diff --git a/.dockerignore b/.dockerignore
index 285200a8b127..f9fc785f92da 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,4 @@
-server/node_modules/
-server/.env
\ No newline at end of file
+.git
+.env
+node_modules
+.nx/cache
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
new file mode 100644
index 000000000000..006b55e2a012
--- /dev/null
+++ b/.eslintrc.cjs
@@ -0,0 +1,151 @@
+module.exports = {
+  root: true,
+  extends: ['plugin:prettier/recommended'],
+  plugins: [
+    '@nx',
+    'prefer-arrow',
+    'import',
+    'simple-import-sort',
+    'unused-imports',
+    'unicorn',
+  ],
+  rules: {
+    'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
+    'no-console': ['warn', { allow: ['group', 'groupCollapsed', 'groupEnd'] }],
+    'no-control-regex': 0,
+    'no-duplicate-imports': 'error',
+    'no-undef': 'off',
+    'no-unused-vars': 'off',
+
+    '@nx/enforce-module-boundaries': [
+      'error',
+      {
+        enforceBuildableLibDependency: true,
+        allow: [],
+        depConstraints: [
+          {
+            sourceTag: '*',
+            onlyDependOnLibsWithTags: ['*'],
+          },
+        ],
+      },
+    ],
+
+    'import/no-relative-packages': 'error',
+    'import/no-useless-path-segments': 'error',
+    'import/no-duplicates': ['error', { considerQueryString: true }],
+
+    'prefer-arrow/prefer-arrow-functions': [
+      'error',
+      {
+        disallowPrototype: true,
+        singleReturnOnly: false,
+        classPropertiesAllowed: false,
+      },
+    ],
+
+    'simple-import-sort/imports': [
+      'error',
+      {
+        groups: [
+          // Packages
+          ['^react', '^@?\\w'],
+          // Internal modules
+          ['^(@|~|src|@ui)(/.*|$)'],
+          // Side effect imports
+          ['^\\u0000'],
+          // Relative imports
+          ['^\\.\\.(?!/?$)', '^\\.\\./?$'],
+          ['^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$'],
+          // CSS imports
+          ['^.+\\.?(css)$'],
+        ],
+      },
+    ],
+    'simple-import-sort/exports': 'error',
+
+    'unused-imports/no-unused-imports': 'warn',
+    'unused-imports/no-unused-vars': [
+      'warn',
+      {
+        vars: 'all',
+        varsIgnorePattern: '^_',
+        args: 'after-used',
+        argsIgnorePattern: '^_',
+      },
+    ],
+  },
+  overrides: [
+    {
+      files: ['**/*.ts', '**/*.tsx'],
+      extends: ['plugin:@nx/typescript'],
+      rules: {
+        '@typescript-eslint/ban-ts-comment': 'error',
+        '@typescript-eslint/consistent-type-imports': [
+          'error',
+          { prefer: 'no-type-imports' },
+        ],
+        '@typescript-eslint/explicit-function-return-type': 'off',
+        '@typescript-eslint/explicit-module-boundary-types': 'off',
+        '@typescript-eslint/interface-name-prefix': 'off',
+        '@typescript-eslint/no-empty-function': 'off',
+        '@typescript-eslint/no-empty-interface': [
+          'error',
+          {
+            allowSingleExtends: true,
+          },
+        ],
+        '@typescript-eslint/no-explicit-any': 'off',
+        '@typescript-eslint/no-empty-function': 'off',
+        '@typescript-eslint/no-unused-vars': [
+          'warn',
+          {
+            vars: 'all',
+            varsIgnorePattern: '^_',
+            args: 'after-used',
+            argsIgnorePattern: '^_',
+          },
+        ],
+      },
+    },
+    {
+      files: ['*.js', '*.jsx'],
+      extends: ['plugin:@nx/javascript'],
+      rules: {},
+    },
+    {
+      files: ['*.spec.@(ts|tsx|js|jsx)', '*.test.@(ts|tsx|js|jsx)'],
+      env: {
+        jest: true,
+      },
+      rules: {
+        '@typescript-eslint/no-non-null-assertion': 'off',
+      },
+    },
+    {
+      files: ['**/constants/*.ts', '**/*.constants.ts'],
+      rules: {
+        '@typescript-eslint/naming-convention': [
+          'error',
+          {
+            selector: 'variable',
+            format: ['UPPER_CASE'],
+          },
+        ],
+        'unicorn/filename-case': [
+          'warn',
+          {
+            cases: {
+              pascalCase: true,
+            },
+          },
+        ],
+        '@nx/workspace-max-consts-per-file': ['error', { max: 1 }],
+      },
+    },
+    {
+      files: ['*.json'],
+      parser: 'jsonc-eslint-parser',
+    },
+  ],
+};
diff --git a/.eslintrc.js b/.eslintrc.js
deleted file mode 100644
index 96425af5abda..000000000000
--- a/.eslintrc.js
+++ /dev/null
@@ -1,126 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ['plugin:prettier/recommended'],
-  plugins: [
-    '@nx',
-    'prefer-arrow',
-    'simple-import-sort',
-    'unused-imports',
-    'unicorn',
-  ],
-  rules: {
-    'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
-    'no-console': ['warn', { allow: ['group', 'groupCollapsed', 'groupEnd'] }],
-    'no-unused-vars': 'off',
-    'no-control-regex': 0,
-    'no-undef': 'off',
-
-    '@nx/enforce-module-boundaries': [
-      'error',
-      {
-        enforceBuildableLibDependency: true,
-        allow: [],
-        depConstraints: [
-          {
-            sourceTag: '*',
-            onlyDependOnLibsWithTags: ['*'],
-          },
-        ],
-      },
-    ],
-
-    'prefer-arrow/prefer-arrow-functions': [
-      'error',
-      {
-        disallowPrototype: true,
-        singleReturnOnly: false,
-        classPropertiesAllowed: false,
-      },
-    ],
-
-    'simple-import-sort/imports': [
-      'error',
-      {
-        groups: [
-          ['^react', '^@?\\w'],
-          ['^(@|~)(/.*|$)'],
-          ['^\\u0000'],
-          ['^\\.\\.(?!/?$)', '^\\.\\./?$'],
-          ['^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$'],
-          ['^.+\\.?(css)$'],
-        ],
-      },
-    ],
-    'simple-import-sort/exports': 'error',
-
-    'unused-imports/no-unused-imports': 'warn',
-    'unused-imports/no-unused-vars': [
-      'warn',
-      {
-        vars: 'all',
-        varsIgnorePattern: '^_',
-        args: 'after-used',
-        argsIgnorePattern: '^_',
-      },
-    ],
-  },
-  overrides: [
-    {
-      files: ['**/*.ts', '**/*.tsx'],
-      extends: ['plugin:@nx/typescript'],
-      rules: {
-        '@typescript-eslint/ban-ts-comment': 'error',
-        '@typescript-eslint/interface-name-prefix': 'off',
-        '@typescript-eslint/explicit-function-return-type': 'off',
-        '@typescript-eslint/explicit-module-boundary-types': 'off',
-        '@typescript-eslint/no-explicit-any': 'off',
-        '@typescript-eslint/no-unused-vars': [
-          'warn',
-          {
-            vars: 'all',
-            varsIgnorePattern: '^_',
-            args: 'after-used',
-            argsIgnorePattern: '^_',
-          },
-        ],
-        '@typescript-eslint/consistent-type-imports': [
-          'error',
-          { prefer: 'no-type-imports' },
-        ],
-      },
-    },
-    {
-      files: ['*.js', '*.jsx'],
-      extends: ['plugin:@nx/javascript'],
-      rules: {},
-    },
-    {
-      files: ['*.spec.@(ts|tsx|js|jsx)', '*.test.@(ts|tsx|js|jsx)'],
-      env: {
-        jest: true,
-      },
-      rules: {},
-    },
-    {
-      files: ['**/constants/*.ts', '**/*.constants.ts'],
-      rules: {
-        '@typescript-eslint/naming-convention': [
-          'error',
-          {
-            selector: 'variable',
-            format: ['UPPER_CASE'],
-          },
-        ],
-        'unicorn/filename-case': [
-          'warn',
-          {
-            cases: {
-              pascalCase: true,
-            },
-          },
-        ],
-        '@nx/workspace-max-consts-per-file': ['error', { max: 1 }],
-      },
-    },
-  ],
-};
diff --git a/.eslintrc.react.cjs b/.eslintrc.react.cjs
new file mode 100644
index 000000000000..22000fa33f96
--- /dev/null
+++ b/.eslintrc.react.cjs
@@ -0,0 +1,80 @@
+module.exports = {
+  extends: [
+    'plugin:@nx/react',
+    'plugin:react/recommended',
+    'plugin:react-hooks/recommended',
+    'plugin:storybook/recommended',
+  ],
+  plugins: ['react-hooks', 'react-refresh'],
+  overrides: [
+    {
+      files: ['*.ts', '*.tsx'],
+      parserOptions: {
+        project: ['./tsconfig.base.{json,*.json}'],
+      },
+      rules: {
+        'no-restricted-imports': [
+          'error',
+          {
+            patterns: [
+              {
+                group: ['@tabler/icons-react'],
+                message: 'Please import icons from `twenty-ui`',
+              },
+              {
+                group: ['react-hotkeys-web-hook'],
+                importNames: ['useHotkeys'],
+                message:
+                  'Please use the custom wrapper: `useScopedHotkeys` from `twenty-ui`',
+              },
+            ],
+          },
+        ],
+        '@nx/workspace-effect-components': 'error',
+        '@nx/workspace-no-hardcoded-colors': 'error',
+        '@nx/workspace-matching-state-variable': 'error',
+        '@nx/workspace-sort-css-properties-alphabetically': 'error',
+        '@nx/workspace-styled-components-prefixed-with-styled': 'error',
+        '@nx/workspace-no-state-useref': 'error',
+        '@nx/workspace-component-props-naming': 'error',
+        '@nx/workspace-explicit-boolean-predicates-in-if': 'error',
+        '@nx/workspace-use-getLoadable-and-getValue-to-get-atoms': 'error',
+        '@nx/workspace-useRecoilCallback-has-dependency-array': 'error',
+        'react/no-unescaped-entities': 'off',
+        'react/prop-types': 'off',
+        'react/jsx-key': 'off',
+        'react/display-name': 'off',
+        'react/jsx-uses-react': 'off',
+        'react/react-in-jsx-scope': 'off',
+        'react/jsx-no-useless-fragment': 'off',
+        'react/jsx-props-no-spreading': [
+          'error',
+          {
+            explicitSpread: 'ignore',
+          },
+        ],
+        'react-hooks/exhaustive-deps': [
+          'warn',
+          {
+            additionalHooks: 'useRecoilCallback',
+          },
+        ],
+      },
+    },
+    {
+      files: ['*.stories.@(ts|tsx|js|jsx)'],
+      rules: {
+        '@typescript-eslint/no-non-null-assertion': 'off',
+      },
+    },
+    {
+      files: ['.storybook/main.@(js|cjs|mjs|ts)'],
+      rules: {
+        'storybook/no-uninstalled-addons': [
+          'error',
+          { packageJsonLocation: '../../package.json' },
+        ],
+      },
+    },
+  ],
+};
diff --git a/.github/vale-styles/docs/Numbers.yml b/.github/vale-styles/docs/Numbers.yml
index 2a2c22943ac7..09a1d8aae7a0 100644
--- a/.github/vale-styles/docs/Numbers.yml
+++ b/.github/vale-styles/docs/Numbers.yml
@@ -1,6 +1,6 @@
 extends: existence
 message: "Numbers must be spelled out"
-level: error
+level: warning
 ignorecase: true
 scope: paragraph
 tokens:
diff --git a/.github/vale-styles/vocabularies/Base/accept.txt b/.github/vale-styles/vocabularies/Base/accept.txt
new file mode 100644
index 000000000000..caf773c97515
--- /dev/null
+++ b/.github/vale-styles/vocabularies/Base/accept.txt
@@ -0,0 +1,14 @@
+kanban
+kanbans
+Kanban
+Kanbans
+automation
+automations
+Automation
+Automations
+S3
+PNGs
+PNG
+JPEG
+JPEGs
+US
\ No newline at end of file
diff --git a/.github/vale-styles/vocabularies/Base/reject.txt b/.github/vale-styles/vocabularies/Base/reject.txt
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/.github/workflows/cd-deploy-main.yaml b/.github/workflows/cd-deploy-main.yaml
index 6b3837f92a59..9b6217c5ab30 100644
--- a/.github/workflows/cd-deploy-main.yaml
+++ b/.github/workflows/cd-deploy-main.yaml
@@ -13,3 +13,4 @@ jobs:
           token: ${{ secrets.TWENTY_INFRA_TOKEN }}
           repository: twentyhq/twenty-infra
           event-type: auto-deploy-main
+          client-payload: '{"github": ${{ toJson(github) }}}' # Passes the entire github context to the downstream workflow
diff --git a/.github/workflows/cd-deploy-tag.yaml b/.github/workflows/cd-deploy-tag.yaml
new file mode 100644
index 000000000000..17bee3d1a34f
--- /dev/null
+++ b/.github/workflows/cd-deploy-tag.yaml
@@ -0,0 +1,16 @@
+name: CD deploy tag
+on:
+  push:
+    tags:
+      - 'v*'
+jobs:
+  deploy-tag:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Repository Dispatch
+        uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ secrets.TWENTY_INFRA_TOKEN }}
+          repository: twentyhq/twenty-infra
+          event-type: auto-deploy-tag
+          client-payload: '{"github": ${{ toJson(github) }}}' # Passes the entire github context to the downstream workflow
diff --git a/.github/workflows/ci-chromatic.yaml b/.github/workflows/ci-chromatic.yaml
index fa3364c572a3..fb0408e086eb 100644
--- a/.github/workflows/ci-chromatic.yaml
+++ b/.github/workflows/ci-chromatic.yaml
@@ -4,8 +4,18 @@ on:
   push:
     branches:
       - main
+    paths:
+      - 'package.json'
+      - 'packages/twenty-front/**'
   pull_request:
     types: [labeled]
+    paths:
+      - 'package.json'
+      - 'packages/twenty-front/**'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   chromatic-deployment:
     if: contains(github.event.pull_request.labels.*.name, 'run-chromatic') || github.event_name == 'push'
@@ -14,10 +24,6 @@ jobs:
       REACT_APP_SERVER_BASE_URL: http://127.0.0.1:3000
       CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
     steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.11.0
-        with:
-            access_token: ${{ github.token }}
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
diff --git a/.github/workflows/ci-chrome-extension.yaml b/.github/workflows/ci-chrome-extension.yaml
index d450cc4378f4..c50ecbf0cef5 100644
--- a/.github/workflows/ci-chrome-extension.yaml
+++ b/.github/workflows/ci-chrome-extension.yaml
@@ -3,7 +3,17 @@ on:
   push:
     branches:
       - main
+    paths:
+      - 'package.json'
+      - 'packages/twenty-chrome-extension/**'
   pull_request:
+    paths:
+      - 'package.json'
+      - 'packages/twenty-chrome-extension/**'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   chrome-extension-yarn-install:
     runs-on: ci-8-cores
@@ -11,10 +21,6 @@ jobs:
       VITE_SERVER_BASE_URL: http://localhost:3000
       VITE_FRONT_BASE_URL: http://localhost:3001
     steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.11.0
-        with:
-            access_token: ${{ github.token }}
       - uses: actions/checkout@v4
       - name: Setup Node.js
         uses: actions/setup-node@v3
diff --git a/.github/workflows/ci-docs.yaml b/.github/workflows/ci-docs.yaml
index ad02f0724479..a08cd741a5c4 100644
--- a/.github/workflows/ci-docs.yaml
+++ b/.github/workflows/ci-docs.yaml
@@ -3,15 +3,21 @@ on:
   push:
     branches:
       - main
+    paths:
+      - 'package.json'
+      - 'packages/twenty-docs/**'
   pull_request:
+    paths:
+      - 'package.json'
+      - 'packages/twenty-docs/**'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   docs-build:
     runs-on: ubuntu-latest
     steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.11.0
-        with:
-            access_token: ${{ github.token }}
       - uses: actions/checkout@v4
       - name: Setup Node.js
         uses: actions/setup-node@v3
@@ -35,4 +41,4 @@ jobs:
           token: ${{ github.token }}
           filter_mode: nofilter
         env:
-          REVIEWDOG_GITHUB_API_TOKEN: ${{ github.token }}
\ No newline at end of file
+          REVIEWDOG_GITHUB_API_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/ci-front.yaml b/.github/workflows/ci-front.yaml
index 66003014eab4..80e21acff652 100644
--- a/.github/workflows/ci-front.yaml
+++ b/.github/workflows/ci-front.yaml
@@ -3,17 +3,23 @@ on:
   push:
     branches:
       - main
+    paths:
+      - 'package.json'
+      - 'packages/twenty-front/**'
   pull_request:
+    paths:
+      - 'package.json'
+      - 'packages/twenty-front/**'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   front-yarn-install:
     runs-on: ci-8-cores
     env:
       REACT_APP_SERVER_BASE_URL: http://localhost:3000
     steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.11.0
-        with:
-            access_token: ${{ github.token }}
       - uses: actions/checkout@v4
       - name: Setup Node.js
         uses: actions/setup-node@v3
@@ -67,7 +73,7 @@ jobs:
       - name: Install Playwright
         run: cd packages/twenty-front && npx playwright install
       - name: Build Storybook
-        run: yarn nx storybook:pages:build --quiet twenty-front
+        run: yarn nx storybook:pages:build twenty-front --quiet
       - name: Run storybook tests
         run: |
           cd packages/twenty-front && npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \
@@ -107,7 +113,7 @@ jobs:
       - name: Install Playwright
         run: cd packages/twenty-front && npx playwright install
       - name: Build Storybook
-        run: yarn nx storybook:modules:build --quiet twenty-front
+        run: yarn nx storybook:modules:build twenty-front --quiet
       - name: Run storybook tests
         run: |
           cd packages/twenty-front && npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \
@@ -172,4 +178,4 @@ jobs:
           key: root-node_modules-${{hashFiles('yarn.lock')}}
           restore-keys: root-node_modules-
       - name: Front / Run jest
-        run: yarn nx test twenty-front
\ No newline at end of file
+        run: yarn nx coverage twenty-front
diff --git a/.github/workflows/ci-release.yaml b/.github/workflows/ci-release.yaml
new file mode 100644
index 000000000000..2c28db36597f
--- /dev/null
+++ b/.github/workflows/ci-release.yaml
@@ -0,0 +1,48 @@
+name: Release Twenty
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        required: true
+        description: Version to release, without the v (e.g. 1.2.3)
+      ref:
+        default: main
+        description: Ref to start the release from (e.g. main, sha)
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.inputs.ref }}
+
+      - name: Sanitize version
+        id: sanitize
+        run: |
+          echo version=$(echo ${{ github.event.inputs.version }} | sed 's/^v//') >> $GITHUB_ENV
+
+      - name: Update versions
+        working-directory: packages
+        run: |
+          for dir in twenty-docs twenty-emails twenty-front twenty-server twenty-ui twenty-website
+          do
+            cd $dir
+            npm version ${{ steps.sanitize.outputs.version }} --no-git-tag-version
+            cd ..
+          done
+
+      # Make sure we have the latest changes before committing
+      - name: Pull changes
+        run: git pull --rebase
+
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: ${{ github.event.inputs.ref }}
+          commit_message: "chore: release v${{ steps.sanitize.outputs.version }}"
+          tagging_message: v${{ steps.sanitize.outputs.version }}
+
+          commit_user_name: Github Action Deploy
+          commit_user_email: github-action-deploy@twenty.com
+          commit_author: Github Action Deploy <github-action-deploy@twenty.com>
diff --git a/.github/workflows/ci-server.yaml b/.github/workflows/ci-server.yaml
index c0782e11e614..b32016c8a625 100644
--- a/.github/workflows/ci-server.yaml
+++ b/.github/workflows/ci-server.yaml
@@ -3,7 +3,19 @@ on:
   push:
     branches:
       - main
+    paths:
+      - 'package.json'
+      - 'packages/twenty-server/**'
+      - 'packages/twenty-emails/**'
   pull_request:
+    paths:
+      - 'package.json'
+      - 'packages/twenty-server/**'
+      - 'packages/twenty-emails/**'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   server-test:
     runs-on: ubuntu-latest
@@ -16,10 +28,6 @@ jobs:
         ports:
           - 5432:5432
     steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.11.0
-        with:
-            access_token: ${{ github.token }}
       - uses: actions/checkout@v4
       - name: Setup Node.js
         uses: actions/setup-node@v3
@@ -30,6 +38,12 @@ jobs:
       - name: Server / Run linter
         run: yarn nx lint twenty-server
       - name: Server / Run jest tests
-        run: yarn nx test twenty-server
-      # - name: Server / Run e2e tests
-      #   run: yarn nx test:e2e twenty-server
+        run: yarn nx test:unit twenty-server
+      - name: Server / Build
+        run: yarn nx build twenty-server
+      - name: Server / Write .env
+        run: |
+          cd packages/twenty-server
+          cp .env.example .env
+      - name: Worker / Run
+        run: MESSAGE_QUEUE_TYPE=sync yarn nx worker twenty-server
diff --git a/.github/workflows/ci-test-docker-compose.yaml b/.github/workflows/ci-test-docker-compose.yaml
new file mode 100644
index 000000000000..1496425c8511
--- /dev/null
+++ b/.github/workflows/ci-test-docker-compose.yaml
@@ -0,0 +1,59 @@
+name: 'Test Docker Compose'
+on:
+  pull_request:
+    paths:
+      - 'packages/twenty-docker/**'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Run compose
+      run: |
+        echo "Patching docker-compose.yml..."
+        # change image to localbuild using yq
+        yq eval 'del(.services.server.image)' -i docker-compose.yml
+        yq eval '.services.server.build.context = "../../"' -i docker-compose.yml
+        yq eval '.services.server.build.dockerfile = "./packages/twenty-docker/twenty/Dockerfile"' -i docker-compose.yml
+        yq eval '.services.server.restart = "no"' -i docker-compose.yml
+
+        yq eval 'del(.services.db.image)' -i docker-compose.yml
+        yq eval '.services.db.build.context = "../../"' -i docker-compose.yml
+        yq eval '.services.db.build.dockerfile = "./packages/twenty-docker/twenty-postgres/Dockerfile"' -i docker-compose.yml
+
+        echo "Setting up .env file..."
+        cp .env.example .env
+        echo "Generating secrets..."
+        echo "# === Randomly generated secrets ===" >>.env
+        echo "ACCESS_TOKEN_SECRET=$(openssl rand -base64 32)" >>.env
+        echo "LOGIN_TOKEN_SECRET=$(openssl rand -base64 32)" >>.env
+        echo "REFRESH_TOKEN_SECRET=$(openssl rand -base64 32)" >>.env
+        echo "FILE_TOKEN_SECRET=$(openssl rand -base64 32)" >>.env
+        echo "POSTGRES_ADMIN_PASSWORD=$(openssl rand -base64 32)" >>.env
+
+        echo "Starting server..."
+        docker compose up -d
+        docker compose logs db server -f &
+        pid=$!
+
+        echo "Waiting for server to start..."
+        count=0
+        while [ ! $(docker inspect --format='{{.State.Health.Status}}' twenty-server-1) = "healthy" ]; do
+            sleep 1;
+            count=$((count+1));
+            if [ $(docker inspect --format='{{.State.Status}}' twenty-server-1) = "exited" ]; then
+                echo "Server exited"
+                exit 1
+            fi
+            if [ $count -gt 300 ]; then
+                echo "Failed to start server"
+                exit 1
+            fi
+        done
+      working-directory: ./packages/twenty-docker/
diff --git a/.github/workflows/ci-utils.yaml b/.github/workflows/ci-utils.yaml
index c1625bc120c9..e77c430a0592 100644
--- a/.github/workflows/ci-utils.yaml
+++ b/.github/workflows/ci-utils.yaml
@@ -2,7 +2,7 @@ name: CI Utils
 on:
   # it's usually not recommended to use pull_request_target
   # but we consider it's safe here if we keep the same steps
-  # see: https://securitylab.github.com/research/github-actions-preventing-pwn-requests/ 
+  # see: https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
   # and: https://github.com/facebook/react-native/pull/34370/files
   pull_request_target:
 permissions:
@@ -12,14 +12,14 @@ permissions:
   issues: write
   pull-requests: write
   statuses: write
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   danger-js:
     runs-on: ubuntu-latest
     steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.11.0
-        with:
-            access_token: ${{ github.token }}
       - uses: actions/checkout@v4
       - name: Setup Node.js
         uses: actions/setup-node@v3
diff --git a/.github/workflows/ci-website.yaml b/.github/workflows/ci-website.yaml
new file mode 100644
index 000000000000..2bed055536ab
--- /dev/null
+++ b/.github/workflows/ci-website.yaml
@@ -0,0 +1,29 @@
+name: CI Website
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'package.json'
+      - 'packages/twenty-website/**'
+  pull_request:
+    paths:
+      - 'package.json'
+      - 'packages/twenty-website/**'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  website-build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "18"
+      - name: Website / Install Dependencies
+        run: yarn
+      - name: Website / Build Website
+        run: yarn nx build twenty-website
diff --git a/.gitignore b/.gitignore
index 945b498ddc6d..fb8264316f2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 **/**/.env
 .DS_Store
-.idea/workspace.xml
+/.idea
 **/**/node_modules/
 
 # yarn is the recommended package manager across the project
@@ -16,7 +16,10 @@
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
-coverage
 .vercel
 
-**/**/logs/**
\ No newline at end of file
+**/**/logs/**
+
+coverage
+dist
+storybook-static
diff --git a/.nx/nxw.js b/.nx/nxw.js
index a9af3c7e0307..2f4503c5aaa5 100644
--- a/.nx/nxw.js
+++ b/.nx/nxw.js
@@ -1,7 +1,7 @@
 "use strict";
 // This file should be committed to your repository! It wraps Nx and ensures
 // that your local installation matches nx.json.
-// See: https://nx.dev/more-concepts/nx-and-the-wrapper for more info.
+// See: https://nx.dev/recipes/installation/install-non-javascript for more info.
 
 
 
@@ -11,9 +11,12 @@ const fs = require('fs');
 const path = require('path');
 const cp = require('child_process');
 const installationPath = path.join(__dirname, 'installation', 'package.json');
-function matchesCurrentNxInstall(nxJsonInstallation) {
+function matchesCurrentNxInstall(currentInstallation, nxJsonInstallation) {
+    if (!currentInstallation.devDependencies ||
+        !Object.keys(currentInstallation.devDependencies).length) {
+        return false;
+    }
     try {
-        const currentInstallation = require(installationPath);
         if (currentInstallation.devDependencies['nx'] !==
             nxJsonInstallation.version ||
             require(path.join(path.dirname(installationPath), 'node_modules', 'nx', 'package.json')).version !== nxJsonInstallation.version) {
@@ -35,30 +38,58 @@ function ensureDir(p) {
         fs.mkdirSync(p, { recursive: true });
     }
 }
+function getCurrentInstallation() {
+    try {
+        return require(installationPath);
+    }
+    catch {
+        return {
+            name: 'nx-installation',
+            version: '0.0.0',
+            devDependencies: {},
+        };
+    }
+}
+function performInstallation(currentInstallation, nxJson) {
+    fs.writeFileSync(installationPath, JSON.stringify({
+        name: 'nx-installation',
+        devDependencies: {
+            nx: nxJson.installation.version,
+            ...nxJson.installation.plugins,
+        },
+    }));
+    try {
+        cp.execSync('npm i', {
+            cwd: path.dirname(installationPath),
+            stdio: 'inherit',
+        });
+    }
+    catch (e) {
+        // revert possible changes to the current installation
+        fs.writeFileSync(installationPath, JSON.stringify(currentInstallation));
+        // rethrow
+        throw e;
+    }
+}
 function ensureUpToDateInstallation() {
     const nxJsonPath = path.join(__dirname, '..', 'nx.json');
     let nxJson;
     try {
         nxJson = require(nxJsonPath);
+        if (!nxJson.installation) {
+            console.error('[NX]: The "installation" entry in the "nx.json" file is required when running the nx wrapper. See https://nx.dev/recipes/installation/install-non-javascript');
+            process.exit(1);
+        }
     }
     catch {
-        console.error('[NX]: nx.json is required when running the nx wrapper. See https://nx.dev/more-concepts/nx-and-the-wrapper');
+        console.error('[NX]: The "nx.json" file is required when running the nx wrapper. See https://nx.dev/recipes/installation/install-non-javascript');
         process.exit(1);
     }
     try {
         ensureDir(path.join(__dirname, 'installation'));
-        if (!matchesCurrentNxInstall(nxJson.installation)) {
-            fs.writeFileSync(installationPath, JSON.stringify({
-                name: 'nx-installation',
-                devDependencies: {
-                    nx: nxJson.installation.version,
-                    ...nxJson.installation.plugins,
-                },
-            }));
-            cp.execSync('npm i', {
-                cwd: path.dirname(installationPath),
-                stdio: 'inherit',
-            });
+        const currentInstallation = getCurrentInstallation();
+        if (!matchesCurrentNxInstall(currentInstallation, nxJson.installation)) {
+            performInstallation(currentInstallation, nxJson);
         }
     }
     catch (e) {
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 31721f10ea5f..48983ed706f3 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -7,10 +7,11 @@
       "type": "node",
       "request": "launch",
       "runtimeExecutable": "yarn",
+      "runtimeVersion": "18",
       "runtimeArgs": [
         "nx",
         "run",
-        "twenty-server:start:dev",
+        "twenty-server:start",
       ],
       "outputCapture": "std",
       "internalConsoleOptions": "openOnSessionStart",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8431fcdba733..299062d40ae7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,21 +4,21 @@
   "[typescript]": {
     "editor.formatOnSave": false,
     "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true,
+      "source.fixAll.eslint": "explicit",
       "source.addMissingImports": "always"
     }
   },
   "[javascript]": {
     "editor.formatOnSave": false,
     "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true,
+      "source.fixAll.eslint": "explicit",
       "source.addMissingImports": "always"
     }
   },
   "[typescriptreact]": {
     "editor.formatOnSave": false,
     "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true,
+      "source.fixAll.eslint": "explicit",
       "source.addMissingImports": "always"
     }
   },
@@ -47,5 +47,6 @@
   },
   "search.exclude": {
     "**/.yarn": true,
-  }
+  },
+  "eslint.debug": true
 }
diff --git a/.vscode/twenty.code-workspace b/.vscode/twenty.code-workspace
index 5abed2559c6c..581e3ed4c02d 100644
--- a/.vscode/twenty.code-workspace
+++ b/.vscode/twenty.code-workspace
@@ -42,10 +42,59 @@
     },
   ],
   "settings": {
+    "editor.formatOnSave": false,
+    "files.eol": "auto",
+    "[typescript]": {
+      "editor.formatOnSave": false,
+      "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": true,
+        "source.addMissingImports": "always"
+      }
+    },
+    "[javascript]": {
+      "editor.formatOnSave": false,
+      "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": true,
+        "source.addMissingImports": "always"
+      }
+    },
+    "[typescriptreact]": {
+      "editor.formatOnSave": false,
+      "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": true,
+        "source.addMissingImports": "always"
+      }
+    },
+    "[json]": {
+      "editor.formatOnSave": true
+    },
+    "javascript.format.enable": false,
+    "typescript.format.enable": false,
+    "cSpell.enableFiletypes": [
+      "!javascript",
+      "!json",
+      "!typescript",
+      "!typescriptreact",
+      "md",
+      "mdx"
+    ],
+    "cSpell.words": [
+      "twentyhq"
+    ],
+    "typescript.preferences.importModuleSpecifier": "non-relative",
+    "[javascript][typescript][typescriptreact]": {
+      "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": "explicit",
+        "source.addMissingImports": "always"
+      }
+    },
+    "search.exclude": {
+      "**/.yarn": true,
+    },
     "files.exclude": {
       "packages/": true
     },
-    "jest.autoEnable": false,
+    "jest.runMode": "on-demand",
     "jest.disabledWorkspaceFolders": [
       "ROOT",
       "packages/twenty-zapier",
diff --git a/README.md b/README.md
index b61bd5073094..d76ededc46bc 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ We felt the need for a CRM platform that empowers rather than constrains. We bel
 <br>
 
 # Demo 
-Go to <a href="https://app.twenty.com/">app.twenty.com</a> and login with the following credentials:
+Go to <a href="https://demo.twenty.com/">demo.twenty.com</a> and login with the following credentials:
 ```
 email: noah@demo.dev
 password: Applecar2025
diff --git a/install.sh b/install.sh
new file mode 100755
index 000000000000..a90f5866afa0
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,167 @@
+#!/bin/bash
+
+echo "🔧 Checking dependencies..."
+if ! command -v docker &>/dev/null; then
+  echo -e "\t❌ Docker is not installed or not in PATH. Please install Docker first.\n\t\tSee https://docs.docker.com/get-docker/"
+  exit 1
+fi
+# Check if docker compose plugin is installed
+if ! docker compose version &>/dev/null; then
+  echo -e "\t❌ Docker Compose is not installed or not in PATH (n.b. docker-compose is deprecated)\n\t\tUpdate docker or install docker-compose-plugin\n\t\tOn Linux: sudo apt-get install docker-compose-plugin\n\t\tSee https://docs.docker.com/compose/install/"
+  exit 1
+fi
+# Check if docker is started
+if ! docker info &>/dev/null; then
+  echo -e "\t❌ Docker is not running.\n\t\tPlease start Docker Desktop, Docker or check documentation at https://docs.docker.com/config/daemon/start/"
+  exit 1
+fi
+if ! command -v curl &>/dev/null; then
+  echo -e "\t❌ Curl is not installed or not in PATH.\n\t\tOn macOS: brew install curl\n\t\tOn Linux: sudo apt install curl"
+  exit 1
+fi
+
+# Check if docker compose version is >= 2
+if [ "$(docker compose version --short | cut -d' ' -f3 | cut -d'.' -f1)" -lt 2 ]; then
+  echo -e "\t❌ Docker Compose is outdated. Please update Docker Compose to version 2 or higher.\n\t\tSee https://docs.docker.com/compose/install/linux/"
+  exit 1
+fi
+# Check if docker-compose is installed, if so issue a warning if version is < 2
+if command -v docker-compose &>/dev/null; then
+  if [ "$(docker-compose version --short | cut -d' ' -f3 | cut -d'.' -f1)" -lt 2 ]; then
+    echo -e "\n\t⚠️ 'docker-compose' is installed but outdated. Make sure to use 'docker compose' or to upgrade 'docker-compose' to version 2.\n\t\tSee https://docs.docker.com/compose/install/standalone/\n"
+  fi
+fi
+
+# Catch errors
+set -e
+function on_exit {
+  # $? is the exit status of the last command executed
+  local exit_status=$?
+  if [ $exit_status -ne 0 ]; then
+    echo "❌ Something went wrong, exiting: $exit_status"
+  fi
+}
+trap on_exit EXIT
+
+# Use environment variables VERSION and BRANCH, with defaults if not set
+version=${VERSION:-$(curl -s https://api.github.com/repos/twentyhq/twenty/releases/latest | grep '"tag_name":' | cut -d '"' -f 4)}
+branch=${BRANCH:-main}
+
+echo "🚀 Using version $version and branch $branch"
+
+dir_name="twenty"
+function ask_directory {
+  read -p "📁 Enter the directory name to setup the project (default: $dir_name): " answer
+  if [ -n "$answer" ]; then
+    dir_name=$answer
+  fi
+}
+
+ask_directory
+
+while [ -d "$dir_name" ]; do
+  read -p "🚫 Directory '$dir_name' already exists. Do you want to overwrite it? (y/N) " answer
+  if [ "$answer" = "y" ]; then
+    break
+  else
+    ask_directory
+  fi
+done
+
+# Create a directory named twenty
+echo "📁 Creating directory '$dir_name'"
+mkdir -p "$dir_name" && cd "$dir_name" || { echo "❌ Failed to create/access directory '$dir_name'"; exit 1; }
+
+# Copy the twenty/packages/twenty-docker/docker-compose.yml file in it
+echo -e "\t• Copying docker-compose.yml"
+curl -sLo docker-compose.yml https://raw.githubusercontent.com/twentyhq/twenty/$branch/packages/twenty-docker/docker-compose.yml
+
+# Copy twenty/packages/twenty-docker/.env.example to .env
+echo -e "\t• Setting up .env file"
+curl -sLo .env https://raw.githubusercontent.com/twentyhq/twenty/$branch/packages/twenty-docker/.env.example
+
+# Replace TAG=latest by TAG=<latest_release or version input>
+if [[ $(uname) == "Darwin" ]]; then
+  # Running on macOS
+  sed -i '' "s/TAG=latest/TAG=$version/g" .env
+else
+  # Assuming Linux
+  sed -i'' "s/TAG=latest/TAG=$version/g" .env
+fi
+
+# Generate random strings for secrets
+echo "# === Randomly generated secrets ===" >>.env
+echo "ACCESS_TOKEN_SECRET=$(openssl rand -base64 32)" >>.env
+echo "LOGIN_TOKEN_SECRET=$(openssl rand -base64 32)" >>.env
+echo "REFRESH_TOKEN_SECRET=$(openssl rand -base64 32)" >>.env
+echo "FILE_TOKEN_SECRET=$(openssl rand -base64 32)" >>.env
+echo "" >>.env
+echo "POSTGRES_ADMIN_PASSWORD=$(openssl rand -base64 32)" >>.env
+
+echo -e "\t• .env configuration completed"
+
+port=3000
+# Check if command nc is available
+if command -v nc &> /dev/null; then
+  # Check if port 3000 is already in use, propose to change it
+  while nc -zv localhost $port &>/dev/null; do
+    read -p "🚫 Port $port is already in use. Do you want to use another port? (Y/n) " answer
+    if [ "$answer" = "n" ]; then
+      continue
+    fi
+    read -p "Enter a new port number: " new_port
+    if [[ $(uname) == "Darwin" ]]; then
+      sed -i '' "s/$port:$port/$new_port:$port/g" docker-compose.yml
+    else
+      sed -i'' "s/$port:$port/$new_port:$port/g" docker-compose.yml
+    fi
+    port=$new_port
+  done
+fi
+
+# Ask user if he wants to start the project
+read -p "🚀 Do you want to start the project now? (Y/n) " answer
+if [ "$answer" = "n" ]; then
+  echo "✅ Project setup completed. Run 'docker compose up -d' to start."
+  exit 0
+else
+  echo "🐳 Starting Docker containers..."
+  docker compose up -d
+  # Check if port is listening
+  echo "Waiting for server to be healthy, it might take a few minutes while we initialize the database..."
+  # Tail logs of the server until it's ready
+  docker compose logs -f server &
+  pid=$!
+  while [ ! $(docker inspect --format='{{.State.Health.Status}}' twenty-server-1) = "healthy" ]; do
+    sleep 1
+  done
+  kill $pid
+  echo ""
+  echo "✅ Server is up and running"
+fi
+
+function ask_open_browser {
+  read -p "🌐 Do you want to open the project in your browser? (Y/n) " answer
+  if [ "$answer" = "n" ]; then
+    echo "✅ Setup completed. Access your project at http://localhost:$port"
+    exit 0
+  fi
+}
+
+# Ask user if he wants to open the project
+# Running on macOS
+if [[ $(uname) == "Darwin" ]]; then
+  ask_open_browser
+
+  open "http://localhost:$port"
+# Assuming Linux
+else
+  # xdg-open is not installed, we could be running in a non gui environment
+  if command -v xdg-open >/dev/null 2>&1; then
+    ask_open_browser
+
+    xdg-open "http://localhost:$port"
+  else
+    echo "✅ Setup completed. Your project is available at http://localhost:$port"
+  fi
+fi
diff --git a/nx.json b/nx.json
index f2e89e086fa7..44fcf672ef61 100644
--- a/nx.json
+++ b/nx.json
@@ -2,38 +2,39 @@
   "targetDefaults": {
     "build": {
       "cache": true,
-      "dependsOn": [
-        "^build"
-      ]
+      "dependsOn": ["^build"]
     },
     "start": {
       "cache": true,
-      "dependsOn": [
-        "^build"
-      ]
+      "dependsOn": ["^build"]
     },
     "lint": {
       "cache": true
     },
     "test": {
       "cache": true,
-      "dependsOn": [
-        "^build"
-      ]
+      "dependsOn": ["^build"]
     },
     "test:e2e": {
       "cache": true,
-      "dependsOn": [
-        "^build"
-      ]
+      "dependsOn": ["^build"]
     },
-    "@nx/jest:jest": {
+    "storybook:build": {
       "cache": true,
       "inputs": [
         "default",
         "^default",
-        "{workspaceRoot}/jest.preset.js"
-      ],
+        "{projectRoot}/.storybook/**/*",
+        "{projectRoot}/tsconfig.storybook.json"
+      ]
+    },
+    "storybook:dev": {
+      "cache": true,
+      "dependsOn": ["^build"]
+    },
+    "@nx/jest:jest": {
+      "cache": true,
+      "inputs": ["default", "^default", "{workspaceRoot}/jest.preset.js"],
       "options": {
         "passWithNoTests": true
       },
@@ -44,28 +45,58 @@
         }
       }
     },
-    "@nx/vite:test": {
+    "@nx/eslint:lint": {
       "cache": true,
       "inputs": [
         "default",
-        "^default"
+        "{workspaceRoot}/.eslintrc.js",
+        "{workspaceRoot}/tools/eslint-rules/**/*"
       ]
+    },
+    "@nx/vite:test": {
+      "cache": true,
+      "inputs": ["default", "^default"]
+    },
+    "@nx/vite:build": {
+      "cache": true,
+      "dependsOn": ["^build"],
+      "inputs": ["default", "^default"]
     }
   },
   "installation": {
-    "version": "17.2.8"
-  },
-  "affected": {
-    "defaultBase": "main"
+    "version": "18.1.3"
   },
   "generators": {
     "@nx/react": {
       "application": {
-        "babel": true
+        "babel": true,
+        "style": "@emotion/styled",
+        "linter": "eslint",
+        "bundler": "vite",
+        "compiler": "swc",
+        "unitTestRunner": "jest",
+        "projectNameAndRootFormat": "derived"
       },
       "library": {
-        "unitTestRunner": "none"
+        "style": "@emotion/styled",
+        "linter": "eslint",
+        "bundler": "vite",
+        "compiler": "swc",
+        "unitTestRunner": "jest",
+        "projectNameAndRootFormat": "derived"
+      },
+      "component": {
+        "style": "@emotion/styled"
+      }
+    }
+  },
+  "tasksRunnerOptions": {
+    "default": {
+      "options": {
+        "cacheableOperations": ["storybook:build"]
       }
     }
-  }
-}
\ No newline at end of file
+  },
+  "useInferencePlugins": false,
+  "defaultBase": "main"
+}
diff --git a/package.json b/package.json
index d0c8e0c6ce7b..0664fc64dd26 100644
--- a/package.json
+++ b/package.json
@@ -5,11 +5,11 @@
     "@apollo/server": "^4.7.3",
     "@aws-sdk/client-s3": "^3.363.0",
     "@aws-sdk/credential-providers": "^3.363.0",
-    "@blocknote/core": "^0.11.2",
-    "@blocknote/react": "^0.11.2",
+    "@blocknote/core": "^0.12.1",
+    "@blocknote/react": "^0.12.2",
     "@chakra-ui/accordion": "^2.3.0",
     "@chakra-ui/system": "^2.6.0",
-    "@codesandbox/sandpack-react": "^2.11.3",
+    "@codesandbox/sandpack-react": "^2.13.5",
     "@docusaurus/core": "^3.1.0",
     "@docusaurus/preset-classic": "^3.1.0",
     "@emotion/react": "^11.11.1",
@@ -34,7 +34,7 @@
     "@nestjs/jwt": "^10.0.3",
     "@nestjs/passport": "^9.0.3",
     "@nestjs/platform-express": "^9.0.0",
-    "@nestjs/serve-static": "^3.0.0",
+    "@nestjs/serve-static": "^4.0.1",
     "@nestjs/terminus": "^9.2.2",
     "@nestjs/typeorm": "^10.0.0",
     "@nivo/calendar": "^0.84.0",
@@ -51,11 +51,14 @@
     "@sentry/tracing": "^7.99.0",
     "@sniptt/guards": "^0.2.0",
     "@stoplight/elements": "^8.0.5",
+    "@storybook/icons": "^1.2.9",
     "@swc/jest": "^0.2.29",
     "@tabler/icons-react": "^2.44.0",
+    "@types/dompurify": "^3.0.5",
     "@types/facepaint": "^1.2.5",
     "@types/lodash.camelcase": "^4.3.7",
     "@types/lodash.merge": "^4.6.7",
+    "@types/lodash.pick": "^4.3.7",
     "@types/mailparser": "^3.4.4",
     "@types/nodemailer": "^6.4.14",
     "add": "^2.0.6",
@@ -78,6 +81,7 @@
     "debounce": "^2.0.0",
     "deep-equal": "^2.2.2",
     "docusaurus-node-polyfills": "^1.0.0",
+    "dompurify": "^3.0.11",
     "dotenv-cli": "^7.2.1",
     "drizzle-orm": "^0.29.3",
     "esbuild-plugin-svgr": "^2.1.0",
@@ -85,7 +89,7 @@
     "file-type": "16.5.4",
     "framer-motion": "^10.12.17",
     "googleapis": "105",
-    "graphiql": "^3.0.10",
+    "graphiql": "^3.1.1",
     "graphql": "16.8.0",
     "graphql-fields": "^2.0.3",
     "graphql-middleware": "^6.1.35",
@@ -106,12 +110,15 @@
     "libphonenumber-js": "^1.10.26",
     "lodash.camelcase": "^4.3.0",
     "lodash.debounce": "^4.0.8",
+    "lodash.groupby": "^4.6.0",
     "lodash.isempty": "^4.4.0",
     "lodash.isequal": "^4.5.0",
     "lodash.isobject": "^3.0.2",
     "lodash.kebabcase": "^4.1.1",
+    "lodash.mapvalues": "^4.6.0",
     "lodash.merge": "^4.6.2",
     "lodash.omit": "^4.5.0",
+    "lodash.pick": "^4.4.0",
     "lodash.snakecase": "^4.1.1",
     "lodash.upperfirst": "^4.3.1",
     "luxon": "^3.3.0",
@@ -122,6 +129,8 @@
     "next-mdx-remote": "^4.4.1",
     "nodemailer": "^6.9.8",
     "openapi-types": "^12.1.3",
+    "overlayscrollbars": "^2.6.1",
+    "overlayscrollbars-react": "^0.5.4",
     "passport": "^0.7.0",
     "passport-google-oauth20": "^2.0.0",
     "passport-jwt": "^4.0.1",
@@ -184,27 +193,34 @@
     "@nestjs/cli": "^9.0.0",
     "@nestjs/schematics": "^9.0.0",
     "@nestjs/testing": "^9.0.0",
-    "@nx/eslint": "17.2.8",
-    "@nx/eslint-plugin": "17.2.8",
-    "@nx/jest": "17.2.8",
-    "@nx/js": "17.2.8",
-    "@nx/react": "17.2.8",
-    "@nx/vite": "17.2.8",
+    "@next/eslint-plugin-next": "^14.1.4",
+    "@nx/eslint": "18.1.3",
+    "@nx/eslint-plugin": "18.1.3",
+    "@nx/jest": "18.1.3",
+    "@nx/js": "18.1.3",
+    "@nx/react": "18.1.3",
+    "@nx/storybook": "18.1.3",
+    "@nx/vite": "18.1.3",
+    "@nx/web": "18.1.3",
+    "@sentry/types": "^7.109.0",
     "@storybook/addon-actions": "^7.6.3",
     "@storybook/addon-coverage": "^1.0.0",
     "@storybook/addon-essentials": "^7.6.7",
     "@storybook/addon-interactions": "^7.6.7",
     "@storybook/addon-links": "^7.6.7",
     "@storybook/addon-onboarding": "^1.0.10",
-    "@storybook/addon-themes": "^7.6.7",
     "@storybook/blocks": "^7.6.3",
+    "@storybook/core-server": "7.6.3",
+    "@storybook/jest": "^0.2.3",
     "@storybook/react": "^7.6.3",
     "@storybook/react-vite": "^7.6.3",
     "@storybook/test": "^7.6.3",
     "@storybook/test-runner": "^0.16.0",
+    "@storybook/testing-library": "^0.2.2",
     "@stylistic/eslint-plugin": "^1.5.0",
-    "@swc-node/register": "~1.6.7",
+    "@swc-node/register": "1.8.0",
     "@swc/core": "~1.3.100",
+    "@swc/helpers": "~0.5.2",
     "@testing-library/jest-dom": "^6.1.5",
     "@testing-library/react": "14.0.0",
     "@types/apollo-upload-client": "^17.0.2",
@@ -219,15 +235,18 @@
     "@types/js-cookie": "^3.0.3",
     "@types/lodash.camelcase": "^4.3.7",
     "@types/lodash.debounce": "^4.0.7",
+    "@types/lodash.groupby": "^4.6.9",
     "@types/lodash.isempty": "^4.4.7",
     "@types/lodash.isequal": "^4.5.7",
     "@types/lodash.isobject": "^3.0.7",
     "@types/lodash.kebabcase": "^4.1.7",
+    "@types/lodash.mapvalues": "^4.6.9",
+    "@types/lodash.omit": "^4.5.9",
     "@types/lodash.snakecase": "^4.1.7",
     "@types/lodash.upperfirst": "^4.3.7",
     "@types/luxon": "^3.3.0",
     "@types/ms": "^0.7.31",
-    "@types/node": "^20.10.6",
+    "@types/node": "18.19.26",
     "@types/passport-google-oauth20": "^2.0.11",
     "@types/passport-jwt": "^3.0.8",
     "@types/react": "^18.2.39",
@@ -236,10 +255,12 @@
     "@types/scroll-into-view": "^1.16.0",
     "@types/supertest": "^2.0.11",
     "@types/uuid": "^9.0.2",
-    "@typescript-eslint/eslint-plugin": "^6.10.0",
-    "@typescript-eslint/parser": "^6.10.0",
-    "@typescript-eslint/utils": "^6.9.1",
+    "@typescript-eslint/eslint-plugin": "6.21.0",
+    "@typescript-eslint/experimental-utils": "^5.62.0",
+    "@typescript-eslint/parser": "6.21.0",
+    "@typescript-eslint/utils": "6.21.0",
     "@vitejs/plugin-react-swc": "^3.5.0",
+    "@vitest/ui": "1.4.0",
     "chromatic": "^6.18.0",
     "concurrently": "^8.2.2",
     "cross-var": "^1.1.0",
@@ -249,7 +270,7 @@
     "eslint": "^8.53.0",
     "eslint-config-next": "14.0.4",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "2.29.1",
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "eslint-plugin-prettier": "^5.1.2",
@@ -263,11 +284,12 @@
     "http-server": "^14.1.1",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
+    "jest-environment-node": "^29.4.1",
     "jest-fetch-mock": "^3.0.3",
     "jsdom": "~22.1.0",
     "msw": "^2.0.11",
     "msw-storybook-addon": "2.0.0--canary.122.b3ed3b1.0",
-    "nx": "17.2.8",
+    "nx": "18.1.3",
     "playwright": "^1.40.1",
     "prettier": "^3.1.1",
     "raw-loader": "^4.0.2",
@@ -276,16 +298,18 @@
     "storybook": "^7.6.3",
     "storybook-addon-cookie": "^3.2.0",
     "storybook-addon-pseudo-states": "^2.1.2",
+    "storybook-dark-mode": "^4.0.1",
     "supertest": "^6.1.3",
     "ts-jest": "^29.1.1",
     "ts-loader": "^9.2.3",
     "ts-node": "10.9.1",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.3.3",
+    "typescript": "5.3.3",
     "vite": "^5.0.0",
     "vite-plugin-checker": "^0.6.2",
-    "vite-plugin-dts": "~2.3.0",
-    "vite-plugin-svgr": "^4.2.0"
+    "vite-plugin-dts": "3.8.1",
+    "vite-plugin-svgr": "^4.2.0",
+    "vitest": "1.4.0"
   },
   "engines": {
     "node": "^18.17.1",
@@ -297,11 +321,12 @@
   "packageManager": "yarn@4.0.2",
   "resolutions": {
     "graphql": "16.8.0",
-    "type-fest": "4.10.1"
+    "type-fest": "4.10.1",
+    "typescript": "5.3.3"
   },
   "version": "0.2.1",
   "scripts": {
-    "start": "cross-env FORCE_COLOR=true concurrently -n \"twenty-server,twenty-front\" -c \"bgBlue.bold,bgGreen.bold\" \"yarn nx start:dev twenty-server\" \"yarn nx start twenty-front\""
+    "start": "cross-env FORCE_COLOR=true concurrently -n \"twenty-server,twenty-front\" -c \"bgBlue.bold,bgGreen.bold\" \"yarn nx start twenty-server\" \"yarn nx start twenty-front\""
   },
   "workspaces": {
     "packages": [
@@ -310,6 +335,7 @@
       "packages/twenty-docs",
       "packages/twenty-server",
       "packages/twenty-emails",
+      "packages/twenty-ui",
       "packages/twenty-utils",
       "packages/twenty-zapier",
       "packages/twenty-website",
diff --git a/packages/twenty-chrome-extension/.eslintrc-ci.cjs b/packages/twenty-chrome-extension/.eslintrc-ci.cjs
index 9b36dd30a212..a0b8a80632e8 100644
--- a/packages/twenty-chrome-extension/.eslintrc-ci.cjs
+++ b/packages/twenty-chrome-extension/.eslintrc-ci.cjs
@@ -3,17 +3,4 @@ module.exports = {
   rules: {
     'no-console': 'error',
   },
-  overrides: [
-    {
-      files: [
-        '.storybook/**/*',
-        '**/*.stories.tsx',
-        '**/*.test.ts',
-        '**/*.test.tsx',
-      ],
-      rules: {
-        'no-console': 'off',
-      },
-    },
-  ],
 };
diff --git a/packages/twenty-chrome-extension/.eslintrc.cjs b/packages/twenty-chrome-extension/.eslintrc.cjs
index fc82c221ab6f..8dbe0179d2ba 100644
--- a/packages/twenty-chrome-extension/.eslintrc.cjs
+++ b/packages/twenty-chrome-extension/.eslintrc.cjs
@@ -1,60 +1,14 @@
-// eslint-disable-next-line
-const path = require('path');
-
 module.exports = {
-  extends: [
-    'plugin:@nx/react',
-    'plugin:react/recommended',
-    'plugin:react-hooks/recommended',
-    'plugin:storybook/recommended',
-    '../../.eslintrc.js',
-  ],
-  plugins: ['react-hooks', 'react-refresh'],
-  ignorePatterns: ['!**/*', 'node_modules', 'dist'],
-  rules: {
-    '@nx/workspace-effect-components': 'error',
-    '@nx/workspace-no-hardcoded-colors': 'error',
-    '@nx/workspace-matching-state-variable': 'error',
-    '@nx/workspace-sort-css-properties-alphabetically': 'error',
-    '@nx/workspace-styled-components-prefixed-with-styled': 'error',
-    '@nx/workspace-no-state-useref': 'error',
-    '@nx/workspace-component-props-naming': 'error',
-
-    'react/no-unescaped-entities': 'off',
-    'react/prop-types': 'off',
-    'react/jsx-key': 'off',
-    'react/display-name': 'off',
-    'react/jsx-uses-react': 'off',
-    'react/react-in-jsx-scope': 'off',
-    'react/jsx-no-useless-fragment': 'off',
-    'react/jsx-props-no-spreading': [
-      'error',
-      {
-        explicitSpread: 'ignore',
-      },
-    ],
-  },
+  extends: ['../../.eslintrc.cjs', '../../.eslintrc.react.cjs'],
+  ignorePatterns: ['!**/*', 'node_modules', 'dist', 'src/generated/*.tsx'],
   overrides: [
     {
-      files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
+      files: ['*.ts', '*.tsx'],
       parserOptions: {
-        project: ['packages/twenty-chrome-extension/tsconfig.*?.json'],
-      },
-      rules: {},
-    },
-    {
-      files: ['.storybook/main.@(js|cjs|mjs|ts)'],
-      rules: {
-        'storybook/no-uninstalled-addons': [
-          'error',
-          { packageJsonLocation: path.resolve('../../package.json') },
-        ],
+        project: ['packages/twenty-chrome-extension/tsconfig.{json,*.json}'],
       },
-    },
-    {
-      files: ['.storybook/**/*', '**/*.stories.tsx', '**/*.test.@(ts|tsx)'],
       rules: {
-        'no-console': 'off',
+        '@nx/workspace-explicit-boolean-predicates-in-if': 'warn',
       },
     },
   ],
diff --git a/packages/twenty-chrome-extension/codegen.ts b/packages/twenty-chrome-extension/codegen.ts
new file mode 100644
index 000000000000..30ed008a0d04
--- /dev/null
+++ b/packages/twenty-chrome-extension/codegen.ts
@@ -0,0 +1,24 @@
+import { CodegenConfig } from '@graphql-codegen/cli';
+
+const config: CodegenConfig = {
+  schema: ['http://localhost:3000/graphql'],
+  overwrite: true,
+  documents: ['./src/**/*.ts', '!src/generated/**/*.*'],
+  generates: {
+    './src/generated/graphql.tsx': {
+      plugins: [
+        'typescript',
+        'typescript-operations',
+        'typescript-react-apollo',
+      ],
+      config: {
+        skipTypename: true,
+        withHooks: true,
+        withHOC: false,
+        withComponent: false,
+      },
+    },
+  },
+};
+
+export default config;
diff --git a/packages/twenty-chrome-extension/loading.html b/packages/twenty-chrome-extension/loading.html
new file mode 100644
index 000000000000..b286e663d641
--- /dev/null
+++ b/packages/twenty-chrome-extension/loading.html
@@ -0,0 +1,12 @@
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" href="/icons/android/android-launchericon-48-48.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Twenty</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/options/loading-index.tsx"></script>
+  </body>
+</html>
diff --git a/packages/twenty-chrome-extension/package.json b/packages/twenty-chrome-extension/package.json
index c5f359cab037..237c74a514ad 100644
--- a/packages/twenty-chrome-extension/package.json
+++ b/packages/twenty-chrome-extension/package.json
@@ -10,6 +10,7 @@
     "start": "yarn clean && vite",
     "build": "yarn clean && tsc && vite build",
     "lint": "eslint . --report-unused-disable-directives --max-warnings 0 --config .eslintrc.cjs",
+    "graphql:generate": "graphql-codegen",
     "fmt": "prettier --check \"src/**/*.ts\" \"src/**/*.tsx\"",
     "fmt:fix": "prettier --cache --write \"src/**/*.ts\" \"src/**/*.tsx\""
   },
diff --git a/packages/twenty-chrome-extension/public/light-noise.png b/packages/twenty-chrome-extension/public/light-noise.png
new file mode 100644
index 000000000000..d7b3bc2c064a
Binary files /dev/null and b/packages/twenty-chrome-extension/public/light-noise.png differ
diff --git a/packages/twenty-chrome-extension/src/background/index.ts b/packages/twenty-chrome-extension/src/background/index.ts
index 36f2a1179613..271224ee05eb 100644
--- a/packages/twenty-chrome-extension/src/background/index.ts
+++ b/packages/twenty-chrome-extension/src/background/index.ts
@@ -8,8 +8,8 @@ chrome.runtime.onInstalled.addListener((details) => {
 });
 
 // Open options page when extension icon is clicked.
-chrome.action.onClicked.addListener(() => {
-  openOptionsPage();
+chrome.action.onClicked.addListener((tab) => {
+  chrome.tabs.sendMessage(tab.id ?? 0, { action: 'TOGGLE' });
 });
 
 // This listens for an event from other parts of the extension, such as the content script, and performs the required tasks.
diff --git a/packages/twenty-chrome-extension/src/contentScript/createButton.ts b/packages/twenty-chrome-extension/src/contentScript/createButton.ts
index 990d4e4e8037..1fa9e9a3f154 100644
--- a/packages/twenty-chrome-extension/src/contentScript/createButton.ts
+++ b/packages/twenty-chrome-extension/src/contentScript/createButton.ts
@@ -1,42 +1,55 @@
-/* eslint-disable @nx/workspace-no-hardcoded-colors */
 const createNewButton = (
   text: string,
   onClickHandler: () => void,
-): HTMLButtonElement => {
-  const newButton: HTMLButtonElement = document.createElement('button');
-  newButton.textContent = text;
+): HTMLDivElement => {
+  const div = document.createElement('div');
+  const img = document.createElement('img');
+  const span = document.createElement('span');
+
+  span.textContent = text;
+  img.src =
+    'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAA7EAAAOxAGVKw4bAAACb0lEQVR4nO2VO4taQRTHr3AblbjxEVlwCwVhg7BoqqCIjy/gAyyFWNlYBOxsfH0KuxgQGwXRUkGuL2S7i1barGAgiwbdW93SnGOc4BonPiKahf3DwXFmuP/fPM4ZlvmlTxAhCBdzHnEQWYiv7Mr4C3NeuVYhQYDPzOUUQgDLBQGcLHNhvQK8DACPx8PTxiqVyvISG43GbyaT6Qfpn06n0m63e/tPAPF4vJ1MJu8kEsnWTCkWi1yr1RKGw+GDRqPBOTfr44vFQvD7/Q/lcpmaaVQAr9fLp1IpO22c47hGOBz+MB6PH+Vy+VYDAL8qlUoGtVotzOfzq4MAgsHgE/6KojiQyWR/bKVSqbSszHFM8Pl8z1YK48JsNltCOBwOnrYLO+8AAIjb+nHbycoTiUQfDJ7tFq4YAHiVSmXBxcD41u8flQU8z7fhzO0r83atVns3Go3u9Xr9x0O/RQXo9/tsIBBg6vX606a52Wz+bZ7P5/WwG29gxSJzhKgA6XTaDoFNF+krFAocmC//4yWEcSf2wTm7mCO19xFgSsKOLI16vV7b7XY7mRNoLwA0JymJ5uQIzgIAuX5PzDElT2m+E8BqtQ4ymcx7Yq7T6a6ZE4sKgOadTucaCwkxp1UzlEKh0GDxIXOwDWHAdi6Xe3swQDQa/Q7mywoolUpvsaptymazDWKxmBHTlWXZm405BFZoNpuGgwEmk4mE2SGtVivii4f1AO7J3ZopkQCQj7Ar1FeRChCJRJzVapX6DKNIfSc1Ax+wtQWQ55h6bH8FWDfYV4fO3wlwDr0C/BcADYiTPCxHqIEA2QsCZAkAKnRGkMbKN/sTX5YHPQ1e7SkAAAAASUVORK5CYII=';
+  img.height = 16;
+  img.width = 16;
+  img.alt = 'Twenty logo';
 
   // Write universal styles for the button
-  const buttonStyles = {
+  const divStyles = {
     border: '1px solid black',
     borderRadius: '20px',
     backgroundColor: 'black',
     color: 'white',
-    fontSize: '1.5rem',
     fontWeight: '600',
-    padding: '0.45em 1em',
-    width: '15rem',
+    fontSize: '1.5rem',
+    display: 'flex',
+    alignItems: 'center',
+    gap: '5px',
+    justifyContent: 'center',
+    padding: '0 1rem',
+    cursor: 'pointer',
     height: '32px',
   };
 
-  // Apply common styles to the button.
-  Object.assign(newButton.style, buttonStyles);
+  Object.assign(div.style, divStyles);
 
-  // Apply common styles to specifc states of a button.
-  newButton.addEventListener('mouseenter', () => {
-    const hoverStyles = {
-      backgroundColor: '#5e5e5e',
-      borderColor: '#5e5e5e',
-    };
-    Object.assign(newButton.style, hoverStyles);
-  });
+  // // Apply common styles to the button.
+  // Object.assign(buttonDiv.style, buttonDivStyles);
 
-  newButton.addEventListener('mouseleave', () => {
-    Object.assign(newButton.style, buttonStyles);
-  });
+  // // Apply common styles to specifc states of a button.
+  // newButton.addEventListener('mouseenter', () => {
+  //   const hoverStyles = {
+  //     backgroundColor: '#5e5e5e',
+  //     borderColor: '#5e5e5e',
+  //   };
+  //   Object.assign(newButton.style, hoverStyles);
+  // });
+
+  // newButton.addEventListener('mouseleave', () => {
+  //   Object.assign(newButton.style, buttonStyles);
+  // });
 
   // Handle the click event.
-  newButton.addEventListener('click', async () => {
+  div.addEventListener('click', async () => {
     const { apiKey } = await chrome.storage.local.get('apiKey');
 
     // If an api key is not set, the options page opens up to allow the user to configure an api key.
@@ -46,13 +59,16 @@ const createNewButton = (
     }
 
     // Update content during the resolution of the request.
-    newButton.textContent = 'Saving...';
+    span.textContent = 'Saving...';
 
     // Call the provided onClickHandler function to handle button click logic
     onClickHandler();
   });
 
-  return newButton;
+  div.appendChild(img);
+  div.appendChild(span);
+
+  return div;
 };
 
 export default createNewButton;
diff --git a/packages/twenty-chrome-extension/src/contentScript/extractCompanyProfile.ts b/packages/twenty-chrome-extension/src/contentScript/extractCompanyProfile.ts
index e2c972efa164..5096438a0557 100644
--- a/packages/twenty-chrome-extension/src/contentScript/extractCompanyProfile.ts
+++ b/packages/twenty-chrome-extension/src/contentScript/extractCompanyProfile.ts
@@ -1,10 +1,10 @@
 import createNewButton from '~/contentScript/createButton';
 import extractCompanyLinkedinLink from '~/contentScript/utils/extractCompanyLinkedinLink';
 import extractDomain from '~/contentScript/utils/extractDomain';
-import handleQueryParams from '~/utils/handleQueryParams';
-import requestDb from '~/utils/requestDb';
+import { createCompany, fetchCompany } from '~/db/company.db';
+import { CompanyInput } from '~/db/types/company.types';
 
-const insertButtonForCompany = (): void => {
+const insertButtonForCompany = async (): Promise<void> => {
   // Select the element in which to create the button.
   const parentDiv: HTMLDivElement | null = document.querySelector(
     '.org-top-card-primary-actions__inner',
@@ -12,94 +12,111 @@ const insertButtonForCompany = (): void => {
 
   // Create the button with desired callback funciton to execute upon click.
   if (parentDiv) {
-    const newButtonCompany: HTMLButtonElement = createNewButton(
-      'Add to Twenty',
-      async () => {
-        // Extract company-specific data from the DOM
-        const companyNameElement = document.querySelector(
-          '.org-top-card-summary__title',
-        );
-        const domainNameElement = document.querySelector(
-          '.org-top-card-primary-actions__inner a',
-        );
-        const addressElement = document.querySelectorAll(
-          '.org-top-card-summary-info-list__info-item',
-        )[1];
-        const employeesNumberElement = document.querySelectorAll(
-          '.org-top-card-summary-info-list__info-item',
-        )[3];
+    // Extract company-specific data from the DOM
+    const companyNameElement = document.querySelector(
+      '.org-top-card-summary__title',
+    );
+    const domainNameElement = document.querySelector(
+      '.org-top-card-primary-actions__inner a',
+    );
+    const addressElement = document.querySelectorAll(
+      '.org-top-card-summary-info-list__info-item',
+    )[1];
+    const employeesNumberElement = document.querySelectorAll(
+      '.org-top-card-summary-info-list__info-item',
+    )[3];
 
-        // Get the text content or other necessary data from the DOM elements
-        const companyName = companyNameElement
-          ? companyNameElement.getAttribute('title')
-          : '';
-        const domainName = extractDomain(
-          domainNameElement && domainNameElement.getAttribute('href'),
-        );
-        const address = addressElement
-          ? addressElement.textContent?.trim().replace(/\s+/g, ' ')
-          : '';
-        const employees = employeesNumberElement
-          ? Number(
-              employeesNumberElement.textContent
-                ?.trim()
-                .replace(/\s+/g, ' ')
-                .split('-')[0],
-            )
-          : 0;
+    // Get the text content or other necessary data from the DOM elements
+    const companyName = companyNameElement
+      ? companyNameElement.getAttribute('title')
+      : '';
+    const domainName = extractDomain(
+      domainNameElement && domainNameElement.getAttribute('href'),
+    );
+    const address = addressElement
+      ? addressElement.textContent?.trim().replace(/\s+/g, ' ')
+      : '';
+    const employees = employeesNumberElement
+      ? Number(
+          employeesNumberElement.textContent
+            ?.trim()
+            .replace(/\s+/g, ' ')
+            .split('-')[0],
+        )
+      : 0;
 
-        // Prepare company data to send to the backend
-        const companyData = {
-          name: companyName,
-          domainName: domainName,
-          address: address,
-          employees: employees,
-          linkedinLink: { url: '', label: '' },
-        };
+    // Prepare company data to send to the backend
+    const companyInputData: CompanyInput = {
+      name: companyName ?? '',
+      domainName: domainName,
+      address: address ?? '',
+      employees: employees,
+    };
 
-        // Extract active tab url using chrome API - an event is triggered here and is caught by background script.
-        const { url: activeTabUrl } = await chrome.runtime.sendMessage({
-          action: 'getActiveTabUrl',
-        });
+    // Extract active tab url using chrome API - an event is triggered here and is caught by background script.
+    const { url: activeTabUrl } = await chrome.runtime.sendMessage({
+      action: 'getActiveTabUrl',
+    });
 
-        // Convert URLs like https://www.linkedin.com/company/twenty/about/ to https://www.linkedin.com/company/twenty
-        const companyURL = extractCompanyLinkedinLink(activeTabUrl);
-        companyData.linkedinLink = { url: companyURL, label: companyURL };
+    // Convert URLs like https://www.linkedin.com/company/twenty/about/ to https://www.linkedin.com/company/twenty
+    const companyURL = extractCompanyLinkedinLink(activeTabUrl);
+    companyInputData.linkedinLink = { url: companyURL, label: companyURL };
 
-        const query = `mutation CreateOneCompany { createCompany(data:{${handleQueryParams(
-          companyData,
-        )}}) {id} }`;
+    const company = await fetchCompany({
+      linkedinLink: {
+        url: { eq: companyURL },
+        label: { eq: companyURL },
+      },
+    });
+    if (company) {
+      const savedCompany: HTMLDivElement = createNewButton(
+        'Saved',
+        async () => {},
+      );
+      // Include the button in the DOM.
+      parentDiv.prepend(savedCompany);
 
-        const response = await requestDb(query);
+      // Write button specific styles here - common ones can be found in createButton.ts.
+      const buttonSpecificStyles = {
+        alignSelf: 'end',
+      };
 
-        if (response.data) {
-          newButtonCompany.textContent = 'Saved';
-          newButtonCompany.setAttribute('disabled', 'true');
+      Object.assign(savedCompany.style, buttonSpecificStyles);
+    } else {
+      const newButtonCompany: HTMLDivElement = createNewButton(
+        'Add to Twenty',
+        async () => {
+          const response = await createCompany(companyInputData);
 
-          // Button specific styles once the button is unclickable after successfully sending data to server.
-          newButtonCompany.addEventListener('mouseenter', () => {
-            const hoverStyles = {
-              backgroundColor: 'black',
-              borderColor: 'black',
-              cursor: 'default',
-            };
-            Object.assign(newButtonCompany.style, hoverStyles);
-          });
-        } else {
-          newButtonCompany.textContent = 'Try Again';
-        }
-      },
-    );
+          if (response) {
+            newButtonCompany.textContent = 'Saved';
+            newButtonCompany.setAttribute('disabled', 'true');
 
-    // Include the button in the DOM.
-    parentDiv.prepend(newButtonCompany);
+            // Button specific styles once the button is unclickable after successfully sending data to server.
+            newButtonCompany.addEventListener('mouseenter', () => {
+              const hoverStyles = {
+                backgroundColor: 'black',
+                borderColor: 'black',
+                cursor: 'default',
+              };
+              Object.assign(newButtonCompany.style, hoverStyles);
+            });
+          } else {
+            newButtonCompany.textContent = 'Try Again';
+          }
+        },
+      );
 
-    // Write button specific styles here - common ones can be found in createButton.ts.
-    const buttonSpecificStyles = {
-      alignSelf: 'end',
-    };
+      // Include the button in the DOM.
+      parentDiv.prepend(newButtonCompany);
+
+      // Write button specific styles here - common ones can be found in createButton.ts.
+      const buttonSpecificStyles = {
+        alignSelf: 'end',
+      };
 
-    Object.assign(newButtonCompany.style, buttonSpecificStyles);
+      Object.assign(newButtonCompany.style, buttonSpecificStyles);
+    }
   }
 };
 
diff --git a/packages/twenty-chrome-extension/src/contentScript/extractPersonProfile.ts b/packages/twenty-chrome-extension/src/contentScript/extractPersonProfile.ts
index 4ddc1d06f3bb..2d5076dfa30a 100644
--- a/packages/twenty-chrome-extension/src/contentScript/extractPersonProfile.ts
+++ b/packages/twenty-chrome-extension/src/contentScript/extractPersonProfile.ts
@@ -1,9 +1,9 @@
 import createNewButton from '~/contentScript/createButton';
 import extractFirstAndLastName from '~/contentScript/utils/extractFirstAndLastName';
-import handleQueryParams from '~/utils/handleQueryParams';
-import requestDb from '~/utils/requestDb';
+import { createPerson, fetchPerson } from '~/db/person.db';
+import { PersonInput } from '~/db/types/person.types';
 
-const insertButtonForPerson = (): void => {
+const insertButtonForPerson = async (): Promise<void> => {
   // Select the element in which to create the button.
   const parentDiv: HTMLDivElement | null = document.querySelector(
     '.pv-top-card-v2-ctas',
@@ -11,108 +11,116 @@ const insertButtonForPerson = (): void => {
 
   // Create the button with desired callback funciton to execute upon click.
   if (parentDiv) {
-    const newButtonPerson: HTMLButtonElement = createNewButton(
-      'Add to Twenty',
-      async () => {
-        // Extract person-specific data from the DOM.
-        const personNameElement = document.querySelector(
-          '.text-heading-xlarge',
-        );
-
-        const separatorElement = document.querySelector(
-          '.pv-text-details__separator',
-        );
-        const personCityElement = separatorElement?.previousElementSibling;
-
-        const profilePictureElement = document.querySelector(
-          '.pv-top-card-profile-picture__image',
-        );
-
-        const firstListItem = document.querySelector(
-          'div[data-view-name="profile-component-entity"]',
-        );
-        const secondDivElement =
-          firstListItem?.querySelector('div:nth-child(2)');
-        const ariaHiddenSpan = secondDivElement?.querySelector(
-          'span[aria-hidden="true"]',
-        );
-
-        // Get the text content or other necessary data from the DOM elements.
-        const personName = personNameElement
-          ? personNameElement.textContent
-          : '';
-        const personCity = personCityElement
-          ? personCityElement.textContent
-              ?.trim()
-              .replace(/\s+/g, ' ')
-              .split(',')[0]
-          : '';
-        const profilePicture = profilePictureElement
-          ? profilePictureElement?.getAttribute('src')
-          : '';
-        const jobTitle = ariaHiddenSpan
-          ? ariaHiddenSpan.textContent?.trim()
-          : '';
-
-        const { firstName, lastName } = extractFirstAndLastName(
-          String(personName),
-        );
-
-        // Prepare person data to send to the backend.
-        const personData = {
-          name: { firstName, lastName },
-          city: personCity,
-          avatarUrl: profilePicture,
-          jobTitle,
-          linkedinLink: { url: '', label: '' },
-        };
-
-        // Extract active tab url using chrome API - an event is triggered here and is caught by background script.
-        let { url: activeTabUrl } = await chrome.runtime.sendMessage({
-          action: 'getActiveTabUrl',
-        });
-
-        // Remove last slash from the URL for consistency when saving usernames.
-        if (activeTabUrl.endsWith('/')) {
-          activeTabUrl = activeTabUrl.slice(0, -1);
-        }
-
-        personData.linkedinLink = { url: activeTabUrl, label: activeTabUrl };
-
-        const query = `mutation CreateOnePerson { createPerson(data:{${handleQueryParams(
-          personData,
-        )}}) {id} }`;
-
-        const response = await requestDb(query);
-
-        if (response.data) {
-          newButtonPerson.textContent = 'Saved';
-          newButtonPerson.setAttribute('disabled', 'true');
-
-          // Button specific styles once the button is unclickable after successfully sending data to server.
-          newButtonPerson.addEventListener('mouseenter', () => {
-            const hoverStyles = {
-              backgroundColor: 'black',
-              borderColor: 'black',
-              cursor: 'default',
-            };
-            Object.assign(newButtonPerson.style, hoverStyles);
-          });
-        } else {
-          newButtonPerson.textContent = 'Try Again';
-        }
-      },
+    // Extract person-specific data from the DOM.
+    const personNameElement = document.querySelector('.text-heading-xlarge');
+
+    const separatorElement = document.querySelector(
+      '.pv-text-details__separator',
     );
+    const personCityElement = separatorElement?.previousElementSibling;
 
-    // Include the button in the DOM.
-    parentDiv.prepend(newButtonPerson);
+    const profilePictureElement = document.querySelector(
+      '.pv-top-card-profile-picture__image',
+    );
+
+    const firstListItem = document.querySelector(
+      'div[data-view-name="profile-component-entity"]',
+    );
+    const secondDivElement = firstListItem?.querySelector('div:nth-child(2)');
+    const ariaHiddenSpan = secondDivElement?.querySelector(
+      'span[aria-hidden="true"]',
+    );
 
-    // Write button specific styles here - common ones can be found in createButton.ts.
-    const buttonSpecificStyles = {
-      marginRight: '0.5em',
+    // Get the text content or other necessary data from the DOM elements.
+    const personName = personNameElement ? personNameElement.textContent : '';
+    const personCity = personCityElement
+      ? personCityElement.textContent?.trim().replace(/\s+/g, ' ').split(',')[0]
+      : '';
+    const profilePicture = profilePictureElement
+      ? profilePictureElement?.getAttribute('src')
+      : '';
+    const jobTitle = ariaHiddenSpan ? ariaHiddenSpan.textContent?.trim() : '';
+
+    const { firstName, lastName } = extractFirstAndLastName(String(personName));
+
+    // Prepare person data to send to the backend.
+    const personData: PersonInput = {
+      name: { firstName, lastName },
+      city: personCity ?? '',
+      avatarUrl: profilePicture ?? '',
+      jobTitle: jobTitle ?? '',
+      linkedinLink: { url: '', label: '' },
     };
 
-    Object.assign(newButtonPerson.style, buttonSpecificStyles);
+    // Extract active tab url using chrome API - an event is triggered here and is caught by background script.
+    let { url: activeTabUrl } = await chrome.runtime.sendMessage({
+      action: 'getActiveTabUrl',
+    });
+
+    // Remove last slash from the URL for consistency when saving usernames.
+    if (activeTabUrl.endsWith('/')) {
+      activeTabUrl = activeTabUrl.slice(0, -1);
+    }
+
+    personData.linkedinLink = { url: activeTabUrl, label: activeTabUrl };
+
+    const person = await fetchPerson({
+      name: {
+        firstName: { eq: firstName },
+        lastName: { eq: lastName },
+      },
+      linkedinLink: { url: { eq: activeTabUrl }, label: { eq: activeTabUrl } },
+    });
+
+    if (person) {
+      const savedPerson: HTMLDivElement = createNewButton(
+        'Saved',
+        async () => {},
+      );
+
+      // Include the button in the DOM.
+      parentDiv.prepend(savedPerson);
+
+      // Write button specific styles here - common ones can be found in createButton.ts.
+      const buttonSpecificStyles = {
+        marginRight: '0.5em',
+      };
+
+      Object.assign(savedPerson.style, buttonSpecificStyles);
+    } else {
+      const newButtonPerson: HTMLDivElement = createNewButton(
+        'Add to Twenty',
+        async () => {
+          const response = await createPerson(personData);
+          if (response) {
+            newButtonPerson.textContent = 'Saved';
+            newButtonPerson.setAttribute('disabled', 'true');
+
+            // Button specific styles once the button is unclickable after successfully sending data to server.
+            newButtonPerson.addEventListener('mouseenter', () => {
+              const hoverStyles = {
+                backgroundColor: 'black',
+                borderColor: 'black',
+                cursor: 'default',
+              };
+              Object.assign(newButtonPerson.style, hoverStyles);
+            });
+          } else {
+            newButtonPerson.textContent = 'Try Again';
+          }
+        },
+      );
+
+      // Include the button in the DOM.
+      parentDiv.prepend(newButtonPerson);
+
+      // Write button specific styles here - common ones can be found in createButton.ts.
+      const buttonSpecificStyles = {
+        marginRight: '0.5em',
+      };
+
+      Object.assign(newButtonPerson.style, buttonSpecificStyles);
+    }
   }
 };
 
diff --git a/packages/twenty-chrome-extension/src/contentScript/index.ts b/packages/twenty-chrome-extension/src/contentScript/index.ts
index a541e0144c39..2cf8d378e85b 100644
--- a/packages/twenty-chrome-extension/src/contentScript/index.ts
+++ b/packages/twenty-chrome-extension/src/contentScript/index.ts
@@ -3,18 +3,68 @@ import insertButtonForPerson from '~/contentScript/extractPersonProfile';
 
 // Inject buttons into the DOM when SPA is reloaded on the resource url.
 // e.g. reload the page when on https://www.linkedin.com/in/mabdullahabaid/
-insertButtonForCompany();
-insertButtonForPerson();
+await insertButtonForCompany();
+await insertButtonForPerson();
 
 // The content script gets executed upon load, so the the content script is executed when a user visits https://www.linkedin.com/feed/.
 // However, there would never be another reload in a single page application unless triggered manually.
 // Therefore, if the user navigates to a person or a company page, we must manually re-execute the content script to create the "Add to Twenty" button.
 // e.g. create "Add to Twenty" button when a user navigates to https://www.linkedin.com/in/mabdullahabaid/ from https://www.linkedin.com/feed/
-chrome.runtime.onMessage.addListener((message, _, sendResponse) => {
+chrome.runtime.onMessage.addListener(async (message, _, sendResponse) => {
   if (message.action === 'executeContentScript') {
-    insertButtonForCompany();
-    insertButtonForPerson();
+    await insertButtonForCompany();
+    await insertButtonForPerson();
+  }
+
+  if (message.action === 'TOGGLE') {
+    toggle();
   }
 
   sendResponse('Executing!');
 });
+
+const createIframe = () => {
+  const iframe = document.createElement('iframe');
+  iframe.style.background = 'lightgrey';
+  iframe.style.height = '100vh';
+  iframe.style.width = '400px';
+  iframe.style.position = 'fixed';
+  iframe.style.top = '0px';
+  iframe.style.right = '-400px';
+  iframe.style.zIndex = '9000000000000000000';
+  iframe.style.transition = 'ease-in-out 0.3s';
+  return iframe;
+};
+
+const handleContentIframeLoadComplete = () => {
+  //If the pop-out window is already open then we replace loading iframe with our content iframe
+  if (loadingIframe.style.right === '0px') contentIframe.style.right = '0px';
+  loadingIframe.style.display = 'none';
+  contentIframe.style.display = 'block';
+};
+
+//Creating one iframe where we are loading our front end in the background
+const contentIframe = createIframe();
+contentIframe.style.display = 'none';
+contentIframe.src = `${import.meta.env.VITE_FRONT_BASE_URL}`;
+contentIframe.onload = handleContentIframeLoadComplete;
+
+//Creating this iframe to show as a loading state until the above iframe loads completely
+const loadingIframe = createIframe();
+loadingIframe.src = chrome.runtime.getURL('loading.html');
+
+document.body.appendChild(loadingIframe);
+document.body.appendChild(contentIframe);
+
+const toggleIframe = (iframe: HTMLIFrameElement) => {
+  if (iframe.style.right === '-400px' && iframe.style.display !== 'none') {
+    iframe.style.right = '0px';
+  } else if (iframe.style.right === '0px' && iframe.style.display !== 'none') {
+    iframe.style.right = '-400px';
+  }
+};
+
+const toggle = () => {
+  toggleIframe(loadingIframe);
+  toggleIframe(contentIframe);
+};
diff --git a/packages/twenty-chrome-extension/src/db/company.db.ts b/packages/twenty-chrome-extension/src/db/company.db.ts
new file mode 100644
index 000000000000..f0936e1b4ef9
--- /dev/null
+++ b/packages/twenty-chrome-extension/src/db/company.db.ts
@@ -0,0 +1,38 @@
+import {
+  CompanyInput,
+  CreateCompanyResponse,
+  FindCompanyResponse,
+} from '~/db/types/company.types';
+import { Company, CompanyFilterInput } from '~/generated/graphql';
+import { CREATE_COMPANY } from '~/graphql/company/mutations';
+import { FIND_COMPANY } from '~/graphql/company/queries';
+
+import { callMutation, callQuery } from '../utils/requestDb';
+
+export const fetchCompany = async (
+  companyfilerInput: CompanyFilterInput,
+): Promise<Company | null> => {
+  const data = await callQuery<FindCompanyResponse>(FIND_COMPANY, {
+    filter: {
+      ...companyfilerInput,
+    },
+  });
+  if (data?.companies.edges) {
+    return data?.companies.edges.length > 0
+      ? data?.companies.edges[0].node
+      : null;
+  }
+  return null;
+};
+
+export const createCompany = async (
+  company: CompanyInput,
+): Promise<string | null> => {
+  const data = await callMutation<CreateCompanyResponse>(CREATE_COMPANY, {
+    input: company,
+  });
+  if (data) {
+    return data.createCompany.id;
+  }
+  return null;
+};
diff --git a/packages/twenty-chrome-extension/src/db/person.db.ts b/packages/twenty-chrome-extension/src/db/person.db.ts
new file mode 100644
index 000000000000..29c782b3879e
--- /dev/null
+++ b/packages/twenty-chrome-extension/src/db/person.db.ts
@@ -0,0 +1,36 @@
+import {
+  CreatePersonResponse,
+  FindPersonResponse,
+  PersonInput,
+} from '~/db/types/person.types';
+import { Person, PersonFilterInput } from '~/generated/graphql';
+import { CREATE_PERSON } from '~/graphql/person/mutations';
+import { FIND_PERSON } from '~/graphql/person/queries';
+
+import { callMutation, callQuery } from '../utils/requestDb';
+
+export const fetchPerson = async (
+  personFilterData: PersonFilterInput,
+): Promise<Person | null> => {
+  const data = await callQuery<FindPersonResponse>(FIND_PERSON, {
+    filter: {
+      ...personFilterData,
+    },
+  });
+  if (data?.people.edges) {
+    return data?.people.edges.length > 0 ? data?.people.edges[0].node : null;
+  }
+  return null;
+};
+
+export const createPerson = async (
+  person: PersonInput,
+): Promise<string | null> => {
+  const data = await callMutation<CreatePersonResponse>(CREATE_PERSON, {
+    input: person,
+  });
+  if (data?.createPerson) {
+    return data.createPerson.id;
+  }
+  return null;
+};
diff --git a/packages/twenty-chrome-extension/src/db/types/company.types.ts b/packages/twenty-chrome-extension/src/db/types/company.types.ts
new file mode 100644
index 000000000000..f6c1241652fb
--- /dev/null
+++ b/packages/twenty-chrome-extension/src/db/types/company.types.ts
@@ -0,0 +1,10 @@
+import { Company, CompanyConnection } from '~/generated/graphql';
+
+export type CompanyInput = Pick<
+  Company,
+  'name' | 'domainName' | 'address' | 'employees' | 'linkedinLink'
+>;
+export type FindCompanyResponse = {
+  companies: Pick<CompanyConnection, 'edges'>;
+};
+export type CreateCompanyResponse = { createCompany: { id: string } };
diff --git a/packages/twenty-chrome-extension/src/db/types/person.types.ts b/packages/twenty-chrome-extension/src/db/types/person.types.ts
new file mode 100644
index 000000000000..914240eb144e
--- /dev/null
+++ b/packages/twenty-chrome-extension/src/db/types/person.types.ts
@@ -0,0 +1,8 @@
+import { Person, PersonConnection } from '~/generated/graphql';
+
+export type PersonInput = Pick<
+  Person,
+  'name' | 'city' | 'avatarUrl' | 'jobTitle' | 'linkedinLink'
+>;
+export type FindPersonResponse = { people: Pick<PersonConnection, 'edges'> };
+export type CreatePersonResponse = { createPerson: { id: string } };
diff --git a/packages/twenty-chrome-extension/src/generated/graphql.tsx b/packages/twenty-chrome-extension/src/generated/graphql.tsx
new file mode 100644
index 000000000000..f48e6ba5dd4b
--- /dev/null
+++ b/packages/twenty-chrome-extension/src/generated/graphql.tsx
@@ -0,0 +1,5632 @@
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+export type Maybe<T> = T | null;
+export type InputMaybe<T> = Maybe<T>;
+export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
+const defaultOptions = {} as const;
+/** All built-in and custom scalars, mapped to their actual values */
+export type Scalars = {
+  ID: string;
+  String: string;
+  Boolean: boolean;
+  Int: number;
+  Float: number;
+  BigFloat: any;
+  ConnectionCursor: any;
+  Cursor: any;
+  Date: any;
+  DateTime: any;
+  JSON: any;
+  UUID: any;
+  Upload: any;
+};
+
+export type ActivateWorkspaceInput = {
+  displayName?: InputMaybe<Scalars['String']>;
+};
+
+/** An activity */
+export type Activity = {
+  /** Activity targets */
+  activityTargets?: Maybe<ActivityTargetConnection>;
+  /** Acitivity assignee */
+  assignee?: Maybe<WorkspaceMember>;
+  /** Acitivity assignee id foreign key */
+  assigneeId?: Maybe<Scalars['ID']>;
+  /** Activity attachments */
+  attachments?: Maybe<AttachmentConnection>;
+  /** Activity author */
+  author?: Maybe<WorkspaceMember>;
+  /** Activity author id foreign key */
+  authorId: Scalars['ID'];
+  /** Activity body */
+  body: Scalars['String'];
+  /** Activity comments */
+  comments?: Maybe<CommentConnection>;
+  /** Activity completion date */
+  completedAt?: Maybe<Scalars['DateTime']>;
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  /** Activity due date */
+  dueAt?: Maybe<Scalars['DateTime']>;
+  id: Scalars['ID'];
+  /** Activity reminder date */
+  reminderAt?: Maybe<Scalars['DateTime']>;
+  /** Activity title */
+  title: Scalars['String'];
+  /** Activity type */
+  type: Scalars['String'];
+  updatedAt: Scalars['DateTime'];
+};
+
+
+/** An activity */
+export type ActivityActivityTargetsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ActivityTargetFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ActivityTargetOrderByInput>;
+};
+
+
+/** An activity */
+export type ActivityAttachmentsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<AttachmentFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<AttachmentOrderByInput>;
+};
+
+
+/** An activity */
+export type ActivityCommentsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<CommentFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<CommentOrderByInput>;
+};
+
+/** An activity */
+export type ActivityConnection = {
+  edges: Array<ActivityEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** An activity */
+export type ActivityCreateInput = {
+  /** Acitivity assignee id foreign key */
+  assigneeId?: InputMaybe<Scalars['ID']>;
+  /** Activity author id foreign key */
+  authorId: Scalars['ID'];
+  /** Activity body */
+  body?: InputMaybe<Scalars['String']>;
+  /** Activity completion date */
+  completedAt?: InputMaybe<Scalars['DateTime']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Activity due date */
+  dueAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Activity reminder date */
+  reminderAt?: InputMaybe<Scalars['DateTime']>;
+  /** Activity title */
+  title?: InputMaybe<Scalars['String']>;
+  /** Activity type */
+  type?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** An activity */
+export type ActivityEdge = {
+  cursor: Scalars['Cursor'];
+  node: Activity;
+};
+
+/** An activity */
+export type ActivityFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<ActivityFilterInput>>>;
+  /** Acitivity assignee id foreign key */
+  assigneeId?: InputMaybe<UuidFilter>;
+  /** Activity author id foreign key */
+  authorId?: InputMaybe<UuidFilter>;
+  /** Activity body */
+  body?: InputMaybe<StringFilter>;
+  /** Activity completion date */
+  completedAt?: InputMaybe<DateFilter>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  /** Activity due date */
+  dueAt?: InputMaybe<DateFilter>;
+  id?: InputMaybe<UuidFilter>;
+  not?: InputMaybe<ActivityFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<ActivityFilterInput>>>;
+  /** Activity reminder date */
+  reminderAt?: InputMaybe<DateFilter>;
+  /** Activity title */
+  title?: InputMaybe<StringFilter>;
+  /** Activity type */
+  type?: InputMaybe<StringFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+};
+
+/** An activity */
+export type ActivityOrderByInput = {
+  /** Acitivity assignee id foreign key */
+  assigneeId?: InputMaybe<OrderByDirection>;
+  /** Activity author id foreign key */
+  authorId?: InputMaybe<OrderByDirection>;
+  /** Activity body */
+  body?: InputMaybe<OrderByDirection>;
+  /** Activity completion date */
+  completedAt?: InputMaybe<OrderByDirection>;
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  /** Activity due date */
+  dueAt?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** Activity reminder date */
+  reminderAt?: InputMaybe<OrderByDirection>;
+  /** Activity title */
+  title?: InputMaybe<OrderByDirection>;
+  /** Activity type */
+  type?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+};
+
+/** An activity target */
+export type ActivityTarget = {
+  /** ActivityTarget activity */
+  activity?: Maybe<Activity>;
+  /** ActivityTarget activity id foreign key */
+  activityId?: Maybe<Scalars['ID']>;
+  /** ActivityTarget company */
+  company?: Maybe<Company>;
+  /** ActivityTarget company id foreign key */
+  companyId?: Maybe<Scalars['ID']>;
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  id: Scalars['ID'];
+  /** ActivityTarget opportunity */
+  opportunity?: Maybe<Opportunity>;
+  /** ActivityTarget opportunity id foreign key */
+  opportunityId?: Maybe<Scalars['ID']>;
+  /** ActivityTarget person */
+  person?: Maybe<Person>;
+  /** ActivityTarget person id foreign key */
+  personId?: Maybe<Scalars['ID']>;
+  updatedAt: Scalars['DateTime'];
+};
+
+/** An activity target */
+export type ActivityTargetConnection = {
+  edges: Array<ActivityTargetEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** An activity target */
+export type ActivityTargetCreateInput = {
+  /** ActivityTarget activity id foreign key */
+  activityId?: InputMaybe<Scalars['ID']>;
+  /** ActivityTarget company id foreign key */
+  companyId?: InputMaybe<Scalars['ID']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** ActivityTarget opportunity id foreign key */
+  opportunityId?: InputMaybe<Scalars['ID']>;
+  /** ActivityTarget person id foreign key */
+  personId?: InputMaybe<Scalars['ID']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** An activity target */
+export type ActivityTargetEdge = {
+  cursor: Scalars['Cursor'];
+  node: ActivityTarget;
+};
+
+/** An activity target */
+export type ActivityTargetFilterInput = {
+  /** ActivityTarget activity id foreign key */
+  activityId?: InputMaybe<UuidFilter>;
+  and?: InputMaybe<Array<InputMaybe<ActivityTargetFilterInput>>>;
+  /** ActivityTarget company id foreign key */
+  companyId?: InputMaybe<UuidFilter>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  id?: InputMaybe<UuidFilter>;
+  not?: InputMaybe<ActivityTargetFilterInput>;
+  /** ActivityTarget opportunity id foreign key */
+  opportunityId?: InputMaybe<UuidFilter>;
+  or?: InputMaybe<Array<InputMaybe<ActivityTargetFilterInput>>>;
+  /** ActivityTarget person id foreign key */
+  personId?: InputMaybe<UuidFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+};
+
+/** An activity target */
+export type ActivityTargetOrderByInput = {
+  /** ActivityTarget activity id foreign key */
+  activityId?: InputMaybe<OrderByDirection>;
+  /** ActivityTarget company id foreign key */
+  companyId?: InputMaybe<OrderByDirection>;
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** ActivityTarget opportunity id foreign key */
+  opportunityId?: InputMaybe<OrderByDirection>;
+  /** ActivityTarget person id foreign key */
+  personId?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+};
+
+/** An activity target */
+export type ActivityTargetUpdateInput = {
+  /** ActivityTarget activity id foreign key */
+  activityId?: InputMaybe<Scalars['ID']>;
+  /** ActivityTarget company id foreign key */
+  companyId?: InputMaybe<Scalars['ID']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** ActivityTarget opportunity id foreign key */
+  opportunityId?: InputMaybe<Scalars['ID']>;
+  /** ActivityTarget person id foreign key */
+  personId?: InputMaybe<Scalars['ID']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** An activity */
+export type ActivityUpdateInput = {
+  /** Acitivity assignee id foreign key */
+  assigneeId?: InputMaybe<Scalars['ID']>;
+  /** Activity author id foreign key */
+  authorId?: InputMaybe<Scalars['ID']>;
+  /** Activity body */
+  body?: InputMaybe<Scalars['String']>;
+  /** Activity completion date */
+  completedAt?: InputMaybe<Scalars['DateTime']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Activity due date */
+  dueAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Activity reminder date */
+  reminderAt?: InputMaybe<Scalars['DateTime']>;
+  /** Activity title */
+  title?: InputMaybe<Scalars['String']>;
+  /** Activity type */
+  type?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+export type Analytics = {
+  /** Boolean that confirms query was dispatched */
+  success: Scalars['Boolean'];
+};
+
+/** An api key */
+export type ApiKey = {
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  /** ApiKey expiration date */
+  expiresAt: Scalars['DateTime'];
+  id: Scalars['ID'];
+  /** ApiKey name */
+  name: Scalars['String'];
+  /** ApiKey revocation date */
+  revokedAt?: Maybe<Scalars['DateTime']>;
+  updatedAt: Scalars['DateTime'];
+};
+
+/** An api key */
+export type ApiKeyConnection = {
+  edges: Array<ApiKeyEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** An api key */
+export type ApiKeyCreateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** ApiKey expiration date */
+  expiresAt: Scalars['DateTime'];
+  id?: InputMaybe<Scalars['ID']>;
+  /** ApiKey name */
+  name?: InputMaybe<Scalars['String']>;
+  /** ApiKey revocation date */
+  revokedAt?: InputMaybe<Scalars['DateTime']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** An api key */
+export type ApiKeyEdge = {
+  cursor: Scalars['Cursor'];
+  node: ApiKey;
+};
+
+/** An api key */
+export type ApiKeyFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<ApiKeyFilterInput>>>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  /** ApiKey expiration date */
+  expiresAt?: InputMaybe<DateFilter>;
+  id?: InputMaybe<UuidFilter>;
+  /** ApiKey name */
+  name?: InputMaybe<StringFilter>;
+  not?: InputMaybe<ApiKeyFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<ApiKeyFilterInput>>>;
+  /** ApiKey revocation date */
+  revokedAt?: InputMaybe<DateFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+};
+
+/** An api key */
+export type ApiKeyOrderByInput = {
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  /** ApiKey expiration date */
+  expiresAt?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** ApiKey name */
+  name?: InputMaybe<OrderByDirection>;
+  /** ApiKey revocation date */
+  revokedAt?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+};
+
+export type ApiKeyToken = {
+  token: Scalars['String'];
+};
+
+/** An api key */
+export type ApiKeyUpdateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** ApiKey expiration date */
+  expiresAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** ApiKey name */
+  name?: InputMaybe<Scalars['String']>;
+  /** ApiKey revocation date */
+  revokedAt?: InputMaybe<Scalars['DateTime']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** An attachment */
+export type Attachment = {
+  /** Attachment activity */
+  activity?: Maybe<Activity>;
+  /** Attachment activity id foreign key */
+  activityId?: Maybe<Scalars['ID']>;
+  /** Attachment author */
+  author?: Maybe<WorkspaceMember>;
+  /** Attachment author id foreign key */
+  authorId: Scalars['ID'];
+  /** Attachment company */
+  company?: Maybe<Company>;
+  /** Attachment company id foreign key */
+  companyId?: Maybe<Scalars['ID']>;
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  /** Attachment full path */
+  fullPath: Scalars['String'];
+  id: Scalars['ID'];
+  /** Attachment name */
+  name: Scalars['String'];
+  /** Attachment opportunity */
+  opportunity?: Maybe<Opportunity>;
+  /** Attachment opportunity id foreign key */
+  opportunityId?: Maybe<Scalars['ID']>;
+  /** Attachment person */
+  person?: Maybe<Person>;
+  /** Attachment person id foreign key */
+  personId?: Maybe<Scalars['ID']>;
+  /** Attachment type */
+  type: Scalars['String'];
+  updatedAt: Scalars['DateTime'];
+};
+
+/** An attachment */
+export type AttachmentConnection = {
+  edges: Array<AttachmentEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** An attachment */
+export type AttachmentCreateInput = {
+  /** Attachment activity id foreign key */
+  activityId?: InputMaybe<Scalars['ID']>;
+  /** Attachment author id foreign key */
+  authorId: Scalars['ID'];
+  /** Attachment company id foreign key */
+  companyId?: InputMaybe<Scalars['ID']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Attachment full path */
+  fullPath?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Attachment name */
+  name?: InputMaybe<Scalars['String']>;
+  /** Attachment opportunity id foreign key */
+  opportunityId?: InputMaybe<Scalars['ID']>;
+  /** Attachment person id foreign key */
+  personId?: InputMaybe<Scalars['ID']>;
+  /** Attachment type */
+  type?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** An attachment */
+export type AttachmentEdge = {
+  cursor: Scalars['Cursor'];
+  node: Attachment;
+};
+
+/** An attachment */
+export type AttachmentFilterInput = {
+  /** Attachment activity id foreign key */
+  activityId?: InputMaybe<UuidFilter>;
+  and?: InputMaybe<Array<InputMaybe<AttachmentFilterInput>>>;
+  /** Attachment author id foreign key */
+  authorId?: InputMaybe<UuidFilter>;
+  /** Attachment company id foreign key */
+  companyId?: InputMaybe<UuidFilter>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  /** Attachment full path */
+  fullPath?: InputMaybe<StringFilter>;
+  id?: InputMaybe<UuidFilter>;
+  /** Attachment name */
+  name?: InputMaybe<StringFilter>;
+  not?: InputMaybe<AttachmentFilterInput>;
+  /** Attachment opportunity id foreign key */
+  opportunityId?: InputMaybe<UuidFilter>;
+  or?: InputMaybe<Array<InputMaybe<AttachmentFilterInput>>>;
+  /** Attachment person id foreign key */
+  personId?: InputMaybe<UuidFilter>;
+  /** Attachment type */
+  type?: InputMaybe<StringFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+};
+
+/** An attachment */
+export type AttachmentOrderByInput = {
+  /** Attachment activity id foreign key */
+  activityId?: InputMaybe<OrderByDirection>;
+  /** Attachment author id foreign key */
+  authorId?: InputMaybe<OrderByDirection>;
+  /** Attachment company id foreign key */
+  companyId?: InputMaybe<OrderByDirection>;
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  /** Attachment full path */
+  fullPath?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** Attachment name */
+  name?: InputMaybe<OrderByDirection>;
+  /** Attachment opportunity id foreign key */
+  opportunityId?: InputMaybe<OrderByDirection>;
+  /** Attachment person id foreign key */
+  personId?: InputMaybe<OrderByDirection>;
+  /** Attachment type */
+  type?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+};
+
+/** An attachment */
+export type AttachmentUpdateInput = {
+  /** Attachment activity id foreign key */
+  activityId?: InputMaybe<Scalars['ID']>;
+  /** Attachment author id foreign key */
+  authorId?: InputMaybe<Scalars['ID']>;
+  /** Attachment company id foreign key */
+  companyId?: InputMaybe<Scalars['ID']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Attachment full path */
+  fullPath?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Attachment name */
+  name?: InputMaybe<Scalars['String']>;
+  /** Attachment opportunity id foreign key */
+  opportunityId?: InputMaybe<Scalars['ID']>;
+  /** Attachment person id foreign key */
+  personId?: InputMaybe<Scalars['ID']>;
+  /** Attachment type */
+  type?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+export type AuthProviders = {
+  google: Scalars['Boolean'];
+  magicLink: Scalars['Boolean'];
+  password: Scalars['Boolean'];
+};
+
+export type AuthToken = {
+  expiresAt: Scalars['DateTime'];
+  token: Scalars['String'];
+};
+
+export type AuthTokenPair = {
+  accessToken: AuthToken;
+  refreshToken: AuthToken;
+};
+
+export type AuthTokens = {
+  tokens: AuthTokenPair;
+};
+
+export type BigFloatFilter = {
+  eq?: InputMaybe<Scalars['BigFloat']>;
+  gt?: InputMaybe<Scalars['BigFloat']>;
+  gte?: InputMaybe<Scalars['BigFloat']>;
+  in?: InputMaybe<Array<Scalars['BigFloat']>>;
+  is?: InputMaybe<FilterIs>;
+  lt?: InputMaybe<Scalars['BigFloat']>;
+  lte?: InputMaybe<Scalars['BigFloat']>;
+  neq?: InputMaybe<Scalars['BigFloat']>;
+};
+
+export type Billing = {
+  billingFreeTrialDurationInDays?: Maybe<Scalars['Float']>;
+  billingUrl: Scalars['String'];
+  isBillingEnabled: Scalars['Boolean'];
+};
+
+/** Blocklist */
+export type Blocklist = {
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  /** Handle */
+  handle: Scalars['String'];
+  id: Scalars['ID'];
+  updatedAt: Scalars['DateTime'];
+  /** WorkspaceMember */
+  workspaceMember?: Maybe<WorkspaceMember>;
+  /** WorkspaceMember id foreign key */
+  workspaceMemberId: Scalars['ID'];
+};
+
+/** Blocklist */
+export type BlocklistConnection = {
+  edges: Array<BlocklistEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** Blocklist */
+export type BlocklistCreateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Handle */
+  handle?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** WorkspaceMember id foreign key */
+  workspaceMemberId: Scalars['ID'];
+};
+
+/** Blocklist */
+export type BlocklistEdge = {
+  cursor: Scalars['Cursor'];
+  node: Blocklist;
+};
+
+/** Blocklist */
+export type BlocklistFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<BlocklistFilterInput>>>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  /** Handle */
+  handle?: InputMaybe<StringFilter>;
+  id?: InputMaybe<UuidFilter>;
+  not?: InputMaybe<BlocklistFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<BlocklistFilterInput>>>;
+  updatedAt?: InputMaybe<DateFilter>;
+  /** WorkspaceMember id foreign key */
+  workspaceMemberId?: InputMaybe<UuidFilter>;
+};
+
+/** Blocklist */
+export type BlocklistOrderByInput = {
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  /** Handle */
+  handle?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+  /** WorkspaceMember id foreign key */
+  workspaceMemberId?: InputMaybe<OrderByDirection>;
+};
+
+/** Blocklist */
+export type BlocklistUpdateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Handle */
+  handle?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** WorkspaceMember id foreign key */
+  workspaceMemberId?: InputMaybe<Scalars['ID']>;
+};
+
+export type BooleanFieldComparison = {
+  is?: InputMaybe<Scalars['Boolean']>;
+  isNot?: InputMaybe<Scalars['Boolean']>;
+};
+
+export type BooleanFilter = {
+  eq?: InputMaybe<Scalars['Boolean']>;
+  is?: InputMaybe<FilterIs>;
+};
+
+export type CheckoutEntity = {
+  url: Scalars['String'];
+};
+
+export type ClientConfig = {
+  authProviders: AuthProviders;
+  billing: Billing;
+  debugMode: Scalars['Boolean'];
+  sentry: Sentry;
+  signInPrefilled: Scalars['Boolean'];
+  signUpDisabled: Scalars['Boolean'];
+  support: Support;
+  telemetry: Telemetry;
+};
+
+/** A comment */
+export type Comment = {
+  /** Comment activity */
+  activity?: Maybe<Activity>;
+  /** Comment activity id foreign key */
+  activityId: Scalars['ID'];
+  /** Comment author */
+  author?: Maybe<WorkspaceMember>;
+  /** Comment author id foreign key */
+  authorId: Scalars['ID'];
+  /** Comment body */
+  body: Scalars['String'];
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  id: Scalars['ID'];
+  updatedAt: Scalars['DateTime'];
+};
+
+/** A comment */
+export type CommentConnection = {
+  edges: Array<CommentEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** A comment */
+export type CommentCreateInput = {
+  /** Comment activity id foreign key */
+  activityId: Scalars['ID'];
+  /** Comment author id foreign key */
+  authorId: Scalars['ID'];
+  /** Comment body */
+  body?: InputMaybe<Scalars['String']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** A comment */
+export type CommentEdge = {
+  cursor: Scalars['Cursor'];
+  node: Comment;
+};
+
+/** A comment */
+export type CommentFilterInput = {
+  /** Comment activity id foreign key */
+  activityId?: InputMaybe<UuidFilter>;
+  and?: InputMaybe<Array<InputMaybe<CommentFilterInput>>>;
+  /** Comment author id foreign key */
+  authorId?: InputMaybe<UuidFilter>;
+  /** Comment body */
+  body?: InputMaybe<StringFilter>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  id?: InputMaybe<UuidFilter>;
+  not?: InputMaybe<CommentFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<CommentFilterInput>>>;
+  updatedAt?: InputMaybe<DateFilter>;
+};
+
+/** A comment */
+export type CommentOrderByInput = {
+  /** Comment activity id foreign key */
+  activityId?: InputMaybe<OrderByDirection>;
+  /** Comment author id foreign key */
+  authorId?: InputMaybe<OrderByDirection>;
+  /** Comment body */
+  body?: InputMaybe<OrderByDirection>;
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+};
+
+/** A comment */
+export type CommentUpdateInput = {
+  /** Comment activity id foreign key */
+  activityId?: InputMaybe<Scalars['ID']>;
+  /** Comment author id foreign key */
+  authorId?: InputMaybe<Scalars['ID']>;
+  /** Comment body */
+  body?: InputMaybe<Scalars['String']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** A company */
+export type Company = {
+  /** Your team member responsible for managing the company account */
+  accountOwner?: Maybe<WorkspaceMember>;
+  /** Your team member responsible for managing the company account id foreign key */
+  accountOwnerId?: Maybe<Scalars['ID']>;
+  /** Activities tied to the company */
+  activityTargets?: Maybe<ActivityTargetConnection>;
+  /** The company address */
+  address: Scalars['String'];
+  /** Annual Recurring Revenue: The actual or estimated annual revenue of the company */
+  annualRecurringRevenue?: Maybe<Currency>;
+  /** Attachments linked to the company. */
+  attachments?: Maybe<AttachmentConnection>;
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  /** The company website URL. We use this url to fetch the company icon */
+  domainName: Scalars['String'];
+  /** Number of employees in the company */
+  employees?: Maybe<Scalars['Float']>;
+  /** Favorites linked to the company */
+  favorites?: Maybe<FavoriteConnection>;
+  id: Scalars['ID'];
+  /** Ideal Customer Profile:  Indicates whether the company is the most suitable and valuable customer for you */
+  idealCustomerProfile: Scalars['Boolean'];
+  /** The company Linkedin account */
+  linkedinLink?: Maybe<Link>;
+  /** The company name */
+  name: Scalars['String'];
+  /** Opportunities linked to the company. */
+  opportunities?: Maybe<OpportunityConnection>;
+  /** People linked to the company. */
+  people?: Maybe<PersonConnection>;
+  /** Position */
+  position?: Maybe<Scalars['Float']>;
+  updatedAt: Scalars['DateTime'];
+  /** The company Twitter/X account */
+  xLink?: Maybe<Link>;
+};
+
+
+/** A company */
+export type CompanyActivityTargetsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ActivityTargetFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ActivityTargetOrderByInput>;
+};
+
+
+/** A company */
+export type CompanyAttachmentsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<AttachmentFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<AttachmentOrderByInput>;
+};
+
+
+/** A company */
+export type CompanyFavoritesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<FavoriteFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<FavoriteOrderByInput>;
+};
+
+
+/** A company */
+export type CompanyOpportunitiesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<OpportunityFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<OpportunityOrderByInput>;
+};
+
+
+/** A company */
+export type CompanyPeopleArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<PersonFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<PersonOrderByInput>;
+};
+
+/** A company */
+export type CompanyConnection = {
+  edges: Array<CompanyEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** A company */
+export type CompanyCreateInput = {
+  /** Your team member responsible for managing the company account id foreign key */
+  accountOwnerId?: InputMaybe<Scalars['ID']>;
+  /** The company address */
+  address?: InputMaybe<Scalars['String']>;
+  /** Annual Recurring Revenue: The actual or estimated annual revenue of the company */
+  annualRecurringRevenue?: InputMaybe<CurrencyCreateInput>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** The company website URL. We use this url to fetch the company icon */
+  domainName?: InputMaybe<Scalars['String']>;
+  /** Number of employees in the company */
+  employees?: InputMaybe<Scalars['Float']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Ideal Customer Profile:  Indicates whether the company is the most suitable and valuable customer for you */
+  idealCustomerProfile?: InputMaybe<Scalars['Boolean']>;
+  /** The company Linkedin account */
+  linkedinLink?: InputMaybe<LinkCreateInput>;
+  /** The company name */
+  name?: InputMaybe<Scalars['String']>;
+  /** Position */
+  position?: InputMaybe<Scalars['Float']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** The company Twitter/X account */
+  xLink?: InputMaybe<LinkCreateInput>;
+};
+
+/** A company */
+export type CompanyEdge = {
+  cursor: Scalars['Cursor'];
+  node: Company;
+};
+
+/** A company */
+export type CompanyFilterInput = {
+  /** Your team member responsible for managing the company account id foreign key */
+  accountOwnerId?: InputMaybe<UuidFilter>;
+  /** The company address */
+  address?: InputMaybe<StringFilter>;
+  and?: InputMaybe<Array<InputMaybe<CompanyFilterInput>>>;
+  /** Annual Recurring Revenue: The actual or estimated annual revenue of the company */
+  annualRecurringRevenue?: InputMaybe<CurrencyFilterInput>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  /** The company website URL. We use this url to fetch the company icon */
+  domainName?: InputMaybe<StringFilter>;
+  /** Number of employees in the company */
+  employees?: InputMaybe<FloatFilter>;
+  id?: InputMaybe<UuidFilter>;
+  /** Ideal Customer Profile:  Indicates whether the company is the most suitable and valuable customer for you */
+  idealCustomerProfile?: InputMaybe<BooleanFilter>;
+  /** The company Linkedin account */
+  linkedinLink?: InputMaybe<LinkFilterInput>;
+  /** The company name */
+  name?: InputMaybe<StringFilter>;
+  not?: InputMaybe<CompanyFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<CompanyFilterInput>>>;
+  /** Position */
+  position?: InputMaybe<FloatFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+  /** The company Twitter/X account */
+  xLink?: InputMaybe<LinkFilterInput>;
+};
+
+/** A company */
+export type CompanyOrderByInput = {
+  /** Your team member responsible for managing the company account id foreign key */
+  accountOwnerId?: InputMaybe<OrderByDirection>;
+  /** The company address */
+  address?: InputMaybe<OrderByDirection>;
+  /** Annual Recurring Revenue: The actual or estimated annual revenue of the company */
+  annualRecurringRevenue?: InputMaybe<CurrencyOrderByInput>;
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  /** The company website URL. We use this url to fetch the company icon */
+  domainName?: InputMaybe<OrderByDirection>;
+  /** Number of employees in the company */
+  employees?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** Ideal Customer Profile:  Indicates whether the company is the most suitable and valuable customer for you */
+  idealCustomerProfile?: InputMaybe<OrderByDirection>;
+  /** The company Linkedin account */
+  linkedinLink?: InputMaybe<LinkOrderByInput>;
+  /** The company name */
+  name?: InputMaybe<OrderByDirection>;
+  /** Position */
+  position?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+  /** The company Twitter/X account */
+  xLink?: InputMaybe<LinkOrderByInput>;
+};
+
+/** A company */
+export type CompanyUpdateInput = {
+  /** Your team member responsible for managing the company account id foreign key */
+  accountOwnerId?: InputMaybe<Scalars['ID']>;
+  /** The company address */
+  address?: InputMaybe<Scalars['String']>;
+  /** Annual Recurring Revenue: The actual or estimated annual revenue of the company */
+  annualRecurringRevenue?: InputMaybe<CurrencyUpdateInput>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** The company website URL. We use this url to fetch the company icon */
+  domainName?: InputMaybe<Scalars['String']>;
+  /** Number of employees in the company */
+  employees?: InputMaybe<Scalars['Float']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Ideal Customer Profile:  Indicates whether the company is the most suitable and valuable customer for you */
+  idealCustomerProfile?: InputMaybe<Scalars['Boolean']>;
+  /** The company Linkedin account */
+  linkedinLink?: InputMaybe<LinkUpdateInput>;
+  /** The company name */
+  name?: InputMaybe<Scalars['String']>;
+  /** Position */
+  position?: InputMaybe<Scalars['Float']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** The company Twitter/X account */
+  xLink?: InputMaybe<LinkUpdateInput>;
+};
+
+/** A connected account */
+export type ConnectedAccount = {
+  /** Messaging provider access token */
+  accessToken: Scalars['String'];
+  /** Account Owner */
+  accountOwner?: Maybe<WorkspaceMember>;
+  /** Account Owner id foreign key */
+  accountOwnerId: Scalars['ID'];
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  /** The account handle (email, username, phone number, etc.) */
+  handle: Scalars['String'];
+  id: Scalars['ID'];
+  /** Last sync history ID */
+  lastSyncHistoryId: Scalars['String'];
+  /** Message Channel */
+  messageChannels?: Maybe<MessageChannelConnection>;
+  /** The account provider */
+  provider: Scalars['String'];
+  /** Messaging provider refresh token */
+  refreshToken: Scalars['String'];
+  updatedAt: Scalars['DateTime'];
+};
+
+
+/** A connected account */
+export type ConnectedAccountMessageChannelsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<MessageChannelFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<MessageChannelOrderByInput>;
+};
+
+/** A connected account */
+export type ConnectedAccountConnection = {
+  edges: Array<ConnectedAccountEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** A connected account */
+export type ConnectedAccountCreateInput = {
+  /** Messaging provider access token */
+  accessToken?: InputMaybe<Scalars['String']>;
+  /** Account Owner id foreign key */
+  accountOwnerId: Scalars['ID'];
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** The account handle (email, username, phone number, etc.) */
+  handle?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Last sync history ID */
+  lastSyncHistoryId?: InputMaybe<Scalars['String']>;
+  /** The account provider */
+  provider?: InputMaybe<Scalars['String']>;
+  /** Messaging provider refresh token */
+  refreshToken?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** A connected account */
+export type ConnectedAccountEdge = {
+  cursor: Scalars['Cursor'];
+  node: ConnectedAccount;
+};
+
+/** A connected account */
+export type ConnectedAccountFilterInput = {
+  /** Messaging provider access token */
+  accessToken?: InputMaybe<StringFilter>;
+  /** Account Owner id foreign key */
+  accountOwnerId?: InputMaybe<UuidFilter>;
+  and?: InputMaybe<Array<InputMaybe<ConnectedAccountFilterInput>>>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  /** The account handle (email, username, phone number, etc.) */
+  handle?: InputMaybe<StringFilter>;
+  id?: InputMaybe<UuidFilter>;
+  /** Last sync history ID */
+  lastSyncHistoryId?: InputMaybe<StringFilter>;
+  not?: InputMaybe<ConnectedAccountFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<ConnectedAccountFilterInput>>>;
+  /** The account provider */
+  provider?: InputMaybe<StringFilter>;
+  /** Messaging provider refresh token */
+  refreshToken?: InputMaybe<StringFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+};
+
+/** A connected account */
+export type ConnectedAccountOrderByInput = {
+  /** Messaging provider access token */
+  accessToken?: InputMaybe<OrderByDirection>;
+  /** Account Owner id foreign key */
+  accountOwnerId?: InputMaybe<OrderByDirection>;
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  /** The account handle (email, username, phone number, etc.) */
+  handle?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** Last sync history ID */
+  lastSyncHistoryId?: InputMaybe<OrderByDirection>;
+  /** The account provider */
+  provider?: InputMaybe<OrderByDirection>;
+  /** Messaging provider refresh token */
+  refreshToken?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+};
+
+/** A connected account */
+export type ConnectedAccountUpdateInput = {
+  /** Messaging provider access token */
+  accessToken?: InputMaybe<Scalars['String']>;
+  /** Account Owner id foreign key */
+  accountOwnerId?: InputMaybe<Scalars['ID']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** The account handle (email, username, phone number, etc.) */
+  handle?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Last sync history ID */
+  lastSyncHistoryId?: InputMaybe<Scalars['String']>;
+  /** The account provider */
+  provider?: InputMaybe<Scalars['String']>;
+  /** Messaging provider refresh token */
+  refreshToken?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+export type Currency = {
+  amountMicros?: Maybe<Scalars['BigFloat']>;
+  createdAt?: Maybe<Scalars['DateTime']>;
+  currencyCode?: Maybe<Scalars['String']>;
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  id?: Maybe<Scalars['ID']>;
+  updatedAt?: Maybe<Scalars['DateTime']>;
+};
+
+export type CurrencyCreateInput = {
+  amountMicros?: InputMaybe<Scalars['BigFloat']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  currencyCode?: InputMaybe<Scalars['String']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+export type CurrencyFilterInput = {
+  amountMicros?: InputMaybe<BigFloatFilter>;
+  and?: InputMaybe<Array<InputMaybe<CurrencyFilterInput>>>;
+  createdAt?: InputMaybe<DateFilter>;
+  currencyCode?: InputMaybe<StringFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  id?: InputMaybe<UuidFilter>;
+  not?: InputMaybe<CurrencyFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<CurrencyFilterInput>>>;
+  updatedAt?: InputMaybe<DateFilter>;
+};
+
+export type CurrencyOrderByInput = {
+  amountMicros?: InputMaybe<OrderByDirection>;
+  createdAt?: InputMaybe<OrderByDirection>;
+  currencyCode?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+};
+
+export type CurrencyUpdateInput = {
+  amountMicros?: InputMaybe<Scalars['BigFloat']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  currencyCode?: InputMaybe<Scalars['String']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+export type CursorPaging = {
+  /** Paginate after opaque cursor */
+  after?: InputMaybe<Scalars['ConnectionCursor']>;
+  /** Paginate before opaque cursor */
+  before?: InputMaybe<Scalars['ConnectionCursor']>;
+  /** Paginate first */
+  first?: InputMaybe<Scalars['Int']>;
+  /** Paginate last */
+  last?: InputMaybe<Scalars['Int']>;
+};
+
+export type DateFilter = {
+  eq?: InputMaybe<Scalars['Date']>;
+  gt?: InputMaybe<Scalars['Date']>;
+  gte?: InputMaybe<Scalars['Date']>;
+  in?: InputMaybe<Array<Scalars['Date']>>;
+  is?: InputMaybe<FilterIs>;
+  lt?: InputMaybe<Scalars['Date']>;
+  lte?: InputMaybe<Scalars['Date']>;
+  neq?: InputMaybe<Scalars['Date']>;
+};
+
+export type DeleteOneObjectInput = {
+  /** The id of the record to delete. */
+  id: Scalars['ID'];
+};
+
+export type EmailPasswordResetLink = {
+  /** Boolean that confirms query was dispatched */
+  success: Scalars['Boolean'];
+};
+
+/** A favorite */
+export type Favorite = {
+  /** Favorite company */
+  company?: Maybe<Company>;
+  /** Favorite company id foreign key */
+  companyId?: Maybe<Scalars['ID']>;
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  id: Scalars['ID'];
+  /** Favorite opportunity */
+  opportunity?: Maybe<Opportunity>;
+  /** Favorite opportunity id foreign key */
+  opportunityId?: Maybe<Scalars['ID']>;
+  /** Favorite person */
+  person?: Maybe<Person>;
+  /** Favorite person id foreign key */
+  personId?: Maybe<Scalars['ID']>;
+  /** Favorite position */
+  position: Scalars['Float'];
+  updatedAt: Scalars['DateTime'];
+  /** Favorite workspace member */
+  workspaceMember?: Maybe<WorkspaceMember>;
+  /** Favorite workspace member id foreign key */
+  workspaceMemberId: Scalars['ID'];
+};
+
+/** A favorite */
+export type FavoriteConnection = {
+  edges: Array<FavoriteEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** A favorite */
+export type FavoriteCreateInput = {
+  /** Favorite company id foreign key */
+  companyId?: InputMaybe<Scalars['ID']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Favorite opportunity id foreign key */
+  opportunityId?: InputMaybe<Scalars['ID']>;
+  /** Favorite person id foreign key */
+  personId?: InputMaybe<Scalars['ID']>;
+  /** Favorite position */
+  position?: InputMaybe<Scalars['Float']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Favorite workspace member id foreign key */
+  workspaceMemberId: Scalars['ID'];
+};
+
+/** A favorite */
+export type FavoriteEdge = {
+  cursor: Scalars['Cursor'];
+  node: Favorite;
+};
+
+/** A favorite */
+export type FavoriteFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<FavoriteFilterInput>>>;
+  /** Favorite company id foreign key */
+  companyId?: InputMaybe<UuidFilter>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  id?: InputMaybe<UuidFilter>;
+  not?: InputMaybe<FavoriteFilterInput>;
+  /** Favorite opportunity id foreign key */
+  opportunityId?: InputMaybe<UuidFilter>;
+  or?: InputMaybe<Array<InputMaybe<FavoriteFilterInput>>>;
+  /** Favorite person id foreign key */
+  personId?: InputMaybe<UuidFilter>;
+  /** Favorite position */
+  position?: InputMaybe<FloatFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+  /** Favorite workspace member id foreign key */
+  workspaceMemberId?: InputMaybe<UuidFilter>;
+};
+
+/** A favorite */
+export type FavoriteOrderByInput = {
+  /** Favorite company id foreign key */
+  companyId?: InputMaybe<OrderByDirection>;
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** Favorite opportunity id foreign key */
+  opportunityId?: InputMaybe<OrderByDirection>;
+  /** Favorite person id foreign key */
+  personId?: InputMaybe<OrderByDirection>;
+  /** Favorite position */
+  position?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+  /** Favorite workspace member id foreign key */
+  workspaceMemberId?: InputMaybe<OrderByDirection>;
+};
+
+/** A favorite */
+export type FavoriteUpdateInput = {
+  /** Favorite company id foreign key */
+  companyId?: InputMaybe<Scalars['ID']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Favorite opportunity id foreign key */
+  opportunityId?: InputMaybe<Scalars['ID']>;
+  /** Favorite person id foreign key */
+  personId?: InputMaybe<Scalars['ID']>;
+  /** Favorite position */
+  position?: InputMaybe<Scalars['Float']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Favorite workspace member id foreign key */
+  workspaceMemberId?: InputMaybe<Scalars['ID']>;
+};
+
+export type FeatureFlag = {
+  id: Scalars['ID'];
+  key: Scalars['String'];
+  value: Scalars['Boolean'];
+  workspaceId: Scalars['String'];
+};
+
+export type FeatureFlagFilter = {
+  and?: InputMaybe<Array<FeatureFlagFilter>>;
+  id?: InputMaybe<IdFilterComparison>;
+  or?: InputMaybe<Array<FeatureFlagFilter>>;
+};
+
+export type FeatureFlagSort = {
+  direction: SortDirection;
+  field: FeatureFlagSortFields;
+  nulls?: InputMaybe<SortNulls>;
+};
+
+export enum FeatureFlagSortFields {
+  Id = 'id'
+}
+
+export type FieldConnection = {
+  /** Array of edges. */
+  edges: Array<FieldEdge>;
+  /** Paging information */
+  pageInfo: PageInfo;
+  /** Fetch total count of records */
+  totalCount: Scalars['Int'];
+};
+
+export type FieldDeleteResponse = {
+  createdAt?: Maybe<Scalars['DateTime']>;
+  defaultValue?: Maybe<Scalars['JSON']>;
+  description?: Maybe<Scalars['String']>;
+  icon?: Maybe<Scalars['String']>;
+  id?: Maybe<Scalars['ID']>;
+  isActive?: Maybe<Scalars['Boolean']>;
+  isCustom?: Maybe<Scalars['Boolean']>;
+  isNullable?: Maybe<Scalars['Boolean']>;
+  isSystem?: Maybe<Scalars['Boolean']>;
+  label?: Maybe<Scalars['String']>;
+  name?: Maybe<Scalars['String']>;
+  options?: Maybe<Scalars['JSON']>;
+  type?: Maybe<FieldMetadataType>;
+  updatedAt?: Maybe<Scalars['DateTime']>;
+};
+
+/** Type of the field */
+export enum FieldMetadataType {
+  Boolean = 'BOOLEAN',
+  Currency = 'CURRENCY',
+  Date = 'DATE',
+  DateTime = 'DATE_TIME',
+  Email = 'EMAIL',
+  FullName = 'FULL_NAME',
+  Link = 'LINK',
+  MultiSelect = 'MULTI_SELECT',
+  Number = 'NUMBER',
+  Numeric = 'NUMERIC',
+  Phone = 'PHONE',
+  Probability = 'PROBABILITY',
+  Rating = 'RATING',
+  Relation = 'RELATION',
+  Select = 'SELECT',
+  Text = 'TEXT',
+  Uuid = 'UUID'
+}
+
+export enum FileFolder {
+  Attachment = 'Attachment',
+  PersonPicture = 'PersonPicture',
+  ProfilePicture = 'ProfilePicture',
+  WorkspaceLogo = 'WorkspaceLogo'
+}
+
+/** This enum to filter by nullability */
+export enum FilterIs {
+  /** Non-nulish values */
+  NotNull = 'NOT_NULL',
+  /** Nulish values */
+  Null = 'NULL'
+}
+
+export type FloatFilter = {
+  eq?: InputMaybe<Scalars['Float']>;
+  gt?: InputMaybe<Scalars['Float']>;
+  gte?: InputMaybe<Scalars['Float']>;
+  in?: InputMaybe<Array<Scalars['Float']>>;
+  is?: InputMaybe<FilterIs>;
+  lt?: InputMaybe<Scalars['Float']>;
+  lte?: InputMaybe<Scalars['Float']>;
+  neq?: InputMaybe<Scalars['Float']>;
+};
+
+export type FullName = {
+  createdAt?: Maybe<Scalars['DateTime']>;
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  firstName: Scalars['String'];
+  id?: Maybe<Scalars['ID']>;
+  lastName: Scalars['String'];
+  updatedAt?: Maybe<Scalars['DateTime']>;
+};
+
+export type FullNameCreateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  firstName?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  lastName?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+export type FullNameFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<FullNameFilterInput>>>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  firstName?: InputMaybe<StringFilter>;
+  id?: InputMaybe<UuidFilter>;
+  lastName?: InputMaybe<StringFilter>;
+  not?: InputMaybe<FullNameFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<FullNameFilterInput>>>;
+  updatedAt?: InputMaybe<DateFilter>;
+};
+
+export type FullNameOrderByInput = {
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  firstName?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  lastName?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+};
+
+export type FullNameUpdateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  firstName?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  lastName?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+export type IdFilterComparison = {
+  eq?: InputMaybe<Scalars['ID']>;
+  gt?: InputMaybe<Scalars['ID']>;
+  gte?: InputMaybe<Scalars['ID']>;
+  iLike?: InputMaybe<Scalars['ID']>;
+  in?: InputMaybe<Array<Scalars['ID']>>;
+  is?: InputMaybe<Scalars['Boolean']>;
+  isNot?: InputMaybe<Scalars['Boolean']>;
+  like?: InputMaybe<Scalars['ID']>;
+  lt?: InputMaybe<Scalars['ID']>;
+  lte?: InputMaybe<Scalars['ID']>;
+  neq?: InputMaybe<Scalars['ID']>;
+  notILike?: InputMaybe<Scalars['ID']>;
+  notIn?: InputMaybe<Array<Scalars['ID']>>;
+  notLike?: InputMaybe<Scalars['ID']>;
+};
+
+export type InvalidatePassword = {
+  /** Boolean that confirms query was dispatched */
+  success: Scalars['Boolean'];
+};
+
+export type Link = {
+  createdAt?: Maybe<Scalars['DateTime']>;
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  id?: Maybe<Scalars['ID']>;
+  label?: Maybe<Scalars['String']>;
+  updatedAt?: Maybe<Scalars['DateTime']>;
+  url?: Maybe<Scalars['String']>;
+};
+
+export type LinkCreateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  label?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  url?: InputMaybe<Scalars['String']>;
+};
+
+export type LinkFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<LinkFilterInput>>>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  id?: InputMaybe<UuidFilter>;
+  label?: InputMaybe<StringFilter>;
+  not?: InputMaybe<LinkFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<LinkFilterInput>>>;
+  updatedAt?: InputMaybe<DateFilter>;
+  url?: InputMaybe<StringFilter>;
+};
+
+export type LinkOrderByInput = {
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  label?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+  url?: InputMaybe<OrderByDirection>;
+};
+
+export type LinkUpdateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  label?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  url?: InputMaybe<Scalars['String']>;
+};
+
+export type LoginToken = {
+  loginToken: AuthToken;
+};
+
+/** Message */
+export type Message = {
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  /** Message Direction */
+  direction: MessageDirectionEnum;
+  /** Message id from the message header */
+  headerMessageId: Scalars['String'];
+  id: Scalars['ID'];
+  /** Messages from the channel. */
+  messageChannelMessageAssociations?: Maybe<MessageChannelMessageAssociationConnection>;
+  /** Message Participants */
+  messageParticipants?: Maybe<MessageParticipantConnection>;
+  /** Message Thread Id */
+  messageThread?: Maybe<MessageThread>;
+  /** Message Thread Id id foreign key */
+  messageThreadId?: Maybe<Scalars['ID']>;
+  /** The date the message was received */
+  receivedAt?: Maybe<Scalars['DateTime']>;
+  /** Subject */
+  subject: Scalars['String'];
+  /** Text */
+  text: Scalars['String'];
+  updatedAt: Scalars['DateTime'];
+};
+
+
+/** Message */
+export type MessageMessageChannelMessageAssociationsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<MessageChannelMessageAssociationFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<MessageChannelMessageAssociationOrderByInput>;
+};
+
+
+/** Message */
+export type MessageMessageParticipantsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<MessageParticipantFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<MessageParticipantOrderByInput>;
+};
+
+/** Message Channels */
+export type MessageChannel = {
+  /** Connected Account */
+  connectedAccount?: Maybe<ConnectedAccount>;
+  /** Connected Account id foreign key */
+  connectedAccountId: Scalars['ID'];
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  /** Handle */
+  handle: Scalars['String'];
+  id: Scalars['ID'];
+  /** Is Contact Auto Creation Enabled */
+  isContactAutoCreationEnabled: Scalars['Boolean'];
+  /** Messages from the channel. */
+  messageChannelMessageAssociations?: Maybe<MessageChannelMessageAssociationConnection>;
+  /** Channel Type */
+  type: MessageChannelTypeEnum;
+  updatedAt: Scalars['DateTime'];
+  /** Visibility */
+  visibility: MessageChannelVisibilityEnum;
+};
+
+
+/** Message Channels */
+export type MessageChannelMessageChannelMessageAssociationsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<MessageChannelMessageAssociationFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<MessageChannelMessageAssociationOrderByInput>;
+};
+
+/** Message Channels */
+export type MessageChannelConnection = {
+  edges: Array<MessageChannelEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** Message Channels */
+export type MessageChannelCreateInput = {
+  /** Connected Account id foreign key */
+  connectedAccountId: Scalars['ID'];
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Handle */
+  handle?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Is Contact Auto Creation Enabled */
+  isContactAutoCreationEnabled?: InputMaybe<Scalars['Boolean']>;
+  /** Channel Type */
+  type?: InputMaybe<MessageChannelTypeEnum>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Visibility */
+  visibility?: InputMaybe<MessageChannelVisibilityEnum>;
+};
+
+/** Message Channels */
+export type MessageChannelEdge = {
+  cursor: Scalars['Cursor'];
+  node: MessageChannel;
+};
+
+/** Message Channels */
+export type MessageChannelFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<MessageChannelFilterInput>>>;
+  /** Connected Account id foreign key */
+  connectedAccountId?: InputMaybe<UuidFilter>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  /** Handle */
+  handle?: InputMaybe<StringFilter>;
+  id?: InputMaybe<UuidFilter>;
+  /** Is Contact Auto Creation Enabled */
+  isContactAutoCreationEnabled?: InputMaybe<BooleanFilter>;
+  not?: InputMaybe<MessageChannelFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<MessageChannelFilterInput>>>;
+  /** Channel Type */
+  type?: InputMaybe<MessageChannelTypeEnumFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+  /** Visibility */
+  visibility?: InputMaybe<MessageChannelVisibilityEnumFilter>;
+};
+
+/** Message Synced with a Message Channel */
+export type MessageChannelMessageAssociation = {
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  id: Scalars['ID'];
+  /** Message Id */
+  message?: Maybe<Message>;
+  /** Message Channel Id */
+  messageChannel?: Maybe<MessageChannel>;
+  /** Message Channel Id id foreign key */
+  messageChannelId?: Maybe<Scalars['ID']>;
+  /** Message id from the messaging provider */
+  messageExternalId?: Maybe<Scalars['String']>;
+  /** Message Id id foreign key */
+  messageId?: Maybe<Scalars['ID']>;
+  /** Message Thread Id */
+  messageThread?: Maybe<MessageThread>;
+  /** Thread id from the messaging provider */
+  messageThreadExternalId?: Maybe<Scalars['String']>;
+  /** Message Thread Id id foreign key */
+  messageThreadId?: Maybe<Scalars['ID']>;
+  updatedAt: Scalars['DateTime'];
+};
+
+/** Message Synced with a Message Channel */
+export type MessageChannelMessageAssociationConnection = {
+  edges: Array<MessageChannelMessageAssociationEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** Message Synced with a Message Channel */
+export type MessageChannelMessageAssociationCreateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Message Channel Id id foreign key */
+  messageChannelId?: InputMaybe<Scalars['ID']>;
+  /** Message id from the messaging provider */
+  messageExternalId?: InputMaybe<Scalars['String']>;
+  /** Message Id id foreign key */
+  messageId?: InputMaybe<Scalars['ID']>;
+  /** Thread id from the messaging provider */
+  messageThreadExternalId?: InputMaybe<Scalars['String']>;
+  /** Message Thread Id id foreign key */
+  messageThreadId?: InputMaybe<Scalars['ID']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** Message Synced with a Message Channel */
+export type MessageChannelMessageAssociationEdge = {
+  cursor: Scalars['Cursor'];
+  node: MessageChannelMessageAssociation;
+};
+
+/** Message Synced with a Message Channel */
+export type MessageChannelMessageAssociationFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<MessageChannelMessageAssociationFilterInput>>>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  id?: InputMaybe<UuidFilter>;
+  /** Message Channel Id id foreign key */
+  messageChannelId?: InputMaybe<UuidFilter>;
+  /** Message id from the messaging provider */
+  messageExternalId?: InputMaybe<StringFilter>;
+  /** Message Id id foreign key */
+  messageId?: InputMaybe<UuidFilter>;
+  /** Thread id from the messaging provider */
+  messageThreadExternalId?: InputMaybe<StringFilter>;
+  /** Message Thread Id id foreign key */
+  messageThreadId?: InputMaybe<UuidFilter>;
+  not?: InputMaybe<MessageChannelMessageAssociationFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<MessageChannelMessageAssociationFilterInput>>>;
+  updatedAt?: InputMaybe<DateFilter>;
+};
+
+/** Message Synced with a Message Channel */
+export type MessageChannelMessageAssociationOrderByInput = {
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** Message Channel Id id foreign key */
+  messageChannelId?: InputMaybe<OrderByDirection>;
+  /** Message id from the messaging provider */
+  messageExternalId?: InputMaybe<OrderByDirection>;
+  /** Message Id id foreign key */
+  messageId?: InputMaybe<OrderByDirection>;
+  /** Thread id from the messaging provider */
+  messageThreadExternalId?: InputMaybe<OrderByDirection>;
+  /** Message Thread Id id foreign key */
+  messageThreadId?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+};
+
+/** Message Synced with a Message Channel */
+export type MessageChannelMessageAssociationUpdateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Message Channel Id id foreign key */
+  messageChannelId?: InputMaybe<Scalars['ID']>;
+  /** Message id from the messaging provider */
+  messageExternalId?: InputMaybe<Scalars['String']>;
+  /** Message Id id foreign key */
+  messageId?: InputMaybe<Scalars['ID']>;
+  /** Thread id from the messaging provider */
+  messageThreadExternalId?: InputMaybe<Scalars['String']>;
+  /** Message Thread Id id foreign key */
+  messageThreadId?: InputMaybe<Scalars['ID']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** Message Channels */
+export type MessageChannelOrderByInput = {
+  /** Connected Account id foreign key */
+  connectedAccountId?: InputMaybe<OrderByDirection>;
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  /** Handle */
+  handle?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** Is Contact Auto Creation Enabled */
+  isContactAutoCreationEnabled?: InputMaybe<OrderByDirection>;
+  /** Channel Type */
+  type?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+  /** Visibility */
+  visibility?: InputMaybe<OrderByDirection>;
+};
+
+/** Channel Type */
+export enum MessageChannelTypeEnum {
+  /** Email */
+  Email = 'email',
+  /** SMS */
+  Sms = 'sms'
+}
+
+export type MessageChannelTypeEnumFilter = {
+  eq?: InputMaybe<MessageChannelTypeEnum>;
+  in?: InputMaybe<Array<InputMaybe<MessageChannelTypeEnum>>>;
+  is?: InputMaybe<FilterIs>;
+  neq?: InputMaybe<MessageChannelTypeEnum>;
+};
+
+/** Message Channels */
+export type MessageChannelUpdateInput = {
+  /** Connected Account id foreign key */
+  connectedAccountId?: InputMaybe<Scalars['ID']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Handle */
+  handle?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Is Contact Auto Creation Enabled */
+  isContactAutoCreationEnabled?: InputMaybe<Scalars['Boolean']>;
+  /** Channel Type */
+  type?: InputMaybe<MessageChannelTypeEnum>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Visibility */
+  visibility?: InputMaybe<MessageChannelVisibilityEnum>;
+};
+
+/** Visibility */
+export enum MessageChannelVisibilityEnum {
+  /** Metadata */
+  Metadata = 'metadata',
+  /** Share Everything */
+  ShareEverything = 'share_everything',
+  /** Subject */
+  Subject = 'subject'
+}
+
+export type MessageChannelVisibilityEnumFilter = {
+  eq?: InputMaybe<MessageChannelVisibilityEnum>;
+  in?: InputMaybe<Array<InputMaybe<MessageChannelVisibilityEnum>>>;
+  is?: InputMaybe<FilterIs>;
+  neq?: InputMaybe<MessageChannelVisibilityEnum>;
+};
+
+/** Message */
+export type MessageConnection = {
+  edges: Array<MessageEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** Message */
+export type MessageCreateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Message Direction */
+  direction?: InputMaybe<MessageDirectionEnum>;
+  /** Message id from the message header */
+  headerMessageId?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Message Thread Id id foreign key */
+  messageThreadId?: InputMaybe<Scalars['ID']>;
+  /** The date the message was received */
+  receivedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Subject */
+  subject?: InputMaybe<Scalars['String']>;
+  /** Text */
+  text?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** Message Direction */
+export enum MessageDirectionEnum {
+  /** Incoming */
+  Incoming = 'incoming',
+  /** Outgoing */
+  Outgoing = 'outgoing'
+}
+
+export type MessageDirectionEnumFilter = {
+  eq?: InputMaybe<MessageDirectionEnum>;
+  in?: InputMaybe<Array<InputMaybe<MessageDirectionEnum>>>;
+  is?: InputMaybe<FilterIs>;
+  neq?: InputMaybe<MessageDirectionEnum>;
+};
+
+/** Message */
+export type MessageEdge = {
+  cursor: Scalars['Cursor'];
+  node: Message;
+};
+
+/** Message */
+export type MessageFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<MessageFilterInput>>>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  /** Message Direction */
+  direction?: InputMaybe<MessageDirectionEnumFilter>;
+  /** Message id from the message header */
+  headerMessageId?: InputMaybe<StringFilter>;
+  id?: InputMaybe<UuidFilter>;
+  /** Message Thread Id id foreign key */
+  messageThreadId?: InputMaybe<UuidFilter>;
+  not?: InputMaybe<MessageFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<MessageFilterInput>>>;
+  /** The date the message was received */
+  receivedAt?: InputMaybe<DateFilter>;
+  /** Subject */
+  subject?: InputMaybe<StringFilter>;
+  /** Text */
+  text?: InputMaybe<StringFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+};
+
+/** Message */
+export type MessageOrderByInput = {
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  /** Message Direction */
+  direction?: InputMaybe<OrderByDirection>;
+  /** Message id from the message header */
+  headerMessageId?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** Message Thread Id id foreign key */
+  messageThreadId?: InputMaybe<OrderByDirection>;
+  /** The date the message was received */
+  receivedAt?: InputMaybe<OrderByDirection>;
+  /** Subject */
+  subject?: InputMaybe<OrderByDirection>;
+  /** Text */
+  text?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+};
+
+/** Message Participants */
+export type MessageParticipant = {
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  /** Display Name */
+  displayName: Scalars['String'];
+  /** Handle */
+  handle: Scalars['String'];
+  id: Scalars['ID'];
+  /** Message */
+  message?: Maybe<Message>;
+  /** Message id foreign key */
+  messageId: Scalars['ID'];
+  /** Person */
+  person?: Maybe<Person>;
+  /** Person id foreign key */
+  personId?: Maybe<Scalars['ID']>;
+  /** Role */
+  role: MessageParticipantRoleEnum;
+  updatedAt: Scalars['DateTime'];
+  /** Workspace member */
+  workspaceMember?: Maybe<WorkspaceMember>;
+  /** Workspace member id foreign key */
+  workspaceMemberId?: Maybe<Scalars['ID']>;
+};
+
+/** Message Participants */
+export type MessageParticipantConnection = {
+  edges: Array<MessageParticipantEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** Message Participants */
+export type MessageParticipantCreateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Display Name */
+  displayName?: InputMaybe<Scalars['String']>;
+  /** Handle */
+  handle?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Message id foreign key */
+  messageId: Scalars['ID'];
+  /** Person id foreign key */
+  personId?: InputMaybe<Scalars['ID']>;
+  /** Role */
+  role?: InputMaybe<MessageParticipantRoleEnum>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Workspace member id foreign key */
+  workspaceMemberId?: InputMaybe<Scalars['ID']>;
+};
+
+/** Message Participants */
+export type MessageParticipantEdge = {
+  cursor: Scalars['Cursor'];
+  node: MessageParticipant;
+};
+
+/** Message Participants */
+export type MessageParticipantFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<MessageParticipantFilterInput>>>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  /** Display Name */
+  displayName?: InputMaybe<StringFilter>;
+  /** Handle */
+  handle?: InputMaybe<StringFilter>;
+  id?: InputMaybe<UuidFilter>;
+  /** Message id foreign key */
+  messageId?: InputMaybe<UuidFilter>;
+  not?: InputMaybe<MessageParticipantFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<MessageParticipantFilterInput>>>;
+  /** Person id foreign key */
+  personId?: InputMaybe<UuidFilter>;
+  /** Role */
+  role?: InputMaybe<MessageParticipantRoleEnumFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+  /** Workspace member id foreign key */
+  workspaceMemberId?: InputMaybe<UuidFilter>;
+};
+
+/** Message Participants */
+export type MessageParticipantOrderByInput = {
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  /** Display Name */
+  displayName?: InputMaybe<OrderByDirection>;
+  /** Handle */
+  handle?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** Message id foreign key */
+  messageId?: InputMaybe<OrderByDirection>;
+  /** Person id foreign key */
+  personId?: InputMaybe<OrderByDirection>;
+  /** Role */
+  role?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+  /** Workspace member id foreign key */
+  workspaceMemberId?: InputMaybe<OrderByDirection>;
+};
+
+/** Role */
+export enum MessageParticipantRoleEnum {
+  /** Bcc */
+  Bcc = 'bcc',
+  /** Cc */
+  Cc = 'cc',
+  /** From */
+  From = 'from',
+  /** To */
+  To = 'to'
+}
+
+export type MessageParticipantRoleEnumFilter = {
+  eq?: InputMaybe<MessageParticipantRoleEnum>;
+  in?: InputMaybe<Array<InputMaybe<MessageParticipantRoleEnum>>>;
+  is?: InputMaybe<FilterIs>;
+  neq?: InputMaybe<MessageParticipantRoleEnum>;
+};
+
+/** Message Participants */
+export type MessageParticipantUpdateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Display Name */
+  displayName?: InputMaybe<Scalars['String']>;
+  /** Handle */
+  handle?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Message id foreign key */
+  messageId?: InputMaybe<Scalars['ID']>;
+  /** Person id foreign key */
+  personId?: InputMaybe<Scalars['ID']>;
+  /** Role */
+  role?: InputMaybe<MessageParticipantRoleEnum>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Workspace member id foreign key */
+  workspaceMemberId?: InputMaybe<Scalars['ID']>;
+};
+
+/** Message Thread */
+export type MessageThread = {
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  id: Scalars['ID'];
+  /** Messages from the channel. */
+  messageChannelMessageAssociations?: Maybe<MessageChannelMessageAssociationConnection>;
+  /** Messages from the thread. */
+  messages?: Maybe<MessageConnection>;
+  updatedAt: Scalars['DateTime'];
+};
+
+
+/** Message Thread */
+export type MessageThreadMessageChannelMessageAssociationsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<MessageChannelMessageAssociationFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<MessageChannelMessageAssociationOrderByInput>;
+};
+
+
+/** Message Thread */
+export type MessageThreadMessagesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<MessageFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<MessageOrderByInput>;
+};
+
+/** Message Thread */
+export type MessageThreadConnection = {
+  edges: Array<MessageThreadEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** Message Thread */
+export type MessageThreadCreateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** Message Thread */
+export type MessageThreadEdge = {
+  cursor: Scalars['Cursor'];
+  node: MessageThread;
+};
+
+/** Message Thread */
+export type MessageThreadFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<MessageThreadFilterInput>>>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  id?: InputMaybe<UuidFilter>;
+  not?: InputMaybe<MessageThreadFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<MessageThreadFilterInput>>>;
+  updatedAt?: InputMaybe<DateFilter>;
+};
+
+/** Message Thread */
+export type MessageThreadOrderByInput = {
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+};
+
+/** Message Thread */
+export type MessageThreadUpdateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** Message */
+export type MessageUpdateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Message Direction */
+  direction?: InputMaybe<MessageDirectionEnum>;
+  /** Message id from the message header */
+  headerMessageId?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Message Thread Id id foreign key */
+  messageThreadId?: InputMaybe<Scalars['ID']>;
+  /** The date the message was received */
+  receivedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Subject */
+  subject?: InputMaybe<Scalars['String']>;
+  /** Text */
+  text?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+export type Mutation = {
+  activateWorkspace: Workspace;
+  challenge: LoginToken;
+  checkout: CheckoutEntity;
+  createActivities: Array<Activity>;
+  createActivity: Activity;
+  createActivityTarget: ActivityTarget;
+  createActivityTargets: Array<ActivityTarget>;
+  createApiKey: ApiKey;
+  createApiKeys: Array<ApiKey>;
+  createAttachment: Attachment;
+  createAttachments: Array<Attachment>;
+  createBlocklist: Blocklist;
+  createBlocklists: Array<Blocklist>;
+  createComment: Comment;
+  createComments: Array<Comment>;
+  createCompanies: Array<Company>;
+  createCompany: Company;
+  createConnectedAccount: ConnectedAccount;
+  createConnectedAccounts: Array<ConnectedAccount>;
+  createEvent: Analytics;
+  createFavorite: Favorite;
+  createFavorites: Array<Favorite>;
+  createMessage: Message;
+  createMessageChannel: MessageChannel;
+  createMessageChannelMessageAssociation: MessageChannelMessageAssociation;
+  createMessageChannelMessageAssociations: Array<MessageChannelMessageAssociation>;
+  createMessageChannels: Array<MessageChannel>;
+  createMessageParticipant: MessageParticipant;
+  createMessageParticipants: Array<MessageParticipant>;
+  createMessageThread: MessageThread;
+  createMessageThreads: Array<MessageThread>;
+  createMessages: Array<Message>;
+  createOneObject: Object;
+  createOneRefreshToken: RefreshToken;
+  createOpportunities: Array<Opportunity>;
+  createOpportunity: Opportunity;
+  createPeople: Array<Person>;
+  createPerson: Person;
+  createPipelineStep: PipelineStep;
+  createPipelineSteps: Array<PipelineStep>;
+  createView: View;
+  createViewField: ViewField;
+  createViewFields: Array<ViewField>;
+  createViewFilter: ViewFilter;
+  createViewFilters: Array<ViewFilter>;
+  createViewSort: ViewSort;
+  createViewSorts: Array<ViewSort>;
+  createViews: Array<View>;
+  createWebhook: Webhook;
+  createWebhooks: Array<Webhook>;
+  createWorkspaceMember: WorkspaceMember;
+  createWorkspaceMembers: Array<WorkspaceMember>;
+  deleteActivities: Array<Activity>;
+  deleteActivity: Activity;
+  deleteActivityTarget: ActivityTarget;
+  deleteActivityTargets: Array<ActivityTarget>;
+  deleteApiKey: ApiKey;
+  deleteApiKeys: Array<ApiKey>;
+  deleteAttachment: Attachment;
+  deleteAttachments: Array<Attachment>;
+  deleteBlocklist: Blocklist;
+  deleteBlocklists: Array<Blocklist>;
+  deleteComment: Comment;
+  deleteComments: Array<Comment>;
+  deleteCompanies: Array<Company>;
+  deleteCompany: Company;
+  deleteConnectedAccount: ConnectedAccount;
+  deleteConnectedAccounts: Array<ConnectedAccount>;
+  deleteCurrentWorkspace: Workspace;
+  deleteFavorite: Favorite;
+  deleteFavorites: Array<Favorite>;
+  deleteMessage: Message;
+  deleteMessageChannel: MessageChannel;
+  deleteMessageChannelMessageAssociation: MessageChannelMessageAssociation;
+  deleteMessageChannelMessageAssociations: Array<MessageChannelMessageAssociation>;
+  deleteMessageChannels: Array<MessageChannel>;
+  deleteMessageParticipant: MessageParticipant;
+  deleteMessageParticipants: Array<MessageParticipant>;
+  deleteMessageThread: MessageThread;
+  deleteMessageThreads: Array<MessageThread>;
+  deleteMessages: Array<Message>;
+  deleteOneObject: Object;
+  deleteOpportunities: Array<Opportunity>;
+  deleteOpportunity: Opportunity;
+  deletePeople: Array<Person>;
+  deletePerson: Person;
+  deletePipelineStep: PipelineStep;
+  deletePipelineSteps: Array<PipelineStep>;
+  deleteUser: User;
+  deleteView: View;
+  deleteViewField: ViewField;
+  deleteViewFields: Array<ViewField>;
+  deleteViewFilter: ViewFilter;
+  deleteViewFilters: Array<ViewFilter>;
+  deleteViewSort: ViewSort;
+  deleteViewSorts: Array<ViewSort>;
+  deleteViews: Array<View>;
+  deleteWebhook: Webhook;
+  deleteWebhooks: Array<Webhook>;
+  deleteWorkspaceMember: WorkspaceMember;
+  deleteWorkspaceMembers: Array<WorkspaceMember>;
+  emailPasswordResetLink: EmailPasswordResetLink;
+  executeQuickActionOnActivity: Activity;
+  executeQuickActionOnActivityTarget: ActivityTarget;
+  executeQuickActionOnApiKey: ApiKey;
+  executeQuickActionOnAttachment: Attachment;
+  executeQuickActionOnBlocklist: Blocklist;
+  executeQuickActionOnComment: Comment;
+  executeQuickActionOnCompany: Company;
+  executeQuickActionOnConnectedAccount: ConnectedAccount;
+  executeQuickActionOnFavorite: Favorite;
+  executeQuickActionOnMessage: Message;
+  executeQuickActionOnMessageChannel: MessageChannel;
+  executeQuickActionOnMessageChannelMessageAssociation: MessageChannelMessageAssociation;
+  executeQuickActionOnMessageParticipant: MessageParticipant;
+  executeQuickActionOnMessageThread: MessageThread;
+  executeQuickActionOnOpportunity: Opportunity;
+  executeQuickActionOnPerson: Person;
+  executeQuickActionOnPipelineStep: PipelineStep;
+  executeQuickActionOnView: View;
+  executeQuickActionOnViewField: ViewField;
+  executeQuickActionOnViewFilter: ViewFilter;
+  executeQuickActionOnViewSort: ViewSort;
+  executeQuickActionOnWebhook: Webhook;
+  executeQuickActionOnWorkspaceMember: WorkspaceMember;
+  generateApiKeyToken: ApiKeyToken;
+  generateTransientToken: TransientToken;
+  impersonate: Verify;
+  renewToken: AuthTokens;
+  signUp: LoginToken;
+  updateActivities: Array<Activity>;
+  updateActivity: Activity;
+  updateActivityTarget: ActivityTarget;
+  updateActivityTargets: Array<ActivityTarget>;
+  updateApiKey: ApiKey;
+  updateApiKeys: Array<ApiKey>;
+  updateAttachment: Attachment;
+  updateAttachments: Array<Attachment>;
+  updateBlocklist: Blocklist;
+  updateBlocklists: Array<Blocklist>;
+  updateComment: Comment;
+  updateComments: Array<Comment>;
+  updateCompanies: Array<Company>;
+  updateCompany: Company;
+  updateConnectedAccount: ConnectedAccount;
+  updateConnectedAccounts: Array<ConnectedAccount>;
+  updateFavorite: Favorite;
+  updateFavorites: Array<Favorite>;
+  updateMessage: Message;
+  updateMessageChannel: MessageChannel;
+  updateMessageChannelMessageAssociation: MessageChannelMessageAssociation;
+  updateMessageChannelMessageAssociations: Array<MessageChannelMessageAssociation>;
+  updateMessageChannels: Array<MessageChannel>;
+  updateMessageParticipant: MessageParticipant;
+  updateMessageParticipants: Array<MessageParticipant>;
+  updateMessageThread: MessageThread;
+  updateMessageThreads: Array<MessageThread>;
+  updateMessages: Array<Message>;
+  updateOneObject: Object;
+  updateOpportunities: Array<Opportunity>;
+  updateOpportunity: Opportunity;
+  updatePasswordViaResetToken: InvalidatePassword;
+  updatePeople: Array<Person>;
+  updatePerson: Person;
+  updatePipelineStep: PipelineStep;
+  updatePipelineSteps: Array<PipelineStep>;
+  updateView: View;
+  updateViewField: ViewField;
+  updateViewFields: Array<ViewField>;
+  updateViewFilter: ViewFilter;
+  updateViewFilters: Array<ViewFilter>;
+  updateViewSort: ViewSort;
+  updateViewSorts: Array<ViewSort>;
+  updateViews: Array<View>;
+  updateWebhook: Webhook;
+  updateWebhooks: Array<Webhook>;
+  updateWorkspace: Workspace;
+  updateWorkspaceMember: WorkspaceMember;
+  updateWorkspaceMembers: Array<WorkspaceMember>;
+  uploadFile: Scalars['String'];
+  uploadImage: Scalars['String'];
+  uploadProfilePicture: Scalars['String'];
+  uploadWorkspaceLogo: Scalars['String'];
+  verify: Verify;
+};
+
+
+export type MutationActivateWorkspaceArgs = {
+  data: ActivateWorkspaceInput;
+};
+
+
+export type MutationChallengeArgs = {
+  email: Scalars['String'];
+  password: Scalars['String'];
+};
+
+
+export type MutationCheckoutArgs = {
+  recurringInterval: Scalars['String'];
+  successUrlPath?: InputMaybe<Scalars['String']>;
+};
+
+
+export type MutationCreateActivitiesArgs = {
+  data: Array<ActivityCreateInput>;
+};
+
+
+export type MutationCreateActivityArgs = {
+  data: ActivityCreateInput;
+};
+
+
+export type MutationCreateActivityTargetArgs = {
+  data: ActivityTargetCreateInput;
+};
+
+
+export type MutationCreateActivityTargetsArgs = {
+  data: Array<ActivityTargetCreateInput>;
+};
+
+
+export type MutationCreateApiKeyArgs = {
+  data: ApiKeyCreateInput;
+};
+
+
+export type MutationCreateApiKeysArgs = {
+  data: Array<ApiKeyCreateInput>;
+};
+
+
+export type MutationCreateAttachmentArgs = {
+  data: AttachmentCreateInput;
+};
+
+
+export type MutationCreateAttachmentsArgs = {
+  data: Array<AttachmentCreateInput>;
+};
+
+
+export type MutationCreateBlocklistArgs = {
+  data: BlocklistCreateInput;
+};
+
+
+export type MutationCreateBlocklistsArgs = {
+  data: Array<BlocklistCreateInput>;
+};
+
+
+export type MutationCreateCommentArgs = {
+  data: CommentCreateInput;
+};
+
+
+export type MutationCreateCommentsArgs = {
+  data: Array<CommentCreateInput>;
+};
+
+
+export type MutationCreateCompaniesArgs = {
+  data: Array<CompanyCreateInput>;
+};
+
+
+export type MutationCreateCompanyArgs = {
+  data: CompanyCreateInput;
+};
+
+
+export type MutationCreateConnectedAccountArgs = {
+  data: ConnectedAccountCreateInput;
+};
+
+
+export type MutationCreateConnectedAccountsArgs = {
+  data: Array<ConnectedAccountCreateInput>;
+};
+
+
+export type MutationCreateEventArgs = {
+  data: Scalars['JSON'];
+  type: Scalars['String'];
+};
+
+
+export type MutationCreateFavoriteArgs = {
+  data: FavoriteCreateInput;
+};
+
+
+export type MutationCreateFavoritesArgs = {
+  data: Array<FavoriteCreateInput>;
+};
+
+
+export type MutationCreateMessageArgs = {
+  data: MessageCreateInput;
+};
+
+
+export type MutationCreateMessageChannelArgs = {
+  data: MessageChannelCreateInput;
+};
+
+
+export type MutationCreateMessageChannelMessageAssociationArgs = {
+  data: MessageChannelMessageAssociationCreateInput;
+};
+
+
+export type MutationCreateMessageChannelMessageAssociationsArgs = {
+  data: Array<MessageChannelMessageAssociationCreateInput>;
+};
+
+
+export type MutationCreateMessageChannelsArgs = {
+  data: Array<MessageChannelCreateInput>;
+};
+
+
+export type MutationCreateMessageParticipantArgs = {
+  data: MessageParticipantCreateInput;
+};
+
+
+export type MutationCreateMessageParticipantsArgs = {
+  data: Array<MessageParticipantCreateInput>;
+};
+
+
+export type MutationCreateMessageThreadArgs = {
+  data: MessageThreadCreateInput;
+};
+
+
+export type MutationCreateMessageThreadsArgs = {
+  data: Array<MessageThreadCreateInput>;
+};
+
+
+export type MutationCreateMessagesArgs = {
+  data: Array<MessageCreateInput>;
+};
+
+
+export type MutationCreateOpportunitiesArgs = {
+  data: Array<OpportunityCreateInput>;
+};
+
+
+export type MutationCreateOpportunityArgs = {
+  data: OpportunityCreateInput;
+};
+
+
+export type MutationCreatePeopleArgs = {
+  data: Array<PersonCreateInput>;
+};
+
+
+export type MutationCreatePersonArgs = {
+  data: PersonCreateInput;
+};
+
+
+export type MutationCreatePipelineStepArgs = {
+  data: PipelineStepCreateInput;
+};
+
+
+export type MutationCreatePipelineStepsArgs = {
+  data: Array<PipelineStepCreateInput>;
+};
+
+
+export type MutationCreateViewArgs = {
+  data: ViewCreateInput;
+};
+
+
+export type MutationCreateViewFieldArgs = {
+  data: ViewFieldCreateInput;
+};
+
+
+export type MutationCreateViewFieldsArgs = {
+  data: Array<ViewFieldCreateInput>;
+};
+
+
+export type MutationCreateViewFilterArgs = {
+  data: ViewFilterCreateInput;
+};
+
+
+export type MutationCreateViewFiltersArgs = {
+  data: Array<ViewFilterCreateInput>;
+};
+
+
+export type MutationCreateViewSortArgs = {
+  data: ViewSortCreateInput;
+};
+
+
+export type MutationCreateViewSortsArgs = {
+  data: Array<ViewSortCreateInput>;
+};
+
+
+export type MutationCreateViewsArgs = {
+  data: Array<ViewCreateInput>;
+};
+
+
+export type MutationCreateWebhookArgs = {
+  data: WebhookCreateInput;
+};
+
+
+export type MutationCreateWebhooksArgs = {
+  data: Array<WebhookCreateInput>;
+};
+
+
+export type MutationCreateWorkspaceMemberArgs = {
+  data: WorkspaceMemberCreateInput;
+};
+
+
+export type MutationCreateWorkspaceMembersArgs = {
+  data: Array<WorkspaceMemberCreateInput>;
+};
+
+
+export type MutationDeleteActivitiesArgs = {
+  filter: ActivityFilterInput;
+};
+
+
+export type MutationDeleteActivityArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteActivityTargetArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteActivityTargetsArgs = {
+  filter: ActivityTargetFilterInput;
+};
+
+
+export type MutationDeleteApiKeyArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteApiKeysArgs = {
+  filter: ApiKeyFilterInput;
+};
+
+
+export type MutationDeleteAttachmentArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteAttachmentsArgs = {
+  filter: AttachmentFilterInput;
+};
+
+
+export type MutationDeleteBlocklistArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteBlocklistsArgs = {
+  filter: BlocklistFilterInput;
+};
+
+
+export type MutationDeleteCommentArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteCommentsArgs = {
+  filter: CommentFilterInput;
+};
+
+
+export type MutationDeleteCompaniesArgs = {
+  filter: CompanyFilterInput;
+};
+
+
+export type MutationDeleteCompanyArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteConnectedAccountArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteConnectedAccountsArgs = {
+  filter: ConnectedAccountFilterInput;
+};
+
+
+export type MutationDeleteFavoriteArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteFavoritesArgs = {
+  filter: FavoriteFilterInput;
+};
+
+
+export type MutationDeleteMessageArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteMessageChannelArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteMessageChannelMessageAssociationArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteMessageChannelMessageAssociationsArgs = {
+  filter: MessageChannelMessageAssociationFilterInput;
+};
+
+
+export type MutationDeleteMessageChannelsArgs = {
+  filter: MessageChannelFilterInput;
+};
+
+
+export type MutationDeleteMessageParticipantArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteMessageParticipantsArgs = {
+  filter: MessageParticipantFilterInput;
+};
+
+
+export type MutationDeleteMessageThreadArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteMessageThreadsArgs = {
+  filter: MessageThreadFilterInput;
+};
+
+
+export type MutationDeleteMessagesArgs = {
+  filter: MessageFilterInput;
+};
+
+
+export type MutationDeleteOneObjectArgs = {
+  input: DeleteOneObjectInput;
+};
+
+
+export type MutationDeleteOpportunitiesArgs = {
+  filter: OpportunityFilterInput;
+};
+
+
+export type MutationDeleteOpportunityArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeletePeopleArgs = {
+  filter: PersonFilterInput;
+};
+
+
+export type MutationDeletePersonArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeletePipelineStepArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeletePipelineStepsArgs = {
+  filter: PipelineStepFilterInput;
+};
+
+
+export type MutationDeleteViewArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteViewFieldArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteViewFieldsArgs = {
+  filter: ViewFieldFilterInput;
+};
+
+
+export type MutationDeleteViewFilterArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteViewFiltersArgs = {
+  filter: ViewFilterFilterInput;
+};
+
+
+export type MutationDeleteViewSortArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteViewSortsArgs = {
+  filter: ViewSortFilterInput;
+};
+
+
+export type MutationDeleteViewsArgs = {
+  filter: ViewFilterInput;
+};
+
+
+export type MutationDeleteWebhookArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteWebhooksArgs = {
+  filter: WebhookFilterInput;
+};
+
+
+export type MutationDeleteWorkspaceMemberArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationDeleteWorkspaceMembersArgs = {
+  filter: WorkspaceMemberFilterInput;
+};
+
+
+export type MutationEmailPasswordResetLinkArgs = {
+  email: Scalars['String'];
+};
+
+
+export type MutationExecuteQuickActionOnActivityArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnActivityTargetArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnApiKeyArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnAttachmentArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnBlocklistArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnCommentArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnCompanyArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnConnectedAccountArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnFavoriteArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnMessageArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnMessageChannelArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnMessageChannelMessageAssociationArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnMessageParticipantArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnMessageThreadArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnOpportunityArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnPersonArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnPipelineStepArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnViewArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnViewFieldArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnViewFilterArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnViewSortArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnWebhookArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationExecuteQuickActionOnWorkspaceMemberArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type MutationGenerateApiKeyTokenArgs = {
+  apiKeyId: Scalars['String'];
+  expiresAt: Scalars['String'];
+};
+
+
+export type MutationImpersonateArgs = {
+  userId: Scalars['String'];
+};
+
+
+export type MutationRenewTokenArgs = {
+  refreshToken: Scalars['String'];
+};
+
+
+export type MutationSignUpArgs = {
+  email: Scalars['String'];
+  password: Scalars['String'];
+  workspaceInviteHash?: InputMaybe<Scalars['String']>;
+};
+
+
+export type MutationUpdateActivitiesArgs = {
+  data: ActivityUpdateInput;
+  filter: ActivityFilterInput;
+};
+
+
+export type MutationUpdateActivityArgs = {
+  data: ActivityUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateActivityTargetArgs = {
+  data: ActivityTargetUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateActivityTargetsArgs = {
+  data: ActivityTargetUpdateInput;
+  filter: ActivityTargetFilterInput;
+};
+
+
+export type MutationUpdateApiKeyArgs = {
+  data: ApiKeyUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateApiKeysArgs = {
+  data: ApiKeyUpdateInput;
+  filter: ApiKeyFilterInput;
+};
+
+
+export type MutationUpdateAttachmentArgs = {
+  data: AttachmentUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateAttachmentsArgs = {
+  data: AttachmentUpdateInput;
+  filter: AttachmentFilterInput;
+};
+
+
+export type MutationUpdateBlocklistArgs = {
+  data: BlocklistUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateBlocklistsArgs = {
+  data: BlocklistUpdateInput;
+  filter: BlocklistFilterInput;
+};
+
+
+export type MutationUpdateCommentArgs = {
+  data: CommentUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateCommentsArgs = {
+  data: CommentUpdateInput;
+  filter: CommentFilterInput;
+};
+
+
+export type MutationUpdateCompaniesArgs = {
+  data: CompanyUpdateInput;
+  filter: CompanyFilterInput;
+};
+
+
+export type MutationUpdateCompanyArgs = {
+  data: CompanyUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateConnectedAccountArgs = {
+  data: ConnectedAccountUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateConnectedAccountsArgs = {
+  data: ConnectedAccountUpdateInput;
+  filter: ConnectedAccountFilterInput;
+};
+
+
+export type MutationUpdateFavoriteArgs = {
+  data: FavoriteUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateFavoritesArgs = {
+  data: FavoriteUpdateInput;
+  filter: FavoriteFilterInput;
+};
+
+
+export type MutationUpdateMessageArgs = {
+  data: MessageUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateMessageChannelArgs = {
+  data: MessageChannelUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateMessageChannelMessageAssociationArgs = {
+  data: MessageChannelMessageAssociationUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateMessageChannelMessageAssociationsArgs = {
+  data: MessageChannelMessageAssociationUpdateInput;
+  filter: MessageChannelMessageAssociationFilterInput;
+};
+
+
+export type MutationUpdateMessageChannelsArgs = {
+  data: MessageChannelUpdateInput;
+  filter: MessageChannelFilterInput;
+};
+
+
+export type MutationUpdateMessageParticipantArgs = {
+  data: MessageParticipantUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateMessageParticipantsArgs = {
+  data: MessageParticipantUpdateInput;
+  filter: MessageParticipantFilterInput;
+};
+
+
+export type MutationUpdateMessageThreadArgs = {
+  data: MessageThreadUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateMessageThreadsArgs = {
+  data: MessageThreadUpdateInput;
+  filter: MessageThreadFilterInput;
+};
+
+
+export type MutationUpdateMessagesArgs = {
+  data: MessageUpdateInput;
+  filter: MessageFilterInput;
+};
+
+
+export type MutationUpdateOpportunitiesArgs = {
+  data: OpportunityUpdateInput;
+  filter: OpportunityFilterInput;
+};
+
+
+export type MutationUpdateOpportunityArgs = {
+  data: OpportunityUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdatePasswordViaResetTokenArgs = {
+  newPassword: Scalars['String'];
+  passwordResetToken: Scalars['String'];
+};
+
+
+export type MutationUpdatePeopleArgs = {
+  data: PersonUpdateInput;
+  filter: PersonFilterInput;
+};
+
+
+export type MutationUpdatePersonArgs = {
+  data: PersonUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdatePipelineStepArgs = {
+  data: PipelineStepUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdatePipelineStepsArgs = {
+  data: PipelineStepUpdateInput;
+  filter: PipelineStepFilterInput;
+};
+
+
+export type MutationUpdateViewArgs = {
+  data: ViewUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateViewFieldArgs = {
+  data: ViewFieldUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateViewFieldsArgs = {
+  data: ViewFieldUpdateInput;
+  filter: ViewFieldFilterInput;
+};
+
+
+export type MutationUpdateViewFilterArgs = {
+  data: ViewFilterUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateViewFiltersArgs = {
+  data: ViewFilterUpdateInput;
+  filter: ViewFilterFilterInput;
+};
+
+
+export type MutationUpdateViewSortArgs = {
+  data: ViewSortUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateViewSortsArgs = {
+  data: ViewSortUpdateInput;
+  filter: ViewSortFilterInput;
+};
+
+
+export type MutationUpdateViewsArgs = {
+  data: ViewUpdateInput;
+  filter: ViewFilterInput;
+};
+
+
+export type MutationUpdateWebhookArgs = {
+  data: WebhookUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateWebhooksArgs = {
+  data: WebhookUpdateInput;
+  filter: WebhookFilterInput;
+};
+
+
+export type MutationUpdateWorkspaceArgs = {
+  data: UpdateWorkspaceInput;
+};
+
+
+export type MutationUpdateWorkspaceMemberArgs = {
+  data: WorkspaceMemberUpdateInput;
+  id: Scalars['ID'];
+};
+
+
+export type MutationUpdateWorkspaceMembersArgs = {
+  data: WorkspaceMemberUpdateInput;
+  filter: WorkspaceMemberFilterInput;
+};
+
+
+export type MutationUploadFileArgs = {
+  file: Scalars['Upload'];
+  fileFolder?: InputMaybe<FileFolder>;
+};
+
+
+export type MutationUploadImageArgs = {
+  file: Scalars['Upload'];
+  fileFolder?: InputMaybe<FileFolder>;
+};
+
+
+export type MutationUploadProfilePictureArgs = {
+  file: Scalars['Upload'];
+};
+
+
+export type MutationUploadWorkspaceLogoArgs = {
+  file: Scalars['Upload'];
+};
+
+
+export type MutationVerifyArgs = {
+  loginToken: Scalars['String'];
+};
+
+export type ObjectConnection = {
+  /** Array of edges. */
+  edges: Array<ObjectEdge>;
+  /** Paging information */
+  pageInfo: PageInfo;
+  /** Fetch total count of records */
+  totalCount: Scalars['Int'];
+};
+
+export type ObjectFieldsConnection = {
+  /** Array of edges. */
+  edges: Array<FieldEdge>;
+  /** Paging information */
+  pageInfo: PageInfo;
+  /** Fetch total count of records */
+  totalCount: Scalars['Int'];
+};
+
+/** An opportunity */
+export type Opportunity = {
+  /** Activities tied to the opportunity */
+  activityTargets?: Maybe<ActivityTargetConnection>;
+  /** Opportunity amount */
+  amount?: Maybe<Currency>;
+  /** Attachments linked to the opportunity. */
+  attachments?: Maybe<AttachmentConnection>;
+  /** Opportunity close date */
+  closeDate?: Maybe<Scalars['DateTime']>;
+  /** Opportunity company */
+  company?: Maybe<Company>;
+  /** Opportunity company id foreign key */
+  companyId?: Maybe<Scalars['ID']>;
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  /** Favorites linked to the opportunity */
+  favorites?: Maybe<FavoriteConnection>;
+  id: Scalars['ID'];
+  /** The opportunity name */
+  name: Scalars['String'];
+  /** Opportunity pipeline step */
+  pipelineStep?: Maybe<PipelineStep>;
+  /** Opportunity pipeline step id foreign key */
+  pipelineStepId?: Maybe<Scalars['ID']>;
+  /** Opportunity point of contact */
+  pointOfContact?: Maybe<Person>;
+  /** Opportunity point of contact id foreign key */
+  pointOfContactId?: Maybe<Scalars['ID']>;
+  /** Position */
+  position?: Maybe<Scalars['Float']>;
+  /** Opportunity probability */
+  probability: Scalars['String'];
+  /** Opportunity stage */
+  stage: OpportunityStageEnum;
+  updatedAt: Scalars['DateTime'];
+};
+
+
+/** An opportunity */
+export type OpportunityActivityTargetsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ActivityTargetFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ActivityTargetOrderByInput>;
+};
+
+
+/** An opportunity */
+export type OpportunityAttachmentsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<AttachmentFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<AttachmentOrderByInput>;
+};
+
+
+/** An opportunity */
+export type OpportunityFavoritesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<FavoriteFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<FavoriteOrderByInput>;
+};
+
+/** An opportunity */
+export type OpportunityConnection = {
+  edges: Array<OpportunityEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** An opportunity */
+export type OpportunityCreateInput = {
+  /** Opportunity amount */
+  amount?: InputMaybe<CurrencyCreateInput>;
+  /** Opportunity close date */
+  closeDate?: InputMaybe<Scalars['DateTime']>;
+  /** Opportunity company id foreign key */
+  companyId?: InputMaybe<Scalars['ID']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** The opportunity name */
+  name?: InputMaybe<Scalars['String']>;
+  /** Opportunity pipeline step id foreign key */
+  pipelineStepId?: InputMaybe<Scalars['ID']>;
+  /** Opportunity point of contact id foreign key */
+  pointOfContactId?: InputMaybe<Scalars['ID']>;
+  /** Position */
+  position?: InputMaybe<Scalars['Float']>;
+  /** Opportunity probability */
+  probability?: InputMaybe<Scalars['String']>;
+  /** Opportunity stage */
+  stage?: InputMaybe<OpportunityStageEnum>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** An opportunity */
+export type OpportunityEdge = {
+  cursor: Scalars['Cursor'];
+  node: Opportunity;
+};
+
+/** An opportunity */
+export type OpportunityFilterInput = {
+  /** Opportunity amount */
+  amount?: InputMaybe<CurrencyFilterInput>;
+  and?: InputMaybe<Array<InputMaybe<OpportunityFilterInput>>>;
+  /** Opportunity close date */
+  closeDate?: InputMaybe<DateFilter>;
+  /** Opportunity company id foreign key */
+  companyId?: InputMaybe<UuidFilter>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  id?: InputMaybe<UuidFilter>;
+  /** The opportunity name */
+  name?: InputMaybe<StringFilter>;
+  not?: InputMaybe<OpportunityFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<OpportunityFilterInput>>>;
+  /** Opportunity pipeline step id foreign key */
+  pipelineStepId?: InputMaybe<UuidFilter>;
+  /** Opportunity point of contact id foreign key */
+  pointOfContactId?: InputMaybe<UuidFilter>;
+  /** Position */
+  position?: InputMaybe<FloatFilter>;
+  /** Opportunity probability */
+  probability?: InputMaybe<StringFilter>;
+  /** Opportunity stage */
+  stage?: InputMaybe<OpportunityStageEnumFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+};
+
+/** An opportunity */
+export type OpportunityOrderByInput = {
+  /** Opportunity amount */
+  amount?: InputMaybe<CurrencyOrderByInput>;
+  /** Opportunity close date */
+  closeDate?: InputMaybe<OrderByDirection>;
+  /** Opportunity company id foreign key */
+  companyId?: InputMaybe<OrderByDirection>;
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** The opportunity name */
+  name?: InputMaybe<OrderByDirection>;
+  /** Opportunity pipeline step id foreign key */
+  pipelineStepId?: InputMaybe<OrderByDirection>;
+  /** Opportunity point of contact id foreign key */
+  pointOfContactId?: InputMaybe<OrderByDirection>;
+  /** Position */
+  position?: InputMaybe<OrderByDirection>;
+  /** Opportunity probability */
+  probability?: InputMaybe<OrderByDirection>;
+  /** Opportunity stage */
+  stage?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+};
+
+/** Opportunity stage */
+export enum OpportunityStageEnum {
+  /** Customer */
+  Customer = 'CUSTOMER',
+  /** Meeting */
+  Meeting = 'MEETING',
+  /** New */
+  New = 'NEW',
+  /** Proposal */
+  Proposal = 'PROPOSAL',
+  /** Screening */
+  Screening = 'SCREENING'
+}
+
+export type OpportunityStageEnumFilter = {
+  eq?: InputMaybe<OpportunityStageEnum>;
+  in?: InputMaybe<Array<InputMaybe<OpportunityStageEnum>>>;
+  is?: InputMaybe<FilterIs>;
+  neq?: InputMaybe<OpportunityStageEnum>;
+};
+
+/** An opportunity */
+export type OpportunityUpdateInput = {
+  /** Opportunity amount */
+  amount?: InputMaybe<CurrencyUpdateInput>;
+  /** Opportunity close date */
+  closeDate?: InputMaybe<Scalars['DateTime']>;
+  /** Opportunity company id foreign key */
+  companyId?: InputMaybe<Scalars['ID']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** The opportunity name */
+  name?: InputMaybe<Scalars['String']>;
+  /** Opportunity pipeline step id foreign key */
+  pipelineStepId?: InputMaybe<Scalars['ID']>;
+  /** Opportunity point of contact id foreign key */
+  pointOfContactId?: InputMaybe<Scalars['ID']>;
+  /** Position */
+  position?: InputMaybe<Scalars['Float']>;
+  /** Opportunity probability */
+  probability?: InputMaybe<Scalars['String']>;
+  /** Opportunity stage */
+  stage?: InputMaybe<OpportunityStageEnum>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** This enum is used to specify the order of results */
+export enum OrderByDirection {
+  /** Ascending order, nulls first */
+  AscNullsFirst = 'AscNullsFirst',
+  /** Ascending order, nulls last */
+  AscNullsLast = 'AscNullsLast',
+  /** Descending order, nulls first */
+  DescNullsFirst = 'DescNullsFirst',
+  /** Descending order, nulls last */
+  DescNullsLast = 'DescNullsLast'
+}
+
+export type PageInfo = {
+  /** The cursor of the last returned record. */
+  endCursor?: Maybe<Scalars['ConnectionCursor']>;
+  /** true if paging forward and there are more records. */
+  hasNextPage: Scalars['Boolean'];
+  /** true if paging backwards and there are more records. */
+  hasPreviousPage: Scalars['Boolean'];
+  /** The cursor of the first returned record. */
+  startCursor?: Maybe<Scalars['ConnectionCursor']>;
+};
+
+/** A person */
+export type Person = {
+  /** Activities tied to the contact */
+  activityTargets?: Maybe<ActivityTargetConnection>;
+  /** Attachments linked to the contact. */
+  attachments?: Maybe<AttachmentConnection>;
+  /** Contact’s avatar */
+  avatarUrl: Scalars['String'];
+  /** Contact’s city */
+  city: Scalars['String'];
+  /** Contact’s company */
+  company?: Maybe<Company>;
+  /** Contact’s company id foreign key */
+  companyId?: Maybe<Scalars['ID']>;
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  /** Contact’s Email */
+  email: Scalars['String'];
+  /** Favorites linked to the contact */
+  favorites?: Maybe<FavoriteConnection>;
+  id: Scalars['ID'];
+  /** Contact’s job title */
+  jobTitle: Scalars['String'];
+  /** Contact’s Linkedin account */
+  linkedinLink?: Maybe<Link>;
+  /** Message Participants */
+  messageParticipants?: Maybe<MessageParticipantConnection>;
+  /** Contact’s name */
+  name?: Maybe<FullName>;
+  /** Contact’s phone number */
+  phone: Scalars['String'];
+  /** Point of Contact for Opportunities */
+  pointOfContactForOpportunities?: Maybe<OpportunityConnection>;
+  /** Record Position */
+  position?: Maybe<Scalars['Float']>;
+  updatedAt: Scalars['DateTime'];
+  /** Contact’s X/Twitter account */
+  xLink?: Maybe<Link>;
+};
+
+
+/** A person */
+export type PersonActivityTargetsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ActivityTargetFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ActivityTargetOrderByInput>;
+};
+
+
+/** A person */
+export type PersonAttachmentsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<AttachmentFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<AttachmentOrderByInput>;
+};
+
+
+/** A person */
+export type PersonFavoritesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<FavoriteFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<FavoriteOrderByInput>;
+};
+
+
+/** A person */
+export type PersonMessageParticipantsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<MessageParticipantFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<MessageParticipantOrderByInput>;
+};
+
+
+/** A person */
+export type PersonPointOfContactForOpportunitiesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<OpportunityFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<OpportunityOrderByInput>;
+};
+
+/** A person */
+export type PersonConnection = {
+  edges: Array<PersonEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** A person */
+export type PersonCreateInput = {
+  /** Contact’s avatar */
+  avatarUrl?: InputMaybe<Scalars['String']>;
+  /** Contact’s city */
+  city?: InputMaybe<Scalars['String']>;
+  /** Contact’s company id foreign key */
+  companyId?: InputMaybe<Scalars['ID']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Contact’s Email */
+  email?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Contact’s job title */
+  jobTitle?: InputMaybe<Scalars['String']>;
+  /** Contact’s Linkedin account */
+  linkedinLink?: InputMaybe<LinkCreateInput>;
+  /** Contact’s name */
+  name?: InputMaybe<FullNameCreateInput>;
+  /** Contact’s phone number */
+  phone?: InputMaybe<Scalars['String']>;
+  /** Record Position */
+  position?: InputMaybe<Scalars['Float']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Contact’s X/Twitter account */
+  xLink?: InputMaybe<LinkCreateInput>;
+};
+
+/** A person */
+export type PersonEdge = {
+  cursor: Scalars['Cursor'];
+  node: Person;
+};
+
+/** A person */
+export type PersonFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<PersonFilterInput>>>;
+  /** Contact’s avatar */
+  avatarUrl?: InputMaybe<StringFilter>;
+  /** Contact’s city */
+  city?: InputMaybe<StringFilter>;
+  /** Contact’s company id foreign key */
+  companyId?: InputMaybe<UuidFilter>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  /** Contact’s Email */
+  email?: InputMaybe<StringFilter>;
+  id?: InputMaybe<UuidFilter>;
+  /** Contact’s job title */
+  jobTitle?: InputMaybe<StringFilter>;
+  /** Contact’s Linkedin account */
+  linkedinLink?: InputMaybe<LinkFilterInput>;
+  /** Contact’s name */
+  name?: InputMaybe<FullNameFilterInput>;
+  not?: InputMaybe<PersonFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<PersonFilterInput>>>;
+  /** Contact’s phone number */
+  phone?: InputMaybe<StringFilter>;
+  /** Record Position */
+  position?: InputMaybe<FloatFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+  /** Contact’s X/Twitter account */
+  xLink?: InputMaybe<LinkFilterInput>;
+};
+
+/** A person */
+export type PersonOrderByInput = {
+  /** Contact’s avatar */
+  avatarUrl?: InputMaybe<OrderByDirection>;
+  /** Contact’s city */
+  city?: InputMaybe<OrderByDirection>;
+  /** Contact’s company id foreign key */
+  companyId?: InputMaybe<OrderByDirection>;
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  /** Contact’s Email */
+  email?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** Contact’s job title */
+  jobTitle?: InputMaybe<OrderByDirection>;
+  /** Contact’s Linkedin account */
+  linkedinLink?: InputMaybe<LinkOrderByInput>;
+  /** Contact’s name */
+  name?: InputMaybe<FullNameOrderByInput>;
+  /** Contact’s phone number */
+  phone?: InputMaybe<OrderByDirection>;
+  /** Record Position */
+  position?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+  /** Contact’s X/Twitter account */
+  xLink?: InputMaybe<LinkOrderByInput>;
+};
+
+/** A person */
+export type PersonUpdateInput = {
+  /** Contact’s avatar */
+  avatarUrl?: InputMaybe<Scalars['String']>;
+  /** Contact’s city */
+  city?: InputMaybe<Scalars['String']>;
+  /** Contact’s company id foreign key */
+  companyId?: InputMaybe<Scalars['ID']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Contact’s Email */
+  email?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Contact’s job title */
+  jobTitle?: InputMaybe<Scalars['String']>;
+  /** Contact’s Linkedin account */
+  linkedinLink?: InputMaybe<LinkUpdateInput>;
+  /** Contact’s name */
+  name?: InputMaybe<FullNameUpdateInput>;
+  /** Contact’s phone number */
+  phone?: InputMaybe<Scalars['String']>;
+  /** Record Position */
+  position?: InputMaybe<Scalars['Float']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Contact’s X/Twitter account */
+  xLink?: InputMaybe<LinkUpdateInput>;
+};
+
+/** A pipeline step */
+export type PipelineStep = {
+  /** Pipeline Step color */
+  color: Scalars['String'];
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  id: Scalars['ID'];
+  /** Pipeline Step name */
+  name: Scalars['String'];
+  /** Opportunities linked to the step. */
+  opportunities?: Maybe<OpportunityConnection>;
+  /** Pipeline Step position */
+  position?: Maybe<Scalars['Float']>;
+  updatedAt: Scalars['DateTime'];
+};
+
+
+/** A pipeline step */
+export type PipelineStepOpportunitiesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<OpportunityFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<OpportunityOrderByInput>;
+};
+
+/** A pipeline step */
+export type PipelineStepConnection = {
+  edges: Array<PipelineStepEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** A pipeline step */
+export type PipelineStepCreateInput = {
+  /** Pipeline Step color */
+  color?: InputMaybe<Scalars['String']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Pipeline Step name */
+  name?: InputMaybe<Scalars['String']>;
+  /** Pipeline Step position */
+  position?: InputMaybe<Scalars['Float']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** A pipeline step */
+export type PipelineStepEdge = {
+  cursor: Scalars['Cursor'];
+  node: PipelineStep;
+};
+
+/** A pipeline step */
+export type PipelineStepFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<PipelineStepFilterInput>>>;
+  /** Pipeline Step color */
+  color?: InputMaybe<StringFilter>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  id?: InputMaybe<UuidFilter>;
+  /** Pipeline Step name */
+  name?: InputMaybe<StringFilter>;
+  not?: InputMaybe<PipelineStepFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<PipelineStepFilterInput>>>;
+  /** Pipeline Step position */
+  position?: InputMaybe<FloatFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+};
+
+/** A pipeline step */
+export type PipelineStepOrderByInput = {
+  /** Pipeline Step color */
+  color?: InputMaybe<OrderByDirection>;
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** Pipeline Step name */
+  name?: InputMaybe<OrderByDirection>;
+  /** Pipeline Step position */
+  position?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+};
+
+/** A pipeline step */
+export type PipelineStepUpdateInput = {
+  /** Pipeline Step color */
+  color?: InputMaybe<Scalars['String']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Pipeline Step name */
+  name?: InputMaybe<Scalars['String']>;
+  /** Pipeline Step position */
+  position?: InputMaybe<Scalars['Float']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+export type ProductPriceEntity = {
+  created: Scalars['Float'];
+  recurringInterval: Scalars['String'];
+  stripePriceId: Scalars['String'];
+  unitAmount: Scalars['Float'];
+};
+
+export type ProductPricesEntity = {
+  productPrices: Array<ProductPriceEntity>;
+  totalNumberOfPrices: Scalars['Int'];
+};
+
+export type Query = {
+  activities: ActivityConnection;
+  activity: Activity;
+  activityDuplicates: ActivityConnection;
+  activityTarget: ActivityTarget;
+  activityTargetDuplicates: ActivityTargetConnection;
+  activityTargets: ActivityTargetConnection;
+  apiKey: ApiKey;
+  apiKeyDuplicates: ApiKeyConnection;
+  apiKeys: ApiKeyConnection;
+  attachment: Attachment;
+  attachmentDuplicates: AttachmentConnection;
+  attachments: AttachmentConnection;
+  blocklist: Blocklist;
+  blocklistDuplicates: BlocklistConnection;
+  blocklists: BlocklistConnection;
+  checkUserExists: UserExists;
+  checkWorkspaceInviteHashIsValid: WorkspaceInviteHashValid;
+  clientConfig: ClientConfig;
+  comment: Comment;
+  commentDuplicates: CommentConnection;
+  comments: CommentConnection;
+  companies: CompanyConnection;
+  company: Company;
+  companyDuplicates: CompanyConnection;
+  connectedAccount: ConnectedAccount;
+  connectedAccountDuplicates: ConnectedAccountConnection;
+  connectedAccounts: ConnectedAccountConnection;
+  currentUser: User;
+  currentWorkspace: Workspace;
+  favorite: Favorite;
+  favoriteDuplicates: FavoriteConnection;
+  favorites: FavoriteConnection;
+  findWorkspaceFromInviteHash: Workspace;
+  getProductPrices: ProductPricesEntity;
+  getTimelineThreadsFromCompanyId: TimelineThreadsWithTotal;
+  getTimelineThreadsFromPersonId: TimelineThreadsWithTotal;
+  message: Message;
+  messageChannel: MessageChannel;
+  messageChannelDuplicates: MessageChannelConnection;
+  messageChannelMessageAssociation: MessageChannelMessageAssociation;
+  messageChannelMessageAssociationDuplicates: MessageChannelMessageAssociationConnection;
+  messageChannelMessageAssociations: MessageChannelMessageAssociationConnection;
+  messageChannels: MessageChannelConnection;
+  messageDuplicates: MessageConnection;
+  messageParticipant: MessageParticipant;
+  messageParticipantDuplicates: MessageParticipantConnection;
+  messageParticipants: MessageParticipantConnection;
+  messageThread: MessageThread;
+  messageThreadDuplicates: MessageThreadConnection;
+  messageThreads: MessageThreadConnection;
+  messages: MessageConnection;
+  object: Object;
+  objects: ObjectConnection;
+  opportunities: OpportunityConnection;
+  opportunity: Opportunity;
+  opportunityDuplicates: OpportunityConnection;
+  people: PersonConnection;
+  person: Person;
+  personDuplicates: PersonConnection;
+  pipelineStep: PipelineStep;
+  pipelineStepDuplicates: PipelineStepConnection;
+  pipelineSteps: PipelineStepConnection;
+  validatePasswordResetToken: ValidatePasswordResetToken;
+  view: View;
+  viewDuplicates: ViewConnection;
+  viewField: ViewField;
+  viewFieldDuplicates: ViewFieldConnection;
+  viewFields: ViewFieldConnection;
+  viewFilter: ViewFilter;
+  viewFilterDuplicates: ViewFilterConnection;
+  viewFilters: ViewFilterConnection;
+  viewSort: ViewSort;
+  viewSortDuplicates: ViewSortConnection;
+  viewSorts: ViewSortConnection;
+  views: ViewConnection;
+  webhook: Webhook;
+  webhookDuplicates: WebhookConnection;
+  webhooks: WebhookConnection;
+  workspaceMember: WorkspaceMember;
+  workspaceMemberDuplicates: WorkspaceMemberConnection;
+  workspaceMembers: WorkspaceMemberConnection;
+};
+
+
+export type QueryActivitiesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ActivityFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ActivityOrderByInput>;
+};
+
+
+export type QueryActivityArgs = {
+  filter: ActivityFilterInput;
+};
+
+
+export type QueryActivityDuplicatesArgs = {
+  data?: InputMaybe<ActivityCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryActivityTargetArgs = {
+  filter: ActivityTargetFilterInput;
+};
+
+
+export type QueryActivityTargetDuplicatesArgs = {
+  data?: InputMaybe<ActivityTargetCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryActivityTargetsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ActivityTargetFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ActivityTargetOrderByInput>;
+};
+
+
+export type QueryApiKeyArgs = {
+  filter: ApiKeyFilterInput;
+};
+
+
+export type QueryApiKeyDuplicatesArgs = {
+  data?: InputMaybe<ApiKeyCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryApiKeysArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ApiKeyFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ApiKeyOrderByInput>;
+};
+
+
+export type QueryAttachmentArgs = {
+  filter: AttachmentFilterInput;
+};
+
+
+export type QueryAttachmentDuplicatesArgs = {
+  data?: InputMaybe<AttachmentCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryAttachmentsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<AttachmentFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<AttachmentOrderByInput>;
+};
+
+
+export type QueryBlocklistArgs = {
+  filter: BlocklistFilterInput;
+};
+
+
+export type QueryBlocklistDuplicatesArgs = {
+  data?: InputMaybe<BlocklistCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryBlocklistsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<BlocklistFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<BlocklistOrderByInput>;
+};
+
+
+export type QueryCheckUserExistsArgs = {
+  email: Scalars['String'];
+};
+
+
+export type QueryCheckWorkspaceInviteHashIsValidArgs = {
+  inviteHash: Scalars['String'];
+};
+
+
+export type QueryCommentArgs = {
+  filter: CommentFilterInput;
+};
+
+
+export type QueryCommentDuplicatesArgs = {
+  data?: InputMaybe<CommentCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryCommentsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<CommentFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<CommentOrderByInput>;
+};
+
+
+export type QueryCompaniesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<CompanyFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<CompanyOrderByInput>;
+};
+
+
+export type QueryCompanyArgs = {
+  filter: CompanyFilterInput;
+};
+
+
+export type QueryCompanyDuplicatesArgs = {
+  data?: InputMaybe<CompanyCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryConnectedAccountArgs = {
+  filter: ConnectedAccountFilterInput;
+};
+
+
+export type QueryConnectedAccountDuplicatesArgs = {
+  data?: InputMaybe<ConnectedAccountCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryConnectedAccountsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ConnectedAccountFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ConnectedAccountOrderByInput>;
+};
+
+
+export type QueryFavoriteArgs = {
+  filter: FavoriteFilterInput;
+};
+
+
+export type QueryFavoriteDuplicatesArgs = {
+  data?: InputMaybe<FavoriteCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryFavoritesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<FavoriteFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<FavoriteOrderByInput>;
+};
+
+
+export type QueryFindWorkspaceFromInviteHashArgs = {
+  inviteHash: Scalars['String'];
+};
+
+
+export type QueryGetProductPricesArgs = {
+  product: Scalars['String'];
+};
+
+
+export type QueryGetTimelineThreadsFromCompanyIdArgs = {
+  companyId: Scalars['ID'];
+  page: Scalars['Int'];
+  pageSize: Scalars['Int'];
+};
+
+
+export type QueryGetTimelineThreadsFromPersonIdArgs = {
+  page: Scalars['Int'];
+  pageSize: Scalars['Int'];
+  personId: Scalars['ID'];
+};
+
+
+export type QueryMessageArgs = {
+  filter: MessageFilterInput;
+};
+
+
+export type QueryMessageChannelArgs = {
+  filter: MessageChannelFilterInput;
+};
+
+
+export type QueryMessageChannelDuplicatesArgs = {
+  data?: InputMaybe<MessageChannelCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryMessageChannelMessageAssociationArgs = {
+  filter: MessageChannelMessageAssociationFilterInput;
+};
+
+
+export type QueryMessageChannelMessageAssociationDuplicatesArgs = {
+  data?: InputMaybe<MessageChannelMessageAssociationCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryMessageChannelMessageAssociationsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<MessageChannelMessageAssociationFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<MessageChannelMessageAssociationOrderByInput>;
+};
+
+
+export type QueryMessageChannelsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<MessageChannelFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<MessageChannelOrderByInput>;
+};
+
+
+export type QueryMessageDuplicatesArgs = {
+  data?: InputMaybe<MessageCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryMessageParticipantArgs = {
+  filter: MessageParticipantFilterInput;
+};
+
+
+export type QueryMessageParticipantDuplicatesArgs = {
+  data?: InputMaybe<MessageParticipantCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryMessageParticipantsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<MessageParticipantFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<MessageParticipantOrderByInput>;
+};
+
+
+export type QueryMessageThreadArgs = {
+  filter: MessageThreadFilterInput;
+};
+
+
+export type QueryMessageThreadDuplicatesArgs = {
+  data?: InputMaybe<MessageThreadCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryMessageThreadsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<MessageThreadFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<MessageThreadOrderByInput>;
+};
+
+
+export type QueryMessagesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<MessageFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<MessageOrderByInput>;
+};
+
+
+export type QueryOpportunitiesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<OpportunityFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<OpportunityOrderByInput>;
+};
+
+
+export type QueryOpportunityArgs = {
+  filter: OpportunityFilterInput;
+};
+
+
+export type QueryOpportunityDuplicatesArgs = {
+  data?: InputMaybe<OpportunityCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryPeopleArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<PersonFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<PersonOrderByInput>;
+};
+
+
+export type QueryPersonArgs = {
+  filter: PersonFilterInput;
+};
+
+
+export type QueryPersonDuplicatesArgs = {
+  data?: InputMaybe<PersonCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryPipelineStepArgs = {
+  filter: PipelineStepFilterInput;
+};
+
+
+export type QueryPipelineStepDuplicatesArgs = {
+  data?: InputMaybe<PipelineStepCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryPipelineStepsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<PipelineStepFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<PipelineStepOrderByInput>;
+};
+
+
+export type QueryValidatePasswordResetTokenArgs = {
+  passwordResetToken: Scalars['String'];
+};
+
+
+export type QueryViewArgs = {
+  filter: ViewFilterInput;
+};
+
+
+export type QueryViewDuplicatesArgs = {
+  data?: InputMaybe<ViewCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryViewFieldArgs = {
+  filter: ViewFieldFilterInput;
+};
+
+
+export type QueryViewFieldDuplicatesArgs = {
+  data?: InputMaybe<ViewFieldCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryViewFieldsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ViewFieldFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ViewFieldOrderByInput>;
+};
+
+
+export type QueryViewFilterArgs = {
+  filter: ViewFilterFilterInput;
+};
+
+
+export type QueryViewFilterDuplicatesArgs = {
+  data?: InputMaybe<ViewFilterCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryViewFiltersArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ViewFilterFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ViewFilterOrderByInput>;
+};
+
+
+export type QueryViewSortArgs = {
+  filter: ViewSortFilterInput;
+};
+
+
+export type QueryViewSortDuplicatesArgs = {
+  data?: InputMaybe<ViewSortCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryViewSortsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ViewSortFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ViewSortOrderByInput>;
+};
+
+
+export type QueryViewsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ViewFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ViewOrderByInput>;
+};
+
+
+export type QueryWebhookArgs = {
+  filter: WebhookFilterInput;
+};
+
+
+export type QueryWebhookDuplicatesArgs = {
+  data?: InputMaybe<WebhookCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryWebhooksArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<WebhookFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<WebhookOrderByInput>;
+};
+
+
+export type QueryWorkspaceMemberArgs = {
+  filter: WorkspaceMemberFilterInput;
+};
+
+
+export type QueryWorkspaceMemberDuplicatesArgs = {
+  data?: InputMaybe<WorkspaceMemberCreateInput>;
+  id?: InputMaybe<Scalars['ID']>;
+};
+
+
+export type QueryWorkspaceMembersArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<WorkspaceMemberFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<WorkspaceMemberOrderByInput>;
+};
+
+export type RefreshToken = {
+  createdAt: Scalars['DateTime'];
+  expiresAt: Scalars['DateTime'];
+  id: Scalars['ID'];
+  updatedAt: Scalars['DateTime'];
+};
+
+export type RefreshTokenEdge = {
+  /** Cursor for this node. */
+  cursor: Scalars['ConnectionCursor'];
+  /** The node containing the RefreshToken */
+  node: RefreshToken;
+};
+
+export type RelationConnection = {
+  /** Array of edges. */
+  edges: Array<RelationEdge>;
+  /** Paging information */
+  pageInfo: PageInfo;
+  /** Fetch total count of records */
+  totalCount: Scalars['Int'];
+};
+
+export type RelationDeleteResponse = {
+  createdAt?: Maybe<Scalars['DateTime']>;
+  fromFieldMetadataId?: Maybe<Scalars['String']>;
+  fromObjectMetadataId?: Maybe<Scalars['String']>;
+  id?: Maybe<Scalars['ID']>;
+  relationType?: Maybe<RelationMetadataType>;
+  toFieldMetadataId?: Maybe<Scalars['String']>;
+  toObjectMetadataId?: Maybe<Scalars['String']>;
+  updatedAt?: Maybe<Scalars['DateTime']>;
+};
+
+/** Type of the relation */
+export enum RelationMetadataType {
+  ManyToMany = 'MANY_TO_MANY',
+  OneToMany = 'ONE_TO_MANY',
+  OneToOne = 'ONE_TO_ONE'
+}
+
+export type Sentry = {
+  dsn?: Maybe<Scalars['String']>;
+};
+
+/** Sort Directions */
+export enum SortDirection {
+  Asc = 'ASC',
+  Desc = 'DESC'
+}
+
+/** Sort Nulls Options */
+export enum SortNulls {
+  NullsFirst = 'NULLS_FIRST',
+  NullsLast = 'NULLS_LAST'
+}
+
+export type StringFilter = {
+  eq?: InputMaybe<Scalars['String']>;
+  gt?: InputMaybe<Scalars['String']>;
+  gte?: InputMaybe<Scalars['String']>;
+  ilike?: InputMaybe<Scalars['String']>;
+  in?: InputMaybe<Array<Scalars['String']>>;
+  iregex?: InputMaybe<Scalars['String']>;
+  is?: InputMaybe<FilterIs>;
+  like?: InputMaybe<Scalars['String']>;
+  lt?: InputMaybe<Scalars['String']>;
+  lte?: InputMaybe<Scalars['String']>;
+  neq?: InputMaybe<Scalars['String']>;
+  regex?: InputMaybe<Scalars['String']>;
+  startsWith?: InputMaybe<Scalars['String']>;
+};
+
+export type Support = {
+  supportDriver: Scalars['String'];
+  supportFrontChatId?: Maybe<Scalars['String']>;
+};
+
+export type Telemetry = {
+  anonymizationEnabled: Scalars['Boolean'];
+  enabled: Scalars['Boolean'];
+};
+
+export type TimelineThread = {
+  firstParticipant: TimelineThreadParticipant;
+  id: Scalars['ID'];
+  lastMessageBody: Scalars['String'];
+  lastMessageReceivedAt: Scalars['DateTime'];
+  lastTwoParticipants: Array<TimelineThreadParticipant>;
+  numberOfMessagesInThread: Scalars['Float'];
+  participantCount: Scalars['Float'];
+  read: Scalars['Boolean'];
+  subject: Scalars['String'];
+  visibility: Scalars['String'];
+};
+
+export type TimelineThreadParticipant = {
+  avatarUrl: Scalars['String'];
+  displayName: Scalars['String'];
+  firstName: Scalars['String'];
+  handle: Scalars['String'];
+  lastName: Scalars['String'];
+  personId?: Maybe<Scalars['ID']>;
+  workspaceMemberId?: Maybe<Scalars['ID']>;
+};
+
+export type TimelineThreadsWithTotal = {
+  timelineThreads: Array<TimelineThread>;
+  totalNumberOfThreads: Scalars['Int'];
+};
+
+export type TransientToken = {
+  transientToken: AuthToken;
+};
+
+export type UuidFilter = {
+  eq?: InputMaybe<Scalars['UUID']>;
+  in?: InputMaybe<Array<InputMaybe<Scalars['UUID']>>>;
+  is?: InputMaybe<FilterIs>;
+  neq?: InputMaybe<Scalars['UUID']>;
+};
+
+export type UpdateWorkspaceInput = {
+  allowImpersonation?: InputMaybe<Scalars['Boolean']>;
+  displayName?: InputMaybe<Scalars['String']>;
+  domainName?: InputMaybe<Scalars['String']>;
+  inviteHash?: InputMaybe<Scalars['String']>;
+  logo?: InputMaybe<Scalars['String']>;
+};
+
+export type User = {
+  canImpersonate: Scalars['Boolean'];
+  createdAt: Scalars['DateTime'];
+  defaultAvatarUrl?: Maybe<Scalars['String']>;
+  defaultWorkspace: Workspace;
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  disabled?: Maybe<Scalars['Boolean']>;
+  email: Scalars['String'];
+  emailVerified: Scalars['Boolean'];
+  firstName: Scalars['String'];
+  id: Scalars['ID'];
+  lastName: Scalars['String'];
+  passwordHash?: Maybe<Scalars['String']>;
+  passwordResetToken?: Maybe<Scalars['String']>;
+  passwordResetTokenExpiresAt?: Maybe<Scalars['DateTime']>;
+  supportUserHash?: Maybe<Scalars['String']>;
+  updatedAt: Scalars['DateTime'];
+  workspaceMember?: Maybe<WorkspaceMember>;
+};
+
+export type UserEdge = {
+  /** Cursor for this node. */
+  cursor: Scalars['ConnectionCursor'];
+  /** The node containing the User */
+  node: User;
+};
+
+export type UserExists = {
+  exists: Scalars['Boolean'];
+};
+
+export type ValidatePasswordResetToken = {
+  email: Scalars['String'];
+  id: Scalars['String'];
+};
+
+export type Verify = {
+  tokens: AuthTokenPair;
+  user: User;
+};
+
+/** (System) Views */
+export type View = {
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  id: Scalars['ID'];
+  /** Describes if the view is in compact mode */
+  isCompact: Scalars['Boolean'];
+  /** View name */
+  name: Scalars['String'];
+  /** View target object */
+  objectMetadataId: Scalars['ID'];
+  /** View type */
+  type: Scalars['String'];
+  updatedAt: Scalars['DateTime'];
+  /** View Fields */
+  viewFields?: Maybe<ViewFieldConnection>;
+  /** View Filters */
+  viewFilters?: Maybe<ViewFilterConnection>;
+  /** View Sorts */
+  viewSorts?: Maybe<ViewSortConnection>;
+};
+
+
+/** (System) Views */
+export type ViewViewFieldsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ViewFieldFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ViewFieldOrderByInput>;
+};
+
+
+/** (System) Views */
+export type ViewViewFiltersArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ViewFilterFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ViewFilterOrderByInput>;
+};
+
+
+/** (System) Views */
+export type ViewViewSortsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ViewSortFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ViewSortOrderByInput>;
+};
+
+/** (System) Views */
+export type ViewConnection = {
+  edges: Array<ViewEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** (System) Views */
+export type ViewCreateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Describes if the view is in compact mode */
+  isCompact?: InputMaybe<Scalars['Boolean']>;
+  /** View name */
+  name?: InputMaybe<Scalars['String']>;
+  /** View target object */
+  objectMetadataId: Scalars['ID'];
+  /** View type */
+  type?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** (System) Views */
+export type ViewEdge = {
+  cursor: Scalars['Cursor'];
+  node: View;
+};
+
+/** (System) View Fields */
+export type ViewField = {
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  /** View Field target field */
+  fieldMetadataId: Scalars['ID'];
+  id: Scalars['ID'];
+  /** View Field visibility */
+  isVisible: Scalars['Boolean'];
+  /** View Field position */
+  position: Scalars['Float'];
+  /** View Field size */
+  size: Scalars['Float'];
+  updatedAt: Scalars['DateTime'];
+  /** View Field related view */
+  view?: Maybe<View>;
+  /** View Field related view id foreign key */
+  viewId?: Maybe<Scalars['ID']>;
+};
+
+/** (System) View Fields */
+export type ViewFieldConnection = {
+  edges: Array<ViewFieldEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** (System) View Fields */
+export type ViewFieldCreateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** View Field target field */
+  fieldMetadataId: Scalars['ID'];
+  id?: InputMaybe<Scalars['ID']>;
+  /** View Field visibility */
+  isVisible?: InputMaybe<Scalars['Boolean']>;
+  /** View Field position */
+  position?: InputMaybe<Scalars['Float']>;
+  /** View Field size */
+  size?: InputMaybe<Scalars['Float']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** View Field related view id foreign key */
+  viewId?: InputMaybe<Scalars['ID']>;
+};
+
+/** (System) View Fields */
+export type ViewFieldEdge = {
+  cursor: Scalars['Cursor'];
+  node: ViewField;
+};
+
+/** (System) View Fields */
+export type ViewFieldFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<ViewFieldFilterInput>>>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  /** View Field target field */
+  fieldMetadataId?: InputMaybe<UuidFilter>;
+  id?: InputMaybe<UuidFilter>;
+  /** View Field visibility */
+  isVisible?: InputMaybe<BooleanFilter>;
+  not?: InputMaybe<ViewFieldFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<ViewFieldFilterInput>>>;
+  /** View Field position */
+  position?: InputMaybe<FloatFilter>;
+  /** View Field size */
+  size?: InputMaybe<FloatFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+  /** View Field related view id foreign key */
+  viewId?: InputMaybe<UuidFilter>;
+};
+
+/** (System) View Fields */
+export type ViewFieldOrderByInput = {
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  /** View Field target field */
+  fieldMetadataId?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** View Field visibility */
+  isVisible?: InputMaybe<OrderByDirection>;
+  /** View Field position */
+  position?: InputMaybe<OrderByDirection>;
+  /** View Field size */
+  size?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+  /** View Field related view id foreign key */
+  viewId?: InputMaybe<OrderByDirection>;
+};
+
+/** (System) View Fields */
+export type ViewFieldUpdateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** View Field target field */
+  fieldMetadataId?: InputMaybe<Scalars['ID']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** View Field visibility */
+  isVisible?: InputMaybe<Scalars['Boolean']>;
+  /** View Field position */
+  position?: InputMaybe<Scalars['Float']>;
+  /** View Field size */
+  size?: InputMaybe<Scalars['Float']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** View Field related view id foreign key */
+  viewId?: InputMaybe<Scalars['ID']>;
+};
+
+/** (System) View Filters */
+export type ViewFilter = {
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  /** View Filter Display Value */
+  displayValue: Scalars['String'];
+  /** View Filter target field */
+  fieldMetadataId: Scalars['ID'];
+  id: Scalars['ID'];
+  /** View Filter operand */
+  operand: Scalars['String'];
+  updatedAt: Scalars['DateTime'];
+  /** View Filter value */
+  value: Scalars['String'];
+  /** View Filter related view */
+  view?: Maybe<View>;
+  /** View Filter related view id foreign key */
+  viewId?: Maybe<Scalars['ID']>;
+};
+
+/** (System) View Filters */
+export type ViewFilterConnection = {
+  edges: Array<ViewFilterEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** (System) View Filters */
+export type ViewFilterCreateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** View Filter Display Value */
+  displayValue?: InputMaybe<Scalars['String']>;
+  /** View Filter target field */
+  fieldMetadataId: Scalars['ID'];
+  id?: InputMaybe<Scalars['ID']>;
+  /** View Filter operand */
+  operand?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** View Filter value */
+  value?: InputMaybe<Scalars['String']>;
+  /** View Filter related view id foreign key */
+  viewId?: InputMaybe<Scalars['ID']>;
+};
+
+/** (System) View Filters */
+export type ViewFilterEdge = {
+  cursor: Scalars['Cursor'];
+  node: ViewFilter;
+};
+
+/** (System) View Filters */
+export type ViewFilterFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<ViewFilterFilterInput>>>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  /** View Filter Display Value */
+  displayValue?: InputMaybe<StringFilter>;
+  /** View Filter target field */
+  fieldMetadataId?: InputMaybe<UuidFilter>;
+  id?: InputMaybe<UuidFilter>;
+  not?: InputMaybe<ViewFilterFilterInput>;
+  /** View Filter operand */
+  operand?: InputMaybe<StringFilter>;
+  or?: InputMaybe<Array<InputMaybe<ViewFilterFilterInput>>>;
+  updatedAt?: InputMaybe<DateFilter>;
+  /** View Filter value */
+  value?: InputMaybe<StringFilter>;
+  /** View Filter related view id foreign key */
+  viewId?: InputMaybe<UuidFilter>;
+};
+
+/** (System) Views */
+export type ViewFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<ViewFilterInput>>>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  id?: InputMaybe<UuidFilter>;
+  /** Describes if the view is in compact mode */
+  isCompact?: InputMaybe<BooleanFilter>;
+  /** View name */
+  name?: InputMaybe<StringFilter>;
+  not?: InputMaybe<ViewFilterInput>;
+  /** View target object */
+  objectMetadataId?: InputMaybe<UuidFilter>;
+  or?: InputMaybe<Array<InputMaybe<ViewFilterInput>>>;
+  /** View type */
+  type?: InputMaybe<StringFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+};
+
+/** (System) View Filters */
+export type ViewFilterOrderByInput = {
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  /** View Filter Display Value */
+  displayValue?: InputMaybe<OrderByDirection>;
+  /** View Filter target field */
+  fieldMetadataId?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** View Filter operand */
+  operand?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+  /** View Filter value */
+  value?: InputMaybe<OrderByDirection>;
+  /** View Filter related view id foreign key */
+  viewId?: InputMaybe<OrderByDirection>;
+};
+
+/** (System) View Filters */
+export type ViewFilterUpdateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** View Filter Display Value */
+  displayValue?: InputMaybe<Scalars['String']>;
+  /** View Filter target field */
+  fieldMetadataId?: InputMaybe<Scalars['ID']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** View Filter operand */
+  operand?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** View Filter value */
+  value?: InputMaybe<Scalars['String']>;
+  /** View Filter related view id foreign key */
+  viewId?: InputMaybe<Scalars['ID']>;
+};
+
+/** (System) Views */
+export type ViewOrderByInput = {
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** Describes if the view is in compact mode */
+  isCompact?: InputMaybe<OrderByDirection>;
+  /** View name */
+  name?: InputMaybe<OrderByDirection>;
+  /** View target object */
+  objectMetadataId?: InputMaybe<OrderByDirection>;
+  /** View type */
+  type?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+};
+
+/** (System) View Sorts */
+export type ViewSort = {
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  /** View Sort direction */
+  direction: Scalars['String'];
+  /** View Sort target field */
+  fieldMetadataId: Scalars['ID'];
+  id: Scalars['ID'];
+  updatedAt: Scalars['DateTime'];
+  /** View Sort related view */
+  view?: Maybe<View>;
+  /** View Sort related view id foreign key */
+  viewId?: Maybe<Scalars['ID']>;
+};
+
+/** (System) View Sorts */
+export type ViewSortConnection = {
+  edges: Array<ViewSortEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** (System) View Sorts */
+export type ViewSortCreateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** View Sort direction */
+  direction?: InputMaybe<Scalars['String']>;
+  /** View Sort target field */
+  fieldMetadataId: Scalars['ID'];
+  id?: InputMaybe<Scalars['ID']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** View Sort related view id foreign key */
+  viewId?: InputMaybe<Scalars['ID']>;
+};
+
+/** (System) View Sorts */
+export type ViewSortEdge = {
+  cursor: Scalars['Cursor'];
+  node: ViewSort;
+};
+
+/** (System) View Sorts */
+export type ViewSortFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<ViewSortFilterInput>>>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  /** View Sort direction */
+  direction?: InputMaybe<StringFilter>;
+  /** View Sort target field */
+  fieldMetadataId?: InputMaybe<UuidFilter>;
+  id?: InputMaybe<UuidFilter>;
+  not?: InputMaybe<ViewSortFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<ViewSortFilterInput>>>;
+  updatedAt?: InputMaybe<DateFilter>;
+  /** View Sort related view id foreign key */
+  viewId?: InputMaybe<UuidFilter>;
+};
+
+/** (System) View Sorts */
+export type ViewSortOrderByInput = {
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  /** View Sort direction */
+  direction?: InputMaybe<OrderByDirection>;
+  /** View Sort target field */
+  fieldMetadataId?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+  /** View Sort related view id foreign key */
+  viewId?: InputMaybe<OrderByDirection>;
+};
+
+/** (System) View Sorts */
+export type ViewSortUpdateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  /** View Sort direction */
+  direction?: InputMaybe<Scalars['String']>;
+  /** View Sort target field */
+  fieldMetadataId?: InputMaybe<Scalars['ID']>;
+  id?: InputMaybe<Scalars['ID']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** View Sort related view id foreign key */
+  viewId?: InputMaybe<Scalars['ID']>;
+};
+
+/** (System) Views */
+export type ViewUpdateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Describes if the view is in compact mode */
+  isCompact?: InputMaybe<Scalars['Boolean']>;
+  /** View name */
+  name?: InputMaybe<Scalars['String']>;
+  /** View target object */
+  objectMetadataId?: InputMaybe<Scalars['ID']>;
+  /** View type */
+  type?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** A webhook */
+export type Webhook = {
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  id: Scalars['ID'];
+  /** Webhook operation */
+  operation: Scalars['String'];
+  /** Webhook target url */
+  targetUrl: Scalars['String'];
+  updatedAt: Scalars['DateTime'];
+};
+
+/** A webhook */
+export type WebhookConnection = {
+  edges: Array<WebhookEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** A webhook */
+export type WebhookCreateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Webhook operation */
+  operation?: InputMaybe<Scalars['String']>;
+  /** Webhook target url */
+  targetUrl?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+/** A webhook */
+export type WebhookEdge = {
+  cursor: Scalars['Cursor'];
+  node: Webhook;
+};
+
+/** A webhook */
+export type WebhookFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<WebhookFilterInput>>>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  id?: InputMaybe<UuidFilter>;
+  not?: InputMaybe<WebhookFilterInput>;
+  /** Webhook operation */
+  operation?: InputMaybe<StringFilter>;
+  or?: InputMaybe<Array<InputMaybe<WebhookFilterInput>>>;
+  /** Webhook target url */
+  targetUrl?: InputMaybe<StringFilter>;
+  updatedAt?: InputMaybe<DateFilter>;
+};
+
+/** A webhook */
+export type WebhookOrderByInput = {
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** Webhook operation */
+  operation?: InputMaybe<OrderByDirection>;
+  /** Webhook target url */
+  targetUrl?: InputMaybe<OrderByDirection>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+};
+
+/** A webhook */
+export type WebhookUpdateInput = {
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Webhook operation */
+  operation?: InputMaybe<Scalars['String']>;
+  /** Webhook target url */
+  targetUrl?: InputMaybe<Scalars['String']>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+};
+
+export type Workspace = {
+  activationStatus: Scalars['String'];
+  allowImpersonation: Scalars['Boolean'];
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  displayName?: Maybe<Scalars['String']>;
+  domainName?: Maybe<Scalars['String']>;
+  featureFlags?: Maybe<Array<FeatureFlag>>;
+  id: Scalars['ID'];
+  inviteHash?: Maybe<Scalars['String']>;
+  logo?: Maybe<Scalars['String']>;
+  subscriptionStatus: Scalars['String'];
+  updatedAt: Scalars['DateTime'];
+};
+
+
+export type WorkspaceFeatureFlagsArgs = {
+  filter?: FeatureFlagFilter;
+  sorting?: Array<FeatureFlagSort>;
+};
+
+export type WorkspaceEdge = {
+  /** Cursor for this node. */
+  cursor: Scalars['ConnectionCursor'];
+  /** The node containing the Workspace */
+  node: Workspace;
+};
+
+export type WorkspaceInviteHashValid = {
+  isValid: Scalars['Boolean'];
+};
+
+/** A workspace member */
+export type WorkspaceMember = {
+  /** Account owner for companies */
+  accountOwnerForCompanies?: Maybe<CompanyConnection>;
+  /** Activities assigned to the workspace member */
+  assignedActivities?: Maybe<ActivityConnection>;
+  /** Activities created by the workspace member */
+  authoredActivities?: Maybe<ActivityConnection>;
+  /** Attachments created by the workspace member */
+  authoredAttachments?: Maybe<AttachmentConnection>;
+  /** Authored comments */
+  authoredComments?: Maybe<CommentConnection>;
+  /** Workspace member avatar */
+  avatarUrl: Scalars['String'];
+  /** Blocklisted handles */
+  blocklist?: Maybe<BlocklistConnection>;
+  /** Preferred color scheme */
+  colorScheme: Scalars['String'];
+  /** Connected accounts */
+  connectedAccounts?: Maybe<ConnectedAccountConnection>;
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  /** Favorites linked to the workspace member */
+  favorites?: Maybe<FavoriteConnection>;
+  id: Scalars['ID'];
+  /** Preferred language */
+  locale: Scalars['String'];
+  /** Message Participants */
+  messageParticipants?: Maybe<MessageParticipantConnection>;
+  /** Workspace member name */
+  name: FullName;
+  updatedAt: Scalars['DateTime'];
+  /** Related user email address */
+  userEmail: Scalars['String'];
+  /** Associated User Id */
+  userId: Scalars['ID'];
+};
+
+
+/** A workspace member */
+export type WorkspaceMemberAccountOwnerForCompaniesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<CompanyFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<CompanyOrderByInput>;
+};
+
+
+/** A workspace member */
+export type WorkspaceMemberAssignedActivitiesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ActivityFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ActivityOrderByInput>;
+};
+
+
+/** A workspace member */
+export type WorkspaceMemberAuthoredActivitiesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ActivityFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ActivityOrderByInput>;
+};
+
+
+/** A workspace member */
+export type WorkspaceMemberAuthoredAttachmentsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<AttachmentFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<AttachmentOrderByInput>;
+};
+
+
+/** A workspace member */
+export type WorkspaceMemberAuthoredCommentsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<CommentFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<CommentOrderByInput>;
+};
+
+
+/** A workspace member */
+export type WorkspaceMemberBlocklistArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<BlocklistFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<BlocklistOrderByInput>;
+};
+
+
+/** A workspace member */
+export type WorkspaceMemberConnectedAccountsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ConnectedAccountFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<ConnectedAccountOrderByInput>;
+};
+
+
+/** A workspace member */
+export type WorkspaceMemberFavoritesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<FavoriteFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<FavoriteOrderByInput>;
+};
+
+
+/** A workspace member */
+export type WorkspaceMemberMessageParticipantsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<MessageParticipantFilterInput>;
+  first?: InputMaybe<Scalars['Float']>;
+  last?: InputMaybe<Scalars['Float']>;
+  orderBy?: InputMaybe<MessageParticipantOrderByInput>;
+};
+
+/** A workspace member */
+export type WorkspaceMemberConnection = {
+  edges: Array<WorkspaceMemberEdge>;
+  pageInfo: PageInfo;
+  /** Total number of records in the connection */
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+/** A workspace member */
+export type WorkspaceMemberCreateInput = {
+  /** Workspace member avatar */
+  avatarUrl?: InputMaybe<Scalars['String']>;
+  /** Preferred color scheme */
+  colorScheme?: InputMaybe<Scalars['String']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Preferred language */
+  locale?: InputMaybe<Scalars['String']>;
+  /** Workspace member name */
+  name?: InputMaybe<FullNameCreateInput>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Related user email address */
+  userEmail?: InputMaybe<Scalars['String']>;
+  /** Associated User Id */
+  userId: Scalars['ID'];
+};
+
+/** A workspace member */
+export type WorkspaceMemberEdge = {
+  cursor: Scalars['Cursor'];
+  node: WorkspaceMember;
+};
+
+/** A workspace member */
+export type WorkspaceMemberFilterInput = {
+  and?: InputMaybe<Array<InputMaybe<WorkspaceMemberFilterInput>>>;
+  /** Workspace member avatar */
+  avatarUrl?: InputMaybe<StringFilter>;
+  /** Preferred color scheme */
+  colorScheme?: InputMaybe<StringFilter>;
+  createdAt?: InputMaybe<DateFilter>;
+  deletedAt?: InputMaybe<DateFilter>;
+  id?: InputMaybe<UuidFilter>;
+  /** Preferred language */
+  locale?: InputMaybe<StringFilter>;
+  /** Workspace member name */
+  name?: InputMaybe<FullNameFilterInput>;
+  not?: InputMaybe<WorkspaceMemberFilterInput>;
+  or?: InputMaybe<Array<InputMaybe<WorkspaceMemberFilterInput>>>;
+  updatedAt?: InputMaybe<DateFilter>;
+  /** Related user email address */
+  userEmail?: InputMaybe<StringFilter>;
+  /** Associated User Id */
+  userId?: InputMaybe<UuidFilter>;
+};
+
+/** A workspace member */
+export type WorkspaceMemberOrderByInput = {
+  /** Workspace member avatar */
+  avatarUrl?: InputMaybe<OrderByDirection>;
+  /** Preferred color scheme */
+  colorScheme?: InputMaybe<OrderByDirection>;
+  createdAt?: InputMaybe<OrderByDirection>;
+  deletedAt?: InputMaybe<OrderByDirection>;
+  id?: InputMaybe<OrderByDirection>;
+  /** Preferred language */
+  locale?: InputMaybe<OrderByDirection>;
+  /** Workspace member name */
+  name?: InputMaybe<FullNameOrderByInput>;
+  updatedAt?: InputMaybe<OrderByDirection>;
+  /** Related user email address */
+  userEmail?: InputMaybe<OrderByDirection>;
+  /** Associated User Id */
+  userId?: InputMaybe<OrderByDirection>;
+};
+
+/** A workspace member */
+export type WorkspaceMemberUpdateInput = {
+  /** Workspace member avatar */
+  avatarUrl?: InputMaybe<Scalars['String']>;
+  /** Preferred color scheme */
+  colorScheme?: InputMaybe<Scalars['String']>;
+  createdAt?: InputMaybe<Scalars['DateTime']>;
+  deletedAt?: InputMaybe<Scalars['DateTime']>;
+  id?: InputMaybe<Scalars['ID']>;
+  /** Preferred language */
+  locale?: InputMaybe<Scalars['String']>;
+  /** Workspace member name */
+  name?: InputMaybe<FullNameUpdateInput>;
+  updatedAt?: InputMaybe<Scalars['DateTime']>;
+  /** Related user email address */
+  userEmail?: InputMaybe<Scalars['String']>;
+  /** Associated User Id */
+  userId?: InputMaybe<Scalars['ID']>;
+};
+
+export type Field = {
+  createdAt: Scalars['DateTime'];
+  defaultValue?: Maybe<Scalars['JSON']>;
+  description?: Maybe<Scalars['String']>;
+  fromRelationMetadata?: Maybe<Relation>;
+  icon?: Maybe<Scalars['String']>;
+  id: Scalars['ID'];
+  isActive?: Maybe<Scalars['Boolean']>;
+  isCustom?: Maybe<Scalars['Boolean']>;
+  isNullable?: Maybe<Scalars['Boolean']>;
+  isSystem?: Maybe<Scalars['Boolean']>;
+  label: Scalars['String'];
+  name: Scalars['String'];
+  options?: Maybe<Scalars['JSON']>;
+  toRelationMetadata?: Maybe<Relation>;
+  type: FieldMetadataType;
+  updatedAt: Scalars['DateTime'];
+};
+
+export type FieldEdge = {
+  /** Cursor for this node. */
+  cursor: Scalars['ConnectionCursor'];
+  /** The node containing the field */
+  node: Field;
+};
+
+export type FieldFilter = {
+  and?: InputMaybe<Array<FieldFilter>>;
+  id?: InputMaybe<IdFilterComparison>;
+  isActive?: InputMaybe<BooleanFieldComparison>;
+  isCustom?: InputMaybe<BooleanFieldComparison>;
+  isSystem?: InputMaybe<BooleanFieldComparison>;
+  or?: InputMaybe<Array<FieldFilter>>;
+};
+
+export type Object = {
+  createdAt: Scalars['DateTime'];
+  dataSourceId: Scalars['String'];
+  description?: Maybe<Scalars['String']>;
+  fields: ObjectFieldsConnection;
+  icon?: Maybe<Scalars['String']>;
+  id: Scalars['ID'];
+  imageIdentifierFieldMetadataId?: Maybe<Scalars['String']>;
+  isActive: Scalars['Boolean'];
+  isCustom: Scalars['Boolean'];
+  isSystem: Scalars['Boolean'];
+  labelIdentifierFieldMetadataId?: Maybe<Scalars['String']>;
+  labelPlural: Scalars['String'];
+  labelSingular: Scalars['String'];
+  namePlural: Scalars['String'];
+  nameSingular: Scalars['String'];
+  updatedAt: Scalars['DateTime'];
+};
+
+
+export type ObjectFieldsArgs = {
+  filter?: FieldFilter;
+  paging?: CursorPaging;
+};
+
+export type ObjectEdge = {
+  /** Cursor for this node. */
+  cursor: Scalars['ConnectionCursor'];
+  /** The node containing the object */
+  node: Object;
+};
+
+export type Relation = {
+  createdAt: Scalars['DateTime'];
+  fromFieldMetadataId: Scalars['String'];
+  fromObjectMetadata: Object;
+  fromObjectMetadataId: Scalars['String'];
+  id: Scalars['ID'];
+  relationType: RelationMetadataType;
+  toFieldMetadataId: Scalars['String'];
+  toObjectMetadata: Object;
+  toObjectMetadataId: Scalars['String'];
+  updatedAt: Scalars['DateTime'];
+};
+
+export type RelationEdge = {
+  /** Cursor for this node. */
+  cursor: Scalars['ConnectionCursor'];
+  /** The node containing the relation */
+  node: Relation;
+};
+
+export type FindCompanyQueryVariables = Exact<{
+  filter: CompanyFilterInput;
+}>;
+
+
+export type FindCompanyQuery = { companies: { edges: Array<{ node: { linkedinLink?: { url?: string | null, label?: string | null } | null } }> } };
+
+
+export const FindCompanyDocument = gql`
+    query FindCompany($filter: CompanyFilterInput!) {
+  companies(filter: $filter) {
+    edges {
+      node {
+        linkedinLink {
+          url
+          label
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useFindCompanyQuery__
+ *
+ * To run a query within a React component, call `useFindCompanyQuery` and pass it any options that fit your needs.
+ * When your component renders, `useFindCompanyQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useFindCompanyQuery({
+ *   variables: {
+ *      filter: // value for 'filter'
+ *   },
+ * });
+ */
+export function useFindCompanyQuery(baseOptions: Apollo.QueryHookOptions<FindCompanyQuery, FindCompanyQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<FindCompanyQuery, FindCompanyQueryVariables>(FindCompanyDocument, options);
+      }
+export function useFindCompanyLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<FindCompanyQuery, FindCompanyQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<FindCompanyQuery, FindCompanyQueryVariables>(FindCompanyDocument, options);
+        }
+export type FindCompanyQueryHookResult = ReturnType<typeof useFindCompanyQuery>;
+export type FindCompanyLazyQueryHookResult = ReturnType<typeof useFindCompanyLazyQuery>;
+export type FindCompanyQueryResult = Apollo.QueryResult<FindCompanyQuery, FindCompanyQueryVariables>;
\ No newline at end of file
diff --git a/packages/twenty-chrome-extension/src/graphql/company/mutations.ts b/packages/twenty-chrome-extension/src/graphql/company/mutations.ts
new file mode 100644
index 000000000000..36bfabf401a3
--- /dev/null
+++ b/packages/twenty-chrome-extension/src/graphql/company/mutations.ts
@@ -0,0 +1,9 @@
+import { gql } from '@apollo/client';
+
+export const CREATE_COMPANY = gql`
+  mutation CreateOneCompany($input: CompanyCreateInput!) {
+    createCompany(data: $input) {
+      id
+    }
+  }
+`;
diff --git a/packages/twenty-chrome-extension/src/graphql/company/queries.ts b/packages/twenty-chrome-extension/src/graphql/company/queries.ts
new file mode 100644
index 000000000000..b3fceedb29db
--- /dev/null
+++ b/packages/twenty-chrome-extension/src/graphql/company/queries.ts
@@ -0,0 +1,17 @@
+import { gql } from '@apollo/client';
+
+export const FIND_COMPANY = gql`
+  query FindCompany($filter: CompanyFilterInput!) {
+    companies(filter: $filter) {
+      edges {
+        node {
+          name
+          linkedinLink {
+            url
+            label
+          }
+        }
+      }
+    }
+  }
+`;
diff --git a/packages/twenty-chrome-extension/src/graphql/person/mutations.ts b/packages/twenty-chrome-extension/src/graphql/person/mutations.ts
new file mode 100644
index 000000000000..947d3a4e0cd4
--- /dev/null
+++ b/packages/twenty-chrome-extension/src/graphql/person/mutations.ts
@@ -0,0 +1,9 @@
+import { gql } from '@apollo/client';
+
+export const CREATE_PERSON = gql`
+  mutation CreateOnePerson($input: PersonCreateInput!) {
+    createPerson(data: $input) {
+      id
+    }
+  }
+`;
diff --git a/packages/twenty-chrome-extension/src/graphql/person/queries.ts b/packages/twenty-chrome-extension/src/graphql/person/queries.ts
new file mode 100644
index 000000000000..83f402c1c280
--- /dev/null
+++ b/packages/twenty-chrome-extension/src/graphql/person/queries.ts
@@ -0,0 +1,20 @@
+import { gql } from '@apollo/client';
+
+export const FIND_PERSON = gql`
+  query FindPerson($filter: PersonFilterInput!) {
+    people(filter: $filter) {
+      edges {
+        node {
+          name {
+            firstName
+            lastName
+          }
+          linkedinLink {
+            url
+            label
+          }
+        }
+      }
+    }
+  }
+`;
diff --git a/packages/twenty-chrome-extension/src/manifest.ts b/packages/twenty-chrome-extension/src/manifest.ts
index dc08d0bca71f..dd3896ba7823 100644
--- a/packages/twenty-chrome-extension/src/manifest.ts
+++ b/packages/twenty-chrome-extension/src/manifest.ts
@@ -16,6 +16,7 @@ export default defineManifest({
 
   action: {},
 
+  //TODO: change this to a documenation page
   options_page: 'options.html',
 
   background: {
@@ -34,4 +35,8 @@ export default defineManifest({
   permissions: ['activeTab', 'storage'],
 
   host_permissions: ['https://www.linkedin.com/*'],
+
+  externally_connectable: {
+    matches: [`https://app.twenty.com/*`, `http://localhost:3001/*`],
+  },
 });
diff --git a/packages/twenty-chrome-extension/src/options/Loading.tsx b/packages/twenty-chrome-extension/src/options/Loading.tsx
new file mode 100644
index 000000000000..1fde24f2b9e5
--- /dev/null
+++ b/packages/twenty-chrome-extension/src/options/Loading.tsx
@@ -0,0 +1,24 @@
+import styled from '@emotion/styled';
+
+import { Loader } from '@/ui/display/loader/components/Loader';
+
+const StyledContainer = styled.div`
+  align-items: center;
+  background: ${({ theme }) => theme.background.noisy};
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  gap: ${({ theme }) => theme.spacing(2)};
+  justify-content: center;
+`;
+
+const Loading = () => {
+  return (
+    <StyledContainer>
+      <img src="/logo/32-32.svg" alt="twenty-logo" height={64} width={64} />
+      <Loader />
+    </StyledContainer>
+  );
+};
+
+export default Loading;
diff --git a/packages/twenty-chrome-extension/src/options/index.tsx b/packages/twenty-chrome-extension/src/options/index.tsx
index dde380ebf90d..e7920fc9e61a 100644
--- a/packages/twenty-chrome-extension/src/options/index.tsx
+++ b/packages/twenty-chrome-extension/src/options/index.tsx
@@ -3,14 +3,14 @@ import ReactDOM from 'react-dom/client';
 
 import { AppThemeProvider } from '@/ui/theme/components/AppThemeProvider';
 import { ThemeType } from '@/ui/theme/constants/ThemeLight';
-import App from '~/options/Options';
+import Options from '~/options/Options';
 
 import '~/index.css';
 
 ReactDOM.createRoot(document.getElementById('app') as HTMLElement).render(
   <AppThemeProvider>
     <React.StrictMode>
-      <App />
+      <Options />
     </React.StrictMode>
   </AppThemeProvider>,
 );
diff --git a/packages/twenty-chrome-extension/src/options/loading-index.tsx b/packages/twenty-chrome-extension/src/options/loading-index.tsx
new file mode 100644
index 000000000000..46f2193fe042
--- /dev/null
+++ b/packages/twenty-chrome-extension/src/options/loading-index.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+
+import { AppThemeProvider } from '@/ui/theme/components/AppThemeProvider';
+import { ThemeType } from '@/ui/theme/constants/ThemeLight';
+import Loading from '~/options/Loading';
+
+import '~/index.css';
+
+ReactDOM.createRoot(document.getElementById('app') as HTMLElement).render(
+  <AppThemeProvider>
+    <React.StrictMode>
+      <Loading />
+    </React.StrictMode>
+  </AppThemeProvider>,
+);
+
+declare module '@emotion/react' {
+  export interface Theme extends ThemeType {}
+}
diff --git a/packages/twenty-chrome-extension/src/options/modules/api-key/components/ApiKeyForm.tsx b/packages/twenty-chrome-extension/src/options/modules/api-key/components/ApiKeyForm.tsx
index 88e051972fe4..524dc0c1faa2 100644
--- a/packages/twenty-chrome-extension/src/options/modules/api-key/components/ApiKeyForm.tsx
+++ b/packages/twenty-chrome-extension/src/options/modules/api-key/components/ApiKeyForm.tsx
@@ -23,7 +23,11 @@ const StyledHeader = styled.header`
   text-align: center;
 `;
 
-const StyledImg = styled.img``;
+const StyledImgLogo = styled.img`
+  &:hover {
+    cursor: pointer;
+  }
+`;
 
 const StyledMain = styled.main`
   margin-bottom: ${({ theme }) => theme.spacing(8)};
@@ -51,6 +55,13 @@ const StyledSection = styled.div<{ showSection: boolean }>`
   max-height: ${({ showSection }) => (showSection ? '200px' : '0')};
 `;
 
+const StyledButtonHorizontalContainer = styled.div`
+  display: flex;
+  flex-direction: row;
+  gap: ${({ theme }) => theme.spacing(4)};
+  width: 100%;
+`;
+
 export const ApiKeyForm = () => {
   const [apiKey, setApiKey] = useState('');
   const [route, setRoute] = useState('');
@@ -73,10 +84,6 @@ export const ApiKeyForm = () => {
     void getState();
   }, []);
 
-  useEffect(() => {
-    chrome.storage.local.set({ apiKey });
-  }, [apiKey]);
-
   useEffect(() => {
     if (import.meta.env.VITE_SERVER_BASE_URL !== route) {
       chrome.storage.local.set({ serverBaseUrl: route });
@@ -85,10 +92,18 @@ export const ApiKeyForm = () => {
     }
   }, [route]);
 
+  const handleValidateKey = () => {
+    chrome.storage.local.set({ apiKey });
+
+    window.close();
+  };
+
   const handleGenerateClick = () => {
-    window.open(
-      `${import.meta.env.VITE_FRONT_BASE_URL}/settings/developers/api-keys`,
-    );
+    window.open(`${import.meta.env.VITE_FRONT_BASE_URL}/settings/developers`);
+  };
+
+  const handleGoToTwenty = () => {
+    window.open(`${import.meta.env.VITE_FRONT_BASE_URL}`);
   };
 
   const handleToggle = () => {
@@ -98,9 +113,12 @@ export const ApiKeyForm = () => {
   return (
     <StyledContainer isToggleOn={showSection}>
       <StyledHeader>
-        <StyledImg src="/logo/32-32.svg" alt="Twenty Logo" />
+        <StyledImgLogo
+          src="/logo/32-32.svg"
+          alt="Twenty Logo"
+          onClick={handleGoToTwenty}
+        />
       </StyledHeader>
-
       <StyledMain>
         <H2Title
           title="Connect your account"
@@ -112,17 +130,30 @@ export const ApiKeyForm = () => {
           onChange={setApiKey}
           placeholder="My API key"
         />
-        <Button
-          title="Generate a key"
-          fullWidth={false}
-          variant="primary"
-          accent="default"
-          size="small"
-          position="standalone"
-          soon={false}
-          disabled={false}
-          onClick={handleGenerateClick}
-        />
+        <StyledButtonHorizontalContainer>
+          <Button
+            title="Generate a key"
+            fullWidth={true}
+            variant="primary"
+            accent="default"
+            size="small"
+            position="standalone"
+            soon={false}
+            disabled={false}
+            onClick={handleGenerateClick}
+          />
+          <Button
+            title="Validate key"
+            fullWidth={true}
+            variant="primary"
+            accent="default"
+            size="small"
+            position="standalone"
+            soon={false}
+            disabled={apiKey === ''}
+            onClick={handleValidateKey}
+          />
+        </StyledButtonHorizontalContainer>
       </StyledMain>
 
       <StyledFooter>
diff --git a/packages/twenty-chrome-extension/src/options/modules/ui/display/loader/components/Loader.tsx b/packages/twenty-chrome-extension/src/options/modules/ui/display/loader/components/Loader.tsx
new file mode 100644
index 000000000000..15cc03852983
--- /dev/null
+++ b/packages/twenty-chrome-extension/src/options/modules/ui/display/loader/components/Loader.tsx
@@ -0,0 +1,38 @@
+import styled from '@emotion/styled';
+import { motion } from 'framer-motion';
+
+const StyledLoaderContainer = styled.div`
+  justify-content: center;
+  align-items: center;
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(2)};
+  width: ${({ theme }) => theme.spacing(6)};
+  height: ${({ theme }) => theme.spacing(3)};
+  border-radius: ${({ theme }) => theme.border.radius.pill};
+  border: 1px solid ${({ theme }) => theme.font.color.tertiary};
+  overflow: hidden;
+`;
+
+const StyledLoader = styled(motion.div)`
+  background-color: ${({ theme }) => theme.font.color.tertiary};
+  border-radius: ${({ theme }) => theme.border.radius.pill};
+  height: 8px;
+  width: 8px;
+`;
+
+export const Loader = () => (
+  <StyledLoaderContainer>
+    <StyledLoader
+      animate={{
+        x: [-16, 0, 16],
+        width: [8, 12, 8],
+        height: [8, 2, 8],
+      }}
+      transition={{
+        duration: 0.8,
+        times: [0, 0.15, 0.3],
+        repeat: Infinity,
+      }}
+    />
+  </StyledLoaderContainer>
+);
diff --git a/packages/twenty-chrome-extension/src/options/modules/ui/theme/constants/BackgroundDark.ts b/packages/twenty-chrome-extension/src/options/modules/ui/theme/constants/BackgroundDark.ts
index 5a7802dfb287..d4687782b729 100644
--- a/packages/twenty-chrome-extension/src/options/modules/ui/theme/constants/BackgroundDark.ts
+++ b/packages/twenty-chrome-extension/src/options/modules/ui/theme/constants/BackgroundDark.ts
@@ -19,6 +19,7 @@ export const BACKGROUND_DARK = {
     light: RGBA(GRAY_SCALE.gray0, 0.06),
     lighter: RGBA(GRAY_SCALE.gray0, 0.03),
     danger: RGBA(COLOR.red, 0.08),
+    forBackdropFilter: RGBA(GRAY_SCALE.gray80, 0.5),
   },
   overlay: RGBA(GRAY_SCALE.gray80, 0.8),
   radialGradient: `radial-gradient(50% 62.62% at 50% 0%, #505050 0%, ${GRAY_SCALE.gray60} 100%)`,
diff --git a/packages/twenty-chrome-extension/src/options/modules/ui/theme/constants/BackgroundLight.ts b/packages/twenty-chrome-extension/src/options/modules/ui/theme/constants/BackgroundLight.ts
index a096887d16ba..e72ff80f98f7 100644
--- a/packages/twenty-chrome-extension/src/options/modules/ui/theme/constants/BackgroundLight.ts
+++ b/packages/twenty-chrome-extension/src/options/modules/ui/theme/constants/BackgroundLight.ts
@@ -19,6 +19,7 @@ export const BACKGROUND_LIGHT = {
     light: RGBA(GRAY_SCALE.gray100, 0.04),
     lighter: RGBA(GRAY_SCALE.gray100, 0.02),
     danger: RGBA(COLOR.red, 0.08),
+    forBackdropFilter: RGBA(GRAY_SCALE.gray10, 0.5),
   },
   overlay: RGBA(GRAY_SCALE.gray80, 0.8),
   radialGradient: `radial-gradient(50% 62.62% at 50% 0%, #505050 0%, ${GRAY_SCALE.gray60} 100%)`,
diff --git a/packages/twenty-chrome-extension/src/options/modules/ui/theme/constants/OverlayBackground.ts b/packages/twenty-chrome-extension/src/options/modules/ui/theme/constants/OverlayBackground.ts
index 50fe3a0ef8db..e23e08f33d79 100644
--- a/packages/twenty-chrome-extension/src/options/modules/ui/theme/constants/OverlayBackground.ts
+++ b/packages/twenty-chrome-extension/src/options/modules/ui/theme/constants/OverlayBackground.ts
@@ -3,7 +3,7 @@ import { css } from '@emotion/react';
 import { ThemeType } from '@/ui/theme/constants/ThemeLight';
 
 export const OVERLAY_BACKGROUND = (props: { theme: ThemeType }) => css`
-  backdrop-filter: blur(8px);
-  background: ${props.theme.background.transparent.secondary};
+  backdrop-filter: blur(12px) saturate(200%) contrast(50%) brightness(130%);
+  background: ${props.theme.background.transparent.forBackdropFilter};
   box-shadow: ${props.theme.boxShadow.strong};
 `;
diff --git a/packages/twenty-chrome-extension/src/utils/apolloClient.ts b/packages/twenty-chrome-extension/src/utils/apolloClient.ts
new file mode 100644
index 000000000000..bc145454bb2c
--- /dev/null
+++ b/packages/twenty-chrome-extension/src/utils/apolloClient.ts
@@ -0,0 +1,18 @@
+import { ApolloClient, InMemoryCache } from '@apollo/client';
+
+const getApolloClient = async () => {
+  const { apiKey } = await chrome.storage.local.get('apiKey');
+  const { serverBaseUrl } = await chrome.storage.local.get('serverBaseUrl');
+
+  return new ApolloClient({
+    cache: new InMemoryCache(),
+    uri: `${
+      serverBaseUrl ? serverBaseUrl : import.meta.env.VITE_SERVER_BASE_URL
+    }/graphql`,
+    headers: {
+      Authorization: `Bearer ${apiKey}`,
+    },
+  });
+};
+
+export default getApolloClient;
diff --git a/packages/twenty-chrome-extension/src/utils/requestDb.ts b/packages/twenty-chrome-extension/src/utils/requestDb.ts
index 140d9da975f4..a160a58aa271 100644
--- a/packages/twenty-chrome-extension/src/utils/requestDb.ts
+++ b/packages/twenty-chrome-extension/src/utils/requestDb.ts
@@ -1,31 +1,31 @@
-const requestDb = async (query: string) => {
-  const { apiKey } = await chrome.storage.local.get('apiKey');
-  const { serverBaseUrl } = await chrome.storage.local.get('serverBaseUrl');
-
-  const options = {
-    method: 'POST',
-    body: JSON.stringify({ query }),
-    headers: {
-      'Content-Type': 'application/json',
-      Accept: 'application/json',
-      Authorization: `Bearer ${apiKey}`,
-    },
-  };
-
-  const response = await fetch(
-    `${
-      serverBaseUrl ? serverBaseUrl : import.meta.env.VITE_SERVER_BASE_URL
-    }/graphql`,
-    options,
-  );
-
-  if (!response.ok) {
-    // TODO: Handle error gracefully and remove the console statement.
-    /* eslint-disable no-console */
-    console.error(response);
-  }
-
-  return await response.json();
+import { OperationVariables } from '@apollo/client';
+import { isUndefined } from '@sniptt/guards';
+import { DocumentNode } from 'graphql';
+
+import getApolloClient from '~/utils/apolloClient';
+
+export const callQuery = async <T>(
+  query: DocumentNode,
+  variables?: OperationVariables,
+): Promise<T | null> => {
+  const client = await getApolloClient();
+
+  const { data, error } = await client.query<T>({ query, variables });
+
+  if (!isUndefined(error)) throw new Error(error.message);
+
+  return data ?? null;
 };
 
-export default requestDb;
+export const callMutation = async <T>(
+  mutation: DocumentNode,
+  variables?: OperationVariables,
+): Promise<T | null> => {
+  const client = await getApolloClient();
+
+  const { data, errors } = await client.mutate<T>({ mutation, variables });
+
+  if (!isUndefined(errors)) throw new Error(errors[0].message);
+
+  return data ?? null;
+};
diff --git a/packages/twenty-chrome-extension/tsconfig.json b/packages/twenty-chrome-extension/tsconfig.json
index 53e26a8532ea..43eb06cc5434 100644
--- a/packages/twenty-chrome-extension/tsconfig.json
+++ b/packages/twenty-chrome-extension/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
+    "target": "ES2022",
     "useDefineForClassFields": true,
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
     "module": "ESNext",
     "skipLibCheck": true,
     "esModuleInterop": true,
diff --git a/packages/twenty-chrome-extension/vite.config.ts b/packages/twenty-chrome-extension/vite.config.ts
index 8cef925430ed..c360a7d24beb 100644
--- a/packages/twenty-chrome-extension/vite.config.ts
+++ b/packages/twenty-chrome-extension/vite.config.ts
@@ -25,6 +25,7 @@ export default defineConfig(() => {
       rollupOptions: {
         output: { chunkFileNames: 'assets/chunk-[hash].js' },
       },
+      target: 'ES2022',
     },
 
     // Adding this to fix websocket connection error.
diff --git a/packages/twenty-docker/.env.example b/packages/twenty-docker/.env.example
new file mode 100644
index 000000000000..3999fc484cef
--- /dev/null
+++ b/packages/twenty-docker/.env.example
@@ -0,0 +1,23 @@
+TAG=latest
+
+# POSTGRES_ADMIN_PASSWORD=replace_me_with_a_strong_password
+
+PG_DATABASE_HOST=db:5432
+
+SERVER_URL=http://localhost:3000
+# Uncoment if you are serving your front on another server than the API (eg. bucket)
+# FRONT_BASE_URL=http://localhost:3000
+
+# Use openssl rand -base64 32 for each secret
+# ACCESS_TOKEN_SECRET=replace_me_with_a_random_string_access
+# LOGIN_TOKEN_SECRET=replace_me_with_a_random_string_login
+# REFRESH_TOKEN_SECRET=replace_me_with_a_random_string_refresh
+# FILE_TOKEN_SECRET=replace_me_with_a_random_string_refresh
+
+SIGN_IN_PREFILLED=true
+
+STORAGE_TYPE=local
+
+# STORAGE_S3_REGION=eu-west3
+# STORAGE_S3_NAME=my-bucket
+# STORAGE_S3_ENDPOINT=
diff --git a/packages/twenty-docker/Makefile b/packages/twenty-docker/Makefile
index 6e3324e5482b..8daa1948446d 100644
--- a/packages/twenty-docker/Makefile
+++ b/packages/twenty-docker/Makefile
@@ -24,57 +24,35 @@ dev-postgres-build:
 	@docker compose -f dev/docker-compose.yml up --build postgres -d
 
 prod-docs-build:
-	@cd ../.. && docker build -f ./packages/twenty-docker/prod/twenty-docs/Dockerfile --tag twenty-docs . && cd -
+	@cd ../.. && docker build -f ./packages/twenty-docker/twenty-docs/Dockerfile --tag twenty-docs . && cd -
 
 prod-docs-run:
 	@docker run -d -p 3000:3000 --name twenty-docs twenty-docs
 
-prod-front-build:
-	@cd ../.. && docker build -f ./packages/twenty-docker/prod/twenty-front/Dockerfile --tag twenty-front . && cd -
+prod-build:
+	@cd ../.. && docker build -f ./packages/twenty-docker/twenty/Dockerfile --tag twenty . && cd -
 
-prod-front-run:
-	@docker run -d -p 3001:3000 --name twenty-front twenty-front
-
-prod-server-build:
-	@cd ../.. && docker build -f ./packages/twenty-docker/prod/twenty-server/Dockerfile --tag twenty-server . && cd -
-
-prod-server-run:
-	@docker run -d -p 3000:3000 --name twenty-server twenty-server
+prod-run:
+	@docker run -d -p 3000:3000 --name twenty twenty
 
 prod-postgres-build:
-	@cd ../.. && docker build -f ./packages/twenty-docker/prod/twenty-postgres/Dockerfile --tag twenty-postgres . && cd -
+	@cd ../.. && docker build -f ./packages/twenty-docker/twenty-postgres/Dockerfile --tag twenty-postgres . && cd -
 
 prod-postgres-run:
 	@docker run -d -p 5432:5432 -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres --name twenty-postgres twenty-postgres
 
 prod-website-build:
-	@cd ../.. && docker build -f ./packages/twenty-docker/prod/twenty-website/Dockerfile --tag twenty-website . && cd -
+	@cd ../.. && docker build -f ./packages/twenty-docker/twenty-website/Dockerfile --tag twenty-website . && cd -
 
 prod-website-run:
 	@docker run -d -p 3000:3000 --name twenty-website twenty-website
 
-release-front:
-	@cd ../.. && docker buildx build \
-		--push \
-		--no-cache \
-		--platform linux/amd64,linux/arm64 \
-		-f ./packages/twenty-docker/prod/twenty-front/Dockerfile -t twentycrm/twenty-front:$(version) -t twentycrm/twenty-front:latest . \
-		&& cd -
-
-release-server:
-	@cd ../.. && docker buildx build \
-		--push \
-		--no-cache \
-		--platform linux/amd64,linux/arm64 \
-		-f ./packages/twenty-docker/prod/twenty-server/Dockerfile -t twentycrm/twenty-server:$(version) -t twentycrm/twenty-server:latest . \
-		&& cd -
-
 release-docs:
 	@cd ../.. && docker buildx build \
 		--push \
 		--no-cache \
 		--platform linux/amd64,linux/arm64 \
-		-f ./packages/twenty-docker/prod/twenty-docs/Dockerfile -t twentycrm/twenty-docs:$(version) -t twentycrm/twenty-docs:latest . \
+		-f ./packages/twenty-docker/twenty-docs/Dockerfile -t twentycrm/twenty-docs:$(version) -t twentycrm/twenty-docs:latest . \
 		&& cd -
 
 release-postgres:
@@ -82,5 +60,5 @@ release-postgres:
 		--push \
 		--no-cache \
 		--platform linux/amd64,linux/arm64 \
-		-f ./packages/twenty-docker/prod/twenty-postgres/Dockerfile -t twentycrm/twenty-postgres:$(version) -t twentycrm/twenty-postgres:latest . \
+		-f ./packages/twenty-docker/twenty-postgres/Dockerfile -t twentycrm/twenty-postgres:$(version) -t twentycrm/twenty-postgres:latest . \
 		&& cd -
diff --git a/packages/twenty-docker/dev/docker-compose.yml b/packages/twenty-docker/dev/docker-compose.yml
deleted file mode 100644
index 20ed185e7b46..000000000000
--- a/packages/twenty-docker/dev/docker-compose.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-version: "3.9"
-services:
-  twenty-dev:
-    build: 
-      context: ../../..
-      dockerfile: ./packages/twenty-docker/dev/twenty-dev/Dockerfile
-    ports:
-      - "3000:3000"
-      - "3001:3001"
-      - "6006:6006"
-    volumes:
-      - ../../..:/app
-      - twenty_dev_node_modules_root:/app/node_modules
-      - twenty_dev_node_modules_docs:/app/packages/twenty-docs/node_modules
-      - twenty_dev_node_modules_front:/app/packages/twenty-front/node_modules
-      - twenty_dev_node_modules_server:/app/packages/twenty-server/node_modules
-      - twenty_dev_node_modules_website:/app/packages/twenty-website/node_modules
-    depends_on:
-      - postgres
-  postgres:
-    container_name: twenty_postgres
-    image: twentycrm/twenty-postgres:latest
-    volumes:
-    - twenty_db_data:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
-      - POSTGRES_DB=default
-    ports:
-      - "5432:5432"
-volumes:
-  twenty_db_data:
-    name: twenty_db_data
-  twenty_dev_node_modules_root:
-  twenty_dev_node_modules_docs:
-  twenty_dev_node_modules_eslint:
-  twenty_dev_node_modules_front:
-  twenty_dev_node_modules_server:
-  twenty_dev_node_modules_website:
-
diff --git a/packages/twenty-docker/dev/twenty-dev/Dockerfile b/packages/twenty-docker/dev/twenty-dev/Dockerfile
deleted file mode 100644
index 92396249efd7..000000000000
--- a/packages/twenty-docker/dev/twenty-dev/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM node:18.17.1-bullseye as twenty-dev
-
-WORKDIR /app
-
-RUN npx playwright install-deps 
-
-CMD ["tail", "-f", "/dev/null"]
diff --git a/packages/twenty-docker/docker-compose.yml b/packages/twenty-docker/docker-compose.yml
new file mode 100644
index 000000000000..70ef4ceef94e
--- /dev/null
+++ b/packages/twenty-docker/docker-compose.yml
@@ -0,0 +1,53 @@
+version: "3.9"
+name: twenty
+
+services:
+  server:
+    image: twentycrm/twenty:${TAG}
+    volumes:
+      - server-local-data:/app/${STORAGE_LOCAL_PATH:-.local-storage}
+    ports:
+      - "3000:3000"
+    environment:
+      PORT: 3000
+      PG_DATABASE_URL: postgres://twenty:twenty@${PG_DATABASE_HOST}/default
+      SERVER_URL: ${SERVER_URL}
+      FRONT_BASE_URL: ${FRONT_BASE_URL:-$SERVER_URL}
+
+      ENABLE_DB_MIGRATIONS: "true"
+
+      SIGN_IN_PREFILLED: ${SIGN_IN_PREFILLED}
+      STORAGE_TYPE: ${STORAGE_TYPE}
+      STORAGE_S3_REGION: ${STORAGE_S3_REGION}
+      STORAGE_S3_NAME: ${STORAGE_S3_NAME}
+      STORAGE_S3_ENDPOINT: ${STORAGE_S3_ENDPOINT}
+      ACCESS_TOKEN_SECRET: ${ACCESS_TOKEN_SECRET}
+      LOGIN_TOKEN_SECRET: ${LOGIN_TOKEN_SECRET}
+      REFRESH_TOKEN_SECRET: ${REFRESH_TOKEN_SECRET}
+      FILE_TOKEN_SECRET: ${FILE_TOKEN_SECRET}
+    depends_on:
+      db:
+        condition: service_healthy
+    healthcheck:
+      test: curl --fail http://localhost:3000/healthz
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    restart: always
+
+  db:
+    image: twentycrm/twenty-postgres:${TAG}
+    volumes:
+      - db-data:/bitnami/postgresql
+    environment:
+      POSTGRES_PASSWORD: ${POSTGRES_ADMIN_PASSWORD}
+    healthcheck:
+      test: pg_isready -U twenty -d default
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    restart: always
+
+volumes:
+  db-data:
+  server-local-data:
diff --git a/packages/twenty-docker/prod/twenty-front/Dockerfile b/packages/twenty-docker/prod/twenty-front/Dockerfile
deleted file mode 100644
index 9f43235384c7..000000000000
--- a/packages/twenty-docker/prod/twenty-front/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-FROM node:18.17.1-alpine as twenty-front-build
-
-ARG REACT_APP_SERVER_BASE_URL
-ARG REACT_APP_SERVER_AUTH_URL
-ARG REACT_APP_SERVER_FILES_URL
-
-WORKDIR /app
-
-COPY ./package.json .
-COPY ./yarn.lock .
-COPY ./.yarnrc.yml .
-COPY ./.yarn/releases /app/.yarn/releases
-COPY ./tools/eslint-rules /app/tools/eslint-rules
-COPY ./packages/twenty-emails /app/packages/twenty-emails
-COPY ./packages/twenty-front/package.json /app/packages/twenty-front/package.json
-
-RUN yarn
-
-COPY ./packages/twenty-front /app/packages/twenty-front
-RUN yarn nx build twenty-front
-
-
-FROM node:18.17.1-alpine as twenty-front
-
-WORKDIR /app/packages/twenty-front
-
-COPY --from=twenty-front-build /app/packages/twenty-front/build ./build
-COPY ./packages/twenty-docker/prod/twenty-front/serve.json ./build
-COPY ./packages/twenty-front/scripts/inject-runtime-env.sh /app/packages/twenty-front/scripts/inject-runtime-env.sh
-RUN yarn global add serve
-
-LABEL org.opencontainers.image.source=https://github.com/twentyhq/twenty
-LABEL org.opencontainers.image.description="This image provides a consistent and reproducible environment for the frontend."
-
-CMD ["/bin/sh", "-c", "./scripts/inject-runtime-env.sh && serve build"]
\ No newline at end of file
diff --git a/packages/twenty-docker/prod/twenty-front/serve.json b/packages/twenty-docker/prod/twenty-front/serve.json
deleted file mode 100644
index cd8879807d9b..000000000000
--- a/packages/twenty-docker/prod/twenty-front/serve.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "rewrites": [
-    { "source": "!static/**", "destination": "/index.html" }
-  ],
-  "directoryListing": false
-}
\ No newline at end of file
diff --git a/packages/twenty-docker/prod/twenty-postgres/Dockerfile b/packages/twenty-docker/prod/twenty-postgres/Dockerfile
deleted file mode 100644
index 8880127ca4aa..000000000000
--- a/packages/twenty-docker/prod/twenty-postgres/Dockerfile
+++ /dev/null
@@ -1,54 +0,0 @@
-ARG IMAGE_TAG='15.5.0-debian-11-r15'
-
-FROM bitnami/postgresql:${IMAGE_TAG}
-
-ARG PG_MAIN_VERSION=15
-ARG PG_GRAPHQL_VERSION=1.4.2
-ARG WRAPPERS_VERSION=0.2.0
-ARG TARGETARCH
-
-USER root
-
-RUN set -eux; \
-    ARCH="$(dpkg --print-architecture)"; \
-    case "${ARCH}" in \
-       aarch64|arm64) \
-         TARGETARCH='arm64'; \
-         ;; \
-       amd64|x86_64) \
-         TARGETARCH='amd64'; \
-         ;; \
-       *) \
-         echo "Unsupported arch: ${ARCH}"; \
-         exit 1; \
-         ;; \
-    esac;
-
-RUN apt update && apt install build-essential git curl default-libmysqlclient-dev -y
-
-# Install precompiled pg_graphql extensions
-COPY ./packages/twenty-postgres/linux/${TARGETARCH}/${PG_MAIN_VERSION}/pg_graphql/${PG_GRAPHQL_VERSION}/pg_graphql--${PG_GRAPHQL_VERSION}.sql \
-    /opt/bitnami/postgresql/share/extension/
-COPY ./packages/twenty-postgres/linux/${TARGETARCH}/${PG_MAIN_VERSION}/pg_graphql/${PG_GRAPHQL_VERSION}/pg_graphql.control \
-    /opt/bitnami/postgresql/share/extension/
-COPY ./packages/twenty-postgres/linux/${TARGETARCH}/${PG_MAIN_VERSION}/pg_graphql/${PG_GRAPHQL_VERSION}/pg_graphql.so \
-    /opt/bitnami/postgresql/lib/
-
-# Install precompiled supabase wrappers extensions
-RUN curl -L "https://github.com/supabase/wrappers/releases/download/v${WRAPPERS_VERSION}/wrappers-v${WRAPPERS_VERSION}-pg${PG_MAIN_VERSION}-${TARGETARCH}-linux-gnu.deb" -o wrappers.deb
-RUN dpkg --install wrappers.deb
-RUN cp /usr/share/postgresql/${PG_MAIN_VERSION}/extension/wrappers* /opt/bitnami/postgresql/share/extension/
-RUN cp /usr/lib/postgresql/${PG_MAIN_VERSION}/lib/wrappers* /opt/bitnami/postgresql/lib/
-
-RUN export PATH=/usr/local/pgsql/bin/:$PATH
-RUN export PATH=/usr/local/mysql/bin/:$PATH
-RUN git clone https://github.com/EnterpriseDB/mysql_fdw.git
-WORKDIR mysql_fdw
-RUN make USE_PGXS=1
-RUN make USE_PGXS=1 install
-
-COPY ./packages/twenty-docker/prod/twenty-postgres/init.sql /docker-entrypoint-initdb.d/
-
-USER 1001
-ENTRYPOINT ["/opt/bitnami/scripts/postgresql/entrypoint.sh"]
-CMD ["/opt/bitnami/scripts/postgresql/run.sh"]
diff --git a/packages/twenty-docker/prod/twenty-server/Dockerfile b/packages/twenty-docker/prod/twenty-server/Dockerfile
deleted file mode 100644
index 954e1c39779e..000000000000
--- a/packages/twenty-docker/prod/twenty-server/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM node:18.16.0-alpine as twenty-server
-
-WORKDIR /app
-
-COPY ./package.json .
-COPY ./yarn.lock .
-COPY ./.yarnrc.yml .
-COPY ./tsconfig.base.json .
-COPY ./nx.json .
-COPY ./.yarn/releases /app/.yarn/releases
-COPY ./packages/twenty-emails /app/packages/twenty-emails
-COPY ./packages/twenty-server /app/packages/twenty-server
-RUN yarn workspaces focus twenty-emails twenty-server
-RUN npx nx reset
-RUN npx nx run twenty-server:build:packageJson
-RUN mv /app/packages/twenty-server/dist/package.json /app/packages/twenty-server/package.json
-RUN yarn workspaces focus twenty-emails twenty-server
-RUN npx nx run twenty-server:build
-
-WORKDIR /app/packages/twenty-server
-
-LABEL org.opencontainers.image.source=https://github.com/twentyhq/twenty
-LABEL org.opencontainers.image.description="This image provides a consistent and reproducible environment for the backend, ensuring it deploys faster and runs the same way regardless of the deployment environment."
-
-CMD ["node", "dist/src/main"]
diff --git a/packages/twenty-docker/prod/twenty-docs/Dockerfile b/packages/twenty-docker/twenty-docs/Dockerfile
similarity index 100%
rename from packages/twenty-docker/prod/twenty-docs/Dockerfile
rename to packages/twenty-docker/twenty-docs/Dockerfile
diff --git a/packages/twenty-docker/twenty-postgres/Dockerfile b/packages/twenty-docker/twenty-postgres/Dockerfile
new file mode 100644
index 000000000000..91cf357a4e0b
--- /dev/null
+++ b/packages/twenty-docker/twenty-postgres/Dockerfile
@@ -0,0 +1,54 @@
+ARG IMAGE_TAG='15.5.0-debian-11-r15'
+
+FROM bitnami/postgresql:${IMAGE_TAG}
+
+ARG PG_MAIN_VERSION=15
+ARG PG_GRAPHQL_VERSION=1.5.1
+ARG WRAPPERS_VERSION=0.2.0
+ARG TARGETARCH
+
+USER root
+
+RUN set -eux; \
+    ARCH="$(dpkg --print-architecture)"; \
+    case "${ARCH}" in \
+       aarch64|arm64) \
+         TARGETARCH='arm64'; \
+         ;; \
+       amd64|x86_64) \
+         TARGETARCH='amd64'; \
+         ;; \
+       *) \
+         echo "Unsupported arch: ${ARCH}"; \
+         exit 1; \
+         ;; \
+    esac;
+
+RUN apt update && apt install build-essential git curl default-libmysqlclient-dev -y
+
+# Install precompiled pg_graphql extensions
+COPY ./packages/twenty-postgres/linux/${TARGETARCH}/${PG_MAIN_VERSION}/pg_graphql/${PG_GRAPHQL_VERSION}/pg_graphql--${PG_GRAPHQL_VERSION}.sql \
+    /opt/bitnami/postgresql/share/extension/
+COPY ./packages/twenty-postgres/linux/${TARGETARCH}/${PG_MAIN_VERSION}/pg_graphql/${PG_GRAPHQL_VERSION}/pg_graphql.control \
+    /opt/bitnami/postgresql/share/extension/
+COPY ./packages/twenty-postgres/linux/${TARGETARCH}/${PG_MAIN_VERSION}/pg_graphql/${PG_GRAPHQL_VERSION}/pg_graphql.so \
+    /opt/bitnami/postgresql/lib/
+
+# Install precompiled supabase wrappers extensions
+RUN curl -L "https://github.com/supabase/wrappers/releases/download/v${WRAPPERS_VERSION}/wrappers-v${WRAPPERS_VERSION}-pg${PG_MAIN_VERSION}-${TARGETARCH}-linux-gnu.deb" -o wrappers.deb
+RUN dpkg --install wrappers.deb
+RUN cp /usr/share/postgresql/${PG_MAIN_VERSION}/extension/wrappers* /opt/bitnami/postgresql/share/extension/
+RUN cp /usr/lib/postgresql/${PG_MAIN_VERSION}/lib/wrappers* /opt/bitnami/postgresql/lib/
+
+RUN export PATH=/usr/local/pgsql/bin/:$PATH
+RUN export PATH=/usr/local/mysql/bin/:$PATH
+RUN git clone https://github.com/EnterpriseDB/mysql_fdw.git
+WORKDIR mysql_fdw
+RUN make USE_PGXS=1
+RUN make USE_PGXS=1 install
+
+COPY ./packages/twenty-docker/twenty-postgres/init.sql /docker-entrypoint-initdb.d/
+
+USER 1001
+ENTRYPOINT ["/opt/bitnami/scripts/postgresql/entrypoint.sh"]
+CMD ["/opt/bitnami/scripts/postgresql/run.sh"]
diff --git a/packages/twenty-docker/prod/twenty-postgres/init.sql b/packages/twenty-docker/twenty-postgres/init.sql
similarity index 100%
rename from packages/twenty-docker/prod/twenty-postgres/init.sql
rename to packages/twenty-docker/twenty-postgres/init.sql
diff --git a/packages/twenty-docker/prod/twenty-website/Dockerfile b/packages/twenty-docker/twenty-website/Dockerfile
similarity index 100%
rename from packages/twenty-docker/prod/twenty-website/Dockerfile
rename to packages/twenty-docker/twenty-website/Dockerfile
diff --git a/packages/twenty-docker/twenty/Dockerfile b/packages/twenty-docker/twenty/Dockerfile
new file mode 100644
index 000000000000..33a872bf6ef5
--- /dev/null
+++ b/packages/twenty-docker/twenty/Dockerfile
@@ -0,0 +1,79 @@
+# Base image for common dependencies
+FROM node:18.17.1-alpine as common-deps
+
+WORKDIR /app
+
+# Copy only the necessary files for dependency resolution
+COPY ./package.json ./yarn.lock ./.yarnrc.yml ./tsconfig.base.json ./nx.json /app/
+COPY ./.yarn/releases /app/.yarn/releases
+
+COPY ./packages/twenty-emails/package.json /app/packages/twenty-emails/
+COPY ./packages/twenty-server/package.json /app/packages/twenty-server/
+COPY ./packages/twenty-server/patches /app/packages/twenty-server/patches
+COPY ./packages/twenty-ui/package.json /app/packages/twenty-ui/
+COPY ./packages/twenty-front/package.json /app/packages/twenty-front/
+
+# Install all dependencies
+RUN yarn && yarn cache clean && npx nx reset
+
+
+# Build the back
+FROM common-deps as twenty-server-build
+
+# Copy sourcecode after installing dependences to accelerate subsequents builds
+COPY ./packages/twenty-emails /app/packages/twenty-emails
+COPY ./packages/twenty-server /app/packages/twenty-server
+
+RUN npx nx run twenty-server:build
+RUN mv /app/packages/twenty-server/dist /app/packages/twenty-server/build
+RUN npx nx run twenty-server:build:packageJson
+RUN mv /app/packages/twenty-server/dist/package.json /app/packages/twenty-server/package.json
+RUN rm -rf /app/packages/twenty-server/dist
+RUN mv /app/packages/twenty-server/build /app/packages/twenty-server/dist
+
+RUN yarn workspaces focus --production twenty-emails twenty-server
+
+
+# Build the front
+FROM common-deps as twenty-front-build
+
+ARG REACT_APP_SERVER_BASE_URL
+
+COPY ./packages/twenty-front /app/packages/twenty-front
+COPY ./packages/twenty-ui /app/packages/twenty-ui
+RUN yarn nx build twenty-front
+
+
+# Final stage: Run the application
+FROM node:18.17.1-alpine as twenty
+
+# Used to run healthcheck in docker
+RUN apk add --no-cache curl jq
+
+COPY ./packages/twenty-docker/twenty/entrypoint.sh /app/entrypoint.sh
+RUN chmod +x /app/entrypoint.sh
+
+WORKDIR /app/packages/twenty-server
+
+ARG REACT_APP_SERVER_BASE_URL
+ENV REACT_APP_SERVER_BASE_URL $REACT_APP_SERVER_BASE_URL
+ARG SENTRY_RELEASE
+ENV SENTRY_RELEASE $SENTRY_RELEASE
+
+# Copy built applications from previous stages
+COPY --chown=1000 --from=twenty-server-build /app /app
+COPY --chown=1000 --from=twenty-server-build /app/packages/twenty-server /app/packages/twenty-server
+COPY --chown=1000 --from=twenty-front-build /app/packages/twenty-front/build /app/packages/twenty-server/dist/front
+
+# Set metadata and labels
+LABEL org.opencontainers.image.source=https://github.com/twentyhq/twenty
+LABEL org.opencontainers.image.description="This image provides a consistent and reproducible environment for the backend and frontend, ensuring it deploys faster and runs the same way regardless of the deployment environment."
+
+RUN mkdir /app/.local-storage
+RUN chown -R 1000 /app
+
+# Use non root user with uid 1000
+USER 1000
+
+CMD ["node", "dist/src/main"]
+ENTRYPOINT ["/app/entrypoint.sh"]
diff --git a/packages/twenty-docker/twenty/entrypoint.sh b/packages/twenty-docker/twenty/entrypoint.sh
new file mode 100755
index 000000000000..b3bb5cad57bc
--- /dev/null
+++ b/packages/twenty-docker/twenty/entrypoint.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Check if the initialization has already been done and that we enabled automatic migration
+if [ "${ENABLE_DB_MIGRATIONS}" = "true" ] && [ ! -f /app/${STORAGE_LOCAL_PATH:-.local-storage}/db_initialized ]; then
+    echo "Running database setup and migrations..."
+
+    # Run setup and migration scripts
+    npx ts-node ./scripts/setup-db.ts
+    yarn database:migrate:prod
+
+    # Mark initialization as done
+    echo "Successfuly migrated DB!"
+    touch /app/${STORAGE_LOCAL_PATH:-.local-storage}/db_initialized
+fi
+
+# Continue with the original Docker command
+exec "$@"
diff --git a/packages/twenty-docs/docs/contributor/server/server.mdx b/packages/twenty-docs/docs/contributor/server/server.mdx
index 19b0a5401763..73292f3bbdcb 100644
--- a/packages/twenty-docs/docs/contributor/server/server.mdx
+++ b/packages/twenty-docs/docs/contributor/server/server.mdx
@@ -13,35 +13,31 @@ import DocCardList from '@theme/DocCardList';
 
 ## Useful commands
 
+These commands should be exectued from packages/twenty-server folder.
+From any other folder you can run `yarn nx <command>` twenty-server.
+
 ### First time setup
 
 ```
-yarn prisma:migrate # run migrations
-yarn prisma:generate # generate prisma and nestjs-graphql schemas
-yarn prisma:seed # provision database with seeds
-
-# alternatively, you can run
-yarn prisma:reset # all-in-one command to reset, migrate, seed and generate schemas
+yarn nx database:reset # setup the database with dev seeds
 ```
 
 ###  Starting the app
 
 ```
-nx prisma:migrate twenty-server
-nx prisma:generate twenty-server 
-nx start:dev twenty-server
+yarn nx start
 ```
 
 ### Lint
 
 ```
-nx lint twenty-server
+yarn nx lint
 ```
 
 ### Test
 
 ```
-nx test twenty-server
+yarn nx test:unit
 ```
 
 ### Resetting the database
@@ -49,7 +45,7 @@ nx test twenty-server
 If you want to reset the database, you can run the following command:
 
 ```bash
-nx database:reset twenty-server
+yarn nx database:reset
 ```
 
 :::warning
diff --git a/packages/twenty-docs/docs/start/cloud.mdx b/packages/twenty-docs/docs/start/cloud.mdx
index 0246892da52c..84538217b3fe 100644
--- a/packages/twenty-docs/docs/start/cloud.mdx
+++ b/packages/twenty-docs/docs/start/cloud.mdx
@@ -13,9 +13,11 @@ The easiest way to try the app is to sign up on [app.twenty.com](https://app.twe
 
 We offer a free trial but require a credit-card to signup.
 
-If you just want to play around with a test instance you can use these credentials:
+If you just want to play around with a test instance you can use these credentials on [demo.twenty.com](https://demo.twenty.com):
 
 ```
 email: noah@demo.dev
 password: Applecar2025
-```
\ No newline at end of file
+```
+
+Expect the demo to occasionnaly have bugs; it's used for testing purposes and therefore is running a version of the software that's newer than the production environment.
\ No newline at end of file
diff --git a/packages/twenty-docs/docs/start/local-setup/docker-setup.mdx b/packages/twenty-docs/docs/start/local-setup/docker-setup.mdx
deleted file mode 100644
index 41f5020ab07a..000000000000
--- a/packages/twenty-docs/docs/start/local-setup/docker-setup.mdx
+++ /dev/null
@@ -1,131 +0,0 @@
----
-title: Docker Setup
-sidebar_position: 3
-description: Set up the project with Docker
-sidebar_custom_props:
-  icon: TbBrandDocker
----
-
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-
-This guide will walk you through provisioning the project with Docker. This comes with the following advantages:
-- It provides the exact same environment as the core development team.
-- It includes some extra dependencies (such as `playwright`) that you might need if you wish to contribute to some advanced areas of the project.
-- It provisions a PostgreSQL database.
-
-:::info
-Avoid setting up the project with Docker if you are a Windows (WSL) user, unless you have experience with it, as it will make troubleshooting harder.
-If you are a Windows user, it's better to use the [yarn installation](/start/local-setup/yarn-setup).
-:::
-
-## Prerequisites
-
-Make sure you have the latest [Docker](https://docs.docker.com/get-docker/) and [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) versions installed on your computer.
-
-You can run `docker --version` to verify the installation.
-
-## Step 1: Git Clone
-
-In your terminal, run the following command:
-
-:::info Note
-
-It's better to use SSH for this step. If you already haven't set up SSH keys, please do so first. You can learn more about it [here](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/about-ssh). 
-
-:::
-
-<Tabs>
-<TabItem value="ssh" label="SSH (Recommended)" default>
-
-```bash
-git clone git@github.com:twentyhq/twenty.git
-```
-</TabItem>
-<TabItem value="https" label="HTTPS" >
-
-```bash
-git clone https://github.com/twentyhq/twenty.git
-```
-
-</TabItem>
-</Tabs>
-
-## Step 2: Setup environment variables
-
-You need to set some environment variables before you can work on the project. Locally, it's better to set them through `.env` files.
-
-```bash
-cd twenty
-cp ./packages/twenty-front/.env.example ./packages/twenty-front/.env
-cp ./packages/twenty-server/.env.example ./packages/twenty-server/.env
-```
-
-The default values should work out of the box, except for the postgres URL, which requires a small modification.
-
-Open `./packages/twenty-server/.env` and change to the following:
-
-```bash
-PG_DATABASE_URL=postgres://twenty:twenty@postgres:5432/default
-```
-
-
-## Step 3: Build
-
-The project includes an environment containerized with Docker and orchestrated with `docker-compose`.
-This installation method will also provision a PostgreSQL container.
-
-
-```bash
-make docker-dev-build
-```
-
-## Step 4: Migrate & seed
-
-Before running the project, you need to initialize the database by running the migrations and seed.
-
-Start the containers:
-```bash
-make docker-dev-up
-```
-
-Setup database, run migrations, and seed:
-```bash
-make docker-dev-sh
-yarn
-yarn nx database:init twenty-server
-```
-
-## Step 5: Start Twenty
-
-Run the project with the following commands from the `root` folder:
-
-```bash
-make docker-dev-sh
-yarn nx start:dev twenty-server
-```
-
-and in a separate terminal:
-```bash
-make docker-dev-sh
-yarn nx start twenty-front
-```
-
-You should now have:
-- **Frontend** available on: [http://localhost:3001](http://localhost:3001)
-- **Server** available on: [http://localhost:3000/graphql](http://localhost:3000/graphql)
-- **Postgres** available on [http://localhost:5432](http://localhost:5432) and containing database named `default`
-
-Sign in using a seeded demo account `tim@apple.dev` (password: `Applecar2025`) to start using Twenty.
-
-## Step 6: Configure your IDE
-
-As you are executing the project inside a Docker container, you need to configure your IDE to use the same environment.
-You can find the instructions for your IDE in our [IDE setup](/start/local-setup/ide-setup) guide.
-
-### Troubleshooting
-
-#### Docker throws errors while setting up local environment
-
-If by any chance you run into problems with Docker, you should change the `docker-compose` to `docker compose` in `./infra/dev/Makefile` as `docker-compose` is an old version
-that's becoming obsolete. (You can find more info [here](https://docs.docker.com/compose/migrate/))
diff --git a/packages/twenty-docs/docs/start/local-setup/ide-setup.mdx b/packages/twenty-docs/docs/start/local-setup/ide-setup.mdx
index f0de8cee6024..93c913729835 100644
--- a/packages/twenty-docs/docs/start/local-setup/ide-setup.mdx
+++ b/packages/twenty-docs/docs/start/local-setup/ide-setup.mdx
@@ -34,21 +34,6 @@ You can use the recommended extensions for the project. You will find them in `.
     <img src="/img/contributor/ide-extensions.png" alt="Visual Studio Code: Install recommended extensions" width="90%" />
 </div>
 
-
-### Step 4: (Docker only) Run VSCode in container
-
-If you are using a [Docker setup](/start/local-setup/docker-setup), you will need to run VSCode in the container. You can do that by opening the project, clicking on the `Remote Explorer` icon on the left sidebar and then clicking on `Attach in New window` on `dev-twenty-dev` container.
-
-<div style={{textAlign: 'center'}}>
-    <img src="/img/contributor/ide-start-dev-container.png" alt="Visual Studio Code: Open in container" width="90%" />
-</div>
-
-<br />
-VSCode will open a new window and you will be able to use it as you would typically do. The only difference is that you will be running VSCode inside the container and you will have access to all the tools and dependencies installed in the container.
-
-<br /><br />
-If you stop your containers, you will need to restart them before opening the project in VSCode again.
-
 ## You are all set
 
 You are all set to start contributing to the project. If you have any questions, feel free to reach out to the team on [Discord](https://discord.gg/cx5n4Jzs57).
\ No newline at end of file
diff --git a/packages/twenty-docs/docs/start/local-setup/local-setup.mdx b/packages/twenty-docs/docs/start/local-setup/local-setup.mdx
index 5ee24fd25643..6fcab0e37651 100644
--- a/packages/twenty-docs/docs/start/local-setup/local-setup.mdx
+++ b/packages/twenty-docs/docs/start/local-setup/local-setup.mdx
@@ -16,14 +16,6 @@ Twenty aims for developer-friendliness, and your local installation should be up
 
 If you have any questions or need help, you can join Twenty's [Discord](https://discord.gg/cx5n4Jzs57) server.
 
-## MacOS and Linux users
-
-It's better to use [yarn installation](/start/local-setup/yarn-setup) as this is the easiest way to get started.
-But there's also an easy way to run the project with [Docker](/start/local-setup/docker-setup) that you can use if you are familiar with containerized environments.
-
-## Windows users
-
-Windows users can install the project through WSL2. [This guide](/start/local-setup/yarn-setup) can help you get started.
 
 ## Project structure
 
@@ -31,10 +23,10 @@ The repository has the following structure:
 ```
 twenty
 └───packages // contains this documentation
-└───twenty-front // contains the frontend code for the application
-└───twenty-server // contains the backend code for the application
-└───twenty-docker // contains docker configurations for development and production build
-└───many other packages you are invited to discover such as twenty-docs, twenty-ui, eslint-rules, twenty-zapier...
+└──────twenty-front // contains the frontend code for the application
+└──────twenty-server // contains the backend code for the application
+└──────twenty-docker // contains docker configurations for production build
+└──────other packages that are less relevant as a first step such (docs, zapier app...)
 ```
 
 ## IDE Setup
diff --git a/packages/twenty-docs/docs/start/local-setup/troubleshooting.mdx b/packages/twenty-docs/docs/start/local-setup/troubleshooting.mdx
index 72eccba95ced..8863fd6823f4 100644
--- a/packages/twenty-docs/docs/start/local-setup/troubleshooting.mdx
+++ b/packages/twenty-docs/docs/start/local-setup/troubleshooting.mdx
@@ -19,8 +19,6 @@ Then delete the repository and clone it again.
 ## Missing metadata schema
 
 During Twenty installation, you need to provision your postgres database with the right schemas, extensions, and users.
-This documentation includes [different ways](/start/local-setup/yarn-setup#step-2-set-up-postgresql-database) to set up your postgres instance.
-
 If you're successful in running this provisioning, you should have `default` and `metadata` schemas in your database.
 If you don't, make sure you don't have more than one postgres instance running on your computer.
 
@@ -41,3 +39,7 @@ This should work out of the box with the eslint extension installed. If this doe
   "source.fixAll.eslint": "explicit"
 }
 ```
+
+## Docker container build
+
+To successfully build Docker images, ensure that your system has a minimum of 2GB of memory available. For users of Docker Desktop, please verify that you've allocated sufficient resources to Docker within the application's settings.
diff --git a/packages/twenty-docs/docs/start/local-setup/yarn-setup.mdx b/packages/twenty-docs/docs/start/local-setup/yarn-setup.mdx
index 12d8569c75fa..507edb47670b 100644
--- a/packages/twenty-docs/docs/start/local-setup/yarn-setup.mdx
+++ b/packages/twenty-docs/docs/start/local-setup/yarn-setup.mdx
@@ -9,7 +9,6 @@ sidebar_custom_props:
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-In this document, you'll learn how to install the project using yarn. You should use this method since it's the easiest way to get started but you can also run the project with [Docker](/start/local-setup/docker-setup).  
 
 :::info
 `npm` does not support local packages well, opt for `yarn` instead.
@@ -183,12 +182,12 @@ yarn
 
 Setup your database with the following command:
 ```bash
-yarn nx database:init twenty-server
+yarn nx database:reset twenty-server
 ```
 
 Start the server and the frontend:
 ```bash
-yarn nx start:dev twenty-server
+yarn nx start twenty-server
 yarn nx start twenty-front
 ```
 
diff --git a/packages/twenty-docs/docs/start/self-hosting/1-click-deploy.mdx b/packages/twenty-docs/docs/start/self-hosting/1-click-deploy.mdx
deleted file mode 100644
index 8c681454cd16..000000000000
--- a/packages/twenty-docs/docs/start/self-hosting/1-click-deploy.mdx
+++ /dev/null
@@ -1,20 +0,0 @@
----
-title: 1-Click Deploy
-sidebar_position: 2
-sidebar_custom_props:
-  icon: TbBolt
----
-
-
-
-## Render
-
-[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/twentyhq/twenty)
-
-## Digital Ocean
-
-Community contribution are welcome!
-
-## Other
-
-Please feel free to Open a PR to add more 1-Click Deploy options.
\ No newline at end of file
diff --git a/packages/twenty-docs/docs/start/self-hosting/cloud-providers.mdx b/packages/twenty-docs/docs/start/self-hosting/cloud-providers.mdx
new file mode 100644
index 000000000000..8e40ade6b730
--- /dev/null
+++ b/packages/twenty-docs/docs/start/self-hosting/cloud-providers.mdx
@@ -0,0 +1,437 @@
+---
+title: Vendor-specific instructions
+sidebar_position: 3
+sidebar_custom_props:
+  icon: TbCloud
+---
+
+:::info
+This document is maintained by the community. It might contain issues.
+Feel free to join our discord if you need assistance.
+:::
+
+
+## Render
+
+[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/twentyhq/twenty)
+
+## RepoCloud
+
+[![Deploy on RepoCloud](https://d16t0pc4846x52.cloudfront.net/deploy.png)](https://repocloud.io/details/?app_id=259)
+
+
+## Azure Container Apps
+
+### About
+
+Hosts Twenty CRM using Azure Container Apps.
+The solution provisions file shares, a container apps environment with three containers, and a log analytics workspace.
+
+The file shares are used to store uploaded images and files through the UI, and to store database backups.
+
+### Prerequisites
+
+- Terraform installed https://developer.hashicorp.com/terraform/install
+- An Azure subscription with permissions to create resources
+
+### Step by step instructions:
+
+1. Create a new folder and copy all the files from below
+2. Run `terraform init`
+3. Run `terraform plan -out tfplan`
+4. Run `terraform apply tfplan`
+5. Connect to server `az containerapp exec --name twenty-server -g twenty-crm-rg`
+6. Initialize the database from the server `yarn database:init:prod`
+7. Go to https://your-twenty-front-fqdn - located in the portal
+
+#### Production docker containers
+
+This uses the prebuilt images found on [docker hub](https://hub.docker.com/r/twentycrm/).
+
+#### Environment Variables
+
+- Is set in respective tf-files
+- See docs [Setup Environment Variables](https://docs.twenty.com/start/self-hosting/) for usage
+- After deployment you could can set `IS_SIGN_UP_DISABLED=true` (and run `terraform plan/apply` again) to disable new workspaces from being created
+
+#### Security and networking
+
+- Container `twenty-db` accepts only ingress TCP traffic from other containers in the environment. No external ingress traffic allowed
+- Container `twenty-server` accepts external traffic over HTTPS
+- Container `twenty-front` accepts external traffic over HTTPS
+
+It´s highly recommended to enable [built-in authentication](https://learn.microsoft.com/en-us/azure/container-apps/authentication) for `twenty-front` using one of the supported providers.
+
+Use the [custom domain](https://learn.microsoft.com/en-us/azure/container-apps/custom-domains-certificates) feature on the `twenty-front` container if you would like an easier domain name.
+
+#### Files
+
+##### providers.tf
+
+```hcl
+# providers.tf
+
+terraform {
+  required_providers {
+    azapi = {
+      source = "Azure/azapi"
+    }
+  }
+}
+
+provider "azapi" {
+}
+
+provider "azurerm" {
+  features {}
+}
+
+provider "azuread" {
+}
+
+provider "random" {
+}
+```
+
+##### main.tf
+
+```hcl
+# main.tf
+
+# Create a resource group
+resource "azurerm_resource_group" "main" {
+  name     = "twenty-crm-rg"
+  location = "North Europe"
+}
+
+# Variables
+locals {
+  app_env_name = "twenty"
+
+  server_name = "twenty-server"
+  server_tag  = "latest"
+
+  front_app_name = "twenty-front"
+  front_tag      = "latest"
+
+  db_app_name = "twenty-postgres"
+  db_tag      = "latest"
+
+  db_user     = "twenty"
+  db_password = "twenty"
+
+  storage_mount_db_name     = "twentydbstoragemount"
+  storage_mount_server_name = "twentyserverstoragemount"
+
+  cpu    = 1.0
+  memory = "2Gi"
+}
+
+# Set up a Log Analytics workspace
+resource "azurerm_log_analytics_workspace" "main" {
+  name                = "${local.app_env_name}-law"
+  location            = azurerm_resource_group.main.location
+  resource_group_name = azurerm_resource_group.main.name
+  sku                 = "PerGB2018"
+  retention_in_days   = 30
+}
+
+# Create a storage account
+resource "random_pet" "example" {
+  length    = 2
+  separator = ""
+}
+
+resource "azurerm_storage_account" "main" {
+  name                     = "twentystorage${random_pet.example.id}"
+  resource_group_name      = azurerm_resource_group.main.name
+  location                 = azurerm_resource_group.main.location
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+  large_file_share_enabled = true
+}
+
+# Create db file storage
+resource "azurerm_storage_share" "db" {
+  name                 = "twentydatabaseshare"
+  storage_account_name = azurerm_storage_account.main.name
+  quota                = 50
+  enabled_protocol     = "SMB"
+}
+
+# Create backend file storage
+resource "azurerm_storage_share" "server" {
+  name                 = "twentyservershare"
+  storage_account_name = azurerm_storage_account.main.name
+  quota                = 50
+  enabled_protocol     = "SMB"
+}
+
+# Create a Container App Environment
+resource "azurerm_container_app_environment" "main" {
+  name                       = "${local.app_env_name}-env"
+  location                   = azurerm_resource_group.main.location
+  resource_group_name        = azurerm_resource_group.main.name
+  log_analytics_workspace_id = azurerm_log_analytics_workspace.main.id
+}
+
+# Connect the db storage share to the container app environment
+resource "azurerm_container_app_environment_storage" "db" {
+  name                         = local.storage_mount_db_name
+  container_app_environment_id = azurerm_container_app_environment.main.id
+  account_name                 = azurerm_storage_account.main.name
+  share_name                   = azurerm_storage_share.db.name
+  access_key                   = azurerm_storage_account.main.primary_access_key
+  access_mode                  = "ReadWrite"
+}
+
+# Connect the server storage share to the container app environment
+resource "azurerm_container_app_environment_storage" "server" {
+  name                         = local.storage_mount_server_name
+  container_app_environment_id = azurerm_container_app_environment.main.id
+  account_name                 = azurerm_storage_account.main.name
+  share_name                   = azurerm_storage_share.server.name
+  access_key                   = azurerm_storage_account.main.primary_access_key
+  access_mode                  = "ReadWrite"
+}
+```
+
+##### frontend.tf
+
+```hcl
+# frontend.tf
+
+resource "azurerm_container_app" "twenty_front" {
+  name                         = local.front_app_name
+  container_app_environment_id = azurerm_container_app_environment.main.id
+  resource_group_name          = azurerm_resource_group.main.name
+  revision_mode                = "Single"
+
+  depends_on = [azurerm_container_app.twenty_server]
+
+  ingress {
+    allow_insecure_connections = false
+    external_enabled           = true
+    target_port                = 3000
+    transport                  = "http"
+    traffic_weight {
+      percentage      = 100
+      latest_revision = true
+    }
+  }
+
+  template {
+    min_replicas = 1
+    # things starts to fail when using more than 1 replica
+    max_replicas = 1
+    container {
+      name   = "twenty-front"
+      image  = "docker.io/twentycrm/twenty-front:${local.front_tag}"
+      cpu    = local.cpu
+      memory = local.memory
+
+      env {
+        name  = "REACT_APP_SERVER_BASE_URL"
+        value = "https://${azurerm_container_app.twenty_server.ingress[0].fqdn}"
+      }
+    }
+  }
+}
+
+# Set CORS rules for frontend app using AzAPI
+resource "azapi_update_resource" "cors" {
+  type        = "Microsoft.App/containerApps@2023-05-01"
+  resource_id = azurerm_container_app.twenty_front.id
+  body = jsonencode({
+    properties = {
+      configuration = {
+        ingress = {
+          corsPolicy = {
+            allowedOrigins = ["*"]
+          }
+        }
+      }
+    }
+  })
+  depends_on = [azurerm_container_app.twenty_front]
+}
+```
+
+##### backend.tf
+
+```hcl
+# backend.tf
+
+# Create three random UUIDs
+resource "random_uuid" "access_token_secret" {}
+resource "random_uuid" "login_token_secret" {}
+resource "random_uuid" "refresh_token_secret" {}
+resource "random_uuid" "file_token_secret" {}
+
+resource "azurerm_container_app" "twenty_server" {
+  name                         = local.server_name
+  container_app_environment_id = azurerm_container_app_environment.main.id
+  resource_group_name          = azurerm_resource_group.main.name
+  revision_mode                = "Single"
+
+  depends_on = [azurerm_container_app.twenty_db, azurerm_container_app_environment_storage.server]
+
+  ingress {
+    allow_insecure_connections = false
+    external_enabled           = true
+    target_port                = 3000
+    transport                  = "http"
+    traffic_weight {
+      percentage      = 100
+      latest_revision = true
+    }
+  }
+
+  template {
+    min_replicas = 1
+    max_replicas = 1
+    volume {
+      name         = "twenty-server-data"
+      storage_type = "AzureFile"
+      storage_name = local.storage_mount_server_name
+    }
+
+    container {
+      name   = local.server_name
+      image  = "docker.io/twentycrm/twenty-server:${local.server_tag}"
+      cpu    = local.cpu
+      memory = local.memory
+
+      volume_mounts {
+        name = "twenty-server-data"
+        path = "/app/packages/twenty-server/.local-storage"
+      }
+
+      # Environment variables
+      env {
+        name  = "IS_SIGN_UP_DISABLED"
+        value = false
+      }
+      env {
+        name  = "SIGN_IN_PREFILLED"
+        value = false
+      }
+      env {
+        name  = "STORAGE_TYPE"
+        value = "local"
+      }
+      env {
+        name  = "STORAGE_LOCAL_PATH"
+        value = ".local-storage"
+      }
+      env {
+        name  = "PG_DATABASE_URL"
+        value = "postgres://${local.db_user}:${local.db_password}@${local.db_app_name}:5432/default"
+      }
+      env {
+        name  = "FRONT_BASE_URL"
+        value = "https://${local.front_app_name}"
+      }
+      env {
+        name  = "ACCESS_TOKEN_SECRET"
+        value = random_uuid.access_token_secret.result
+      }
+      env {
+        name  = "LOGIN_TOKEN_SECRET"
+        value = random_uuid.login_token_secret.result
+      }
+      env {
+        name  = "REFRESH_TOKEN_SECRET"
+        value = random_uuid.refresh_token_secret.result
+      }
+      env {
+        name  = "FILE_TOKEN_SECRET"
+        value = random_uuid.file_token_secret.result
+      }
+    }
+  }
+}
+
+# Set CORS rules for server app using AzAPI
+resource "azapi_update_resource" "server_cors" {
+  type        = "Microsoft.App/containerApps@2023-05-01"
+  resource_id = azurerm_container_app.twenty_server.id
+  body = jsonencode({
+    properties = {
+      configuration = {
+        ingress = {
+          corsPolicy = {
+            allowedOrigins = ["*"]
+          }
+        }
+      }
+    }
+  })
+  depends_on = [azurerm_container_app.twenty_server]
+}
+```
+
+##### database.tf
+
+```hcl
+# database.tf
+
+resource "azurerm_container_app" "twenty_db" {
+  name                         = local.db_app_name
+  container_app_environment_id = azurerm_container_app_environment.main.id
+  resource_group_name          = azurerm_resource_group.main.name
+  revision_mode                = "Single"
+
+  depends_on = [azurerm_container_app_environment_storage.db]
+
+  ingress {
+    allow_insecure_connections = false
+    external_enabled           = false
+    target_port                = 5432
+    transport                  = "tcp"
+    traffic_weight {
+      percentage      = 100
+      latest_revision = true
+    }
+  }
+
+  template {
+    min_replicas = 1
+    max_replicas = 1
+    container {
+      name   = local.db_app_name
+      image  = "docker.io/twentycrm/twenty-postgres:${local.db_tag}"
+      cpu    = local.cpu
+      memory = local.memory
+
+      volume_mounts {
+        name = "twenty-db-data"
+        path = "/var/lib/postgresql/data"
+      }
+
+      env {
+        name  = "POSTGRES_USER"
+        value = "postgres"
+      }
+      env {
+        name  = "POSTGRES_PASSWORD"
+        value = "postgres"
+      }
+      env {
+        name  = "POSTGRES_DB"
+        value = "default"
+      }
+    }
+
+    volume {
+      name         = "twenty-db-data"
+      storage_type = "AzureFile"
+      storage_name = local.storage_mount_db_name
+    }
+  }
+}
+```
+
+## Others
+
+Please feel free to Open a PR to add more Cloud Provider options.
diff --git a/packages/twenty-docs/docs/start/self-hosting/docker-compose.mdx b/packages/twenty-docs/docs/start/self-hosting/docker-compose.mdx
index 88ce97498525..660ed026fac4 100644
--- a/packages/twenty-docs/docs/start/self-hosting/docker-compose.mdx
+++ b/packages/twenty-docs/docs/start/self-hosting/docker-compose.mdx
@@ -1,74 +1,58 @@
 ---
-title: Docker Compose
-sidebar_position: 1
+title: Docker Compose (easy)
+sidebar_position: 2
 sidebar_custom_props:
   icon: TbBrandDocker
 ---
 # Step by step instructions:
 
-1) Copy the [.env.example](https://github.com/twentyhq/twenty/blob/main/packages/twenty-server/.env.example) into a `.env` in the same directory where your `docker-compose.yml` file will be
-2) Run the command `openssl rand -base64 32` three times, make note of the string for each
-3) Replace the three "replace_me_with_a_random_string_access" with the three random strings you just generated.
-4) Create a `docker-compose.yml` file from the example below.
-5) Run the command `docker-compose up -d`
-6) Go to http://localhost:3001 and see your docker instance.
-
-- If you encounter errors, (not able to log into the application after inputting an email) after the inital setup, try running `docker exec -it twenty_backend_1 yarn database:reset` and see if that solves your issue. 
-## Production docker containers
-
-Prebuilt images for both Postgres, frontend, and back-end can be found on [docker hub](https://hub.docker.com/r/twentycrm/).
-
-## Environment Variables
-
-- Copy this `.env.example` file into a `.env` in the same directory as your `docker-compose.yml` file
-- Find the `.env.example` [here](https://github.com/twentyhq/twenty/blob/main/packages/twenty-server/.env.example).
-
-## Docker Compose file
-
-We will soon update the documentation with an up-to-date docker compose file.
-Here is one that was proposed on Discord by a community member:
-
-
-```yaml
-version: "3.9"
-services:
-
-  twenty:
-    image: twentycrm/twenty-front:${TAG}
-    ports:
-      - 3001:3000
-    environment:
-      - SIGN_IN_PREFILLED=${SIGN_IN_PREFILLED}
-      - REACT_APP_SERVER_BASE_URL=${LOCAL_SERVER_URL}
-      - REACT_APP_SERVER_AUTH_URL=${LOCAL_SERVER_URL}/auth
-      - REACT_APP_SERVER_FILES_URL=${LOCAL_SERVER_URL}/files
-    depends_on:
-      - backend
-
-  backend:
-    image: twentycrm/twenty-server:${TAG}
-    ports:
-      - 3000:3000
-    environment:
-      - SIGN_IN_PREFILLED=${SIGN_IN_PREFILLED}
-      - PG_DATABASE_URL=${PG_DATABASE_URL}
-      - FRONT_BASE_URL=${FRONT_BASE_URL}
-      - PORT=3000
-      - STORAGE_TYPE=local
-      - STORAGE_LOCAL_PATH=.local-storage
-      - ACCESS_TOKEN_SECRET=${ACCESS_TOKEN_SECRET}
-      - LOGIN_TOKEN_SECRET=${LOGIN_TOKEN_SECRET}
-      - REFRESH_TOKEN_SECRET=${REFRESH_TOKEN_SECRET}
-    depends_on:
-      - db
-
-  db:
-    image: twentycrm/twenty-postgres:${TAG}
-    volumes:
-      - twenty-db-data:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_PASSWORD=${POSTGRES_ADMIN_PASSWORD}
-  
-volumes:
-  twenty-db-data:
+## One command installation
+
+Install the project with the command below. By default, it installs the latest version from the main branch.
+```bash
+bash <(curl -sL https://git.new/20)
+```
+
+## Custom Installation:
+
+Set VERSION for a specific docker image version, BRANCH for a specific clone branch:
+```bash
+VERSION=x.y.z BRANCH=branch-name bash <(curl -sL https://git.new/20)
+```
+
+## Manual installation
+
+1. Copy the [.env.example](https://github.com/twentyhq/twenty/blob/main/packages/twenty-docker/.env.example) into a `.env` in the same directory where your `docker-compose.yml` file will be
+2. Run the command `openssl rand -base64 32` three times, make note of the string for each
+3. In your .env file, replace the three "replace_me_with_a_random_string_access" with the three random strings you just generated.
+
+```
+ACCESS_TOKEN_SECRET=replace_me_with_a_random_string_access
+LOGIN_TOKEN_SECRET=replace_me_with_a_random_string_login
+REFRESH_TOKEN_SECRET=replace_me_with_a_random_string_refresh
+FILE_TOKEN_SECRET=replace_me_with_a_random_string_refresh
+```
+
+4. Copy the [docker-compose.yml](https://github.com/twentyhq/twenty/blob/main/packages/twenty-docker/docker-compose.yml) in the same directory as your `.env` file.
+5. Run the command `docker-compose up -d`
+6. Go to http://localhost:3000 and see your docker instance.
+
+## Troubleshooting
+
+### Not able to login
+
+If you encounter errors, (not able to log into the application after inputting an email) after the inital setup, try running the following commands and see if that solves your issue.
+```
+docker exec -it twenty-server-1 yarn
+docker exec -it twenty-server-1 yarn nx database:reset
 ```
+
+### Cannot connect to server, running behind a reverse proxy
+
+Complete step three and four with:
+
+3. Update `SERVER_URL=https://<your-api-url.com>` in your `.env`
+
+### Persistence
+
+By default the docker-compose will create volumes for the Database and local storage of the Server. Note that the containers will not persist data if your server is not configured to be stateful (for example Heroku). You probably want to configure a special stateful resource for this purpose.
diff --git a/packages/twenty-docs/docs/start/self-hosting/self-hosting.mdx b/packages/twenty-docs/docs/start/self-hosting/self-hosting.mdx
index f060bd803745..936e67577357 100644
--- a/packages/twenty-docs/docs/start/self-hosting/self-hosting.mdx
+++ b/packages/twenty-docs/docs/start/self-hosting/self-hosting.mdx
@@ -23,8 +23,6 @@ import TabItem from '@theme/TabItem';
 
 <OptionTable options={[
     ['REACT_APP_SERVER_BASE_URL', 'http://localhost:3000', 'Url of backend server'],
-    ['REACT_APP_SERVER_AUTH_URL', 'http://localhost:3000/auth', 'Auth Url of backend server'],
-    ['REACT_APP_SERVER_FILES_URL', 'http://localhost:3000/files', 'Files Url of backend server'],
     ['GENERATE_SOURCEMAP', 'false', 'Generate source maps for debugging'],
     ['CHROMATIC_PROJECT_TOKEN', '', 'Chromatic token used for CI'],
     ]}></OptionTable>
@@ -41,6 +39,8 @@ import TabItem from '@theme/TabItem';
     ['FRONT_BASE_URL', 'http://localhost:3001', 'Url to the hosted frontend'],
     ['SERVER_URL', 'http://localhost:3000', 'Url to the hosted server'],
     ['PORT', '3000', 'Port'],
+    ['CACHE_STORAGE_TYPE', 'memory', 'Cache type (memory, redis...)'],
+    ['CACHE_STORAGE_TTL', '3600 * 24 * 7', 'Cache TTL in seconds']
     ]}></OptionTable>
 
 ### Security
@@ -59,6 +59,8 @@ import TabItem from '@theme/TabItem';
     ['REFRESH_TOKEN_SECRET', '<random>', 'Secret used for the refresh tokens'],
     ['REFRESH_TOKEN_EXPIRES_IN', '90d', 'Refresh token expiration time'],
     ['REFRESH_TOKEN_COOL_DOWN', '1m', 'Refresh token cooldown'],
+    ['FILE_TOKEN_SECRET', '<random>', 'Secret used for the file tokens'],
+    ['FILE_TOKEN_EXPIRES_IN', '1d', 'File token expiration time'],
     ['API_TOKEN_EXPIRES_IN', '1000y', 'Api token expiration time'],
     ]}></OptionTable>
 
@@ -66,7 +68,8 @@ import TabItem from '@theme/TabItem';
 
 <OptionTable options={[
     ['MESSAGING_PROVIDER_GMAIL_ENABLED', 'false', 'Enable Gmail API connection'],
-    ['MESSAGING_PROVIDER_GMAIL_CALLBACK_URL', '', 'Gmail auth callback'],
+    ['CALENDAR_PROVIDER_GMAIL_ENABLED', 'false', 'Enable Google Calendar API connection'],
+    ['AUTH_GOOGLE_APIS_CALLBACK_URL', '', 'Google APIs auth callback'],
     ['AUTH_GOOGLE_ENABLED', 'false', 'Enable Goole SSO login'],
     ['AUTH_GOOGLE_CLIENT_ID', '', 'Google client ID'],
     ['AUTH_GOOGLE_CLIENT_SECRET', '', 'Google client secret'],
@@ -149,7 +152,10 @@ import TabItem from '@theme/TabItem';
     ['LOGGER_IS_BUFFER_ENABLED', 'true', 'Buffer the logs before sending them to the logging driver'],
     ['LOG_LEVELS', 'error,warn', "The loglevels which are logged to the logging driver. Can include: 'log', 'warn', 'error'"],
     ['EXCEPTION_HANDLER_DRIVER', 'sentry', "The exception handler driver can be: 'console' or 'sentry'"],
+    ['SENTRY_ENVIRONMENT', 'main', 'The sentry environment used if sentry logging driver is selected'],
+    ['SENTRY_RELEASE', 'latest', 'The sentry release used if sentry logging driver is selected'],
     ['SENTRY_DSN', 'https://xxx@xxx.ingest.sentry.io/xxx', 'The sentry logging endpoint used if sentry logging driver is selected'],
+    ['SENTRY_FRONT_DSN', 'https://xxx@xxx.ingest.sentry.io/xxx', 'The sentry logging endpoint used by the frontend if sentry logging driver is selected'],
     ]}></OptionTable>
 
 
diff --git a/packages/twenty-docs/docs/start/self-hosting/upgrade-guide.mdx b/packages/twenty-docs/docs/start/self-hosting/upgrade-guide.mdx
index 23a920f1c082..0afcf554d709 100644
--- a/packages/twenty-docs/docs/start/self-hosting/upgrade-guide.mdx
+++ b/packages/twenty-docs/docs/start/self-hosting/upgrade-guide.mdx
@@ -1,6 +1,6 @@
 ---
 title: Upgrade guide
-sidebar_position: 3
+sidebar_position: 4
 sidebar_class_name: coming-soon
 sidebar_custom_props:
   icon: TbServer
diff --git a/packages/twenty-docs/package.json b/packages/twenty-docs/package.json
index 411746c30b9c..0389b157df0d 100644
--- a/packages/twenty-docs/package.json
+++ b/packages/twenty-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twenty-docs",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "private": true,
   "scripts": {
     "nx": "NX_DEFAULT_PROJECT=twenty-docs node ../../node_modules/nx/bin/nx.js",
diff --git a/packages/twenty-docs/sidebars.js b/packages/twenty-docs/sidebars.js
index bc0c76434fb8..99a9a5a03105 100644
--- a/packages/twenty-docs/sidebars.js
+++ b/packages/twenty-docs/sidebars.js
@@ -56,9 +56,7 @@ const sidebars = {
             {
               type: 'link',
               label: 'Metadata API',
-              href: '#',
-              className: 'coming-soon',
-              //href: '/rest-api/metadata',
+              href: '/rest-api/metadata',
             },
           ],
         },
diff --git a/packages/twenty-docs/src/components/token-form.tsx b/packages/twenty-docs/src/components/token-form.tsx
index b89216af7fb1..8c9ee1fc15ed 100644
--- a/packages/twenty-docs/src/components/token-form.tsx
+++ b/packages/twenty-docs/src/components/token-form.tsx
@@ -48,10 +48,13 @@ const TokenForm = ({
     await submitToken(event.target.value);
   };
 
-  const updateBaseUrl = (baseUrl) => {
-    setBaseUrl(baseUrl);
-    submitBaseUrl?.(baseUrl);
-    localStorage.setItem('baseUrl', JSON.stringify({ baseUrl: baseUrl }));
+  const updateBaseUrl = (baseUrl: string) => {
+    const url = baseUrl?.endsWith('/')
+      ? baseUrl.substring(0, baseUrl.length - 1)
+      : baseUrl;
+    setBaseUrl(url);
+    submitBaseUrl?.(url);
+    localStorage.setItem('baseUrl', JSON.stringify({ baseUrl: url }));
   };
 
   const validateToken = (openApiJson) => {
diff --git a/packages/twenty-docs/src/css/custom.css b/packages/twenty-docs/src/css/custom.css
index 2631868830c5..60dd700a812b 100644
--- a/packages/twenty-docs/src/css/custom.css
+++ b/packages/twenty-docs/src/css/custom.css
@@ -43,7 +43,13 @@
   --category-icon-background-color: #ebebeb;
   --category-icon-border-color: #d6d6d6;
   --level-1-color: #B3B3B3;
-  
+
+  --dark-docsearch-hit-title-color: #444950;
+  --dark-docsearch-hit-mark-color: #11181c;
+  --dark-docsearch-hit-general-color: #969faf;
+  --light-docsearch-hit-title-color: #bec3c9;
+  --light-docsearch-hit-mark-color: #ffffff;
+  --light-docsearch-hit-general-color: #7f8497;
 }
 
 .markdown > h1 {
@@ -193,6 +199,38 @@ li.coming-soon a::after {
   color: white;
 }
 
+[data-theme='dark'] ul > .DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-title {
+  color: var(--dark-docsearch-hit-title-color) !important;
+}
+
+[data-theme='dark'] ul > .DocSearch-Hit[aria-selected='true'] mark {
+  color: var(--dark-docsearch-hit-mark-color) !important;
+}
+
+[data-theme='dark'] ul > .DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-action,
+[data-theme='dark'] ul > .DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-icon,
+[data-theme='dark'] ul > .DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-path,
+[data-theme='dark'] ul > .DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-text,
+[data-theme='dark'] ul > .DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-Tree {
+  color: var(--dark-docsearch-hit-general-color) !important;
+}
+
+
+[data-theme='light'] ul > .DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-title {
+  color: var(--light-docsearch-hit-title-color) !important;
+}
+
+[data-theme='light'] ul > .DocSearch-Hit[aria-selected='true'] mark {
+  color: var(--light-docsearch-hit-mark-color) !important;
+}
+
+[data-theme='light'] ul > .DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-action,
+[data-theme='light'] ul > .DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-icon,
+[data-theme='light'] ul > .DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-path,
+[data-theme='light'] ul > .DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-text,
+[data-theme='light'] ul > .DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-Tree {
+  color: var(--light-docsearch-hit-general-color) !important;
+}
 
 [data-theme='light'] .menu__list-item--level1 > .menu__link--active > .icon-and-text {
   color: initial;
diff --git a/packages/twenty-docs/src/pages/rest-api/metadata.tsx b/packages/twenty-docs/src/pages/rest-api/metadata.tsx
new file mode 100644
index 000000000000..b41356311a38
--- /dev/null
+++ b/packages/twenty-docs/src/pages/rest-api/metadata.tsx
@@ -0,0 +1,55 @@
+import React, { useEffect, useState } from 'react';
+import BrowserOnly from '@docusaurus/BrowserOnly';
+import { API } from '@stoplight/elements';
+import Layout from '@theme/Layout';
+
+import Playground from '../../components/playground';
+
+import spotlightTheme from '!css-loader!@stoplight/elements/styles.min.css';
+
+const RestApiComponent = ({ openApiJson }) => {
+  // We load spotlightTheme style using useEffect as it breaks remaining docs style
+  useEffect(() => {
+    const styleElement = document.createElement('style');
+    styleElement.innerHTML = spotlightTheme.toString();
+    document.head.append(styleElement);
+
+    return () => styleElement.remove();
+  }, []);
+
+  return (
+    <div
+      style={{
+        height: 'calc(100vh - var(--ifm-navbar-height) - 45px)',
+        overflow: 'auto',
+      }}
+    >
+      <API apiDescriptionDocument={JSON.stringify(openApiJson)} router="hash" />
+    </div>
+  );
+};
+
+const restApi = () => {
+  const [openApiJson, setOpenApiJson] = useState({});
+
+  const children = <RestApiComponent openApiJson={openApiJson} />;
+
+  return (
+    <Layout
+      title="REST API Playground"
+      description="REST API Playground for Twenty"
+    >
+      <BrowserOnly>
+        {() => (
+          <Playground
+            children={children}
+            setOpenApiJson={setOpenApiJson}
+            subDoc="metadata"
+          />
+        )}
+      </BrowserOnly>
+    </Layout>
+  );
+};
+
+export default restApi;
diff --git a/packages/twenty-docs/static/img/logo-square-light.svg b/packages/twenty-docs/static/img/logo-square-light.svg
new file mode 100644
index 000000000000..ce4077db564c
--- /dev/null
+++ b/packages/twenty-docs/static/img/logo-square-light.svg
@@ -0,0 +1,11 @@
+<svg width="136" height="136" viewBox="0 0 136 136" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2343_96409)">
+<rect width="136" height="136" rx="18" fill="black"/>
+<path d="M118.83 0H17.17C7.69 0 0 7.69 0 17.17V118.83C0 128.31 7.69 136 17.17 136H118.83C128.31 136 136 128.31 136 118.83V17.17C136 7.69 128.31 0 118.83 0ZM27.27 50.64C27.27 43.21 33.3 37.18 40.73 37.18H66.64C67.02 37.18 67.37 37.41 67.53 37.76C67.69 38.11 67.62 38.52 67.36 38.81L61.68 44.98C60.69 46.05 59.3 46.67 57.84 46.67H40.8C38.57 46.67 36.76 48.48 36.76 50.71V60.89C36.76 62.2 35.7 63.26 34.39 63.26H29.65C28.34 63.26 27.28 62.2 27.28 60.89V50.64H27.27ZM107.88 85.36C107.88 92.79 101.85 98.82 94.42 98.82H83.41C75.98 98.82 69.95 92.79 69.95 85.36V66.09C69.95 64.78 70.44 63.52 71.33 62.55L77.75 55.58C78.02 55.29 78.44 55.19 78.82 55.33C79.19 55.48 79.44 55.83 79.44 56.23V85.3C79.44 87.53 81.25 89.34 83.48 89.34H94.36C96.59 89.34 98.4 87.53 98.4 85.3V50.71C98.4 48.48 96.59 46.67 94.36 46.67H81.71C80.26 46.67 78.88 47.28 77.89 48.34L40.16 89.34H62.83C64.14 89.34 65.2 90.4 65.2 91.71V96.45C65.2 97.76 64.14 98.82 62.83 98.82H32.28C29.51 98.82 27.26 96.57 27.26 93.8V91.29C27.26 90.03 27.73 88.82 28.59 87.89L70.89 41.94C73.69 38.9 77.62 37.18 81.75 37.18H94.41C101.84 37.18 107.87 43.21 107.87 50.64V85.36H107.88Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2343_96409">
+<rect width="136" height="136" rx="18" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/twenty-emails/.eslintrc.cjs b/packages/twenty-emails/.eslintrc.cjs
new file mode 100644
index 000000000000..fba68ff6c3c9
--- /dev/null
+++ b/packages/twenty-emails/.eslintrc.cjs
@@ -0,0 +1,15 @@
+module.exports = {
+  extends: ['../../.eslintrc.cjs', '../../.eslintrc.react.cjs'],
+  ignorePatterns: ['!**/*'],
+  overrides: [
+    {
+      files: ['*.ts', '*.tsx'],
+      parserOptions: {
+        project: ['packages/twenty-emails/tsconfig.{json,*.json}'],
+      },
+      rules: {
+        '@nx/dependency-checks': 'error',
+      },
+    },
+  ],
+};
diff --git a/packages/twenty-emails/.eslintrc.json b/packages/twenty-emails/.eslintrc.json
deleted file mode 100644
index d3e61a2ea857..000000000000
--- a/packages/twenty-emails/.eslintrc.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "extends": ["../../.eslintrc.js"],
-  "ignorePatterns": ["!**/*"],
-  "overrides": [
-    {
-      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.ts", "*.tsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.js", "*.jsx"],
-      "rules": {}
-    }
-  ]
-}
diff --git a/packages/twenty-emails/package.json b/packages/twenty-emails/package.json
index aa30fc9f24e0..2638997514f3 100644
--- a/packages/twenty-emails/package.json
+++ b/packages/twenty-emails/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twenty-emails",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "",
   "author": "",
   "private": true,
@@ -8,7 +8,7 @@
   "main": "./dist/index.js",
   "scripts": {
     "nx": "NX_DEFAULT_PROJECT=twenty-emails node ../../node_modules/nx/bin/nx.js",
-    "build": "vite build",
+    "build": "npx vite build",
     "lint": "eslint"
   },
   "exports": {
@@ -17,13 +17,6 @@
       "require": "./dist/index.js"
     }
   },
-  "devDependencies": {
-    "@nx/vite": "17.2.8",
-    "@vitejs/plugin-react-swc": "^3.5.0",
-    "vite": "^5.0.0",
-    "vite-plugin-dts": "~2.3.0",
-    "vite-tsconfig-paths": "^4.2.1"
-  },
   "engines": {
     "node": "^18.17.1",
     "npm": "please-use-yarn",
diff --git a/packages/twenty-emails/vite.config.ts b/packages/twenty-emails/vite.config.ts
index abcbeeeee8e2..4aedc623fb6b 100644
--- a/packages/twenty-emails/vite.config.ts
+++ b/packages/twenty-emails/vite.config.ts
@@ -13,8 +13,7 @@ export default defineConfig({
     tsconfigPaths(),
     dts({
       entryRoot: 'src',
-      tsConfigFilePath: path.join(__dirname, 'tsconfig.lib.json'),
-      skipDiagnostics: true,
+      tsconfigPath: path.join(__dirname, 'tsconfig.lib.json'),
     }),
   ],
 
diff --git a/packages/twenty-front/.env.example b/packages/twenty-front/.env.example
index e39840f2f67c..423b00b0733b 100644
--- a/packages/twenty-front/.env.example
+++ b/packages/twenty-front/.env.example
@@ -2,6 +2,4 @@ REACT_APP_SERVER_BASE_URL=http://localhost:3000
 GENERATE_SOURCEMAP=false
 
 # ———————— Optional ————————
-# REACT_APP_SERVER_AUTH_URL=http://localhost:3000/auth
-# REACT_APP_SERVER_FILES_URL=http://localhost:3000/files
 # CHROMATIC_PROJECT_TOKEN=
diff --git a/packages/twenty-front/.eslintrc-ci.cjs b/packages/twenty-front/.eslintrc-ci.cjs
index 9b36dd30a212..a0b8a80632e8 100644
--- a/packages/twenty-front/.eslintrc-ci.cjs
+++ b/packages/twenty-front/.eslintrc-ci.cjs
@@ -3,17 +3,4 @@ module.exports = {
   rules: {
     'no-console': 'error',
   },
-  overrides: [
-    {
-      files: [
-        '.storybook/**/*',
-        '**/*.stories.tsx',
-        '**/*.test.ts',
-        '**/*.test.tsx',
-      ],
-      rules: {
-        'no-console': 'off',
-      },
-    },
-  ],
 };
diff --git a/packages/twenty-front/.eslintrc.cjs b/packages/twenty-front/.eslintrc.cjs
index 68b808b3cdc4..b6e293abcb8b 100644
--- a/packages/twenty-front/.eslintrc.cjs
+++ b/packages/twenty-front/.eslintrc.cjs
@@ -1,15 +1,5 @@
-// eslint-disable-next-line
-const path = require('path');
-
 module.exports = {
-  extends: [
-    'plugin:@nx/react',
-    'plugin:react/recommended',
-    'plugin:react-hooks/recommended',
-    'plugin:storybook/recommended',
-    '../../.eslintrc.js',
-  ],
-  plugins: ['react-hooks', 'react-refresh'],
+  extends: ['../../.eslintrc.cjs', '../../.eslintrc.react.cjs'],
   ignorePatterns: [
     '!**/*',
     'node_modules',
@@ -22,76 +12,15 @@ module.exports = {
     '**/*config.js',
     'codegen*',
     'tsup.ui.index.tsx',
+    '__mocks__',
   ],
-  rules: {
-    'no-restricted-imports': [
-      'error',
-      {
-        patterns: [
-          {
-            group: ['@tabler/icons-react'],
-            message: 'Icon imports are only allowed for `@/ui/display/icon`',
-          },
-          {
-            group: ['react-hotkeys-web-hook'],
-            importNames: ['useHotkeys'],
-            message: 'Please use the custom wrapper: `useScopedHotkeys`',
-          },
-        ],
-      },
-    ],
-
-    '@nx/workspace-effect-components': 'error',
-    '@nx/workspace-no-hardcoded-colors': 'error',
-    '@nx/workspace-matching-state-variable': 'error',
-    '@nx/workspace-sort-css-properties-alphabetically': 'error',
-    '@nx/workspace-styled-components-prefixed-with-styled': 'error',
-    '@nx/workspace-no-state-useref': 'error',
-    '@nx/workspace-component-props-naming': 'error',
-
-    'react/no-unescaped-entities': 'off',
-    'react/prop-types': 'off',
-    'react/jsx-key': 'off',
-    'react/display-name': 'off',
-    'react/jsx-uses-react': 'off',
-    'react/react-in-jsx-scope': 'off',
-    'react/jsx-no-useless-fragment': 'off',
-    'react/jsx-props-no-spreading': [
-      'error',
-      {
-        explicitSpread: 'ignore',
-      },
-    ],
-
-    'react-hooks/exhaustive-deps': [
-      'warn',
-      {
-        additionalHooks: 'useRecoilCallback',
-      },
-    ],
-  },
   overrides: [
     {
-      files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
+      files: ['*.ts', '*.tsx'],
       parserOptions: {
-        project: ['packages/twenty-front/tsconfig.*?.json'],
+        project: ['packages/twenty-front/tsconfig.{json,*.json}'],
       },
       rules: {},
     },
-    {
-      files: ['.storybook/main.@(js|cjs|mjs|ts)'],
-      rules: {
-        'storybook/no-uninstalled-addons': [
-          'error',
-          { packageJsonLocation: path.resolve('../../package.json') },
-        ],
-      },
-    },
-    {
-      files: ['.storybook/**/*', '**/*.stories.tsx', '**/*.test.@(ts|tsx)'],
-      rules: {
-        'no-console': 'off',
-      },
-    },
   ],
 };
diff --git a/packages/twenty-front/.gitignore b/packages/twenty-front/.gitignore
index fad3dacbdcf6..a9e8e5b674c2 100644
--- a/packages/twenty-front/.gitignore
+++ b/packages/twenty-front/.gitignore
@@ -40,4 +40,5 @@ dist-ssr
 *.sln
 *.sw?
 
-.vite/
\ No newline at end of file
+.vite/
+.nyc_output/
\ No newline at end of file
diff --git a/packages/twenty-front/.storybook/main.ts b/packages/twenty-front/.storybook/main.ts
index 82a6b77d62b3..e3a39f5fce00 100644
--- a/packages/twenty-front/.storybook/main.ts
+++ b/packages/twenty-front/.storybook/main.ts
@@ -33,7 +33,7 @@ const config: StorybookConfig = {
     '@storybook/addon-onboarding',
     '@storybook/addon-interactions',
     '@storybook/addon-coverage',
-    '@storybook/addon-themes',
+    'storybook-dark-mode',
     'storybook-addon-cookie',
     'storybook-addon-pseudo-states',
   ],
diff --git a/packages/twenty-front/.storybook/manager-head.html b/packages/twenty-front/.storybook/manager-head.html
new file mode 100644
index 000000000000..0be4849fca4e
--- /dev/null
+++ b/packages/twenty-front/.storybook/manager-head.html
@@ -0,0 +1,5 @@
+<style>
+    [data-is-storybook="true"] {
+        background-color: transparent!important;
+    }
+</style>
\ No newline at end of file
diff --git a/packages/twenty-front/.storybook/preview.ts b/packages/twenty-front/.storybook/preview.ts
deleted file mode 100644
index 90f711161820..000000000000
--- a/packages/twenty-front/.storybook/preview.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { ThemeProvider } from '@emotion/react';
-import { withThemeFromJSXProvider } from '@storybook/addon-themes';
-import { Preview, ReactRenderer } from '@storybook/react';
-import { initialize, mswDecorator } from 'msw-storybook-addon';
-
-import { THEME_DARK } from '@/ui/theme/constants/ThemeDark';
-import { THEME_LIGHT } from '@/ui/theme/constants/ThemeLight';
-
-import { RootDecorator } from '../src/testing/decorators/RootDecorator';
-import { mockedUserJWT } from '../src/testing/mock-data/jwt';
-
-import 'react-loading-skeleton/dist/skeleton.css';
-
-initialize({
-  onUnhandledRequest: async (request: Request) => {
-    const fileExtensionsToIgnore =
-      /\.(ts|tsx|js|jsx|svg|css|png)(\?v=[a-zA-Z0-9]+)?/;
-
-    if (fileExtensionsToIgnore.test(request.url)) {
-      return;
-    }
-
-    const requestBody = await request.json();
-    console.warn(`Unhandled ${request.method} request to ${request.url} 
-      with payload ${JSON.stringify(requestBody)}\n
-      This request should be mocked with MSW`);
-  },
-});
-
-const preview: Preview = {
-  decorators: [
-    withThemeFromJSXProvider<ReactRenderer>({
-      themes: {
-        light: THEME_LIGHT,
-        dark: THEME_DARK,
-      },
-      defaultTheme: 'light',
-      Provider: ThemeProvider,
-    }),
-    RootDecorator,
-    mswDecorator,
-  ],
-  parameters: {
-    actions: { argTypesRegex: '^on[A-Z].*' },
-    controls: {
-      matchers: {
-        color: /(background|color)$/i,
-        date: /Date$/,
-      },
-    },
-    options: {
-      storySort: {
-        order: ['UI', 'Modules', 'Pages'],
-      },
-    },
-    cookie: {
-      tokenPair: `{%22accessToken%22:{%22token%22:%22${mockedUserJWT}%22%2C%22expiresAt%22:%222023-07-18T15:06:40.704Z%22%2C%22__typename%22:%22AuthToken%22}%2C%22refreshToken%22:{%22token%22:%22${mockedUserJWT}%22%2C%22expiresAt%22:%222023-10-15T15:06:41.558Z%22%2C%22__typename%22:%22AuthToken%22}%2C%22__typename%22:%22AuthTokenPair%22}`,
-    },
-  },
-};
-
-export default preview;
diff --git a/packages/twenty-front/.storybook/preview.tsx b/packages/twenty-front/.storybook/preview.tsx
new file mode 100644
index 000000000000..86745cdf78ae
--- /dev/null
+++ b/packages/twenty-front/.storybook/preview.tsx
@@ -0,0 +1,65 @@
+import { ThemeProvider } from '@emotion/react';
+import { Preview } from '@storybook/react';
+import { initialize, mswDecorator } from 'msw-storybook-addon';
+import { useDarkMode } from 'storybook-dark-mode';
+
+import { THEME_DARK } from '@/ui/theme/constants/ThemeDark';
+import { THEME_LIGHT } from '@/ui/theme/constants/ThemeLight';
+
+import { RootDecorator } from '../src/testing/decorators/RootDecorator';
+import { mockedUserJWT } from '../src/testing/mock-data/jwt';
+
+import 'react-loading-skeleton/dist/skeleton.css';
+
+initialize({
+  onUnhandledRequest: async (request: Request) => {
+    const fileExtensionsToIgnore =
+      /\.(ts|tsx|js|jsx|svg|css|png)(\?v=[a-zA-Z0-9]+)?/;
+
+    if (fileExtensionsToIgnore.test(request.url)) {
+      return;
+    }
+
+    const requestBody = await request.json();
+    // eslint-disable-next-line no-console
+    console.warn(`Unhandled ${request.method} request to ${request.url} 
+      with payload ${JSON.stringify(requestBody)}\n
+      This request should be mocked with MSW`);
+  },
+});
+
+const preview: Preview = {
+  decorators: [
+    (Story) => {
+      const mode = useDarkMode() ? 'Dark' : 'Light';
+
+      const theme = mode === 'Dark' ? THEME_DARK : THEME_LIGHT;
+      return (
+        <ThemeProvider theme={theme}>
+          <Story />
+        </ThemeProvider>
+      );
+    },
+    RootDecorator,
+    mswDecorator,
+  ],
+  parameters: {
+    actions: { argTypesRegex: '^on[A-Z].*' },
+    controls: {
+      matchers: {
+        color: /(background|color)$/i,
+        date: /Date$/,
+      },
+    },
+    options: {
+      storySort: {
+        order: ['UI', 'Modules', 'Pages'],
+      },
+    },
+    cookie: {
+      tokenPair: `{%22accessToken%22:{%22token%22:%22${mockedUserJWT}%22%2C%22expiresAt%22:%222023-07-18T15:06:40.704Z%22%2C%22__typename%22:%22AuthToken%22}%2C%22refreshToken%22:{%22token%22:%22${mockedUserJWT}%22%2C%22expiresAt%22:%222023-10-15T15:06:41.558Z%22%2C%22__typename%22:%22AuthToken%22}%2C%22__typename%22:%22AuthTokenPair%22}`,
+    },
+  },
+};
+
+export default preview;
diff --git a/packages/twenty-front/__mocks__/styleMock.js b/packages/twenty-front/__mocks__/styleMock.js
new file mode 100644
index 000000000000..602eb23ee2eb
--- /dev/null
+++ b/packages/twenty-front/__mocks__/styleMock.js
@@ -0,0 +1 @@
+export default 'test-file-stub';
diff --git a/packages/twenty-front/codegen-metadata.cjs b/packages/twenty-front/codegen-metadata.cjs
index d62ae6a4dfc7..2d4e3fa895cf 100644
--- a/packages/twenty-front/codegen-metadata.cjs
+++ b/packages/twenty-front/codegen-metadata.cjs
@@ -1,13 +1,18 @@
 module.exports = {
-  schema: process.env.REACT_APP_SERVER_BASE_URL + "/metadata",
-  documents: ['./src/modules/object-metadata/graphql/*.ts', './src/modules/object-record/graphql/*.tsx', './src/modules/metadata/graphql/*.ts'],
+  schema: process.env.REACT_APP_SERVER_BASE_URL + '/metadata',
+  documents: [
+    './src/modules/databases/graphql/**/*.ts',
+    './src/modules/object-metadata/graphql/*.ts',
+    './src/modules/object-record/graphql/*.tsx',
+    './src/modules/metadata/graphql/*.ts',
+  ],
   overwrite: true,
   generates: {
     './src/generated-metadata/': {
       preset: 'client',
       presetConfig: {
-        fragmentMasking: false
-      }
+        fragmentMasking: false,
+      },
     },
   },
 };
diff --git a/packages/twenty-front/codegen.cjs b/packages/twenty-front/codegen.cjs
index eeb1da9af2f5..461f7366cb99 100644
--- a/packages/twenty-front/codegen.cjs
+++ b/packages/twenty-front/codegen.cjs
@@ -1,13 +1,14 @@
 module.exports = {
   schema: process.env.REACT_APP_SERVER_BASE_URL + '/graphql',
   documents: [
+    '!./src/modules/databases/**',
     '!./src/modules/object-metadata/**',
     '!./src/modules/object-record/**',
     './src/modules/**/*.tsx',
     './src/modules/**/*.ts',
     '!./src/**/*.test.tsx',
     '!./src/**/__mocks__/*.ts',
-    '!./src/modules/users/graphql/queries/getCurrentUserAndViews.ts'
+    '!./src/modules/users/graphql/queries/getCurrentUserAndViews.ts',
   ],
   overwrite: true,
   generates: {
diff --git a/packages/twenty-front/jest.config.ts b/packages/twenty-front/jest.config.ts
index 70b145e3d91a..24279df51051 100644
--- a/packages/twenty-front/jest.config.ts
+++ b/packages/twenty-front/jest.config.ts
@@ -1,25 +1,38 @@
-export default {
-  setupFilesAfterEnv: ['./src/setupTests.ts'],
+/* eslint-disable @nx/enforce-module-boundaries,import/no-relative-packages */
+import { JestConfigWithTsJest, pathsToModuleNameMapper } from 'ts-jest';
+
+import { compilerOptions as twentyUiCompilerOptions } from '../twenty-ui/tsconfig.json';
+
+import { compilerOptions } from './tsconfig.json';
+
+const jestConfig: JestConfigWithTsJest = {
+  // to enable logs, comment out the following line
+  silent: true,
+  displayName: 'twenty-front',
+  preset: '../../jest.preset.js',
+  setupFilesAfterEnv: ['./setupTests.ts'],
   testEnvironment: 'jsdom',
+  transformIgnorePatterns: ['../../node_modules/'],
   transform: {
     '^.+\\.(ts|js|tsx|jsx)$': '@swc/jest',
   },
   moduleNameMapper: {
-    '~/(.+)': '<rootDir>/src/$1',
-    '@/(.+)': '<rootDir>/src/modules/$1',
-    '@testing/(.+)': '<rootDir>/src/testing/$1',
+    ...pathsToModuleNameMapper(compilerOptions.paths),
+    // Include internal library aliases, so there is no need to build the library before tests.
+    ...pathsToModuleNameMapper(twentyUiCompilerOptions.paths),
     '\\.(jpg|jpeg|png|gif|webp|svg|svg\\?react)$':
       '<rootDir>/__mocks__/imageMock.js',
+    '\\.css$': '<rootDir>/__mocks__/styleMock.js',
   },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   extensionsToTreatAsEsm: ['.ts', '.tsx'],
   coverageThreshold: {
     global: {
-      statements: 70,
-      lines: 70,
-      functions: 60,
+      statements: 65,
+      lines: 65,
+      functions: 55,
     },
   },
-  collectCoverage: true,
   collectCoverageFrom: ['<rootDir>/src/**/*.ts'],
   coveragePathIgnorePatterns: [
     'states/.+State.ts$',
@@ -38,5 +51,7 @@ export default {
     '__stories__/*',
     'display/icon/index.ts',
   ],
-  // coverageDirectory: '<rootDir>/coverage/',
+  coverageDirectory: './coverage',
 };
+
+export default jestConfig;
diff --git a/packages/twenty-front/nyc.config.cjs b/packages/twenty-front/nyc.config.cjs
index bf92d9cde36d..5afd740ac9bf 100644
--- a/packages/twenty-front/nyc.config.cjs
+++ b/packages/twenty-front/nyc.config.cjs
@@ -6,16 +6,16 @@ const globalCoverage = {
 };
 
 const modulesCoverage = {
-  statements: 75,
-  lines: 75,
-  functions: 70,
+  statements: 70,
+  lines: 70,
+  functions: 65,
   include: ['src/modules/**/*'],
   exclude: ['src/**/*.ts'],
 };
 
 const pagesCoverage = {
-  statements: 60,
-  lines: 60,
+  statements: 55,
+  lines: 55,
   functions: 45,
   exclude: ['src/generated/**/*', 'src/modules/**/*', 'src/**/*.ts'],
 };
diff --git a/packages/twenty-front/package.json b/packages/twenty-front/package.json
index 99a403fcaca5..cede2c86b3b5 100644
--- a/packages/twenty-front/package.json
+++ b/packages/twenty-front/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twenty-front",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -18,7 +18,7 @@
     "fmt:fix": "prettier --cache --write \"src/**/*.ts\" \"src/**/*.tsx\"",
     "fmt": "prettier --check \"src/**/*.ts\" \"src/**/*.tsx\"",
     "test": "jest",
-    "test-watch": "jest --coverage=false --watch",
+    "test-watch": "jest --watch",
     "tsup": "tsup",
     "coverage": "jest --coverage",
     "storybook:modules:dev": "STORYBOOK_SCOPE=modules yarn storybook:dev",
diff --git a/packages/twenty-front/public/images/integrations/airtable-logo.png b/packages/twenty-front/public/images/integrations/airtable-logo.png
new file mode 100644
index 000000000000..f63243b3616d
Binary files /dev/null and b/packages/twenty-front/public/images/integrations/airtable-logo.png differ
diff --git a/packages/twenty-front/public/images/integrations/chrome-icon.svg b/packages/twenty-front/public/images/integrations/chrome-icon.svg
new file mode 100644
index 000000000000..4ff6ab6bab67
--- /dev/null
+++ b/packages/twenty-front/public/images/integrations/chrome-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" height="48" width="48"><defs><linearGradient id="a" x1="3.2173" y1="15" x2="44.7812" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d93025"/><stop offset="1" stop-color="#ea4335"/></linearGradient><linearGradient id="b" x1="20.7219" y1="47.6791" x2="41.5039" y2="11.6837" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fcc934"/><stop offset="1" stop-color="#fbbc04"/></linearGradient><linearGradient id="c" x1="26.5981" y1="46.5015" x2="5.8161" y2="10.506" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1e8e3e"/><stop offset="1" stop-color="#34a853"/></linearGradient></defs><circle cx="24" cy="23.9947" r="12" style="fill:#fff"/><path d="M3.2154,36A24,24,0,1,0,12,3.2154,24,24,0,0,0,3.2154,36ZM34.3923,18A12,12,0,1,1,18,13.6077,12,12,0,0,1,34.3923,18Z" style="fill:none"/><path d="M24,12H44.7812a23.9939,23.9939,0,0,0-41.5639.0029L13.6079,30l.0093-.0024A11.9852,11.9852,0,0,1,24,12Z" style="fill:url(#a)"/><circle cx="24" cy="24" r="9.5" style="fill:#1a73e8"/><path d="M34.3913,30.0029,24.0007,48A23.994,23.994,0,0,0,44.78,12.0031H23.9989l-.0025.0093A11.985,11.985,0,0,1,34.3913,30.0029Z" style="fill:url(#b)"/><path d="M13.6086,30.0031,3.218,12.006A23.994,23.994,0,0,0,24.0025,48L34.3931,30.0029l-.0067-.0068a11.9852,11.9852,0,0,1-20.7778.007Z" style="fill:url(#c)"/></svg>
\ No newline at end of file
diff --git a/packages/twenty-front/public/images/integrations/link-apps.svg b/packages/twenty-front/public/images/integrations/link-apps.svg
new file mode 100644
index 000000000000..556edacf2d5f
--- /dev/null
+++ b/packages/twenty-front/public/images/integrations/link-apps.svg
@@ -0,0 +1,19 @@
+<svg width="50" height="18" viewBox="0 0 50 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M49 8.5H1" stroke="black" stroke-width="1.32597" stroke-linecap="round" stroke-dasharray="3.54 3.54"/>
+<g filter="url(#filter0_d_22_627)">
+<circle cx="25" cy="8.5" r="8" fill="white"/>
+<circle cx="25" cy="8.5" r="7.65217" stroke="black" stroke-width="0.695651"/>
+</g>
+<path d="M23.0341 6.5689C24.1158 5.50666 25.8637 5.50154 26.9524 6.55182L26.2358 7.25372C26.1158 7.37156 26.0811 7.54746 26.1454 7.70116C26.2098 7.85486 26.3628 7.95391 26.5315 7.95391H28.6098H28.7576C28.9889 7.95391 29.175 7.77118 29.175 7.54405V5.35809C29.175 5.19243 29.0741 5.04215 28.9176 4.97896C28.7611 4.91577 28.5819 4.94993 28.4619 5.06776L27.7385 5.7782C26.215 4.30097 23.7611 4.30609 22.2463 5.79528C21.8219 6.21198 21.5158 6.70211 21.328 7.2264C21.2254 7.5116 21.3785 7.82241 21.6671 7.92317C21.9558 8.02393 22.2741 7.87365 22.3767 7.59016C22.5106 7.21786 22.728 6.86776 23.0341 6.5689ZM20.8271 9.45676V9.58655V9.59851V11.6427C20.8271 11.8084 20.928 11.9587 21.0845 12.0218C21.2411 12.085 21.4202 12.0509 21.5402 11.933L22.2637 11.2226C23.7871 12.6998 26.2411 12.6947 27.7558 11.2055C28.1802 10.7888 28.488 10.2987 28.6758 9.77612C28.7785 9.49092 28.6254 9.1801 28.3367 9.07934C28.048 8.97858 27.7298 9.12887 27.6271 9.41236C27.4932 9.78465 27.2758 10.1348 26.9698 10.4336C25.888 11.4959 24.1402 11.501 23.0515 10.4507L23.7663 9.74708C23.8863 9.62925 23.9211 9.45335 23.8567 9.29964C23.7924 9.14594 23.6393 9.04689 23.4706 9.04689H21.3906H21.3785H21.2445C21.0132 9.04689 20.8271 9.22963 20.8271 9.45676Z" fill="black"/>
+<defs>
+<filter id="filter0_d_22_627" x="16.3043" y="0.5" width="16.6957" height="16.6957" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dx="-0.695651" dy="0.695651"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_22_627"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_22_627" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/packages/twenty-front/public/images/integrations/postgresql-logo.png b/packages/twenty-front/public/images/integrations/postgresql-logo.png
new file mode 100644
index 000000000000..08e86c06b07b
Binary files /dev/null and b/packages/twenty-front/public/images/integrations/postgresql-logo.png differ
diff --git a/packages/twenty-front/public/manifest.json b/packages/twenty-front/public/manifest.json
index 0323bf813878..e78ded684021 100644
--- a/packages/twenty-front/public/manifest.json
+++ b/packages/twenty-front/public/manifest.json
@@ -6,453 +6,453 @@
   "theme_color": "#000000",
   "background_color": "#ffffff",
   "icons": [
-      {
-        "src": "icons/windows11/SmallTile.scale-100.png",
-        "sizes": "71x71"
-      },
-      {
-        "src": "icons/windows11/SmallTile.scale-125.png",
-        "sizes": "89x89"
-      },
-      {
-        "src": "icons/windows11/SmallTile.scale-150.png",
-        "sizes": "107x107"
-      },
-      {
-        "src": "icons/windows11/SmallTile.scale-200.png",
-        "sizes": "142x142"
-      },
-      {
-        "src": "icons/windows11/SmallTile.scale-400.png",
-        "sizes": "284x284"
-      },
-      {
-        "src": "icons/windows11/Square150x150Logo.scale-100.png",
-        "sizes": "150x150"
-      },
-      {
-        "src": "icons/windows11/Square150x150Logo.scale-125.png",
-        "sizes": "188x188"
-      },
-      {
-        "src": "icons/windows11/Square150x150Logo.scale-150.png",
-        "sizes": "225x225"
-      },
-      {
-        "src": "icons/windows11/Square150x150Logo.scale-200.png",
-        "sizes": "300x300"
-      },
-      {
-        "src": "icons/windows11/Square150x150Logo.scale-400.png",
-        "sizes": "600x600"
-      },
-      {
-        "src": "icons/windows11/Wide310x150Logo.scale-100.png",
-        "sizes": "310x150"
-      },
-      {
-        "src": "icons/windows11/Wide310x150Logo.scale-125.png",
-        "sizes": "388x188"
-      },
-      {
-        "src": "icons/windows11/Wide310x150Logo.scale-150.png",
-        "sizes": "465x225"
-      },
-      {
-        "src": "icons/windows11/Wide310x150Logo.scale-200.png",
-        "sizes": "620x300"
-      },
-      {
-        "src": "icons/windows11/Wide310x150Logo.scale-400.png",
-        "sizes": "1240x600"
-      },
-      {
-        "src": "icons/windows11/LargeTile.scale-100.png",
-        "sizes": "310x310"
-      },
-      {
-        "src": "icons/windows11/LargeTile.scale-125.png",
-        "sizes": "388x388"
-      },
-      {
-        "src": "icons/windows11/LargeTile.scale-150.png",
-        "sizes": "465x465"
-      },
-      {
-        "src": "icons/windows11/LargeTile.scale-200.png",
-        "sizes": "620x620"
-      },
-      {
-        "src": "icons/windows11/LargeTile.scale-400.png",
-        "sizes": "1240x1240"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.scale-100.png",
-        "sizes": "44x44"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.scale-125.png",
-        "sizes": "55x55"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.scale-150.png",
-        "sizes": "66x66"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.scale-200.png",
-        "sizes": "88x88"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.scale-400.png",
-        "sizes": "176x176"
-      },
-      {
-        "src": "icons/windows11/StoreLogo.scale-100.png",
-        "sizes": "50x50"
-      },
-      {
-        "src": "icons/windows11/StoreLogo.scale-125.png",
-        "sizes": "63x63"
-      },
-      {
-        "src": "icons/windows11/StoreLogo.scale-150.png",
-        "sizes": "75x75"
-      },
-      {
-        "src": "icons/windows11/StoreLogo.scale-200.png",
-        "sizes": "100x100"
-      },
-      {
-        "src": "icons/windows11/StoreLogo.scale-400.png",
-        "sizes": "200x200"
-      },
-      {
-        "src": "icons/windows11/SplashScreen.scale-100.png",
-        "sizes": "620x300"
-      },
-      {
-        "src": "icons/windows11/SplashScreen.scale-125.png",
-        "sizes": "775x375"
-      },
-      {
-        "src": "icons/windows11/SplashScreen.scale-150.png",
-        "sizes": "930x450"
-      },
-      {
-        "src": "icons/windows11/SplashScreen.scale-200.png",
-        "sizes": "1240x600"
-      },
-      {
-        "src": "icons/windows11/SplashScreen.scale-400.png",
-        "sizes": "2480x1200"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.targetsize-16.png",
-        "sizes": "16x16"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.targetsize-20.png",
-        "sizes": "20x20"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.targetsize-24.png",
-        "sizes": "24x24"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.targetsize-30.png",
-        "sizes": "30x30"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.targetsize-32.png",
-        "sizes": "32x32"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.targetsize-36.png",
-        "sizes": "36x36"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.targetsize-40.png",
-        "sizes": "40x40"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.targetsize-44.png",
-        "sizes": "44x44"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.targetsize-48.png",
-        "sizes": "48x48"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.targetsize-60.png",
-        "sizes": "60x60"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.targetsize-64.png",
-        "sizes": "64x64"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.targetsize-72.png",
-        "sizes": "72x72"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.targetsize-80.png",
-        "sizes": "80x80"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.targetsize-96.png",
-        "sizes": "96x96"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.targetsize-256.png",
-        "sizes": "256x256"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-16.png",
-        "sizes": "16x16"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-20.png",
-        "sizes": "20x20"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-24.png",
-        "sizes": "24x24"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-30.png",
-        "sizes": "30x30"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-32.png",
-        "sizes": "32x32"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-36.png",
-        "sizes": "36x36"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-40.png",
-        "sizes": "40x40"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-44.png",
-        "sizes": "44x44"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-48.png",
-        "sizes": "48x48"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-60.png",
-        "sizes": "60x60"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-64.png",
-        "sizes": "64x64"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-72.png",
-        "sizes": "72x72"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-80.png",
-        "sizes": "80x80"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-96.png",
-        "sizes": "96x96"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-256.png",
-        "sizes": "256x256"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-16.png",
-        "sizes": "16x16"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-20.png",
-        "sizes": "20x20"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-24.png",
-        "sizes": "24x24"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-30.png",
-        "sizes": "30x30"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-32.png",
-        "sizes": "32x32"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-36.png",
-        "sizes": "36x36"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-40.png",
-        "sizes": "40x40"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-44.png",
-        "sizes": "44x44"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-48.png",
-        "sizes": "48x48"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-60.png",
-        "sizes": "60x60"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-64.png",
-        "sizes": "64x64"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-72.png",
-        "sizes": "72x72"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-80.png",
-        "sizes": "80x80"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-96.png",
-        "sizes": "96x96"
-      },
-      {
-        "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-256.png",
-        "sizes": "256x256"
-      },
-      {
-        "src": "icons/android/android-launchericon-512-512.png",
-        "sizes": "512x512"
-      },
-      {
-        "src": "icons/android/android-launchericon-192-192.png",
-        "sizes": "192x192"
-      },
-      {
-        "src": "icons/android/android-launchericon-144-144.png",
-        "sizes": "144x144"
-      },
-      {
-        "src": "icons/android/android-launchericon-96-96.png",
-        "sizes": "96x96"
-      },
-      {
-        "src": "icons/android/android-launchericon-72-72.png",
-        "sizes": "72x72"
-      },
-      {
-        "src": "icons/android/android-launchericon-48-48.png",
-        "sizes": "48x48"
-      },
-      {
-        "src": "icons/ios/16.png",
-        "sizes": "16x16"
-      },
-      {
-        "src": "icons/ios/20.png",
-        "sizes": "20x20"
-      },
-      {
-        "src": "icons/ios/29.png",
-        "sizes": "29x29"
-      },
-      {
-        "src": "icons/ios/32.png",
-        "sizes": "32x32"
-      },
-      {
-        "src": "icons/ios/40.png",
-        "sizes": "40x40"
-      },
-      {
-        "src": "icons/ios/50.png",
-        "sizes": "50x50"
-      },
-      {
-        "src": "icons/ios/57.png",
-        "sizes": "57x57"
-      },
-      {
-        "src": "icons/ios/58.png",
-        "sizes": "58x58"
-      },
-      {
-        "src": "icons/ios/60.png",
-        "sizes": "60x60"
-      },
-      {
-        "src": "icons/ios/64.png",
-        "sizes": "64x64"
-      },
-      {
-        "src": "icons/ios/72.png",
-        "sizes": "72x72"
-      },
-      {
-        "src": "icons/ios/76.png",
-        "sizes": "76x76"
-      },
-      {
-        "src": "icons/ios/80.png",
-        "sizes": "80x80"
-      },
-      {
-        "src": "icons/ios/87.png",
-        "sizes": "87x87"
-      },
-      {
-        "src": "icons/ios/100.png",
-        "sizes": "100x100"
-      },
-      {
-        "src": "icons/ios/114.png",
-        "sizes": "114x114"
-      },
-      {
-        "src": "icons/ios/120.png",
-        "sizes": "120x120"
-      },
-      {
-        "src": "icons/ios/128.png",
-        "sizes": "128x128"
-      },
-      {
-        "src": "icons/ios/144.png",
-        "sizes": "144x144"
-      },
-      {
-        "src": "icons/ios/152.png",
-        "sizes": "152x152"
-      },
-      {
-        "src": "icons/ios/167.png",
-        "sizes": "167x167"
-      },
-      {
-        "src": "icons/ios/180.png",
-        "sizes": "180x180"
-      },
-      {
-        "src": "icons/ios/192.png",
-        "sizes": "192x192"
-      },
-      {
-        "src": "icons/ios/256.png",
-        "sizes": "256x256"
-      },
-      {
-        "src": "icons/ios/512.png",
-        "sizes": "512x512"
-      },
-      {
-        "src": "icons/ios/1024.png",
-        "sizes": "1024x1024"
-      }
+    {
+      "src": "icons/windows11/SmallTile.scale-100.png",
+      "sizes": "71x71"
+    },
+    {
+      "src": "icons/windows11/SmallTile.scale-125.png",
+      "sizes": "89x89"
+    },
+    {
+      "src": "icons/windows11/SmallTile.scale-150.png",
+      "sizes": "107x107"
+    },
+    {
+      "src": "icons/windows11/SmallTile.scale-200.png",
+      "sizes": "142x142"
+    },
+    {
+      "src": "icons/windows11/SmallTile.scale-400.png",
+      "sizes": "284x284"
+    },
+    {
+      "src": "icons/windows11/Square150x150Logo.scale-100.png",
+      "sizes": "150x150"
+    },
+    {
+      "src": "icons/windows11/Square150x150Logo.scale-125.png",
+      "sizes": "188x188"
+    },
+    {
+      "src": "icons/windows11/Square150x150Logo.scale-150.png",
+      "sizes": "225x225"
+    },
+    {
+      "src": "icons/windows11/Square150x150Logo.scale-200.png",
+      "sizes": "300x300"
+    },
+    {
+      "src": "icons/windows11/Square150x150Logo.scale-400.png",
+      "sizes": "600x600"
+    },
+    {
+      "src": "icons/windows11/Wide310x150Logo.scale-100.png",
+      "sizes": "310x150"
+    },
+    {
+      "src": "icons/windows11/Wide310x150Logo.scale-125.png",
+      "sizes": "388x188"
+    },
+    {
+      "src": "icons/windows11/Wide310x150Logo.scale-150.png",
+      "sizes": "465x225"
+    },
+    {
+      "src": "icons/windows11/Wide310x150Logo.scale-200.png",
+      "sizes": "620x300"
+    },
+    {
+      "src": "icons/windows11/Wide310x150Logo.scale-400.png",
+      "sizes": "1240x600"
+    },
+    {
+      "src": "icons/windows11/LargeTile.scale-100.png",
+      "sizes": "310x310"
+    },
+    {
+      "src": "icons/windows11/LargeTile.scale-125.png",
+      "sizes": "388x388"
+    },
+    {
+      "src": "icons/windows11/LargeTile.scale-150.png",
+      "sizes": "465x465"
+    },
+    {
+      "src": "icons/windows11/LargeTile.scale-200.png",
+      "sizes": "620x620"
+    },
+    {
+      "src": "icons/windows11/LargeTile.scale-400.png",
+      "sizes": "1240x1240"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.scale-100.png",
+      "sizes": "44x44"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.scale-125.png",
+      "sizes": "55x55"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.scale-150.png",
+      "sizes": "66x66"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.scale-200.png",
+      "sizes": "88x88"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.scale-400.png",
+      "sizes": "176x176"
+    },
+    {
+      "src": "icons/windows11/StoreLogo.scale-100.png",
+      "sizes": "50x50"
+    },
+    {
+      "src": "icons/windows11/StoreLogo.scale-125.png",
+      "sizes": "63x63"
+    },
+    {
+      "src": "icons/windows11/StoreLogo.scale-150.png",
+      "sizes": "75x75"
+    },
+    {
+      "src": "icons/windows11/StoreLogo.scale-200.png",
+      "sizes": "100x100"
+    },
+    {
+      "src": "icons/windows11/StoreLogo.scale-400.png",
+      "sizes": "200x200"
+    },
+    {
+      "src": "icons/windows11/SplashScreen.scale-100.png",
+      "sizes": "620x300"
+    },
+    {
+      "src": "icons/windows11/SplashScreen.scale-125.png",
+      "sizes": "775x375"
+    },
+    {
+      "src": "icons/windows11/SplashScreen.scale-150.png",
+      "sizes": "930x450"
+    },
+    {
+      "src": "icons/windows11/SplashScreen.scale-200.png",
+      "sizes": "1240x600"
+    },
+    {
+      "src": "icons/windows11/SplashScreen.scale-400.png",
+      "sizes": "2480x1200"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.targetsize-16.png",
+      "sizes": "16x16"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.targetsize-20.png",
+      "sizes": "20x20"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.targetsize-24.png",
+      "sizes": "24x24"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.targetsize-30.png",
+      "sizes": "30x30"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.targetsize-32.png",
+      "sizes": "32x32"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.targetsize-36.png",
+      "sizes": "36x36"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.targetsize-40.png",
+      "sizes": "40x40"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.targetsize-44.png",
+      "sizes": "44x44"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.targetsize-48.png",
+      "sizes": "48x48"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.targetsize-60.png",
+      "sizes": "60x60"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.targetsize-64.png",
+      "sizes": "64x64"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.targetsize-72.png",
+      "sizes": "72x72"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.targetsize-80.png",
+      "sizes": "80x80"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.targetsize-96.png",
+      "sizes": "96x96"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.targetsize-256.png",
+      "sizes": "256x256"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-16.png",
+      "sizes": "16x16"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-20.png",
+      "sizes": "20x20"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-24.png",
+      "sizes": "24x24"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-30.png",
+      "sizes": "30x30"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-32.png",
+      "sizes": "32x32"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-36.png",
+      "sizes": "36x36"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-40.png",
+      "sizes": "40x40"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-44.png",
+      "sizes": "44x44"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-48.png",
+      "sizes": "48x48"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-60.png",
+      "sizes": "60x60"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-64.png",
+      "sizes": "64x64"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-72.png",
+      "sizes": "72x72"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-80.png",
+      "sizes": "80x80"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-96.png",
+      "sizes": "96x96"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-unplated_targetsize-256.png",
+      "sizes": "256x256"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-16.png",
+      "sizes": "16x16"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-20.png",
+      "sizes": "20x20"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-24.png",
+      "sizes": "24x24"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-30.png",
+      "sizes": "30x30"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-32.png",
+      "sizes": "32x32"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-36.png",
+      "sizes": "36x36"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-40.png",
+      "sizes": "40x40"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-44.png",
+      "sizes": "44x44"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-48.png",
+      "sizes": "48x48"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-60.png",
+      "sizes": "60x60"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-64.png",
+      "sizes": "64x64"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-72.png",
+      "sizes": "72x72"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-80.png",
+      "sizes": "80x80"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-96.png",
+      "sizes": "96x96"
+    },
+    {
+      "src": "icons/windows11/Square44x44Logo.altform-lightunplated_targetsize-256.png",
+      "sizes": "256x256"
+    },
+    {
+      "src": "icons/android/android-launchericon-512-512.png",
+      "sizes": "512x512"
+    },
+    {
+      "src": "icons/android/android-launchericon-192-192.png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "icons/android/android-launchericon-144-144.png",
+      "sizes": "144x144"
+    },
+    {
+      "src": "icons/android/android-launchericon-96-96.png",
+      "sizes": "96x96"
+    },
+    {
+      "src": "icons/android/android-launchericon-72-72.png",
+      "sizes": "72x72"
+    },
+    {
+      "src": "icons/android/android-launchericon-48-48.png",
+      "sizes": "48x48"
+    },
+    {
+      "src": "icons/ios/16.png",
+      "sizes": "16x16"
+    },
+    {
+      "src": "icons/ios/20.png",
+      "sizes": "20x20"
+    },
+    {
+      "src": "icons/ios/29.png",
+      "sizes": "29x29"
+    },
+    {
+      "src": "icons/ios/32.png",
+      "sizes": "32x32"
+    },
+    {
+      "src": "icons/ios/40.png",
+      "sizes": "40x40"
+    },
+    {
+      "src": "icons/ios/50.png",
+      "sizes": "50x50"
+    },
+    {
+      "src": "icons/ios/57.png",
+      "sizes": "57x57"
+    },
+    {
+      "src": "icons/ios/58.png",
+      "sizes": "58x58"
+    },
+    {
+      "src": "icons/ios/60.png",
+      "sizes": "60x60"
+    },
+    {
+      "src": "icons/ios/64.png",
+      "sizes": "64x64"
+    },
+    {
+      "src": "icons/ios/72.png",
+      "sizes": "72x72"
+    },
+    {
+      "src": "icons/ios/76.png",
+      "sizes": "76x76"
+    },
+    {
+      "src": "icons/ios/80.png",
+      "sizes": "80x80"
+    },
+    {
+      "src": "icons/ios/87.png",
+      "sizes": "87x87"
+    },
+    {
+      "src": "icons/ios/100.png",
+      "sizes": "100x100"
+    },
+    {
+      "src": "icons/ios/114.png",
+      "sizes": "114x114"
+    },
+    {
+      "src": "icons/ios/120.png",
+      "sizes": "120x120"
+    },
+    {
+      "src": "icons/ios/128.png",
+      "sizes": "128x128"
+    },
+    {
+      "src": "icons/ios/144.png",
+      "sizes": "144x144"
+    },
+    {
+      "src": "icons/ios/152.png",
+      "sizes": "152x152"
+    },
+    {
+      "src": "icons/ios/167.png",
+      "sizes": "167x167"
+    },
+    {
+      "src": "icons/ios/180.png",
+      "sizes": "180x180"
+    },
+    {
+      "src": "icons/ios/192.png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "icons/ios/256.png",
+      "sizes": "256x256"
+    },
+    {
+      "src": "icons/ios/512.png",
+      "sizes": "512x512"
+    },
+    {
+      "src": "icons/ios/1024.png",
+      "sizes": "1024x1024"
+    }
   ]
 }
diff --git a/packages/twenty-front/scripts/inject-runtime-env.sh b/packages/twenty-front/scripts/inject-runtime-env.sh
index d561874a2050..5b09e8b99fb4 100755
--- a/packages/twenty-front/scripts/inject-runtime-env.sh
+++ b/packages/twenty-front/scripts/inject-runtime-env.sh
@@ -9,4 +9,4 @@ rm -rf "./$BASE_FILENAME"
 	echo "window._env_ = {"
 	echo "  REACT_APP_SERVER_BASE_URL: \"$REACT_APP_SERVER_BASE_URL\","
 	echo "}"
-} > "./$BASE_FILENAME"
\ No newline at end of file
+} > "./$BASE_FILENAME"
diff --git a/packages/twenty-front/src/setupTests.ts b/packages/twenty-front/setupTests.ts
similarity index 100%
rename from packages/twenty-front/src/setupTests.ts
rename to packages/twenty-front/setupTests.ts
diff --git a/packages/twenty-front/src/App.tsx b/packages/twenty-front/src/App.tsx
index 91c41aa547a2..8b34bd0ce3db 100644
--- a/packages/twenty-front/src/App.tsx
+++ b/packages/twenty-front/src/App.tsx
@@ -1,23 +1,26 @@
+<<<<import { useRecoilValue } from 'recoil';
+import { VerifyEffect } from '@/auth/components/VerifyEffect';
+import { billingState } from '@/client-config/states/billingState.ts';
 import { Navigate, Route, Routes, useLocation } from 'react-router-dom';
-
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { AppPath } from '@/types/AppPath';
 import { CustomPath } from '@/types/CustomPath';
 import { SettingsPath } from '@/types/SettingsPath';
+import { BlankLayout } from '@/ui/layout/page/BlankLayout';
 import { DefaultLayout } from '@/ui/layout/page/DefaultLayout';
 import { PageTitle } from '@/ui/utilities/page-title/PageTitle';
 import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { CommandMenuEffect } from '~/effect-components/CommandMenuEffect';
 import { GotoHotkeysEffect } from '~/effect-components/GotoHotkeysEffect';
+import Authorize from '~/pages/auth/Authorize';
 import { ChooseYourPlan } from '~/pages/auth/ChooseYourPlan.tsx';
 import { useDefaultHomePagePath } from '~/hooks/useDefaultHomePagePath';
 import { CreateProfile } from '~/pages/auth/CreateProfile';
 import { CreateWorkspace } from '~/pages/auth/CreateWorkspace';
 import { PasswordReset } from '~/pages/auth/PasswordReset';
 import { PaymentSuccess } from '~/pages/auth/PaymentSuccess.tsx';
-import { PlanRequired } from '~/pages/auth/PlanRequired';
 import { SignInUp } from '~/pages/auth/SignInUp';
-import { VerifyEffect } from '~/pages/auth/VerifyEffect';
+import { DefaultHomePage } from '~/pages/DefaultHomePage';
 import { Campaigns } from '~/pages/campaigns/Campaigns';
 import { ImpersonateEffect } from '~/pages/impersonate/ImpersonateEffect';
 import { NotFound } from '~/pages/not-found/NotFound';
@@ -39,11 +42,23 @@ import { SettingsObjects } from '~/pages/settings/data-model/SettingsObjects';
 import { SettingsDevelopersApiKeyDetail } from '~/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail';
 import { SettingsDevelopersApiKeysNew } from '~/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew';
 import { SettingsDevelopers } from '~/pages/settings/developers/SettingsDevelopers';
+import { SettingsDevelopersWebhooksDetail } from '~/pages/settings/developers/webhooks/SettingsDevelopersWebhookDetail';
+import { SettingsDevelopersWebhooksNew } from '~/pages/settings/developers/webhooks/SettingsDevelopersWebhooksNew';
+import { SettingsIntegrationDatabase } from '~/pages/settings/integrations/SettingsIntegrationDatabase';
+import { SettingsIntegrationDatabaseConnection } from '~/pages/settings/integrations/SettingsIntegrationDatabaseConnection';
+import { SettingsIntegrationNewDatabaseConnection } from '~/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection';
+import { SettingsIntegrations } from '~/pages/settings/integrations/SettingsIntegrations';
 import { SettingsAppearance } from '~/pages/settings/SettingsAppearance';
+import { SettingsBilling } from '~/pages/settings/SettingsBilling.tsx';
 import { SettingsProfile } from '~/pages/settings/SettingsProfile';
 import { SettingsWorkspace } from '~/pages/settings/SettingsWorkspace';
 import { SettingsWorkspaceMembers } from '~/pages/settings/SettingsWorkspaceMembers';
 import { Tasks } from '~/pages/tasks/Tasks';
+
+export const App = () => {
+  const billing = useRecoilValue(billingState);
+  const { pathname } = useLocation();
+  const pageTitle = getPageTitleFromPath(pathname);
 import { AudioTemplate } from '~/pages/Templates/AudioTemplate';
 import { DocumentTemplate } from '~/pages/Templates/DocumentTemplate';
 import { ImageTemplate } from '~/pages/Templates/ImageTemplate';
@@ -76,21 +91,15 @@ export const App = () => {
       <PageTitle title={pageTitle} />
       <GotoHotkeysEffect />
       <CommandMenuEffect />
-      <DefaultLayout>
-        <Routes>
+      <Routes>
+        <Route element={<DefaultLayout />}>
           <Route path={AppPath.Verify} element={<VerifyEffect />} />
-          <Route path={AppPath.SignIn} element={<SignInUp />} />
-          <Route path={AppPath.SignUp} element={<SignInUp />} />
+          <Route path={AppPath.SignInUp} element={<SignInUp />} />
           <Route path={AppPath.Invite} element={<SignInUp />} />
           <Route path={AppPath.ResetPassword} element={<PasswordReset />} />
           <Route path={AppPath.CreateWorkspace} element={<CreateWorkspace />} />
           <Route path={AppPath.CreateProfile} element={<CreateProfile />} />
-          <Route
-            path={AppPath.PlanRequired}
-            element={
-              isSelfBillingEnabled ? <ChooseYourPlan /> : <PlanRequired />
-            }
-          />
+          <Route path={AppPath.PlanRequired} element={<ChooseYourPlan />} />
           <Route
             path={AppPath.PlanRequiredSuccess}
             element={<PaymentSuccess />}
@@ -137,6 +146,12 @@ export const App = () => {
                   path={SettingsPath.AccountsEmailsInboxSettings}
                   element={<SettingsAccountsEmailsInboxSettings />}
                 />
+                {billing?.isBillingEnabled && (
+                  <Route
+                    path={SettingsPath.Billing}
+                    element={<SettingsBilling />}
+                  />
+                )}
                 <Route
                   path={SettingsPath.WorkspaceMembersPage}
                   element={<SettingsWorkspaceMembers />}
@@ -180,6 +195,22 @@ export const App = () => {
                     </Routes>
                   }
                 />
+                <Route
+                  path={SettingsPath.Integrations}
+                  element={<SettingsIntegrations />}
+                />
+                <Route
+                  path={SettingsPath.IntegrationDatabase}
+                  element={<SettingsIntegrationDatabase />}
+                />
+                <Route
+                  path={SettingsPath.IntegrationNewDatabaseConnection}
+                  element={<SettingsIntegrationNewDatabaseConnection />}
+                />
+                <Route
+                  path={SettingsPath.IntegrationDatabaseConnection}
+                  element={<SettingsIntegrationDatabaseConnection />}
+                />
                 <Route
                   path={SettingsPath.ObjectNewFieldStep1}
                   element={<SettingsObjectNewFieldStep1 />}
@@ -198,6 +229,12 @@ export const App = () => {
 
           <Route path={AppPath.NotFoundWildcard} element={<NotFound />} />
 
+        </Route>
+        <Route element={<BlankLayout />}>
+          <Route path={AppPath.Authorize} element={<Authorize />} />
+        </Route>
+      </Routes>
+
           <Route
             path={CustomPath.ImageTemplatePage}
             element={<ImageTemplate targetableObject={targetableObject} />}
diff --git a/packages/twenty-front/src/DefaultPageTitle.tsx b/packages/twenty-front/src/DefaultPageTitle.tsx
deleted file mode 100644
index 87b3c17f0b60..000000000000
--- a/packages/twenty-front/src/DefaultPageTitle.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { useLocation } from 'react-router-dom';
-
-import { PageTitle } from '@/ui/utilities/page-title/PageTitle';
-import { getPageTitleFromPath } from '~/utils/title-utils';
-
-export const DefaultPageTitle = () => {
-  const { pathname } = useLocation();
-  const pageTitle = getPageTitleFromPath(pathname);
-
-  return <PageTitle title={pageTitle} />;
-};
diff --git a/packages/twenty-front/src/config/index.ts b/packages/twenty-front/src/config/index.ts
index 9a8043a581dc..4dbb196252fd 100644
--- a/packages/twenty-front/src/config/index.ts
+++ b/packages/twenty-front/src/config/index.ts
@@ -5,17 +5,26 @@ declare global {
   }
 }
 
+const getDefaultUrl = () => {
+  if (
+    window.location.hostname === 'localhost' ||
+    window.location.hostname === '127.0.0.1'
+  ) {
+    // In development environment front and backend usually run on seperate ports
+    // we set the default value to localhost:3000.
+    // It dev context, we use env vars to overwrite it
+    return 'http://localhost:3000';
+  } else {
+    // Outside of localhost we assume that they run on the same port
+    // because the backend will serve the frontend
+    // It prod context, we use env-config.js + window var to ovewrite it
+    return `${window.location.protocol}//${window.location.hostname}${
+      window.location.port ? `:${window.location.port}` : ''
+    }`;
+  }
+};
+
 export const REACT_APP_SERVER_BASE_URL =
   window._env_?.REACT_APP_SERVER_BASE_URL ||
   process.env.REACT_APP_SERVER_BASE_URL ||
-  'http://localhost:3000';
-
-export const REACT_APP_SERVER_AUTH_URL =
-  window._env_?.REACT_APP_SERVER_AUTH_URL ||
-  process.env.REACT_APP_SERVER_AUTH_URL ||
-  REACT_APP_SERVER_BASE_URL + '/auth';
-
-export const REACT_APP_SERVER_FILES_URL =
-  window._env_?.REACT_APP_SERVER_FILES_URL ||
-  process.env.REACT_APP_SERVER_FILES_URL ||
-  REACT_APP_SERVER_BASE_URL + '/files';
+  getDefaultUrl();
diff --git a/packages/twenty-front/src/effect-components/PageChangeEffect.tsx b/packages/twenty-front/src/effect-components/PageChangeEffect.tsx
index b86a15c6d4c7..ea0b1a2e4262 100644
--- a/packages/twenty-front/src/effect-components/PageChangeEffect.tsx
+++ b/packages/twenty-front/src/effect-components/PageChangeEffect.tsx
@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 import { matchPath, useLocation, useNavigate } from 'react-router-dom';
 import { useRecoilValue } from 'recoil';
+import { IconCheckbox } from 'twenty-ui';
 
 import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
 import { useEventTracker } from '@/analytics/hooks/useEventTracker';
@@ -14,10 +15,11 @@ import { AppBasePath } from '@/types/AppBasePath';
 import { AppPath } from '@/types/AppPath';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
 import { SettingsPath } from '@/types/SettingsPath';
-import { IconCheckbox } from '@/ui/display/icon';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
 import { useGetWorkspaceFromInviteHashLazyQuery } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 import { useIsMatchingLocation } from '../hooks/useIsMatchingLocation';
 
@@ -55,8 +57,7 @@ export const PageChangeEffect = () => {
 
   useEffect(() => {
     const isMatchingOngoingUserCreationRoute =
-      isMatchingLocation(AppPath.SignUp) ||
-      isMatchingLocation(AppPath.SignIn) ||
+      isMatchingLocation(AppPath.SignInUp) ||
       isMatchingLocation(AppPath.Invite) ||
       isMatchingLocation(AppPath.Verify);
 
@@ -64,13 +65,14 @@ export const PageChangeEffect = () => {
       isMatchingOngoingUserCreationRoute ||
       isMatchingLocation(AppPath.CreateWorkspace) ||
       isMatchingLocation(AppPath.CreateProfile) ||
-      isMatchingLocation(AppPath.PlanRequired);
+      isMatchingLocation(AppPath.PlanRequired) ||
+      isMatchingLocation(AppPath.PlanRequiredSuccess);
 
     const navigateToSignUp = () => {
       enqueueSnackBar('workspace does not exist', {
         variant: 'error',
       });
-      navigate(AppPath.SignUp);
+      navigate(AppPath.SignInUp);
     };
 
     if (
@@ -78,15 +80,26 @@ export const PageChangeEffect = () => {
       !isMatchingOngoingUserCreationRoute &&
       !isMatchingLocation(AppPath.ResetPassword)
     ) {
-      navigate(AppPath.SignIn);
+      navigate(AppPath.SignInUp);
     } else if (
-      onboardingStatus &&
-      [OnboardingStatus.Canceled, OnboardingStatus.Incomplete].includes(
-        onboardingStatus,
-      ) &&
+      isDefined(onboardingStatus) &&
+      onboardingStatus === OnboardingStatus.Incomplete &&
       !isMatchingLocation(AppPath.PlanRequired)
     ) {
       navigate(AppPath.PlanRequired);
+    } else if (
+      isDefined(onboardingStatus) &&
+      [OnboardingStatus.Unpaid, OnboardingStatus.Canceled].includes(
+        onboardingStatus,
+      ) &&
+      !(
+        isMatchingLocation(AppPath.SettingsCatchAll) ||
+        isMatchingLocation(AppPath.PlanRequired)
+      )
+    ) {
+      navigate(
+        `${AppPath.SettingsCatchAll.replace('/*', '')}/${SettingsPath.Billing}`,
+      );
     } else if (
       onboardingStatus === OnboardingStatus.OngoingWorkspaceActivation &&
       !isMatchingLocation(AppPath.CreateWorkspace) &&
@@ -103,6 +116,12 @@ export const PageChangeEffect = () => {
       isMatchingOnboardingRoute
     ) {
       navigate(AppPath.Index);
+    } else if (
+      onboardingStatus === OnboardingStatus.CompletedWithoutSubscription &&
+      isMatchingOnboardingRoute &&
+      !isMatchingLocation(AppPath.PlanRequired)
+    ) {
+      navigate(AppPath.Index);
     } else if (isMatchingLocation(AppPath.Invite)) {
       const inviteHash =
         matchPath({ path: '/invite/:workspaceInviteHash' }, location.pathname)
@@ -113,7 +132,7 @@ export const PageChangeEffect = () => {
           inviteHash,
         },
         onCompleted: (data) => {
-          if (!data.findWorkspaceFromInviteHash) {
+          if (isUndefinedOrNull(data.findWorkspaceFromInviteHash)) {
             navigateToSignUp();
           }
         },
@@ -121,8 +140,6 @@ export const PageChangeEffect = () => {
           navigateToSignUp();
         },
       });
-    } else if (isMatchingLocation(AppPath.SignUp) && isSignUpDisabled) {
-      navigate(AppPath.SignIn);
     }
   }, [
     enqueueSnackBar,
@@ -165,11 +182,7 @@ export const PageChangeEffect = () => {
         break;
       }
 
-      case isMatchingLocation(AppPath.SignIn): {
-        setHotkeyScope(PageHotkeyScope.SignInUp);
-        break;
-      }
-      case isMatchingLocation(AppPath.SignUp): {
+      case isMatchingLocation(AppPath.SignInUp): {
         setHotkeyScope(PageHotkeyScope.SignInUp);
         break;
       }
diff --git a/packages/twenty-front/src/generated-metadata/gql.ts b/packages/twenty-front/src/generated-metadata/gql.ts
index 00721794ecbe..ecde7f3cab83 100644
--- a/packages/twenty-front/src/generated-metadata/gql.ts
+++ b/packages/twenty-front/src/generated-metadata/gql.ts
@@ -13,14 +13,23 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
  * Therefore it is highly recommended to use the babel or swc plugin for production.
  */
 const documents = {
+    "\n  fragment RemoteServerFields on RemoteServer {\n    id\n    createdAt\n    foreignDataWrapperId\n    foreignDataWrapperOptions\n    foreignDataWrapperType\n    updatedAt\n  }\n": types.RemoteServerFieldsFragmentDoc,
+    "\n  fragment RemoteTableFields on RemoteTable {\n    name\n    schema\n    status\n  }\n": types.RemoteTableFieldsFragmentDoc,
+    "\n  \n  mutation createServer($input: CreateRemoteServerInput!) {\n    createOneRemoteServer(input: $input) {\n      ...RemoteServerFields\n    }\n  }\n": types.CreateServerDocument,
+    "\n  mutation deleteServer($input: RemoteServerIdInput!) {\n    deleteOneRemoteServer(input: $input) {\n      id\n    }\n  }\n": types.DeleteServerDocument,
+    "\n  \n  mutation syncRemoteTable($input: RemoteTableInput!) {\n    syncRemoteTable(input: $input) {\n      ...RemoteTableFields\n    }\n  }\n": types.SyncRemoteTableDocument,
+    "\n  \n  mutation unsyncRemoteTable($input: RemoteTableInput!) {\n    unsyncRemoteTable(input: $input) {\n      ...RemoteTableFields\n    }\n  }\n": types.UnsyncRemoteTableDocument,
+    "\n  \n  query GetManyDatabaseConnections($input: RemoteServerTypeInput!) {\n    findManyRemoteServersByType(input: $input) {\n      ...RemoteServerFields\n    }\n  }\n": types.GetManyDatabaseConnectionsDocument,
+    "\n  \n  query GetManyRemoteTables($input: RemoteServerIdInput!) {\n    findAvailableRemoteTablesByServerId(input: $input) {\n      ...RemoteTableFields\n    }\n  }\n": types.GetManyRemoteTablesDocument,
+    "\n  \n  query GetOneDatabaseConnection($input: RemoteServerIdInput!) {\n    findOneRemoteServerById(input: $input) {\n      ...RemoteServerFields\n    }\n  }\n": types.GetOneDatabaseConnectionDocument,
     "\n  mutation CreateOneObjectMetadataItem($input: CreateOneObjectInput!) {\n    createOneObject(input: $input) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n    }\n  }\n": types.CreateOneObjectMetadataItemDocument,
     "\n  mutation CreateOneFieldMetadataItem($input: CreateOneFieldMetadataInput!) {\n    createOneField(input: $input) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n      defaultValue\n      options\n    }\n  }\n": types.CreateOneFieldMetadataItemDocument,
     "\n  mutation CreateOneRelationMetadata($input: CreateOneRelationInput!) {\n    createOneRelation(input: $input) {\n      id\n      relationType\n      fromObjectMetadataId\n      toObjectMetadataId\n      fromFieldMetadataId\n      toFieldMetadataId\n      createdAt\n      updatedAt\n    }\n  }\n": types.CreateOneRelationMetadataDocument,
-    "\n  mutation UpdateOneFieldMetadataItem(\n    $idToUpdate: ID!\n    $updatePayload: UpdateFieldInput!\n  ) {\n    updateOneField(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n": types.UpdateOneFieldMetadataItemDocument,
-    "\n  mutation UpdateOneObjectMetadataItem(\n    $idToUpdate: ID!\n    $updatePayload: UpdateObjectInput!\n  ) {\n    updateOneObject(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n    }\n  }\n": types.UpdateOneObjectMetadataItemDocument,
-    "\n  mutation DeleteOneObjectMetadataItem($idToDelete: ID!) {\n    deleteOneObject(input: { id: $idToDelete }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n    }\n  }\n": types.DeleteOneObjectMetadataItemDocument,
-    "\n  mutation DeleteOneFieldMetadataItem($idToDelete: ID!) {\n    deleteOneField(input: { id: $idToDelete }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n": types.DeleteOneFieldMetadataItemDocument,
-    "\n  query ObjectMetadataItems(\n    $objectFilter: objectFilter\n    $fieldFilter: fieldFilter\n  ) {\n    objects(paging: { first: 1000 }, filter: $objectFilter) {\n      edges {\n        node {\n          id\n          dataSourceId\n          nameSingular\n          namePlural\n          labelSingular\n          labelPlural\n          description\n          icon\n          isCustom\n          isActive\n          isSystem\n          createdAt\n          updatedAt\n          labelIdentifierFieldMetadataId\n          imageIdentifierFieldMetadataId\n          fields(paging: { first: 1000 }, filter: $fieldFilter) {\n            edges {\n              node {\n                id\n                type\n                name\n                label\n                description\n                icon\n                isCustom\n                isActive\n                isSystem\n                isNullable\n                createdAt\n                updatedAt\n                fromRelationMetadata {\n                  id\n                  relationType\n                  toObjectMetadata {\n                    id\n                    dataSourceId\n                    nameSingular\n                    namePlural\n                    isSystem\n                  }\n                  toFieldMetadataId\n                }\n                toRelationMetadata {\n                  id\n                  relationType\n                  fromObjectMetadata {\n                    id\n                    dataSourceId\n                    nameSingular\n                    namePlural\n                    isSystem\n                  }\n                  fromFieldMetadataId\n                }\n                defaultValue\n                options\n              }\n            }\n            pageInfo {\n              hasNextPage\n              hasPreviousPage\n              startCursor\n              endCursor\n            }\n            totalCount\n          }\n        }\n      }\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n      totalCount\n    }\n  }\n": types.ObjectMetadataItemsDocument,
+    "\n  mutation UpdateOneFieldMetadataItem(\n    $idToUpdate: UUID!\n    $updatePayload: UpdateFieldInput!\n  ) {\n    updateOneField(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n": types.UpdateOneFieldMetadataItemDocument,
+    "\n  mutation UpdateOneObjectMetadataItem(\n    $idToUpdate: UUID!\n    $updatePayload: UpdateObjectInput!\n  ) {\n    updateOneObject(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n    }\n  }\n": types.UpdateOneObjectMetadataItemDocument,
+    "\n  mutation DeleteOneObjectMetadataItem($idToDelete: UUID!) {\n    deleteOneObject(input: { id: $idToDelete }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n    }\n  }\n": types.DeleteOneObjectMetadataItemDocument,
+    "\n  mutation DeleteOneFieldMetadataItem($idToDelete: UUID!) {\n    deleteOneField(input: { id: $idToDelete }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n": types.DeleteOneFieldMetadataItemDocument,
+    "\n  query ObjectMetadataItems(\n    $objectFilter: objectFilter\n    $fieldFilter: fieldFilter\n  ) {\n    objects(paging: { first: 1000 }, filter: $objectFilter) {\n      edges {\n        node {\n          id\n          dataSourceId\n          nameSingular\n          namePlural\n          labelSingular\n          labelPlural\n          description\n          icon\n          isCustom\n          isRemote\n          isActive\n          isSystem\n          createdAt\n          updatedAt\n          labelIdentifierFieldMetadataId\n          imageIdentifierFieldMetadataId\n          fields(paging: { first: 1000 }, filter: $fieldFilter) {\n            edges {\n              node {\n                id\n                type\n                name\n                label\n                description\n                icon\n                isCustom\n                isActive\n                isSystem\n                isNullable\n                createdAt\n                updatedAt\n                fromRelationMetadata {\n                  id\n                  relationType\n                  toObjectMetadata {\n                    id\n                    dataSourceId\n                    nameSingular\n                    namePlural\n                    isSystem\n                  }\n                  toFieldMetadataId\n                }\n                toRelationMetadata {\n                  id\n                  relationType\n                  fromObjectMetadata {\n                    id\n                    dataSourceId\n                    nameSingular\n                    namePlural\n                    isSystem\n                  }\n                  fromFieldMetadataId\n                }\n                defaultValue\n                options\n                relationDefinition {\n                  direction\n                  sourceObjectMetadata {\n                    id\n                    nameSingular\n                    namePlural\n                  }\n                  sourceFieldMetadata {\n                    id\n                    name\n                  }\n                  targetObjectMetadata {\n                    id\n                    nameSingular\n                    namePlural\n                  }\n                  targetFieldMetadata {\n                    id\n                    name\n                  }\n                }\n              }\n            }\n            pageInfo {\n              hasNextPage\n              hasPreviousPage\n              startCursor\n              endCursor\n            }\n          }\n        }\n      }\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n    }\n  }\n": types.ObjectMetadataItemsDocument,
 };
 
 /**
@@ -37,6 +46,42 @@ const documents = {
  */
 export function graphql(source: string): unknown;
 
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  fragment RemoteServerFields on RemoteServer {\n    id\n    createdAt\n    foreignDataWrapperId\n    foreignDataWrapperOptions\n    foreignDataWrapperType\n    updatedAt\n  }\n"): (typeof documents)["\n  fragment RemoteServerFields on RemoteServer {\n    id\n    createdAt\n    foreignDataWrapperId\n    foreignDataWrapperOptions\n    foreignDataWrapperType\n    updatedAt\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  fragment RemoteTableFields on RemoteTable {\n    name\n    schema\n    status\n  }\n"): (typeof documents)["\n  fragment RemoteTableFields on RemoteTable {\n    name\n    schema\n    status\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  \n  mutation createServer($input: CreateRemoteServerInput!) {\n    createOneRemoteServer(input: $input) {\n      ...RemoteServerFields\n    }\n  }\n"): (typeof documents)["\n  \n  mutation createServer($input: CreateRemoteServerInput!) {\n    createOneRemoteServer(input: $input) {\n      ...RemoteServerFields\n    }\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  mutation deleteServer($input: RemoteServerIdInput!) {\n    deleteOneRemoteServer(input: $input) {\n      id\n    }\n  }\n"): (typeof documents)["\n  mutation deleteServer($input: RemoteServerIdInput!) {\n    deleteOneRemoteServer(input: $input) {\n      id\n    }\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  \n  mutation syncRemoteTable($input: RemoteTableInput!) {\n    syncRemoteTable(input: $input) {\n      ...RemoteTableFields\n    }\n  }\n"): (typeof documents)["\n  \n  mutation syncRemoteTable($input: RemoteTableInput!) {\n    syncRemoteTable(input: $input) {\n      ...RemoteTableFields\n    }\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  \n  mutation unsyncRemoteTable($input: RemoteTableInput!) {\n    unsyncRemoteTable(input: $input) {\n      ...RemoteTableFields\n    }\n  }\n"): (typeof documents)["\n  \n  mutation unsyncRemoteTable($input: RemoteTableInput!) {\n    unsyncRemoteTable(input: $input) {\n      ...RemoteTableFields\n    }\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  \n  query GetManyDatabaseConnections($input: RemoteServerTypeInput!) {\n    findManyRemoteServersByType(input: $input) {\n      ...RemoteServerFields\n    }\n  }\n"): (typeof documents)["\n  \n  query GetManyDatabaseConnections($input: RemoteServerTypeInput!) {\n    findManyRemoteServersByType(input: $input) {\n      ...RemoteServerFields\n    }\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  \n  query GetManyRemoteTables($input: RemoteServerIdInput!) {\n    findAvailableRemoteTablesByServerId(input: $input) {\n      ...RemoteTableFields\n    }\n  }\n"): (typeof documents)["\n  \n  query GetManyRemoteTables($input: RemoteServerIdInput!) {\n    findAvailableRemoteTablesByServerId(input: $input) {\n      ...RemoteTableFields\n    }\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  \n  query GetOneDatabaseConnection($input: RemoteServerIdInput!) {\n    findOneRemoteServerById(input: $input) {\n      ...RemoteServerFields\n    }\n  }\n"): (typeof documents)["\n  \n  query GetOneDatabaseConnection($input: RemoteServerIdInput!) {\n    findOneRemoteServerById(input: $input) {\n      ...RemoteServerFields\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -52,23 +97,23 @@ export function graphql(source: "\n  mutation CreateOneRelationMetadata($input:
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  mutation UpdateOneFieldMetadataItem(\n    $idToUpdate: ID!\n    $updatePayload: UpdateFieldInput!\n  ) {\n    updateOneField(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"): (typeof documents)["\n  mutation UpdateOneFieldMetadataItem(\n    $idToUpdate: ID!\n    $updatePayload: UpdateFieldInput!\n  ) {\n    updateOneField(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"];
+export function graphql(source: "\n  mutation UpdateOneFieldMetadataItem(\n    $idToUpdate: UUID!\n    $updatePayload: UpdateFieldInput!\n  ) {\n    updateOneField(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"): (typeof documents)["\n  mutation UpdateOneFieldMetadataItem(\n    $idToUpdate: UUID!\n    $updatePayload: UpdateFieldInput!\n  ) {\n    updateOneField(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  mutation UpdateOneObjectMetadataItem(\n    $idToUpdate: ID!\n    $updatePayload: UpdateObjectInput!\n  ) {\n    updateOneObject(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n    }\n  }\n"): (typeof documents)["\n  mutation UpdateOneObjectMetadataItem(\n    $idToUpdate: ID!\n    $updatePayload: UpdateObjectInput!\n  ) {\n    updateOneObject(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n    }\n  }\n"];
+export function graphql(source: "\n  mutation UpdateOneObjectMetadataItem(\n    $idToUpdate: UUID!\n    $updatePayload: UpdateObjectInput!\n  ) {\n    updateOneObject(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n    }\n  }\n"): (typeof documents)["\n  mutation UpdateOneObjectMetadataItem(\n    $idToUpdate: UUID!\n    $updatePayload: UpdateObjectInput!\n  ) {\n    updateOneObject(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  mutation DeleteOneObjectMetadataItem($idToDelete: ID!) {\n    deleteOneObject(input: { id: $idToDelete }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n    }\n  }\n"): (typeof documents)["\n  mutation DeleteOneObjectMetadataItem($idToDelete: ID!) {\n    deleteOneObject(input: { id: $idToDelete }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n    }\n  }\n"];
+export function graphql(source: "\n  mutation DeleteOneObjectMetadataItem($idToDelete: UUID!) {\n    deleteOneObject(input: { id: $idToDelete }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n    }\n  }\n"): (typeof documents)["\n  mutation DeleteOneObjectMetadataItem($idToDelete: UUID!) {\n    deleteOneObject(input: { id: $idToDelete }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  mutation DeleteOneFieldMetadataItem($idToDelete: ID!) {\n    deleteOneField(input: { id: $idToDelete }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"): (typeof documents)["\n  mutation DeleteOneFieldMetadataItem($idToDelete: ID!) {\n    deleteOneField(input: { id: $idToDelete }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"];
+export function graphql(source: "\n  mutation DeleteOneFieldMetadataItem($idToDelete: UUID!) {\n    deleteOneField(input: { id: $idToDelete }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"): (typeof documents)["\n  mutation DeleteOneFieldMetadataItem($idToDelete: UUID!) {\n    deleteOneField(input: { id: $idToDelete }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query ObjectMetadataItems(\n    $objectFilter: objectFilter\n    $fieldFilter: fieldFilter\n  ) {\n    objects(paging: { first: 1000 }, filter: $objectFilter) {\n      edges {\n        node {\n          id\n          dataSourceId\n          nameSingular\n          namePlural\n          labelSingular\n          labelPlural\n          description\n          icon\n          isCustom\n          isActive\n          isSystem\n          createdAt\n          updatedAt\n          labelIdentifierFieldMetadataId\n          imageIdentifierFieldMetadataId\n          fields(paging: { first: 1000 }, filter: $fieldFilter) {\n            edges {\n              node {\n                id\n                type\n                name\n                label\n                description\n                icon\n                isCustom\n                isActive\n                isSystem\n                isNullable\n                createdAt\n                updatedAt\n                fromRelationMetadata {\n                  id\n                  relationType\n                  toObjectMetadata {\n                    id\n                    dataSourceId\n                    nameSingular\n                    namePlural\n                    isSystem\n                  }\n                  toFieldMetadataId\n                }\n                toRelationMetadata {\n                  id\n                  relationType\n                  fromObjectMetadata {\n                    id\n                    dataSourceId\n                    nameSingular\n                    namePlural\n                    isSystem\n                  }\n                  fromFieldMetadataId\n                }\n                defaultValue\n                options\n              }\n            }\n            pageInfo {\n              hasNextPage\n              hasPreviousPage\n              startCursor\n              endCursor\n            }\n            totalCount\n          }\n        }\n      }\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n      totalCount\n    }\n  }\n"): (typeof documents)["\n  query ObjectMetadataItems(\n    $objectFilter: objectFilter\n    $fieldFilter: fieldFilter\n  ) {\n    objects(paging: { first: 1000 }, filter: $objectFilter) {\n      edges {\n        node {\n          id\n          dataSourceId\n          nameSingular\n          namePlural\n          labelSingular\n          labelPlural\n          description\n          icon\n          isCustom\n          isActive\n          isSystem\n          createdAt\n          updatedAt\n          labelIdentifierFieldMetadataId\n          imageIdentifierFieldMetadataId\n          fields(paging: { first: 1000 }, filter: $fieldFilter) {\n            edges {\n              node {\n                id\n                type\n                name\n                label\n                description\n                icon\n                isCustom\n                isActive\n                isSystem\n                isNullable\n                createdAt\n                updatedAt\n                fromRelationMetadata {\n                  id\n                  relationType\n                  toObjectMetadata {\n                    id\n                    dataSourceId\n                    nameSingular\n                    namePlural\n                    isSystem\n                  }\n                  toFieldMetadataId\n                }\n                toRelationMetadata {\n                  id\n                  relationType\n                  fromObjectMetadata {\n                    id\n                    dataSourceId\n                    nameSingular\n                    namePlural\n                    isSystem\n                  }\n                  fromFieldMetadataId\n                }\n                defaultValue\n                options\n              }\n            }\n            pageInfo {\n              hasNextPage\n              hasPreviousPage\n              startCursor\n              endCursor\n            }\n            totalCount\n          }\n        }\n      }\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n      totalCount\n    }\n  }\n"];
+export function graphql(source: "\n  query ObjectMetadataItems(\n    $objectFilter: objectFilter\n    $fieldFilter: fieldFilter\n  ) {\n    objects(paging: { first: 1000 }, filter: $objectFilter) {\n      edges {\n        node {\n          id\n          dataSourceId\n          nameSingular\n          namePlural\n          labelSingular\n          labelPlural\n          description\n          icon\n          isCustom\n          isRemote\n          isActive\n          isSystem\n          createdAt\n          updatedAt\n          labelIdentifierFieldMetadataId\n          imageIdentifierFieldMetadataId\n          fields(paging: { first: 1000 }, filter: $fieldFilter) {\n            edges {\n              node {\n                id\n                type\n                name\n                label\n                description\n                icon\n                isCustom\n                isActive\n                isSystem\n                isNullable\n                createdAt\n                updatedAt\n                fromRelationMetadata {\n                  id\n                  relationType\n                  toObjectMetadata {\n                    id\n                    dataSourceId\n                    nameSingular\n                    namePlural\n                    isSystem\n                  }\n                  toFieldMetadataId\n                }\n                toRelationMetadata {\n                  id\n                  relationType\n                  fromObjectMetadata {\n                    id\n                    dataSourceId\n                    nameSingular\n                    namePlural\n                    isSystem\n                  }\n                  fromFieldMetadataId\n                }\n                defaultValue\n                options\n                relationDefinition {\n                  direction\n                  sourceObjectMetadata {\n                    id\n                    nameSingular\n                    namePlural\n                  }\n                  sourceFieldMetadata {\n                    id\n                    name\n                  }\n                  targetObjectMetadata {\n                    id\n                    nameSingular\n                    namePlural\n                  }\n                  targetFieldMetadata {\n                    id\n                    name\n                  }\n                }\n              }\n            }\n            pageInfo {\n              hasNextPage\n              hasPreviousPage\n              startCursor\n              endCursor\n            }\n          }\n        }\n      }\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n    }\n  }\n"): (typeof documents)["\n  query ObjectMetadataItems(\n    $objectFilter: objectFilter\n    $fieldFilter: fieldFilter\n  ) {\n    objects(paging: { first: 1000 }, filter: $objectFilter) {\n      edges {\n        node {\n          id\n          dataSourceId\n          nameSingular\n          namePlural\n          labelSingular\n          labelPlural\n          description\n          icon\n          isCustom\n          isRemote\n          isActive\n          isSystem\n          createdAt\n          updatedAt\n          labelIdentifierFieldMetadataId\n          imageIdentifierFieldMetadataId\n          fields(paging: { first: 1000 }, filter: $fieldFilter) {\n            edges {\n              node {\n                id\n                type\n                name\n                label\n                description\n                icon\n                isCustom\n                isActive\n                isSystem\n                isNullable\n                createdAt\n                updatedAt\n                fromRelationMetadata {\n                  id\n                  relationType\n                  toObjectMetadata {\n                    id\n                    dataSourceId\n                    nameSingular\n                    namePlural\n                    isSystem\n                  }\n                  toFieldMetadataId\n                }\n                toRelationMetadata {\n                  id\n                  relationType\n                  fromObjectMetadata {\n                    id\n                    dataSourceId\n                    nameSingular\n                    namePlural\n                    isSystem\n                  }\n                  fromFieldMetadataId\n                }\n                defaultValue\n                options\n                relationDefinition {\n                  direction\n                  sourceObjectMetadata {\n                    id\n                    nameSingular\n                    namePlural\n                  }\n                  sourceFieldMetadata {\n                    id\n                    name\n                  }\n                  targetObjectMetadata {\n                    id\n                    nameSingular\n                    namePlural\n                  }\n                  targetFieldMetadata {\n                    id\n                    name\n                  }\n                }\n              }\n            }\n            pageInfo {\n              hasNextPage\n              hasPreviousPage\n              startCursor\n              endCursor\n            }\n          }\n        }\n      }\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n    }\n  }\n"];
 
 export function graphql(source: string) {
   return (documents as any)[source] ?? {};
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index f3429607c2ef..3328bbdd7fa0 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -20,15 +20,44 @@ export type Scalars = {
   DateTime: { input: any; output: any; }
   /** The `JSON` scalar type represents JSON values as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf). */
   JSON: { input: any; output: any; }
+  /** A UUID scalar type */
+  UUID: { input: any; output: any; }
   /** The `Upload` scalar type represents a file upload. */
   Upload: { input: any; output: any; }
 };
 
+export type ActivateWorkspaceInput = {
+  displayName?: InputMaybe<Scalars['String']['input']>;
+};
+
+export type Analytics = {
+  __typename?: 'Analytics';
+  /** Boolean that confirms query was dispatched */
+  success: Scalars['Boolean']['output'];
+};
+
 export type ApiKeyToken = {
   __typename?: 'ApiKeyToken';
   token: Scalars['String']['output'];
 };
 
+export type AppToken = {
+  __typename?: 'AppToken';
+  createdAt: Scalars['DateTime']['output'];
+  expiresAt: Scalars['DateTime']['output'];
+  id: Scalars['UUID']['output'];
+  type: Scalars['String']['output'];
+  updatedAt: Scalars['DateTime']['output'];
+};
+
+export type AppTokenEdge = {
+  __typename?: 'AppTokenEdge';
+  /** Cursor for this node. */
+  cursor: Scalars['ConnectionCursor']['output'];
+  /** The node containing the AppToken */
+  node: AppToken;
+};
+
 export type AuthProviders = {
   __typename?: 'AuthProviders';
   google: Scalars['Boolean']['output'];
@@ -53,17 +82,62 @@ export type AuthTokens = {
   tokens: AuthTokenPair;
 };
 
+export type AuthorizeApp = {
+  __typename?: 'AuthorizeApp';
+  redirectUrl: Scalars['String']['output'];
+};
+
 export type Billing = {
   __typename?: 'Billing';
-  billingUrl: Scalars['String']['output'];
+  billingFreeTrialDurationInDays?: Maybe<Scalars['Float']['output']>;
+  billingUrl?: Maybe<Scalars['String']['output']>;
   isBillingEnabled: Scalars['Boolean']['output'];
 };
 
+export type BillingSubscription = {
+  __typename?: 'BillingSubscription';
+  id: Scalars['UUID']['output'];
+  interval?: Maybe<Scalars['String']['output']>;
+  status: Scalars['String']['output'];
+};
+
+export type BillingSubscriptionFilter = {
+  and?: InputMaybe<Array<BillingSubscriptionFilter>>;
+  id?: InputMaybe<UuidFilterComparison>;
+  or?: InputMaybe<Array<BillingSubscriptionFilter>>;
+};
+
+export type BillingSubscriptionSort = {
+  direction: SortDirection;
+  field: BillingSubscriptionSortFields;
+  nulls?: InputMaybe<SortNulls>;
+};
+
+export enum BillingSubscriptionSortFields {
+  Id = 'id'
+}
+
 export type BooleanFieldComparison = {
   is?: InputMaybe<Scalars['Boolean']['input']>;
   isNot?: InputMaybe<Scalars['Boolean']['input']>;
 };
 
+export type ClientConfig = {
+  __typename?: 'ClientConfig';
+  authProviders: AuthProviders;
+  billing: Billing;
+  debugMode: Scalars['Boolean']['output'];
+  sentry: Sentry;
+  signInPrefilled: Scalars['Boolean']['output'];
+  signUpDisabled: Scalars['Boolean']['output'];
+  support: Support;
+  telemetry: Telemetry;
+};
+
+export type CreateAppTokenInput = {
+  expiresAt: Scalars['DateTime']['input'];
+};
+
 export type CreateFieldInput = {
   defaultValue?: InputMaybe<Scalars['JSON']['input']>;
   description?: InputMaybe<Scalars['String']['input']>;
@@ -71,6 +145,7 @@ export type CreateFieldInput = {
   isActive?: InputMaybe<Scalars['Boolean']['input']>;
   isCustom?: InputMaybe<Scalars['Boolean']['input']>;
   isNullable?: InputMaybe<Scalars['Boolean']['input']>;
+  isRemoteCreation?: InputMaybe<Scalars['Boolean']['input']>;
   isSystem?: InputMaybe<Scalars['Boolean']['input']>;
   label: Scalars['String']['input'];
   name: Scalars['String']['input'];
@@ -83,11 +158,18 @@ export type CreateObjectInput = {
   description?: InputMaybe<Scalars['String']['input']>;
   icon?: InputMaybe<Scalars['String']['input']>;
   imageIdentifierFieldMetadataId?: InputMaybe<Scalars['String']['input']>;
+  isRemote?: InputMaybe<Scalars['Boolean']['input']>;
   labelIdentifierFieldMetadataId?: InputMaybe<Scalars['String']['input']>;
   labelPlural: Scalars['String']['input'];
   labelSingular: Scalars['String']['input'];
   namePlural: Scalars['String']['input'];
   nameSingular: Scalars['String']['input'];
+  remoteTablePrimaryKeyColumnType?: InputMaybe<Scalars['String']['input']>;
+};
+
+export type CreateOneAppTokenInput = {
+  /** The record to create */
+  appToken: CreateAppTokenInput;
 };
 
 export type CreateOneFieldMetadataInput = {
@@ -120,6 +202,12 @@ export type CreateRelationInput = {
   toObjectMetadataId: Scalars['String']['input'];
 };
 
+export type CreateRemoteServerInput = {
+  foreignDataWrapperOptions: Scalars['JSON']['input'];
+  foreignDataWrapperType: Scalars['String']['input'];
+  userMappingOptions?: InputMaybe<Scalars['JSON']['input']>;
+};
+
 export type CursorPaging = {
   /** Paginate after opaque cursor */
   after?: InputMaybe<Scalars['ConnectionCursor']['input']>;
@@ -132,18 +220,18 @@ export type CursorPaging = {
 };
 
 export type DeleteOneFieldInput = {
-  /** The id of the record to delete. */
-  id: Scalars['ID']['input'];
+  /** The id of the field to delete. */
+  id: Scalars['UUID']['input'];
 };
 
 export type DeleteOneObjectInput = {
   /** The id of the record to delete. */
-  id: Scalars['ID']['input'];
+  id: Scalars['UUID']['input'];
 };
 
 export type DeleteOneRelationInput = {
   /** The id of the record to delete. */
-  id: Scalars['ID']['input'];
+  id: Scalars['UUID']['input'];
 };
 
 export type EmailPasswordResetLink = {
@@ -152,38 +240,51 @@ export type EmailPasswordResetLink = {
   success: Scalars['Boolean']['output'];
 };
 
+export type ExchangeAuthCode = {
+  __typename?: 'ExchangeAuthCode';
+  accessToken: AuthToken;
+  loginToken: AuthToken;
+  refreshToken: AuthToken;
+};
+
+export type FeatureFlag = {
+  __typename?: 'FeatureFlag';
+  id: Scalars['UUID']['output'];
+  key: Scalars['String']['output'];
+  value: Scalars['Boolean']['output'];
+  workspaceId: Scalars['String']['output'];
+};
+
+export type FeatureFlagFilter = {
+  and?: InputMaybe<Array<FeatureFlagFilter>>;
+  id?: InputMaybe<UuidFilterComparison>;
+  or?: InputMaybe<Array<FeatureFlagFilter>>;
+};
+
+export type FeatureFlagSort = {
+  direction: SortDirection;
+  field: FeatureFlagSortFields;
+  nulls?: InputMaybe<SortNulls>;
+};
+
+export enum FeatureFlagSortFields {
+  Id = 'id'
+}
+
 export type FieldConnection = {
   __typename?: 'FieldConnection';
   /** Array of edges. */
   edges: Array<FieldEdge>;
   /** Paging information */
   pageInfo: PageInfo;
-  /** Fetch total count of records */
-  totalCount: Scalars['Int']['output'];
-};
-
-export type FieldDeleteResponse = {
-  __typename?: 'FieldDeleteResponse';
-  createdAt?: Maybe<Scalars['DateTime']['output']>;
-  defaultValue?: Maybe<Scalars['JSON']['output']>;
-  description?: Maybe<Scalars['String']['output']>;
-  icon?: Maybe<Scalars['String']['output']>;
-  id?: Maybe<Scalars['ID']['output']>;
-  isActive?: Maybe<Scalars['Boolean']['output']>;
-  isCustom?: Maybe<Scalars['Boolean']['output']>;
-  isNullable?: Maybe<Scalars['Boolean']['output']>;
-  isSystem?: Maybe<Scalars['Boolean']['output']>;
-  label?: Maybe<Scalars['String']['output']>;
-  name?: Maybe<Scalars['String']['output']>;
-  options?: Maybe<Scalars['JSON']['output']>;
-  type?: Maybe<FieldMetadataType>;
-  updatedAt?: Maybe<Scalars['DateTime']['output']>;
 };
 
 /** Type of the field */
 export enum FieldMetadataType {
+  Address = 'ADDRESS',
   Boolean = 'BOOLEAN',
   Currency = 'CURRENCY',
+  Date = 'DATE',
   DateTime = 'DATE_TIME',
   Email = 'EMAIL',
   FullName = 'FULL_NAME',
@@ -192,8 +293,10 @@ export enum FieldMetadataType {
   Number = 'NUMBER',
   Numeric = 'NUMERIC',
   Phone = 'PHONE',
+  Position = 'POSITION',
   Probability = 'PROBABILITY',
   Rating = 'RATING',
+  RawJson = 'RAW_JSON',
   Relation = 'RELATION',
   Select = 'SELECT',
   Text = 'TEXT',
@@ -213,29 +316,18 @@ export type FullName = {
   lastName: Scalars['String']['output'];
 };
 
-export type IdFilterComparison = {
-  eq?: InputMaybe<Scalars['ID']['input']>;
-  gt?: InputMaybe<Scalars['ID']['input']>;
-  gte?: InputMaybe<Scalars['ID']['input']>;
-  iLike?: InputMaybe<Scalars['ID']['input']>;
-  in?: InputMaybe<Array<Scalars['ID']['input']>>;
-  is?: InputMaybe<Scalars['Boolean']['input']>;
-  isNot?: InputMaybe<Scalars['Boolean']['input']>;
-  like?: InputMaybe<Scalars['ID']['input']>;
-  lt?: InputMaybe<Scalars['ID']['input']>;
-  lte?: InputMaybe<Scalars['ID']['input']>;
-  neq?: InputMaybe<Scalars['ID']['input']>;
-  notILike?: InputMaybe<Scalars['ID']['input']>;
-  notIn?: InputMaybe<Array<Scalars['ID']['input']>>;
-  notLike?: InputMaybe<Scalars['ID']['input']>;
-};
-
 export type InvalidatePassword = {
   __typename?: 'InvalidatePassword';
   /** Boolean that confirms query was dispatched */
   success: Scalars['Boolean']['output'];
 };
 
+export type LinkMetadata = {
+  __typename?: 'LinkMetadata';
+  label: Scalars['String']['output'];
+  url: Scalars['String']['output'];
+};
+
 export type LoginToken = {
   __typename?: 'LoginToken';
   loginToken: AuthToken;
@@ -243,36 +335,73 @@ export type LoginToken = {
 
 export type Mutation = {
   __typename?: 'Mutation';
+  activateWorkspace: Workspace;
+  authorizeApp: AuthorizeApp;
   challenge: LoginToken;
+  checkoutSession: SessionEntity;
+  createOneAppToken: AppToken;
   createOneField: Field;
   createOneObject: Object;
   createOneRelation: Relation;
-  deleteOneField: FieldDeleteResponse;
+  createOneRemoteServer: RemoteServer;
+  deleteCurrentWorkspace: Workspace;
+  deleteOneField: Field;
   deleteOneObject: Object;
   deleteOneRelation: RelationDeleteResponse;
+  deleteOneRemoteServer: RemoteServer;
   deleteUser: User;
   emailPasswordResetLink: EmailPasswordResetLink;
   generateApiKeyToken: ApiKeyToken;
+  generateJWT: AuthTokens;
   generateTransientToken: TransientToken;
   impersonate: Verify;
   renewToken: AuthTokens;
   signUp: LoginToken;
+  syncRemoteTable: RemoteTable;
+  track: Analytics;
+  unsyncRemoteTable: RemoteTable;
+  updateBillingSubscription: UpdateBillingEntity;
   updateOneField: Field;
   updateOneObject: Object;
   updatePasswordViaResetToken: InvalidatePassword;
+  updateWorkspace: Workspace;
   uploadFile: Scalars['String']['output'];
   uploadImage: Scalars['String']['output'];
   uploadProfilePicture: Scalars['String']['output'];
+  uploadWorkspaceLogo: Scalars['String']['output'];
   verify: Verify;
 };
 
 
+export type MutationActivateWorkspaceArgs = {
+  data: ActivateWorkspaceInput;
+};
+
+
+export type MutationAuthorizeAppArgs = {
+  clientId: Scalars['String']['input'];
+  codeChallenge?: InputMaybe<Scalars['String']['input']>;
+  redirectUrl?: InputMaybe<Scalars['String']['input']>;
+};
+
+
 export type MutationChallengeArgs = {
   email: Scalars['String']['input'];
   password: Scalars['String']['input'];
 };
 
 
+export type MutationCheckoutSessionArgs = {
+  recurringInterval: Scalars['String']['input'];
+  successUrlPath?: InputMaybe<Scalars['String']['input']>;
+};
+
+
+export type MutationCreateOneAppTokenArgs = {
+  input: CreateOneAppTokenInput;
+};
+
+
 export type MutationCreateOneFieldArgs = {
   input: CreateOneFieldMetadataInput;
 };
@@ -288,6 +417,11 @@ export type MutationCreateOneRelationArgs = {
 };
 
 
+export type MutationCreateOneRemoteServerArgs = {
+  input: CreateRemoteServerInput;
+};
+
+
 export type MutationDeleteOneFieldArgs = {
   input: DeleteOneFieldInput;
 };
@@ -303,6 +437,11 @@ export type MutationDeleteOneRelationArgs = {
 };
 
 
+export type MutationDeleteOneRemoteServerArgs = {
+  input: RemoteServerIdInput;
+};
+
+
 export type MutationEmailPasswordResetLinkArgs = {
   email: Scalars['String']['input'];
 };
@@ -314,13 +453,18 @@ export type MutationGenerateApiKeyTokenArgs = {
 };
 
 
+export type MutationGenerateJwtArgs = {
+  workspaceId: Scalars['String']['input'];
+};
+
+
 export type MutationImpersonateArgs = {
   userId: Scalars['String']['input'];
 };
 
 
 export type MutationRenewTokenArgs = {
-  refreshToken: Scalars['String']['input'];
+  appToken: Scalars['String']['input'];
 };
 
 
@@ -331,6 +475,22 @@ export type MutationSignUpArgs = {
 };
 
 
+export type MutationSyncRemoteTableArgs = {
+  input: RemoteTableInput;
+};
+
+
+export type MutationTrackArgs = {
+  data: Scalars['JSON']['input'];
+  type: Scalars['String']['input'];
+};
+
+
+export type MutationUnsyncRemoteTableArgs = {
+  input: RemoteTableInput;
+};
+
+
 export type MutationUpdateOneFieldArgs = {
   input: UpdateOneFieldMetadataInput;
 };
@@ -347,6 +507,11 @@ export type MutationUpdatePasswordViaResetTokenArgs = {
 };
 
 
+export type MutationUpdateWorkspaceArgs = {
+  data: UpdateWorkspaceInput;
+};
+
+
 export type MutationUploadFileArgs = {
   file: Scalars['Upload']['input'];
   fileFolder?: InputMaybe<FileFolder>;
@@ -364,6 +529,11 @@ export type MutationUploadProfilePictureArgs = {
 };
 
 
+export type MutationUploadWorkspaceLogoArgs = {
+  file: Scalars['Upload']['input'];
+};
+
+
 export type MutationVerifyArgs = {
   loginToken: Scalars['String']['input'];
 };
@@ -374,8 +544,6 @@ export type ObjectConnection = {
   edges: Array<ObjectEdge>;
   /** Paging information */
   pageInfo: PageInfo;
-  /** Fetch total count of records */
-  totalCount: Scalars['Int']['output'];
 };
 
 export type ObjectFieldsConnection = {
@@ -384,8 +552,6 @@ export type ObjectFieldsConnection = {
   edges: Array<FieldEdge>;
   /** Paging information */
   pageInfo: PageInfo;
-  /** Fetch total count of records */
-  totalCount: Scalars['Int']['output'];
 };
 
 export type PageInfo = {
@@ -400,14 +566,40 @@ export type PageInfo = {
   startCursor?: Maybe<Scalars['ConnectionCursor']['output']>;
 };
 
+export type ProductPriceEntity = {
+  __typename?: 'ProductPriceEntity';
+  created: Scalars['Float']['output'];
+  recurringInterval: Scalars['String']['output'];
+  stripePriceId: Scalars['String']['output'];
+  unitAmount: Scalars['Float']['output'];
+};
+
+export type ProductPricesEntity = {
+  __typename?: 'ProductPricesEntity';
+  productPrices: Array<ProductPriceEntity>;
+  totalNumberOfPrices: Scalars['Int']['output'];
+};
+
 export type Query = {
   __typename?: 'Query';
+  billingPortalSession: SessionEntity;
   checkUserExists: UserExists;
   checkWorkspaceInviteHashIsValid: WorkspaceInviteHashValid;
+  clientConfig: ClientConfig;
   currentUser: User;
+  currentWorkspace: Workspace;
+  exchangeAuthorizationCode: ExchangeAuthCode;
   field: Field;
   fields: FieldConnection;
+  findAvailableRemoteTablesByServerId: Array<RemoteTable>;
+  findManyRemoteServersByType: Array<RemoteServer>;
+  findOneRemoteServerById: RemoteServer;
   findWorkspaceFromInviteHash: Workspace;
+  getProductPrices: ProductPricesEntity;
+  getTimelineCalendarEventsFromCompanyId: TimelineCalendarEventsWithTotal;
+  getTimelineCalendarEventsFromPersonId: TimelineCalendarEventsWithTotal;
+  getTimelineThreadsFromCompanyId: TimelineThreadsWithTotal;
+  getTimelineThreadsFromPersonId: TimelineThreadsWithTotal;
   object: Object;
   objects: ObjectConnection;
   relation: Relation;
@@ -416,6 +608,11 @@ export type Query = {
 };
 
 
+export type QueryBillingPortalSessionArgs = {
+  returnUrlPath?: InputMaybe<Scalars['String']['input']>;
+};
+
+
 export type QueryCheckUserExistsArgs = {
   email: Scalars['String']['input'];
 };
@@ -426,8 +623,15 @@ export type QueryCheckWorkspaceInviteHashIsValidArgs = {
 };
 
 
+export type QueryExchangeAuthorizationCodeArgs = {
+  authorizationCode: Scalars['String']['input'];
+  clientSecret?: InputMaybe<Scalars['String']['input']>;
+  codeVerifier?: InputMaybe<Scalars['String']['input']>;
+};
+
+
 export type QueryFieldArgs = {
-  id: Scalars['ID']['input'];
+  id: Scalars['UUID']['input'];
 };
 
 
@@ -437,13 +641,61 @@ export type QueryFieldsArgs = {
 };
 
 
+export type QueryFindAvailableRemoteTablesByServerIdArgs = {
+  input: RemoteServerIdInput;
+};
+
+
+export type QueryFindManyRemoteServersByTypeArgs = {
+  input: RemoteServerTypeInput;
+};
+
+
+export type QueryFindOneRemoteServerByIdArgs = {
+  input: RemoteServerIdInput;
+};
+
+
 export type QueryFindWorkspaceFromInviteHashArgs = {
   inviteHash: Scalars['String']['input'];
 };
 
 
+export type QueryGetProductPricesArgs = {
+  product: Scalars['String']['input'];
+};
+
+
+export type QueryGetTimelineCalendarEventsFromCompanyIdArgs = {
+  companyId: Scalars['UUID']['input'];
+  page: Scalars['Int']['input'];
+  pageSize: Scalars['Int']['input'];
+};
+
+
+export type QueryGetTimelineCalendarEventsFromPersonIdArgs = {
+  page: Scalars['Int']['input'];
+  pageSize: Scalars['Int']['input'];
+  personId: Scalars['UUID']['input'];
+};
+
+
+export type QueryGetTimelineThreadsFromCompanyIdArgs = {
+  companyId: Scalars['UUID']['input'];
+  page: Scalars['Int']['input'];
+  pageSize: Scalars['Int']['input'];
+};
+
+
+export type QueryGetTimelineThreadsFromPersonIdArgs = {
+  page: Scalars['Int']['input'];
+  pageSize: Scalars['Int']['input'];
+  personId: Scalars['UUID']['input'];
+};
+
+
 export type QueryObjectArgs = {
-  id: Scalars['ID']['input'];
+  id: Scalars['UUID']['input'];
 };
 
 
@@ -454,7 +706,7 @@ export type QueryObjectsArgs = {
 
 
 export type QueryRelationArgs = {
-  id: Scalars['ID']['input'];
+  id: Scalars['UUID']['input'];
 };
 
 
@@ -467,38 +719,37 @@ export type QueryValidatePasswordResetTokenArgs = {
   passwordResetToken: Scalars['String']['input'];
 };
 
-export type RefreshToken = {
-  __typename?: 'RefreshToken';
-  createdAt: Scalars['DateTime']['output'];
-  expiresAt: Scalars['DateTime']['output'];
-  id: Scalars['ID']['output'];
-  updatedAt: Scalars['DateTime']['output'];
-};
-
-export type RefreshTokenEdge = {
-  __typename?: 'RefreshTokenEdge';
-  /** Cursor for this node. */
-  cursor: Scalars['ConnectionCursor']['output'];
-  /** The node containing the RefreshToken */
-  node: RefreshToken;
-};
-
 export type RelationConnection = {
   __typename?: 'RelationConnection';
   /** Array of edges. */
   edges: Array<RelationEdge>;
   /** Paging information */
   pageInfo: PageInfo;
-  /** Fetch total count of records */
-  totalCount: Scalars['Int']['output'];
 };
 
+export type RelationDefinition = {
+  __typename?: 'RelationDefinition';
+  direction: RelationDefinitionType;
+  sourceFieldMetadata: Field;
+  sourceObjectMetadata: Object;
+  targetFieldMetadata: Field;
+  targetObjectMetadata: Object;
+};
+
+/** Relation definition type */
+export enum RelationDefinitionType {
+  ManyToMany = 'MANY_TO_MANY',
+  ManyToOne = 'MANY_TO_ONE',
+  OneToMany = 'ONE_TO_MANY',
+  OneToOne = 'ONE_TO_ONE'
+}
+
 export type RelationDeleteResponse = {
   __typename?: 'RelationDeleteResponse';
   createdAt?: Maybe<Scalars['DateTime']['output']>;
   fromFieldMetadataId?: Maybe<Scalars['String']['output']>;
   fromObjectMetadataId?: Maybe<Scalars['String']['output']>;
-  id?: Maybe<Scalars['ID']['output']>;
+  id?: Maybe<Scalars['UUID']['output']>;
   relationType?: Maybe<RelationMetadataType>;
   toFieldMetadataId?: Maybe<Scalars['String']['output']>;
   toObjectMetadataId?: Maybe<Scalars['String']['output']>;
@@ -512,11 +763,68 @@ export enum RelationMetadataType {
   OneToOne = 'ONE_TO_ONE'
 }
 
+export type RemoteServer = {
+  __typename?: 'RemoteServer';
+  createdAt: Scalars['DateTime']['output'];
+  foreignDataWrapperId: Scalars['ID']['output'];
+  foreignDataWrapperOptions?: Maybe<Scalars['JSON']['output']>;
+  foreignDataWrapperType: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  updatedAt: Scalars['DateTime']['output'];
+};
+
+export type RemoteServerIdInput = {
+  /** The id of the record. */
+  id: Scalars['ID']['input'];
+};
+
+export type RemoteServerTypeInput = {
+  foreignDataWrapperType: Scalars['String']['input'];
+};
+
+export type RemoteTable = {
+  __typename?: 'RemoteTable';
+  name: Scalars['String']['output'];
+  schema: Scalars['String']['output'];
+  status: RemoteTableStatus;
+};
+
+export type RemoteTableInput = {
+  name: Scalars['String']['input'];
+  remoteServerId: Scalars['ID']['input'];
+  schema: Scalars['String']['input'];
+};
+
+/** Status of the table */
+export enum RemoteTableStatus {
+  NotSynced = 'NOT_SYNCED',
+  Synced = 'SYNCED'
+}
+
 export type Sentry = {
   __typename?: 'Sentry';
   dsn?: Maybe<Scalars['String']['output']>;
+  environment?: Maybe<Scalars['String']['output']>;
+  release?: Maybe<Scalars['String']['output']>;
+};
+
+export type SessionEntity = {
+  __typename?: 'SessionEntity';
+  url?: Maybe<Scalars['String']['output']>;
 };
 
+/** Sort Directions */
+export enum SortDirection {
+  Asc = 'ASC',
+  Desc = 'DESC'
+}
+
+/** Sort Nulls Options */
+export enum SortNulls {
+  NullsFirst = 'NULLS_FIRST',
+  NullsLast = 'NULLS_LAST'
+}
+
 export type Support = {
   __typename?: 'Support';
   supportDriver: Scalars['String']['output'];
@@ -529,10 +837,49 @@ export type Telemetry = {
   enabled: Scalars['Boolean']['output'];
 };
 
+export type TimelineCalendarEvent = {
+  __typename?: 'TimelineCalendarEvent';
+  conferenceLink: LinkMetadata;
+  conferenceSolution: Scalars['String']['output'];
+  description: Scalars['String']['output'];
+  endsAt: Scalars['DateTime']['output'];
+  id: Scalars['UUID']['output'];
+  isCanceled: Scalars['Boolean']['output'];
+  isFullDay: Scalars['Boolean']['output'];
+  location: Scalars['String']['output'];
+  participants: Array<TimelineCalendarEventParticipant>;
+  startsAt: Scalars['DateTime']['output'];
+  title: Scalars['String']['output'];
+  visibility: TimelineCalendarEventVisibility;
+};
+
+export type TimelineCalendarEventParticipant = {
+  __typename?: 'TimelineCalendarEventParticipant';
+  avatarUrl: Scalars['String']['output'];
+  displayName: Scalars['String']['output'];
+  firstName: Scalars['String']['output'];
+  handle: Scalars['String']['output'];
+  lastName: Scalars['String']['output'];
+  personId?: Maybe<Scalars['UUID']['output']>;
+  workspaceMemberId?: Maybe<Scalars['UUID']['output']>;
+};
+
+/** Visibility of the calendar event */
+export enum TimelineCalendarEventVisibility {
+  Metadata = 'METADATA',
+  ShareEverything = 'SHARE_EVERYTHING'
+}
+
+export type TimelineCalendarEventsWithTotal = {
+  __typename?: 'TimelineCalendarEventsWithTotal';
+  timelineCalendarEvents: Array<TimelineCalendarEvent>;
+  totalNumberOfCalendarEvents: Scalars['Int']['output'];
+};
+
 export type TimelineThread = {
   __typename?: 'TimelineThread';
   firstParticipant: TimelineThreadParticipant;
-  id: Scalars['ID']['output'];
+  id: Scalars['UUID']['output'];
   lastMessageBody: Scalars['String']['output'];
   lastMessageReceivedAt: Scalars['DateTime']['output'];
   lastTwoParticipants: Array<TimelineThreadParticipant>;
@@ -540,6 +887,7 @@ export type TimelineThread = {
   participantCount: Scalars['Float']['output'];
   read: Scalars['Boolean']['output'];
   subject: Scalars['String']['output'];
+  visibility: Scalars['String']['output'];
 };
 
 export type TimelineThreadParticipant = {
@@ -549,8 +897,14 @@ export type TimelineThreadParticipant = {
   firstName: Scalars['String']['output'];
   handle: Scalars['String']['output'];
   lastName: Scalars['String']['output'];
-  personId?: Maybe<Scalars['ID']['output']>;
-  workspaceMemberId?: Maybe<Scalars['ID']['output']>;
+  personId?: Maybe<Scalars['UUID']['output']>;
+  workspaceMemberId?: Maybe<Scalars['UUID']['output']>;
+};
+
+export type TimelineThreadsWithTotal = {
+  __typename?: 'TimelineThreadsWithTotal';
+  timelineThreads: Array<TimelineThread>;
+  totalNumberOfThreads: Scalars['Int']['output'];
 };
 
 export type TransientToken = {
@@ -558,6 +912,29 @@ export type TransientToken = {
   transientToken: AuthToken;
 };
 
+export type UuidFilterComparison = {
+  eq?: InputMaybe<Scalars['UUID']['input']>;
+  gt?: InputMaybe<Scalars['UUID']['input']>;
+  gte?: InputMaybe<Scalars['UUID']['input']>;
+  iLike?: InputMaybe<Scalars['UUID']['input']>;
+  in?: InputMaybe<Array<Scalars['UUID']['input']>>;
+  is?: InputMaybe<Scalars['Boolean']['input']>;
+  isNot?: InputMaybe<Scalars['Boolean']['input']>;
+  like?: InputMaybe<Scalars['UUID']['input']>;
+  lt?: InputMaybe<Scalars['UUID']['input']>;
+  lte?: InputMaybe<Scalars['UUID']['input']>;
+  neq?: InputMaybe<Scalars['UUID']['input']>;
+  notILike?: InputMaybe<Scalars['UUID']['input']>;
+  notIn?: InputMaybe<Array<Scalars['UUID']['input']>>;
+  notLike?: InputMaybe<Scalars['UUID']['input']>;
+};
+
+export type UpdateBillingEntity = {
+  __typename?: 'UpdateBillingEntity';
+  /** Boolean that confirms query was successful */
+  success: Scalars['Boolean']['output'];
+};
+
 export type UpdateFieldInput = {
   defaultValue?: InputMaybe<Scalars['JSON']['input']>;
   description?: InputMaybe<Scalars['String']['input']>;
@@ -585,36 +962,47 @@ export type UpdateObjectInput = {
 
 export type UpdateOneFieldMetadataInput = {
   /** The id of the record to update */
-  id: Scalars['ID']['input'];
+  id: Scalars['UUID']['input'];
   /** The record to update */
   update: UpdateFieldInput;
 };
 
 export type UpdateOneObjectInput = {
   /** The id of the record to update */
-  id: Scalars['ID']['input'];
+  id: Scalars['UUID']['input'];
   /** The update to apply. */
   update: UpdateObjectInput;
 };
 
+export type UpdateWorkspaceInput = {
+  allowImpersonation?: InputMaybe<Scalars['Boolean']['input']>;
+  displayName?: InputMaybe<Scalars['String']['input']>;
+  domainName?: InputMaybe<Scalars['String']['input']>;
+  inviteHash?: InputMaybe<Scalars['String']['input']>;
+  logo?: InputMaybe<Scalars['String']['input']>;
+};
+
 export type User = {
   __typename?: 'User';
   canImpersonate: Scalars['Boolean']['output'];
   createdAt: Scalars['DateTime']['output'];
+  defaultAvatarUrl?: Maybe<Scalars['String']['output']>;
   defaultWorkspace: Workspace;
+  defaultWorkspaceId: Scalars['String']['output'];
   deletedAt?: Maybe<Scalars['DateTime']['output']>;
   disabled?: Maybe<Scalars['Boolean']['output']>;
   email: Scalars['String']['output'];
   emailVerified: Scalars['Boolean']['output'];
   firstName: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
+  id: Scalars['UUID']['output'];
   lastName: Scalars['String']['output'];
   passwordHash?: Maybe<Scalars['String']['output']>;
   passwordResetToken?: Maybe<Scalars['String']['output']>;
   passwordResetTokenExpiresAt?: Maybe<Scalars['DateTime']['output']>;
   supportUserHash?: Maybe<Scalars['String']['output']>;
   updatedAt: Scalars['DateTime']['output'];
-  workspaceMember: WorkspaceMember;
+  workspaceMember?: Maybe<WorkspaceMember>;
+  workspaces: Array<UserWorkspace>;
 };
 
 export type UserEdge = {
@@ -630,6 +1018,18 @@ export type UserExists = {
   exists: Scalars['Boolean']['output'];
 };
 
+export type UserWorkspace = {
+  __typename?: 'UserWorkspace';
+  createdAt: Scalars['DateTime']['output'];
+  deletedAt?: Maybe<Scalars['DateTime']['output']>;
+  id: Scalars['UUID']['output'];
+  updatedAt: Scalars['DateTime']['output'];
+  user: User;
+  userId: Scalars['String']['output'];
+  workspace?: Maybe<Workspace>;
+  workspaceId: Scalars['String']['output'];
+};
+
 export type ValidatePasswordResetToken = {
   __typename?: 'ValidatePasswordResetToken';
   email: Scalars['String']['output'];
@@ -644,18 +1044,35 @@ export type Verify = {
 
 export type Workspace = {
   __typename?: 'Workspace';
+  activationStatus: Scalars['String']['output'];
   allowImpersonation: Scalars['Boolean']['output'];
+  billingSubscriptions?: Maybe<Array<BillingSubscription>>;
   createdAt: Scalars['DateTime']['output'];
+  currentBillingSubscription?: Maybe<BillingSubscription>;
+  currentCacheVersion?: Maybe<Scalars['String']['output']>;
   deletedAt?: Maybe<Scalars['DateTime']['output']>;
   displayName?: Maybe<Scalars['String']['output']>;
   domainName?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
+  featureFlags?: Maybe<Array<FeatureFlag>>;
+  id: Scalars['UUID']['output'];
   inviteHash?: Maybe<Scalars['String']['output']>;
   logo?: Maybe<Scalars['String']['output']>;
   subscriptionStatus: Scalars['String']['output'];
   updatedAt: Scalars['DateTime']['output'];
 };
 
+
+export type WorkspaceBillingSubscriptionsArgs = {
+  filter?: BillingSubscriptionFilter;
+  sorting?: Array<BillingSubscriptionSort>;
+};
+
+
+export type WorkspaceFeatureFlagsArgs = {
+  filter?: FeatureFlagFilter;
+  sorting?: Array<FeatureFlagSort>;
+};
+
 export type WorkspaceEdge = {
   __typename?: 'WorkspaceEdge';
   /** Cursor for this node. */
@@ -673,7 +1090,7 @@ export type WorkspaceMember = {
   __typename?: 'WorkspaceMember';
   avatarUrl?: Maybe<Scalars['String']['output']>;
   colorScheme: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
+  id: Scalars['UUID']['output'];
   locale: Scalars['String']['output'];
   name: FullName;
 };
@@ -685,7 +1102,7 @@ export type Field = {
   description?: Maybe<Scalars['String']['output']>;
   fromRelationMetadata?: Maybe<Relation>;
   icon?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
+  id: Scalars['UUID']['output'];
   isActive?: Maybe<Scalars['Boolean']['output']>;
   isCustom?: Maybe<Scalars['Boolean']['output']>;
   isNullable?: Maybe<Scalars['Boolean']['output']>;
@@ -693,6 +1110,7 @@ export type Field = {
   label: Scalars['String']['output'];
   name: Scalars['String']['output'];
   options?: Maybe<Scalars['JSON']['output']>;
+  relationDefinition?: Maybe<RelationDefinition>;
   toRelationMetadata?: Maybe<Relation>;
   type: FieldMetadataType;
   updatedAt: Scalars['DateTime']['output'];
@@ -708,7 +1126,7 @@ export type FieldEdge = {
 
 export type FieldFilter = {
   and?: InputMaybe<Array<FieldFilter>>;
-  id?: InputMaybe<IdFilterComparison>;
+  id?: InputMaybe<UuidFilterComparison>;
   isActive?: InputMaybe<BooleanFieldComparison>;
   isCustom?: InputMaybe<BooleanFieldComparison>;
   isSystem?: InputMaybe<BooleanFieldComparison>;
@@ -722,10 +1140,11 @@ export type Object = {
   description?: Maybe<Scalars['String']['output']>;
   fields: ObjectFieldsConnection;
   icon?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
+  id: Scalars['UUID']['output'];
   imageIdentifierFieldMetadataId?: Maybe<Scalars['String']['output']>;
   isActive: Scalars['Boolean']['output'];
   isCustom: Scalars['Boolean']['output'];
+  isRemote: Scalars['Boolean']['output'];
   isSystem: Scalars['Boolean']['output'];
   labelIdentifierFieldMetadataId?: Maybe<Scalars['String']['output']>;
   labelPlural: Scalars['String']['output'];
@@ -751,9 +1170,10 @@ export type ObjectEdge = {
 
 export type ObjectFilter = {
   and?: InputMaybe<Array<ObjectFilter>>;
-  id?: InputMaybe<IdFilterComparison>;
+  id?: InputMaybe<UuidFilterComparison>;
   isActive?: InputMaybe<BooleanFieldComparison>;
   isCustom?: InputMaybe<BooleanFieldComparison>;
+  isRemote?: InputMaybe<BooleanFieldComparison>;
   isSystem?: InputMaybe<BooleanFieldComparison>;
   or?: InputMaybe<Array<ObjectFilter>>;
 };
@@ -764,7 +1184,7 @@ export type Relation = {
   fromFieldMetadataId: Scalars['String']['output'];
   fromObjectMetadata: Object;
   fromObjectMetadataId: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
+  id: Scalars['UUID']['output'];
   relationType: RelationMetadataType;
   toFieldMetadataId: Scalars['String']['output'];
   toObjectMetadata: Object;
@@ -780,56 +1200,109 @@ export type RelationEdge = {
   node: Relation;
 };
 
+export type RemoteServerFieldsFragment = { __typename?: 'RemoteServer', id: string, createdAt: any, foreignDataWrapperId: string, foreignDataWrapperOptions?: any | null, foreignDataWrapperType: string, updatedAt: any };
+
+export type RemoteTableFieldsFragment = { __typename?: 'RemoteTable', name: string, schema: string, status: RemoteTableStatus };
+
+export type CreateServerMutationVariables = Exact<{
+  input: CreateRemoteServerInput;
+}>;
+
+
+export type CreateServerMutation = { __typename?: 'Mutation', createOneRemoteServer: { __typename?: 'RemoteServer', id: string, createdAt: any, foreignDataWrapperId: string, foreignDataWrapperOptions?: any | null, foreignDataWrapperType: string, updatedAt: any } };
+
+export type DeleteServerMutationVariables = Exact<{
+  input: RemoteServerIdInput;
+}>;
+
+
+export type DeleteServerMutation = { __typename?: 'Mutation', deleteOneRemoteServer: { __typename?: 'RemoteServer', id: string } };
+
+export type SyncRemoteTableMutationVariables = Exact<{
+  input: RemoteTableInput;
+}>;
+
+
+export type SyncRemoteTableMutation = { __typename?: 'Mutation', syncRemoteTable: { __typename?: 'RemoteTable', name: string, schema: string, status: RemoteTableStatus } };
+
+export type UnsyncRemoteTableMutationVariables = Exact<{
+  input: RemoteTableInput;
+}>;
+
+
+export type UnsyncRemoteTableMutation = { __typename?: 'Mutation', unsyncRemoteTable: { __typename?: 'RemoteTable', name: string, schema: string, status: RemoteTableStatus } };
+
+export type GetManyDatabaseConnectionsQueryVariables = Exact<{
+  input: RemoteServerTypeInput;
+}>;
+
+
+export type GetManyDatabaseConnectionsQuery = { __typename?: 'Query', findManyRemoteServersByType: Array<{ __typename?: 'RemoteServer', id: string, createdAt: any, foreignDataWrapperId: string, foreignDataWrapperOptions?: any | null, foreignDataWrapperType: string, updatedAt: any }> };
+
+export type GetManyRemoteTablesQueryVariables = Exact<{
+  input: RemoteServerIdInput;
+}>;
+
+
+export type GetManyRemoteTablesQuery = { __typename?: 'Query', findAvailableRemoteTablesByServerId: Array<{ __typename?: 'RemoteTable', name: string, schema: string, status: RemoteTableStatus }> };
+
+export type GetOneDatabaseConnectionQueryVariables = Exact<{
+  input: RemoteServerIdInput;
+}>;
+
+
+export type GetOneDatabaseConnectionQuery = { __typename?: 'Query', findOneRemoteServerById: { __typename?: 'RemoteServer', id: string, createdAt: any, foreignDataWrapperId: string, foreignDataWrapperOptions?: any | null, foreignDataWrapperType: string, updatedAt: any } };
+
 export type CreateOneObjectMetadataItemMutationVariables = Exact<{
   input: CreateOneObjectInput;
 }>;
 
 
-export type CreateOneObjectMetadataItemMutation = { __typename?: 'Mutation', createOneObject: { __typename?: 'object', id: string, dataSourceId: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isActive: boolean, createdAt: any, updatedAt: any, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null } };
+export type CreateOneObjectMetadataItemMutation = { __typename?: 'Mutation', createOneObject: { __typename?: 'object', id: any, dataSourceId: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isActive: boolean, createdAt: any, updatedAt: any, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null } };
 
 export type CreateOneFieldMetadataItemMutationVariables = Exact<{
   input: CreateOneFieldMetadataInput;
 }>;
 
 
-export type CreateOneFieldMetadataItemMutation = { __typename?: 'Mutation', createOneField: { __typename?: 'field', id: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isNullable?: boolean | null, createdAt: any, updatedAt: any, defaultValue?: any | null, options?: any | null } };
+export type CreateOneFieldMetadataItemMutation = { __typename?: 'Mutation', createOneField: { __typename?: 'field', id: any, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isNullable?: boolean | null, createdAt: any, updatedAt: any, defaultValue?: any | null, options?: any | null } };
 
 export type CreateOneRelationMetadataMutationVariables = Exact<{
   input: CreateOneRelationInput;
 }>;
 
 
-export type CreateOneRelationMetadataMutation = { __typename?: 'Mutation', createOneRelation: { __typename?: 'relation', id: string, relationType: RelationMetadataType, fromObjectMetadataId: string, toObjectMetadataId: string, fromFieldMetadataId: string, toFieldMetadataId: string, createdAt: any, updatedAt: any } };
+export type CreateOneRelationMetadataMutation = { __typename?: 'Mutation', createOneRelation: { __typename?: 'relation', id: any, relationType: RelationMetadataType, fromObjectMetadataId: string, toObjectMetadataId: string, fromFieldMetadataId: string, toFieldMetadataId: string, createdAt: any, updatedAt: any } };
 
 export type UpdateOneFieldMetadataItemMutationVariables = Exact<{
-  idToUpdate: Scalars['ID']['input'];
+  idToUpdate: Scalars['UUID']['input'];
   updatePayload: UpdateFieldInput;
 }>;
 
 
-export type UpdateOneFieldMetadataItemMutation = { __typename?: 'Mutation', updateOneField: { __typename?: 'field', id: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isNullable?: boolean | null, createdAt: any, updatedAt: any } };
+export type UpdateOneFieldMetadataItemMutation = { __typename?: 'Mutation', updateOneField: { __typename?: 'field', id: any, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isNullable?: boolean | null, createdAt: any, updatedAt: any } };
 
 export type UpdateOneObjectMetadataItemMutationVariables = Exact<{
-  idToUpdate: Scalars['ID']['input'];
+  idToUpdate: Scalars['UUID']['input'];
   updatePayload: UpdateObjectInput;
 }>;
 
 
-export type UpdateOneObjectMetadataItemMutation = { __typename?: 'Mutation', updateOneObject: { __typename?: 'object', id: string, dataSourceId: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isActive: boolean, createdAt: any, updatedAt: any, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null } };
+export type UpdateOneObjectMetadataItemMutation = { __typename?: 'Mutation', updateOneObject: { __typename?: 'object', id: any, dataSourceId: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isActive: boolean, createdAt: any, updatedAt: any, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null } };
 
 export type DeleteOneObjectMetadataItemMutationVariables = Exact<{
-  idToDelete: Scalars['ID']['input'];
+  idToDelete: Scalars['UUID']['input'];
 }>;
 
 
-export type DeleteOneObjectMetadataItemMutation = { __typename?: 'Mutation', deleteOneObject: { __typename?: 'object', id: string, dataSourceId: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isActive: boolean, createdAt: any, updatedAt: any, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null } };
+export type DeleteOneObjectMetadataItemMutation = { __typename?: 'Mutation', deleteOneObject: { __typename?: 'object', id: any, dataSourceId: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isActive: boolean, createdAt: any, updatedAt: any, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null } };
 
 export type DeleteOneFieldMetadataItemMutationVariables = Exact<{
-  idToDelete: Scalars['ID']['input'];
+  idToDelete: Scalars['UUID']['input'];
 }>;
 
 
-export type DeleteOneFieldMetadataItemMutation = { __typename?: 'Mutation', deleteOneField: { __typename?: 'FieldDeleteResponse', id?: string | null, type?: FieldMetadataType | null, name?: string | null, label?: string | null, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isNullable?: boolean | null, createdAt?: any | null, updatedAt?: any | null } };
+export type DeleteOneFieldMetadataItemMutation = { __typename?: 'Mutation', deleteOneField: { __typename?: 'field', id: any, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isNullable?: boolean | null, createdAt: any, updatedAt: any } };
 
 export type ObjectMetadataItemsQueryVariables = Exact<{
   objectFilter?: InputMaybe<ObjectFilter>;
@@ -837,14 +1310,22 @@ export type ObjectMetadataItemsQueryVariables = Exact<{
 }>;
 
 
-export type ObjectMetadataItemsQuery = { __typename?: 'Query', objects: { __typename?: 'ObjectConnection', totalCount: number, edges: Array<{ __typename?: 'objectEdge', node: { __typename?: 'object', id: string, dataSourceId: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isActive: boolean, isSystem: boolean, createdAt: any, updatedAt: any, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, fields: { __typename?: 'ObjectFieldsConnection', totalCount: number, edges: Array<{ __typename?: 'fieldEdge', node: { __typename?: 'field', id: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isNullable?: boolean | null, createdAt: any, updatedAt: any, defaultValue?: any | null, options?: any | null, fromRelationMetadata?: { __typename?: 'relation', id: string, relationType: RelationMetadataType, toFieldMetadataId: string, toObjectMetadata: { __typename?: 'object', id: string, dataSourceId: string, nameSingular: string, namePlural: string, isSystem: boolean } } | null, toRelationMetadata?: { __typename?: 'relation', id: string, relationType: RelationMetadataType, fromFieldMetadataId: string, fromObjectMetadata: { __typename?: 'object', id: string, dataSourceId: string, nameSingular: string, namePlural: string, isSystem: boolean } } | null } }>, pageInfo: { __typename?: 'PageInfo', hasNextPage?: boolean | null, hasPreviousPage?: boolean | null, startCursor?: any | null, endCursor?: any | null } } } }>, pageInfo: { __typename?: 'PageInfo', hasNextPage?: boolean | null, hasPreviousPage?: boolean | null, startCursor?: any | null, endCursor?: any | null } } };
-
+export type ObjectMetadataItemsQuery = { __typename?: 'Query', objects: { __typename?: 'ObjectConnection', edges: Array<{ __typename?: 'objectEdge', node: { __typename?: 'object', id: any, dataSourceId: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, createdAt: any, updatedAt: any, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, fields: { __typename?: 'ObjectFieldsConnection', edges: Array<{ __typename?: 'fieldEdge', node: { __typename?: 'field', id: any, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isNullable?: boolean | null, createdAt: any, updatedAt: any, defaultValue?: any | null, options?: any | null, fromRelationMetadata?: { __typename?: 'relation', id: any, relationType: RelationMetadataType, toFieldMetadataId: string, toObjectMetadata: { __typename?: 'object', id: any, dataSourceId: string, nameSingular: string, namePlural: string, isSystem: boolean } } | null, toRelationMetadata?: { __typename?: 'relation', id: any, relationType: RelationMetadataType, fromFieldMetadataId: string, fromObjectMetadata: { __typename?: 'object', id: any, dataSourceId: string, nameSingular: string, namePlural: string, isSystem: boolean } } | null, relationDefinition?: { __typename?: 'RelationDefinition', direction: RelationDefinitionType, sourceObjectMetadata: { __typename?: 'object', id: any, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'field', id: any, name: string }, targetObjectMetadata: { __typename?: 'object', id: any, nameSingular: string, namePlural: string }, targetFieldMetadata: { __typename?: 'field', id: any, name: string } } | null } }>, pageInfo: { __typename?: 'PageInfo', hasNextPage?: boolean | null, hasPreviousPage?: boolean | null, startCursor?: any | null, endCursor?: any | null } } } }>, pageInfo: { __typename?: 'PageInfo', hasNextPage?: boolean | null, hasPreviousPage?: boolean | null, startCursor?: any | null, endCursor?: any | null } } };
 
+export const RemoteServerFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"RemoteServerFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteServer"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperId"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperOptions"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperType"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<RemoteServerFieldsFragment, unknown>;
+export const RemoteTableFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"RemoteTableFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteTable"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"schema"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}}]} as unknown as DocumentNode<RemoteTableFieldsFragment, unknown>;
+export const CreateServerDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"createServer"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateRemoteServerInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createOneRemoteServer"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"RemoteServerFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"RemoteServerFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteServer"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperId"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperOptions"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperType"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<CreateServerMutation, CreateServerMutationVariables>;
+export const DeleteServerDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"deleteServer"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteServerIdInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteOneRemoteServer"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]} as unknown as DocumentNode<DeleteServerMutation, DeleteServerMutationVariables>;
+export const SyncRemoteTableDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"syncRemoteTable"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteTableInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"syncRemoteTable"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"RemoteTableFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"RemoteTableFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteTable"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"schema"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}}]} as unknown as DocumentNode<SyncRemoteTableMutation, SyncRemoteTableMutationVariables>;
+export const UnsyncRemoteTableDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"unsyncRemoteTable"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteTableInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unsyncRemoteTable"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"RemoteTableFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"RemoteTableFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteTable"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"schema"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}}]} as unknown as DocumentNode<UnsyncRemoteTableMutation, UnsyncRemoteTableMutationVariables>;
+export const GetManyDatabaseConnectionsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetManyDatabaseConnections"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteServerTypeInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findManyRemoteServersByType"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"RemoteServerFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"RemoteServerFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteServer"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperId"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperOptions"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperType"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<GetManyDatabaseConnectionsQuery, GetManyDatabaseConnectionsQueryVariables>;
+export const GetManyRemoteTablesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetManyRemoteTables"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteServerIdInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findAvailableRemoteTablesByServerId"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"RemoteTableFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"RemoteTableFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteTable"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"schema"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}}]} as unknown as DocumentNode<GetManyRemoteTablesQuery, GetManyRemoteTablesQueryVariables>;
+export const GetOneDatabaseConnectionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetOneDatabaseConnection"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteServerIdInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findOneRemoteServerById"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"RemoteServerFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"RemoteServerFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteServer"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperId"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperOptions"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperType"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<GetOneDatabaseConnectionQuery, GetOneDatabaseConnectionQueryVariables>;
 export const CreateOneObjectMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateOneObjectMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateOneObjectInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createOneObject"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"labelSingular"}},{"kind":"Field","name":{"kind":"Name","value":"labelPlural"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"labelIdentifierFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"imageIdentifierFieldMetadataId"}}]}}]}}]} as unknown as DocumentNode<CreateOneObjectMetadataItemMutation, CreateOneObjectMetadataItemMutationVariables>;
 export const CreateOneFieldMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateOneFieldMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateOneFieldMetadataInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createOneField"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"defaultValue"}},{"kind":"Field","name":{"kind":"Name","value":"options"}}]}}]}}]} as unknown as DocumentNode<CreateOneFieldMetadataItemMutation, CreateOneFieldMetadataItemMutationVariables>;
 export const CreateOneRelationMetadataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateOneRelationMetadata"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateOneRelationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createOneRelation"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"relationType"}},{"kind":"Field","name":{"kind":"Name","value":"fromObjectMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"toObjectMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"fromFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"toFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<CreateOneRelationMetadataMutation, CreateOneRelationMetadataMutationVariables>;
-export const UpdateOneFieldMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateOneFieldMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToUpdate"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"updatePayload"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateFieldInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateOneField"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToUpdate"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"update"},"value":{"kind":"Variable","name":{"kind":"Name","value":"updatePayload"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<UpdateOneFieldMetadataItemMutation, UpdateOneFieldMetadataItemMutationVariables>;
-export const UpdateOneObjectMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateOneObjectMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToUpdate"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"updatePayload"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateObjectInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateOneObject"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToUpdate"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"update"},"value":{"kind":"Variable","name":{"kind":"Name","value":"updatePayload"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"labelSingular"}},{"kind":"Field","name":{"kind":"Name","value":"labelPlural"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"labelIdentifierFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"imageIdentifierFieldMetadataId"}}]}}]}}]} as unknown as DocumentNode<UpdateOneObjectMetadataItemMutation, UpdateOneObjectMetadataItemMutationVariables>;
-export const DeleteOneObjectMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteOneObjectMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteOneObject"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"labelSingular"}},{"kind":"Field","name":{"kind":"Name","value":"labelPlural"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"labelIdentifierFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"imageIdentifierFieldMetadataId"}}]}}]}}]} as unknown as DocumentNode<DeleteOneObjectMetadataItemMutation, DeleteOneObjectMetadataItemMutationVariables>;
-export const DeleteOneFieldMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteOneFieldMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteOneField"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<DeleteOneFieldMetadataItemMutation, DeleteOneFieldMetadataItemMutationVariables>;
-export const ObjectMetadataItemsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ObjectMetadataItems"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"objectFilter"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"objectFilter"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"fieldFilter"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"fieldFilter"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"objects"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"paging"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1000"}}]}},{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"Variable","name":{"kind":"Name","value":"objectFilter"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"labelSingular"}},{"kind":"Field","name":{"kind":"Name","value":"labelPlural"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isSystem"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"labelIdentifierFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"imageIdentifierFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"fields"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"paging"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1000"}}]}},{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"Variable","name":{"kind":"Name","value":"fieldFilter"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isSystem"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"fromRelationMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"relationType"}},{"kind":"Field","name":{"kind":"Name","value":"toObjectMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"isSystem"}}]}},{"kind":"Field","name":{"kind":"Name","value":"toFieldMetadataId"}}]}},{"kind":"Field","name":{"kind":"Name","value":"toRelationMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"relationType"}},{"kind":"Field","name":{"kind":"Name","value":"fromObjectMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"isSystem"}}]}},{"kind":"Field","name":{"kind":"Name","value":"fromFieldMetadataId"}}]}},{"kind":"Field","name":{"kind":"Name","value":"defaultValue"}},{"kind":"Field","name":{"kind":"Name","value":"options"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}},{"kind":"Field","name":{"kind":"Name","value":"hasPreviousPage"}},{"kind":"Field","name":{"kind":"Name","value":"startCursor"}},{"kind":"Field","name":{"kind":"Name","value":"endCursor"}}]}},{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}},{"kind":"Field","name":{"kind":"Name","value":"hasPreviousPage"}},{"kind":"Field","name":{"kind":"Name","value":"startCursor"}},{"kind":"Field","name":{"kind":"Name","value":"endCursor"}}]}},{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}}]}}]} as unknown as DocumentNode<ObjectMetadataItemsQuery, ObjectMetadataItemsQueryVariables>;
\ No newline at end of file
+export const UpdateOneFieldMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateOneFieldMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToUpdate"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"updatePayload"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateFieldInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateOneField"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToUpdate"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"update"},"value":{"kind":"Variable","name":{"kind":"Name","value":"updatePayload"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<UpdateOneFieldMetadataItemMutation, UpdateOneFieldMetadataItemMutationVariables>;
+export const UpdateOneObjectMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateOneObjectMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToUpdate"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"updatePayload"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateObjectInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateOneObject"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToUpdate"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"update"},"value":{"kind":"Variable","name":{"kind":"Name","value":"updatePayload"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"labelSingular"}},{"kind":"Field","name":{"kind":"Name","value":"labelPlural"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"labelIdentifierFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"imageIdentifierFieldMetadataId"}}]}}]}}]} as unknown as DocumentNode<UpdateOneObjectMetadataItemMutation, UpdateOneObjectMetadataItemMutationVariables>;
+export const DeleteOneObjectMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteOneObjectMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteOneObject"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"labelSingular"}},{"kind":"Field","name":{"kind":"Name","value":"labelPlural"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"labelIdentifierFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"imageIdentifierFieldMetadataId"}}]}}]}}]} as unknown as DocumentNode<DeleteOneObjectMetadataItemMutation, DeleteOneObjectMetadataItemMutationVariables>;
+export const DeleteOneFieldMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteOneFieldMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteOneField"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<DeleteOneFieldMetadataItemMutation, DeleteOneFieldMetadataItemMutationVariables>;
+export const ObjectMetadataItemsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ObjectMetadataItems"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"objectFilter"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"objectFilter"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"fieldFilter"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"fieldFilter"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"objects"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"paging"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1000"}}]}},{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"Variable","name":{"kind":"Name","value":"objectFilter"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"labelSingular"}},{"kind":"Field","name":{"kind":"Name","value":"labelPlural"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isRemote"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isSystem"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"labelIdentifierFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"imageIdentifierFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"fields"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"paging"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1000"}}]}},{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"Variable","name":{"kind":"Name","value":"fieldFilter"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isSystem"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"fromRelationMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"relationType"}},{"kind":"Field","name":{"kind":"Name","value":"toObjectMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"isSystem"}}]}},{"kind":"Field","name":{"kind":"Name","value":"toFieldMetadataId"}}]}},{"kind":"Field","name":{"kind":"Name","value":"toRelationMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"relationType"}},{"kind":"Field","name":{"kind":"Name","value":"fromObjectMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"isSystem"}}]}},{"kind":"Field","name":{"kind":"Name","value":"fromFieldMetadataId"}}]}},{"kind":"Field","name":{"kind":"Name","value":"defaultValue"}},{"kind":"Field","name":{"kind":"Name","value":"options"}},{"kind":"Field","name":{"kind":"Name","value":"relationDefinition"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"direction"}},{"kind":"Field","name":{"kind":"Name","value":"sourceObjectMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}}]}},{"kind":"Field","name":{"kind":"Name","value":"sourceFieldMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"targetObjectMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}}]}},{"kind":"Field","name":{"kind":"Name","value":"targetFieldMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}},{"kind":"Field","name":{"kind":"Name","value":"hasPreviousPage"}},{"kind":"Field","name":{"kind":"Name","value":"startCursor"}},{"kind":"Field","name":{"kind":"Name","value":"endCursor"}}]}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}},{"kind":"Field","name":{"kind":"Name","value":"hasPreviousPage"}},{"kind":"Field","name":{"kind":"Name","value":"startCursor"}},{"kind":"Field","name":{"kind":"Name","value":"endCursor"}}]}}]}}]}}]} as unknown as DocumentNode<ObjectMetadataItemsQuery, ObjectMetadataItemsQueryVariables>;
\ No newline at end of file
diff --git a/packages/twenty-front/src/generated/graphql.tsx b/packages/twenty-front/src/generated/graphql.tsx
index 2e092eaa2b8b..7b68aa5ef145 100644
--- a/packages/twenty-front/src/generated/graphql.tsx
+++ b/packages/twenty-front/src/generated/graphql.tsx
@@ -16,6 +16,7 @@ export type Scalars = {
   ConnectionCursor: any;
   DateTime: string;
   JSON: any;
+  UUID: any;
   Upload: any;
 };
 
@@ -34,6 +35,23 @@ export type ApiKeyToken = {
   token: Scalars['String'];
 };
 
+export type AppToken = {
+  __typename?: 'AppToken';
+  createdAt: Scalars['DateTime'];
+  expiresAt: Scalars['DateTime'];
+  id: Scalars['UUID'];
+  type: Scalars['String'];
+  updatedAt: Scalars['DateTime'];
+};
+
+export type AppTokenEdge = {
+  __typename?: 'AppTokenEdge';
+  /** Cursor for this node. */
+  cursor: Scalars['ConnectionCursor'];
+  /** The node containing the AppToken */
+  node: AppToken;
+};
+
 export type AuthProviders = {
   __typename?: 'AuthProviders';
   google: Scalars['Boolean'];
@@ -58,23 +76,46 @@ export type AuthTokens = {
   tokens: AuthTokenPair;
 };
 
+export type AuthorizeApp = {
+  __typename?: 'AuthorizeApp';
+  redirectUrl: Scalars['String'];
+};
+
 export type Billing = {
   __typename?: 'Billing';
   billingFreeTrialDurationInDays?: Maybe<Scalars['Float']>;
-  billingUrl: Scalars['String'];
+  billingUrl?: Maybe<Scalars['String']>;
   isBillingEnabled: Scalars['Boolean'];
 };
 
+export type BillingSubscription = {
+  __typename?: 'BillingSubscription';
+  id: Scalars['UUID'];
+  interval?: Maybe<Scalars['String']>;
+  status: Scalars['String'];
+};
+
+export type BillingSubscriptionFilter = {
+  and?: InputMaybe<Array<BillingSubscriptionFilter>>;
+  id?: InputMaybe<UuidFilterComparison>;
+  or?: InputMaybe<Array<BillingSubscriptionFilter>>;
+};
+
+export type BillingSubscriptionSort = {
+  direction: SortDirection;
+  field: BillingSubscriptionSortFields;
+  nulls?: InputMaybe<SortNulls>;
+};
+
+export enum BillingSubscriptionSortFields {
+  Id = 'id'
+}
+
 export type BooleanFieldComparison = {
   is?: InputMaybe<Scalars['Boolean']>;
   isNot?: InputMaybe<Scalars['Boolean']>;
 };
 
-export type CheckoutEntity = {
-  __typename?: 'CheckoutEntity';
-  url: Scalars['String'];
-};
-
 export type ClientConfig = {
   __typename?: 'ClientConfig';
   authProviders: AuthProviders;
@@ -100,7 +141,7 @@ export type CursorPaging = {
 
 export type DeleteOneObjectInput = {
   /** The id of the record to delete. */
-  id: Scalars['ID'];
+  id: Scalars['UUID'];
 };
 
 export type EmailPasswordResetLink = {
@@ -109,9 +150,16 @@ export type EmailPasswordResetLink = {
   success: Scalars['Boolean'];
 };
 
+export type ExchangeAuthCode = {
+  __typename?: 'ExchangeAuthCode';
+  accessToken: AuthToken;
+  loginToken: AuthToken;
+  refreshToken: AuthToken;
+};
+
 export type FeatureFlag = {
   __typename?: 'FeatureFlag';
-  id: Scalars['ID'];
+  id: Scalars['UUID'];
   key: Scalars['String'];
   value: Scalars['Boolean'];
   workspaceId: Scalars['String'];
@@ -119,7 +167,7 @@ export type FeatureFlag = {
 
 export type FeatureFlagFilter = {
   and?: InputMaybe<Array<FeatureFlagFilter>>;
-  id?: InputMaybe<IdFilterComparison>;
+  id?: InputMaybe<UuidFilterComparison>;
   or?: InputMaybe<Array<FeatureFlagFilter>>;
 };
 
@@ -139,32 +187,14 @@ export type FieldConnection = {
   edges: Array<FieldEdge>;
   /** Paging information */
   pageInfo: PageInfo;
-  /** Fetch total count of records */
-  totalCount: Scalars['Int'];
-};
-
-export type FieldDeleteResponse = {
-  __typename?: 'FieldDeleteResponse';
-  createdAt?: Maybe<Scalars['DateTime']>;
-  defaultValue?: Maybe<Scalars['JSON']>;
-  description?: Maybe<Scalars['String']>;
-  icon?: Maybe<Scalars['String']>;
-  id?: Maybe<Scalars['ID']>;
-  isActive?: Maybe<Scalars['Boolean']>;
-  isCustom?: Maybe<Scalars['Boolean']>;
-  isNullable?: Maybe<Scalars['Boolean']>;
-  isSystem?: Maybe<Scalars['Boolean']>;
-  label?: Maybe<Scalars['String']>;
-  name?: Maybe<Scalars['String']>;
-  options?: Maybe<Scalars['JSON']>;
-  type?: Maybe<FieldMetadataType>;
-  updatedAt?: Maybe<Scalars['DateTime']>;
 };
 
 /** Type of the field */
 export enum FieldMetadataType {
+  Address = 'ADDRESS',
   Boolean = 'BOOLEAN',
   Currency = 'CURRENCY',
+  Date = 'DATE',
   DateTime = 'DATE_TIME',
   Email = 'EMAIL',
   FullName = 'FULL_NAME',
@@ -173,8 +203,10 @@ export enum FieldMetadataType {
   Number = 'NUMBER',
   Numeric = 'NUMERIC',
   Phone = 'PHONE',
+  Position = 'POSITION',
   Probability = 'PROBABILITY',
   Rating = 'RATING',
+  RawJson = 'RAW_JSON',
   Relation = 'RELATION',
   Select = 'SELECT',
   Text = 'TEXT',
@@ -194,29 +226,18 @@ export type FullName = {
   lastName: Scalars['String'];
 };
 
-export type IdFilterComparison = {
-  eq?: InputMaybe<Scalars['ID']>;
-  gt?: InputMaybe<Scalars['ID']>;
-  gte?: InputMaybe<Scalars['ID']>;
-  iLike?: InputMaybe<Scalars['ID']>;
-  in?: InputMaybe<Array<Scalars['ID']>>;
-  is?: InputMaybe<Scalars['Boolean']>;
-  isNot?: InputMaybe<Scalars['Boolean']>;
-  like?: InputMaybe<Scalars['ID']>;
-  lt?: InputMaybe<Scalars['ID']>;
-  lte?: InputMaybe<Scalars['ID']>;
-  neq?: InputMaybe<Scalars['ID']>;
-  notILike?: InputMaybe<Scalars['ID']>;
-  notIn?: InputMaybe<Array<Scalars['ID']>>;
-  notLike?: InputMaybe<Scalars['ID']>;
-};
-
 export type InvalidatePassword = {
   __typename?: 'InvalidatePassword';
   /** Boolean that confirms query was dispatched */
   success: Scalars['Boolean'];
 };
 
+export type LinkMetadata = {
+  __typename?: 'LinkMetadata';
+  label: Scalars['String'];
+  url: Scalars['String'];
+};
+
 export type LoginToken = {
   __typename?: 'LoginToken';
   loginToken: AuthToken;
@@ -225,20 +246,23 @@ export type LoginToken = {
 export type Mutation = {
   __typename?: 'Mutation';
   activateWorkspace: Workspace;
+  authorizeApp: AuthorizeApp;
   challenge: LoginToken;
-  checkout: CheckoutEntity;
-  createEvent: Analytics;
+  checkoutSession: SessionEntity;
+  createOneAppToken: AppToken;
   createOneObject: Object;
-  createOneRefreshToken: RefreshToken;
   deleteCurrentWorkspace: Workspace;
   deleteOneObject: Object;
   deleteUser: User;
   emailPasswordResetLink: EmailPasswordResetLink;
   generateApiKeyToken: ApiKeyToken;
+  generateJWT: AuthTokens;
   generateTransientToken: TransientToken;
   impersonate: Verify;
   renewToken: AuthTokens;
   signUp: LoginToken;
+  track: Analytics;
+  updateBillingSubscription: UpdateBillingEntity;
   updateOneObject: Object;
   updatePasswordViaResetToken: InvalidatePassword;
   updateWorkspace: Workspace;
@@ -255,24 +279,25 @@ export type MutationActivateWorkspaceArgs = {
 };
 
 
+export type MutationAuthorizeAppArgs = {
+  clientId: Scalars['String'];
+  codeChallenge?: InputMaybe<Scalars['String']>;
+  redirectUrl?: InputMaybe<Scalars['String']>;
+};
+
+
 export type MutationChallengeArgs = {
   email: Scalars['String'];
   password: Scalars['String'];
 };
 
 
-export type MutationCheckoutArgs = {
+export type MutationCheckoutSessionArgs = {
   recurringInterval: Scalars['String'];
   successUrlPath?: InputMaybe<Scalars['String']>;
 };
 
 
-export type MutationCreateEventArgs = {
-  data: Scalars['JSON'];
-  type: Scalars['String'];
-};
-
-
 export type MutationDeleteOneObjectArgs = {
   input: DeleteOneObjectInput;
 };
@@ -289,13 +314,18 @@ export type MutationGenerateApiKeyTokenArgs = {
 };
 
 
+export type MutationGenerateJwtArgs = {
+  workspaceId: Scalars['String'];
+};
+
+
 export type MutationImpersonateArgs = {
   userId: Scalars['String'];
 };
 
 
 export type MutationRenewTokenArgs = {
-  refreshToken: Scalars['String'];
+  appToken: Scalars['String'];
 };
 
 
@@ -306,6 +336,12 @@ export type MutationSignUpArgs = {
 };
 
 
+export type MutationTrackArgs = {
+  data: Scalars['JSON'];
+  type: Scalars['String'];
+};
+
+
 export type MutationUpdatePasswordViaResetTokenArgs = {
   newPassword: Scalars['String'];
   passwordResetToken: Scalars['String'];
@@ -349,8 +385,6 @@ export type ObjectConnection = {
   edges: Array<ObjectEdge>;
   /** Paging information */
   pageInfo: PageInfo;
-  /** Fetch total count of records */
-  totalCount: Scalars['Int'];
 };
 
 export type ObjectFieldsConnection = {
@@ -359,8 +393,6 @@ export type ObjectFieldsConnection = {
   edges: Array<FieldEdge>;
   /** Paging information */
   pageInfo: PageInfo;
-  /** Fetch total count of records */
-  totalCount: Scalars['Int'];
 };
 
 export type PageInfo = {
@@ -391,13 +423,17 @@ export type ProductPricesEntity = {
 
 export type Query = {
   __typename?: 'Query';
+  billingPortalSession: SessionEntity;
   checkUserExists: UserExists;
   checkWorkspaceInviteHashIsValid: WorkspaceInviteHashValid;
   clientConfig: ClientConfig;
   currentUser: User;
   currentWorkspace: Workspace;
+  exchangeAuthorizationCode: ExchangeAuthCode;
   findWorkspaceFromInviteHash: Workspace;
   getProductPrices: ProductPricesEntity;
+  getTimelineCalendarEventsFromCompanyId: TimelineCalendarEventsWithTotal;
+  getTimelineCalendarEventsFromPersonId: TimelineCalendarEventsWithTotal;
   getTimelineThreadsFromCompanyId: TimelineThreadsWithTotal;
   getTimelineThreadsFromPersonId: TimelineThreadsWithTotal;
   object: Object;
@@ -406,6 +442,11 @@ export type Query = {
 };
 
 
+export type QueryBillingPortalSessionArgs = {
+  returnUrlPath?: InputMaybe<Scalars['String']>;
+};
+
+
 export type QueryCheckUserExistsArgs = {
   email: Scalars['String'];
 };
@@ -416,6 +457,13 @@ export type QueryCheckWorkspaceInviteHashIsValidArgs = {
 };
 
 
+export type QueryExchangeAuthorizationCodeArgs = {
+  authorizationCode: Scalars['String'];
+  clientSecret?: InputMaybe<Scalars['String']>;
+  codeVerifier?: InputMaybe<Scalars['String']>;
+};
+
+
 export type QueryFindWorkspaceFromInviteHashArgs = {
   inviteHash: Scalars['String'];
 };
@@ -426,38 +474,36 @@ export type QueryGetProductPricesArgs = {
 };
 
 
-export type QueryGetTimelineThreadsFromCompanyIdArgs = {
-  companyId: Scalars['ID'];
+export type QueryGetTimelineCalendarEventsFromCompanyIdArgs = {
+  companyId: Scalars['UUID'];
   page: Scalars['Int'];
   pageSize: Scalars['Int'];
 };
 
 
-export type QueryGetTimelineThreadsFromPersonIdArgs = {
+export type QueryGetTimelineCalendarEventsFromPersonIdArgs = {
   page: Scalars['Int'];
   pageSize: Scalars['Int'];
-  personId: Scalars['ID'];
+  personId: Scalars['UUID'];
 };
 
 
-export type QueryValidatePasswordResetTokenArgs = {
-  passwordResetToken: Scalars['String'];
+export type QueryGetTimelineThreadsFromCompanyIdArgs = {
+  companyId: Scalars['UUID'];
+  page: Scalars['Int'];
+  pageSize: Scalars['Int'];
 };
 
-export type RefreshToken = {
-  __typename?: 'RefreshToken';
-  createdAt: Scalars['DateTime'];
-  expiresAt: Scalars['DateTime'];
-  id: Scalars['ID'];
-  updatedAt: Scalars['DateTime'];
+
+export type QueryGetTimelineThreadsFromPersonIdArgs = {
+  page: Scalars['Int'];
+  pageSize: Scalars['Int'];
+  personId: Scalars['UUID'];
 };
 
-export type RefreshTokenEdge = {
-  __typename?: 'RefreshTokenEdge';
-  /** Cursor for this node. */
-  cursor: Scalars['ConnectionCursor'];
-  /** The node containing the RefreshToken */
-  node: RefreshToken;
+
+export type QueryValidatePasswordResetTokenArgs = {
+  passwordResetToken: Scalars['String'];
 };
 
 export type RelationConnection = {
@@ -466,16 +512,31 @@ export type RelationConnection = {
   edges: Array<RelationEdge>;
   /** Paging information */
   pageInfo: PageInfo;
-  /** Fetch total count of records */
-  totalCount: Scalars['Int'];
 };
 
+export type RelationDefinition = {
+  __typename?: 'RelationDefinition';
+  direction: RelationDefinitionType;
+  sourceFieldMetadata: Field;
+  sourceObjectMetadata: Object;
+  targetFieldMetadata: Field;
+  targetObjectMetadata: Object;
+};
+
+/** Relation definition type */
+export enum RelationDefinitionType {
+  ManyToMany = 'MANY_TO_MANY',
+  ManyToOne = 'MANY_TO_ONE',
+  OneToMany = 'ONE_TO_MANY',
+  OneToOne = 'ONE_TO_ONE'
+}
+
 export type RelationDeleteResponse = {
   __typename?: 'RelationDeleteResponse';
   createdAt?: Maybe<Scalars['DateTime']>;
   fromFieldMetadataId?: Maybe<Scalars['String']>;
   fromObjectMetadataId?: Maybe<Scalars['String']>;
-  id?: Maybe<Scalars['ID']>;
+  id?: Maybe<Scalars['UUID']>;
   relationType?: Maybe<RelationMetadataType>;
   toFieldMetadataId?: Maybe<Scalars['String']>;
   toObjectMetadataId?: Maybe<Scalars['String']>;
@@ -489,9 +550,39 @@ export enum RelationMetadataType {
   OneToOne = 'ONE_TO_ONE'
 }
 
+export type RemoteServer = {
+  __typename?: 'RemoteServer';
+  createdAt: Scalars['DateTime'];
+  foreignDataWrapperId: Scalars['ID'];
+  foreignDataWrapperOptions?: Maybe<Scalars['JSON']>;
+  foreignDataWrapperType: Scalars['String'];
+  id: Scalars['ID'];
+  updatedAt: Scalars['DateTime'];
+};
+
+export type RemoteTable = {
+  __typename?: 'RemoteTable';
+  name: Scalars['String'];
+  schema: Scalars['String'];
+  status: RemoteTableStatus;
+};
+
+/** Status of the table */
+export enum RemoteTableStatus {
+  NotSynced = 'NOT_SYNCED',
+  Synced = 'SYNCED'
+}
+
 export type Sentry = {
   __typename?: 'Sentry';
   dsn?: Maybe<Scalars['String']>;
+  environment?: Maybe<Scalars['String']>;
+  release?: Maybe<Scalars['String']>;
+};
+
+export type SessionEntity = {
+  __typename?: 'SessionEntity';
+  url?: Maybe<Scalars['String']>;
 };
 
 /** Sort Directions */
@@ -518,10 +609,49 @@ export type Telemetry = {
   enabled: Scalars['Boolean'];
 };
 
+export type TimelineCalendarEvent = {
+  __typename?: 'TimelineCalendarEvent';
+  conferenceLink: LinkMetadata;
+  conferenceSolution: Scalars['String'];
+  description: Scalars['String'];
+  endsAt: Scalars['DateTime'];
+  id: Scalars['UUID'];
+  isCanceled: Scalars['Boolean'];
+  isFullDay: Scalars['Boolean'];
+  location: Scalars['String'];
+  participants: Array<TimelineCalendarEventParticipant>;
+  startsAt: Scalars['DateTime'];
+  title: Scalars['String'];
+  visibility: TimelineCalendarEventVisibility;
+};
+
+export type TimelineCalendarEventParticipant = {
+  __typename?: 'TimelineCalendarEventParticipant';
+  avatarUrl: Scalars['String'];
+  displayName: Scalars['String'];
+  firstName: Scalars['String'];
+  handle: Scalars['String'];
+  lastName: Scalars['String'];
+  personId?: Maybe<Scalars['UUID']>;
+  workspaceMemberId?: Maybe<Scalars['UUID']>;
+};
+
+/** Visibility of the calendar event */
+export enum TimelineCalendarEventVisibility {
+  Metadata = 'METADATA',
+  ShareEverything = 'SHARE_EVERYTHING'
+}
+
+export type TimelineCalendarEventsWithTotal = {
+  __typename?: 'TimelineCalendarEventsWithTotal';
+  timelineCalendarEvents: Array<TimelineCalendarEvent>;
+  totalNumberOfCalendarEvents: Scalars['Int'];
+};
+
 export type TimelineThread = {
   __typename?: 'TimelineThread';
   firstParticipant: TimelineThreadParticipant;
-  id: Scalars['ID'];
+  id: Scalars['UUID'];
   lastMessageBody: Scalars['String'];
   lastMessageReceivedAt: Scalars['DateTime'];
   lastTwoParticipants: Array<TimelineThreadParticipant>;
@@ -539,8 +669,8 @@ export type TimelineThreadParticipant = {
   firstName: Scalars['String'];
   handle: Scalars['String'];
   lastName: Scalars['String'];
-  personId?: Maybe<Scalars['ID']>;
-  workspaceMemberId?: Maybe<Scalars['ID']>;
+  personId?: Maybe<Scalars['UUID']>;
+  workspaceMemberId?: Maybe<Scalars['UUID']>;
 };
 
 export type TimelineThreadsWithTotal = {
@@ -554,6 +684,29 @@ export type TransientToken = {
   transientToken: AuthToken;
 };
 
+export type UuidFilterComparison = {
+  eq?: InputMaybe<Scalars['UUID']>;
+  gt?: InputMaybe<Scalars['UUID']>;
+  gte?: InputMaybe<Scalars['UUID']>;
+  iLike?: InputMaybe<Scalars['UUID']>;
+  in?: InputMaybe<Array<Scalars['UUID']>>;
+  is?: InputMaybe<Scalars['Boolean']>;
+  isNot?: InputMaybe<Scalars['Boolean']>;
+  like?: InputMaybe<Scalars['UUID']>;
+  lt?: InputMaybe<Scalars['UUID']>;
+  lte?: InputMaybe<Scalars['UUID']>;
+  neq?: InputMaybe<Scalars['UUID']>;
+  notILike?: InputMaybe<Scalars['UUID']>;
+  notIn?: InputMaybe<Array<Scalars['UUID']>>;
+  notLike?: InputMaybe<Scalars['UUID']>;
+};
+
+export type UpdateBillingEntity = {
+  __typename?: 'UpdateBillingEntity';
+  /** Boolean that confirms query was successful */
+  success: Scalars['Boolean'];
+};
+
 export type UpdateWorkspaceInput = {
   allowImpersonation?: InputMaybe<Scalars['Boolean']>;
   displayName?: InputMaybe<Scalars['String']>;
@@ -568,12 +721,13 @@ export type User = {
   createdAt: Scalars['DateTime'];
   defaultAvatarUrl?: Maybe<Scalars['String']>;
   defaultWorkspace: Workspace;
+  defaultWorkspaceId: Scalars['String'];
   deletedAt?: Maybe<Scalars['DateTime']>;
   disabled?: Maybe<Scalars['Boolean']>;
   email: Scalars['String'];
   emailVerified: Scalars['Boolean'];
   firstName: Scalars['String'];
-  id: Scalars['ID'];
+  id: Scalars['UUID'];
   lastName: Scalars['String'];
   passwordHash?: Maybe<Scalars['String']>;
   passwordResetToken?: Maybe<Scalars['String']>;
@@ -581,6 +735,7 @@ export type User = {
   supportUserHash?: Maybe<Scalars['String']>;
   updatedAt: Scalars['DateTime'];
   workspaceMember?: Maybe<WorkspaceMember>;
+  workspaces: Array<UserWorkspace>;
 };
 
 export type UserEdge = {
@@ -596,6 +751,18 @@ export type UserExists = {
   exists: Scalars['Boolean'];
 };
 
+export type UserWorkspace = {
+  __typename?: 'UserWorkspace';
+  createdAt: Scalars['DateTime'];
+  deletedAt?: Maybe<Scalars['DateTime']>;
+  id: Scalars['UUID'];
+  updatedAt: Scalars['DateTime'];
+  user: User;
+  userId: Scalars['String'];
+  workspace?: Maybe<Workspace>;
+  workspaceId: Scalars['String'];
+};
+
 export type ValidatePasswordResetToken = {
   __typename?: 'ValidatePasswordResetToken';
   email: Scalars['String'];
@@ -612,12 +779,15 @@ export type Workspace = {
   __typename?: 'Workspace';
   activationStatus: Scalars['String'];
   allowImpersonation: Scalars['Boolean'];
+  billingSubscriptions?: Maybe<Array<BillingSubscription>>;
   createdAt: Scalars['DateTime'];
+  currentBillingSubscription?: Maybe<BillingSubscription>;
+  currentCacheVersion?: Maybe<Scalars['String']>;
   deletedAt?: Maybe<Scalars['DateTime']>;
   displayName?: Maybe<Scalars['String']>;
   domainName?: Maybe<Scalars['String']>;
   featureFlags?: Maybe<Array<FeatureFlag>>;
-  id: Scalars['ID'];
+  id: Scalars['UUID'];
   inviteHash?: Maybe<Scalars['String']>;
   logo?: Maybe<Scalars['String']>;
   subscriptionStatus: Scalars['String'];
@@ -625,6 +795,12 @@ export type Workspace = {
 };
 
 
+export type WorkspaceBillingSubscriptionsArgs = {
+  filter?: BillingSubscriptionFilter;
+  sorting?: Array<BillingSubscriptionSort>;
+};
+
+
 export type WorkspaceFeatureFlagsArgs = {
   filter?: FeatureFlagFilter;
   sorting?: Array<FeatureFlagSort>;
@@ -647,7 +823,7 @@ export type WorkspaceMember = {
   __typename?: 'WorkspaceMember';
   avatarUrl?: Maybe<Scalars['String']>;
   colorScheme: Scalars['String'];
-  id: Scalars['ID'];
+  id: Scalars['UUID'];
   locale: Scalars['String'];
   name: FullName;
 };
@@ -659,7 +835,7 @@ export type Field = {
   description?: Maybe<Scalars['String']>;
   fromRelationMetadata?: Maybe<Relation>;
   icon?: Maybe<Scalars['String']>;
-  id: Scalars['ID'];
+  id: Scalars['UUID'];
   isActive?: Maybe<Scalars['Boolean']>;
   isCustom?: Maybe<Scalars['Boolean']>;
   isNullable?: Maybe<Scalars['Boolean']>;
@@ -667,6 +843,7 @@ export type Field = {
   label: Scalars['String'];
   name: Scalars['String'];
   options?: Maybe<Scalars['JSON']>;
+  relationDefinition?: Maybe<RelationDefinition>;
   toRelationMetadata?: Maybe<Relation>;
   type: FieldMetadataType;
   updatedAt: Scalars['DateTime'];
@@ -682,7 +859,7 @@ export type FieldEdge = {
 
 export type FieldFilter = {
   and?: InputMaybe<Array<FieldFilter>>;
-  id?: InputMaybe<IdFilterComparison>;
+  id?: InputMaybe<UuidFilterComparison>;
   isActive?: InputMaybe<BooleanFieldComparison>;
   isCustom?: InputMaybe<BooleanFieldComparison>;
   isSystem?: InputMaybe<BooleanFieldComparison>;
@@ -696,10 +873,11 @@ export type Object = {
   description?: Maybe<Scalars['String']>;
   fields: ObjectFieldsConnection;
   icon?: Maybe<Scalars['String']>;
-  id: Scalars['ID'];
+  id: Scalars['UUID'];
   imageIdentifierFieldMetadataId?: Maybe<Scalars['String']>;
   isActive: Scalars['Boolean'];
   isCustom: Scalars['Boolean'];
+  isRemote: Scalars['Boolean'];
   isSystem: Scalars['Boolean'];
   labelIdentifierFieldMetadataId?: Maybe<Scalars['String']>;
   labelPlural: Scalars['String'];
@@ -729,7 +907,7 @@ export type Relation = {
   fromFieldMetadataId: Scalars['String'];
   fromObjectMetadata: Object;
   fromObjectMetadataId: Scalars['String'];
-  id: Scalars['ID'];
+  id: Scalars['UUID'];
   relationType: RelationMetadataType;
   toFieldMetadataId: Scalars['String'];
   toObjectMetadata: Object;
@@ -745,44 +923,76 @@ export type RelationEdge = {
   node: Relation;
 };
 
-export type ParticipantFragmentFragment = { __typename?: 'TimelineThreadParticipant', personId?: string | null, workspaceMemberId?: string | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string };
+export type TimelineCalendarEventFragmentFragment = { __typename?: 'TimelineCalendarEvent', id: any, title: string, description: string, location: string, startsAt: string, endsAt: string, isFullDay: boolean, visibility: TimelineCalendarEventVisibility, participants: Array<{ __typename?: 'TimelineCalendarEventParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }> };
+
+export type TimelineCalendarEventParticipantFragmentFragment = { __typename?: 'TimelineCalendarEventParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string };
+
+export type TimelineCalendarEventsWithTotalFragmentFragment = { __typename?: 'TimelineCalendarEventsWithTotal', totalNumberOfCalendarEvents: number, timelineCalendarEvents: Array<{ __typename?: 'TimelineCalendarEvent', id: any, title: string, description: string, location: string, startsAt: string, endsAt: string, isFullDay: boolean, visibility: TimelineCalendarEventVisibility, participants: Array<{ __typename?: 'TimelineCalendarEventParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }> }> };
+
+export type GetTimelineCalendarEventsFromCompanyIdQueryVariables = Exact<{
+  companyId: Scalars['UUID'];
+  page: Scalars['Int'];
+  pageSize: Scalars['Int'];
+}>;
+
+
+export type GetTimelineCalendarEventsFromCompanyIdQuery = { __typename?: 'Query', getTimelineCalendarEventsFromCompanyId: { __typename?: 'TimelineCalendarEventsWithTotal', totalNumberOfCalendarEvents: number, timelineCalendarEvents: Array<{ __typename?: 'TimelineCalendarEvent', id: any, title: string, description: string, location: string, startsAt: string, endsAt: string, isFullDay: boolean, visibility: TimelineCalendarEventVisibility, participants: Array<{ __typename?: 'TimelineCalendarEventParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }> }> } };
 
-export type TimelineThreadFragmentFragment = { __typename?: 'TimelineThread', id: string, read: boolean, visibility: string, lastMessageReceivedAt: string, lastMessageBody: string, subject: string, numberOfMessagesInThread: number, participantCount: number, firstParticipant: { __typename?: 'TimelineThreadParticipant', personId?: string | null, workspaceMemberId?: string | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }, lastTwoParticipants: Array<{ __typename?: 'TimelineThreadParticipant', personId?: string | null, workspaceMemberId?: string | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }> };
+export type GetTimelineCalendarEventsFromPersonIdQueryVariables = Exact<{
+  personId: Scalars['UUID'];
+  page: Scalars['Int'];
+  pageSize: Scalars['Int'];
+}>;
+
+
+export type GetTimelineCalendarEventsFromPersonIdQuery = { __typename?: 'Query', getTimelineCalendarEventsFromPersonId: { __typename?: 'TimelineCalendarEventsWithTotal', totalNumberOfCalendarEvents: number, timelineCalendarEvents: Array<{ __typename?: 'TimelineCalendarEvent', id: any, title: string, description: string, location: string, startsAt: string, endsAt: string, isFullDay: boolean, visibility: TimelineCalendarEventVisibility, participants: Array<{ __typename?: 'TimelineCalendarEventParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }> }> } };
 
-export type TimelineThreadsWithTotalFragmentFragment = { __typename?: 'TimelineThreadsWithTotal', totalNumberOfThreads: number, timelineThreads: Array<{ __typename?: 'TimelineThread', id: string, read: boolean, visibility: string, lastMessageReceivedAt: string, lastMessageBody: string, subject: string, numberOfMessagesInThread: number, participantCount: number, firstParticipant: { __typename?: 'TimelineThreadParticipant', personId?: string | null, workspaceMemberId?: string | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }, lastTwoParticipants: Array<{ __typename?: 'TimelineThreadParticipant', personId?: string | null, workspaceMemberId?: string | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }> }> };
+export type ParticipantFragmentFragment = { __typename?: 'TimelineThreadParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string };
+
+export type TimelineThreadFragmentFragment = { __typename?: 'TimelineThread', id: any, read: boolean, visibility: string, lastMessageReceivedAt: string, lastMessageBody: string, subject: string, numberOfMessagesInThread: number, participantCount: number, firstParticipant: { __typename?: 'TimelineThreadParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }, lastTwoParticipants: Array<{ __typename?: 'TimelineThreadParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }> };
+
+export type TimelineThreadsWithTotalFragmentFragment = { __typename?: 'TimelineThreadsWithTotal', totalNumberOfThreads: number, timelineThreads: Array<{ __typename?: 'TimelineThread', id: any, read: boolean, visibility: string, lastMessageReceivedAt: string, lastMessageBody: string, subject: string, numberOfMessagesInThread: number, participantCount: number, firstParticipant: { __typename?: 'TimelineThreadParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }, lastTwoParticipants: Array<{ __typename?: 'TimelineThreadParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }> }> };
 
 export type GetTimelineThreadsFromCompanyIdQueryVariables = Exact<{
-  companyId: Scalars['ID'];
+  companyId: Scalars['UUID'];
   page: Scalars['Int'];
   pageSize: Scalars['Int'];
 }>;
 
 
-export type GetTimelineThreadsFromCompanyIdQuery = { __typename?: 'Query', getTimelineThreadsFromCompanyId: { __typename?: 'TimelineThreadsWithTotal', totalNumberOfThreads: number, timelineThreads: Array<{ __typename?: 'TimelineThread', id: string, read: boolean, visibility: string, lastMessageReceivedAt: string, lastMessageBody: string, subject: string, numberOfMessagesInThread: number, participantCount: number, firstParticipant: { __typename?: 'TimelineThreadParticipant', personId?: string | null, workspaceMemberId?: string | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }, lastTwoParticipants: Array<{ __typename?: 'TimelineThreadParticipant', personId?: string | null, workspaceMemberId?: string | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }> }> } };
+export type GetTimelineThreadsFromCompanyIdQuery = { __typename?: 'Query', getTimelineThreadsFromCompanyId: { __typename?: 'TimelineThreadsWithTotal', totalNumberOfThreads: number, timelineThreads: Array<{ __typename?: 'TimelineThread', id: any, read: boolean, visibility: string, lastMessageReceivedAt: string, lastMessageBody: string, subject: string, numberOfMessagesInThread: number, participantCount: number, firstParticipant: { __typename?: 'TimelineThreadParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }, lastTwoParticipants: Array<{ __typename?: 'TimelineThreadParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }> }> } };
 
 export type GetTimelineThreadsFromPersonIdQueryVariables = Exact<{
-  personId: Scalars['ID'];
+  personId: Scalars['UUID'];
   page: Scalars['Int'];
   pageSize: Scalars['Int'];
 }>;
 
 
-export type GetTimelineThreadsFromPersonIdQuery = { __typename?: 'Query', getTimelineThreadsFromPersonId: { __typename?: 'TimelineThreadsWithTotal', totalNumberOfThreads: number, timelineThreads: Array<{ __typename?: 'TimelineThread', id: string, read: boolean, visibility: string, lastMessageReceivedAt: string, lastMessageBody: string, subject: string, numberOfMessagesInThread: number, participantCount: number, firstParticipant: { __typename?: 'TimelineThreadParticipant', personId?: string | null, workspaceMemberId?: string | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }, lastTwoParticipants: Array<{ __typename?: 'TimelineThreadParticipant', personId?: string | null, workspaceMemberId?: string | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }> }> } };
+export type GetTimelineThreadsFromPersonIdQuery = { __typename?: 'Query', getTimelineThreadsFromPersonId: { __typename?: 'TimelineThreadsWithTotal', totalNumberOfThreads: number, timelineThreads: Array<{ __typename?: 'TimelineThread', id: any, read: boolean, visibility: string, lastMessageReceivedAt: string, lastMessageBody: string, subject: string, numberOfMessagesInThread: number, participantCount: number, firstParticipant: { __typename?: 'TimelineThreadParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }, lastTwoParticipants: Array<{ __typename?: 'TimelineThreadParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }> }> } };
 
-export type TimelineThreadFragment = { __typename?: 'TimelineThread', id: string, subject: string, lastMessageReceivedAt: string };
+export type TimelineThreadFragment = { __typename?: 'TimelineThread', id: any, subject: string, lastMessageReceivedAt: string };
 
-export type CreateEventMutationVariables = Exact<{
+export type TrackMutationVariables = Exact<{
   type: Scalars['String'];
   data: Scalars['JSON'];
 }>;
 
 
-export type CreateEventMutation = { __typename?: 'Mutation', createEvent: { __typename?: 'Analytics', success: boolean } };
+export type TrackMutation = { __typename?: 'Mutation', track: { __typename?: 'Analytics', success: boolean } };
 
 export type AuthTokenFragmentFragment = { __typename?: 'AuthToken', token: string, expiresAt: string };
 
 export type AuthTokensFragmentFragment = { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } };
 
+export type AuthorizeAppMutationVariables = Exact<{
+  clientId: Scalars['String'];
+  codeChallenge: Scalars['String'];
+}>;
+
+
+export type AuthorizeAppMutation = { __typename?: 'Mutation', authorizeApp: { __typename?: 'AuthorizeApp', redirectUrl: string } };
+
 export type ChallengeMutationVariables = Exact<{
   email: Scalars['String'];
   password: Scalars['String'];
@@ -806,6 +1016,13 @@ export type GenerateApiKeyTokenMutationVariables = Exact<{
 
 export type GenerateApiKeyTokenMutation = { __typename?: 'Mutation', generateApiKeyToken: { __typename?: 'ApiKeyToken', token: string } };
 
+export type GenerateJwtMutationVariables = Exact<{
+  workspaceId: Scalars['String'];
+}>;
+
+
+export type GenerateJwtMutation = { __typename?: 'Mutation', generateJWT: { __typename?: 'AuthTokens', tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
+
 export type GenerateTransientTokenMutationVariables = Exact<{ [key: string]: never; }>;
 
 
@@ -816,10 +1033,10 @@ export type ImpersonateMutationVariables = Exact<{
 }>;
 
 
-export type ImpersonateMutation = { __typename?: 'Mutation', impersonate: { __typename?: 'Verify', user: { __typename?: 'User', id: string, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: string, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: string, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, subscriptionStatus: string, activationStatus: string, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: string, key: string, value: boolean, workspaceId: string }> | null } }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
+export type ImpersonateMutation = { __typename?: 'Mutation', impersonate: { __typename?: 'Verify', user: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, subscriptionStatus: string, activationStatus: string, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
 
 export type RenewTokenMutationVariables = Exact<{
-  refreshToken: Scalars['String'];
+  appToken: Scalars['String'];
 }>;
 
 
@@ -847,7 +1064,7 @@ export type VerifyMutationVariables = Exact<{
 }>;
 
 
-export type VerifyMutation = { __typename?: 'Mutation', verify: { __typename?: 'Verify', user: { __typename?: 'User', id: string, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: string, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: string, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, subscriptionStatus: string, activationStatus: string, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: string, key: string, value: boolean, workspaceId: string }> | null } }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
+export type VerifyMutation = { __typename?: 'Mutation', verify: { __typename?: 'Verify', user: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, subscriptionStatus: string, activationStatus: string, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
 
 export type CheckUserExistsQueryVariables = Exact<{
   email: Scalars['String'];
@@ -863,13 +1080,20 @@ export type ValidatePasswordResetTokenQueryVariables = Exact<{
 
 export type ValidatePasswordResetTokenQuery = { __typename?: 'Query', validatePasswordResetToken: { __typename?: 'ValidatePasswordResetToken', id: string, email: string } };
 
-export type CheckoutMutationVariables = Exact<{
+export type BillingPortalSessionQueryVariables = Exact<{
+  returnUrlPath?: InputMaybe<Scalars['String']>;
+}>;
+
+
+export type BillingPortalSessionQuery = { __typename?: 'Query', billingPortalSession: { __typename?: 'SessionEntity', url?: string | null } };
+
+export type CheckoutSessionMutationVariables = Exact<{
   recurringInterval: Scalars['String'];
   successUrlPath?: InputMaybe<Scalars['String']>;
 }>;
 
 
-export type CheckoutMutation = { __typename?: 'Mutation', checkout: { __typename?: 'CheckoutEntity', url: string } };
+export type CheckoutSessionMutation = { __typename?: 'Mutation', checkoutSession: { __typename?: 'SessionEntity', url?: string | null } };
 
 export type GetProductPricesQueryVariables = Exact<{
   product: Scalars['String'];
@@ -878,10 +1102,15 @@ export type GetProductPricesQueryVariables = Exact<{
 
 export type GetProductPricesQuery = { __typename?: 'Query', getProductPrices: { __typename?: 'ProductPricesEntity', productPrices: Array<{ __typename?: 'ProductPriceEntity', created: number, recurringInterval: string, stripePriceId: string, unitAmount: number }> } };
 
+export type UpdateBillingSubscriptionMutationVariables = Exact<{ [key: string]: never; }>;
+
+
+export type UpdateBillingSubscriptionMutation = { __typename?: 'Mutation', updateBillingSubscription: { __typename?: 'UpdateBillingEntity', success: boolean } };
+
 export type GetClientConfigQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetClientConfigQuery = { __typename?: 'Query', clientConfig: { __typename?: 'ClientConfig', signInPrefilled: boolean, signUpDisabled: boolean, debugMode: boolean, authProviders: { __typename?: 'AuthProviders', google: boolean, password: boolean }, billing: { __typename?: 'Billing', isBillingEnabled: boolean, billingUrl: string, billingFreeTrialDurationInDays?: number | null }, telemetry: { __typename?: 'Telemetry', enabled: boolean, anonymizationEnabled: boolean }, support: { __typename?: 'Support', supportDriver: string, supportFrontChatId?: string | null }, sentry: { __typename?: 'Sentry', dsn?: string | null } } };
+export type GetClientConfigQuery = { __typename?: 'Query', clientConfig: { __typename?: 'ClientConfig', signInPrefilled: boolean, signUpDisabled: boolean, debugMode: boolean, authProviders: { __typename?: 'AuthProviders', google: boolean, password: boolean }, billing: { __typename?: 'Billing', isBillingEnabled: boolean, billingUrl?: string | null, billingFreeTrialDurationInDays?: number | null }, telemetry: { __typename?: 'Telemetry', enabled: boolean, anonymizationEnabled: boolean }, support: { __typename?: 'Support', supportDriver: string, supportFrontChatId?: string | null }, sentry: { __typename?: 'Sentry', dsn?: string | null, environment?: string | null, release?: string | null } } };
 
 export type UploadFileMutationVariables = Exact<{
   file: Scalars['Upload'];
@@ -899,12 +1128,12 @@ export type UploadImageMutationVariables = Exact<{
 
 export type UploadImageMutation = { __typename?: 'Mutation', uploadImage: string };
 
-export type UserQueryFragmentFragment = { __typename?: 'User', id: string, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: string, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: string, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, subscriptionStatus: string, activationStatus: string, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: string, key: string, value: boolean, workspaceId: string }> | null } };
+export type UserQueryFragmentFragment = { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, subscriptionStatus: string, activationStatus: string, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> };
 
 export type DeleteUserAccountMutationVariables = Exact<{ [key: string]: never; }>;
 
 
-export type DeleteUserAccountMutation = { __typename?: 'Mutation', deleteUser: { __typename?: 'User', id: string } };
+export type DeleteUserAccountMutation = { __typename?: 'Mutation', deleteUser: { __typename?: 'User', id: any } };
 
 export type UploadProfilePictureMutationVariables = Exact<{
   file: Scalars['Upload'];
@@ -916,26 +1145,26 @@ export type UploadProfilePictureMutation = { __typename?: 'Mutation', uploadProf
 export type GetCurrentUserQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetCurrentUserQuery = { __typename?: 'Query', currentUser: { __typename?: 'User', id: string, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: string, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: string, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, subscriptionStatus: string, activationStatus: string, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: string, key: string, value: boolean, workspaceId: string }> | null } } };
+export type GetCurrentUserQuery = { __typename?: 'Query', currentUser: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale: string, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, subscriptionStatus: string, activationStatus: string, currentCacheVersion?: string | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', status: string, interval?: string | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null } | null }> } };
 
 export type ActivateWorkspaceMutationVariables = Exact<{
   input: ActivateWorkspaceInput;
 }>;
 
 
-export type ActivateWorkspaceMutation = { __typename?: 'Mutation', activateWorkspace: { __typename?: 'Workspace', id: string } };
+export type ActivateWorkspaceMutation = { __typename?: 'Mutation', activateWorkspace: { __typename?: 'Workspace', id: any } };
 
 export type DeleteCurrentWorkspaceMutationVariables = Exact<{ [key: string]: never; }>;
 
 
-export type DeleteCurrentWorkspaceMutation = { __typename?: 'Mutation', deleteCurrentWorkspace: { __typename?: 'Workspace', id: string } };
+export type DeleteCurrentWorkspaceMutation = { __typename?: 'Mutation', deleteCurrentWorkspace: { __typename?: 'Workspace', id: any } };
 
 export type UpdateWorkspaceMutationVariables = Exact<{
   input: UpdateWorkspaceInput;
 }>;
 
 
-export type UpdateWorkspaceMutation = { __typename?: 'Mutation', updateWorkspace: { __typename?: 'Workspace', id: string, domainName?: string | null, displayName?: string | null, logo?: string | null, allowImpersonation: boolean, subscriptionStatus: string } };
+export type UpdateWorkspaceMutation = { __typename?: 'Mutation', updateWorkspace: { __typename?: 'Workspace', id: any, domainName?: string | null, displayName?: string | null, logo?: string | null, allowImpersonation: boolean, subscriptionStatus: string } };
 
 export type UploadWorkspaceLogoMutationVariables = Exact<{
   file: Scalars['Upload'];
@@ -949,8 +1178,42 @@ export type GetWorkspaceFromInviteHashQueryVariables = Exact<{
 }>;
 
 
-export type GetWorkspaceFromInviteHashQuery = { __typename?: 'Query', findWorkspaceFromInviteHash: { __typename?: 'Workspace', id: string, displayName?: string | null, logo?: string | null, allowImpersonation: boolean } };
+export type GetWorkspaceFromInviteHashQuery = { __typename?: 'Query', findWorkspaceFromInviteHash: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, allowImpersonation: boolean } };
 
+export const TimelineCalendarEventParticipantFragmentFragmentDoc = gql`
+    fragment TimelineCalendarEventParticipantFragment on TimelineCalendarEventParticipant {
+  personId
+  workspaceMemberId
+  firstName
+  lastName
+  displayName
+  avatarUrl
+  handle
+}
+    `;
+export const TimelineCalendarEventFragmentFragmentDoc = gql`
+    fragment TimelineCalendarEventFragment on TimelineCalendarEvent {
+  id
+  title
+  description
+  location
+  startsAt
+  endsAt
+  isFullDay
+  visibility
+  participants {
+    ...TimelineCalendarEventParticipantFragment
+  }
+}
+    ${TimelineCalendarEventParticipantFragmentFragmentDoc}`;
+export const TimelineCalendarEventsWithTotalFragmentFragmentDoc = gql`
+    fragment TimelineCalendarEventsWithTotalFragment on TimelineCalendarEventsWithTotal {
+  totalNumberOfCalendarEvents
+  timelineCalendarEvents {
+    ...TimelineCalendarEventFragment
+  }
+}
+    ${TimelineCalendarEventFragmentFragmentDoc}`;
 export const ParticipantFragmentFragmentDoc = gql`
     fragment ParticipantFragment on TimelineThreadParticipant {
   personId
@@ -1045,10 +1308,100 @@ export const UserQueryFragmentFragmentDoc = gql`
       workspaceId
     }
   }
+  workspaces {
+    workspace {
+      id
+      logo
+      displayName
+      domainName
+    }
+  }
 }
     `;
+export const GetTimelineCalendarEventsFromCompanyIdDocument = gql`
+    query GetTimelineCalendarEventsFromCompanyId($companyId: UUID!, $page: Int!, $pageSize: Int!) {
+  getTimelineCalendarEventsFromCompanyId(
+    companyId: $companyId
+    page: $page
+    pageSize: $pageSize
+  ) {
+    ...TimelineCalendarEventsWithTotalFragment
+  }
+}
+    ${TimelineCalendarEventsWithTotalFragmentFragmentDoc}`;
+
+/**
+ * __useGetTimelineCalendarEventsFromCompanyIdQuery__
+ *
+ * To run a query within a React component, call `useGetTimelineCalendarEventsFromCompanyIdQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetTimelineCalendarEventsFromCompanyIdQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetTimelineCalendarEventsFromCompanyIdQuery({
+ *   variables: {
+ *      companyId: // value for 'companyId'
+ *      page: // value for 'page'
+ *      pageSize: // value for 'pageSize'
+ *   },
+ * });
+ */
+export function useGetTimelineCalendarEventsFromCompanyIdQuery(baseOptions: Apollo.QueryHookOptions<GetTimelineCalendarEventsFromCompanyIdQuery, GetTimelineCalendarEventsFromCompanyIdQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<GetTimelineCalendarEventsFromCompanyIdQuery, GetTimelineCalendarEventsFromCompanyIdQueryVariables>(GetTimelineCalendarEventsFromCompanyIdDocument, options);
+      }
+export function useGetTimelineCalendarEventsFromCompanyIdLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetTimelineCalendarEventsFromCompanyIdQuery, GetTimelineCalendarEventsFromCompanyIdQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<GetTimelineCalendarEventsFromCompanyIdQuery, GetTimelineCalendarEventsFromCompanyIdQueryVariables>(GetTimelineCalendarEventsFromCompanyIdDocument, options);
+        }
+export type GetTimelineCalendarEventsFromCompanyIdQueryHookResult = ReturnType<typeof useGetTimelineCalendarEventsFromCompanyIdQuery>;
+export type GetTimelineCalendarEventsFromCompanyIdLazyQueryHookResult = ReturnType<typeof useGetTimelineCalendarEventsFromCompanyIdLazyQuery>;
+export type GetTimelineCalendarEventsFromCompanyIdQueryResult = Apollo.QueryResult<GetTimelineCalendarEventsFromCompanyIdQuery, GetTimelineCalendarEventsFromCompanyIdQueryVariables>;
+export const GetTimelineCalendarEventsFromPersonIdDocument = gql`
+    query GetTimelineCalendarEventsFromPersonId($personId: UUID!, $page: Int!, $pageSize: Int!) {
+  getTimelineCalendarEventsFromPersonId(
+    personId: $personId
+    page: $page
+    pageSize: $pageSize
+  ) {
+    ...TimelineCalendarEventsWithTotalFragment
+  }
+}
+    ${TimelineCalendarEventsWithTotalFragmentFragmentDoc}`;
+
+/**
+ * __useGetTimelineCalendarEventsFromPersonIdQuery__
+ *
+ * To run a query within a React component, call `useGetTimelineCalendarEventsFromPersonIdQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetTimelineCalendarEventsFromPersonIdQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetTimelineCalendarEventsFromPersonIdQuery({
+ *   variables: {
+ *      personId: // value for 'personId'
+ *      page: // value for 'page'
+ *      pageSize: // value for 'pageSize'
+ *   },
+ * });
+ */
+export function useGetTimelineCalendarEventsFromPersonIdQuery(baseOptions: Apollo.QueryHookOptions<GetTimelineCalendarEventsFromPersonIdQuery, GetTimelineCalendarEventsFromPersonIdQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<GetTimelineCalendarEventsFromPersonIdQuery, GetTimelineCalendarEventsFromPersonIdQueryVariables>(GetTimelineCalendarEventsFromPersonIdDocument, options);
+      }
+export function useGetTimelineCalendarEventsFromPersonIdLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetTimelineCalendarEventsFromPersonIdQuery, GetTimelineCalendarEventsFromPersonIdQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<GetTimelineCalendarEventsFromPersonIdQuery, GetTimelineCalendarEventsFromPersonIdQueryVariables>(GetTimelineCalendarEventsFromPersonIdDocument, options);
+        }
+export type GetTimelineCalendarEventsFromPersonIdQueryHookResult = ReturnType<typeof useGetTimelineCalendarEventsFromPersonIdQuery>;
+export type GetTimelineCalendarEventsFromPersonIdLazyQueryHookResult = ReturnType<typeof useGetTimelineCalendarEventsFromPersonIdLazyQuery>;
+export type GetTimelineCalendarEventsFromPersonIdQueryResult = Apollo.QueryResult<GetTimelineCalendarEventsFromPersonIdQuery, GetTimelineCalendarEventsFromPersonIdQueryVariables>;
 export const GetTimelineThreadsFromCompanyIdDocument = gql`
-    query GetTimelineThreadsFromCompanyId($companyId: ID!, $page: Int!, $pageSize: Int!) {
+    query GetTimelineThreadsFromCompanyId($companyId: UUID!, $page: Int!, $pageSize: Int!) {
   getTimelineThreadsFromCompanyId(
     companyId: $companyId
     page: $page
@@ -1089,7 +1442,7 @@ export type GetTimelineThreadsFromCompanyIdQueryHookResult = ReturnType<typeof u
 export type GetTimelineThreadsFromCompanyIdLazyQueryHookResult = ReturnType<typeof useGetTimelineThreadsFromCompanyIdLazyQuery>;
 export type GetTimelineThreadsFromCompanyIdQueryResult = Apollo.QueryResult<GetTimelineThreadsFromCompanyIdQuery, GetTimelineThreadsFromCompanyIdQueryVariables>;
 export const GetTimelineThreadsFromPersonIdDocument = gql`
-    query GetTimelineThreadsFromPersonId($personId: ID!, $page: Int!, $pageSize: Int!) {
+    query GetTimelineThreadsFromPersonId($personId: UUID!, $page: Int!, $pageSize: Int!) {
   getTimelineThreadsFromPersonId(
     personId: $personId
     page: $page
@@ -1129,40 +1482,74 @@ export function useGetTimelineThreadsFromPersonIdLazyQuery(baseOptions?: Apollo.
 export type GetTimelineThreadsFromPersonIdQueryHookResult = ReturnType<typeof useGetTimelineThreadsFromPersonIdQuery>;
 export type GetTimelineThreadsFromPersonIdLazyQueryHookResult = ReturnType<typeof useGetTimelineThreadsFromPersonIdLazyQuery>;
 export type GetTimelineThreadsFromPersonIdQueryResult = Apollo.QueryResult<GetTimelineThreadsFromPersonIdQuery, GetTimelineThreadsFromPersonIdQueryVariables>;
-export const CreateEventDocument = gql`
-    mutation CreateEvent($type: String!, $data: JSON!) {
-  createEvent(type: $type, data: $data) {
+export const TrackDocument = gql`
+    mutation Track($type: String!, $data: JSON!) {
+  track(type: $type, data: $data) {
     success
   }
 }
     `;
-export type CreateEventMutationFn = Apollo.MutationFunction<CreateEventMutation, CreateEventMutationVariables>;
+export type TrackMutationFn = Apollo.MutationFunction<TrackMutation, TrackMutationVariables>;
 
 /**
- * __useCreateEventMutation__
+ * __useTrackMutation__
  *
- * To run a mutation, you first call `useCreateEventMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useCreateEventMutation` returns a tuple that includes:
+ * To run a mutation, you first call `useTrackMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useTrackMutation` returns a tuple that includes:
  * - A mutate function that you can call at any time to execute the mutation
  * - An object with fields that represent the current status of the mutation's execution
  *
  * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
  *
  * @example
- * const [createEventMutation, { data, loading, error }] = useCreateEventMutation({
+ * const [trackMutation, { data, loading, error }] = useTrackMutation({
  *   variables: {
  *      type: // value for 'type'
  *      data: // value for 'data'
  *   },
  * });
  */
-export function useCreateEventMutation(baseOptions?: Apollo.MutationHookOptions<CreateEventMutation, CreateEventMutationVariables>) {
+export function useTrackMutation(baseOptions?: Apollo.MutationHookOptions<TrackMutation, TrackMutationVariables>) {
         const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useMutation<CreateEventMutation, CreateEventMutationVariables>(CreateEventDocument, options);
+        return Apollo.useMutation<TrackMutation, TrackMutationVariables>(TrackDocument, options);
       }
-export type CreateEventMutationHookResult = ReturnType<typeof useCreateEventMutation>;
-export type CreateEventMutationResult = Apollo.MutationResult<CreateEventMutation>;
-export type CreateEventMutationOptions = Apollo.BaseMutationOptions<CreateEventMutation, CreateEventMutationVariables>;
+export type TrackMutationHookResult = ReturnType<typeof useTrackMutation>;
+export type TrackMutationResult = Apollo.MutationResult<TrackMutation>;
+export type TrackMutationOptions = Apollo.BaseMutationOptions<TrackMutation, TrackMutationVariables>;
+export const AuthorizeAppDocument = gql`
+    mutation authorizeApp($clientId: String!, $codeChallenge: String!) {
+  authorizeApp(clientId: $clientId, codeChallenge: $codeChallenge) {
+    redirectUrl
+  }
+}
+    `;
+export type AuthorizeAppMutationFn = Apollo.MutationFunction<AuthorizeAppMutation, AuthorizeAppMutationVariables>;
+
+/**
+ * __useAuthorizeAppMutation__
+ *
+ * To run a mutation, you first call `useAuthorizeAppMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useAuthorizeAppMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [authorizeAppMutation, { data, loading, error }] = useAuthorizeAppMutation({
+ *   variables: {
+ *      clientId: // value for 'clientId'
+ *      codeChallenge: // value for 'codeChallenge'
+ *   },
+ * });
+ */
+export function useAuthorizeAppMutation(baseOptions?: Apollo.MutationHookOptions<AuthorizeAppMutation, AuthorizeAppMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<AuthorizeAppMutation, AuthorizeAppMutationVariables>(AuthorizeAppDocument, options);
+      }
+export type AuthorizeAppMutationHookResult = ReturnType<typeof useAuthorizeAppMutation>;
+export type AuthorizeAppMutationResult = Apollo.MutationResult<AuthorizeAppMutation>;
+export type AuthorizeAppMutationOptions = Apollo.BaseMutationOptions<AuthorizeAppMutation, AuthorizeAppMutationVariables>;
 export const ChallengeDocument = gql`
     mutation Challenge($email: String!, $password: String!) {
   challenge(email: $email, password: $password) {
@@ -1266,6 +1653,41 @@ export function useGenerateApiKeyTokenMutation(baseOptions?: Apollo.MutationHook
 export type GenerateApiKeyTokenMutationHookResult = ReturnType<typeof useGenerateApiKeyTokenMutation>;
 export type GenerateApiKeyTokenMutationResult = Apollo.MutationResult<GenerateApiKeyTokenMutation>;
 export type GenerateApiKeyTokenMutationOptions = Apollo.BaseMutationOptions<GenerateApiKeyTokenMutation, GenerateApiKeyTokenMutationVariables>;
+export const GenerateJwtDocument = gql`
+    mutation GenerateJWT($workspaceId: String!) {
+  generateJWT(workspaceId: $workspaceId) {
+    tokens {
+      ...AuthTokensFragment
+    }
+  }
+}
+    ${AuthTokensFragmentFragmentDoc}`;
+export type GenerateJwtMutationFn = Apollo.MutationFunction<GenerateJwtMutation, GenerateJwtMutationVariables>;
+
+/**
+ * __useGenerateJwtMutation__
+ *
+ * To run a mutation, you first call `useGenerateJwtMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useGenerateJwtMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [generateJwtMutation, { data, loading, error }] = useGenerateJwtMutation({
+ *   variables: {
+ *      workspaceId: // value for 'workspaceId'
+ *   },
+ * });
+ */
+export function useGenerateJwtMutation(baseOptions?: Apollo.MutationHookOptions<GenerateJwtMutation, GenerateJwtMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<GenerateJwtMutation, GenerateJwtMutationVariables>(GenerateJwtDocument, options);
+      }
+export type GenerateJwtMutationHookResult = ReturnType<typeof useGenerateJwtMutation>;
+export type GenerateJwtMutationResult = Apollo.MutationResult<GenerateJwtMutation>;
+export type GenerateJwtMutationOptions = Apollo.BaseMutationOptions<GenerateJwtMutation, GenerateJwtMutationVariables>;
 export const GenerateTransientTokenDocument = gql`
     mutation generateTransientToken {
   generateTransientToken {
@@ -1340,8 +1762,8 @@ export type ImpersonateMutationHookResult = ReturnType<typeof useImpersonateMuta
 export type ImpersonateMutationResult = Apollo.MutationResult<ImpersonateMutation>;
 export type ImpersonateMutationOptions = Apollo.BaseMutationOptions<ImpersonateMutation, ImpersonateMutationVariables>;
 export const RenewTokenDocument = gql`
-    mutation RenewToken($refreshToken: String!) {
-  renewToken(refreshToken: $refreshToken) {
+    mutation RenewToken($appToken: String!) {
+  renewToken(appToken: $appToken) {
     tokens {
       ...AuthTokensFragment
     }
@@ -1363,7 +1785,7 @@ export type RenewTokenMutationFn = Apollo.MutationFunction<RenewTokenMutation, R
  * @example
  * const [renewTokenMutation, { data, loading, error }] = useRenewTokenMutation({
  *   variables: {
- *      refreshToken: // value for 'refreshToken'
+ *      appToken: // value for 'appToken'
  *   },
  * });
  */
@@ -1562,40 +1984,78 @@ export function useValidatePasswordResetTokenLazyQuery(baseOptions?: Apollo.Lazy
 export type ValidatePasswordResetTokenQueryHookResult = ReturnType<typeof useValidatePasswordResetTokenQuery>;
 export type ValidatePasswordResetTokenLazyQueryHookResult = ReturnType<typeof useValidatePasswordResetTokenLazyQuery>;
 export type ValidatePasswordResetTokenQueryResult = Apollo.QueryResult<ValidatePasswordResetTokenQuery, ValidatePasswordResetTokenQueryVariables>;
-export const CheckoutDocument = gql`
-    mutation Checkout($recurringInterval: String!, $successUrlPath: String) {
-  checkout(recurringInterval: $recurringInterval, successUrlPath: $successUrlPath) {
+export const BillingPortalSessionDocument = gql`
+    query BillingPortalSession($returnUrlPath: String) {
+  billingPortalSession(returnUrlPath: $returnUrlPath) {
     url
   }
 }
     `;
-export type CheckoutMutationFn = Apollo.MutationFunction<CheckoutMutation, CheckoutMutationVariables>;
 
 /**
- * __useCheckoutMutation__
+ * __useBillingPortalSessionQuery__
  *
- * To run a mutation, you first call `useCheckoutMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useCheckoutMutation` returns a tuple that includes:
+ * To run a query within a React component, call `useBillingPortalSessionQuery` and pass it any options that fit your needs.
+ * When your component renders, `useBillingPortalSessionQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useBillingPortalSessionQuery({
+ *   variables: {
+ *      returnUrlPath: // value for 'returnUrlPath'
+ *   },
+ * });
+ */
+export function useBillingPortalSessionQuery(baseOptions?: Apollo.QueryHookOptions<BillingPortalSessionQuery, BillingPortalSessionQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<BillingPortalSessionQuery, BillingPortalSessionQueryVariables>(BillingPortalSessionDocument, options);
+      }
+export function useBillingPortalSessionLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<BillingPortalSessionQuery, BillingPortalSessionQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<BillingPortalSessionQuery, BillingPortalSessionQueryVariables>(BillingPortalSessionDocument, options);
+        }
+export type BillingPortalSessionQueryHookResult = ReturnType<typeof useBillingPortalSessionQuery>;
+export type BillingPortalSessionLazyQueryHookResult = ReturnType<typeof useBillingPortalSessionLazyQuery>;
+export type BillingPortalSessionQueryResult = Apollo.QueryResult<BillingPortalSessionQuery, BillingPortalSessionQueryVariables>;
+export const CheckoutSessionDocument = gql`
+    mutation CheckoutSession($recurringInterval: String!, $successUrlPath: String) {
+  checkoutSession(
+    recurringInterval: $recurringInterval
+    successUrlPath: $successUrlPath
+  ) {
+    url
+  }
+}
+    `;
+export type CheckoutSessionMutationFn = Apollo.MutationFunction<CheckoutSessionMutation, CheckoutSessionMutationVariables>;
+
+/**
+ * __useCheckoutSessionMutation__
+ *
+ * To run a mutation, you first call `useCheckoutSessionMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useCheckoutSessionMutation` returns a tuple that includes:
  * - A mutate function that you can call at any time to execute the mutation
  * - An object with fields that represent the current status of the mutation's execution
  *
  * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
  *
  * @example
- * const [checkoutMutation, { data, loading, error }] = useCheckoutMutation({
+ * const [checkoutSessionMutation, { data, loading, error }] = useCheckoutSessionMutation({
  *   variables: {
  *      recurringInterval: // value for 'recurringInterval'
  *      successUrlPath: // value for 'successUrlPath'
  *   },
  * });
  */
-export function useCheckoutMutation(baseOptions?: Apollo.MutationHookOptions<CheckoutMutation, CheckoutMutationVariables>) {
+export function useCheckoutSessionMutation(baseOptions?: Apollo.MutationHookOptions<CheckoutSessionMutation, CheckoutSessionMutationVariables>) {
         const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useMutation<CheckoutMutation, CheckoutMutationVariables>(CheckoutDocument, options);
+        return Apollo.useMutation<CheckoutSessionMutation, CheckoutSessionMutationVariables>(CheckoutSessionDocument, options);
       }
-export type CheckoutMutationHookResult = ReturnType<typeof useCheckoutMutation>;
-export type CheckoutMutationResult = Apollo.MutationResult<CheckoutMutation>;
-export type CheckoutMutationOptions = Apollo.BaseMutationOptions<CheckoutMutation, CheckoutMutationVariables>;
+export type CheckoutSessionMutationHookResult = ReturnType<typeof useCheckoutSessionMutation>;
+export type CheckoutSessionMutationResult = Apollo.MutationResult<CheckoutSessionMutation>;
+export type CheckoutSessionMutationOptions = Apollo.BaseMutationOptions<CheckoutSessionMutation, CheckoutSessionMutationVariables>;
 export const GetProductPricesDocument = gql`
     query GetProductPrices($product: String!) {
   getProductPrices(product: $product) {
@@ -1636,6 +2096,38 @@ export function useGetProductPricesLazyQuery(baseOptions?: Apollo.LazyQueryHookO
 export type GetProductPricesQueryHookResult = ReturnType<typeof useGetProductPricesQuery>;
 export type GetProductPricesLazyQueryHookResult = ReturnType<typeof useGetProductPricesLazyQuery>;
 export type GetProductPricesQueryResult = Apollo.QueryResult<GetProductPricesQuery, GetProductPricesQueryVariables>;
+export const UpdateBillingSubscriptionDocument = gql`
+    mutation UpdateBillingSubscription {
+  updateBillingSubscription {
+    success
+  }
+}
+    `;
+export type UpdateBillingSubscriptionMutationFn = Apollo.MutationFunction<UpdateBillingSubscriptionMutation, UpdateBillingSubscriptionMutationVariables>;
+
+/**
+ * __useUpdateBillingSubscriptionMutation__
+ *
+ * To run a mutation, you first call `useUpdateBillingSubscriptionMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useUpdateBillingSubscriptionMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [updateBillingSubscriptionMutation, { data, loading, error }] = useUpdateBillingSubscriptionMutation({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useUpdateBillingSubscriptionMutation(baseOptions?: Apollo.MutationHookOptions<UpdateBillingSubscriptionMutation, UpdateBillingSubscriptionMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<UpdateBillingSubscriptionMutation, UpdateBillingSubscriptionMutationVariables>(UpdateBillingSubscriptionDocument, options);
+      }
+export type UpdateBillingSubscriptionMutationHookResult = ReturnType<typeof useUpdateBillingSubscriptionMutation>;
+export type UpdateBillingSubscriptionMutationResult = Apollo.MutationResult<UpdateBillingSubscriptionMutation>;
+export type UpdateBillingSubscriptionMutationOptions = Apollo.BaseMutationOptions<UpdateBillingSubscriptionMutation, UpdateBillingSubscriptionMutationVariables>;
 export const GetClientConfigDocument = gql`
     query GetClientConfig {
   clientConfig {
@@ -1661,6 +2153,8 @@ export const GetClientConfigDocument = gql`
     }
     sentry {
       dsn
+      environment
+      release
     }
   }
 }
@@ -1853,6 +2347,19 @@ export const GetCurrentUserDocument = gql`
         value
         workspaceId
       }
+      currentCacheVersion
+      currentBillingSubscription {
+        status
+        interval
+      }
+    }
+    workspaces {
+      workspace {
+        id
+        displayName
+        logo
+        domainName
+      }
     }
   }
 }
diff --git a/packages/twenty-front/src/hooks/useDefaultHomePagePath.tsx b/packages/twenty-front/src/hooks/useDefaultHomePagePath.tsx
index 6f0c25d4a738..8ed52fe8cff4 100644
--- a/packages/twenty-front/src/hooks/useDefaultHomePagePath.tsx
+++ b/packages/twenty-front/src/hooks/useDefaultHomePagePath.tsx
@@ -1,25 +1,19 @@
-import { useCachedRootQuery } from '@/apollo/hooks/useCachedRootQuery';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { QueryMethodName } from '@/object-metadata/types/QueryMethodName';
+import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
+import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
 
 export const useDefaultHomePagePath = () => {
   const { objectMetadataItem: companyObjectMetadataItem } =
     useObjectMetadataItem({
       objectNameSingular: CoreObjectNameSingular.Company,
     });
-  const { objectMetadataItem: viewObjectMetadataItem } = useObjectMetadataItem({
-    objectNameSingular: CoreObjectNameSingular.View,
-  });
-  const { cachedRootQuery } = useCachedRootQuery({
-    objectMetadataItem: viewObjectMetadataItem,
-    queryMethodName: QueryMethodName.FindMany,
-  });
 
-  const companyViewId = cachedRootQuery?.views?.edges?.find(
-    (view: any) =>
-      view?.node?.objectMetadataId === companyObjectMetadataItem.id,
-  )?.node.id;
+  const { records } = usePrefetchedData(PrefetchKey.AllViews);
+
+  const companyViewId = records.find(
+    (view: any) => view?.objectMetadataId === companyObjectMetadataItem.id,
+  )?.id;
   const defaultHomePagePath =
     '/objects/companies' + (companyViewId ? `?view=${companyViewId}` : '');
 
diff --git a/packages/twenty-front/src/index.tsx b/packages/twenty-front/src/index.tsx
index ddb5673813e9..5629ac82fe89 100644
--- a/packages/twenty-front/src/index.tsx
+++ b/packages/twenty-front/src/index.tsx
@@ -13,6 +13,7 @@ import { ExceptionHandlerProvider } from '@/error-handler/components/ExceptionHa
 import { PromiseRejectionEffect } from '@/error-handler/components/PromiseRejectionEffect';
 import { ApolloMetadataClientProvider } from '@/object-metadata/components/ApolloMetadataClientProvider';
 import { ObjectMetadataItemsProvider } from '@/object-metadata/components/ObjectMetadataItemsProvider';
+import { PrefetchDataProvider } from '@/prefetch/components/PrefetchDataProvider';
 import { IconsProvider } from '@/ui/display/icon/components/IconsProvider';
 import { DialogManager } from '@/ui/feedback/dialog-manager/components/DialogManager';
 import { DialogManagerScope } from '@/ui/feedback/dialog-manager/scopes/DialogManagerScope';
@@ -48,6 +49,7 @@ root.render(
                     <UserProvider>
                       <ApolloMetadataClientProvider>
                         <ObjectMetadataItemsProvider>
+                        <PrefetchDataProvider>
                           <AppThemeProvider>
                             <SnackBarProvider>
                               <DialogManagerScope dialogManagerScopeId="dialog-manager">
@@ -62,6 +64,7 @@ root.render(
                               </DialogManagerScope>
                             </SnackBarProvider>
                           </AppThemeProvider>
+                          </PrefetchDataProvider>
                           <PageChangeEffect />
                         </ObjectMetadataItemsProvider>
                       </ApolloMetadataClientProvider>
diff --git a/packages/twenty-front/src/modules/accounts/types/CalendarChannel.ts b/packages/twenty-front/src/modules/accounts/types/CalendarChannel.ts
new file mode 100644
index 000000000000..173bf3c9252d
--- /dev/null
+++ b/packages/twenty-front/src/modules/accounts/types/CalendarChannel.ts
@@ -0,0 +1,12 @@
+export enum CalendarChannelVisibility {
+  Everything = 'SHARE_EVERYTHING',
+  Metadata = 'METADATA',
+}
+
+export type CalendarChannel = {
+  id: string;
+  handle: string;
+  isContactAutoCreationEnabled?: boolean;
+  isSyncEnabled?: boolean;
+  visibility: CalendarChannelVisibility;
+};
diff --git a/packages/twenty-front/src/modules/accounts/types/ConnectedAccount.ts b/packages/twenty-front/src/modules/accounts/types/ConnectedAccount.ts
index 8d96550609a3..45aece6ae0c2 100644
--- a/packages/twenty-front/src/modules/accounts/types/ConnectedAccount.ts
+++ b/packages/twenty-front/src/modules/accounts/types/ConnectedAccount.ts
@@ -11,5 +11,6 @@ export type ConnectedAccount = {
   refreshToken: string;
   accountOwnerId: string;
   lastSyncHistoryId: string;
+  authFailedAt: Date | null;
   messageChannels: MessageChannelConnection;
 };
diff --git a/packages/twenty-front/src/modules/activities/blocks/FileBlock.tsx b/packages/twenty-front/src/modules/activities/blocks/FileBlock.tsx
index 09052ec98773..1230d592b4bd 100644
--- a/packages/twenty-front/src/modules/activities/blocks/FileBlock.tsx
+++ b/packages/twenty-front/src/modules/activities/blocks/FileBlock.tsx
@@ -1,46 +1,21 @@
 import { ChangeEvent, useRef } from 'react';
-import {
-  BlockFromConfig,
-  BlockNoteEditor,
-  InlineContentSchema,
-  PropSchema,
-  StyleSchema,
-} from '@blocknote/core';
 import { createReactBlockSpec } from '@blocknote/react';
 import styled from '@emotion/styled';
+import { isNonEmptyString } from '@sniptt/guards';
 
 import { Button } from '@/ui/input/button/components/Button';
 import { AppThemeProvider } from '@/ui/theme/components/AppThemeProvider';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 import { AttachmentIcon } from '../files/components/AttachmentIcon';
 import { AttachmentType } from '../files/types/Attachment';
 import { getFileType } from '../files/utils/getFileType';
 
-import { blockSpecs } from './blockSpecs';
-
-export const filePropSchema = {
-  // File url
-  url: {
-    default: '' as string,
-  },
-  name: {
-    default: '' as string,
-  },
-  fileType: {
-    default: 'Other' as AttachmentType,
-  },
-} satisfies PropSchema;
-
 const StyledFileInput = styled.input`
   display: none;
 `;
 
-const FileBlockConfig = {
-  type: 'file' as const,
-  propSchema: filePropSchema,
-  content: 'none' as const,
-};
-
 const StyledFileLine = styled.div`
   align-items: center;
   display: flex;
@@ -63,75 +38,82 @@ const StyledUploadFileContainer = styled.div`
   gap: ${({ theme }) => theme.spacing(2)};
 `;
 
-const FileBlockRenderer = ({
-  block,
-  editor,
-}: {
-  block: BlockFromConfig<
-    typeof FileBlockConfig,
-    InlineContentSchema,
-    StyleSchema
-  >;
-  editor: BlockNoteEditor<typeof blockSpecs, InlineContentSchema, StyleSchema>;
-}) => {
-  const inputFileRef = useRef<HTMLInputElement>(null);
-
-  const handleUploadAttachment = async (file: File) => {
-    if (!file) {
-      return '';
-    }
-    const fileUrl = await editor.uploadFile?.(file);
-
-    editor.updateBlock(block.id, {
-      props: {
-        ...block.props,
-        ...{ url: fileUrl, fileType: getFileType(file.name), name: file.name },
+export const FileBlock = createReactBlockSpec(
+  {
+    type: 'file',
+    propSchema: {
+      url: {
+        default: '' as string,
+      },
+      name: {
+        default: '' as string,
+      },
+      fileType: {
+        default: 'Other' as AttachmentType,
       },
-    });
-  };
-  const handleUploadFileClick = () => {
-    inputFileRef?.current?.click?.();
-  };
-  const handleFileChange = (e: ChangeEvent<HTMLInputElement>) => {
-    if (e.target.files) handleUploadAttachment?.(e.target.files[0]);
-  };
+    },
+    content: 'none',
+  },
+  {
+    render: ({ block, editor }) => {
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      const inputFileRef = useRef<HTMLInputElement>(null);
 
-  if (block.props.url) {
-    return (
-      <AppThemeProvider>
-        <StyledFileLine>
-          <AttachmentIcon
-            attachmentType={block.props.fileType as AttachmentType}
-          ></AttachmentIcon>
-          <StyledLink href={block.props.url} target="__blank">
-            {block.props.name}
-          </StyledLink>
-        </StyledFileLine>
-      </AppThemeProvider>
-    );
-  }
+      const handleUploadAttachment = async (file: File) => {
+        if (isUndefinedOrNull(file)) {
+          return '';
+        }
+        const fileUrl = await editor.uploadFile?.(file);
+
+        editor.updateBlock(block.id, {
+          props: {
+            ...block.props,
+            ...{
+              url: fileUrl,
+              fileType: getFileType(file.name),
+              name: file.name,
+            },
+          },
+        });
+      };
+      const handleUploadFileClick = () => {
+        inputFileRef?.current?.click?.();
+      };
+      const handleFileChange = (e: ChangeEvent<HTMLInputElement>) => {
+        if (isDefined(e.target.files))
+          handleUploadAttachment?.(e.target.files[0]);
+      };
 
-  return (
-    <AppThemeProvider>
-      <StyledUploadFileContainer>
-        <StyledFileInput
-          ref={inputFileRef}
-          onChange={handleFileChange}
-          type="file"
-        />
-        <Button onClick={handleUploadFileClick} title="Upload File"></Button>
-      </StyledUploadFileContainer>
-    </AppThemeProvider>
-  );
-};
+      if (isNonEmptyString(block.props.url)) {
+        return (
+          <AppThemeProvider>
+            <StyledFileLine>
+              <AttachmentIcon
+                attachmentType={block.props.fileType as AttachmentType}
+              ></AttachmentIcon>
+              <StyledLink href={block.props.url} target="__blank">
+                {block.props.name}
+              </StyledLink>
+            </StyledFileLine>
+          </AppThemeProvider>
+        );
+      }
 
-export const FileBlock = createReactBlockSpec(FileBlockConfig, {
-  render: (block) => {
-    return (
-      <FileBlockRenderer
-        block={block.block}
-        editor={block.editor}
-      ></FileBlockRenderer>
-    );
+      return (
+        <AppThemeProvider>
+          <StyledUploadFileContainer>
+            <StyledFileInput
+              ref={inputFileRef}
+              onChange={handleFileChange}
+              type="file"
+            />
+            <Button
+              onClick={handleUploadFileClick}
+              title="Upload File"
+            ></Button>
+          </StyledUploadFileContainer>
+        </AppThemeProvider>
+      );
+    },
   },
-});
+);
diff --git a/packages/twenty-front/src/modules/activities/blocks/blockSpecs.ts b/packages/twenty-front/src/modules/activities/blocks/blockSpecs.ts
deleted file mode 100644
index fd95c52f241c..000000000000
--- a/packages/twenty-front/src/modules/activities/blocks/blockSpecs.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { defaultBlockSpecs } from '@blocknote/core';
-
-import { FileBlock } from './FileBlock';
-
-export const blockSpecs: any = {
-  ...defaultBlockSpecs,
-  file: FileBlock,
-};
diff --git a/packages/twenty-front/src/modules/activities/blocks/schema.ts b/packages/twenty-front/src/modules/activities/blocks/schema.ts
index 78e83e7d20d6..d6ea82eac19b 100644
--- a/packages/twenty-front/src/modules/activities/blocks/schema.ts
+++ b/packages/twenty-front/src/modules/activities/blocks/schema.ts
@@ -1,8 +1,10 @@
-import { BlockSchema, defaultBlockSchema } from '@blocknote/core';
+import { BlockNoteSchema, defaultBlockSpecs } from '@blocknote/core';
 
 import { FileBlock } from './FileBlock';
 
-export const blockSchema: BlockSchema = {
-  ...defaultBlockSchema,
-  file: FileBlock.config,
-};
+export const blockSchema = BlockNoteSchema.create({
+  blockSpecs: {
+    ...defaultBlockSpecs,
+    file: FileBlock,
+  },
+});
diff --git a/packages/twenty-front/src/modules/activities/blocks/slashMenu.tsx b/packages/twenty-front/src/modules/activities/blocks/slashMenu.tsx
index 437d61f3fdcf..8db3376e8163 100644
--- a/packages/twenty-front/src/modules/activities/blocks/slashMenu.tsx
+++ b/packages/twenty-front/src/modules/activities/blocks/slashMenu.tsx
@@ -1,30 +1,45 @@
-import {
-  BlockNoteEditor,
-  InlineContentSchema,
-  StyleSchema,
-} from '@blocknote/core';
 import { getDefaultReactSlashMenuItems } from '@blocknote/react';
+import {
+  IconFile,
+  IconH1,
+  IconH2,
+  IconH3,
+  IconList,
+  IconListNumbers,
+  IconPhoto,
+  IconPilcrow,
+  IconTable,
+} from 'twenty-ui';
 
-import { IconFile } from '@/ui/display/icon';
+import { IconComponent } from '@/ui/display/icon/types/IconComponent';
+import { SuggestionItem } from '@/ui/input/editor/components/CustomSlashMenu';
 
 import { blockSchema } from './schema';
 
-export const getSlashMenu = () => {
-  const items = [
-    ...getDefaultReactSlashMenuItems(blockSchema),
+const Icons: Record<string, IconComponent> = {
+  'Heading 1': IconH1,
+  'Heading 2': IconH2,
+  'Heading 3': IconH3,
+  'Numbered List': IconListNumbers,
+  'Bullet List': IconList,
+  Paragraph: IconPilcrow,
+  Table: IconTable,
+  Image: IconPhoto,
+};
+
+export const getSlashMenu = (editor: typeof blockSchema.BlockNoteEditor) => {
+  const items: SuggestionItem[] = [
+    ...getDefaultReactSlashMenuItems(editor).map((x) => ({
+      ...x,
+      Icon: Icons[x.title],
+    })),
     {
-      name: 'File',
+      title: 'File',
       aliases: ['file', 'folder'],
-      group: 'Media',
-      icon: <IconFile size={16} />,
-      hint: 'Insert a file',
-      execute: (
-        editor: BlockNoteEditor<
-          typeof blockSchema,
-          InlineContentSchema,
-          StyleSchema
-        >,
-      ) => {
+      Icon: IconFile,
+      onItemClick: () => {
+        const currentBlock = editor.getTextCursorPosition().block;
+
         editor.insertBlocks(
           [
             {
@@ -34,7 +49,7 @@ export const getSlashMenu = () => {
               },
             },
           ],
-          editor.getTextCursorPosition().block,
+          currentBlock,
           'before',
         );
       },
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx b/packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx
new file mode 100644
index 000000000000..11a41c8c2505
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx
@@ -0,0 +1,138 @@
+import styled from '@emotion/styled';
+import { format, getYear } from 'date-fns';
+
+import { CalendarMonthCard } from '@/activities/calendar/components/CalendarMonthCard';
+import { TIMELINE_CALENDAR_EVENTS_DEFAULT_PAGE_SIZE } from '@/activities/calendar/constants/Calendar';
+import { CalendarContext } from '@/activities/calendar/contexts/CalendarContext';
+import { useCalendarEvents } from '@/activities/calendar/hooks/useCalendarEvents';
+import { getTimelineCalendarEventsFromCompanyId } from '@/activities/calendar/queries/getTimelineCalendarEventsFromCompanyId';
+import { getTimelineCalendarEventsFromPersonId } from '@/activities/calendar/queries/getTimelineCalendarEventsFromPersonId';
+import { FetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';
+import { useCustomResolver } from '@/activities/hooks/useCustomResolver';
+import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { H3Title } from '@/ui/display/typography/components/H3Title';
+import AnimatedPlaceholder from '@/ui/layout/animated-placeholder/components/AnimatedPlaceholder';
+import {
+  AnimatedPlaceholderEmptyContainer,
+  AnimatedPlaceholderEmptySubTitle,
+  AnimatedPlaceholderEmptyTextContainer,
+  AnimatedPlaceholderEmptyTitle,
+} from '@/ui/layout/animated-placeholder/components/EmptyPlaceholderStyled';
+import { Section } from '@/ui/layout/section/components/Section';
+import { TimelineCalendarEventsWithTotal } from '~/generated/graphql';
+
+const StyledContainer = styled.div`
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  gap: ${({ theme }) => theme.spacing(8)};
+  padding: ${({ theme }) => theme.spacing(6)};
+  width: 100%;
+  overflow: scroll;
+`;
+
+const StyledYear = styled.span`
+  color: ${({ theme }) => theme.font.color.light};
+`;
+
+export const Calendar = ({
+  targetableObject,
+}: {
+  targetableObject: ActivityTargetableObject;
+}) => {
+  const [query, queryName] =
+    targetableObject.targetObjectNameSingular === CoreObjectNameSingular.Person
+      ? [
+          getTimelineCalendarEventsFromPersonId,
+          'getTimelineCalendarEventsFromPersonId',
+        ]
+      : [
+          getTimelineCalendarEventsFromCompanyId,
+          'getTimelineCalendarEventsFromCompanyId',
+        ];
+
+  const { data, firstQueryLoading, isFetchingMore, fetchMoreRecords } =
+    useCustomResolver<TimelineCalendarEventsWithTotal>(
+      query,
+      queryName,
+      'timelineCalendarEvents',
+      targetableObject,
+      TIMELINE_CALENDAR_EVENTS_DEFAULT_PAGE_SIZE,
+    );
+
+  const { timelineCalendarEvents } = data?.[queryName] ?? {};
+
+  const {
+    calendarEventsByDayTime,
+    currentCalendarEvent,
+    daysByMonthTime,
+    getNextCalendarEvent,
+    monthTimes,
+    monthTimesByYear,
+    updateCurrentCalendarEvent,
+  } = useCalendarEvents(timelineCalendarEvents || []);
+
+  if (firstQueryLoading) {
+    // TODO: implement loader
+    return;
+  }
+
+  if (!firstQueryLoading && !timelineCalendarEvents?.length) {
+    // TODO: change animated placeholder
+    return (
+      <AnimatedPlaceholderEmptyContainer>
+        <AnimatedPlaceholder type="noMatchRecord" />
+        <AnimatedPlaceholderEmptyTextContainer>
+          <AnimatedPlaceholderEmptyTitle>
+            No Events
+          </AnimatedPlaceholderEmptyTitle>
+          <AnimatedPlaceholderEmptySubTitle>
+            No events have been scheduled with this{' '}
+            {targetableObject.targetObjectNameSingular} yet.
+          </AnimatedPlaceholderEmptySubTitle>
+        </AnimatedPlaceholderEmptyTextContainer>
+      </AnimatedPlaceholderEmptyContainer>
+    );
+  }
+
+  return (
+    <CalendarContext.Provider
+      value={{
+        calendarEventsByDayTime,
+        currentCalendarEvent,
+        displayCurrentEventCursor: true,
+        getNextCalendarEvent,
+        updateCurrentCalendarEvent,
+      }}
+    >
+      <StyledContainer>
+        {monthTimes.map((monthTime) => {
+          const monthDayTimes = daysByMonthTime[monthTime] || [];
+          const year = getYear(monthTime);
+          const lastMonthTimeOfYear = monthTimesByYear[year]?.[0];
+          const isLastMonthOfYear = lastMonthTimeOfYear === monthTime;
+          const monthLabel = format(monthTime, 'MMMM');
+
+          return (
+            <Section key={monthTime}>
+              <H3Title
+                title={
+                  <>
+                    {monthLabel}
+                    {isLastMonthOfYear && <StyledYear> {year}</StyledYear>}
+                  </>
+                }
+              />
+              <CalendarMonthCard dayTimes={monthDayTimes} />
+            </Section>
+          );
+        })}
+        <FetchMoreLoader
+          loading={isFetchingMore || firstQueryLoading}
+          onLastRowVisible={fetchMoreRecords}
+        />
+      </StyledContainer>
+    </CalendarContext.Provider>
+  );
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarCurrentEventCursor.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarCurrentEventCursor.tsx
new file mode 100644
index 000000000000..02d11fa87e7a
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarCurrentEventCursor.tsx
@@ -0,0 +1,173 @@
+import { useContext, useMemo, useState } from 'react';
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import {
+  differenceInSeconds,
+  isThisMonth,
+  startOfDay,
+  startOfMonth,
+} from 'date-fns';
+import { AnimatePresence, motion } from 'framer-motion';
+
+import { CalendarContext } from '@/activities/calendar/contexts/CalendarContext';
+import { getCalendarEventEndDate } from '@/activities/calendar/utils/getCalendarEventEndDate';
+import { getCalendarEventStartDate } from '@/activities/calendar/utils/getCalendarEventStartDate';
+import { hasCalendarEventEnded } from '@/activities/calendar/utils/hasCalendarEventEnded';
+import { hasCalendarEventStarted } from '@/activities/calendar/utils/hasCalendarEventStarted';
+import { TimelineCalendarEvent } from '~/generated-metadata/graphql';
+
+type CalendarCurrentEventCursorProps = {
+  calendarEvent: TimelineCalendarEvent;
+};
+
+const StyledCurrentEventCursor = styled(motion.div)`
+  align-items: center;
+  background-color: ${({ theme }) => theme.font.color.danger};
+  display: inline-flex;
+  height: 1.5px;
+  left: 0;
+  position: absolute;
+  right: 0;
+  border-radius: ${({ theme }) => theme.border.radius.sm};
+  transform: translateY(-50%);
+
+  &::before {
+    background-color: ${({ theme }) => theme.font.color.danger};
+    border-radius: 1px;
+    content: '';
+    display: block;
+    height: ${({ theme }) => theme.spacing(1)};
+    width: ${({ theme }) => theme.spacing(1)};
+  }
+`;
+
+export const CalendarCurrentEventCursor = ({
+  calendarEvent,
+}: CalendarCurrentEventCursorProps) => {
+  const theme = useTheme();
+  const {
+    calendarEventsByDayTime,
+    currentCalendarEvent,
+    getNextCalendarEvent,
+    updateCurrentCalendarEvent,
+  } = useContext(CalendarContext);
+
+  const nextCalendarEvent = getNextCalendarEvent(calendarEvent);
+  const nextCalendarEventStartsAt = nextCalendarEvent
+    ? getCalendarEventStartDate(nextCalendarEvent)
+    : undefined;
+  const isNextEventThisMonth =
+    !!nextCalendarEventStartsAt && isThisMonth(nextCalendarEventStartsAt);
+
+  const calendarEventStartsAt = getCalendarEventStartDate(calendarEvent);
+  const calendarEventEndsAt = getCalendarEventEndDate(calendarEvent);
+
+  const isCurrent = currentCalendarEvent?.id === calendarEvent.id;
+  const [hasStarted, setHasStarted] = useState(
+    hasCalendarEventStarted(calendarEvent),
+  );
+  const [hasEnded, setHasEnded] = useState(
+    hasCalendarEventEnded(calendarEvent),
+  );
+  const [isWaiting, setIsWaiting] = useState(hasEnded && !isNextEventThisMonth);
+
+  const dayTime = startOfDay(calendarEventStartsAt).getTime();
+  const dayEvents = calendarEventsByDayTime[dayTime];
+  const isFirstEventOfDay = dayEvents?.slice(-1)[0] === calendarEvent;
+  const isLastEventOfDay = dayEvents?.[0] === calendarEvent;
+
+  const topOffset = isLastEventOfDay ? 9 : 6;
+  const bottomOffset = isFirstEventOfDay ? 9 : 6;
+
+  const currentEventCursorVariants = {
+    beforeEvent: { top: `calc(100% + ${bottomOffset}px)` },
+    eventStart: {
+      top: 'calc(100% + 3px)',
+      transition: {
+        delay: Math.max(
+          0,
+          differenceInSeconds(calendarEventStartsAt, new Date()),
+        ),
+      },
+    },
+    eventEnd: {
+      top: `-${topOffset}px`,
+      transition: {
+        delay: Math.max(
+          0,
+          differenceInSeconds(calendarEventEndsAt, new Date()) + 1,
+        ),
+      },
+    },
+    fadeAway: {
+      opacity: 0,
+      top: `-${topOffset}px`,
+      transition: {
+        delay:
+          isWaiting && nextCalendarEventStartsAt
+            ? differenceInSeconds(
+                startOfMonth(nextCalendarEventStartsAt),
+                new Date(),
+              )
+            : 0,
+      },
+    },
+  };
+
+  const animationSequence = useMemo(() => {
+    if (!hasStarted) return { initial: 'beforeEvent', animate: 'eventStart' };
+
+    if (!hasEnded) {
+      return { initial: 'eventStart', animate: 'eventEnd' };
+    }
+
+    if (!isWaiting) {
+      return { initial: undefined, animate: 'eventEnd' };
+    }
+
+    return { initial: 'eventEnd', animate: 'fadeAway' };
+  }, [hasEnded, hasStarted, isWaiting]);
+
+  return (
+    <AnimatePresence>
+      {isCurrent && (
+        <StyledCurrentEventCursor
+          key={calendarEvent.id}
+          initial={animationSequence.initial}
+          animate={animationSequence.animate}
+          exit="fadeAway"
+          variants={currentEventCursorVariants}
+          onAnimationComplete={(stage) => {
+            if (stage === 'eventStart') {
+              setHasStarted(true);
+            }
+
+            if (stage === 'eventEnd') {
+              setHasEnded(true);
+
+              if (isNextEventThisMonth) {
+                updateCurrentCalendarEvent();
+              }
+              // If the next event is not the same month as the current event,
+              // we don't want the cursor to jump to the next month until the next month starts.
+              // => Wait for the upcoming event's month to start before moving the cursor.
+              // Example: we're in March. The previous event is February 15th, and the next event is April 10th.
+              // We want the cursor to stay in February until April starts.
+              else {
+                setIsWaiting(true);
+              }
+            }
+
+            if (isWaiting && stage === 'fadeAway') {
+              setIsWaiting(false);
+              updateCurrentCalendarEvent();
+            }
+          }}
+          transition={{
+            duration: theme.animation.duration.normal,
+          }}
+        />
+      )}
+    </AnimatePresence>
+  );
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarDayCardContent.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarDayCardContent.tsx
new file mode 100644
index 000000000000..c4ff26571109
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarDayCardContent.tsx
@@ -0,0 +1,93 @@
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import { differenceInSeconds, endOfDay, format } from 'date-fns';
+
+import { CalendarEventRow } from '@/activities/calendar/components/CalendarEventRow';
+import { getCalendarEventStartDate } from '@/activities/calendar/utils/getCalendarEventStartDate';
+import { CardContent } from '@/ui/layout/card/components/CardContent';
+import { TimelineCalendarEvent } from '~/generated-metadata/graphql';
+
+type CalendarDayCardContentProps = {
+  calendarEvents: TimelineCalendarEvent[];
+  divider?: boolean;
+};
+
+const StyledCardContent = styled(CardContent)`
+  align-items: flex-start;
+  border-color: ${({ theme }) => theme.border.color.light};
+  display: flex;
+  flex-direction: row;
+  gap: ${({ theme }) => theme.spacing(3)};
+  padding: ${({ theme }) => theme.spacing(2, 3)};
+`;
+
+const StyledDayContainer = styled.div`
+  text-align: center;
+  width: ${({ theme }) => theme.spacing(6)};
+`;
+
+const StyledWeekDay = styled.div`
+  color: ${({ theme }) => theme.font.color.tertiary};
+  font-size: ${({ theme }) => theme.font.size.xxs};
+  font-weight: ${({ theme }) => theme.font.weight.semiBold};
+`;
+
+const StyledMonthDay = styled.div`
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+`;
+
+const StyledEvents = styled.div`
+  align-items: stretch;
+  display: flex;
+  flex: 1 0 auto;
+  flex-direction: column;
+  gap: ${({ theme }) => theme.spacing(3)};
+`;
+
+const StyledEventRow = styled(CalendarEventRow)`
+  flex: 1 0 auto;
+`;
+
+export const CalendarDayCardContent = ({
+  calendarEvents,
+  divider,
+}: CalendarDayCardContentProps) => {
+  const theme = useTheme();
+
+  const endOfDayDate = endOfDay(getCalendarEventStartDate(calendarEvents[0]));
+  const dayEndsIn = differenceInSeconds(endOfDayDate, Date.now());
+
+  const weekDayLabel = format(endOfDayDate, 'EE');
+  const monthDayLabel = format(endOfDayDate, 'dd');
+
+  const upcomingDayCardContentVariants = {
+    upcoming: {},
+    ended: { backgroundColor: theme.background.primary },
+  };
+
+  return (
+    <StyledCardContent
+      divider={divider}
+      initial="upcoming"
+      animate="ended"
+      variants={upcomingDayCardContentVariants}
+      transition={{
+        delay: Math.max(0, dayEndsIn),
+        duration: theme.animation.duration.fast,
+      }}
+    >
+      <StyledDayContainer>
+        <StyledWeekDay>{weekDayLabel}</StyledWeekDay>
+        <StyledMonthDay>{monthDayLabel}</StyledMonthDay>
+      </StyledDayContainer>
+      <StyledEvents>
+        {calendarEvents.map((calendarEvent) => (
+          <StyledEventRow
+            key={calendarEvent.id}
+            calendarEvent={calendarEvent}
+          />
+        ))}
+      </StyledEvents>
+    </StyledCardContent>
+  );
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventDetails.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventDetails.tsx
new file mode 100644
index 000000000000..363ceafeb586
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventDetails.tsx
@@ -0,0 +1,154 @@
+import React from 'react';
+import { css, useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import { IconCalendarEvent } from 'twenty-ui';
+
+import { CalendarEventParticipantsResponseStatus } from '@/activities/calendar/components/CalendarEventParticipantsResponseStatus';
+import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';
+import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
+import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
+import { PropertyBox } from '@/object-record/record-inline-cell/property-box/components/PropertyBox';
+import {
+  Chip,
+  ChipAccent,
+  ChipSize,
+  ChipVariant,
+} from '@/ui/display/chip/components/Chip';
+import { mapArrayToObject } from '~/utils/array/mapArrayToObject';
+import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';
+
+type CalendarEventDetailsProps = {
+  calendarEvent: CalendarEvent;
+};
+
+const StyledContainer = styled.div`
+  background: ${({ theme }) => theme.background.secondary};
+  align-items: flex-start;
+  border-bottom: 1px solid ${({ theme }) => theme.border.color.medium};
+  display: flex;
+  flex-direction: column;
+  gap: ${({ theme }) => theme.spacing(6)};
+  padding: ${({ theme }) => theme.spacing(6)};
+  width: 100%;
+  box-sizing: border-box;
+`;
+
+const StyledEventChip = styled(Chip)`
+  gap: ${({ theme }) => theme.spacing(2)};
+  padding-left: ${({ theme }) => theme.spacing(2)};
+  padding-right: ${({ theme }) => theme.spacing(2)};
+`;
+
+const StyledHeader = styled.header``;
+
+const StyledTitle = styled.h2<{ canceled?: boolean }>`
+  color: ${({ theme }) => theme.font.color.primary};
+  font-weight: ${({ theme }) => theme.font.weight.semiBold};
+  margin: ${({ theme }) => theme.spacing(0, 0, 2)};
+
+  ${({ canceled }) =>
+    canceled &&
+    css`
+      text-decoration: line-through;
+    `}
+`;
+
+const StyledCreatedAt = styled.div`
+  color: ${({ theme }) => theme.font.color.tertiary};
+`;
+
+const StyledFields = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: ${({ theme }) => theme.spacing(3)};
+  width: 100%;
+`;
+
+const StyledPropertyBox = styled(PropertyBox)`
+  height: ${({ theme }) => theme.spacing(6)};
+  padding: 0;
+  width: 100%;
+`;
+
+export const CalendarEventDetails = ({
+  calendarEvent,
+}: CalendarEventDetailsProps) => {
+  const theme = useTheme();
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular: CoreObjectNameSingular.CalendarEvent,
+  });
+
+  const fieldsToDisplay = [
+    'startsAt',
+    'endsAt',
+    'conferenceLink',
+    'location',
+    'description',
+  ];
+
+  const fieldsByName = mapArrayToObject(
+    objectMetadataItem.fields,
+    ({ name }) => name,
+  );
+
+  const { calendarEventParticipants } = calendarEvent;
+
+  const Fields = fieldsToDisplay.map((fieldName) => (
+    <StyledPropertyBox key={fieldName}>
+      <FieldContext.Provider
+        value={{
+          entityId: calendarEvent.id,
+          hotkeyScope: 'calendar-event-details',
+          recoilScopeId: `${calendarEvent.id}-${fieldName}`,
+          isLabelIdentifier: false,
+          fieldDefinition: formatFieldMetadataItemAsFieldDefinition({
+            field: fieldsByName[fieldName],
+            objectMetadataItem,
+            showLabel: true,
+            labelWidth: 72,
+          }),
+          useUpdateRecord: () => [() => undefined, { loading: false }],
+          maxWidth: 300,
+        }}
+      >
+        <RecordInlineCell readonly />
+      </FieldContext.Provider>
+    </StyledPropertyBox>
+  ));
+
+  return (
+    <StyledContainer>
+      <StyledEventChip
+        accent={ChipAccent.TextSecondary}
+        size={ChipSize.Large}
+        variant={ChipVariant.Highlighted}
+        clickable={false}
+        leftComponent={<IconCalendarEvent size={theme.icon.size.md} />}
+        label="Event"
+      />
+      <StyledHeader>
+        <StyledTitle canceled={calendarEvent.isCanceled}>
+          {calendarEvent.title}
+        </StyledTitle>
+        <StyledCreatedAt>
+          Created{' '}
+          {beautifyPastDateRelativeToNow(
+            new Date(calendarEvent.externalCreatedAt),
+          )}
+        </StyledCreatedAt>
+      </StyledHeader>
+      <StyledFields>
+        {Fields.slice(0, 2)}
+        {calendarEventParticipants && (
+          <CalendarEventParticipantsResponseStatus
+            participants={calendarEventParticipants}
+          />
+        )}
+        {Fields.slice(2)}
+      </StyledFields>
+    </StyledContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsResponseStatus.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsResponseStatus.tsx
new file mode 100644
index 000000000000..1db72c28ac34
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsResponseStatus.tsx
@@ -0,0 +1,42 @@
+import groupBy from 'lodash.groupby';
+
+import { CalendarEventParticipantsResponseStatusField } from '@/activities/calendar/components/CalendarEventParticipantsResponseStatusField';
+import { CalendarEventParticipant } from '@/activities/calendar/types/CalendarEventParticipant';
+
+export const CalendarEventParticipantsResponseStatus = ({
+  participants,
+}: {
+  participants: CalendarEventParticipant[];
+}) => {
+  const groupedParticipants = groupBy(participants, (participant) => {
+    switch (participant.responseStatus) {
+      case 'ACCEPTED':
+        return 'Yes';
+      case 'DECLINED':
+        return 'No';
+      case 'NEEDS_ACTION':
+      case 'TENTATIVE':
+        return 'Maybe';
+      default:
+        return '';
+    }
+  });
+
+  const responseStatusOrder: ('Yes' | 'Maybe' | 'No')[] = [
+    'Yes',
+    'Maybe',
+    'No',
+  ];
+
+  return (
+    <>
+      {responseStatusOrder.map((responseStatus) => (
+        <CalendarEventParticipantsResponseStatusField
+          key={responseStatus}
+          responseStatus={responseStatus}
+          participants={groupedParticipants[responseStatus] || []}
+        />
+      ))}
+    </>
+  );
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsResponseStatusField.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsResponseStatusField.tsx
new file mode 100644
index 000000000000..6a83a6f723b5
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventParticipantsResponseStatusField.tsx
@@ -0,0 +1,108 @@
+import { useRef } from 'react';
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import { IconCheck, IconQuestionMark, IconX } from 'twenty-ui';
+import { v4 } from 'uuid';
+
+import { CalendarEventParticipant } from '@/activities/calendar/types/CalendarEventParticipant';
+import { ParticipantChip } from '@/activities/components/ParticipantChip';
+import { PropertyBox } from '@/object-record/record-inline-cell/property-box/components/PropertyBox';
+import { ExpandableList } from '@/ui/display/expandable-list/ExpandableList';
+import { EllipsisDisplay } from '@/ui/field/display/components/EllipsisDisplay';
+
+const StyledInlineCellBaseContainer = styled.div`
+  align-items: center;
+  box-sizing: border-box;
+  width: 100%;
+  display: flex;
+
+  gap: ${({ theme }) => theme.spacing(1)};
+
+  position: relative;
+  user-select: none;
+`;
+
+const StyledPropertyBox = styled(PropertyBox)`
+  height: ${({ theme }) => theme.spacing(6)};
+  padding: 0;
+  width: 100%;
+`;
+
+const StyledIconContainer = styled.div`
+  align-items: center;
+  color: ${({ theme }) => theme.font.color.tertiary};
+  display: flex;
+  width: 16px;
+
+  svg {
+    align-items: center;
+    display: flex;
+    height: 16px;
+    justify-content: center;
+    width: 16px;
+  }
+`;
+
+const StyledLabelAndIconContainer = styled.div`
+  align-items: center;
+  color: ${({ theme }) => theme.font.color.tertiary};
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+`;
+
+const StyledLabelContainer = styled.div<{ width?: number }>`
+  color: ${({ theme }) => theme.font.color.tertiary};
+  font-size: ${({ theme }) => theme.font.size.sm};
+  width: ${({ width }) => width}px;
+`;
+
+export const CalendarEventParticipantsResponseStatusField = ({
+  responseStatus,
+  participants,
+}: {
+  responseStatus: 'Yes' | 'Maybe' | 'No';
+  participants: CalendarEventParticipant[];
+}) => {
+  const theme = useTheme();
+
+  const Icon = {
+    Yes: <IconCheck stroke={theme.icon.stroke.sm} />,
+    Maybe: <IconQuestionMark stroke={theme.icon.stroke.sm} />,
+    No: <IconX stroke={theme.icon.stroke.sm} />,
+  }[responseStatus];
+
+  // We want to display external participants first
+  const orderedParticipants = [
+    ...participants.filter((participant) => participant.person),
+    ...participants.filter(
+      (participant) => !participant.person && !participant.workspaceMember,
+    ),
+    ...participants.filter((participant) => participant.workspaceMember),
+  ];
+
+  const participantsContainerRef = useRef<HTMLDivElement>(null);
+
+  const StyledChips = orderedParticipants.map((participant) => (
+    <ParticipantChip participant={participant} />
+  ));
+
+  return (
+    <StyledPropertyBox>
+      <StyledInlineCellBaseContainer>
+        <StyledLabelAndIconContainer>
+          <StyledIconContainer>{Icon}</StyledIconContainer>
+
+          <StyledLabelContainer width={72}>
+            <EllipsisDisplay>{responseStatus}</EllipsisDisplay>
+          </StyledLabelContainer>
+        </StyledLabelAndIconContainer>
+
+        <ExpandableList
+          listItems={StyledChips}
+          id={v4()}
+          rootRef={participantsContainerRef}
+        />
+      </StyledInlineCellBaseContainer>
+    </StyledPropertyBox>
+  );
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx
new file mode 100644
index 000000000000..1fbdeeb033f1
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx
@@ -0,0 +1,181 @@
+import { useContext } from 'react';
+import { css, useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import { format } from 'date-fns';
+import { useRecoilValue } from 'recoil';
+import { IconArrowRight, IconLock } from 'twenty-ui';
+
+import { CalendarCurrentEventCursor } from '@/activities/calendar/components/CalendarCurrentEventCursor';
+import { CalendarContext } from '@/activities/calendar/contexts/CalendarContext';
+import { useOpenCalendarEventRightDrawer } from '@/activities/calendar/right-drawer/hooks/useOpenCalendarEventRightDrawer';
+import { getCalendarEventEndDate } from '@/activities/calendar/utils/getCalendarEventEndDate';
+import { getCalendarEventStartDate } from '@/activities/calendar/utils/getCalendarEventStartDate';
+import { hasCalendarEventEnded } from '@/activities/calendar/utils/hasCalendarEventEnded';
+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
+import { Card } from '@/ui/layout/card/components/Card';
+import { CardContent } from '@/ui/layout/card/components/CardContent';
+import { Avatar } from '@/users/components/Avatar';
+import { AvatarGroup } from '@/users/components/AvatarGroup';
+import { TimelineCalendarEvent } from '~/generated-metadata/graphql';
+import { isDefined } from '~/utils/isDefined';
+
+type CalendarEventRowProps = {
+  calendarEvent: TimelineCalendarEvent;
+  className?: string;
+};
+
+const StyledContainer = styled.div<{ showTitle?: boolean }>`
+  align-items: center;
+  display: inline-flex;
+  gap: ${({ theme }) => theme.spacing(3)};
+  height: ${({ theme }) => theme.spacing(6)};
+  position: relative;
+  cursor: ${({ showTitle }) => (showTitle ? 'pointer' : 'not-allowed')};
+`;
+
+const StyledAttendanceIndicator = styled.div<{ active?: boolean }>`
+  background-color: ${({ theme }) => theme.tag.background.gray};
+  height: 100%;
+  width: ${({ theme }) => theme.spacing(1)};
+  border-radius: ${({ theme }) => theme.border.radius.xs};
+
+  ${({ active, theme }) =>
+    active &&
+    css`
+      background-color: ${theme.tag.background.red};
+    `}
+`;
+
+const StyledLabels = styled.div`
+  align-items: center;
+  display: flex;
+  color: ${({ theme }) => theme.font.color.tertiary};
+  gap: ${({ theme }) => theme.spacing(2)};
+  flex: 1 0 auto;
+`;
+
+const StyledTime = styled.div`
+  align-items: center;
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+  width: ${({ theme }) => theme.spacing(26)};
+`;
+
+const StyledTitle = styled.div<{ active: boolean; canceled: boolean }>`
+  flex: 1 0 auto;
+
+  ${({ theme, active }) =>
+    active &&
+    css`
+      color: ${theme.font.color.primary};
+      font-weight: ${theme.font.weight.medium};
+    `}
+
+  ${({ canceled }) =>
+    canceled &&
+    css`
+      text-decoration: line-through;
+    `}
+`;
+
+const StyledVisibilityCard = styled(Card)<{ active: boolean }>`
+  color: ${({ active, theme }) =>
+    active ? theme.font.color.primary : theme.font.color.light};
+  border-color: ${({ theme }) => theme.border.color.light};
+  flex: 1 0 auto;
+  transition: color ${({ theme }) => theme.animation.duration.normal} ease;
+`;
+
+const StyledVisibilityCardContent = styled(CardContent)`
+  align-items: center;
+  font-size: ${({ theme }) => theme.font.size.sm};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+  padding: ${({ theme }) => theme.spacing(0, 1)};
+  height: ${({ theme }) => theme.spacing(6)};
+  background-color: ${({ theme }) => theme.background.transparent.lighter};
+`;
+
+export const CalendarEventRow = ({
+  calendarEvent,
+  className,
+}: CalendarEventRowProps) => {
+  const theme = useTheme();
+  const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
+  const { displayCurrentEventCursor = false } = useContext(CalendarContext);
+  const { openCalendarEventRightDrawer } = useOpenCalendarEventRightDrawer();
+
+  const startsAt = getCalendarEventStartDate(calendarEvent);
+  const endsAt = getCalendarEventEndDate(calendarEvent);
+  const hasEnded = hasCalendarEventEnded(calendarEvent);
+
+  const startTimeLabel = calendarEvent.isFullDay
+    ? 'All day'
+    : format(startsAt, 'HH:mm');
+  const endTimeLabel = calendarEvent.isFullDay ? '' : format(endsAt, 'HH:mm');
+
+  const isCurrentWorkspaceMemberAttending = calendarEvent.participants?.some(
+    ({ workspaceMemberId }) => workspaceMemberId === currentWorkspaceMember?.id,
+  );
+  const showTitle = calendarEvent.visibility === 'SHARE_EVERYTHING';
+
+  return (
+    <StyledContainer
+      className={className}
+      showTitle={showTitle}
+      onClick={
+        showTitle
+          ? () => openCalendarEventRightDrawer(calendarEvent.id)
+          : undefined
+      }
+    >
+      <StyledAttendanceIndicator active={isCurrentWorkspaceMemberAttending} />
+      <StyledLabels>
+        <StyledTime>
+          {startTimeLabel}
+          {endTimeLabel && (
+            <>
+              <IconArrowRight size={theme.icon.size.sm} />
+              {endTimeLabel}
+            </>
+          )}
+        </StyledTime>
+        {showTitle ? (
+          <StyledTitle active={!hasEnded} canceled={!!calendarEvent.isCanceled}>
+            {calendarEvent.title}
+          </StyledTitle>
+        ) : (
+          <StyledVisibilityCard active={!hasEnded}>
+            <StyledVisibilityCardContent>
+              <IconLock size={theme.icon.size.sm} />
+              Not shared
+            </StyledVisibilityCardContent>
+          </StyledVisibilityCard>
+        )}
+      </StyledLabels>
+      {!!calendarEvent.participants?.length && (
+        <AvatarGroup
+          avatars={calendarEvent.participants.map((participant) => (
+            <Avatar
+              key={[participant.workspaceMemberId, participant.displayName]
+                .filter(isDefined)
+                .join('-')}
+              avatarUrl={participant.avatarUrl}
+              placeholder={
+                participant.firstName && participant.lastName
+                  ? `${participant.firstName} ${participant.lastName}`
+                  : participant.displayName
+              }
+              entityId={participant.workspaceMemberId ?? participant.personId}
+              type="rounded"
+            />
+          ))}
+        />
+      )}
+      {displayCurrentEventCursor && (
+        <CalendarCurrentEventCursor calendarEvent={calendarEvent} />
+      )}
+    </StyledContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarMonthCard.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarMonthCard.tsx
new file mode 100644
index 000000000000..f42f2e35f594
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarMonthCard.tsx
@@ -0,0 +1,29 @@
+import { useContext } from 'react';
+
+import { CalendarDayCardContent } from '@/activities/calendar/components/CalendarDayCardContent';
+import { CalendarContext } from '@/activities/calendar/contexts/CalendarContext';
+import { Card } from '@/ui/layout/card/components/Card';
+
+type CalendarMonthCardProps = {
+  dayTimes: number[];
+};
+
+export const CalendarMonthCard = ({ dayTimes }: CalendarMonthCardProps) => {
+  const { calendarEventsByDayTime } = useContext(CalendarContext);
+
+  return (
+    <Card fullWidth>
+      {dayTimes.map((dayTime, index) => {
+        const dayCalendarEvents = calendarEventsByDayTime[dayTime] || [];
+
+        return (
+          <CalendarDayCardContent
+            key={dayTime}
+            calendarEvents={dayCalendarEvents}
+            divider={index < dayTimes.length - 1}
+          />
+        );
+      })}
+    </Card>
+  );
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/__stories__/Calendar.stories.tsx b/packages/twenty-front/src/modules/activities/calendar/components/__stories__/Calendar.stories.tsx
new file mode 100644
index 000000000000..82cba4e103e4
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/components/__stories__/Calendar.stories.tsx
@@ -0,0 +1,27 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { Calendar } from '@/activities/calendar/components/Calendar';
+import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
+import { graphqlMocks } from '~/testing/graphqlMocks';
+
+const meta: Meta<typeof Calendar> = {
+  title: 'Modules/Activities/Calendar/Calendar',
+  component: Calendar,
+  decorators: [ComponentDecorator, SnackBarDecorator],
+  parameters: {
+    container: { width: 728 },
+    msw: graphqlMocks,
+  },
+  args: {
+    targetableObject: {
+      id: '1',
+      targetObjectNameSingular: 'Person',
+    },
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof Calendar>;
+
+export const Default: Story = {};
diff --git a/packages/twenty-front/src/modules/activities/calendar/constants/Calendar.ts b/packages/twenty-front/src/modules/activities/calendar/constants/Calendar.ts
new file mode 100644
index 000000000000..e958b80883d1
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/constants/Calendar.ts
@@ -0,0 +1 @@
+export const TIMELINE_CALENDAR_EVENTS_DEFAULT_PAGE_SIZE = 10;
diff --git a/packages/twenty-front/src/modules/activities/calendar/contexts/CalendarContext.ts b/packages/twenty-front/src/modules/activities/calendar/contexts/CalendarContext.ts
new file mode 100644
index 000000000000..423b48f822e1
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/contexts/CalendarContext.ts
@@ -0,0 +1,19 @@
+import { createContext } from 'react';
+
+import { TimelineCalendarEvent } from '~/generated-metadata/graphql';
+
+type CalendarContextValue = {
+  calendarEventsByDayTime: Record<number, TimelineCalendarEvent[] | undefined>;
+  currentCalendarEvent?: TimelineCalendarEvent;
+  displayCurrentEventCursor?: boolean;
+  getNextCalendarEvent: (
+    calendarEvent: TimelineCalendarEvent,
+  ) => TimelineCalendarEvent | undefined;
+  updateCurrentCalendarEvent: () => void;
+};
+
+export const CalendarContext = createContext<CalendarContextValue>({
+  calendarEventsByDayTime: {},
+  getNextCalendarEvent: () => undefined,
+  updateCurrentCalendarEvent: () => {},
+});
diff --git a/packages/twenty-front/src/modules/activities/calendar/hooks/__tests__/useCalendarEvents.test.tsx b/packages/twenty-front/src/modules/activities/calendar/hooks/__tests__/useCalendarEvents.test.tsx
new file mode 100644
index 000000000000..498cc5ff75af
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/hooks/__tests__/useCalendarEvents.test.tsx
@@ -0,0 +1,53 @@
+import { act, renderHook } from '@testing-library/react';
+
+import { useCalendarEvents } from '@/activities/calendar/hooks/useCalendarEvents';
+import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
+
+const calendarEvents: CalendarEvent[] = [
+  {
+    id: '1234',
+    externalCreatedAt: '2024-02-17T20:45:43.854Z',
+    isFullDay: false,
+    startsAt: '2024-02-17T21:45:27.822Z',
+    visibility: 'METADATA',
+  },
+  {
+    id: '5678',
+    externalCreatedAt: '2024-02-18T19:43:37.854Z',
+    isFullDay: false,
+    startsAt: '2024-02-18T21:43:27.754Z',
+    visibility: 'SHARE_EVERYTHING',
+  },
+  {
+    id: '91011',
+    externalCreatedAt: '2024-02-19T20:45:20.854Z',
+    isFullDay: true,
+    startsAt: '2024-02-19T22:05:27.653Z',
+    visibility: 'METADATA',
+  },
+  {
+    id: '121314',
+    externalCreatedAt: '2024-02-20T20:45:12.854Z',
+    isFullDay: true,
+    startsAt: '2024-02-20T23:15:23.150Z',
+    visibility: 'SHARE_EVERYTHING',
+  },
+];
+
+describe('useCalendar', () => {
+  it('returns calendar events', () => {
+    const { result } = renderHook(() => useCalendarEvents(calendarEvents));
+
+    expect(result.current.currentCalendarEvent).toBe(calendarEvents[0]);
+
+    expect(result.current.getNextCalendarEvent(calendarEvents[1])).toBe(
+      calendarEvents[0],
+    );
+
+    act(() => {
+      result.current.updateCurrentCalendarEvent();
+    });
+
+    expect(result.current.currentCalendarEvent).toBe(calendarEvents[0]);
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEvents.ts b/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEvents.ts
new file mode 100644
index 000000000000..5f2e633816e0
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEvents.ts
@@ -0,0 +1,88 @@
+import { useMemo, useState } from 'react';
+import { getYear, isThisMonth, startOfDay, startOfMonth } from 'date-fns';
+
+import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
+import { findUpcomingCalendarEvent } from '@/activities/calendar/utils/findUpcomingCalendarEvent';
+import { getCalendarEventStartDate } from '@/activities/calendar/utils/getCalendarEventStartDate';
+import { groupArrayItemsBy } from '~/utils/array/groupArrayItemsBy';
+import { isDefined } from '~/utils/isDefined';
+import { sortDesc } from '~/utils/sort';
+
+type CalendarEventGeneric = Omit<
+  CalendarEvent,
+  'participants' | 'externalCreatedAt'
+>;
+
+export const useCalendarEvents = <T extends CalendarEventGeneric>(
+  calendarEvents: T[],
+) => {
+  const calendarEventsByDayTime = groupArrayItemsBy(
+    calendarEvents,
+    (calendarEvent) =>
+      startOfDay(getCalendarEventStartDate(calendarEvent)).getTime(),
+  );
+
+  const sortedDayTimes = Object.keys(calendarEventsByDayTime)
+    .map(Number)
+    .sort(sortDesc);
+
+  const daysByMonthTime = groupArrayItemsBy(sortedDayTimes, (dayTime) =>
+    startOfMonth(dayTime).getTime(),
+  );
+
+  const sortedMonthTimes = Object.keys(daysByMonthTime)
+    .map(Number)
+    .sort(sortDesc);
+
+  const monthTimesByYear = groupArrayItemsBy(sortedMonthTimes, getYear);
+
+  const getPreviousCalendarEvent = (calendarEvent: T) => {
+    const calendarEventIndex = calendarEvents.indexOf(calendarEvent);
+    return calendarEventIndex < calendarEvents.length - 1
+      ? calendarEvents[calendarEventIndex + 1]
+      : undefined;
+  };
+
+  const getNextCalendarEvent = (calendarEvent: T) => {
+    const calendarEventIndex = calendarEvents.indexOf(calendarEvent);
+    return calendarEventIndex > 0
+      ? calendarEvents[calendarEventIndex - 1]
+      : undefined;
+  };
+
+  const initialUpcomingCalendarEvent = useMemo(
+    () => findUpcomingCalendarEvent(calendarEvents),
+    [calendarEvents],
+  );
+  const lastEventInCalendar = calendarEvents.length
+    ? calendarEvents[0]
+    : undefined;
+
+  const [currentCalendarEvent, setCurrentCalendarEvent] = useState(
+    (initialUpcomingCalendarEvent &&
+      (isThisMonth(getCalendarEventStartDate(initialUpcomingCalendarEvent))
+        ? initialUpcomingCalendarEvent
+        : getPreviousCalendarEvent(initialUpcomingCalendarEvent))) ||
+      lastEventInCalendar,
+  );
+
+  const updateCurrentCalendarEvent = () => {
+    if (!currentCalendarEvent) return;
+
+    const nextCurrentCalendarEvent = getNextCalendarEvent(currentCalendarEvent);
+
+    if (isDefined(nextCurrentCalendarEvent)) {
+      setCurrentCalendarEvent(nextCurrentCalendarEvent);
+    }
+  };
+
+  return {
+    calendarEventsByDayTime,
+    currentCalendarEvent,
+    daysByMonthTime,
+    getNextCalendarEvent,
+    monthTimes: sortedMonthTimes,
+    monthTimesByYear,
+    updateCurrentCalendarEvent,
+  };
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/queries/fragments/timelineCalendarEventFragment.ts b/packages/twenty-front/src/modules/activities/calendar/queries/fragments/timelineCalendarEventFragment.ts
new file mode 100644
index 000000000000..d98c7bcf81b2
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/queries/fragments/timelineCalendarEventFragment.ts
@@ -0,0 +1,20 @@
+import { gql } from '@apollo/client';
+
+import { timelineCalendarEventParticipantFragment } from '@/activities/calendar/queries/fragments/timelineCalendarEventParticipantFragment';
+
+export const timelineCalendarEventFragment = gql`
+  fragment TimelineCalendarEventFragment on TimelineCalendarEvent {
+    id
+    title
+    description
+    location
+    startsAt
+    endsAt
+    isFullDay
+    visibility
+    participants {
+      ...TimelineCalendarEventParticipantFragment
+    }
+  }
+  ${timelineCalendarEventParticipantFragment}
+`;
diff --git a/packages/twenty-front/src/modules/activities/calendar/queries/fragments/timelineCalendarEventParticipantFragment.ts b/packages/twenty-front/src/modules/activities/calendar/queries/fragments/timelineCalendarEventParticipantFragment.ts
new file mode 100644
index 000000000000..7a48eea69453
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/queries/fragments/timelineCalendarEventParticipantFragment.ts
@@ -0,0 +1,13 @@
+import { gql } from '@apollo/client';
+
+export const timelineCalendarEventParticipantFragment = gql`
+  fragment TimelineCalendarEventParticipantFragment on TimelineCalendarEventParticipant {
+    personId
+    workspaceMemberId
+    firstName
+    lastName
+    displayName
+    avatarUrl
+    handle
+  }
+`;
diff --git a/packages/twenty-front/src/modules/activities/calendar/queries/fragments/timelineCalendarEventWithTotalFragment.ts b/packages/twenty-front/src/modules/activities/calendar/queries/fragments/timelineCalendarEventWithTotalFragment.ts
new file mode 100644
index 000000000000..2a76f0f7fa41
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/queries/fragments/timelineCalendarEventWithTotalFragment.ts
@@ -0,0 +1,13 @@
+import { gql } from '@apollo/client';
+
+import { timelineCalendarEventFragment } from '@/activities/calendar/queries/fragments/timelineCalendarEventFragment';
+
+export const timelineCalendarEventWithTotalFragment = gql`
+  fragment TimelineCalendarEventsWithTotalFragment on TimelineCalendarEventsWithTotal {
+    totalNumberOfCalendarEvents
+    timelineCalendarEvents {
+      ...TimelineCalendarEventFragment
+    }
+  }
+  ${timelineCalendarEventFragment}
+`;
diff --git a/packages/twenty-front/src/modules/activities/calendar/queries/getTimelineCalendarEventsFromCompanyId.ts b/packages/twenty-front/src/modules/activities/calendar/queries/getTimelineCalendarEventsFromCompanyId.ts
new file mode 100644
index 000000000000..e454e67452f3
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/queries/getTimelineCalendarEventsFromCompanyId.ts
@@ -0,0 +1,20 @@
+import { gql } from '@apollo/client';
+
+import { timelineCalendarEventWithTotalFragment } from '@/activities/calendar/queries/fragments/timelineCalendarEventWithTotalFragment';
+
+export const getTimelineCalendarEventsFromCompanyId = gql`
+  query GetTimelineCalendarEventsFromCompanyId(
+    $companyId: UUID!
+    $page: Int!
+    $pageSize: Int!
+  ) {
+    getTimelineCalendarEventsFromCompanyId(
+      companyId: $companyId
+      page: $page
+      pageSize: $pageSize
+    ) {
+      ...TimelineCalendarEventsWithTotalFragment
+    }
+  }
+  ${timelineCalendarEventWithTotalFragment}
+`;
diff --git a/packages/twenty-front/src/modules/activities/calendar/queries/getTimelineCalendarEventsFromPersonId.ts b/packages/twenty-front/src/modules/activities/calendar/queries/getTimelineCalendarEventsFromPersonId.ts
new file mode 100644
index 000000000000..7d9f221fbc78
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/queries/getTimelineCalendarEventsFromPersonId.ts
@@ -0,0 +1,20 @@
+import { gql } from '@apollo/client';
+
+import { timelineCalendarEventWithTotalFragment } from '@/activities/calendar/queries/fragments/timelineCalendarEventWithTotalFragment';
+
+export const getTimelineCalendarEventsFromPersonId = gql`
+  query GetTimelineCalendarEventsFromPersonId(
+    $personId: UUID!
+    $page: Int!
+    $pageSize: Int!
+  ) {
+    getTimelineCalendarEventsFromPersonId(
+      personId: $personId
+      page: $page
+      pageSize: $pageSize
+    ) {
+      ...TimelineCalendarEventsWithTotalFragment
+    }
+  }
+  ${timelineCalendarEventWithTotalFragment}
+`;
diff --git a/packages/twenty-front/src/modules/activities/calendar/right-drawer/components/RightDrawerCalendarEvent.tsx b/packages/twenty-front/src/modules/activities/calendar/right-drawer/components/RightDrawerCalendarEvent.tsx
new file mode 100644
index 000000000000..f0e895dcdaa5
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/right-drawer/components/RightDrawerCalendarEvent.tsx
@@ -0,0 +1,23 @@
+import { useRecoilValue } from 'recoil';
+
+import { CalendarEventDetails } from '@/activities/calendar/components/CalendarEventDetails';
+import { viewableCalendarEventIdState } from '@/activities/calendar/states/viewableCalendarEventIdState';
+import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
+import { useSetRecordInStore } from '@/object-record/record-store/hooks/useSetRecordInStore';
+
+export const RightDrawerCalendarEvent = () => {
+  const { setRecords } = useSetRecordInStore();
+  const viewableCalendarEventId = useRecoilValue(viewableCalendarEventIdState);
+  const { record: calendarEvent } = useFindOneRecord<CalendarEvent>({
+    objectNameSingular: CoreObjectNameSingular.CalendarEvent,
+    objectRecordId: viewableCalendarEventId ?? '',
+    onCompleted: (record) => setRecords([record]),
+    depth: 2,
+  });
+
+  if (!calendarEvent) return null;
+
+  return <CalendarEventDetails calendarEvent={calendarEvent} />;
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/right-drawer/hooks/__tests__/useOpenCalendarEventRightDrawer.test.tsx b/packages/twenty-front/src/modules/activities/calendar/right-drawer/hooks/__tests__/useOpenCalendarEventRightDrawer.test.tsx
new file mode 100644
index 000000000000..027f7f87557a
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/right-drawer/hooks/__tests__/useOpenCalendarEventRightDrawer.test.tsx
@@ -0,0 +1,35 @@
+import { act, renderHook } from '@testing-library/react';
+import { RecoilRoot, useRecoilValue } from 'recoil';
+
+import { useOpenCalendarEventRightDrawer } from '@/activities/calendar/right-drawer/hooks/useOpenCalendarEventRightDrawer';
+import { viewableCalendarEventIdState } from '@/activities/calendar/states/viewableCalendarEventIdState';
+import { isRightDrawerOpenState } from '@/ui/layout/right-drawer/states/isRightDrawerOpenState';
+
+describe('useOpenCalendarEventRightDrawer', () => {
+  it('opens the right drawer with the calendar event', () => {
+    const { result } = renderHook(
+      () => {
+        const isRightDrawerOpen = useRecoilValue(isRightDrawerOpenState);
+        const viewableCalendarEventId = useRecoilValue(
+          viewableCalendarEventIdState,
+        );
+        return {
+          ...useOpenCalendarEventRightDrawer(),
+          isRightDrawerOpen,
+          viewableCalendarEventId,
+        };
+      },
+      { wrapper: RecoilRoot },
+    );
+
+    expect(result.current.isRightDrawerOpen).toBe(false);
+    expect(result.current.viewableCalendarEventId).toBeNull();
+
+    act(() => {
+      result.current.openCalendarEventRightDrawer('1234');
+    });
+
+    expect(result.current.isRightDrawerOpen).toBe(true);
+    expect(result.current.viewableCalendarEventId).toBe('1234');
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/calendar/right-drawer/hooks/useOpenCalendarEventRightDrawer.ts b/packages/twenty-front/src/modules/activities/calendar/right-drawer/hooks/useOpenCalendarEventRightDrawer.ts
new file mode 100644
index 000000000000..9cd27d017e52
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/right-drawer/hooks/useOpenCalendarEventRightDrawer.ts
@@ -0,0 +1,23 @@
+import { useSetRecoilState } from 'recoil';
+
+import { viewableCalendarEventIdState } from '@/activities/calendar/states/viewableCalendarEventIdState';
+import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
+import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope';
+import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages';
+import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+
+export const useOpenCalendarEventRightDrawer = () => {
+  const { openRightDrawer } = useRightDrawer();
+  const setHotkeyScope = useSetHotkeyScope();
+  const setViewableCalendarEventId = useSetRecoilState(
+    viewableCalendarEventIdState,
+  );
+
+  const openCalendarEventRightDrawer = (calendarEventId: string) => {
+    setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
+    openRightDrawer(RightDrawerPages.ViewCalendarEvent);
+    setViewableCalendarEventId(calendarEventId);
+  };
+
+  return { openCalendarEventRightDrawer };
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/states/viewableCalendarEventIdState.ts b/packages/twenty-front/src/modules/activities/calendar/states/viewableCalendarEventIdState.ts
new file mode 100644
index 000000000000..32d1951bcf5b
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/states/viewableCalendarEventIdState.ts
@@ -0,0 +1,6 @@
+import { createState } from 'twenty-ui';
+
+export const viewableCalendarEventIdState = createState<string | null>({
+  key: 'viewableCalendarEventIdState',
+  defaultValue: null,
+});
diff --git a/packages/twenty-front/src/modules/activities/calendar/types/CalendarEvent.ts b/packages/twenty-front/src/modules/activities/calendar/types/CalendarEvent.ts
new file mode 100644
index 000000000000..a598c23d967f
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/types/CalendarEvent.ts
@@ -0,0 +1,20 @@
+import { CalendarEventParticipant } from '@/activities/calendar/types/CalendarEventParticipant';
+
+// TODO: use backend CalendarEvent type when ready
+export type CalendarEvent = {
+  conferenceLink?: {
+    label: string;
+    url: string;
+  };
+  description?: string;
+  endsAt?: string;
+  externalCreatedAt: string;
+  id: string;
+  isCanceled?: boolean;
+  isFullDay: boolean;
+  location?: string;
+  startsAt: string;
+  title?: string;
+  visibility: 'METADATA' | 'SHARE_EVERYTHING';
+  calendarEventParticipants?: CalendarEventParticipant[];
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/types/CalendarEventParticipant.ts b/packages/twenty-front/src/modules/activities/calendar/types/CalendarEventParticipant.ts
new file mode 100644
index 000000000000..079e57c18d31
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/types/CalendarEventParticipant.ts
@@ -0,0 +1,12 @@
+import { Person } from '@/people/types/Person';
+import { WorkspaceMember } from '~/generated-metadata/graphql';
+
+export type CalendarEventParticipant = {
+  id: string;
+  handle: string;
+  isOrganizer: boolean;
+  displayName: string;
+  person?: Person;
+  workspaceMember?: WorkspaceMember;
+  responseStatus: 'ACCEPTED' | 'DECLINED' | 'NEEDS_ACTION' | 'TENTATIVE';
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/findUpcomingCalendarEvent.test.ts b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/findUpcomingCalendarEvent.test.ts
new file mode 100644
index 000000000000..dce86cc71c20
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/findUpcomingCalendarEvent.test.ts
@@ -0,0 +1,80 @@
+import { addDays, addHours, startOfDay, subDays, subHours } from 'date-fns';
+
+import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
+
+import { findUpcomingCalendarEvent } from '../findUpcomingCalendarEvent';
+
+const pastEvent: Pick<CalendarEvent, 'startsAt' | 'endsAt' | 'isFullDay'> = {
+  startsAt: subHours(new Date(), 2).toISOString(),
+  endsAt: subHours(new Date(), 1).toISOString(),
+  isFullDay: false,
+};
+const fullDayPastEvent: Pick<CalendarEvent, 'startsAt' | 'isFullDay'> = {
+  startsAt: subDays(new Date(), 1).toISOString(),
+  isFullDay: true,
+};
+
+const currentEvent: Pick<CalendarEvent, 'startsAt' | 'endsAt' | 'isFullDay'> = {
+  startsAt: addHours(new Date(), 1).toISOString(),
+  endsAt: addHours(new Date(), 2).toISOString(),
+  isFullDay: false,
+};
+const currentFullDayEvent: Pick<CalendarEvent, 'startsAt' | 'isFullDay'> = {
+  startsAt: startOfDay(new Date()).toISOString(),
+  isFullDay: true,
+};
+
+const futureEvent: Pick<CalendarEvent, 'startsAt' | 'endsAt' | 'isFullDay'> = {
+  startsAt: addDays(new Date(), 1).toISOString(),
+  endsAt: addDays(new Date(), 2).toISOString(),
+  isFullDay: false,
+};
+const fullDayFutureEvent: Pick<CalendarEvent, 'startsAt' | 'isFullDay'> = {
+  startsAt: addDays(new Date(), 2).toISOString(),
+  isFullDay: false,
+};
+
+describe('findUpcomingCalendarEvent', () => {
+  it('returns the first current event by chronological order', () => {
+    // Given
+    const calendarEvents = [
+      futureEvent,
+      currentFullDayEvent,
+      pastEvent,
+      currentEvent,
+    ];
+
+    // When
+    const result = findUpcomingCalendarEvent(calendarEvents);
+
+    // Then
+    expect(result).toEqual(currentFullDayEvent);
+  });
+
+  it('returns the next future event by chronological order', () => {
+    // Given
+    const calendarEvents = [
+      fullDayPastEvent,
+      fullDayFutureEvent,
+      futureEvent,
+      pastEvent,
+    ];
+
+    // When
+    const result = findUpcomingCalendarEvent(calendarEvents);
+
+    // Then
+    expect(result).toEqual(futureEvent);
+  });
+
+  it('returns undefined if all events are in the past', () => {
+    // Given
+    const calendarEvents = [pastEvent, fullDayPastEvent];
+
+    // When
+    const result = findUpcomingCalendarEvent(calendarEvents);
+
+    // Then
+    expect(result).toBeUndefined();
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventEnded.test.ts b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventEnded.test.ts
new file mode 100644
index 000000000000..7519fb7e06f2
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventEnded.test.ts
@@ -0,0 +1,88 @@
+import { addDays, addHours, subDays, subHours } from 'date-fns';
+
+import { hasCalendarEventEnded } from '../hasCalendarEventEnded';
+
+describe('hasCalendarEventEnded', () => {
+  describe('Event with end date', () => {
+    it('returns true for an event with a past end date', () => {
+      // Given
+      const startsAt = subHours(new Date(), 2).toISOString();
+      const endsAt = subHours(new Date(), 1).toISOString();
+      const isFullDay = false;
+
+      // When
+      const result = hasCalendarEventEnded({
+        startsAt,
+        endsAt,
+        isFullDay,
+      });
+
+      // Then
+      expect(result).toBe(true);
+    });
+
+    it('returns false for an event with a future end date', () => {
+      // Given
+      const startsAt = new Date().toISOString();
+      const endsAt = addHours(new Date(), 1).toISOString();
+      const isFullDay = false;
+
+      // When
+      const result = hasCalendarEventEnded({
+        startsAt,
+        endsAt,
+        isFullDay,
+      });
+
+      // Then
+      expect(result).toBe(false);
+    });
+  });
+
+  describe('Full day event', () => {
+    it('returns true for a past full day event', () => {
+      // Given
+      const startsAt = subDays(new Date(), 1).toISOString();
+      const isFullDay = true;
+
+      // When
+      const result = hasCalendarEventEnded({
+        startsAt,
+        isFullDay,
+      });
+
+      // Then
+      expect(result).toBe(true);
+    });
+
+    it('returns false for a future full day event', () => {
+      // Given
+      const startsAt = addDays(new Date(), 1).toISOString();
+      const isFullDay = true;
+
+      // When
+      const result = hasCalendarEventEnded({
+        startsAt,
+        isFullDay,
+      });
+
+      // Then
+      expect(result).toBe(false);
+    });
+
+    it('returns false if the full day event is today', () => {
+      // Given
+      const startsAt = new Date().toISOString();
+      const isFullDay = true;
+
+      // When
+      const result = hasCalendarEventEnded({
+        startsAt,
+        isFullDay,
+      });
+
+      // Then
+      expect(result).toBe(false);
+    });
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventStarted.test.ts b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventStarted.test.ts
new file mode 100644
index 000000000000..5e0ddaea4756
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventStarted.test.ts
@@ -0,0 +1,38 @@
+import { addHours, subHours } from 'date-fns';
+
+import { hasCalendarEventStarted } from '../hasCalendarEventStarted';
+
+describe('hasCalendarEventStarted', () => {
+  it('returns true for an event with a past start date', () => {
+    // Given
+    const startsAt = subHours(new Date(), 2).toISOString();
+
+    // When
+    const result = hasCalendarEventStarted({ startsAt });
+
+    // Then
+    expect(result).toBe(true);
+  });
+
+  it('returns false for an event if start date is now', () => {
+    // Given
+    const startsAt = new Date().toISOString();
+
+    // When
+    const result = hasCalendarEventStarted({ startsAt });
+
+    // Then
+    expect(result).toBe(false);
+  });
+
+  it('returns false for an event with a future start date', () => {
+    // Given
+    const startsAt = addHours(new Date(), 1).toISOString();
+
+    // When
+    const result = hasCalendarEventStarted({ startsAt });
+
+    // Then
+    expect(result).toBe(false);
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/sortCalendarEvents.test.ts b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/sortCalendarEvents.test.ts
new file mode 100644
index 000000000000..dc1a42a9cc16
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/sortCalendarEvents.test.ts
@@ -0,0 +1,313 @@
+import { addHours } from 'date-fns';
+
+import {
+  sortCalendarEventsAsc,
+  sortCalendarEventsDesc,
+} from '../sortCalendarEvents';
+
+const someDate = new Date(2000, 1, 1);
+const someDatePlusOneHour = addHours(someDate, 1);
+const someDatePlusTwoHours = addHours(someDate, 2);
+const someDatePlusThreeHours = addHours(someDate, 3);
+
+describe('sortCalendarEventsAsc', () => {
+  it('sorts non-intersecting events by ascending order', () => {
+    // Given
+    const eventA = {
+      startsAt: someDate.toISOString(),
+      endsAt: someDatePlusOneHour.toISOString(),
+      isFullDay: false,
+    };
+    const eventB = {
+      startsAt: someDatePlusTwoHours.toISOString(),
+      endsAt: someDatePlusThreeHours.toISOString(),
+      isFullDay: false,
+    };
+
+    // When
+    const result = sortCalendarEventsAsc(eventA, eventB);
+    const invertedArgsResult = sortCalendarEventsAsc(eventB, eventA);
+
+    // Then
+    expect(result).toBe(-1);
+    expect(invertedArgsResult).toBe(1);
+  });
+
+  it('sorts intersecting events by start date ascending order', () => {
+    // Given
+    const eventA = {
+      startsAt: someDate.toISOString(),
+      endsAt: someDatePlusTwoHours.toISOString(),
+      isFullDay: false,
+    };
+    const eventB = {
+      startsAt: someDatePlusOneHour.toISOString(),
+      endsAt: someDatePlusThreeHours.toISOString(),
+      isFullDay: false,
+    };
+
+    // When
+    const result = sortCalendarEventsAsc(eventA, eventB);
+    const invertedArgsResult = sortCalendarEventsAsc(eventB, eventA);
+
+    // Then
+    expect(result).toBe(-1);
+    expect(invertedArgsResult).toBe(1);
+  });
+
+  it('sorts events with same start date by end date ascending order', () => {
+    // Given
+    const eventA = {
+      startsAt: someDate.toISOString(),
+      endsAt: someDatePlusTwoHours.toISOString(),
+      isFullDay: false,
+    };
+    const eventB = {
+      startsAt: someDate.toISOString(),
+      endsAt: someDatePlusThreeHours.toISOString(),
+      isFullDay: false,
+    };
+
+    // When
+    const result = sortCalendarEventsAsc(eventA, eventB);
+    const invertedArgsResult = sortCalendarEventsAsc(eventB, eventA);
+
+    // Then
+    expect(result).toBe(-1);
+    expect(invertedArgsResult).toBe(1);
+  });
+
+  it('sorts events with same end date by start date ascending order', () => {
+    // Given
+    const eventA = {
+      startsAt: someDate.toISOString(),
+      endsAt: someDatePlusThreeHours.toISOString(),
+      isFullDay: false,
+    };
+    const eventB = {
+      startsAt: someDatePlusOneHour.toISOString(),
+      endsAt: someDatePlusThreeHours.toISOString(),
+      isFullDay: false,
+    };
+
+    // When
+    const result = sortCalendarEventsAsc(eventA, eventB);
+    const invertedArgsResult = sortCalendarEventsAsc(eventB, eventA);
+
+    // Then
+    expect(result).toBe(-1);
+    expect(invertedArgsResult).toBe(1);
+  });
+
+  it('sorts events without end date by start date ascending order', () => {
+    // Given
+    const eventA = {
+      startsAt: someDate.toISOString(),
+      isFullDay: true,
+    };
+    const eventB = {
+      startsAt: someDatePlusOneHour.toISOString(),
+      isFullDay: true,
+    };
+
+    // When
+    const result = sortCalendarEventsAsc(eventA, eventB);
+    const invertedArgsResult = sortCalendarEventsAsc(eventB, eventA);
+
+    // Then
+    expect(result).toBe(-1);
+    expect(invertedArgsResult).toBe(1);
+  });
+
+  it('returns 0 for full day events with the same start date', () => {
+    // Given
+    const eventA = {
+      startsAt: someDate.toISOString(),
+      isFullDay: true,
+    };
+    const eventB = {
+      startsAt: someDate.toISOString(),
+      isFullDay: true,
+    };
+
+    // When
+    const result = sortCalendarEventsAsc(eventA, eventB);
+    const invertedArgsResult = sortCalendarEventsAsc(eventB, eventA);
+
+    // Then
+    expect(result).toBe(0);
+    expect(invertedArgsResult).toBe(0);
+  });
+
+  it('sorts the full day event last for two events with the same start date if one is full day', () => {
+    // Given
+    const eventA = {
+      startsAt: someDate.toISOString(),
+      endsAt: someDatePlusOneHour.toISOString(),
+      isFullDay: false,
+    };
+    const eventB = {
+      startsAt: someDate.toISOString(),
+      isFullDay: true,
+    };
+
+    // When
+    const result = sortCalendarEventsAsc(eventA, eventB);
+    const invertedArgsResult = sortCalendarEventsAsc(eventB, eventA);
+
+    // Then
+    expect(result).toBe(-1);
+    expect(invertedArgsResult).toBe(1);
+  });
+});
+
+describe('sortCalendarEventsDesc', () => {
+  it('sorts non-intersecting events by descending order', () => {
+    // Given
+    const eventA = {
+      startsAt: someDate.toISOString(),
+      endsAt: someDatePlusOneHour.toISOString(),
+      isFullDay: false,
+    };
+    const eventB = {
+      startsAt: someDatePlusTwoHours.toISOString(),
+      endsAt: someDatePlusThreeHours.toISOString(),
+      isFullDay: false,
+    };
+
+    // When
+    const result = sortCalendarEventsDesc(eventA, eventB);
+    const invertedArgsResult = sortCalendarEventsDesc(eventB, eventA);
+
+    // Then
+    expect(result).toBe(1);
+    expect(invertedArgsResult).toBe(-1);
+  });
+
+  it('sorts intersecting events by start date descending order', () => {
+    // Given
+    const eventA = {
+      startsAt: someDate.toISOString(),
+      endsAt: someDatePlusTwoHours.toISOString(),
+      isFullDay: false,
+    };
+    const eventB = {
+      startsAt: someDatePlusOneHour.toISOString(),
+      endsAt: someDatePlusThreeHours.toISOString(),
+      isFullDay: false,
+    };
+
+    // When
+    const result = sortCalendarEventsDesc(eventA, eventB);
+    const invertedArgsResult = sortCalendarEventsDesc(eventB, eventA);
+
+    // Then
+    expect(result).toBe(1);
+    expect(invertedArgsResult).toBe(-1);
+  });
+
+  it('sorts events with same start date by end date descending order', () => {
+    // Given
+    const eventA = {
+      startsAt: someDate.toISOString(),
+      endsAt: someDatePlusTwoHours.toISOString(),
+      isFullDay: false,
+    };
+    const eventB = {
+      startsAt: someDate.toISOString(),
+      endsAt: someDatePlusThreeHours.toISOString(),
+      isFullDay: false,
+    };
+
+    // When
+    const result = sortCalendarEventsDesc(eventA, eventB);
+    const invertedArgsResult = sortCalendarEventsDesc(eventB, eventA);
+
+    // Then
+    expect(result).toBe(1);
+    expect(invertedArgsResult).toBe(-1);
+  });
+
+  it('sorts events with same end date by start date descending order', () => {
+    // Given
+    const eventA = {
+      startsAt: someDate.toISOString(),
+      endsAt: someDatePlusThreeHours.toISOString(),
+      isFullDay: false,
+    };
+    const eventB = {
+      startsAt: someDatePlusOneHour.toISOString(),
+      endsAt: someDatePlusThreeHours.toISOString(),
+      isFullDay: false,
+    };
+
+    // When
+    const result = sortCalendarEventsDesc(eventA, eventB);
+    const invertedArgsResult = sortCalendarEventsDesc(eventB, eventA);
+
+    // Then
+    expect(result).toBe(1);
+    expect(invertedArgsResult).toBe(-1);
+  });
+
+  it('sorts events without end date by start date descending order', () => {
+    // Given
+    const eventA = {
+      startsAt: someDate.toISOString(),
+      isFullDay: true,
+    };
+    const eventB = {
+      startsAt: someDatePlusOneHour.toISOString(),
+      isFullDay: true,
+    };
+
+    // When
+    const result = sortCalendarEventsDesc(eventA, eventB);
+    const invertedArgsResult = sortCalendarEventsDesc(eventB, eventA);
+
+    // Then
+    expect(result).toBe(1);
+    expect(invertedArgsResult).toBe(-1);
+  });
+
+  it('returns 0 for full day events with the same start date', () => {
+    // Given
+    const eventA = {
+      startsAt: someDate.toISOString(),
+      isFullDay: true,
+    };
+    const eventB = {
+      startsAt: someDate.toISOString(),
+      isFullDay: true,
+    };
+
+    // When
+    const result = sortCalendarEventsDesc(eventA, eventB);
+    const invertedArgsResult = sortCalendarEventsDesc(eventB, eventA);
+
+    // Then
+    expect(result === 0).toBe(true);
+    expect(invertedArgsResult === 0).toBe(true);
+  });
+
+  it('sorts the full day event first for two events with the same start date if one is full day', () => {
+    // Given
+    const eventA = {
+      startsAt: someDate.toISOString(),
+      endsAt: someDatePlusOneHour.toISOString(),
+      isFullDay: false,
+    };
+    const eventB = {
+      startsAt: someDate.toISOString(),
+      isFullDay: true,
+    };
+
+    // When
+    const result = sortCalendarEventsDesc(eventA, eventB);
+    const invertedArgsResult = sortCalendarEventsDesc(eventB, eventA);
+
+    // Then
+    expect(result).toBe(1);
+    expect(invertedArgsResult).toBe(-1);
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/findUpcomingCalendarEvent.ts b/packages/twenty-front/src/modules/activities/calendar/utils/findUpcomingCalendarEvent.ts
new file mode 100644
index 000000000000..250a4511281e
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/findUpcomingCalendarEvent.ts
@@ -0,0 +1,12 @@
+import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
+import { hasCalendarEventEnded } from '@/activities/calendar/utils/hasCalendarEventEnded';
+import { sortCalendarEventsAsc } from '@/activities/calendar/utils/sortCalendarEvents';
+
+export const findUpcomingCalendarEvent = <
+  T extends Pick<CalendarEvent, 'startsAt' | 'endsAt' | 'isFullDay'>,
+>(
+  calendarEvents: T[],
+) =>
+  [...calendarEvents]
+    .sort(sortCalendarEventsAsc)
+    .find((calendarEvent) => !hasCalendarEventEnded(calendarEvent));
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/getCalendarEventEndDate.ts b/packages/twenty-front/src/modules/activities/calendar/utils/getCalendarEventEndDate.ts
new file mode 100644
index 000000000000..8463f2236faa
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/getCalendarEventEndDate.ts
@@ -0,0 +1,11 @@
+import { endOfDay } from 'date-fns';
+
+import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
+import { getCalendarEventStartDate } from '@/activities/calendar/utils/getCalendarEventStartDate';
+
+export const getCalendarEventEndDate = (
+  calendarEvent: Pick<CalendarEvent, 'endsAt' | 'isFullDay' | 'startsAt'>,
+) =>
+  calendarEvent.endsAt
+    ? new Date(calendarEvent.endsAt)
+    : endOfDay(getCalendarEventStartDate(calendarEvent));
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/getCalendarEventStartDate.ts b/packages/twenty-front/src/modules/activities/calendar/utils/getCalendarEventStartDate.ts
new file mode 100644
index 000000000000..db7a08de3ee3
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/getCalendarEventStartDate.ts
@@ -0,0 +1,5 @@
+import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
+
+export const getCalendarEventStartDate = (
+  calendarEvent: Pick<CalendarEvent, 'startsAt'>,
+) => new Date(calendarEvent.startsAt);
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/hasCalendarEventEnded.ts b/packages/twenty-front/src/modules/activities/calendar/utils/hasCalendarEventEnded.ts
new file mode 100644
index 000000000000..9800634db746
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/hasCalendarEventEnded.ts
@@ -0,0 +1,8 @@
+import { isPast } from 'date-fns';
+
+import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
+import { getCalendarEventEndDate } from '@/activities/calendar/utils/getCalendarEventEndDate';
+
+export const hasCalendarEventEnded = (
+  calendarEvent: Pick<CalendarEvent, 'endsAt' | 'isFullDay' | 'startsAt'>,
+) => isPast(getCalendarEventEndDate(calendarEvent));
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/hasCalendarEventStarted.ts b/packages/twenty-front/src/modules/activities/calendar/utils/hasCalendarEventStarted.ts
new file mode 100644
index 000000000000..f351edc9d90d
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/hasCalendarEventStarted.ts
@@ -0,0 +1,8 @@
+import { isPast } from 'date-fns';
+
+import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
+import { getCalendarEventStartDate } from '@/activities/calendar/utils/getCalendarEventStartDate';
+
+export const hasCalendarEventStarted = (
+  calendarEvent: Pick<CalendarEvent, 'startsAt'>,
+) => isPast(getCalendarEventStartDate(calendarEvent));
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/sortCalendarEvents.ts b/packages/twenty-front/src/modules/activities/calendar/utils/sortCalendarEvents.ts
new file mode 100644
index 000000000000..8ea50406c36c
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/sortCalendarEvents.ts
@@ -0,0 +1,26 @@
+import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
+import { getCalendarEventEndDate } from '@/activities/calendar/utils/getCalendarEventEndDate';
+import { getCalendarEventStartDate } from '@/activities/calendar/utils/getCalendarEventStartDate';
+import { sortAsc } from '~/utils/sort';
+
+export const sortCalendarEventsAsc = (
+  calendarEventA: Pick<CalendarEvent, 'startsAt' | 'endsAt' | 'isFullDay'>,
+  calendarEventB: Pick<CalendarEvent, 'startsAt' | 'endsAt' | 'isFullDay'>,
+) => {
+  const startsAtSort = sortAsc(
+    getCalendarEventStartDate(calendarEventA).getTime(),
+    getCalendarEventStartDate(calendarEventB).getTime(),
+  );
+
+  if (startsAtSort !== 0) return startsAtSort;
+
+  return sortAsc(
+    getCalendarEventEndDate(calendarEventA).getTime(),
+    getCalendarEventEndDate(calendarEventB).getTime(),
+  );
+};
+
+export const sortCalendarEventsDesc = (
+  calendarEventA: Pick<CalendarEvent, 'startsAt' | 'endsAt' | 'isFullDay'>,
+  calendarEventB: Pick<CalendarEvent, 'startsAt' | 'endsAt' | 'isFullDay'>,
+) => -sortCalendarEventsAsc(calendarEventA, calendarEventB);
diff --git a/packages/twenty-front/src/modules/activities/comment/CommentCounter.tsx b/packages/twenty-front/src/modules/activities/comment/CommentCounter.tsx
index 52274fdf54da..29abcea3ab2f 100644
--- a/packages/twenty-front/src/modules/activities/comment/CommentCounter.tsx
+++ b/packages/twenty-front/src/modules/activities/comment/CommentCounter.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-
-import { IconComment } from '@/ui/display/icon';
+import { IconComment } from 'twenty-ui';
 
 const StyledCommentIcon = styled.div`
   align-items: center;
diff --git a/packages/twenty-front/src/modules/activities/components/ActivityBodyEditor.tsx b/packages/twenty-front/src/modules/activities/components/ActivityBodyEditor.tsx
index fc2408ba91e2..0b3994278a6c 100644
--- a/packages/twenty-front/src/modules/activities/components/ActivityBodyEditor.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityBodyEditor.tsx
@@ -1,22 +1,22 @@
-import { useCallback, useMemo } from 'react';
-import { BlockNoteEditor } from '@blocknote/core';
-import { useBlockNote } from '@blocknote/react';
-import styled from '@emotion/styled';
+import { ClipboardEvent, useCallback, useMemo } from 'react';
+import { useApolloClient } from '@apollo/client';
+import { useCreateBlockNote } from '@blocknote/react';
 import { isArray, isNonEmptyString } from '@sniptt/guards';
 import { useRecoilCallback, useRecoilState } from 'recoil';
 import { Key } from 'ts-key-enum';
 import { useDebouncedCallback } from 'use-debounce';
 import { v4 } from 'uuid';
 
+import { blockSchema } from '@/activities/blocks/schema';
 import { useUpsertActivity } from '@/activities/hooks/useUpsertActivity';
 import { activityBodyFamilyState } from '@/activities/states/activityBodyFamilyState';
 import { activityTitleHasBeenSetFamilyState } from '@/activities/states/activityTitleHasBeenSetFamilyState';
 import { canCreateActivityState } from '@/activities/states/canCreateActivityState';
 import { Activity } from '@/activities/types/Activity';
 import { ActivityEditorHotkeyScope } from '@/activities/types/ActivityEditorHotkeyScope';
-import { useObjectMetadataItemOnly } from '@/object-metadata/hooks/useObjectMetadataItemOnly';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useModifyRecordFromCache } from '@/object-record/cache/hooks/useModifyRecordFromCache';
+import { modifyRecordFromCache } from '@/object-record/cache/utils/modifyRecordFromCache';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import { BlockEditor } from '@/ui/input/editor/components/BlockEditor';
 import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope';
@@ -25,18 +25,13 @@ import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { isNonTextWritingKey } from '@/ui/utilities/hotkey/utils/isNonTextWritingKey';
 import { REACT_APP_SERVER_BASE_URL } from '~/config';
 import { FileFolder, useUploadFileMutation } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
-import { blockSpecs } from '../blocks/blockSpecs';
-import { getSlashMenu } from '../blocks/slashMenu';
 import { getFileType } from '../files/utils/getFileType';
 
 import '@blocknote/react/style.css';
 
-const StyledBlockNoteStyledContainer = styled.div`
-  height: 100%;
-  width: 100%;
-`;
-
 type ActivityBodyEditorProps = {
   activityId: string;
   fillTitleFromBody: boolean;
@@ -47,7 +42,7 @@ export const ActivityBodyEditor = ({
   fillTitleFromBody,
 }: ActivityBodyEditorProps) => {
   const [activityInStore] = useRecoilState(recordStoreFamilyState(activityId));
-
+  const cache = useApolloClient().cache;
   const activity = activityInStore as Activity | null;
 
   const [activityTitleHasBeenSet, setActivityTitleHasBeenSet] = useRecoilState(
@@ -63,13 +58,10 @@ export const ActivityBodyEditor = ({
   );
 
   const { objectMetadataItem: objectMetadataItemActivity } =
-    useObjectMetadataItemOnly({
+    useObjectMetadataItem({
       objectNameSingular: CoreObjectNameSingular.Activity,
     });
 
-  const modifyActivityFromCache = useModifyRecordFromCache({
-    objectMetadataItem: objectMetadataItemActivity,
-  });
   const {
     goBackToPreviousHotkeyScope,
     setHotkeyScopeAndMemorizePreviousScope,
@@ -78,7 +70,7 @@ export const ActivityBodyEditor = ({
   const { upsertActivity } = useUpsertActivity();
 
   const persistBodyDebounced = useDebouncedCallback((newBody: string) => {
-    if (activity) {
+    if (isDefined(activity)) {
       upsertActivity({
         activity,
         input: {
@@ -90,7 +82,7 @@ export const ActivityBodyEditor = ({
 
   const persistTitleAndBodyDebounced = useDebouncedCallback(
     (newTitle: string, newBody: string) => {
-      if (activity) {
+      if (isDefined(activity)) {
         upsertActivity({
           activity,
           input: {
@@ -119,12 +111,10 @@ export const ActivityBodyEditor = ({
     canCreateActivityState,
   );
 
-  const slashMenuItems = getSlashMenu();
-
   const [uploadFile] = useUploadFileMutation();
 
   const handleUploadAttachment = async (file: File): Promise<string> => {
-    if (!file) {
+    if (isUndefinedOrNull(file)) {
       return '';
     }
     const result = await uploadFile({
@@ -174,10 +164,15 @@ export const ActivityBodyEditor = ({
           };
         });
 
-        modifyActivityFromCache(activityId, {
-          body: () => {
-            return newStringifiedBody;
+        modifyRecordFromCache({
+          recordId: activityId,
+          fieldModifiers: {
+            body: () => {
+              return newStringifiedBody;
+            },
           },
+          cache,
+          objectMetadataItem: objectMetadataItemActivity,
         });
 
         const activityTitleHasBeenSet = snapshot
@@ -200,22 +195,33 @@ export const ActivityBodyEditor = ({
             };
           });
 
-          modifyActivityFromCache(activityId, {
-            title: () => {
-              return newTitleFromBody;
+          modifyRecordFromCache({
+            recordId: activityId,
+            fieldModifiers: {
+              title: () => {
+                return newTitleFromBody;
+              },
             },
+            cache,
+            objectMetadataItem: objectMetadataItemActivity,
           });
         }
 
         handlePersistBody(newStringifiedBody);
       },
-    [activityId, fillTitleFromBody, modifyActivityFromCache, handlePersistBody],
+    [
+      activityId,
+      cache,
+      objectMetadataItemActivity,
+      fillTitleFromBody,
+      handlePersistBody,
+    ],
   );
 
   const handleBodyChangeDebounced = useDebouncedCallback(handleBodyChange, 500);
 
-  const handleEditorChange = (newEditor: BlockNoteEditor) => {
-    const newStringifiedBody = JSON.stringify(newEditor.topLevelBlocks) ?? '';
+  const handleEditorChange = () => {
+    const newStringifiedBody = JSON.stringify(editor.document) ?? '';
 
     setActivityBody(newStringifiedBody);
 
@@ -226,7 +232,7 @@ export const ActivityBodyEditor = ({
     if (isNonEmptyString(activityBody) && activityBody !== '{}') {
       return JSON.parse(activityBody);
     } else if (
-      activity &&
+      isDefined(activity) &&
       isNonEmptyString(activity.body) &&
       activity?.body !== '{}'
     ) {
@@ -236,22 +242,17 @@ export const ActivityBodyEditor = ({
     }
   }, [activity, activityBody]);
 
-  const editor: BlockNoteEditor<typeof blockSpecs> | null = useBlockNote({
+  const editor = useCreateBlockNote({
     initialContent: initialBody,
     domAttributes: { editor: { class: 'editor' } },
-    onEditorContentChange: handleEditorChange,
-    slashMenuItems,
-    blockSpecs: blockSpecs,
+    schema: blockSchema,
     uploadFile: handleUploadAttachment,
-    onEditorReady: (editor: BlockNoteEditor) => {
-      editor.domElement.addEventListener('paste', handleImagePaste);
-    },
   });
 
   const handleImagePaste = async (event: ClipboardEvent) => {
     const clipboardItems = event.clipboardData?.items;
 
-    if (clipboardItems) {
+    if (isDefined(clipboardItems)) {
       for (let i = 0; i < clipboardItems.length; i++) {
         if (clipboardItems[i].kind === 'file') {
           const isImage = clipboardItems[i].type.match('^image/');
@@ -266,7 +267,7 @@ export const ActivityBodyEditor = ({
             return;
           }
 
-          if (isImage) {
+          if (isDefined(isImage)) {
             editor?.insertBlocks(
               [
                 {
@@ -332,7 +333,7 @@ export const ActivityBodyEditor = ({
       const currentBlockContent = blockIdentifier?.content;
 
       if (
-        currentBlockContent &&
+        isDefined(currentBlockContent) &&
         isArray(currentBlockContent) &&
         currentBlockContent.length === 0
       ) {
@@ -344,9 +345,9 @@ export const ActivityBodyEditor = ({
       }
 
       if (
-        currentBlockContent &&
+        isDefined(currentBlockContent) &&
         isArray(currentBlockContent) &&
-        currentBlockContent[0] &&
+        isDefined(currentBlockContent[0]) &&
         currentBlockContent[0].type === 'text'
       ) {
         // Text block case
@@ -359,7 +360,7 @@ export const ActivityBodyEditor = ({
       const newBlockId = v4();
       const newBlock = {
         id: newBlockId,
-        type: 'paragraph',
+        type: 'paragraph' as const,
         content: keyboardEvent.key,
       };
       editor.insertBlocks([newBlock], blockIdentifier, 'after');
@@ -381,12 +382,12 @@ export const ActivityBodyEditor = ({
   };
 
   return (
-    <StyledBlockNoteStyledContainer onClick={() => editor.focus()}>
-      <BlockEditor
-        onFocus={handleBlockEditorFocus}
-        onBlur={handlerBlockEditorBlur}
-        editor={editor}
-      />
-    </StyledBlockNoteStyledContainer>
+    <BlockEditor
+      onFocus={handleBlockEditorFocus}
+      onBlur={handlerBlockEditorBlur}
+      onPaste={handleImagePaste}
+      onChange={handleEditorChange}
+      editor={editor}
+    />
   );
 };
diff --git a/packages/twenty-front/src/modules/activities/components/ActivityBodyEffect.tsx b/packages/twenty-front/src/modules/activities/components/ActivityBodyEffect.tsx
index 7da880ed189c..221d087209e7 100644
--- a/packages/twenty-front/src/modules/activities/components/ActivityBodyEffect.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityBodyEffect.tsx
@@ -3,6 +3,7 @@ import { useRecoilState } from 'recoil';
 
 import { activityBodyFamilyState } from '@/activities/states/activityBodyFamilyState';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { isDefined } from '~/utils/isDefined';
 
 export const ActivityBodyEffect = ({ activityId }: { activityId: string }) => {
   const [activityFromStore] = useRecoilState(
@@ -16,7 +17,7 @@ export const ActivityBodyEffect = ({ activityId }: { activityId: string }) => {
   useEffect(() => {
     if (
       activityBody === '' &&
-      activityFromStore &&
+      isDefined(activityFromStore) &&
       activityBody !== activityFromStore.body
     ) {
       setActivityBody(activityFromStore.body);
diff --git a/packages/twenty-front/src/modules/activities/components/ActivityEditorEffect.tsx b/packages/twenty-front/src/modules/activities/components/ActivityEditorEffect.tsx
index cffc5e0799eb..3d6a03d994ac 100644
--- a/packages/twenty-front/src/modules/activities/components/ActivityEditorEffect.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityEditorEffect.tsx
@@ -1,6 +1,5 @@
 import { useRecoilCallback } from 'recoil';
 
-import { useDeleteActivityFromCache } from '@/activities/hooks/useDeleteActivityFromCache';
 import { useUpsertActivity } from '@/activities/hooks/useUpsertActivity';
 import { activityBodyFamilyState } from '@/activities/states/activityBodyFamilyState';
 import { activityTitleFamilyState } from '@/activities/states/activityTitleFamilyState';
@@ -8,9 +7,12 @@ import { canCreateActivityState } from '@/activities/states/canCreateActivitySta
 import { isActivityInCreateModeState } from '@/activities/states/isActivityInCreateModeState';
 import { isUpsertingActivityInDBState } from '@/activities/states/isCreatingActivityInDBState';
 import { Activity } from '@/activities/types/Activity';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useDeleteRecordFromCache } from '@/object-record/cache/hooks/useDeleteRecordFromCache';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import { RIGHT_DRAWER_CLICK_OUTSIDE_LISTENER_ID } from '@/ui/layout/right-drawer/constants/RightDrawerClickOutsideListener';
 import { useClickOutsideListener } from '@/ui/utilities/pointer-event/hooks/useClickOutsideListener';
+import { isDefined } from '~/utils/isDefined';
 
 export const ActivityEditorEffect = ({
   activityId,
@@ -22,7 +24,9 @@ export const ActivityEditorEffect = ({
   );
 
   const { upsertActivity } = useUpsertActivity();
-  const { deleteActivityFromCache } = useDeleteActivityFromCache();
+  const deleteRecordFromCache = useDeleteRecordFromCache({
+    objectNameSingular: CoreObjectNameSingular.Activity,
+  });
 
   const upsertActivityCallback = useRecoilCallback(
     ({ snapshot, set }) =>
@@ -57,7 +61,7 @@ export const ActivityEditorEffect = ({
           return;
         }
 
-        if (isActivityInCreateMode && activity) {
+        if (isActivityInCreateMode && isDefined(activity)) {
           if (canCreateActivity) {
             upsertActivity({
               activity,
@@ -67,11 +71,11 @@ export const ActivityEditorEffect = ({
               },
             });
           } else {
-            deleteActivityFromCache(activity);
+            deleteRecordFromCache(activity);
           }
 
           set(isActivityInCreateModeState, false);
-        } else if (activity) {
+        } else if (isDefined(activity)) {
           if (
             activity.title !== activityTitle ||
             activity.body !== activityBody
@@ -86,7 +90,7 @@ export const ActivityEditorEffect = ({
           }
         }
       },
-    [activityId, deleteActivityFromCache, upsertActivity],
+    [activityId, deleteRecordFromCache, upsertActivity],
   );
 
   useRegisterClickOutsideListenerCallback({
diff --git a/packages/twenty-front/src/modules/activities/components/ActivityEditorFields.tsx b/packages/twenty-front/src/modules/activities/components/ActivityEditorFields.tsx
index 126ce0de5358..31ae39ceef38 100644
--- a/packages/twenty-front/src/modules/activities/components/ActivityEditorFields.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityEditorFields.tsx
@@ -1,10 +1,11 @@
 import styled from '@emotion/styled';
-import { useRecoilState } from 'recoil';
+import { useRecoilValue } from 'recoil';
 
 import { useUpsertActivity } from '@/activities/hooks/useUpsertActivity';
 import { ActivityTargetsInlineCell } from '@/activities/inline-cell/components/ActivityTargetsInlineCell';
 import { Activity } from '@/activities/types/Activity';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
 import { useFieldContext } from '@/object-record/hooks/useFieldContext';
 import {
   RecordUpdateHook,
@@ -13,6 +14,7 @@ import {
 import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
 import { PropertyBox } from '@/object-record/record-inline-cell/property-box/components/PropertyBox';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { isDefined } from '~/utils/isDefined';
 
 const StyledPropertyBox = styled(PropertyBox)`
   padding: 0;
@@ -25,9 +27,13 @@ export const ActivityEditorFields = ({
 }) => {
   const { upsertActivity } = useUpsertActivity();
 
-  const [activityFromStore] = useRecoilState(
-    recordStoreFamilyState(activityId),
-  );
+  const getRecordFromCache = useGetRecordFromCache({
+    objectNameSingular: CoreObjectNameSingular.Activity,
+  });
+
+  const activityFromCache = getRecordFromCache<Activity>(activityId);
+
+  const activityFromStore = useRecoilValue(recordStoreFamilyState(activityId));
 
   const activity = activityFromStore as Activity;
 
@@ -35,7 +41,7 @@ export const ActivityEditorFields = ({
     const upsertActivityMutation = async ({
       variables,
     }: RecordUpdateHookParams) => {
-      if (activityFromStore) {
+      if (isDefined(activityFromStore)) {
         await upsertActivity({
           activity: activityFromStore as Activity,
           input: variables.updateOneRecordInput,
@@ -87,9 +93,9 @@ export const ActivityEditorFields = ({
             </AssigneeFieldContextProvider>
           </>
         )}
-      {ActivityTargetsContextProvider && (
+      {ActivityTargetsContextProvider && isDefined(activityFromCache) && (
         <ActivityTargetsContextProvider>
-          <ActivityTargetsInlineCell activity={activity} />
+          <ActivityTargetsInlineCell activity={activityFromCache} />
         </ActivityTargetsContextProvider>
       )}
     </StyledPropertyBox>
diff --git a/packages/twenty-front/src/modules/activities/components/ActivityTargetChips.tsx b/packages/twenty-front/src/modules/activities/components/ActivityTargetChips.tsx
index c88d5f5e6f79..d5d37739c1f7 100644
--- a/packages/twenty-front/src/modules/activities/components/ActivityTargetChips.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityTargetChips.tsx
@@ -1,7 +1,14 @@
+import { useMemo } from 'react';
 import styled from '@emotion/styled';
+import { v4 } from 'uuid';
 
 import { ActivityTargetWithTargetRecord } from '@/activities/types/ActivityTargetObject';
 import { RecordChip } from '@/object-record/components/RecordChip';
+import { Chip, ChipVariant } from '@/ui/display/chip/components/Chip';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { RGBA } from '@/ui/theme/constants/Rgba';
+
+const MAX_RECORD_CHIPS_DISPLAY = 2;
 
 const StyledContainer = styled.div`
   display: flex;
@@ -9,22 +16,77 @@ const StyledContainer = styled.div`
   gap: ${({ theme }) => theme.spacing(1)};
 `;
 
+const StyledRelationsListContainer = styled(StyledContainer)`
+  padding: ${({ theme }) => theme.spacing(2)};
+  border-radius: ${({ theme }) => theme.spacing(1)};
+  background-color: ${({ theme }) => RGBA(theme.color.gray10, 0.8)};
+  box-shadow: '0px 2px 4px ${({ theme }) =>
+    theme.boxShadow.light}, 2px 4px 16px ${({ theme }) =>
+    theme.boxShadow.strong}';
+  backdrop-filter: ${({ theme }) => theme.blur.strong};
+`;
+
+const showMoreRelationsHandler = (event?: React.MouseEvent<HTMLDivElement>) => {
+  event?.preventDefault();
+  event?.stopPropagation();
+};
+
 export const ActivityTargetChips = ({
   activityTargetObjectRecords,
 }: {
   activityTargetObjectRecords: ActivityTargetWithTargetRecord[];
 }) => {
+  const dropdownId = useMemo(() => `multiple-relations-dropdown-${v4()}`, []);
+
   return (
     <StyledContainer>
-      {activityTargetObjectRecords?.map((activityTargetObjectRecord) => (
-        <RecordChip
-          key={activityTargetObjectRecord.targetObject.id}
-          record={activityTargetObjectRecord.targetObject}
-          objectNameSingular={
-            activityTargetObjectRecord.targetObjectMetadataItem.nameSingular
-          }
-        />
-      ))}
+      {activityTargetObjectRecords
+        ?.slice(0, MAX_RECORD_CHIPS_DISPLAY)
+        .map((activityTargetObjectRecord) => (
+          <RecordChip
+            key={activityTargetObjectRecord.targetObject.id}
+            record={activityTargetObjectRecord.targetObject}
+            objectNameSingular={
+              activityTargetObjectRecord.targetObjectMetadataItem.nameSingular
+            }
+          />
+        ))}
+
+      {activityTargetObjectRecords.length > MAX_RECORD_CHIPS_DISPLAY && (
+        <div onClick={showMoreRelationsHandler}>
+          <Dropdown
+            dropdownId={dropdownId}
+            dropdownHotkeyScope={{
+              scope: dropdownId,
+            }}
+            clickableComponent={
+              <Chip
+                label={`+${
+                  activityTargetObjectRecords.length - MAX_RECORD_CHIPS_DISPLAY
+                }`}
+                variant={ChipVariant.Highlighted}
+              />
+            }
+            dropdownOffset={{ x: 0, y: -20 }}
+            dropdownComponents={
+              <StyledRelationsListContainer>
+                {activityTargetObjectRecords.map(
+                  (activityTargetObjectRecord) => (
+                    <RecordChip
+                      key={activityTargetObjectRecord.targetObject.id}
+                      record={activityTargetObjectRecord.targetObject}
+                      objectNameSingular={
+                        activityTargetObjectRecord.targetObjectMetadataItem
+                          .nameSingular
+                      }
+                    />
+                  ),
+                )}
+              </StyledRelationsListContainer>
+            }
+          />
+        </div>
+      )}
     </StyledContainer>
   );
 };
diff --git a/packages/twenty-front/src/modules/activities/components/ActivityTitle.tsx b/packages/twenty-front/src/modules/activities/components/ActivityTitle.tsx
index 4eb7b38033b4..288447dbec41 100644
--- a/packages/twenty-front/src/modules/activities/components/ActivityTitle.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityTitle.tsx
@@ -1,4 +1,5 @@
 import { useRef } from 'react';
+import { useApolloClient } from '@apollo/client';
 import styled from '@emotion/styled';
 import { isNonEmptyString } from '@sniptt/guards';
 import { useRecoilState } from 'recoil';
@@ -11,9 +12,9 @@ import { activityTitleHasBeenSetFamilyState } from '@/activities/states/activity
 import { canCreateActivityState } from '@/activities/states/canCreateActivityState';
 import { Activity } from '@/activities/types/Activity';
 import { ActivityEditorHotkeyScope } from '@/activities/types/ActivityEditorHotkeyScope';
-import { useObjectMetadataItemOnly } from '@/object-metadata/hooks/useObjectMetadataItemOnly';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useModifyRecordFromCache } from '@/object-record/cache/hooks/useModifyRecordFromCache';
+import { modifyRecordFromCache } from '@/object-record/cache/utils/modifyRecordFromCache';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import {
   Checkbox,
@@ -22,7 +23,7 @@ import {
 } from '@/ui/input/components/Checkbox';
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 const StyledEditableTitleInput = styled.input<{
   completed: boolean;
@@ -64,6 +65,8 @@ export const ActivityTitle = ({ activityId }: ActivityTitleProps) => {
     recordStoreFamilyState(activityId),
   );
 
+  const cache = useApolloClient().cache;
+
   const [activityTitle, setActivityTitle] = useRecoilState(
     activityTitleFamilyState({ activityId }),
   );
@@ -108,14 +111,10 @@ export const ActivityTitle = ({ activityId }: ActivityTitleProps) => {
   );
 
   const { objectMetadataItem: objectMetadataItemActivity } =
-    useObjectMetadataItemOnly({
+    useObjectMetadataItem({
       objectNameSingular: CoreObjectNameSingular.Activity,
     });
 
-  const modifyActivityFromCache = useModifyRecordFromCache({
-    objectMetadataItem: objectMetadataItemActivity,
-  });
-
   const persistTitleDebounced = useDebouncedCallback((newTitle: string) => {
     upsertActivity({
       activity,
@@ -142,10 +141,15 @@ export const ActivityTitle = ({ activityId }: ActivityTitleProps) => {
       setCanCreateActivity(true);
     }
 
-    modifyActivityFromCache(activity.id, {
-      title: () => {
-        return newTitle;
+    modifyRecordFromCache({
+      recordId: activity.id,
+      fieldModifiers: {
+        title: () => {
+          return newTitle;
+        },
       },
+      cache: cache,
+      objectMetadataItem: objectMetadataItemActivity,
     });
   }, 500);
 
@@ -166,7 +170,7 @@ export const ActivityTitle = ({ activityId }: ActivityTitleProps) => {
     });
   };
 
-  const completed = isNonNullable(activity.completedAt);
+  const completed = isDefined(activity.completedAt);
 
   return (
     <StyledContainer>
diff --git a/packages/twenty-front/src/modules/activities/components/ActivityTitleEffect.tsx b/packages/twenty-front/src/modules/activities/components/ActivityTitleEffect.tsx
index c5fcadaa7cf0..50d3e4dffd59 100644
--- a/packages/twenty-front/src/modules/activities/components/ActivityTitleEffect.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityTitleEffect.tsx
@@ -3,6 +3,7 @@ import { useRecoilState } from 'recoil';
 
 import { activityTitleFamilyState } from '@/activities/states/activityTitleFamilyState';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { isDefined } from '~/utils/isDefined';
 
 export const ActivityTitleEffect = ({ activityId }: { activityId: string }) => {
   const [activityFromStore] = useRecoilState(
@@ -16,7 +17,7 @@ export const ActivityTitleEffect = ({ activityId }: { activityId: string }) => {
   useEffect(() => {
     if (
       activityTitle === '' &&
-      activityFromStore &&
+      isDefined(activityFromStore) &&
       activityTitle !== activityFromStore.title
     ) {
       setActivityTitle(activityFromStore.title);
diff --git a/packages/twenty-front/src/modules/activities/components/ActivityTypeDropdown.tsx b/packages/twenty-front/src/modules/activities/components/ActivityTypeDropdown.tsx
index d1b927e3550c..40015fee55b0 100644
--- a/packages/twenty-front/src/modules/activities/components/ActivityTypeDropdown.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityTypeDropdown.tsx
@@ -1,5 +1,6 @@
 import { useTheme } from '@emotion/react';
 import { useRecoilState } from 'recoil';
+import { IconCheckbox, IconNotes } from 'twenty-ui';
 
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import {
@@ -8,7 +9,6 @@ import {
   ChipSize,
   ChipVariant,
 } from '@/ui/display/chip/components/Chip';
-import { IconCheckbox, IconNotes } from '@/ui/display/icon';
 
 type ActivityTypeDropdownProps = {
   activityId: string;
diff --git a/packages/twenty-front/src/modules/activities/components/CustomResolverFetchMoreLoader.tsx b/packages/twenty-front/src/modules/activities/components/CustomResolverFetchMoreLoader.tsx
new file mode 100644
index 000000000000..5bc3c1eb1252
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/components/CustomResolverFetchMoreLoader.tsx
@@ -0,0 +1,34 @@
+import { useInView } from 'react-intersection-observer';
+import styled from '@emotion/styled';
+
+import { GRAY_SCALE } from '@/ui/theme/constants/GrayScale';
+
+type FetchMoreLoaderProps = {
+  loading: boolean;
+  onLastRowVisible: (...args: any[]) => any;
+};
+
+const StyledText = styled.div`
+  align-items: center;
+  box-shadow: none;
+  color: ${GRAY_SCALE.gray40};
+  display: flex;
+  height: 32px;
+  margin-left: ${({ theme }) => theme.spacing(8)};
+  padding-left: ${({ theme }) => theme.spacing(2)};
+`;
+
+export const FetchMoreLoader = ({
+  loading,
+  onLastRowVisible,
+}: FetchMoreLoaderProps) => {
+  const { ref: tbodyRef } = useInView({
+    onChange: onLastRowVisible,
+  });
+
+  return (
+    <div ref={tbodyRef}>
+      {loading && <StyledText>Loading more...</StyledText>}
+    </div>
+  );
+};
diff --git a/packages/twenty-front/src/modules/activities/components/ParticipantChip.tsx b/packages/twenty-front/src/modules/activities/components/ParticipantChip.tsx
new file mode 100644
index 000000000000..84235d6a912e
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/components/ParticipantChip.tsx
@@ -0,0 +1,80 @@
+import styled from '@emotion/styled';
+
+import { getDisplayNameFromParticipant } from '@/activities/emails/utils/getDisplayNameFromParticipant';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { RecordChip } from '@/object-record/components/RecordChip';
+import { Avatar } from '@/users/components/Avatar';
+
+const StyledAvatar = styled(Avatar)`
+  margin-right: ${({ theme }) => theme.spacing(1)};
+`;
+
+const StyledSenderName = styled.span<{ variant?: 'default' | 'bold' }>`
+  color: ${({ theme }) => theme.font.color.primary};
+  font-size: ${({ theme }) => theme.font.size.md};
+  font-weight: ${({ theme, variant }) =>
+    variant === 'bold' ? theme.font.weight.medium : theme.font.weight.regular};
+  overflow: hidden;
+  text-overflow: ellipsis;
+`;
+
+const StyledContainer = styled.div`
+  align-items: flex-start;
+  display: flex;
+`;
+
+const StyledRecordChip = styled(RecordChip)<{ variant: 'default' | 'bold' }>`
+  font-weight: ${({ theme, variant }) =>
+    variant === 'bold' ? theme.font.weight.medium : theme.font.weight.regular};
+`;
+
+const StyledChip = styled.div`
+  align-items: center;
+  display: flex;
+  padding: ${({ theme }) => theme.spacing(1)};
+  height: 20px;
+  box-sizing: border-box;
+`;
+
+type ParticipantChipVariant = 'default' | 'bold';
+
+export const ParticipantChip = ({
+  participant,
+  variant = 'default',
+  className,
+}: {
+  participant: any;
+  variant?: ParticipantChipVariant;
+  className?: string;
+}) => {
+  const { person, workspaceMember } = participant;
+
+  const displayName = getDisplayNameFromParticipant({
+    participant,
+    shouldUseFullName: true,
+  });
+
+  const avatarUrl = person?.avatarUrl ?? workspaceMember?.avatarUrl ?? '';
+
+  return (
+    <StyledContainer className={className}>
+      {person ? (
+        <StyledRecordChip
+          objectNameSingular={CoreObjectNameSingular.Person}
+          record={person}
+          variant={variant}
+        />
+      ) : (
+        <StyledChip>
+          <StyledAvatar
+            avatarUrl={avatarUrl}
+            type="rounded"
+            placeholder={displayName}
+            size="sm"
+          />
+          <StyledSenderName variant={variant}>{displayName}</StyledSenderName>
+        </StyledChip>
+      )}
+    </StyledContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadBottomBar.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadBottomBar.tsx
index 0174832819a2..c010da2cd1fb 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadBottomBar.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadBottomBar.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled';
+import { IconArrowBackUp, IconUserCircle } from 'twenty-ui';
 
-import { IconArrowBackUp, IconUserCircle } from '@/ui/display/icon';
 import { Button } from '@/ui/input/button/components/Button';
 
 const StyledThreadBottomBar = styled.div`
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadFetchMoreLoader.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadFetchMoreLoader.tsx
deleted file mode 100644
index c133b5531018..000000000000
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadFetchMoreLoader.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { useInView } from 'react-intersection-observer';
-import styled from '@emotion/styled';
-
-import { GRAY_SCALE } from '@/ui/theme/constants/GrayScale';
-
-type EmailThreadFetchMoreLoaderProps = {
-  loading: boolean;
-  onLastRowVisible: (...args: any[]) => any;
-};
-
-const StyledText = styled.div`
-  align-items: center;
-  box-shadow: none;
-  color: ${GRAY_SCALE.gray40};
-  display: flex;
-  height: 32px;
-  margin-left: ${({ theme }) => theme.spacing(8)};
-  padding-left: ${({ theme }) => theme.spacing(2)};
-`;
-
-export const EmailThreadFetchMoreLoader = ({
-  loading,
-  onLastRowVisible,
-}: EmailThreadFetchMoreLoaderProps) => {
-  const { ref: tbodyRef } = useInView({
-    onChange: onLastRowVisible,
-  });
-
-  return (
-    <div ref={tbodyRef}>
-      {loading && <StyledText>Loading more...</StyledText>}
-    </div>
-  );
-};
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadHeader.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadHeader.tsx
index e5d53542e6e6..2dcc73c58e1a 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadHeader.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadHeader.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled';
+import { IconMail } from 'twenty-ui';
 
-import { IconMail } from '@/ui/display/icon';
 import { Tag } from '@/ui/display/tag/components/Tag';
 import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';
 
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
index ae2552c203b1..d58e4606aafb 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
@@ -1,11 +1,7 @@
-import React from 'react';
 import styled from '@emotion/styled';
 
+import { ParticipantChip } from '@/activities/components/ParticipantChip';
 import { EmailThreadMessageParticipant } from '@/activities/emails/types/EmailThreadMessageParticipant';
-import { getDisplayNameFromParticipant } from '@/activities/emails/utils/getDisplayNameFromParticipant';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { RecordChip } from '@/object-record/components/RecordChip';
-import { Avatar } from '@/users/components/Avatar';
 import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';
 
 const StyledEmailThreadMessageSender = styled.div`
@@ -13,23 +9,6 @@ const StyledEmailThreadMessageSender = styled.div`
   justify-content: space-between;
 `;
 
-const StyledEmailThreadMessageSenderUser = styled.div`
-  align-items: flex-start;
-  display: flex;
-`;
-
-const StyledAvatar = styled(Avatar)`
-  margin: ${({ theme }) => theme.spacing(0, 1)};
-`;
-
-const StyledSenderName = styled.span`
-  color: ${({ theme }) => theme.font.color.primary};
-  font-size: ${({ theme }) => theme.font.size.sm};
-  font-weight: ${({ theme }) => theme.font.weight.medium};
-  overflow: hidden;
-  text-overflow: ellipsis;
-`;
-
 const StyledThreadMessageSentAt = styled.div`
   align-items: flex-end;
   display: flex;
@@ -37,10 +16,6 @@ const StyledThreadMessageSentAt = styled.div`
   font-size: ${({ theme }) => theme.font.size.sm};
 `;
 
-const StyledRecordChip = styled(RecordChip)`
-  font-weight: ${({ theme }) => theme.font.weight.medium};
-`;
-
 type EmailThreadMessageSenderProps = {
   sender: EmailThreadMessageParticipant;
   sentAt: string;
@@ -50,35 +25,9 @@ export const EmailThreadMessageSender = ({
   sender,
   sentAt,
 }: EmailThreadMessageSenderProps) => {
-  const { person, workspaceMember } = sender;
-
-  const displayName = getDisplayNameFromParticipant({
-    participant: sender,
-    shouldUseFullName: true,
-  });
-
-  const avatarUrl = person?.avatarUrl ?? workspaceMember?.avatarUrl ?? '';
-
   return (
     <StyledEmailThreadMessageSender>
-      <StyledEmailThreadMessageSenderUser>
-        {person ? (
-          <StyledRecordChip
-            objectNameSingular={CoreObjectNameSingular.Person}
-            record={person}
-          />
-        ) : (
-          <>
-            <StyledAvatar
-              avatarUrl={avatarUrl}
-              type="rounded"
-              placeholder={displayName}
-              size="sm"
-            />
-            <StyledSenderName>{displayName}</StyledSenderName>
-          </>
-        )}
-      </StyledEmailThreadMessageSenderUser>
+      <ParticipantChip participant={sender} variant="bold" />
       <StyledThreadMessageSentAt>
         {beautifyPastDateRelativeToNow(sentAt)}
       </StyledThreadMessageSentAt>
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx
index 1768956ca95c..87623cb0eb4c 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx
@@ -1,7 +1,6 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-
-import { IconLock } from '@/ui/display/icon';
+import { IconLock } from 'twenty-ui';
 
 const StyledContainer = styled.div`
   align-items: center;
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx
index 523645b1cb13..ce085a8e7b3d 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx
@@ -1,7 +1,12 @@
+import { useRef } from 'react';
 import styled from '@emotion/styled';
+import { useRecoilCallback } from 'recoil';
 
 import { EmailThreadNotShared } from '@/activities/emails/components/EmailThreadNotShared';
+import { useEmailThread } from '@/activities/emails/hooks/useEmailThread';
+import { emailThreadIdWhenEmailThreadWasClosedState } from '@/activities/emails/states/lastViewableEmailThreadIdState';
 import { CardContent } from '@/ui/layout/card/components/CardContent';
+import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
 import { GRAY_SCALE } from '@/ui/theme/constants/GrayScale';
 import { Avatar } from '@/users/components/Avatar';
 import { TimelineThread } from '~/generated/graphql';
@@ -73,19 +78,23 @@ const StyledReceivedAt = styled.div`
   padding: ${({ theme }) => theme.spacing(0, 1)};
 `;
 
+export type EmailThreadVisibility = 'metadata' | 'subject' | 'share_everything';
+
 type EmailThreadPreviewProps = {
   divider?: boolean;
   thread: TimelineThread;
-  onClick: () => void;
-  visibility: 'metadata' | 'subject' | 'share_everything';
 };
 
 export const EmailThreadPreview = ({
   divider,
   thread,
-  onClick,
-  visibility,
 }: EmailThreadPreviewProps) => {
+  const cardRef = useRef<HTMLDivElement>(null);
+
+  const { openEmailThread } = useEmailThread();
+
+  const visibility = thread.visibility as EmailThreadVisibility;
+
   const senderNames =
     thread.firstParticipant.displayName +
     (thread?.lastTwoParticipants?.[0]?.displayName
@@ -104,9 +113,39 @@ export const EmailThreadPreview = ({
           false,
         ];
 
+  const { isSameEventThanRightDrawerClose } = useRightDrawer();
+
+  const handleThreadClick = useRecoilCallback(
+    ({ snapshot }) =>
+      (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
+        const clickJustTriggeredEmailDrawerClose =
+          isSameEventThanRightDrawerClose(event.nativeEvent);
+
+        const emailThreadIdWhenEmailThreadWasClosed = snapshot
+          .getLoadable(emailThreadIdWhenEmailThreadWasClosedState)
+          .getValue();
+
+        const canOpen =
+          thread.visibility === 'share_everything' &&
+          (!clickJustTriggeredEmailDrawerClose ||
+            emailThreadIdWhenEmailThreadWasClosed !== thread.id);
+
+        if (canOpen) {
+          openEmailThread(thread.id);
+        }
+      },
+    [
+      isSameEventThanRightDrawerClose,
+      openEmailThread,
+      thread.id,
+      thread.visibility,
+    ],
+  );
+
   return (
     <StyledCardContent
-      onClick={() => onClick()}
+      ref={cardRef}
+      onClick={(event) => handleThreadClick(event)}
       divider={divider}
       visibility={visibility}
     >
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreads.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreads.tsx
index 370414543363..8577d7f1a320 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreads.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreads.tsx
@@ -1,23 +1,18 @@
-import { useState } from 'react';
-import { useQuery } from '@apollo/client';
 import styled from '@emotion/styled';
-import { useRecoilState } from 'recoil';
 
+import { FetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';
 import { EmailLoader } from '@/activities/emails/components/EmailLoader';
-import { EmailThreadFetchMoreLoader } from '@/activities/emails/components/EmailThreadFetchMoreLoader';
 import { EmailThreadPreview } from '@/activities/emails/components/EmailThreadPreview';
 import { TIMELINE_THREADS_DEFAULT_PAGE_SIZE } from '@/activities/emails/constants/Messaging';
-import { useEmailThreadStates } from '@/activities/emails/hooks/internal/useEmailThreadStates';
-import { useEmailThread } from '@/activities/emails/hooks/useEmailThread';
 import { getTimelineThreadsFromCompanyId } from '@/activities/emails/queries/getTimelineThreadsFromCompanyId';
 import { getTimelineThreadsFromPersonId } from '@/activities/emails/queries/getTimelineThreadsFromPersonId';
+import { useCustomResolver } from '@/activities/hooks/useCustomResolver';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import {
   H1Title,
   H1TitleFontColor,
 } from '@/ui/display/typography/components/H1Title';
-import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import AnimatedPlaceholder from '@/ui/layout/animated-placeholder/components/AnimatedPlaceholder';
 import {
   AnimatedPlaceholderEmptyContainer,
@@ -27,12 +22,7 @@ import {
 } from '@/ui/layout/animated-placeholder/components/EmptyPlaceholderStyled';
 import { Card } from '@/ui/layout/card/components/Card';
 import { Section } from '@/ui/layout/section/components/Section';
-import { getScopeIdFromComponentId } from '@/ui/utilities/recoil-scope/utils/getScopeIdFromComponentId';
-import {
-  GetTimelineThreadsFromPersonIdQueryVariables,
-  TimelineThread,
-  TimelineThreadsWithTotal,
-} from '~/generated/graphql';
+import { TimelineThread, TimelineThreadsWithTotal } from '~/generated/graphql';
 
 const StyledContainer = styled.div`
   display: flex;
@@ -53,101 +43,25 @@ const StyledEmailCount = styled.span`
 `;
 
 export const EmailThreads = ({
-  entity,
+  targetableObject,
 }: {
-  entity: ActivityTargetableObject;
+  targetableObject: ActivityTargetableObject;
 }) => {
-  const { openEmailThread } = useEmailThread();
-  const { enqueueSnackBar } = useSnackBar();
-
-  const { getEmailThreadsPageState } = useEmailThreadStates({
-    emailThreadScopeId: getScopeIdFromComponentId(entity.id),
-  });
-
-  const [emailThreadsPage, setEmailThreadsPage] = useRecoilState(
-    getEmailThreadsPageState(),
-  );
-
-  const [isFetchingMoreEmails, setIsFetchingMoreEmails] = useState(false);
-
-  const [threadQuery, queryName] =
-    entity.targetObjectNameSingular === CoreObjectNameSingular.Person
+  const [query, queryName] =
+    targetableObject.targetObjectNameSingular === CoreObjectNameSingular.Person
       ? [getTimelineThreadsFromPersonId, 'getTimelineThreadsFromPersonId']
       : [getTimelineThreadsFromCompanyId, 'getTimelineThreadsFromCompanyId'];
 
-  const threadQueryVariables = {
-    ...(entity.targetObjectNameSingular === CoreObjectNameSingular.Person
-      ? { personId: entity.id }
-      : { companyId: entity.id }),
-    page: 1,
-    pageSize: TIMELINE_THREADS_DEFAULT_PAGE_SIZE,
-  } as GetTimelineThreadsFromPersonIdQueryVariables;
-
-  const {
-    data,
-    loading: firstQueryLoading,
-    fetchMore,
-    error,
-  } = useQuery(threadQuery, {
-    variables: threadQueryVariables,
-  });
-
-  const fetchMoreRecords = async () => {
-    if (
-      emailThreadsPage.hasNextPage &&
-      !isFetchingMoreEmails &&
-      !firstQueryLoading
-    ) {
-      setIsFetchingMoreEmails(true);
-
-      await fetchMore({
-        variables: {
-          ...threadQueryVariables,
-          page: emailThreadsPage.pageNumber + 1,
-        },
-        updateQuery: (prev, { fetchMoreResult }) => {
-          if (!fetchMoreResult?.[queryName]?.timelineThreads?.length) {
-            setEmailThreadsPage((emailThreadsPage) => ({
-              ...emailThreadsPage,
-              hasNextPage: false,
-            }));
-            return {
-              [queryName]: {
-                ...prev?.[queryName],
-                timelineThreads: [
-                  ...(prev?.[queryName]?.timelineThreads ?? []),
-                ],
-              },
-            };
-          }
-
-          return {
-            [queryName]: {
-              ...prev?.[queryName],
-              timelineThreads: [
-                ...(prev?.[queryName]?.timelineThreads ?? []),
-                ...(fetchMoreResult?.[queryName]?.timelineThreads ?? []),
-              ],
-            },
-          };
-        },
-      });
-      setEmailThreadsPage((emailThreadsPage) => ({
-        ...emailThreadsPage,
-        pageNumber: emailThreadsPage.pageNumber + 1,
-      }));
-      setIsFetchingMoreEmails(false);
-    }
-  };
-
-  if (error) {
-    enqueueSnackBar(error.message || 'Error loading email threads', {
-      variant: 'error',
-    });
-  }
+  const { data, firstQueryLoading, isFetchingMore, fetchMoreRecords } =
+    useCustomResolver<TimelineThreadsWithTotal>(
+      query,
+      queryName,
+      'timelineThreads',
+      targetableObject,
+      TIMELINE_THREADS_DEFAULT_PAGE_SIZE,
+    );
 
-  const { totalNumberOfThreads, timelineThreads }: TimelineThreadsWithTotal =
-    data?.[queryName] ?? [];
+  const { totalNumberOfThreads, timelineThreads } = data?.[queryName] ?? {};
 
   if (firstQueryLoading) {
     return <EmailLoader />;
@@ -187,24 +101,12 @@ export const EmailThreads = ({
                 key={index}
                 divider={index < timelineThreads.length - 1}
                 thread={thread}
-                onClick={
-                  thread.visibility === 'share_everything'
-                    ? () => openEmailThread(thread.id)
-                    : () => {}
-                }
-                visibility={
-                  // TODO: Fix typing for visibility
-                  thread.visibility as
-                    | 'metadata'
-                    | 'subject'
-                    | 'share_everything'
-                }
               />
             ))}
           </Card>
         )}
-        <EmailThreadFetchMoreLoader
-          loading={isFetchingMoreEmails || firstQueryLoading}
+        <FetchMoreLoader
+          loading={isFetchingMore || firstQueryLoading}
           onLastRowVisible={fetchMoreRecords}
         />
       </Section>
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/useEmailThread.test.tsx b/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/useEmailThread.test.tsx
new file mode 100644
index 000000000000..4dae422ca2fd
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/useEmailThread.test.tsx
@@ -0,0 +1,69 @@
+import { act, renderHook } from '@testing-library/react';
+import { RecoilRoot, useRecoilState, useRecoilValue } from 'recoil';
+
+import { useEmailThread } from '@/activities/emails/hooks/useEmailThread';
+import { viewableEmailThreadIdState } from '@/activities/emails/states/viewableEmailThreadIdState';
+import { isRightDrawerOpenState } from '@/ui/layout/right-drawer/states/isRightDrawerOpenState';
+
+const viewableEmailThreadId = '1234';
+
+describe('useEmailThread', () => {
+  it('should open email thread', () => {
+    const { result } = renderHook(
+      () => {
+        const emailThread = useEmailThread();
+        const isRightDrawerOpen = useRecoilValue(isRightDrawerOpenState);
+        const viewableEmailThreadId = useRecoilValue(
+          viewableEmailThreadIdState,
+        );
+
+        return { ...emailThread, isRightDrawerOpen, viewableEmailThreadId };
+      },
+      { wrapper: RecoilRoot },
+    );
+
+    expect(result.current.isRightDrawerOpen).toBe(false);
+    expect(result.current.viewableEmailThreadId).toBeNull();
+
+    act(() => {
+      result.current.openEmailThread(viewableEmailThreadId);
+    });
+
+    expect(result.current.isRightDrawerOpen).toBe(true);
+    expect(result.current.viewableEmailThreadId).toBe(viewableEmailThreadId);
+  });
+
+  it('should close email thread if trying to open the same thread id', () => {
+    const { result } = renderHook(
+      () => {
+        const emailThread = useEmailThread();
+        const [isRightDrawerOpen, setIsRightDrawerOpen] = useRecoilState(
+          isRightDrawerOpenState,
+        );
+        const [viewableEmailThreadId, setViewableEmailThreadId] =
+          useRecoilState(viewableEmailThreadIdState);
+
+        return {
+          ...emailThread,
+          isRightDrawerOpen,
+          viewableEmailThreadId,
+          setIsRightDrawerOpen,
+          setViewableEmailThreadId,
+        };
+      },
+      { wrapper: RecoilRoot },
+    );
+
+    act(() => {
+      result.current.setIsRightDrawerOpen(true);
+      result.current.setViewableEmailThreadId(viewableEmailThreadId);
+    });
+
+    act(() => {
+      result.current.openEmailThread(viewableEmailThreadId);
+    });
+
+    expect(result.current.isRightDrawerOpen).toBe(false);
+    expect(result.current.viewableEmailThreadId).toBeNull();
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/internal/useEmailThreadStates.ts b/packages/twenty-front/src/modules/activities/emails/hooks/internal/useEmailThreadStates.ts
deleted file mode 100644
index dc40a314dfb5..000000000000
--- a/packages/twenty-front/src/modules/activities/emails/hooks/internal/useEmailThreadStates.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { emailThreadsPageStateScopeMap } from '@/activities/emails/state/emailThreadsPageStateScopeMap';
-import { TabListScopeInternalContext } from '@/ui/layout/tab/scopes/scope-internal-context/TabListScopeInternalContext';
-import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
-import { getState } from '@/ui/utilities/recoil-scope/utils/getState';
-
-type useEmailThreadStatesProps = {
-  emailThreadScopeId?: string;
-};
-
-export const useEmailThreadStates = ({
-  emailThreadScopeId,
-}: useEmailThreadStatesProps) => {
-  const scopeId = useAvailableScopeIdOrThrow(
-    TabListScopeInternalContext,
-    emailThreadScopeId,
-  );
-
-  return {
-    scopeId,
-    getEmailThreadsPageState: getState(emailThreadsPageStateScopeMap, scopeId),
-  };
-};
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useEmailThread.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useEmailThread.ts
index a0e9bbc857c8..a0757a18af57 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/useEmailThread.ts
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useEmailThread.ts
@@ -1,22 +1,36 @@
-import { useRecoilState } from 'recoil';
+import { useRecoilCallback } from 'recoil';
 
 import { useOpenEmailThreadRightDrawer } from '@/activities/emails/right-drawer/hooks/useOpenEmailThreadRightDrawer';
-import { viewableEmailThreadIdState } from '@/activities/emails/state/viewableEmailThreadIdState';
+import { viewableEmailThreadIdState } from '@/activities/emails/states/viewableEmailThreadIdState';
+import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
+import { isRightDrawerOpenState } from '@/ui/layout/right-drawer/states/isRightDrawerOpenState';
 
 export const useEmailThread = () => {
-  const [, setViewableEmailThreadId] = useRecoilState(
-    viewableEmailThreadIdState,
-  );
-
+  const { closeRightDrawer } = useRightDrawer();
   const openEmailThredRightDrawer = useOpenEmailThreadRightDrawer();
 
-  const openEmailThread = (threadId: string) => {
-    openEmailThredRightDrawer();
+  const openEmailThread = useRecoilCallback(
+    ({ snapshot, set }) =>
+      (threadId: string) => {
+        const isRightDrawerOpen = snapshot
+          .getLoadable(isRightDrawerOpenState)
+          .getValue();
+
+        const viewableEmailThreadId = snapshot
+          .getLoadable(viewableEmailThreadIdState)
+          .getValue();
 
-    setViewableEmailThreadId(threadId);
-  };
+        if (isRightDrawerOpen && viewableEmailThreadId === threadId) {
+          set(viewableEmailThreadIdState, null);
+          closeRightDrawer();
+          return;
+        }
+
+        openEmailThredRightDrawer();
+        set(viewableEmailThreadIdState, threadId);
+      },
+    [closeRightDrawer, openEmailThredRightDrawer],
+  );
 
-  return {
-    openEmailThread,
-  };
+  return { openEmailThread };
 };
diff --git a/packages/twenty-front/src/modules/activities/emails/queries/__tests__/getTimelineThreadsFromCompanyId.test.ts b/packages/twenty-front/src/modules/activities/emails/queries/__tests__/getTimelineThreadsFromCompanyId.test.ts
new file mode 100644
index 000000000000..9b3c3ba70fde
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/queries/__tests__/getTimelineThreadsFromCompanyId.test.ts
@@ -0,0 +1,16 @@
+import { gql } from '@apollo/client';
+
+import { getTimelineThreadsFromCompanyId } from '../getTimelineThreadsFromCompanyId';
+
+jest.mock('@apollo/client', () => ({
+  gql: jest.fn().mockImplementation((strings) => {
+    return strings.map((str: string) => str.trim()).join(' ');
+  }),
+}));
+
+describe('getTimelineThreadsFromCompanyId query', () => {
+  test('should construct the query correctly', () => {
+    expect(gql).toHaveBeenCalled();
+    expect(getTimelineThreadsFromCompanyId).toBeDefined();
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/emails/queries/__tests__/getTimelineThreadsFromPersonId.test.ts b/packages/twenty-front/src/modules/activities/emails/queries/__tests__/getTimelineThreadsFromPersonId.test.ts
new file mode 100644
index 000000000000..66862b7288ee
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/queries/__tests__/getTimelineThreadsFromPersonId.test.ts
@@ -0,0 +1,16 @@
+import { gql } from '@apollo/client';
+
+import { getTimelineThreadsFromPersonId } from '../getTimelineThreadsFromPersonId';
+
+jest.mock('@apollo/client', () => ({
+  gql: jest.fn().mockImplementation((strings) => {
+    return strings.map((str: string) => str.trim()).join(' ');
+  }),
+}));
+
+describe('getTimelineThreadsFromPersonId query', () => {
+  test('should construct the query correctly', () => {
+    expect(gql).toHaveBeenCalled();
+    expect(getTimelineThreadsFromPersonId).toBeDefined();
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/emails/queries/getTimelineThreadsFromCompanyId.ts b/packages/twenty-front/src/modules/activities/emails/queries/getTimelineThreadsFromCompanyId.ts
index e0df0e6d7e96..589905550c7d 100644
--- a/packages/twenty-front/src/modules/activities/emails/queries/getTimelineThreadsFromCompanyId.ts
+++ b/packages/twenty-front/src/modules/activities/emails/queries/getTimelineThreadsFromCompanyId.ts
@@ -4,7 +4,7 @@ import { timelineThreadWithTotalFragment } from '@/activities/emails/queries/fra
 
 export const getTimelineThreadsFromCompanyId = gql`
   query GetTimelineThreadsFromCompanyId(
-    $companyId: ID!
+    $companyId: UUID!
     $page: Int!
     $pageSize: Int!
   ) {
diff --git a/packages/twenty-front/src/modules/activities/emails/queries/getTimelineThreadsFromPersonId.ts b/packages/twenty-front/src/modules/activities/emails/queries/getTimelineThreadsFromPersonId.ts
index 6bad39f9b6d7..84cd7053791e 100644
--- a/packages/twenty-front/src/modules/activities/emails/queries/getTimelineThreadsFromPersonId.ts
+++ b/packages/twenty-front/src/modules/activities/emails/queries/getTimelineThreadsFromPersonId.ts
@@ -4,7 +4,7 @@ import { timelineThreadWithTotalFragment } from '@/activities/emails/queries/fra
 
 export const getTimelineThreadsFromPersonId = gql`
   query GetTimelineThreadsFromPersonId(
-    $personId: ID!
+    $personId: UUID!
     $page: Int!
     $pageSize: Int!
   ) {
diff --git a/packages/twenty-front/src/modules/activities/emails/right-drawer/components/RightDrawerEmailThread.tsx b/packages/twenty-front/src/modules/activities/emails/right-drawer/components/RightDrawerEmailThread.tsx
index a59741d15de4..e80b0a4e9104 100644
--- a/packages/twenty-front/src/modules/activities/emails/right-drawer/components/RightDrawerEmailThread.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/right-drawer/components/RightDrawerEmailThread.tsx
@@ -1,11 +1,14 @@
-import React from 'react';
 import styled from '@emotion/styled';
+import { useRecoilCallback } from 'recoil';
 
+import { FetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';
 import { EmailLoader } from '@/activities/emails/components/EmailLoader';
-import { EmailThreadFetchMoreLoader } from '@/activities/emails/components/EmailThreadFetchMoreLoader';
 import { EmailThreadHeader } from '@/activities/emails/components/EmailThreadHeader';
 import { EmailThreadMessage } from '@/activities/emails/components/EmailThreadMessage';
 import { useRightDrawerEmailThread } from '@/activities/emails/right-drawer/hooks/useRightDrawerEmailThread';
+import { emailThreadIdWhenEmailThreadWasClosedState } from '@/activities/emails/states/lastViewableEmailThreadIdState';
+import { RIGHT_DRAWER_CLICK_OUTSIDE_LISTENER_ID } from '@/ui/layout/right-drawer/constants/RightDrawerClickOutsideListener';
+import { useClickOutsideListener } from '@/ui/utilities/pointer-event/hooks/useClickOutsideListener';
 
 const StyledContainer = styled.div`
   box-sizing: border-box;
@@ -21,6 +24,22 @@ export const RightDrawerEmailThread = () => {
   const { thread, messages, fetchMoreMessages, loading } =
     useRightDrawerEmailThread();
 
+  const { useRegisterClickOutsideListenerCallback } = useClickOutsideListener(
+    RIGHT_DRAWER_CLICK_OUTSIDE_LISTENER_ID,
+  );
+
+  useRegisterClickOutsideListenerCallback({
+    callbackId:
+      'EmailThreadClickOutsideCallBack-' + thread.id ?? 'no-thread-id',
+    callbackFunction: useRecoilCallback(
+      ({ set }) =>
+        () => {
+          set(emailThreadIdWhenEmailThreadWasClosedState, thread.id);
+        },
+      [thread],
+    ),
+  });
+
   if (!thread) {
     return null;
   }
@@ -43,7 +62,7 @@ export const RightDrawerEmailThread = () => {
               sentAt={message.receivedAt}
             />
           ))}
-          <EmailThreadFetchMoreLoader
+          <FetchMoreLoader
             loading={loading}
             onLastRowVisible={fetchMoreMessages}
           />
diff --git a/packages/twenty-front/src/modules/activities/emails/right-drawer/components/RightDrawerEmailThreadTopBar.tsx b/packages/twenty-front/src/modules/activities/emails/right-drawer/components/RightDrawerEmailThreadTopBar.tsx
deleted file mode 100644
index 29e71fe6e127..000000000000
--- a/packages/twenty-front/src/modules/activities/emails/right-drawer/components/RightDrawerEmailThreadTopBar.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import styled from '@emotion/styled';
-
-import { StyledRightDrawerTopBar } from '@/ui/layout/right-drawer/components/StyledRightDrawerTopBar';
-import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
-
-import { RightDrawerTopBarCloseButton } from '../../../../ui/layout/right-drawer/components/RightDrawerTopBarCloseButton';
-import { RightDrawerTopBarExpandButton } from '../../../../ui/layout/right-drawer/components/RightDrawerTopBarExpandButton';
-
-const StyledTopBarWrapper = styled.div`
-  display: flex;
-`;
-
-export const RightDrawerEmailThreadTopBar = () => {
-  const isMobile = useIsMobile();
-
-  return (
-    <StyledRightDrawerTopBar>
-      <StyledTopBarWrapper>
-        <RightDrawerTopBarCloseButton />
-        {!isMobile && <RightDrawerTopBarExpandButton />}
-      </StyledTopBarWrapper>
-    </StyledRightDrawerTopBar>
-  );
-};
diff --git a/packages/twenty-front/src/modules/activities/emails/right-drawer/components/__stories__/RightDrawerEmailThreadTopBar.stories.tsx b/packages/twenty-front/src/modules/activities/emails/right-drawer/components/__stories__/RightDrawerEmailThreadTopBar.stories.tsx
deleted file mode 100644
index ebbfc80dcb92..000000000000
--- a/packages/twenty-front/src/modules/activities/emails/right-drawer/components/__stories__/RightDrawerEmailThreadTopBar.stories.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Meta, StoryObj } from '@storybook/react';
-
-import { RightDrawerEmailThreadTopBar } from '@/activities/emails/right-drawer/components/RightDrawerEmailThreadTopBar';
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-import { graphqlMocks } from '~/testing/graphqlMocks';
-
-const meta: Meta<typeof RightDrawerEmailThreadTopBar> = {
-  title: 'Modules/Activities/Emails/RightDrawer/RightDrawerEmailThreadTopBar',
-  component: RightDrawerEmailThreadTopBar,
-  decorators: [
-    (Story) => (
-      <div style={{ width: '500px' }}>
-        <Story />
-      </div>
-    ),
-    ComponentDecorator,
-  ],
-  parameters: {
-    msw: graphqlMocks,
-  },
-};
-
-export default meta;
-type Story = StoryObj<typeof RightDrawerEmailThreadTopBar>;
-
-export const Default: Story = {};
diff --git a/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/__tests__/useOpenEmailThreadRightDrawer.test.ts b/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/__tests__/useOpenEmailThreadRightDrawer.test.ts
new file mode 100644
index 000000000000..6e77fc50907d
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/__tests__/useOpenEmailThreadRightDrawer.test.ts
@@ -0,0 +1,35 @@
+import { act } from 'react-dom/test-utils';
+import { renderHook } from '@testing-library/react';
+
+import { useOpenEmailThreadRightDrawer } from '@/activities/emails/right-drawer/hooks/useOpenEmailThreadRightDrawer';
+import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope';
+import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages';
+
+const mockOpenRightDrawer = jest.fn();
+const mockSetHotkeyScope = jest.fn();
+
+jest.mock('@/ui/layout/right-drawer/hooks/useRightDrawer', () => ({
+  useRightDrawer: () => ({
+    openRightDrawer: mockOpenRightDrawer,
+  }),
+}));
+
+jest.mock('@/ui/utilities/hotkey/hooks/useSetHotkeyScope', () => ({
+  useSetHotkeyScope: () => mockSetHotkeyScope,
+}));
+
+test('useOpenEmailThreadRightDrawer opens the email thread right drawer', () => {
+  const { result } = renderHook(() => useOpenEmailThreadRightDrawer());
+
+  act(() => {
+    result.current();
+  });
+
+  expect(mockSetHotkeyScope).toHaveBeenCalledWith(
+    RightDrawerHotkeyScope.RightDrawer,
+    { goto: false },
+  );
+  expect(mockOpenRightDrawer).toHaveBeenCalledWith(
+    RightDrawerPages.ViewEmailThread,
+  );
+});
diff --git a/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/__tests__/useRightDrawerEmailThread.test.tsx b/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/__tests__/useRightDrawerEmailThread.test.tsx
new file mode 100644
index 000000000000..63f1b09b06de
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/__tests__/useRightDrawerEmailThread.test.tsx
@@ -0,0 +1,40 @@
+import { MockedProvider } from '@apollo/client/testing';
+import { renderHook } from '@testing-library/react';
+import { RecoilRoot } from 'recoil';
+
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+
+import { useRightDrawerEmailThread } from '../useRightDrawerEmailThread';
+
+jest.mock('@/object-record/hooks/useFindManyRecords', () => ({
+  __esModule: true,
+  useFindManyRecords: jest.fn(),
+}));
+
+describe('useRightDrawerEmailThread', () => {
+  it('should return correct values', async () => {
+    const mockMessages = [
+      { id: '1', text: 'Message 1' },
+      { id: '2', text: 'Message 2' },
+    ];
+    const mockFetchMoreRecords = jest.fn();
+    (useFindManyRecords as jest.Mock).mockReturnValue({
+      records: mockMessages,
+      loading: false,
+      fetchMoreRecords: mockFetchMoreRecords,
+    });
+
+    const { result } = renderHook(() => useRightDrawerEmailThread(), {
+      wrapper: ({ children }) => (
+        <MockedProvider mocks={[]} addTypename={false}>
+          <RecoilRoot>{children}</RecoilRoot>
+        </MockedProvider>
+      ),
+    });
+
+    expect(result.current.thread).toBeDefined();
+    expect(result.current.messages).toEqual(mockMessages);
+    expect(result.current.loading).toBeFalsy();
+    expect(result.current.fetchMoreMessages).toBeInstanceOf(Function);
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/useRightDrawerEmailThread.ts b/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/useRightDrawerEmailThread.ts
index 1dbce6e00646..a524679fdb34 100644
--- a/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/useRightDrawerEmailThread.ts
+++ b/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/useRightDrawerEmailThread.ts
@@ -3,7 +3,7 @@ import { useApolloClient } from '@apollo/client';
 import gql from 'graphql-tag';
 import { useRecoilValue } from 'recoil';
 
-import { viewableEmailThreadIdState } from '@/activities/emails/state/viewableEmailThreadIdState';
+import { viewableEmailThreadIdState } from '@/activities/emails/states/viewableEmailThreadIdState';
 import { EmailThreadMessage as EmailThreadMessageType } from '@/activities/emails/types/EmailThreadMessage';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
@@ -40,7 +40,6 @@ export const useRightDrawerEmailThread = () => {
       receivedAt: 'AscNullsLast',
     },
     skip: !viewableEmailThreadId,
-    useRecordsWithoutConnection: true,
   });
 
   const fetchMoreMessages = useCallback(() => {
diff --git a/packages/twenty-front/src/modules/activities/emails/state/emailThreadsPageStateScopeMap.ts b/packages/twenty-front/src/modules/activities/emails/state/emailThreadsPageStateScopeMap.ts
deleted file mode 100644
index f7761acc793b..000000000000
--- a/packages/twenty-front/src/modules/activities/emails/state/emailThreadsPageStateScopeMap.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export type EmailThreadsPageType = {
-  pageNumber: number;
-  hasNextPage: boolean;
-};
-
-export const emailThreadsPageStateScopeMap =
-  createStateScopeMap<EmailThreadsPageType>({
-    key: 'emailThreadsPageStateScopeMap',
-    defaultValue: { pageNumber: 1, hasNextPage: true },
-  });
diff --git a/packages/twenty-front/src/modules/activities/emails/state/viewableEmailThreadIdState.ts b/packages/twenty-front/src/modules/activities/emails/state/viewableEmailThreadIdState.ts
deleted file mode 100644
index 73b4a3b89a46..000000000000
--- a/packages/twenty-front/src/modules/activities/emails/state/viewableEmailThreadIdState.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { atom } from 'recoil';
-
-export const viewableEmailThreadIdState = atom<string | null>({
-  key: 'viewableEmailThreadIdState',
-  default: null,
-});
diff --git a/packages/twenty-front/src/modules/activities/emails/states/lastViewableEmailThreadIdState.ts b/packages/twenty-front/src/modules/activities/emails/states/lastViewableEmailThreadIdState.ts
new file mode 100644
index 000000000000..4e90b960566d
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/states/lastViewableEmailThreadIdState.ts
@@ -0,0 +1,8 @@
+import { createState } from 'twenty-ui';
+
+export const emailThreadIdWhenEmailThreadWasClosedState = createState<
+  string | null
+>({
+  key: 'emailThreadIdWhenEmailThreadWasClosedState',
+  defaultValue: null,
+});
diff --git a/packages/twenty-front/src/modules/activities/emails/states/viewableEmailThreadIdState.ts b/packages/twenty-front/src/modules/activities/emails/states/viewableEmailThreadIdState.ts
new file mode 100644
index 000000000000..494ec3d9cb63
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/states/viewableEmailThreadIdState.ts
@@ -0,0 +1,6 @@
+import { createState } from 'twenty-ui';
+
+export const viewableEmailThreadIdState = createState<string | null>({
+  key: 'viewableEmailThreadIdState',
+  defaultValue: null,
+});
diff --git a/packages/twenty-front/src/modules/activities/emails/utils/__tests__/getDisplayNameFromParticipant.test.ts b/packages/twenty-front/src/modules/activities/emails/utils/__tests__/getDisplayNameFromParticipant.test.ts
new file mode 100644
index 000000000000..e7647d869483
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/utils/__tests__/getDisplayNameFromParticipant.test.ts
@@ -0,0 +1,100 @@
+import { EmailThreadMessageParticipant } from '@/activities/emails/types/EmailThreadMessageParticipant';
+
+import { getDisplayNameFromParticipant } from '../getDisplayNameFromParticipant';
+
+describe('getDisplayNameFromParticipant', () => {
+  const participantWithName: EmailThreadMessageParticipant = {
+    displayName: '',
+    handle: '',
+    role: 'from',
+    person: {
+      id: '1',
+      createdAt: '',
+      updatedAt: '',
+      deletedAt: null,
+      name: {
+        firstName: 'John',
+        lastName: 'Doe',
+      },
+      avatarUrl: '',
+      jobTitle: '',
+      linkedinLink: {
+        url: '',
+        label: '',
+      },
+      xLink: {
+        url: '',
+        label: '',
+      },
+      city: '',
+      email: '',
+      phone: '',
+      companyId: '',
+    },
+    workspaceMember: {
+      id: '1',
+      name: {
+        firstName: 'Jane',
+        lastName: 'Smith',
+      },
+      locale: '',
+      createdAt: '',
+      updatedAt: '',
+      userEmail: '',
+      userId: '',
+    },
+  };
+
+  const participantWithHandle: any = {
+    displayName: '',
+    handle: 'user_handle',
+    role: 'from',
+  };
+
+  const participantWithDisplayName: any = {
+    displayName: 'User123',
+    handle: '',
+    role: 'from',
+  };
+
+  const participantWithoutInfo: any = {
+    displayName: '',
+    handle: '',
+    role: 'from',
+  };
+
+  it('should return full name when shouldUseFullName is true', () => {
+    expect(
+      getDisplayNameFromParticipant({
+        participant: participantWithName,
+        shouldUseFullName: true,
+      }),
+    ).toBe('John Doe');
+  });
+
+  it('should return first name when shouldUseFullName is false', () => {
+    expect(
+      getDisplayNameFromParticipant({ participant: participantWithName }),
+    ).toBe('John');
+  });
+
+  it('should return displayName if it is a non-empty string', () => {
+    expect(
+      getDisplayNameFromParticipant({
+        participant: participantWithDisplayName,
+      }),
+    ).toBe('User123');
+  });
+
+  it('should return handle if displayName is not available', () => {
+    expect(
+      getDisplayNameFromParticipant({ participant: participantWithHandle }),
+    ).toBe('user_handle');
+  });
+
+  it('should return Unknown if no suitable information is available', () => {
+    expect(
+      getDisplayNameFromParticipant({ participant: participantWithoutInfo }),
+    ).toBe('Unknown');
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/emails/utils/getDisplayNameFromParticipant.ts b/packages/twenty-front/src/modules/activities/emails/utils/getDisplayNameFromParticipant.ts
index 8735711c21b8..ca1e63ee2aa2 100644
--- a/packages/twenty-front/src/modules/activities/emails/utils/getDisplayNameFromParticipant.ts
+++ b/packages/twenty-front/src/modules/activities/emails/utils/getDisplayNameFromParticipant.ts
@@ -1,4 +1,7 @@
+import { isNonEmptyString } from '@sniptt/guards';
+
 import { EmailThreadMessageParticipant } from '@/activities/emails/types/EmailThreadMessageParticipant';
+import { isDefined } from '~/utils/isDefined';
 
 export const getDisplayNameFromParticipant = ({
   participant,
@@ -7,14 +10,14 @@ export const getDisplayNameFromParticipant = ({
   participant: EmailThreadMessageParticipant;
   shouldUseFullName?: boolean;
 }) => {
-  if (participant.person) {
+  if (isDefined(participant.person)) {
     return (
       `${participant.person?.name?.firstName}` +
       (shouldUseFullName ? ` ${participant.person?.name?.lastName}` : '')
     );
   }
 
-  if (participant.workspaceMember) {
+  if (isDefined(participant.workspaceMember)) {
     return (
       participant.workspaceMember?.name?.firstName +
       (shouldUseFullName
@@ -23,11 +26,11 @@ export const getDisplayNameFromParticipant = ({
     );
   }
 
-  if (participant.displayName) {
+  if (isNonEmptyString(participant.displayName)) {
     return participant.displayName;
   }
 
-  if (participant.handle) {
+  if (isNonEmptyString(participant.handle)) {
     return participant.handle;
   }
 
diff --git a/packages/twenty-front/src/modules/activities/events/components/EventList.tsx b/packages/twenty-front/src/modules/activities/events/components/EventList.tsx
new file mode 100644
index 000000000000..92219b4e8430
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/events/components/EventList.tsx
@@ -0,0 +1,56 @@
+import { ReactElement } from 'react';
+import styled from '@emotion/styled';
+
+import { EventsGroup } from '@/activities/events/components/EventsGroup';
+import { Event } from '@/activities/events/types/Event';
+import { groupEventsByMonth } from '@/activities/events/utils/groupEventsByMonth';
+import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
+import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
+
+type EventListProps = {
+  targetableObject: ActivityTargetableObject;
+  title: string;
+  events: Event[];
+  button?: ReactElement | false;
+};
+
+const StyledTimelineContainer = styled.div`
+  align-items: center;
+  align-self: stretch;
+
+  display: flex;
+  flex: 1 0 0;
+  flex-direction: column;
+  gap: ${({ theme }) => theme.spacing(1)};
+  justify-content: flex-start;
+
+  padding: ${({ theme }) => theme.spacing(4)};
+  width: calc(100% - ${({ theme }) => theme.spacing(8)});
+`;
+
+export const EventList = ({ events, targetableObject }: EventListProps) => {
+  const groupedEvents = groupEventsByMonth(events);
+
+  return (
+    <ScrollWrapper>
+      <StyledTimelineContainer>
+        {groupedEvents.map((group, index) => (
+          <EventsGroup
+            targetableObject={targetableObject}
+            key={group.year.toString() + group.month}
+            group={group}
+            month={new Date(group.items[0].createdAt).toLocaleString(
+              'default',
+              { month: 'long' },
+            )}
+            year={
+              index === 0 || group.year !== groupedEvents[index - 1].year
+                ? group.year
+                : undefined
+            }
+          />
+        ))}
+      </StyledTimelineContainer>
+    </ScrollWrapper>
+  );
+};
diff --git a/packages/twenty-front/src/modules/activities/events/components/EventRow.tsx b/packages/twenty-front/src/modules/activities/events/components/EventRow.tsx
new file mode 100644
index 000000000000..581d9120c896
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/events/components/EventRow.tsx
@@ -0,0 +1,199 @@
+import { Tooltip } from 'react-tooltip';
+import styled from '@emotion/styled';
+import { IconCirclePlus, IconEditCircle, IconFocusCentered } from 'twenty-ui';
+
+import { EventUpdateProperty } from '@/activities/events/components/EventUpdateProperty';
+import { Event } from '@/activities/events/types/Event';
+import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
+import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
+import {
+  beautifyExactDateTime,
+  beautifyPastDateRelativeToNow,
+} from '~/utils/date-utils';
+
+const StyledIconContainer = styled.div`
+  align-items: center;
+  color: ${({ theme }) => theme.font.color.tertiary};
+  display: flex;
+  user-select: none;
+  height: 16px;
+  margin: 5px;
+  justify-content: center;
+  text-decoration-line: underline;
+  width: 16px;
+  z-index: 2;
+`;
+
+const StyledActionName = styled.span`
+  overflow: hidden;
+  flex: none;
+  white-space: nowrap;
+`;
+
+const StyledItemContainer = styled.div`
+  align-content: center;
+  align-items: center;
+  color: ${({ theme }) => theme.font.color.tertiary};
+  display: flex;
+  flex: 1;
+  gap: ${({ theme }) => theme.spacing(1)};
+  span {
+    color: ${({ theme }) => theme.font.color.secondary};
+  }
+  overflow: hidden;
+`;
+
+const StyledItemTitleContainer = styled.div`
+  display: flex;
+  flex: 1;
+  flex-flow: row ${() => (useIsMobile() ? 'wrap' : 'nowrap')};
+  gap: ${({ theme }) => theme.spacing(1)};
+  overflow: hidden;
+`;
+
+const StyledItemAuthorText = styled.span`
+  display: flex;
+  color: ${({ theme }) => theme.font.color.primary};
+  gap: ${({ theme }) => theme.spacing(1)};
+  white-space: nowrap;
+`;
+
+const StyledItemTitle = styled.span`
+  display: flex;
+  flex-flow: row nowrap;
+  overflow: hidden;
+  white-space: nowrap;
+`;
+
+const StyledItemTitleDate = styled.div`
+  align-items: center;
+  color: ${({ theme }) => theme.font.color.tertiary};
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(2)};
+  justify-content: flex-end;
+  margin-left: auto;
+`;
+
+const StyledVerticalLineContainer = styled.div`
+  align-items: center;
+  align-self: stretch;
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(2)};
+  justify-content: center;
+  width: 26px;
+  z-index: 2;
+`;
+
+const StyledVerticalLine = styled.div`
+  align-self: stretch;
+  background: ${({ theme }) => theme.border.color.light};
+  flex-shrink: 0;
+  width: 2px;
+`;
+
+const StyledTooltip = styled(Tooltip)`
+  background-color: ${({ theme }) => theme.background.primary};
+
+  box-shadow: 0px 2px 4px 3px
+    ${({ theme }) => theme.background.transparent.light};
+
+  box-shadow: 2px 4px 16px 6px
+    ${({ theme }) => theme.background.transparent.light};
+
+  color: ${({ theme }) => theme.font.color.primary};
+
+  opacity: 1;
+  padding: ${({ theme }) => theme.spacing(2)};
+`;
+
+const StyledTimelineItemContainer = styled.div<{ isGap?: boolean }>`
+  align-items: center;
+  align-self: stretch;
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(4)};
+  height: ${({ isGap, theme }) =>
+    isGap ? (useIsMobile() ? theme.spacing(6) : theme.spacing(3)) : 'auto'};
+  overflow: hidden;
+  white-space: nowrap;
+`;
+
+type EventRowProps = {
+  targetableObject: ActivityTargetableObject;
+  isLastEvent?: boolean;
+  event: Event;
+};
+
+export const EventRow = ({
+  isLastEvent,
+  event,
+  targetableObject,
+}: EventRowProps) => {
+  const beautifiedCreatedAt = beautifyPastDateRelativeToNow(event.createdAt);
+  const exactCreatedAt = beautifyExactDateTime(event.createdAt);
+
+  const properties = JSON.parse(event.properties);
+  const diff: Record<string, { before: any; after: any }> = properties?.diff;
+
+  const isEventType = (type: 'created' | 'updated') => {
+    return (
+      event.name === type + '.' + targetableObject.targetObjectNameSingular
+    );
+  };
+
+  return (
+    <>
+      <StyledTimelineItemContainer>
+        <StyledIconContainer>
+          {isEventType('created') && <IconCirclePlus />}
+          {isEventType('updated') && <IconEditCircle />}
+          {!isEventType('created') && !isEventType('updated') && (
+            <IconFocusCentered />
+          )}
+        </StyledIconContainer>
+        <StyledItemContainer>
+          <StyledItemTitleContainer>
+            <StyledItemAuthorText>
+              {event.workspaceMember?.name.firstName}{' '}
+              {event.workspaceMember?.name.lastName}
+            </StyledItemAuthorText>
+            <StyledActionName>
+              {isEventType('created') && 'created'}
+              {isEventType('updated') && 'updated'}
+              {!isEventType('created') && !isEventType('updated') && event.name}
+            </StyledActionName>
+            <StyledItemTitle>
+              {isEventType('created') &&
+                `a new ${targetableObject.targetObjectNameSingular}`}
+              {isEventType('updated') &&
+                Object.entries(diff).map(([key, value]) => (
+                  <EventUpdateProperty
+                    propertyName={key}
+                    after={value?.after}
+                  ></EventUpdateProperty>
+                ))}
+              {!isEventType('created') &&
+                !isEventType('updated') &&
+                JSON.stringify(diff)}
+            </StyledItemTitle>
+          </StyledItemTitleContainer>
+          <StyledItemTitleDate id={`id-${event.id}`}>
+            {beautifiedCreatedAt}
+          </StyledItemTitleDate>
+          <StyledTooltip
+            anchorSelect={`#id-${event.id}`}
+            content={exactCreatedAt}
+            clickable
+            noArrow
+          />
+        </StyledItemContainer>
+      </StyledTimelineItemContainer>
+      {!isLastEvent && (
+        <StyledTimelineItemContainer isGap>
+          <StyledVerticalLineContainer>
+            <StyledVerticalLine></StyledVerticalLine>
+          </StyledVerticalLineContainer>
+        </StyledTimelineItemContainer>
+      )}
+    </>
+  );
+};
diff --git a/packages/twenty-front/src/modules/activities/events/components/EventUpdateProperty.tsx b/packages/twenty-front/src/modules/activities/events/components/EventUpdateProperty.tsx
new file mode 100644
index 000000000000..cbeb157e2db3
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/events/components/EventUpdateProperty.tsx
@@ -0,0 +1,31 @@
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import { IconArrowRight } from 'twenty-ui';
+
+type EventUpdatePropertyProps = {
+  propertyName: string;
+  after?: string;
+};
+
+const StyledContainer = styled.div`
+  display: flex;
+  margin-right: ${({ theme }) => theme.spacing(1)};
+  gap: ${({ theme }) => theme.spacing(1)};
+  white-space: nowrap;
+`;
+
+const StyledPropertyName = styled.div``;
+
+export const EventUpdateProperty = ({
+  propertyName,
+  after,
+}: EventUpdatePropertyProps) => {
+  const theme = useTheme();
+  return (
+    <StyledContainer>
+      <StyledPropertyName>{propertyName}</StyledPropertyName>
+      <IconArrowRight size={theme.icon.size.sm} stroke={theme.icon.stroke.sm} />
+      {after}
+    </StyledContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/activities/events/components/Events.tsx b/packages/twenty-front/src/modules/activities/events/components/Events.tsx
new file mode 100644
index 000000000000..5caccae98c59
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/events/components/Events.tsx
@@ -0,0 +1,60 @@
+import styled from '@emotion/styled';
+import { isNonEmptyArray } from '@sniptt/guards';
+
+import { EventList } from '@/activities/events/components/EventList';
+import { useEvents } from '@/activities/events/hooks/useEvents';
+import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
+import AnimatedPlaceholder from '@/ui/layout/animated-placeholder/components/AnimatedPlaceholder';
+import {
+  AnimatedPlaceholderEmptyContainer,
+  AnimatedPlaceholderEmptySubTitle,
+  AnimatedPlaceholderEmptyTextContainer,
+  AnimatedPlaceholderEmptyTitle,
+} from '@/ui/layout/animated-placeholder/components/EmptyPlaceholderStyled';
+import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
+
+const StyledMainContainer = styled.div`
+  align-items: flex-start;
+  align-self: stretch;
+  border-top: ${({ theme }) =>
+    useIsMobile() ? `1px solid ${theme.border.color.medium}` : 'none'};
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+
+  justify-content: center;
+`;
+
+export const Events = ({
+  targetableObject,
+}: {
+  targetableObject: ActivityTargetableObject;
+}) => {
+  const { events } = useEvents(targetableObject);
+
+  if (!isNonEmptyArray(events)) {
+    return (
+      <AnimatedPlaceholderEmptyContainer>
+        <AnimatedPlaceholder type="emptyTimeline" />
+        <AnimatedPlaceholderEmptyTextContainer>
+          <AnimatedPlaceholderEmptyTitle>
+            No Events
+          </AnimatedPlaceholderEmptyTitle>
+          <AnimatedPlaceholderEmptySubTitle>
+            There are no events associated with this record.{' '}
+          </AnimatedPlaceholderEmptySubTitle>
+        </AnimatedPlaceholderEmptyTextContainer>
+      </AnimatedPlaceholderEmptyContainer>
+    );
+  }
+
+  return (
+    <StyledMainContainer>
+      <EventList
+        targetableObject={targetableObject}
+        title="All"
+        events={events ?? []}
+      />
+    </StyledMainContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/activities/events/components/EventsGroup.tsx b/packages/twenty-front/src/modules/activities/events/components/EventsGroup.tsx
new file mode 100644
index 000000000000..091e9913e68e
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/events/components/EventsGroup.tsx
@@ -0,0 +1,81 @@
+import styled from '@emotion/styled';
+
+import { EventRow } from '@/activities/events/components/EventRow';
+import { EventGroup } from '@/activities/events/utils/groupEventsByMonth';
+import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
+
+type EventsGroupProps = {
+  group: EventGroup;
+  month: string;
+  year?: number;
+  targetableObject: ActivityTargetableObject;
+};
+
+const StyledActivityGroup = styled.div`
+  display: flex;
+  flex-flow: column;
+  gap: ${({ theme }) => theme.spacing(4)};
+  margin-bottom: ${({ theme }) => theme.spacing(4)};
+  width: 100%;
+`;
+
+const StyledActivityGroupContainer = styled.div`
+  padding-bottom: ${({ theme }) => theme.spacing(2)};
+  padding-top: ${({ theme }) => theme.spacing(2)};
+  position: relative;
+`;
+
+const StyledActivityGroupBar = styled.div`
+  align-items: center;
+  background: ${({ theme }) => theme.background.secondary};
+  border: 1px solid ${({ theme }) => theme.border.color.light};
+  border-radius: ${({ theme }) => theme.border.radius.xl};
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  justify-content: center;
+  position: absolute;
+  top: 0;
+  width: 24px;
+`;
+
+const StyledMonthSeperator = styled.div`
+  align-items: center;
+  align-self: stretch;
+  color: ${({ theme }) => theme.font.color.light};
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(4)};
+`;
+const StyledMonthSeperatorLine = styled.div`
+  background: ${({ theme }) => theme.border.color.light};
+  border-radius: 50px;
+  flex: 1 0 0;
+  height: 1px;
+`;
+
+export const EventsGroup = ({
+  group,
+  month,
+  year,
+  targetableObject,
+}: EventsGroupProps) => {
+  return (
+    <StyledActivityGroup>
+      <StyledMonthSeperator>
+        {month} {year}
+        <StyledMonthSeperatorLine />
+      </StyledMonthSeperator>
+      <StyledActivityGroupContainer>
+        <StyledActivityGroupBar />
+        {group.items.map((event, index) => (
+          <EventRow
+            targetableObject={targetableObject}
+            key={event.id}
+            event={event}
+            isLastEvent={index === group.items.length - 1}
+          />
+        ))}
+      </StyledActivityGroupContainer>
+    </StyledActivityGroup>
+  );
+};
diff --git a/packages/twenty-front/src/modules/activities/events/hooks/__tests__/useEvents.test.ts b/packages/twenty-front/src/modules/activities/events/hooks/__tests__/useEvents.test.ts
new file mode 100644
index 000000000000..25c6d5bf1209
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/events/hooks/__tests__/useEvents.test.ts
@@ -0,0 +1,91 @@
+import { renderHook } from '@testing-library/react';
+
+import { useEvents } from '@/activities/events/hooks/useEvents';
+
+jest.mock('@/object-record/hooks/useFindManyRecords', () => ({
+  useFindManyRecords: jest.fn(),
+}));
+
+describe('useEvent', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('fetches events correctly for a given targetableObject', () => {
+    const mockEvents = [
+      {
+        __typename: 'Event',
+        id: '166ec73f-26b1-4934-bb3b-c86c8513b99b',
+        opportunityId: null,
+        opportunity: null,
+        personId: null,
+        person: null,
+        company: {
+          __typename: 'Company',
+          address: 'Paris',
+          linkedinLink: {
+            __typename: 'Link',
+            label: '',
+            url: '',
+          },
+          xLink: {
+            __typename: 'Link',
+            label: '',
+            url: '',
+          },
+          position: 4,
+          domainName: 'microsoft.com',
+          employees: null,
+          createdAt: '2024-03-21T16:01:41.809Z',
+          annualRecurringRevenue: {
+            __typename: 'Currency',
+            amountMicros: 100000000,
+            currencyCode: 'USD',
+          },
+          idealCustomerProfile: false,
+          accountOwnerId: null,
+          updatedAt: '2024-03-22T08:28:44.812Z',
+          name: 'Microsoft',
+          id: '460b6fb1-ed89-413a-b31a-962986e67bb4',
+        },
+        workspaceMember: {
+          __typename: 'WorkspaceMember',
+          locale: 'en',
+          avatarUrl: '',
+          updatedAt: '2024-03-21T16:01:41.839Z',
+          name: {
+            __typename: 'FullName',
+            firstName: 'Tim',
+            lastName: 'Apple',
+          },
+          id: '20202020-0687-4c41-b707-ed1bfca972a7',
+          userEmail: 'tim@apple.dev',
+          colorScheme: 'Light',
+          createdAt: '2024-03-21T16:01:41.839Z',
+          userId: '20202020-9e3b-46d4-a556-88b9ddc2b034',
+        },
+        workspaceMemberId: '20202020-0687-4c41-b707-ed1bfca972a7',
+        createdAt: '2024-03-22T08:28:44.830Z',
+        name: 'updated.company',
+        companyId: '460b6fb1-ed89-413a-b31a-962986e67bb4',
+        properties: '{"diff": {"address": {"after": "Paris", "before": ""}}}',
+        updatedAt: '2024-03-22T08:28:44.830Z',
+      },
+    ];
+    const mockTargetableObject = {
+      id: '1',
+      targetObjectNameSingular: 'Opportunity',
+    };
+
+    const useFindManyRecordsMock = jest.requireMock(
+      '@/object-record/hooks/useFindManyRecords',
+    );
+    useFindManyRecordsMock.useFindManyRecords.mockReturnValue({
+      records: mockEvents,
+    });
+
+    const { result } = renderHook(() => useEvents(mockTargetableObject));
+
+    expect(result.current.events).toEqual(mockEvents);
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/events/hooks/useEvents.tsx b/packages/twenty-front/src/modules/activities/events/hooks/useEvents.tsx
new file mode 100644
index 000000000000..9e5cbecc3e19
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/events/hooks/useEvents.tsx
@@ -0,0 +1,28 @@
+import { Event } from '@/activities/events/types/Event';
+import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
+import { getActivityTargetObjectFieldIdName } from '@/activities/utils/getActivityTargetObjectFieldIdName';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+
+// do we need to test this?
+export const useEvents = (targetableObject: ActivityTargetableObject) => {
+  const targetableObjectFieldIdName = getActivityTargetObjectFieldIdName({
+    nameSingular: targetableObject.targetObjectNameSingular,
+  });
+
+  const { records: events } = useFindManyRecords({
+    objectNameSingular: CoreObjectNameSingular.Event,
+    filter: {
+      [targetableObjectFieldIdName]: {
+        eq: targetableObject.id,
+      },
+    },
+    orderBy: {
+      createdAt: 'DescNullsFirst',
+    },
+  });
+
+  return {
+    events: events as Event[],
+  };
+};
diff --git a/packages/twenty-front/src/modules/activities/events/types/Event.ts b/packages/twenty-front/src/modules/activities/events/types/Event.ts
new file mode 100644
index 000000000000..c39ceecd2bb4
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/events/types/Event.ts
@@ -0,0 +1,15 @@
+import { WorkspaceMember } from '~/generated/graphql';
+
+export type Event = {
+  id: string;
+  createdAt: string;
+  updatedAt: string;
+  deletedAt: string | null;
+  opportunityId: string | null;
+  companyId: string | null;
+  personId: string | null;
+  workspaceMemberId: string;
+  workspaceMember: WorkspaceMember;
+  properties: any;
+  name: string;
+};
diff --git a/packages/twenty-front/src/modules/activities/events/utils/__tests__/groupEventsByMonth.test.ts b/packages/twenty-front/src/modules/activities/events/utils/__tests__/groupEventsByMonth.test.ts
new file mode 100644
index 000000000000..917ece6f6fb4
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/events/utils/__tests__/groupEventsByMonth.test.ts
@@ -0,0 +1,19 @@
+import { mockedEvents } from '~/testing/mock-data/events';
+
+import { groupEventsByMonth } from '../groupEventsByMonth';
+
+describe('groupEventsByMonth', () => {
+  it('should group activities by month', () => {
+    const grouped = groupEventsByMonth(mockedEvents as unknown as Event[]);
+
+    expect(grouped).toHaveLength(2);
+    expect(grouped[0].items).toHaveLength(1);
+    expect(grouped[1].items).toHaveLength(1);
+
+    expect(grouped[0].year).toBe(new Date().getFullYear());
+    expect(grouped[1].year).toBe(2023);
+
+    expect(grouped[0].month).toBe(new Date().getMonth());
+    expect(grouped[1].month).toBe(3);
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/events/utils/groupEventsByMonth.ts b/packages/twenty-front/src/modules/activities/events/utils/groupEventsByMonth.ts
new file mode 100644
index 000000000000..316bd25e858e
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/events/utils/groupEventsByMonth.ts
@@ -0,0 +1,33 @@
+import { Event } from '@/activities/events/types/Event';
+import { isDefined } from '~/utils/isDefined';
+
+export type EventGroup = {
+  month: number;
+  year: number;
+  items: Event[];
+};
+
+export const groupEventsByMonth = (events: Event[]) => {
+  const acitivityGroups: EventGroup[] = [];
+
+  for (const event of events) {
+    const d = new Date(event.createdAt);
+    const month = d.getMonth();
+    const year = d.getFullYear();
+
+    const matchingGroup = acitivityGroups.find(
+      (x) => x.year === year && x.month === month,
+    );
+    if (isDefined(matchingGroup)) {
+      matchingGroup.items.push(event);
+    } else {
+      acitivityGroups.push({
+        year,
+        month,
+        items: [event],
+      });
+    }
+  }
+
+  return acitivityGroups.sort((a, b) => b.year - a.year || b.month - a.month);
+};
diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx
index 33aebff64e55..884c43c812ee 100644
--- a/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx
@@ -1,4 +1,5 @@
-import { IconDotsVertical, IconDownload, IconTrash } from '@/ui/display/icon';
+import { IconDotsVertical, IconDownload, IconTrash } from 'twenty-ui';
+
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentIcon.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentIcon.tsx
index aaf8232cbdfd..5061ab65fe01 100644
--- a/packages/twenty-front/src/modules/activities/files/components/AttachmentIcon.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentIcon.tsx
@@ -1,7 +1,5 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-
-import { AttachmentType } from '@/activities/files/types/Attachment';
 import {
   IconFile,
   IconFileText,
@@ -11,7 +9,9 @@ import {
   IconPresentation,
   IconTable,
   IconVideo,
-} from '@/ui/display/icon';
+} from 'twenty-ui';
+
+import { AttachmentType } from '@/activities/files/types/Attachment';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 
 const StyledIconContainer = styled.div<{ background: string }>`
diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx
index 4aac69cb7536..30485c7f46d3 100644
--- a/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx
@@ -1,6 +1,7 @@
 import { useMemo } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconCalendar } from 'twenty-ui';
 
 import { AttachmentDropdown } from '@/activities/files/components/AttachmentDropdown';
 import { AttachmentIcon } from '@/activities/files/components/AttachmentIcon';
@@ -12,7 +13,6 @@ import {
   FieldContext,
   GenericFieldContextType,
 } from '@/object-record/record-field/contexts/FieldContext';
-import { IconCalendar } from '@/ui/display/icon';
 import { REACT_APP_SERVER_BASE_URL } from '~/config';
 import { formatToHumanReadableDate } from '~/utils';
 
diff --git a/packages/twenty-front/src/modules/activities/files/components/Attachments.tsx b/packages/twenty-front/src/modules/activities/files/components/Attachments.tsx
index d13871b40916..aacc0ec6ad3f 100644
--- a/packages/twenty-front/src/modules/activities/files/components/Attachments.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/Attachments.tsx
@@ -1,13 +1,13 @@
 import { ChangeEvent, useRef, useState } from 'react';
 import styled from '@emotion/styled';
 import { isNonEmptyArray } from '@sniptt/guards';
+import { IconPlus } from 'twenty-ui';
 
 import { AttachmentList } from '@/activities/files/components/AttachmentList';
 import { DropZone } from '@/activities/files/components/DropZone';
 import { useAttachments } from '@/activities/files/hooks/useAttachments';
 import { useUploadAttachmentFile } from '@/activities/files/hooks/useUploadAttachmentFile';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { IconPlus } from '@/ui/display/icon';
 import { Button } from '@/ui/input/button/components/Button';
 import AnimatedPlaceholder from '@/ui/layout/animated-placeholder/components/AnimatedPlaceholder';
 import {
@@ -16,6 +16,7 @@ import {
   AnimatedPlaceholderEmptyTextContainer,
   AnimatedPlaceholderEmptyTitle,
 } from '@/ui/layout/animated-placeholder/components/EmptyPlaceholderStyled';
+import { isDefined } from '~/utils/isDefined';
 
 const StyledAttachmentsContainer = styled.div`
   display: flex;
@@ -46,7 +47,7 @@ export const Attachments = ({
   const [isDraggingFile, setIsDraggingFile] = useState(false);
 
   const handleFileChange = (e: ChangeEvent<HTMLInputElement>) => {
-    if (e.target.files) onUploadFile?.(e.target.files[0]);
+    if (isDefined(e.target.files)) onUploadFile?.(e.target.files[0]);
   };
 
   const handleUploadFileClick = () => {
diff --git a/packages/twenty-front/src/modules/activities/files/components/DropZone.tsx b/packages/twenty-front/src/modules/activities/files/components/DropZone.tsx
index e1068d48951d..7fa8cf1abd28 100644
--- a/packages/twenty-front/src/modules/activities/files/components/DropZone.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/DropZone.tsx
@@ -1,9 +1,9 @@
 import { useDropzone } from 'react-dropzone';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconUpload } from 'twenty-ui';
 
 import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal';
-import { IconUpload } from '@/ui/display/icon';
 
 const StyledContainer = styled.div`
   align-items: center;
diff --git a/packages/twenty-front/src/modules/activities/files/hooks/__tests__/useAttachments.test.ts b/packages/twenty-front/src/modules/activities/files/hooks/__tests__/useAttachments.test.ts
new file mode 100644
index 000000000000..5d582322ba00
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/files/hooks/__tests__/useAttachments.test.ts
@@ -0,0 +1,51 @@
+import { renderHook } from '@testing-library/react';
+
+import { useAttachments } from '../useAttachments';
+
+jest.mock('@/object-record/hooks/useFindManyRecords', () => ({
+  useFindManyRecords: jest.fn(),
+}));
+
+describe('useAttachments', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('fetches attachments correctly for a given targetableObject', () => {
+    const mockAttachments = [
+      { id: '1', name: 'Attachment 1' },
+      { id: 2, name: 'Attachment 2' },
+    ];
+    const mockTargetableObject = {
+      id: '1',
+      targetObjectNameSingular: 'SomeObject',
+    };
+
+    const useFindManyRecordsMock = jest.requireMock(
+      '@/object-record/hooks/useFindManyRecords',
+    );
+    useFindManyRecordsMock.useFindManyRecords.mockReturnValue({
+      records: mockAttachments,
+    });
+
+    const { result } = renderHook(() => useAttachments(mockTargetableObject));
+
+    expect(result.current.attachments).toEqual(mockAttachments);
+  });
+
+  it('handles case when there are no attachments', () => {
+    const mockTargetableObject = {
+      id: '1',
+      targetObjectNameSingular: 'SomeObject',
+    };
+
+    const useFindManyRecordsMock = jest.requireMock(
+      '@/object-record/hooks/useFindManyRecords',
+    );
+    useFindManyRecordsMock.useFindManyRecords.mockReturnValue({ records: [] });
+
+    const { result } = renderHook(() => useAttachments(mockTargetableObject));
+
+    expect(result.current.attachments).toEqual([]);
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/files/hooks/useAttachments.tsx b/packages/twenty-front/src/modules/activities/files/hooks/useAttachments.tsx
index b8d71ec8d847..2d8539889d27 100644
--- a/packages/twenty-front/src/modules/activities/files/hooks/useAttachments.tsx
+++ b/packages/twenty-front/src/modules/activities/files/hooks/useAttachments.tsx
@@ -1,6 +1,6 @@
 import { Attachment } from '@/activities/files/types/Attachment';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { getActivityTargetObjectFieldIdName } from '@/activities/utils/getTargetObjectFilterFieldName';
+import { getActivityTargetObjectFieldIdName } from '@/activities/utils/getActivityTargetObjectFieldIdName';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 
@@ -10,7 +10,7 @@ export const useAttachments = (targetableObject: ActivityTargetableObject) => {
     nameSingular: targetableObject.targetObjectNameSingular,
   });
 
-  const { records: attachments } = useFindManyRecords({
+  const { records: attachments } = useFindManyRecords<Attachment>({
     objectNameSingular: CoreObjectNameSingular.Attachment,
     filter: {
       [targetableObjectFieldIdName]: {
@@ -23,6 +23,6 @@ export const useAttachments = (targetableObject: ActivityTargetableObject) => {
   });
 
   return {
-    attachments: attachments as Attachment[],
+    attachments,
   };
 };
diff --git a/packages/twenty-front/src/modules/activities/files/hooks/useUploadAttachmentFile.tsx b/packages/twenty-front/src/modules/activities/files/hooks/useUploadAttachmentFile.tsx
index 1a0cceee7a5d..d68645fe1310 100644
--- a/packages/twenty-front/src/modules/activities/files/hooks/useUploadAttachmentFile.tsx
+++ b/packages/twenty-front/src/modules/activities/files/hooks/useUploadAttachmentFile.tsx
@@ -2,7 +2,7 @@ import { useRecoilValue } from 'recoil';
 
 import { getFileType } from '@/activities/files/utils/getFileType';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { getActivityTargetObjectFieldIdName } from '@/activities/utils/getTargetObjectFilterFieldName';
+import { getActivityTargetObjectFieldIdName } from '@/activities/utils/getActivityTargetObjectFieldIdName';
 import { Attachment } from '@/attachments/types/Attachment';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
@@ -45,6 +45,8 @@ export const useUploadAttachmentFile = () => {
       fullPath: attachmentUrl,
       type: getFileType(file.name),
       [targetableObjectFieldIdName]: targetableObject.id,
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
     } as Partial<Attachment>;
 
     await createOneAttachment(attachmentToCreate);
diff --git a/packages/twenty-front/src/modules/activities/files/utils/__tests__/downloadFile.test.ts b/packages/twenty-front/src/modules/activities/files/utils/__tests__/downloadFile.test.ts
index 7c1c01eeb45f..b25fae0e7c37 100644
--- a/packages/twenty-front/src/modules/activities/files/utils/__tests__/downloadFile.test.ts
+++ b/packages/twenty-front/src/modules/activities/files/utils/__tests__/downloadFile.test.ts
@@ -28,7 +28,7 @@ describe.skip('downloadFile', () => {
     const link = document.querySelector(
       'a[href="mock-url"][download="file.pdf"]',
     );
-    console.log(document.body.innerHTML, link);
+
     expect(link).not.toBeNull();
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
diff --git a/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivities.test.tsx b/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivities.test.tsx
new file mode 100644
index 000000000000..3e3dd0dfd3dd
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivities.test.tsx
@@ -0,0 +1,238 @@
+import { ReactNode } from 'react';
+import { gql } from '@apollo/client';
+import { MockedProvider, MockedResponse } from '@apollo/client/testing';
+import { act, renderHook, waitFor } from '@testing-library/react';
+import { RecoilRoot, useSetRecoilState } from 'recoil';
+
+import { useActivities } from '@/activities/hooks/useActivities';
+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
+import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
+import { mockWorkspaceMembers } from '~/testing/mock-data/workspace-members';
+
+const mockActivityTarget = {
+  __typename: 'ActivityTarget',
+  updatedAt: '2021-08-03T19:20:06.000Z',
+  createdAt: '2021-08-03T19:20:06.000Z',
+  personId: '1',
+  activityId: '234',
+  companyId: '1',
+  id: '123',
+};
+
+const mockActivity = {
+  __typename: 'Activity',
+  updatedAt: '2021-08-03T19:20:06.000Z',
+  createdAt: '2021-08-03T19:20:06.000Z',
+  completedAt: '2021-08-03T19:20:06.000Z',
+  reminderAt: '2021-08-03T19:20:06.000Z',
+  title: 'title',
+  authorId: '1',
+  body: 'body',
+  dueAt: '2021-08-03T19:20:06.000Z',
+  type: 'type',
+  assigneeId: '1',
+  id: '234',
+};
+
+const defaultResponseData = {
+  pageInfo: {
+    hasNextPage: false,
+    startCursor: '',
+    endCursor: '',
+  },
+  totalCount: 1,
+};
+
+const mocks: MockedResponse[] = [
+  {
+    request: {
+      query: gql`
+        query FindManyActivityTargets(
+          $filter: ActivityTargetFilterInput
+          $orderBy: ActivityTargetOrderByInput
+          $lastCursor: String
+          $limit: Float
+        ) {
+          activityTargets(
+            filter: $filter
+            orderBy: $orderBy
+            first: $limit
+            after: $lastCursor
+          ) {
+            edges {
+              node {
+                __typename
+                updatedAt
+                createdAt
+                activityId
+                id
+              }
+              cursor
+            }
+            pageInfo {
+              hasNextPage
+              startCursor
+              endCursor
+            }
+            totalCount
+          }
+        }
+      `,
+      variables: {
+        filter: { activityTargetId: { eq: '123' } },
+        limit: undefined,
+        orderBy: undefined,
+      },
+    },
+    result: jest.fn(() => ({
+      data: {
+        activityTargets: {
+          ...defaultResponseData,
+          edges: [
+            {
+              node: mockActivityTarget,
+              cursor: '1',
+            },
+          ],
+        },
+      },
+    })),
+  },
+  {
+    request: {
+      query: gql`
+        query FindManyActivities(
+          $filter: ActivityFilterInput
+          $orderBy: ActivityOrderByInput
+          $lastCursor: String
+          $limit: Float
+        ) {
+          activities(
+            filter: $filter
+            orderBy: $orderBy
+            first: $limit
+            after: $lastCursor
+          ) {
+            edges {
+              node {
+                __typename
+                createdAt
+                reminderAt
+                authorId
+                title
+                completedAt
+                updatedAt
+                body
+                dueAt
+                type
+                id
+                assigneeId
+              }
+              cursor
+            }
+            pageInfo {
+              hasNextPage
+              startCursor
+              endCursor
+            }
+            totalCount
+          }
+        }
+      `,
+      variables: {
+        filter: { id: { in: ['234'] } },
+        limit: undefined,
+        orderBy: {},
+      },
+    },
+    result: jest.fn(() => ({
+      data: {
+        activities: {
+          ...defaultResponseData,
+          edges: [
+            {
+              node: mockActivity,
+              cursor: '1',
+            },
+          ],
+        },
+      },
+    })),
+  },
+];
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>
+    <MockedProvider mocks={mocks} addTypename={false}>
+      <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
+        {children}
+      </SnackBarProviderScope>
+    </MockedProvider>
+  </RecoilRoot>
+);
+
+describe('useActivities', () => {
+  it('returns default response', () => {
+    const { result } = renderHook(
+      () =>
+        useActivities({
+          targetableObjects: [],
+          activitiesFilters: {},
+          activitiesOrderByVariables: {},
+          skip: false,
+          skipActivityTargets: false,
+        }),
+      { wrapper: Wrapper },
+    );
+
+    expect(result.current).toEqual({
+      activities: [],
+      loading: false,
+      initialized: true,
+      noActivities: true,
+    });
+  });
+
+  it('fetches activities', async () => {
+    const { result } = renderHook(
+      () => {
+        const setCurrentWorkspaceMember = useSetRecoilState(
+          currentWorkspaceMemberState,
+        );
+
+        const activities = useActivities({
+          targetableObjects: [
+            { targetObjectNameSingular: 'activityTarget', id: '123' },
+          ],
+          activitiesFilters: {},
+          activitiesOrderByVariables: {},
+          skip: false,
+          skipActivityTargets: false,
+        });
+        return { activities, setCurrentWorkspaceMember };
+      },
+      { wrapper: Wrapper },
+    );
+
+    act(() => {
+      result.current.setCurrentWorkspaceMember(mockWorkspaceMembers[0]);
+    });
+
+    expect(result.current.activities.loading).toBe(true);
+
+    // Wait for activityTargets to complete fetching
+    await waitFor(() => !result.current.activities.loading);
+
+    expect(result.current.activities.loading).toBe(false);
+
+    // Wait for request to fetch activities to be made
+    await waitFor(() => result.current.activities.loading);
+
+    // Wait for activities to complete fetching
+    await waitFor(() => !result.current.activities.loading);
+
+    const { activities } = result.current;
+
+    expect(activities.activities).toEqual([mockActivity]);
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivityConnectionUtils.test.tsx b/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivityConnectionUtils.test.tsx
deleted file mode 100644
index a43b53fbaef6..000000000000
--- a/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivityConnectionUtils.test.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import { RecoilRoot } from 'recoil';
-
-import { useActivityConnectionUtils } from '@/activities/hooks/useActivityConnectionUtils';
-import { Comment } from '@/activities/types/Comment';
-import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
-import { ObjectRecordEdge } from '@/object-record/types/ObjectRecordEdge';
-
-const mockActivityWithConnectionRelation = {
-  activityTargets: {
-    edges: [
-      {
-        __typename: 'ActivityTargetEdge',
-        node: {
-          id: '20202020-1029-4661-9e91-83bad932bdff',
-        },
-      },
-    ],
-    pageInfo: {
-      hasNextPage: false,
-      hasPreviousPage: false,
-    },
-  },
-  comments: {
-    edges: [
-      {
-        __typename: 'CommentEdge',
-        node: {
-          id: '20202020-1029-4661-9e91-83bad932bdee',
-        },
-      },
-    ] as ObjectRecordEdge<Comment>[],
-    pageInfo: {
-      hasNextPage: false,
-      hasPreviousPage: false,
-    },
-  },
-};
-
-const mockActivityWithArrayRelation = {
-  activityTargets: [
-    {
-      id: '20202020-1029-4661-9e91-83bad932bdff',
-    },
-  ],
-  comments: [
-    {
-      id: '20202020-1029-4661-9e91-83bad932bdee',
-    },
-  ],
-};
-
-describe('useActivityConnectionUtils', () => {
-  it('Should turn activity with connection relation in activity with array relation', async () => {
-    const { result } = renderHook(() => useActivityConnectionUtils(), {
-      wrapper: ({ children }) => (
-        <RecoilRoot
-          initializeState={(snapshot) => {
-            snapshot.set(
-              objectMetadataItemsState,
-              getObjectMetadataItemsMock(),
-            );
-          }}
-        >
-          {children}
-        </RecoilRoot>
-      ),
-    });
-
-    const { makeActivityWithoutConnection } = result.current;
-
-    const { activity: activityWithArrayRelation } =
-      makeActivityWithoutConnection(mockActivityWithConnectionRelation as any);
-
-    expect(activityWithArrayRelation).toBeDefined();
-
-    expect(activityWithArrayRelation.activityTargets[0].id).toEqual(
-      mockActivityWithArrayRelation.activityTargets[0].id,
-    );
-  });
-
-  it('Should turn activity with connection relation in activity with array relation', async () => {
-    const { result } = renderHook(() => useActivityConnectionUtils(), {
-      wrapper: ({ children }) => (
-        <RecoilRoot
-          initializeState={(snapshot) => {
-            snapshot.set(
-              objectMetadataItemsState,
-              getObjectMetadataItemsMock(),
-            );
-          }}
-        >
-          {children}
-        </RecoilRoot>
-      ),
-    });
-
-    const { makeActivityWithConnection } = result.current;
-
-    const { activityWithConnection } = makeActivityWithConnection(
-      mockActivityWithArrayRelation as any,
-    );
-
-    expect(activityWithConnection).toBeDefined();
-
-    console.log(
-      JSON.stringify({
-        mockActivityWithConnectionRelation,
-        activityWithConnection,
-        mockActivityWithArrayRelation,
-      }),
-    );
-
-    expect(activityWithConnection.activityTargets.edges[0].node.id).toEqual(
-      mockActivityWithConnectionRelation.activityTargets.edges[0].node.id,
-    );
-  });
-});
diff --git a/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivityTargetObjectRecords.test.tsx b/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivityTargetObjectRecords.test.tsx
new file mode 100644
index 000000000000..76a0079eb80c
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivityTargetObjectRecords.test.tsx
@@ -0,0 +1,166 @@
+import { ReactNode } from 'react';
+import { gql, InMemoryCache } from '@apollo/client';
+import { MockedProvider } from '@apollo/client/testing';
+import { act, renderHook } from '@testing-library/react';
+import { RecoilRoot, useSetRecoilState } from 'recoil';
+
+import { useActivityTargetObjectRecords } from '@/activities/hooks/useActivityTargetObjectRecords';
+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
+import { getRecordFromRecordNode } from '@/object-record/cache/utils/getRecordFromRecordNode';
+import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
+import { mockWorkspaceMembers } from '~/testing/mock-data/workspace-members';
+
+const mockObjectMetadataItems = getObjectMetadataItemsMock();
+
+const cache = new InMemoryCache();
+
+const activityNode = {
+  id: '3ecaa1be-aac7-463a-a38e-64078dd451d5',
+  createdAt: '2023-04-26T10:12:42.33625+00:00',
+  updatedAt: '2023-04-26T10:23:42.33625+00:00',
+  reminderAt: null,
+  title: 'My very first note',
+  type: 'Note',
+  body: '',
+  dueAt: '2023-04-26T10:12:42.33625+00:00',
+  completedAt: null,
+  author: null,
+  assignee: null,
+  assigneeId: null,
+  authorId: null,
+  comments: {
+    edges: [],
+  },
+  activityTargets: {
+    edges: [
+      {
+        node: {
+          id: '89bb825c-171e-4bcc-9cf7-43448d6fb300',
+          createdAt: '2023-04-26T10:12:42.33625+00:00',
+          updatedAt: '2023-04-26T10:23:42.33625+00:00',
+          personId: null,
+          companyId: '89bb825c-171e-4bcc-9cf7-43448d6fb280',
+          company: {
+            id: '89bb825c-171e-4bcc-9cf7-43448d6fb280',
+            name: 'Airbnb',
+            domainName: 'airbnb.com',
+          },
+          person: null,
+          activityId: '89bb825c-171e-4bcc-9cf7-43448d6fb230',
+          activity: {
+            id: '89bb825c-171e-4bcc-9cf7-43448d6fb230',
+            createdAt: '2023-04-26T10:12:42.33625+00:00',
+            updatedAt: '2023-04-26T10:23:42.33625+00:00',
+          },
+          __typename: 'ActivityTarget',
+        },
+        __typename: 'ActivityTargetEdge',
+      },
+    ],
+    __typename: 'ActivityTargetConnection',
+  },
+  __typename: 'Activity' as const,
+};
+
+cache.writeFragment({
+  fragment: gql`
+    fragment CreateOneActivityInCache on Activity {
+      id
+      createdAt
+      updatedAt
+      reminderAt
+      title
+      body
+      dueAt
+      completedAt
+      author
+      assignee
+      assigneeId
+      authorId
+      activityTargets {
+        edges {
+          node {
+            id
+            createdAt
+            updatedAt
+            targetObjectNameSingular
+            personId
+            companyId
+            company {
+              id
+              name
+              domainName
+            }
+            person
+            activityId
+            activity {
+              id
+              createdAt
+              updatedAt
+            }
+            __typename
+          }
+        }
+      }
+      __typename
+    }
+  `,
+  id: activityNode.id,
+  data: activityNode,
+});
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>
+    <MockedProvider cache={cache}>
+      <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
+        {children}
+      </SnackBarProviderScope>
+    </MockedProvider>
+  </RecoilRoot>
+);
+
+describe('useActivityTargetObjectRecords', () => {
+  it('return targetObjects', async () => {
+    const { result } = renderHook(
+      () => {
+        const setCurrentWorkspaceMember = useSetRecoilState(
+          currentWorkspaceMemberState,
+        );
+        const setObjectMetadataItems = useSetRecoilState(
+          objectMetadataItemsState,
+        );
+
+        const { activityTargetObjectRecords } = useActivityTargetObjectRecords(
+          getRecordFromRecordNode({ recordNode: activityNode as any }),
+        );
+
+        return {
+          activityTargetObjectRecords,
+          setCurrentWorkspaceMember,
+          setObjectMetadataItems,
+        };
+      },
+      { wrapper: Wrapper },
+    );
+
+    act(() => {
+      result.current.setCurrentWorkspaceMember(mockWorkspaceMembers[0]);
+      result.current.setObjectMetadataItems(mockObjectMetadataItems);
+    });
+    const activityTargetObjectRecords =
+      result.current.activityTargetObjectRecords;
+
+    expect(activityTargetObjectRecords).toHaveLength(1);
+    expect(activityTargetObjectRecords[0].activityTarget).toEqual(
+      activityNode.activityTargets.edges[0].node,
+    );
+    expect(activityTargetObjectRecords[0].targetObject).toEqual(
+      activityNode.activityTargets.edges[0].node.company,
+    );
+    expect(
+      activityTargetObjectRecords[0].targetObjectMetadataItem.nameSingular,
+    ).toEqual('company');
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivityTargetsForTargetableObject.test.tsx b/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivityTargetsForTargetableObject.test.tsx
new file mode 100644
index 000000000000..dedd2e3a0cfd
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivityTargetsForTargetableObject.test.tsx
@@ -0,0 +1,129 @@
+import { ReactNode } from 'react';
+import { MockedProvider, MockedResponse } from '@apollo/client/testing';
+import { act, renderHook, waitFor } from '@testing-library/react';
+import gql from 'graphql-tag';
+import { RecoilRoot, useSetRecoilState } from 'recoil';
+
+import { useActivityTargetsForTargetableObject } from '@/activities/hooks/useActivityTargetsForTargetableObject';
+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
+import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
+import { mockWorkspaceMembers } from '~/testing/mock-data/workspace-members';
+
+const mockActivityTarget = {
+  __typename: 'ActivityTarget',
+  updatedAt: '2021-08-03T19:20:06.000Z',
+  createdAt: '2021-08-03T19:20:06.000Z',
+  personId: '1',
+  activityId: '234',
+  companyId: '1',
+  id: '123',
+};
+
+const defaultResponseData = {
+  pageInfo: {
+    hasNextPage: false,
+    startCursor: '',
+    endCursor: '',
+  },
+  totalCount: 1,
+};
+
+const mocks: MockedResponse[] = [
+  {
+    request: {
+      query: gql`
+        query FindManyActivityTargets(
+          $filter: ActivityTargetFilterInput
+          $orderBy: ActivityTargetOrderByInput
+          $lastCursor: String
+          $limit: Float
+        ) {
+          activityTargets(
+            filter: $filter
+            orderBy: $orderBy
+            first: $limit
+            after: $lastCursor
+          ) {
+            edges {
+              node {
+                __typename
+                updatedAt
+                createdAt
+                personId
+                activityId
+                companyId
+                id
+              }
+              cursor
+            }
+            pageInfo {
+              hasNextPage
+              startCursor
+              endCursor
+            }
+            totalCount
+          }
+        }
+      `,
+      variables: {
+        filter: { personId: { eq: '1234' } },
+        limit: undefined,
+        orderBy: undefined,
+      },
+    },
+    result: jest.fn(() => ({
+      data: {
+        activityTargets: {
+          ...defaultResponseData,
+          edges: [
+            {
+              node: mockActivityTarget,
+              cursor: '1',
+            },
+          ],
+        },
+      },
+    })),
+  },
+];
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>
+    <MockedProvider mocks={mocks} addTypename={false}>
+      <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
+        {children}
+      </SnackBarProviderScope>
+    </MockedProvider>
+  </RecoilRoot>
+);
+
+describe('useActivityTargetsForTargetableObject', () => {
+  it('works as expected', async () => {
+    const { result } = renderHook(
+      () => {
+        const setCurrentWorkspaceMember = useSetRecoilState(
+          currentWorkspaceMemberState,
+        );
+
+        const res = useActivityTargetsForTargetableObject({
+          targetableObject: {
+            id: '1234',
+            targetObjectNameSingular: 'person',
+          },
+        });
+        return { ...res, setCurrentWorkspaceMember };
+      },
+      { wrapper: Wrapper },
+    );
+
+    act(() => {
+      result.current.setCurrentWorkspaceMember(mockWorkspaceMembers[0]);
+    });
+
+    expect(result.current.loadingActivityTargets).toBe(true);
+
+    await waitFor(() => !result.current.loadingActivityTargets);
+
+    expect(result.current.activityTargets).toEqual([mockActivityTarget]);
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/hooks/__tests__/useCreateActivityInCache.test.tsx b/packages/twenty-front/src/modules/activities/hooks/__tests__/useCreateActivityInCache.test.tsx
new file mode 100644
index 000000000000..a23ee3b4eb85
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/hooks/__tests__/useCreateActivityInCache.test.tsx
@@ -0,0 +1,99 @@
+import { ReactNode } from 'react';
+import { MockedProvider, MockedResponse } from '@apollo/client/testing';
+import { act, renderHook } from '@testing-library/react';
+import gql from 'graphql-tag';
+import { RecoilRoot, useSetRecoilState } from 'recoil';
+
+import { useCreateActivityInCache } from '@/activities/hooks/useCreateActivityInCache';
+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
+import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
+import { mockWorkspaceMembers } from '~/testing/mock-data/workspace-members';
+
+const mocks: MockedResponse[] = [
+  {
+    request: {
+      query: gql`
+        query FindOneWorkspaceMember($objectRecordId: UUID!) {
+          workspaceMember(filter: { id: { eq: $objectRecordId } }) {
+            __typename
+            colorScheme
+            name {
+              firstName
+              lastName
+            }
+            locale
+            userId
+            avatarUrl
+            createdAt
+            updatedAt
+            id
+          }
+        }
+      `,
+      variables: { objectRecordId: '20202020-1553-45c6-a028-5a9064cce07f' },
+    },
+    result: jest.fn(() => ({
+      data: {
+        workspaceMember: mockWorkspaceMembers[0],
+      },
+    })),
+  },
+];
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>
+    <MockedProvider mocks={mocks} addTypename={false}>
+      <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
+        {children}
+      </SnackBarProviderScope>
+    </MockedProvider>
+  </RecoilRoot>
+);
+
+const mockObjectMetadataItems = getObjectMetadataItemsMock();
+
+describe('useCreateActivityInCache', () => {
+  it('Should create activity in cache', async () => {
+    const { result } = renderHook(
+      () => {
+        const setCurrentWorkspaceMember = useSetRecoilState(
+          currentWorkspaceMemberState,
+        );
+        const setObjectMetadataItems = useSetRecoilState(
+          objectMetadataItemsState,
+        );
+
+        const res = useCreateActivityInCache();
+        return {
+          ...res,
+          setCurrentWorkspaceMember,
+          setObjectMetadataItems,
+        };
+      },
+      { wrapper: Wrapper },
+    );
+
+    act(() => {
+      result.current.setCurrentWorkspaceMember(mockWorkspaceMembers[0]);
+      result.current.setObjectMetadataItems(mockObjectMetadataItems);
+    });
+
+    act(() => {
+      const res = result.current.createActivityInCache({
+        type: 'Note',
+        targetableObjects: [
+          {
+            targetObjectNameSingular: 'person',
+            id: '1234',
+          },
+        ],
+      });
+
+      expect(res.createdActivityInCache).toHaveProperty('id');
+      expect(res.createdActivityInCache).toHaveProperty('__typename');
+      expect(res.createdActivityInCache).toHaveProperty('activityTargets');
+    });
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/hooks/__tests__/useCreateActivityInDB.test.tsx b/packages/twenty-front/src/modules/activities/hooks/__tests__/useCreateActivityInDB.test.tsx
new file mode 100644
index 000000000000..5c982afaac82
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/hooks/__tests__/useCreateActivityInDB.test.tsx
@@ -0,0 +1,90 @@
+import { ReactNode } from 'react';
+import { MockedProvider, MockedResponse } from '@apollo/client/testing';
+import { act, renderHook } from '@testing-library/react';
+import gql from 'graphql-tag';
+import pick from 'lodash/pick';
+import { RecoilRoot } from 'recoil';
+
+import { useCreateActivityInDB } from '@/activities/hooks/useCreateActivityInDB';
+import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
+import { mockedActivities } from '~/testing/mock-data/activities';
+
+const mockedDate = '2024-03-15T12:00:00.000Z';
+const toISOStringMock = jest.fn(() => mockedDate);
+global.Date.prototype.toISOString = toISOStringMock;
+
+const mockedActivity = {
+  ...pick(mockedActivities[0], [
+    'id',
+    'title',
+    'body',
+    'type',
+    'completedAt',
+    'dueAt',
+  ]),
+  updatedAt: mockedDate,
+};
+
+const mocks: MockedResponse[] = [
+  {
+    request: {
+      query: gql`
+        mutation CreateOneActivity($input: ActivityCreateInput!) {
+          createActivity(data: $input) {
+            __typename
+            createdAt
+            reminderAt
+            authorId
+            title
+            completedAt
+            updatedAt
+            body
+            dueAt
+            type
+            id
+            assigneeId
+          }
+        }
+      `,
+      variables: {
+        input: mockedActivity,
+      },
+    },
+    result: jest.fn(() => ({
+      data: {
+        createActivity: {
+          ...mockedActivity,
+          __typename: 'Activity',
+          assigneeId: '',
+          authorId: '1',
+          reminderAt: null,
+          createdAt: mockedDate,
+        },
+      },
+    })),
+  },
+];
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>
+    <MockedProvider mocks={mocks} addTypename={false}>
+      <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
+        {children}
+      </SnackBarProviderScope>
+    </MockedProvider>
+  </RecoilRoot>
+);
+
+describe('useCreateActivityInDB', () => {
+  it('Should create activity in DB', async () => {
+    const { result } = renderHook(() => useCreateActivityInDB(), {
+      wrapper: Wrapper,
+    });
+
+    await act(async () => {
+      await result.current.createActivityInDB(mockedActivity);
+    });
+
+    expect(mocks[0].result).toHaveBeenCalled();
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/hooks/__tests__/useOpenActivityRightDrawer.test.tsx b/packages/twenty-front/src/modules/activities/hooks/__tests__/useOpenActivityRightDrawer.test.tsx
new file mode 100644
index 000000000000..19a027551a21
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/hooks/__tests__/useOpenActivityRightDrawer.test.tsx
@@ -0,0 +1,42 @@
+import { ReactNode } from 'react';
+import { MockedProvider } from '@apollo/client/testing';
+import { act, renderHook } from '@testing-library/react';
+import { RecoilRoot, useRecoilValue } from 'recoil';
+
+import { useOpenActivityRightDrawer } from '@/activities/hooks/useOpenActivityRightDrawer';
+import { activityIdInDrawerState } from '@/activities/states/activityIdInDrawerState';
+import { viewableActivityIdState } from '@/activities/states/viewableActivityIdState';
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>
+    <MockedProvider addTypename={false}>{children}</MockedProvider>
+  </RecoilRoot>
+);
+
+describe('useOpenActivityRightDrawer', () => {
+  it('works as expected', () => {
+    const { result } = renderHook(
+      () => {
+        const openActivityRightDrawer = useOpenActivityRightDrawer();
+        const viewableActivityId = useRecoilValue(viewableActivityIdState);
+        const activityIdInDrawer = useRecoilValue(activityIdInDrawerState);
+        return {
+          openActivityRightDrawer,
+          activityIdInDrawer,
+          viewableActivityId,
+        };
+      },
+      {
+        wrapper: Wrapper,
+      },
+    );
+
+    expect(result.current.activityIdInDrawer).toBeNull();
+    expect(result.current.viewableActivityId).toBeNull();
+    act(() => {
+      result.current.openActivityRightDrawer('123');
+    });
+    expect(result.current.activityIdInDrawer).toBe('123');
+    expect(result.current.viewableActivityId).toBe('123');
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/hooks/__tests__/useOpenCreateActivityDrawer.test.tsx b/packages/twenty-front/src/modules/activities/hooks/__tests__/useOpenCreateActivityDrawer.test.tsx
new file mode 100644
index 000000000000..eb60717a4125
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/hooks/__tests__/useOpenCreateActivityDrawer.test.tsx
@@ -0,0 +1,63 @@
+import { ReactNode } from 'react';
+import { MockedProvider } from '@apollo/client/testing';
+import { act, renderHook } from '@testing-library/react';
+import { RecoilRoot, useRecoilValue, useSetRecoilState } from 'recoil';
+
+import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
+import { activityIdInDrawerState } from '@/activities/states/activityIdInDrawerState';
+import { viewableActivityIdState } from '@/activities/states/viewableActivityIdState';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
+
+const mockUUID = '37873e04-2f83-4468-9ab7-3f87da6cafad';
+
+jest.mock('uuid', () => ({
+  v4: () => mockUUID,
+}));
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>
+    <MockedProvider addTypename={false}>{children}</MockedProvider>
+  </RecoilRoot>
+);
+
+const mockObjectMetadataItems = getObjectMetadataItemsMock();
+
+describe('useOpenCreateActivityDrawer', () => {
+  it('works as expected', async () => {
+    const { result } = renderHook(
+      () => {
+        const openActivityRightDrawer = useOpenCreateActivityDrawer();
+        const viewableActivityId = useRecoilValue(viewableActivityIdState);
+        const activityIdInDrawer = useRecoilValue(activityIdInDrawerState);
+        const setObjectMetadataItems = useSetRecoilState(
+          objectMetadataItemsState,
+        );
+        return {
+          openActivityRightDrawer,
+          activityIdInDrawer,
+          viewableActivityId,
+          setObjectMetadataItems,
+        };
+      },
+      {
+        wrapper: Wrapper,
+      },
+    );
+
+    act(() => {
+      result.current.setObjectMetadataItems(mockObjectMetadataItems);
+    });
+
+    expect(result.current.activityIdInDrawer).toBeNull();
+    expect(result.current.viewableActivityId).toBeNull();
+    await act(async () => {
+      result.current.openActivityRightDrawer({
+        type: 'Note',
+        targetableObjects: [],
+      });
+    });
+    expect(result.current.activityIdInDrawer).toBe(mockUUID);
+    expect(result.current.viewableActivityId).toBe(mockUUID);
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/hooks/useActivities.ts b/packages/twenty-front/src/modules/activities/hooks/useActivities.ts
index 0806cece8009..1c2cb0943bbf 100644
--- a/packages/twenty-front/src/modules/activities/hooks/useActivities.ts
+++ b/packages/twenty-front/src/modules/activities/hooks/useActivities.ts
@@ -2,13 +2,12 @@ import { useEffect, useState } from 'react';
 import { isNonEmptyArray, isNonEmptyString } from '@sniptt/guards';
 import { useRecoilCallback } from 'recoil';
 
-import { useActivityConnectionUtils } from '@/activities/hooks/useActivityConnectionUtils';
 import { useActivityTargetsForTargetableObjects } from '@/activities/hooks/useActivityTargetsForTargetableObjects';
+import { FIND_MANY_ACTIVITIES_QUERY_KEY } from '@/activities/query-keys/FindManyActivitiesQueryKey';
 import { Activity } from '@/activities/types/Activity';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
 import { OrderByField } from '@/object-metadata/types/OrderByField';
-import { getRecordsFromRecordConnection } from '@/object-record/cache/utils/getRecordsFromRecordConnection';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { ObjectRecordQueryFilter } from '@/object-record/record-filter/types/ObjectRecordQueryFilter';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
@@ -29,7 +28,7 @@ export const useActivities = ({
 }) => {
   const [initialized, setInitialized] = useState(false);
 
-  const { makeActivityWithoutConnection } = useActivityConnectionUtils();
+  const { objectMetadataItems } = useObjectMetadataItems();
 
   const {
     activityTargets,
@@ -40,13 +39,17 @@ export const useActivities = ({
     skip: skipActivityTargets || skip,
   });
 
-  const activityIds = activityTargets
-    ? [
-        ...activityTargets
-          .map((activityTarget) => activityTarget.activityId)
-          .filter(isNonEmptyString),
-      ].sort(sortByAscString)
-    : [];
+  const activityIds = [
+    ...new Set(
+      activityTargets
+        ? [
+            ...activityTargets
+              .map((activityTarget) => activityTarget.activityId)
+              .filter(isNonEmptyString),
+          ].sort(sortByAscString)
+        : [],
+    ),
+  ];
 
   const activityTargetsFound =
     initializedActivityTargets && isNonEmptyArray(activityTargets);
@@ -65,23 +68,22 @@ export const useActivities = ({
     (!skipActivityTargets &&
       (!initializedActivityTargets || !activityTargetsFound));
 
-  const { records: activitiesWithConnection, loading: loadingActivities } =
+  const { records: activities, loading: loadingActivities } =
     useFindManyRecords<Activity>({
       skip: skipActivities,
-      objectNameSingular: CoreObjectNameSingular.Activity,
+      objectNameSingular: FIND_MANY_ACTIVITIES_QUERY_KEY.objectNameSingular,
+      depth: FIND_MANY_ACTIVITIES_QUERY_KEY.depth,
+      queryFields:
+        FIND_MANY_ACTIVITIES_QUERY_KEY.fieldsFactory?.(objectMetadataItems),
       filter,
       orderBy: activitiesOrderByVariables,
       onCompleted: useRecoilCallback(
         ({ set }) =>
-          (data) => {
+          (activities) => {
             if (!initialized) {
               setInitialized(true);
             }
 
-            const activities = getRecordsFromRecordConnection({
-              recordConnection: data,
-            });
-
             for (const activity of activities) {
               set(recordStoreFamilyState(activity.id), activity);
             }
@@ -92,11 +94,6 @@ export const useActivities = ({
 
   const loading = loadingActivities || loadingActivityTargets;
 
-  // TODO: fix connection in relation => automatically change to an array
-  const activities: Activity[] = activitiesWithConnection
-    ?.map(makeActivityWithoutConnection as any)
-    .map(({ activity }: any) => activity);
-
   const noActivities =
     (!activityTargetsFound && !skipActivityTargets && initialized) ||
     (initialized && !loading && !isNonEmptyArray(activities));
diff --git a/packages/twenty-front/src/modules/activities/hooks/useActivityById.ts b/packages/twenty-front/src/modules/activities/hooks/useActivityById.ts
deleted file mode 100644
index 4f63b2d1b207..000000000000
--- a/packages/twenty-front/src/modules/activities/hooks/useActivityById.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { useActivityConnectionUtils } from '@/activities/hooks/useActivityConnectionUtils';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
-
-const QUERY_DEPTH_TO_GET_ACTIVITY_TARGET_RELATIONS = 3;
-
-export const useActivityById = ({ activityId }: { activityId: string }) => {
-  const { makeActivityWithoutConnection } = useActivityConnectionUtils();
-
-  // TODO: fix connection in relation => automatically change to an array
-  const { record: activityWithConnections, loading } = useFindOneRecord({
-    objectNameSingular: CoreObjectNameSingular.Activity,
-    objectRecordId: activityId,
-    skip: !activityId,
-    depth: QUERY_DEPTH_TO_GET_ACTIVITY_TARGET_RELATIONS,
-  });
-
-  const { activity } = activityWithConnections
-    ? makeActivityWithoutConnection(activityWithConnections as any)
-    : { activity: null };
-
-  return {
-    activity,
-    loading,
-  };
-};
diff --git a/packages/twenty-front/src/modules/activities/hooks/useActivityConnectionUtils.ts b/packages/twenty-front/src/modules/activities/hooks/useActivityConnectionUtils.ts
deleted file mode 100644
index a858368df3de..000000000000
--- a/packages/twenty-front/src/modules/activities/hooks/useActivityConnectionUtils.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { isNonEmptyArray } from '@apollo/client/utilities';
-
-import { Activity } from '@/activities/types/Activity';
-import { ActivityTarget } from '@/activities/types/ActivityTarget';
-import { Comment } from '@/activities/types/Comment';
-import { isObjectRecordConnection } from '@/apollo/optimistic-effect/utils/isObjectRecordConnection';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { getEmptyPageInfo } from '@/object-record/cache/utils/getEmptyPageInfo';
-import { useMapConnectionToRecords } from '@/object-record/hooks/useMapConnectionToRecords';
-import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
-import { isNonNullable } from '~/utils/isNonNullable';
-
-export const useActivityConnectionUtils = () => {
-  const mapConnectionToRecords = useMapConnectionToRecords();
-
-  const makeActivityWithoutConnection = (
-    activityWithConnections: Activity & {
-      activityTargets: ObjectRecordConnection<ActivityTarget>;
-      comments: ObjectRecordConnection<Comment>;
-    },
-  ) => {
-    if (!isNonNullable(activityWithConnections)) {
-      throw new Error('Activity with connections is not defined');
-    }
-
-    const hasActivityTargetsConnection = isObjectRecordConnection(
-      CoreObjectNameSingular.ActivityTarget,
-      activityWithConnections?.activityTargets,
-    );
-
-    const activityTargets: ActivityTarget[] = [];
-
-    if (hasActivityTargetsConnection) {
-      const newActivityTargets = mapConnectionToRecords({
-        objectRecordConnection: activityWithConnections?.activityTargets,
-        objectNameSingular: CoreObjectNameSingular.ActivityTarget,
-        depth: 5,
-      }) as ActivityTarget[];
-
-      activityTargets.push(...newActivityTargets);
-    }
-
-    const hasCommentsConnection = isObjectRecordConnection(
-      CoreObjectNameSingular.Comment,
-      activityWithConnections?.comments,
-    );
-
-    const comments: Comment[] = [];
-
-    if (hasCommentsConnection) {
-      const newComments = mapConnectionToRecords({
-        objectRecordConnection: activityWithConnections?.comments,
-        objectNameSingular: CoreObjectNameSingular.Comment,
-        depth: 5,
-      }) as Comment[];
-
-      comments.push(...newComments);
-    }
-
-    const activity: Activity = {
-      ...activityWithConnections,
-      activityTargets,
-      comments,
-    };
-
-    return { activity };
-  };
-
-  const makeActivityWithConnection = (activity: Activity) => {
-    const activityTargetEdges = isNonEmptyArray(activity?.activityTargets)
-      ? activity.activityTargets.map((activityTarget) => ({
-          node: activityTarget,
-          cursor: '',
-        }))
-      : [];
-
-    const commentEdges = isNonEmptyArray(activity?.comments)
-      ? activity.comments.map((comment) => ({
-          node: comment,
-          cursor: '',
-        }))
-      : [];
-
-    const activityTargets = {
-      __typename: 'ActivityTargetConnection',
-      edges: activityTargetEdges,
-      pageInfo: getEmptyPageInfo(),
-    } as ObjectRecordConnection<ActivityTarget>;
-
-    const comments = {
-      __typename: 'CommentConnection',
-      edges: commentEdges,
-      pageInfo: getEmptyPageInfo(),
-    } as ObjectRecordConnection<Comment>;
-
-    const activityWithConnection = {
-      ...activity,
-      activityTargets,
-      comments,
-    } as Activity & {
-      activityTargets: ObjectRecordConnection<ActivityTarget>;
-      comments: ObjectRecordConnection<Comment>;
-    };
-
-    return { activityWithConnection };
-  };
-
-  return {
-    makeActivityWithoutConnection,
-    makeActivityWithConnection,
-  };
-};
diff --git a/packages/twenty-front/src/modules/activities/hooks/useActivityTargetObjectRecords.ts b/packages/twenty-front/src/modules/activities/hooks/useActivityTargetObjectRecords.ts
index 15e1fb1f9d57..7f403d89dd4d 100644
--- a/packages/twenty-front/src/modules/activities/hooks/useActivityTargetObjectRecords.ts
+++ b/packages/twenty-front/src/modules/activities/hooks/useActivityTargetObjectRecords.ts
@@ -1,56 +1,67 @@
-import { isNonEmptyString } from '@sniptt/guards';
+import { useApolloClient } from '@apollo/client';
 import { useRecoilValue } from 'recoil';
 
+import { Activity } from '@/activities/types/Activity';
 import { ActivityTarget } from '@/activities/types/ActivityTarget';
 import { ActivityTargetWithTargetRecord } from '@/activities/types/ActivityTargetObject';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
 import { Nullable } from '~/types/Nullable';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
-export const useActivityTargetObjectRecords = ({
-  activityId,
-}: {
-  activityId: string;
-}) => {
+export const useActivityTargetObjectRecords = (activity: Activity) => {
   const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
 
-  const { records: activityTargets, loading: loadingActivityTargets } =
-    useFindManyRecords<ActivityTarget>({
-      objectNameSingular: CoreObjectNameSingular.ActivityTarget,
-      skip: !isNonEmptyString(activityId),
-      filter: {
-        activityId: {
-          eq: activityId,
-        },
-      },
-    });
+  const activityTargets = activity.activityTargets ?? [];
+
+  const getRecordFromCache = useGetRecordFromCache({
+    objectNameSingular: CoreObjectNameSingular.ActivityTarget,
+  });
+
+  const apolloClient = useApolloClient();
 
   const activityTargetObjectRecords = activityTargets
     .map<Nullable<ActivityTargetWithTargetRecord>>((activityTarget) => {
+      const activityTargetFromCache = getRecordFromCache<ActivityTarget>(
+        activityTarget.id,
+        apolloClient.cache,
+      );
+
+      if (!isDefined(activityTargetFromCache)) {
+        throw new Error(
+          `Cannot find activity target ${activityTarget.id} in cache, this shouldn't happen.`,
+        );
+      }
+
       const correspondingObjectMetadataItem = objectMetadataItems.find(
         (objectMetadataItem) =>
-          isNonNullable(activityTarget[objectMetadataItem.nameSingular]) &&
+          isDefined(activityTargetFromCache[objectMetadataItem.nameSingular]) &&
           !objectMetadataItem.isSystem,
       );
 
       if (!correspondingObjectMetadataItem) {
-        return null;
+        return undefined;
+      }
+
+      const targetObjectRecord =
+        activityTargetFromCache[correspondingObjectMetadataItem.nameSingular];
+
+      if (!targetObjectRecord) {
+        throw new Error(
+          `Cannot find target object record of type ${correspondingObjectMetadataItem.nameSingular}, make sure the request for activities eagerly loads for the target objects on activity target relation.`,
+        );
       }
 
       return {
-        activityTarget: activityTarget,
-        targetObject:
-          activityTarget[correspondingObjectMetadataItem.nameSingular],
+        activityTarget: activityTargetFromCache ?? activityTarget,
+        targetObject: targetObjectRecord ?? undefined,
         targetObjectMetadataItem: correspondingObjectMetadataItem,
-        targetObjectNameSingular: correspondingObjectMetadataItem.nameSingular,
       };
     })
-    .filter(isNonNullable);
+    .filter(isDefined);
 
   return {
     activityTargetObjectRecords,
-    loadingActivityTargets,
   };
 };
diff --git a/packages/twenty-front/src/modules/activities/hooks/useActivityTargetsForTargetableObject.ts b/packages/twenty-front/src/modules/activities/hooks/useActivityTargetsForTargetableObject.ts
index a48dec8f8dd2..7d2a8e762cfe 100644
--- a/packages/twenty-front/src/modules/activities/hooks/useActivityTargetsForTargetableObject.ts
+++ b/packages/twenty-front/src/modules/activities/hooks/useActivityTargetsForTargetableObject.ts
@@ -3,7 +3,7 @@ import { isNonEmptyString } from '@sniptt/guards';
 
 import { ActivityTarget } from '@/activities/types/ActivityTarget';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { getActivityTargetObjectFieldIdName } from '@/activities/utils/getTargetObjectFilterFieldName';
+import { getActivityTargetObjectFieldIdName } from '@/activities/utils/getActivityTargetObjectFieldIdName';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 
@@ -26,7 +26,7 @@ export const useActivityTargetsForTargetableObject = ({
   //   If we are on a show page and we remove the current show page object corresponding activity target
   //   See also if we need to update useTimelineActivities
   const { records: activityTargets, loading: loadingActivityTargets } =
-    useFindManyRecords({
+    useFindManyRecords<ActivityTarget>({
       objectNameSingular: CoreObjectNameSingular.ActivityTarget,
       skip: skipRequest,
       filter: {
@@ -42,7 +42,7 @@ export const useActivityTargetsForTargetableObject = ({
     });
 
   return {
-    activityTargets: activityTargets as ActivityTarget[],
+    activityTargets,
     loadingActivityTargets,
     initialized,
   };
diff --git a/packages/twenty-front/src/modules/activities/hooks/useActivityTargetsForTargetableObjects.ts b/packages/twenty-front/src/modules/activities/hooks/useActivityTargetsForTargetableObjects.ts
index 2dbe174a6ac2..be828110297a 100644
--- a/packages/twenty-front/src/modules/activities/hooks/useActivityTargetsForTargetableObjects.ts
+++ b/packages/twenty-front/src/modules/activities/hooks/useActivityTargetsForTargetableObjects.ts
@@ -1,9 +1,11 @@
 import { useState } from 'react';
+import { useRecoilValue } from 'recoil';
 
+import { FIND_MANY_ACTIVITY_TARGETS_QUERY_KEY } from '@/activities/query-keys/FindManyActivityTargetsQueryKey';
 import { ActivityTarget } from '@/activities/types/ActivityTarget';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
 import { getActivityTargetsFilter } from '@/activities/utils/getActivityTargetsFilter';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 
 export const useActivityTargetsForTargetableObjects = ({
@@ -20,16 +22,23 @@ export const useActivityTargetsForTargetableObjects = ({
     targetableObjects: targetableObjects,
   });
 
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
+
   const [initialized, setInitialized] = useState(false);
 
   // TODO: We want to optimistically remove from this request
   //   If we are on a show page and we remove the current show page object corresponding activity target
   //   See also if we need to update useTimelineActivities
   const { records: activityTargets, loading: loadingActivityTargets } =
-    useFindManyRecords({
+    useFindManyRecords<ActivityTarget>({
       skip,
-      objectNameSingular: CoreObjectNameSingular.ActivityTarget,
+      objectNameSingular:
+        FIND_MANY_ACTIVITY_TARGETS_QUERY_KEY.objectNameSingular,
       filter: activityTargetsFilter,
+      queryFields:
+        FIND_MANY_ACTIVITY_TARGETS_QUERY_KEY.fieldsFactory?.(
+          objectMetadataItems,
+        ),
       onCompleted: () => {
         if (!initialized) {
           setInitialized(true);
@@ -38,7 +47,7 @@ export const useActivityTargetsForTargetableObjects = ({
     });
 
   return {
-    activityTargets: activityTargets as ActivityTarget[],
+    activityTargets,
     loadingActivityTargets,
     initialized,
   };
diff --git a/packages/twenty-front/src/modules/activities/hooks/useAttachRelationInBothDirections.ts b/packages/twenty-front/src/modules/activities/hooks/useAttachRelationInBothDirections.ts
deleted file mode 100644
index bdc0df87d088..000000000000
--- a/packages/twenty-front/src/modules/activities/hooks/useAttachRelationInBothDirections.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { useApolloClient } from '@apollo/client';
-import { StringKeyOf } from 'type-fest';
-
-import { getRelationDefinition } from '@/apollo/optimistic-effect/utils/getRelationDefinition';
-import { triggerAttachRelationOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerAttachRelationOptimisticEffect';
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { getObjectMetadataItemByNameSingular } from '@/object-metadata/utils/getObjectMetadataItemBySingularName';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { isNonNullable } from '~/utils/isNonNullable';
-
-export const useAttachRelationInBothDirections = () => {
-  const { objectMetadataItems } = useObjectMetadataItems();
-
-  const apolloClient = useApolloClient();
-
-  const attachRelationInBothDirections = <
-    Source extends ObjectRecord = ObjectRecord,
-    Target extends ObjectRecord = ObjectRecord,
-  >({
-    sourceRecord,
-    targetRecords,
-    sourceObjectNameSingular,
-    targetObjectNameSingular,
-    fieldNameOnSourceRecord,
-    fieldNameOnTargetRecord,
-  }: {
-    sourceRecord: Source;
-    targetRecords: Target[];
-    sourceObjectNameSingular: string;
-    targetObjectNameSingular: string;
-    fieldNameOnSourceRecord: StringKeyOf<Source>;
-    fieldNameOnTargetRecord: StringKeyOf<Target>;
-  }) => {
-    const sourceObjectMetadataItem = getObjectMetadataItemByNameSingular({
-      objectMetadataItems,
-      objectNameSingular: sourceObjectNameSingular,
-    });
-
-    const targetObjectMetadataItem = getObjectMetadataItemByNameSingular({
-      objectMetadataItems,
-      objectNameSingular: targetObjectNameSingular,
-    });
-
-    const fieldMetadataItemOnSourceRecord =
-      sourceObjectMetadataItem.fields.find(
-        (field) => field.name === fieldNameOnSourceRecord,
-      );
-
-    if (!isNonNullable(fieldMetadataItemOnSourceRecord)) {
-      throw new Error(
-        `Field ${fieldNameOnSourceRecord} not found on object ${sourceObjectNameSingular}`,
-      );
-    }
-
-    const relationDefinition = getRelationDefinition({
-      fieldMetadataItemOnSourceRecord: fieldMetadataItemOnSourceRecord,
-      objectMetadataItems,
-    });
-
-    if (!isNonNullable(relationDefinition)) {
-      throw new Error(
-        `Relation metadata not found for field ${fieldNameOnSourceRecord} on object ${sourceObjectNameSingular}`,
-      );
-    }
-
-    // TODO: could we use triggerUpdateRelationsOptimisticEffect here?
-    targetRecords.forEach((relationTargetRecord) => {
-      triggerAttachRelationOptimisticEffect({
-        cache: apolloClient.cache,
-        sourceObjectNameSingular: sourceObjectMetadataItem.nameSingular,
-        sourceRecordId: sourceRecord.id,
-        fieldNameOnTargetRecord: fieldNameOnTargetRecord,
-        targetObjectNameSingular: targetObjectMetadataItem.nameSingular,
-        targetRecordId: relationTargetRecord.id,
-      });
-
-      triggerAttachRelationOptimisticEffect({
-        cache: apolloClient.cache,
-        sourceObjectNameSingular: targetObjectMetadataItem.nameSingular,
-        sourceRecordId: relationTargetRecord.id,
-        fieldNameOnTargetRecord: fieldNameOnSourceRecord,
-        targetObjectNameSingular: sourceObjectMetadataItem.nameSingular,
-        targetRecordId: sourceRecord.id,
-      });
-    });
-  };
-
-  return {
-    attachRelationInBothDirections,
-  };
-};
diff --git a/packages/twenty-front/src/modules/activities/hooks/useCreateActivityInCache.ts b/packages/twenty-front/src/modules/activities/hooks/useCreateActivityInCache.ts
index 5c1bd50d79b1..8f54fdf1f7d5 100644
--- a/packages/twenty-front/src/modules/activities/hooks/useCreateActivityInCache.ts
+++ b/packages/twenty-front/src/modules/activities/hooks/useCreateActivityInCache.ts
@@ -1,20 +1,24 @@
+import { Reference, useApolloClient } from '@apollo/client';
 import { useRecoilCallback, useRecoilValue } from 'recoil';
 import { v4 } from 'uuid';
 
-import { useAttachRelationInBothDirections } from '@/activities/hooks/useAttachRelationInBothDirections';
-import { useInjectIntoActivityTargetInlineCellCache } from '@/activities/inline-cell/hooks/useInjectIntoActivityTargetInlineCellCache';
 import { Activity, ActivityType } from '@/activities/types/Activity';
 import { ActivityTarget } from '@/activities/types/ActivityTarget';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
 import { makeActivityTargetsToCreateFromTargetableObjects } from '@/activities/utils/getActivityTargetsToCreateFromTargetableObjects';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useCreateManyRecordsInCache } from '@/object-record/hooks/useCreateManyRecordsInCache';
-import { useCreateOneRecordInCache } from '@/object-record/hooks/useCreateOneRecordInCache';
+import { useCreateManyRecordsInCache } from '@/object-record/cache/hooks/useCreateManyRecordsInCache';
+import { useCreateOneRecordInCache } from '@/object-record/cache/hooks/useCreateOneRecordInCache';
+import { getRecordConnectionFromRecords } from '@/object-record/cache/utils/getRecordConnectionFromRecords';
+import { modifyRecordFromCache } from '@/object-record/cache/utils/modifyRecordFromCache';
 import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 export const useCreateActivityInCache = () => {
   const { createManyRecordsInCache: createManyActivityTargetsInCache } =
@@ -22,40 +26,48 @@ export const useCreateActivityInCache = () => {
       objectNameSingular: CoreObjectNameSingular.ActivityTarget,
     });
 
-  const { createOneRecordInCache: createOneActivityInCache } =
-    useCreateOneRecordInCache<Activity>({
-      objectNameSingular: CoreObjectNameSingular.Activity,
-    });
+  const cache = useApolloClient().cache;
 
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
   const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
 
   const { record: currentWorkspaceMemberRecord } = useFindOneRecord({
     objectNameSingular: CoreObjectNameSingular.WorkspaceMember,
     objectRecordId: currentWorkspaceMember?.id,
-    depth: 3,
+    depth: 0,
   });
 
-  const { injectIntoActivityTargetInlineCellCache } =
-    useInjectIntoActivityTargetInlineCellCache();
+  const { objectMetadataItem: objectMetadataItemActivity } =
+    useObjectMetadataItem({
+      objectNameSingular: CoreObjectNameSingular.Activity,
+    });
+
+  const { objectMetadataItem: objectMetadataItemActivityTarget } =
+    useObjectMetadataItem({
+      objectNameSingular: CoreObjectNameSingular.ActivityTarget,
+    });
 
-  const { attachRelationInBothDirections } =
-    useAttachRelationInBothDirections();
+  const createOneActivityInCache = useCreateOneRecordInCache<Activity>({
+    objectMetadataItem: objectMetadataItemActivity,
+  });
 
   const createActivityInCache = useRecoilCallback(
     ({ snapshot, set }) =>
       ({
         type,
-        targetableObjects,
+        targetObject,
         customAssignee,
       }: {
         type: ActivityType;
-        targetableObjects: ActivityTargetableObject[];
+        targetObject?: ActivityTargetableObject;
         customAssignee?: WorkspaceMember;
       }) => {
         const activityId = v4();
 
         const createdActivityInCache = createOneActivityInCache({
           id: activityId,
+          createdAt: new Date().toISOString(),
+          updatedAt: new Date().toISOString(),
           author: currentWorkspaceMemberRecord,
           authorId: currentWorkspaceMemberRecord?.id,
           assignee: customAssignee ?? currentWorkspaceMemberRecord,
@@ -63,42 +75,89 @@ export const useCreateActivityInCache = () => {
           type,
         });
 
-        const targetObjectRecords = targetableObjects
-          .map((targetableObject) => {
-            const targetObject = snapshot
-              .getLoadable(recordStoreFamilyState(targetableObject.id))
-              .getValue();
+        if (isUndefinedOrNull(createdActivityInCache)) {
+          throw new Error('Failed to create activity in cache');
+        }
+
+        if (isUndefinedOrNull(targetObject)) {
+          set(recordStoreFamilyState(activityId), {
+            ...createdActivityInCache,
+            activityTargets: [],
+            comments: [],
+          });
+
+          return {
+            createdActivityInCache: {
+              ...createdActivityInCache,
+              activityTargets: [],
+            },
+          };
+        }
+
+        const targetObjectRecord = snapshot
+          .getLoadable(recordStoreFamilyState(targetObject.id))
+          .getValue();
 
-            return targetObject;
-          })
-          .filter(isNonNullable);
+        if (isUndefinedOrNull(targetObjectRecord)) {
+          throw new Error('Failed to find target object record');
+        }
 
         const activityTargetsToCreate =
           makeActivityTargetsToCreateFromTargetableObjects({
-            activityId,
-            targetableObjects,
-            targetObjectRecords,
+            activity: createdActivityInCache,
+            targetableObjects: [targetObject],
+            targetObjectRecords: [targetObjectRecord],
           });
 
         const createdActivityTargetsInCache = createManyActivityTargetsInCache(
           activityTargetsToCreate,
         );
 
-        injectIntoActivityTargetInlineCellCache({
-          activityId,
-          activityTargetsToInject: createdActivityTargetsInCache,
+        const activityTargetsConnection = getRecordConnectionFromRecords({
+          objectMetadataItems: objectMetadataItems,
+          objectMetadataItem: objectMetadataItemActivityTarget,
+          records: createdActivityTargetsInCache,
+          withPageInfo: false,
+          computeReferences: true,
+          isRootLevel: false,
         });
 
-        attachRelationInBothDirections({
-          sourceRecord: createdActivityInCache,
-          fieldNameOnSourceRecord: 'activityTargets',
-          sourceObjectNameSingular: CoreObjectNameSingular.Activity,
-          fieldNameOnTargetRecord: 'activity',
-          targetObjectNameSingular: CoreObjectNameSingular.ActivityTarget,
-          targetRecords: createdActivityTargetsInCache,
+        modifyRecordFromCache({
+          recordId: createdActivityInCache.id,
+          cache,
+          fieldModifiers: {
+            activityTargets: () => activityTargetsConnection,
+          },
+          objectMetadataItem: objectMetadataItemActivity,
         });
 
-        // TODO: should refactor when refactoring make activity connection utils
+        const targetObjectMetadataItem = objectMetadataItems.find(
+          (item) => item.nameSingular === targetObject.targetObjectNameSingular,
+        );
+
+        if (isDefined(targetObjectMetadataItem)) {
+          modifyRecordFromCache({
+            cache,
+            objectMetadataItem: targetObjectMetadataItem,
+            recordId: targetObject.id,
+            fieldModifiers: {
+              activityTargets: (activityTargetsRef, { readField }) => {
+                const edges = readField<{ node: Reference }[]>(
+                  'edges',
+                  activityTargetsRef,
+                );
+
+                if (!edges) return activityTargetsRef;
+
+                return {
+                  ...activityTargetsRef,
+                  edges: [...edges, ...activityTargetsConnection.edges],
+                };
+              },
+            },
+          });
+        }
+
         set(recordStoreFamilyState(activityId), {
           ...createdActivityInCache,
           activityTargets: createdActivityTargetsInCache,
@@ -110,15 +169,16 @@ export const useCreateActivityInCache = () => {
             ...createdActivityInCache,
             activityTargets: createdActivityTargetsInCache,
           },
-          createdActivityTargetsInCache,
         };
       },
     [
-      attachRelationInBothDirections,
-      createManyActivityTargetsInCache,
       createOneActivityInCache,
       currentWorkspaceMemberRecord,
-      injectIntoActivityTargetInlineCellCache,
+      createManyActivityTargetsInCache,
+      objectMetadataItems,
+      objectMetadataItemActivityTarget,
+      cache,
+      objectMetadataItemActivity,
     ],
   );
 
diff --git a/packages/twenty-front/src/modules/activities/hooks/useCreateActivityInDB.ts b/packages/twenty-front/src/modules/activities/hooks/useCreateActivityInDB.ts
index 5ade36582011..58e0349e28e0 100644
--- a/packages/twenty-front/src/modules/activities/hooks/useCreateActivityInDB.ts
+++ b/packages/twenty-front/src/modules/activities/hooks/useCreateActivityInDB.ts
@@ -1,6 +1,6 @@
 import { isNonEmptyArray } from '@sniptt/guards';
 
-import { useActivityConnectionUtils } from '@/activities/hooks/useActivityConnectionUtils';
+import { CREATE_ONE_ACTIVITY_QUERY_KEY } from '@/activities/query-keys/CreateOneActivityQueryKey';
 import { ActivityForEditor } from '@/activities/types/ActivityForEditor';
 import { ActivityTarget } from '@/activities/types/ActivityTarget';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
@@ -9,37 +9,27 @@ import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 
 export const useCreateActivityInDB = () => {
   const { createOneRecord: createOneActivity } = useCreateOneRecord({
-    objectNameSingular: CoreObjectNameSingular.Activity,
+    objectNameSingular: CREATE_ONE_ACTIVITY_QUERY_KEY.objectNameSingular,
+    queryFields: CREATE_ONE_ACTIVITY_QUERY_KEY.fields,
+    depth: CREATE_ONE_ACTIVITY_QUERY_KEY.depth,
   });
 
   const { createManyRecords: createManyActivityTargets } =
     useCreateManyRecords<ActivityTarget>({
       objectNameSingular: CoreObjectNameSingular.ActivityTarget,
+      skipPostOptmisticEffect: true,
     });
 
-  const { makeActivityWithConnection } = useActivityConnectionUtils();
-
   const createActivityInDB = async (activityToCreate: ActivityForEditor) => {
-    const { activityWithConnection } = makeActivityWithConnection(
-      activityToCreate as any, // TODO: fix type
-    );
-
-    await createOneActivity?.(
-      {
-        ...activityWithConnection,
-        updatedAt: new Date().toISOString(),
-      },
-      {
-        skipOptimisticEffect: true,
-      },
-    );
+    await createOneActivity?.({
+      ...activityToCreate,
+      updatedAt: new Date().toISOString(),
+    });
 
     const activityTargetsToCreate = activityToCreate.activityTargets ?? [];
 
     if (isNonEmptyArray(activityTargetsToCreate)) {
-      await createManyActivityTargets(activityTargetsToCreate, {
-        skipOptimisticEffect: true,
-      });
+      await createManyActivityTargets(activityTargetsToCreate);
     }
   };
 
diff --git a/packages/twenty-front/src/modules/activities/hooks/useCustomResolver.ts b/packages/twenty-front/src/modules/activities/hooks/useCustomResolver.ts
new file mode 100644
index 000000000000..ed32eb3f0d0f
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/hooks/useCustomResolver.ts
@@ -0,0 +1,121 @@
+import { useState } from 'react';
+import {
+  DocumentNode,
+  OperationVariables,
+  TypedDocumentNode,
+  useQuery,
+} from '@apollo/client';
+
+import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+
+type CustomResolverQueryResult<
+  T extends {
+    [key: string]: any;
+  },
+> = {
+  [queryName: string]: T;
+};
+
+export const useCustomResolver = <
+  T extends {
+    [key: string]: any;
+  },
+>(
+  query:
+    | DocumentNode
+    | TypedDocumentNode<CustomResolverQueryResult<T>, OperationVariables>,
+  queryName: string,
+  objectName: string,
+  activityTargetableObject: ActivityTargetableObject,
+  pageSize: number,
+): {
+  data: CustomResolverQueryResult<T> | undefined;
+  firstQueryLoading: boolean;
+  isFetchingMore: boolean;
+  fetchMoreRecords: () => Promise<void>;
+} => {
+  const { enqueueSnackBar } = useSnackBar();
+
+  const [page, setPage] = useState({
+    pageNumber: 1,
+    hasNextPage: true,
+  });
+
+  const [isFetchingMore, setIsFetchingMore] = useState(false);
+
+  const queryVariables = {
+    ...(activityTargetableObject.targetObjectNameSingular ===
+    CoreObjectNameSingular.Person
+      ? { personId: activityTargetableObject.id }
+      : { companyId: activityTargetableObject.id }),
+    page: 1,
+    pageSize,
+  };
+
+  const {
+    data,
+    loading: firstQueryLoading,
+    fetchMore,
+  } = useQuery<CustomResolverQueryResult<T>>(query, {
+    variables: queryVariables,
+    onError: (error) => {
+      enqueueSnackBar(error.message || `Error loading ${objectName}`, {
+        variant: 'error',
+      });
+    },
+  });
+
+  const fetchMoreRecords = async () => {
+    if (page.hasNextPage && !isFetchingMore && !firstQueryLoading) {
+      setIsFetchingMore(true);
+
+      await fetchMore({
+        variables: {
+          ...queryVariables,
+          page: page.pageNumber + 1,
+        },
+        updateQuery: (prev, { fetchMoreResult }) => {
+          if (!fetchMoreResult?.[queryName]?.[objectName]?.length) {
+            setPage((page) => ({
+              ...page,
+              hasNextPage: false,
+            }));
+
+            return {
+              [queryName]: {
+                ...prev?.[queryName],
+                [objectName]: [...(prev?.[queryName]?.[objectName] ?? [])],
+              },
+            };
+          }
+
+          return {
+            [queryName]: {
+              ...prev?.[queryName],
+              [objectName]: [
+                ...(prev?.[queryName]?.[objectName] ?? []),
+                ...(fetchMoreResult?.[queryName]?.[objectName] ?? []),
+              ],
+            },
+          };
+        },
+      });
+
+      setPage((page) => ({
+        ...page,
+        pageNumber: page.pageNumber + 1,
+      }));
+
+      setIsFetchingMore(false);
+    }
+  };
+
+  return {
+    data,
+    firstQueryLoading,
+    isFetchingMore,
+    fetchMoreRecords,
+  };
+};
diff --git a/packages/twenty-front/src/modules/activities/hooks/useDeleteActivityFromCache.ts b/packages/twenty-front/src/modules/activities/hooks/useDeleteActivityFromCache.ts
deleted file mode 100644
index f4cd5914bd64..000000000000
--- a/packages/twenty-front/src/modules/activities/hooks/useDeleteActivityFromCache.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useApolloClient } from '@apollo/client';
-
-import { useActivityConnectionUtils } from '@/activities/hooks/useActivityConnectionUtils';
-import { ActivityForEditor } from '@/activities/types/ActivityForEditor';
-import { triggerDeleteRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerDeleteRecordsOptimisticEffect';
-import { useObjectMetadataItemOnly } from '@/object-metadata/hooks/useObjectMetadataItemOnly';
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-
-// TODO: this should be useDeleteRecordFromCache
-export const useDeleteActivityFromCache = () => {
-  const { makeActivityWithConnection } = useActivityConnectionUtils();
-
-  const apolloClient = useApolloClient();
-
-  const { objectMetadataItem: objectMetadataItemActivity } =
-    useObjectMetadataItemOnly({
-      objectNameSingular: CoreObjectNameSingular.Activity,
-    });
-
-  const { objectMetadataItems } = useObjectMetadataItems();
-
-  const deleteActivityFromCache = (activityToDelete: ActivityForEditor) => {
-    const { activityWithConnection } = makeActivityWithConnection(
-      activityToDelete as any, // TODO: fix type
-    );
-
-    triggerDeleteRecordsOptimisticEffect({
-      cache: apolloClient.cache,
-      objectMetadataItem: objectMetadataItemActivity,
-      objectMetadataItems,
-      recordsToDelete: [activityWithConnection],
-    });
-  };
-
-  return {
-    deleteActivityFromCache,
-  };
-};
diff --git a/packages/twenty-front/src/modules/activities/hooks/useInjectIntoActivitiesQueries.ts b/packages/twenty-front/src/modules/activities/hooks/useInjectIntoActivitiesQueries.ts
deleted file mode 100644
index eb07c0ddcec2..000000000000
--- a/packages/twenty-front/src/modules/activities/hooks/useInjectIntoActivitiesQueries.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-import { isNonEmptyArray, isNonEmptyString } from '@sniptt/guards';
-
-import { Activity } from '@/activities/types/Activity';
-import { ActivityTarget } from '@/activities/types/ActivityTarget';
-import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { getActivityTargetsFilter } from '@/activities/utils/getActivityTargetsFilter';
-import { useObjectMetadataItemOnly } from '@/object-metadata/hooks/useObjectMetadataItemOnly';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { OrderByField } from '@/object-metadata/types/OrderByField';
-import { useReadFindManyRecordsQueryInCache } from '@/object-record/cache/hooks/useReadFindManyRecordsQueryInCache';
-import { useUpsertFindManyRecordsQueryInCache } from '@/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache';
-import { ObjectRecordQueryFilter } from '@/object-record/record-filter/types/ObjectRecordQueryFilter';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { sortByAscString } from '~/utils/array/sortByAscString';
-
-// TODO: create a generic hook from this
-export const useInjectIntoActivitiesQueries = () => {
-  const { objectMetadataItem: objectMetadataItemActivity } =
-    useObjectMetadataItemOnly({
-      objectNameSingular: CoreObjectNameSingular.Activity,
-    });
-
-  const {
-    upsertFindManyRecordsQueryInCache: overwriteFindManyActivitiesInCache,
-  } = useUpsertFindManyRecordsQueryInCache({
-    objectMetadataItem: objectMetadataItemActivity,
-  });
-
-  const { objectMetadataItem: objectMetadataItemActivityTarget } =
-    useObjectMetadataItemOnly({
-      objectNameSingular: CoreObjectNameSingular.ActivityTarget,
-    });
-
-  const {
-    readFindManyRecordsQueryInCache: readFindManyActivityTargetsQueryInCache,
-  } = useReadFindManyRecordsQueryInCache({
-    objectMetadataItem: objectMetadataItemActivityTarget,
-  });
-
-  const {
-    readFindManyRecordsQueryInCache: readFindManyActivitiesQueryInCache,
-  } = useReadFindManyRecordsQueryInCache({
-    objectMetadataItem: objectMetadataItemActivity,
-  });
-
-  const injectActivitiesQueries = ({
-    activityToInject,
-    activityTargetsToInject,
-    targetableObjects,
-    activitiesFilters,
-    activitiesOrderByVariables,
-    injectOnlyInIdFilter,
-  }: {
-    activityToInject: Activity;
-    activityTargetsToInject: ActivityTarget[];
-    targetableObjects: ActivityTargetableObject[];
-    activitiesFilters?: ObjectRecordQueryFilter;
-    activitiesOrderByVariables?: OrderByField;
-    injectOnlyInIdFilter?: boolean;
-  }) => {
-    const hasActivityTargets = isNonEmptyArray(targetableObjects);
-
-    if (hasActivityTargets) {
-      const findManyActivitiyTargetsQueryFilter = getActivityTargetsFilter({
-        targetableObjects,
-      });
-
-      const findManyActivitiyTargetsQueryVariables = {
-        filter: findManyActivitiyTargetsQueryFilter,
-      };
-
-      const existingActivityTargetsWithMaybeDuplicates =
-        readFindManyActivityTargetsQueryInCache({
-          queryVariables: findManyActivitiyTargetsQueryVariables,
-        });
-
-      const existingActivityTargetsWithoutDuplicates: ObjectRecord[] =
-        existingActivityTargetsWithMaybeDuplicates.filter(
-          (existingActivityTarget) =>
-            !activityTargetsToInject.some(
-              (activityTargetToInject) =>
-                activityTargetToInject.id === existingActivityTarget.id,
-            ),
-        );
-
-      const existingActivityIdsFromTargets =
-        existingActivityTargetsWithoutDuplicates
-          ?.map((activityTarget) => activityTarget.activityId)
-          .filter(isNonEmptyString);
-
-      const currentFindManyActivitiesQueryVariables = {
-        filter: {
-          id: {
-            in: [...existingActivityIdsFromTargets].sort(sortByAscString),
-          },
-          ...activitiesFilters,
-        },
-        orderBy: activitiesOrderByVariables,
-      };
-
-      const existingActivities = readFindManyActivitiesQueryInCache({
-        queryVariables: currentFindManyActivitiesQueryVariables,
-      });
-
-      const nextActivityIds = [
-        ...existingActivityIdsFromTargets,
-        activityToInject.id,
-      ];
-
-      const nextFindManyActivitiesQueryVariables = {
-        filter: {
-          id: {
-            in: [...nextActivityIds].sort(sortByAscString),
-          },
-          ...activitiesFilters,
-        },
-        orderBy: activitiesOrderByVariables,
-      };
-
-      const newActivities = [...existingActivities];
-
-      if (!injectOnlyInIdFilter) {
-        const newActivity = {
-          ...activityToInject,
-          __typename: 'Activity',
-        };
-
-        newActivities.unshift(newActivity);
-      }
-
-      overwriteFindManyActivitiesInCache({
-        objectRecordsToOverwrite: newActivities,
-        queryVariables: nextFindManyActivitiesQueryVariables,
-      });
-    } else {
-      const currentFindManyActivitiesQueryVariables = {
-        filter: {
-          ...activitiesFilters,
-        },
-        orderBy: activitiesOrderByVariables,
-      };
-
-      const existingActivities = readFindManyActivitiesQueryInCache({
-        queryVariables: currentFindManyActivitiesQueryVariables,
-      });
-
-      const nextFindManyActivitiesQueryVariables = {
-        filter: {
-          ...activitiesFilters,
-        },
-        orderBy: activitiesOrderByVariables,
-      };
-
-      const newActivities = [...existingActivities];
-
-      if (!injectOnlyInIdFilter) {
-        const newActivity = {
-          ...activityToInject,
-          __typename: 'Activity',
-        };
-
-        newActivities.unshift(newActivity);
-      }
-
-      overwriteFindManyActivitiesInCache({
-        objectRecordsToOverwrite: newActivities,
-        queryVariables: nextFindManyActivitiesQueryVariables,
-      });
-    }
-  };
-
-  return {
-    injectActivitiesQueries,
-  };
-};
diff --git a/packages/twenty-front/src/modules/activities/hooks/useInjectIntoActivityTargetsQueries.ts b/packages/twenty-front/src/modules/activities/hooks/useInjectIntoActivityTargetsQueries.ts
deleted file mode 100644
index 1b70bc053303..000000000000
--- a/packages/twenty-front/src/modules/activities/hooks/useInjectIntoActivityTargetsQueries.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { isNonEmptyArray } from '@sniptt/guards';
-
-import { ActivityTarget } from '@/activities/types/ActivityTarget';
-import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { getActivityTargetsFilter } from '@/activities/utils/getActivityTargetsFilter';
-import { useObjectMetadataItemOnly } from '@/object-metadata/hooks/useObjectMetadataItemOnly';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useReadFindManyRecordsQueryInCache } from '@/object-record/cache/hooks/useReadFindManyRecordsQueryInCache';
-import { useUpsertFindManyRecordsQueryInCache } from '@/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-
-// TODO: create a generic hook from this
-export const useInjectIntoActivityTargetsQueries = () => {
-  const { objectMetadataItem: objectMetadataItemActivityTarget } =
-    useObjectMetadataItemOnly({
-      objectNameSingular: CoreObjectNameSingular.ActivityTarget,
-    });
-
-  const {
-    readFindManyRecordsQueryInCache: readFindManyActivityTargetsQueryInCache,
-  } = useReadFindManyRecordsQueryInCache({
-    objectMetadataItem: objectMetadataItemActivityTarget,
-  });
-
-  const {
-    upsertFindManyRecordsQueryInCache:
-      overwriteFindManyActivityTargetsQueryInCache,
-  } = useUpsertFindManyRecordsQueryInCache({
-    objectMetadataItem: objectMetadataItemActivityTarget,
-  });
-
-  const injectActivityTargetsQueries = ({
-    activityTargetsToInject,
-    targetableObjects,
-  }: {
-    activityTargetsToInject: ActivityTarget[];
-    targetableObjects: ActivityTargetableObject[];
-  }) => {
-    const hasActivityTargets = isNonEmptyArray(targetableObjects);
-
-    if (!hasActivityTargets) {
-      return;
-    }
-
-    const findManyActivitiyTargetsQueryFilter = getActivityTargetsFilter({
-      targetableObjects,
-    });
-
-    const findManyActivitiyTargetsQueryVariables = {
-      filter: findManyActivitiyTargetsQueryFilter,
-    };
-
-    const existingActivityTargetsWithMaybeDuplicates =
-      readFindManyActivityTargetsQueryInCache({
-        queryVariables: findManyActivitiyTargetsQueryVariables,
-      });
-
-    const existingActivityTargetsWithoutDuplicates: ObjectRecord[] =
-      existingActivityTargetsWithMaybeDuplicates.filter(
-        (existingActivityTarget) =>
-          !activityTargetsToInject.some(
-            (activityTargetToInject) =>
-              activityTargetToInject.id === existingActivityTarget.id,
-          ),
-      );
-
-    const newActivityTargets = [
-      ...existingActivityTargetsWithoutDuplicates,
-      ...activityTargetsToInject,
-    ];
-
-    overwriteFindManyActivityTargetsQueryInCache({
-      objectRecordsToOverwrite: newActivityTargets,
-      queryVariables: findManyActivitiyTargetsQueryVariables,
-    });
-  };
-
-  return {
-    injectActivityTargetsQueries,
-  };
-};
diff --git a/packages/twenty-front/src/modules/activities/hooks/useModifyActivityOnActivityTargetCache.ts b/packages/twenty-front/src/modules/activities/hooks/useModifyActivityOnActivityTargetCache.ts
deleted file mode 100644
index 84683c61571d..000000000000
--- a/packages/twenty-front/src/modules/activities/hooks/useModifyActivityOnActivityTargetCache.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useApolloClient } from '@apollo/client';
-
-import { Activity } from '@/activities/types/Activity';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useModifyRecordFromCache } from '@/object-record/cache/hooks/useModifyRecordFromCache';
-import { getCacheReferenceFromRecord } from '@/object-record/cache/utils/getCacheReferenceFromRecord';
-
-export const useModifyActivityOnActivityTargetsCache = () => {
-  const { objectMetadataItem: objectMetadataItemActivityTarget } =
-    useObjectMetadataItem({
-      objectNameSingular: CoreObjectNameSingular.ActivityTarget,
-    });
-
-  const modifyActivityTargetFromCache = useModifyRecordFromCache({
-    objectMetadataItem: objectMetadataItemActivityTarget,
-  });
-
-  const apolloClient = useApolloClient();
-
-  const modifyActivityOnActivityTargetsCache = ({
-    activityTargetIds,
-    activity,
-  }: {
-    activityTargetIds: string[];
-    activity: Activity;
-  }) => {
-    for (const activityTargetId of activityTargetIds) {
-      modifyActivityTargetFromCache(activityTargetId, {
-        activity: () => {
-          const newActivityReference = getCacheReferenceFromRecord({
-            apolloClient,
-            objectNameSingular: CoreObjectNameSingular.Activity,
-            record: activity,
-          });
-
-          return newActivityReference;
-        },
-      });
-    }
-  };
-
-  return {
-    modifyActivityOnActivityTargetsCache,
-  };
-};
diff --git a/packages/twenty-front/src/modules/activities/hooks/useModifyActivityTargetsOnActivityCache.ts b/packages/twenty-front/src/modules/activities/hooks/useModifyActivityTargetsOnActivityCache.ts
deleted file mode 100644
index 357fae472c5d..000000000000
--- a/packages/twenty-front/src/modules/activities/hooks/useModifyActivityTargetsOnActivityCache.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { useApolloClient } from '@apollo/client';
-
-import { ActivityTarget } from '@/activities/types/ActivityTarget';
-import { CachedObjectRecordConnection } from '@/apollo/types/CachedObjectRecordConnection';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useModifyRecordFromCache } from '@/object-record/cache/hooks/useModifyRecordFromCache';
-import { getCachedRecordEdgesFromRecords } from '@/object-record/cache/utils/getCachedRecordEdgesFromRecords';
-
-export const useModifyActivityTargetsOnActivityCache = () => {
-  const { objectMetadataItem: objectMetadataItemActivity } =
-    useObjectMetadataItem({
-      objectNameSingular: CoreObjectNameSingular.Activity,
-    });
-
-  const modifyActivityFromCache = useModifyRecordFromCache({
-    objectMetadataItem: objectMetadataItemActivity,
-  });
-
-  const apolloClient = useApolloClient();
-
-  const modifyActivityTargetsOnActivityCache = ({
-    activityId,
-    activityTargets,
-  }: {
-    activityId: string;
-    activityTargets: ActivityTarget[];
-  }) => {
-    modifyActivityFromCache(activityId, {
-      activityTargets: (
-        activityTargetsCachedConnection: CachedObjectRecordConnection,
-      ) => {
-        const newActivityTargetsCachedRecordEdges =
-          getCachedRecordEdgesFromRecords({
-            apolloClient,
-            objectNameSingular: CoreObjectNameSingular.ActivityTarget,
-            records: activityTargets,
-          });
-
-        return {
-          ...activityTargetsCachedConnection,
-          edges: newActivityTargetsCachedRecordEdges,
-        };
-      },
-    });
-  };
-
-  return {
-    modifyActivityTargetsOnActivityCache,
-  };
-};
diff --git a/packages/twenty-front/src/modules/activities/hooks/useOpenActivityRightDrawer.ts b/packages/twenty-front/src/modules/activities/hooks/useOpenActivityRightDrawer.ts
index 9bcc1ec21ded..b0279e17eece 100644
--- a/packages/twenty-front/src/modules/activities/hooks/useOpenActivityRightDrawer.ts
+++ b/packages/twenty-front/src/modules/activities/hooks/useOpenActivityRightDrawer.ts
@@ -1,4 +1,4 @@
-import { useRecoilState } from 'recoil';
+import { useRecoilState, useSetRecoilState } from 'recoil';
 
 import { activityIdInDrawerState } from '@/activities/states/activityIdInDrawerState';
 import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
@@ -14,7 +14,7 @@ export const useOpenActivityRightDrawer = () => {
   const [viewableActivityId, setViewableActivityId] = useRecoilState(
     viewableActivityIdState,
   );
-  const [, setActivityIdInDrawer] = useRecoilState(activityIdInDrawerState);
+  const setActivityIdInDrawer = useSetRecoilState(activityIdInDrawerState);
   const setHotkeyScope = useSetHotkeyScope();
 
   return (activityId: string) => {
diff --git a/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts b/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
index 6b7e83c447f1..521473627095 100644
--- a/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
+++ b/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
@@ -23,10 +23,10 @@ export const useOpenCreateActivityDrawer = () => {
 
   const { createActivityInCache } = useCreateActivityInCache();
 
-  const [, setActivityTargetableEntityArray] = useRecoilState(
+  const setActivityTargetableEntityArray = useSetRecoilState(
     activityTargetableEntityArrayState,
   );
-  const [, setViewableActivityId] = useRecoilState(viewableActivityIdState);
+  const setViewableActivityId = useSetRecoilState(viewableActivityIdState);
 
   const setIsCreatingActivity = useSetRecoilState(isActivityInCreateModeState);
 
@@ -51,7 +51,7 @@ export const useOpenCreateActivityDrawer = () => {
   }) => {
     const { createdActivityInCache } = createActivityInCache({
       type,
-      targetableObjects,
+      targetObject: targetableObjects[0],
       customAssignee,
     });
 
diff --git a/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts b/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts
deleted file mode 100644
index 9cde4d7439c5..000000000000
--- a/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { useRecoilCallback } from 'recoil';
-
-import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
-import { ActivityType } from '@/activities/types/Activity';
-import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
-import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
-import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
-import { isNonNullable } from '~/utils/isNonNullable';
-
-import { ActivityTargetableObject } from '../types/ActivityTargetableEntity';
-
-export const useOpenCreateActivityDrawerForSelectedRowIds = (
-  recordTableId: string,
-) => {
-  const openCreateActivityDrawer = useOpenCreateActivityDrawer();
-
-  const { getSelectedRowIdsSelector } = useRecordTableStates(recordTableId);
-
-  return useRecoilCallback(
-    ({ snapshot }) =>
-      (
-        type: ActivityType,
-        objectNameSingular: string,
-        relatedEntities?: ActivityTargetableObject[],
-      ) => {
-        const selectedRowIds = getSnapshotValue(
-          snapshot,
-          getSelectedRowIdsSelector(),
-        );
-
-        let activityTargetableObjectArray: ActivityTargetableObject[] =
-          selectedRowIds
-            .map((recordId: string) => {
-              const targetObjectRecord = getSnapshotValue(
-                snapshot,
-                recordStoreFamilyState(recordId),
-              );
-
-              if (!targetObjectRecord) {
-                return null;
-              }
-
-              return {
-                type: 'Custom',
-                targetObjectNameSingular: objectNameSingular,
-                id: recordId,
-                targetObjectRecord,
-              };
-            })
-            .filter(isNonNullable);
-
-        if (relatedEntities) {
-          activityTargetableObjectArray =
-            activityTargetableObjectArray.concat(relatedEntities);
-        }
-
-        openCreateActivityDrawer({
-          type,
-          targetableObjects: activityTargetableObjectArray,
-        });
-      },
-    [openCreateActivityDrawer, getSelectedRowIdsSelector],
-  );
-};
diff --git a/packages/twenty-front/src/modules/activities/hooks/usePrepareFindManyActivitiesQuery.ts b/packages/twenty-front/src/modules/activities/hooks/usePrepareFindManyActivitiesQuery.ts
new file mode 100644
index 000000000000..9d2e50b837da
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/hooks/usePrepareFindManyActivitiesQuery.ts
@@ -0,0 +1,123 @@
+import { useApolloClient } from '@apollo/client';
+
+import { FIND_MANY_ACTIVITIES_QUERY_KEY } from '@/activities/query-keys/FindManyActivitiesQueryKey';
+import { Activity } from '@/activities/types/Activity';
+import { ActivityTarget } from '@/activities/types/ActivityTarget';
+import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
+import { useUpsertFindManyRecordsQueryInCache } from '@/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache';
+import { getRecordFromCache } from '@/object-record/cache/utils/getRecordFromCache';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { sortByAscString } from '~/utils/array/sortByAscString';
+import { isDefined } from '~/utils/isDefined';
+
+export const usePrepareFindManyActivitiesQuery = () => {
+  const { objectMetadataItem: objectMetadataItemActivity } =
+    useObjectMetadataItem({
+      objectNameSingular: CoreObjectNameSingular.Activity,
+    });
+
+  const getActivityFromCache = useGetRecordFromCache({
+    objectNameSingular: CoreObjectNameSingular.Activity,
+  });
+
+  const cache = useApolloClient().cache;
+  const { objectMetadataItems } = useObjectMetadataItems();
+
+  const { upsertFindManyRecordsQueryInCache: upsertFindManyActivitiesInCache } =
+    useUpsertFindManyRecordsQueryInCache({
+      objectMetadataItem: objectMetadataItemActivity,
+    });
+
+  const prepareFindManyActivitiesQuery = ({
+    targetableObject,
+    additionalFilter,
+    shouldActivityBeExcluded,
+  }: {
+    additionalFilter?: Record<string, unknown>;
+    targetableObject: ActivityTargetableObject;
+    shouldActivityBeExcluded?: (activityTarget: Activity) => boolean;
+  }) => {
+    const targetableObjectMetadataItem = objectMetadataItems.find(
+      (objectMetadataItem) =>
+        objectMetadataItem.nameSingular ===
+        targetableObject.targetObjectNameSingular,
+    );
+
+    if (!targetableObjectMetadataItem) {
+      throw new Error(
+        `Cannot find object metadata item for targetable object ${targetableObject.targetObjectNameSingular}`,
+      );
+    }
+
+    const targetableObjectRecord = getRecordFromCache<ObjectRecord>({
+      recordId: targetableObject.id,
+      objectMetadataItem: targetableObjectMetadataItem,
+      objectMetadataItems,
+      cache,
+    });
+
+    const activityTargets: ActivityTarget[] =
+      targetableObjectRecord?.activityTargets ?? [];
+
+    const activityTargetIds = [
+      ...new Set(
+        activityTargets
+          .map((activityTarget) => activityTarget.id)
+          .filter(isDefined),
+      ),
+    ];
+
+    const activities: Activity[] = activityTargetIds
+      .map((activityTargetId) => {
+        const activityTarget = activityTargets.find(
+          (activityTarget) => activityTarget.id === activityTargetId,
+        );
+
+        if (!activityTarget) {
+          return undefined;
+        }
+
+        return getActivityFromCache<Activity>(activityTarget.activityId);
+      })
+      .filter(isDefined);
+
+    const activityIds = [...new Set(activities.map((activity) => activity.id))];
+
+    const nextFindManyActivitiesQueryFilter = {
+      filter: {
+        id: {
+          in: [...activityIds].sort(sortByAscString),
+        },
+        ...additionalFilter,
+      },
+    };
+
+    const filteredActivities = [
+      ...activities.filter(
+        (activity) => !shouldActivityBeExcluded?.(activity) ?? true,
+      ),
+    ].sort((a, b) => {
+      return a.createdAt > b.createdAt ? -1 : 1;
+    });
+
+    upsertFindManyActivitiesInCache({
+      objectRecordsToOverwrite: filteredActivities,
+      queryVariables: {
+        ...nextFindManyActivitiesQueryFilter,
+        orderBy: { createdAt: 'DescNullsFirst' },
+      },
+      depth: FIND_MANY_ACTIVITIES_QUERY_KEY.depth,
+      queryFields:
+        FIND_MANY_ACTIVITIES_QUERY_KEY.fieldsFactory?.(objectMetadataItems),
+      computeReferences: true,
+    });
+  };
+
+  return {
+    prepareFindManyActivitiesQuery,
+  };
+};
diff --git a/packages/twenty-front/src/modules/activities/hooks/useRefreshShowPageFindManyActivitiesQueries.ts b/packages/twenty-front/src/modules/activities/hooks/useRefreshShowPageFindManyActivitiesQueries.ts
new file mode 100644
index 000000000000..cbf0e2f419a3
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/hooks/useRefreshShowPageFindManyActivitiesQueries.ts
@@ -0,0 +1,49 @@
+import { useRecoilValue } from 'recoil';
+
+import { usePrepareFindManyActivitiesQuery } from '@/activities/hooks/usePrepareFindManyActivitiesQuery';
+import { objectShowPageTargetableObjectState } from '@/activities/timeline/states/objectShowPageTargetableObjectIdState';
+import { Activity } from '@/activities/types/Activity';
+import { isDefined } from '~/utils/isDefined';
+
+// This hook should only be executed if the normalized cache is up-to-date
+// It will take a targetableObject and prepare the queries for the activities
+// based on the activityTargets of the targetableObject
+export const useRefreshShowPageFindManyActivitiesQueries = () => {
+  const objectShowPageTargetableObject = useRecoilValue(
+    objectShowPageTargetableObjectState,
+  );
+
+  const { prepareFindManyActivitiesQuery } =
+    usePrepareFindManyActivitiesQuery();
+
+  const refreshShowPageFindManyActivitiesQueries = () => {
+    if (isDefined(objectShowPageTargetableObject)) {
+      prepareFindManyActivitiesQuery({
+        targetableObject: objectShowPageTargetableObject,
+      });
+      prepareFindManyActivitiesQuery({
+        targetableObject: objectShowPageTargetableObject,
+        additionalFilter: {
+          completedAt: { is: 'NULL' },
+          type: { eq: 'Task' },
+        },
+        shouldActivityBeExcluded: (activity: Activity) => {
+          return activity.type !== 'Task';
+        },
+      });
+      prepareFindManyActivitiesQuery({
+        targetableObject: objectShowPageTargetableObject,
+        additionalFilter: {
+          type: { eq: 'Note' },
+        },
+        shouldActivityBeExcluded: (activity: Activity) => {
+          return activity.type !== 'Note';
+        },
+      });
+    }
+  };
+
+  return {
+    refreshShowPageFindManyActivitiesQueries,
+  };
+};
diff --git a/packages/twenty-front/src/modules/activities/hooks/useRemoveFromActivitiesQueries.ts b/packages/twenty-front/src/modules/activities/hooks/useRemoveFromActivitiesQueries.ts
deleted file mode 100644
index e65b8058c051..000000000000
--- a/packages/twenty-front/src/modules/activities/hooks/useRemoveFromActivitiesQueries.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import { isNonEmptyArray, isNonEmptyString } from '@sniptt/guards';
-
-import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { getActivityTargetsFilter } from '@/activities/utils/getActivityTargetsFilter';
-import { useObjectMetadataItemOnly } from '@/object-metadata/hooks/useObjectMetadataItemOnly';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { OrderByField } from '@/object-metadata/types/OrderByField';
-import { useReadFindManyRecordsQueryInCache } from '@/object-record/cache/hooks/useReadFindManyRecordsQueryInCache';
-import { useUpsertFindManyRecordsQueryInCache } from '@/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache';
-import { ObjectRecordQueryFilter } from '@/object-record/record-filter/types/ObjectRecordQueryFilter';
-import { ObjectRecordQueryVariables } from '@/object-record/types/ObjectRecordQueryVariables';
-import { sortByAscString } from '~/utils/array/sortByAscString';
-
-// TODO: improve, no bug if query to inject doesn't exist
-export const useRemoveFromActivitiesQueries = () => {
-  const { objectMetadataItem: objectMetadataItemActivity } =
-    useObjectMetadataItemOnly({
-      objectNameSingular: CoreObjectNameSingular.Activity,
-    });
-
-  const {
-    upsertFindManyRecordsQueryInCache: overwriteFindManyActivitiesInCache,
-  } = useUpsertFindManyRecordsQueryInCache({
-    objectMetadataItem: objectMetadataItemActivity,
-  });
-
-  const { objectMetadataItem: objectMetadataItemActivityTarget } =
-    useObjectMetadataItemOnly({
-      objectNameSingular: CoreObjectNameSingular.ActivityTarget,
-    });
-
-  const {
-    readFindManyRecordsQueryInCache: readFindManyActivityTargetsQueryInCache,
-  } = useReadFindManyRecordsQueryInCache({
-    objectMetadataItem: objectMetadataItemActivityTarget,
-  });
-
-  const {
-    readFindManyRecordsQueryInCache: readFindManyActivitiesQueryInCache,
-  } = useReadFindManyRecordsQueryInCache({
-    objectMetadataItem: objectMetadataItemActivity,
-  });
-
-  const removeFromActivitiesQueries = ({
-    activityIdToRemove,
-    targetableObjects,
-    activitiesFilters,
-    activitiesOrderByVariables,
-  }: {
-    activityIdToRemove: string;
-    targetableObjects: ActivityTargetableObject[];
-    activitiesFilters?: ObjectRecordQueryFilter;
-    activitiesOrderByVariables?: OrderByField;
-  }) => {
-    const findManyActivitiyTargetsQueryFilter = getActivityTargetsFilter({
-      targetableObjects,
-    });
-
-    const findManyActivityTargetsQueryVariables = {
-      filter: findManyActivitiyTargetsQueryFilter,
-    } as ObjectRecordQueryVariables;
-
-    const existingActivityTargetsForTargetableObject =
-      readFindManyActivityTargetsQueryInCache({
-        queryVariables: findManyActivityTargetsQueryVariables,
-      });
-
-    const existingActivityIds = existingActivityTargetsForTargetableObject
-      ?.map((activityTarget) => activityTarget.activityId)
-      .filter(isNonEmptyString);
-
-    const currentFindManyActivitiesQueryVariables = {
-      filter: {
-        id: {
-          in: [...existingActivityIds].sort(sortByAscString),
-        },
-        ...activitiesFilters,
-      },
-      orderBy: activitiesOrderByVariables,
-    };
-
-    const existingActivities = readFindManyActivitiesQueryInCache({
-      queryVariables: currentFindManyActivitiesQueryVariables,
-    });
-
-    if (!isNonEmptyArray(existingActivities)) {
-      return;
-    }
-
-    const activityIdsAfterRemoval = existingActivityIds.filter(
-      (existingActivityId) => existingActivityId !== activityIdToRemove,
-    );
-
-    const nextFindManyActivitiesQueryVariables = {
-      filter: {
-        id: {
-          in: [...activityIdsAfterRemoval].sort(sortByAscString),
-        },
-        ...activitiesFilters,
-      },
-      orderBy: activitiesOrderByVariables,
-    };
-
-    const newActivities = existingActivities.filter(
-      (existingActivity) => existingActivity.id !== activityIdToRemove,
-    );
-
-    overwriteFindManyActivitiesInCache({
-      objectRecordsToOverwrite: newActivities,
-      queryVariables: nextFindManyActivitiesQueryVariables,
-    });
-  };
-
-  return {
-    removeFromActivitiesQueries,
-  };
-};
diff --git a/packages/twenty-front/src/modules/activities/hooks/useRemoveFromActivityTargetsQueries.ts b/packages/twenty-front/src/modules/activities/hooks/useRemoveFromActivityTargetsQueries.ts
deleted file mode 100644
index dd490f68514e..000000000000
--- a/packages/twenty-front/src/modules/activities/hooks/useRemoveFromActivityTargetsQueries.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { isNonEmptyArray } from '@sniptt/guards';
-
-import { ActivityTarget } from '@/activities/types/ActivityTarget';
-import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { getActivityTargetsFilter } from '@/activities/utils/getActivityTargetsFilter';
-import { useObjectMetadataItemOnly } from '@/object-metadata/hooks/useObjectMetadataItemOnly';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useReadFindManyRecordsQueryInCache } from '@/object-record/cache/hooks/useReadFindManyRecordsQueryInCache';
-import { useUpsertFindManyRecordsQueryInCache } from '@/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache';
-import { ObjectRecordQueryVariables } from '@/object-record/types/ObjectRecordQueryVariables';
-
-export const useRemoveFromActivityTargetsQueries = () => {
-  const { objectMetadataItem: objectMetadataItemActivityTarget } =
-    useObjectMetadataItemOnly({
-      objectNameSingular: CoreObjectNameSingular.ActivityTarget,
-    });
-
-  const {
-    readFindManyRecordsQueryInCache: readFindManyActivityTargetsQueryInCache,
-  } = useReadFindManyRecordsQueryInCache({
-    objectMetadataItem: objectMetadataItemActivityTarget,
-  });
-
-  const {
-    upsertFindManyRecordsQueryInCache:
-      overwriteFindManyActivityTargetsQueryInCache,
-  } = useUpsertFindManyRecordsQueryInCache({
-    objectMetadataItem: objectMetadataItemActivityTarget,
-  });
-
-  const removeFromActivityTargetsQueries = ({
-    activityTargetsToRemove,
-    targetableObjects,
-  }: {
-    activityTargetsToRemove: ActivityTarget[];
-    targetableObjects: ActivityTargetableObject[];
-  }) => {
-    const findManyActivitiyTargetsQueryFilter = getActivityTargetsFilter({
-      targetableObjects,
-    });
-
-    const findManyActivityTargetsQueryVariables = {
-      filter: findManyActivitiyTargetsQueryFilter,
-    } as ObjectRecordQueryVariables;
-
-    const existingActivityTargetsForTargetableObject =
-      readFindManyActivityTargetsQueryInCache({
-        queryVariables: findManyActivityTargetsQueryVariables,
-      });
-
-    const newActivityTargetsForTargetableObject = isNonEmptyArray(
-      activityTargetsToRemove,
-    )
-      ? existingActivityTargetsForTargetableObject.filter(
-          (existingActivityTarget) =>
-            activityTargetsToRemove.some(
-              (activityTargetToRemove) =>
-                activityTargetToRemove.id !== existingActivityTarget.id,
-            ),
-        )
-      : existingActivityTargetsForTargetableObject;
-
-    overwriteFindManyActivityTargetsQueryInCache({
-      objectRecordsToOverwrite: newActivityTargetsForTargetableObject,
-      queryVariables: findManyActivityTargetsQueryVariables,
-    });
-  };
-
-  return {
-    removeFromActivityTargetsQueries,
-  };
-};
diff --git a/packages/twenty-front/src/modules/activities/hooks/useUpsertActivity.ts b/packages/twenty-front/src/modules/activities/hooks/useUpsertActivity.ts
index 746735dad950..6365199216e3 100644
--- a/packages/twenty-front/src/modules/activities/hooks/useUpsertActivity.ts
+++ b/packages/twenty-front/src/modules/activities/hooks/useUpsertActivity.ts
@@ -1,24 +1,16 @@
-import { useLocation } from 'react-router-dom';
 import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
 
-import { useActivityConnectionUtils } from '@/activities/hooks/useActivityConnectionUtils';
 import { useCreateActivityInDB } from '@/activities/hooks/useCreateActivityInDB';
-import { useInjectIntoActivitiesQueries } from '@/activities/hooks/useInjectIntoActivitiesQueries';
-import { useInjectIntoActivityTargetsQueries } from '@/activities/hooks/useInjectIntoActivityTargetsQueries';
-import { currentNotesQueryVariablesState } from '@/activities/notes/states/currentNotesQueryVariablesState';
+import { useRefreshShowPageFindManyActivitiesQueries } from '@/activities/hooks/useRefreshShowPageFindManyActivitiesQueries';
 import { activityIdInDrawerState } from '@/activities/states/activityIdInDrawerState';
 import { isActivityInCreateModeState } from '@/activities/states/isActivityInCreateModeState';
 import { isUpsertingActivityInDBState } from '@/activities/states/isCreatingActivityInDBState';
-import { currentCompletedTaskQueryVariablesState } from '@/activities/tasks/states/currentCompletedTaskQueryVariablesState';
-import { currentIncompleteTaskQueryVariablesState } from '@/activities/tasks/states/currentIncompleteTaskQueryVariablesState';
-import { useInjectIntoTimelineActivitiesQueries } from '@/activities/timeline/hooks/useInjectIntoTimelineActivitiesQueries';
 import { objectShowPageTargetableObjectState } from '@/activities/timeline/states/objectShowPageTargetableObjectIdState';
 import { Activity } from '@/activities/types/Activity';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
-// TODO: create a generic way to have records only in cache for create mode and delete them afterwards ?
 export const useUpsertActivity = () => {
   const [isActivityInCreateMode, setIsActivityInCreateMode] = useRecoilState(
     isActivityInCreateModeState,
@@ -40,31 +32,8 @@ export const useUpsertActivity = () => {
     objectShowPageTargetableObjectState,
   );
 
-  const { injectActivitiesQueries } = useInjectIntoActivitiesQueries();
-  const { injectActivityTargetsQueries } =
-    useInjectIntoActivityTargetsQueries();
-
-  const { pathname } = useLocation();
-
-  const weAreOnObjectShowPage = pathname.startsWith('/object');
-  const weAreOnTaskPage = pathname.startsWith('/tasks');
-
-  const { injectIntoTimelineActivitiesQueries } =
-    useInjectIntoTimelineActivitiesQueries();
-
-  const { makeActivityWithConnection } = useActivityConnectionUtils();
-
-  const currentCompletedTaskQueryVariables = useRecoilValue(
-    currentCompletedTaskQueryVariablesState,
-  );
-
-  const currentIncompleteTaskQueryVariables = useRecoilValue(
-    currentIncompleteTaskQueryVariablesState,
-  );
-
-  const currentNotesQueryVariables = useRecoilValue(
-    currentNotesQueryVariablesState,
-  );
+  const { refreshShowPageFindManyActivitiesQueries } =
+    useRefreshShowPageFindManyActivitiesQueries();
 
   const upsertActivity = async ({
     activity,
@@ -74,103 +43,19 @@ export const useUpsertActivity = () => {
     input: Partial<Activity>;
   }) => {
     setIsUpsertingActivityInDB(true);
-
     if (isActivityInCreateMode) {
       const activityToCreate: Activity = {
         ...activity,
         ...input,
       };
 
-      const { activityWithConnection } =
-        makeActivityWithConnection(activityToCreate);
-
-      if (weAreOnTaskPage) {
-        if (isNonNullable(activityWithConnection.completedAt)) {
-          injectActivitiesQueries({
-            activitiesFilters: currentCompletedTaskQueryVariables?.filter,
-            activitiesOrderByVariables:
-              currentCompletedTaskQueryVariables?.orderBy,
-            activityTargetsToInject: activityToCreate.activityTargets,
-            activityToInject: activityWithConnection,
-            targetableObjects: [],
-          });
-        } else {
-          injectActivitiesQueries({
-            activitiesFilters: currentIncompleteTaskQueryVariables?.filter,
-            activitiesOrderByVariables:
-              currentIncompleteTaskQueryVariables?.orderBy,
-            activityTargetsToInject: activityToCreate.activityTargets,
-            activityToInject: activityWithConnection,
-            targetableObjects: [],
-          });
-        }
-
-        injectActivityTargetsQueries({
-          activityTargetsToInject: activityToCreate.activityTargets,
-          targetableObjects: [],
-        });
-      }
-
-      // Call optimistic effects
-      if (weAreOnObjectShowPage && objectShowPageTargetableObject) {
-        injectIntoTimelineActivitiesQueries({
-          timelineTargetableObject: objectShowPageTargetableObject,
-          activityToInject: activityWithConnection,
-          activityTargetsToInject: activityToCreate.activityTargets,
-        });
-
-        const injectOnlyInIdFilterForTaskQueries =
-          activityWithConnection.type !== 'Task';
-
-        const injectOnlyInIdFilterForNotesQueries =
-          activityWithConnection.type !== 'Note';
-
-        if (isNonNullable(currentCompletedTaskQueryVariables)) {
-          injectActivitiesQueries({
-            activitiesFilters: currentCompletedTaskQueryVariables?.filter,
-            activitiesOrderByVariables:
-              currentCompletedTaskQueryVariables?.orderBy,
-            activityTargetsToInject: activityToCreate.activityTargets,
-            activityToInject: activityWithConnection,
-            targetableObjects: [objectShowPageTargetableObject],
-            injectOnlyInIdFilter: injectOnlyInIdFilterForTaskQueries,
-          });
-        }
-
-        if (isNonNullable(currentIncompleteTaskQueryVariables)) {
-          injectActivitiesQueries({
-            activitiesFilters:
-              currentIncompleteTaskQueryVariables?.filter ?? {},
-            activitiesOrderByVariables:
-              currentIncompleteTaskQueryVariables?.orderBy ?? {},
-            activityTargetsToInject: activityToCreate.activityTargets,
-            activityToInject: activityWithConnection,
-            targetableObjects: [objectShowPageTargetableObject],
-            injectOnlyInIdFilter: injectOnlyInIdFilterForTaskQueries,
-          });
-        }
-
-        if (isNonNullable(currentNotesQueryVariables)) {
-          injectActivitiesQueries({
-            activitiesFilters: currentNotesQueryVariables?.filter,
-            activitiesOrderByVariables: currentNotesQueryVariables?.orderBy,
-            activityTargetsToInject: activityToCreate.activityTargets,
-            activityToInject: activityWithConnection,
-            targetableObjects: [objectShowPageTargetableObject],
-            injectOnlyInIdFilter: injectOnlyInIdFilterForNotesQueries,
-          });
-        }
-
-        injectActivityTargetsQueries({
-          activityTargetsToInject: activityToCreate.activityTargets,
-          targetableObjects: [objectShowPageTargetableObject],
-        });
+      if (isDefined(objectShowPageTargetableObject)) {
+        refreshShowPageFindManyActivitiesQueries();
       }
 
       await createActivityInDB(activityToCreate);
 
       setActivityIdInDrawer(activityToCreate.id);
-
       setIsActivityInCreateMode(false);
     } else {
       await updateOneActivity?.({
diff --git a/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetInlineCellEditMode.tsx b/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetInlineCellEditMode.tsx
index 3275f09233ee..16a51164a88f 100644
--- a/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetInlineCellEditMode.tsx
+++ b/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetInlineCellEditMode.tsx
@@ -1,23 +1,25 @@
 import styled from '@emotion/styled';
-import { isNonEmptyArray } from '@sniptt/guards';
-import { useRecoilState } from 'recoil';
+import { isNonEmptyArray, isNull } from '@sniptt/guards';
+import { useRecoilState, useSetRecoilState } from 'recoil';
 import { v4 } from 'uuid';
 
 import { useUpsertActivity } from '@/activities/hooks/useUpsertActivity';
-import { useInjectIntoActivityTargetInlineCellCache } from '@/activities/inline-cell/hooks/useInjectIntoActivityTargetInlineCellCache';
 import { isActivityInCreateModeState } from '@/activities/states/isActivityInCreateModeState';
 import { Activity } from '@/activities/types/Activity';
 import { ActivityTarget } from '@/activities/types/ActivityTarget';
 import { ActivityTargetWithTargetRecord } from '@/activities/types/ActivityTargetObject';
-import { getActivityTargetObjectFieldIdName } from '@/activities/utils/getTargetObjectFilterFieldName';
-import { useObjectMetadataItemOnly } from '@/object-metadata/hooks/useObjectMetadataItemOnly';
+import { getActivityTargetObjectFieldIdName } from '@/activities/utils/getActivityTargetObjectFieldIdName';
+import { getActivityTargetObjectFieldName } from '@/activities/utils/getActivityTargetObjectFieldName';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useGenerateObjectRecordOptimisticResponse } from '@/object-record/cache/hooks/useGenerateObjectRecordOptimisticResponse';
+import { useCreateManyRecordsInCache } from '@/object-record/cache/hooks/useCreateManyRecordsInCache';
 import { useCreateManyRecords } from '@/object-record/hooks/useCreateManyRecords';
 import { useDeleteManyRecords } from '@/object-record/hooks/useDeleteManyRecords';
 import { useInlineCell } from '@/object-record/record-inline-cell/hooks/useInlineCell';
+import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import { MultipleObjectRecordSelect } from '@/object-record/relation-picker/components/MultipleObjectRecordSelect';
 import { ObjectRecordForSelect } from '@/object-record/relation-picker/hooks/useMultiObjectSearch';
+import { prefillRecord } from '@/object-record/utils/prefillRecord';
 
 const StyledSelectContainer = styled.div`
   left: 0px;
@@ -38,7 +40,7 @@ export const ActivityTargetInlineCellEditMode = ({
 
   const selectedTargetObjectIds = activityTargetWithTargetRecords.map(
     (activityTarget) => ({
-      objectNameSingular: activityTarget.targetObjectNameSingular,
+      objectNameSingular: activityTarget.targetObjectMetadataItem.nameSingular,
       id: activityTarget.targetObject.id,
     }),
   );
@@ -59,16 +61,17 @@ export const ActivityTargetInlineCellEditMode = ({
   const { upsertActivity } = useUpsertActivity();
 
   const { objectMetadataItem: objectMetadataItemActivityTarget } =
-    useObjectMetadataItemOnly({
+    useObjectMetadataItem({
       objectNameSingular: CoreObjectNameSingular.ActivityTarget,
     });
 
-  const { injectIntoActivityTargetInlineCellCache } =
-    useInjectIntoActivityTargetInlineCellCache();
+  const setActivityFromStore = useSetRecoilState(
+    recordStoreFamilyState(activity.id),
+  );
 
-  const { generateObjectRecordOptimisticResponse } =
-    useGenerateObjectRecordOptimisticResponse({
-      objectMetadataItem: objectMetadataItemActivityTarget,
+  const { createManyRecordsInCache: createManyActivityTargetsInCache } =
+    useCreateManyRecordsInCache<ActivityTarget>({
+      objectNameSingular: CoreObjectNameSingular.ActivityTarget,
     });
 
   const handleSubmit = async (selectedRecords: ObjectRecordForSelect[]) => {
@@ -100,17 +103,22 @@ export const ActivityTargetInlineCellEditMode = ({
 
     const activityTargetsToCreate = selectedTargetObjectsToCreate.map(
       (selectedRecord) => {
-        const emptyActivityTarget =
-          generateObjectRecordOptimisticResponse<ActivityTarget>({
+        const emptyActivityTarget = prefillRecord<ActivityTarget>({
+          objectMetadataItem: objectMetadataItemActivityTarget,
+          input: {
             id: v4(),
             activityId: activity.id,
             activity,
             createdAt: new Date().toISOString(),
             updatedAt: new Date().toISOString(),
+            [getActivityTargetObjectFieldName({
+              nameSingular: selectedRecord.objectMetadataItem.nameSingular,
+            })]: selectedRecord.record,
             [getActivityTargetObjectFieldIdName({
               nameSingular: selectedRecord.objectMetadataItem.nameSingular,
             })]: selectedRecord.recordIdentifier.id,
-          });
+          },
+        });
 
         return emptyActivityTarget;
       },
@@ -128,12 +136,8 @@ export const ActivityTargetInlineCellEditMode = ({
       );
     }
 
-    injectIntoActivityTargetInlineCellCache({
-      activityId: activity.id,
-      activityTargetsToInject: activityTargetsAfterUpdate,
-    });
-
     if (isActivityInCreateMode) {
+      createManyActivityTargetsInCache(activityTargetsToCreate);
       upsertActivity({
         activity,
         input: {
@@ -142,9 +146,7 @@ export const ActivityTargetInlineCellEditMode = ({
       });
     } else {
       if (activityTargetsToCreate.length > 0) {
-        await createManyActivityTargets(activityTargetsToCreate, {
-          skipOptimisticEffect: true,
-        });
+        await createManyActivityTargets(activityTargetsToCreate);
       }
 
       if (activityTargetsToDelete.length > 0) {
@@ -153,12 +155,20 @@ export const ActivityTargetInlineCellEditMode = ({
             (activityTargetObjectRecord) =>
               activityTargetObjectRecord.activityTarget.id,
           ),
-          {
-            skipOptimisticEffect: true,
-          },
         );
       }
     }
+
+    setActivityFromStore((currentActivity) => {
+      if (isNull(currentActivity)) {
+        return null;
+      }
+
+      return {
+        ...currentActivity,
+        activityTargets: activityTargetsAfterUpdate,
+      };
+    });
   };
 
   const handleCancel = () => {
diff --git a/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx b/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx
index d1b09c737255..0ba763525629 100644
--- a/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx
+++ b/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx
@@ -1,4 +1,5 @@
 import { Key } from 'ts-key-enum';
+import { IconArrowUpRight, IconPencil } from 'twenty-ui';
 
 import { ActivityTargetChips } from '@/activities/components/ActivityTargetChips';
 import { useActivityTargetObjectRecords } from '@/activities/hooks/useActivityTargetObjectRecords';
@@ -8,7 +9,6 @@ import { ActivityEditorHotkeyScope } from '@/activities/types/ActivityEditorHotk
 import { RecordFieldInputScope } from '@/object-record/record-field/scopes/RecordFieldInputScope';
 import { RecordInlineCellContainer } from '@/object-record/record-inline-cell/components/RecordInlineCellContainer';
 import { useInlineCell } from '@/object-record/record-inline-cell/hooks/useInlineCell';
-import { IconArrowUpRight, IconPencil } from '@/ui/display/icon';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 
 type ActivityTargetsInlineCellProps = {
@@ -18,9 +18,8 @@ type ActivityTargetsInlineCellProps = {
 export const ActivityTargetsInlineCell = ({
   activity,
 }: ActivityTargetsInlineCellProps) => {
-  const { activityTargetObjectRecords } = useActivityTargetObjectRecords({
-    activityId: activity?.id ?? '',
-  });
+  const { activityTargetObjectRecords } =
+    useActivityTargetObjectRecords(activity);
   const { closeInlineCell } = useInlineCell();
 
   useScopedHotkeys(
diff --git a/packages/twenty-front/src/modules/activities/inline-cell/hooks/useInjectIntoActivityTargetInlineCellCache.ts b/packages/twenty-front/src/modules/activities/inline-cell/hooks/useInjectIntoActivityTargetInlineCellCache.ts
deleted file mode 100644
index d3c52f1bf38a..000000000000
--- a/packages/twenty-front/src/modules/activities/inline-cell/hooks/useInjectIntoActivityTargetInlineCellCache.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { ActivityTarget } from '@/activities/types/ActivityTarget';
-import { useObjectMetadataItemOnly } from '@/object-metadata/hooks/useObjectMetadataItemOnly';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useUpsertFindManyRecordsQueryInCache } from '@/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache';
-
-export const useInjectIntoActivityTargetInlineCellCache = () => {
-  const { objectMetadataItem: objectMetadataItemActivityTarget } =
-    useObjectMetadataItemOnly({
-      objectNameSingular: CoreObjectNameSingular.ActivityTarget,
-    });
-
-  const {
-    upsertFindManyRecordsQueryInCache:
-      overwriteFindManyActivityTargetsQueryInCache,
-  } = useUpsertFindManyRecordsQueryInCache({
-    objectMetadataItem: objectMetadataItemActivityTarget,
-  });
-
-  const injectIntoActivityTargetInlineCellCache = ({
-    activityId,
-    activityTargetsToInject,
-  }: {
-    activityId: string;
-    activityTargetsToInject: ActivityTarget[];
-  }) => {
-    const activityTargetInlineCellQueryVariables = {
-      filter: {
-        activityId: {
-          eq: activityId,
-        },
-      },
-    };
-
-    overwriteFindManyActivityTargetsQueryInCache({
-      queryVariables: activityTargetInlineCellQueryVariables,
-      objectRecordsToOverwrite: activityTargetsToInject,
-    });
-  };
-
-  return {
-    injectIntoActivityTargetInlineCellCache,
-  };
-};
diff --git a/packages/twenty-front/src/modules/activities/notes/components/NoteCard.tsx b/packages/twenty-front/src/modules/activities/notes/components/NoteCard.tsx
index 323546127a24..3ae87c635959 100644
--- a/packages/twenty-front/src/modules/activities/notes/components/NoteCard.tsx
+++ b/packages/twenty-front/src/modules/activities/notes/components/NoteCard.tsx
@@ -1,6 +1,7 @@
 import { useMemo } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconComment } from 'twenty-ui';
 
 import { useOpenActivityRightDrawer } from '@/activities/hooks/useOpenActivityRightDrawer';
 import { ActivityTargetsInlineCell } from '@/activities/inline-cell/components/ActivityTargetsInlineCell';
@@ -10,7 +11,6 @@ import {
   FieldContext,
   GenericFieldContextType,
 } from '@/object-record/record-field/contexts/FieldContext';
-import { IconComment } from '@/ui/display/icon';
 
 const StyledCard = styled.div<{ isSingleNote: boolean }>`
   align-items: flex-start;
diff --git a/packages/twenty-front/src/modules/activities/notes/components/Notes.tsx b/packages/twenty-front/src/modules/activities/notes/components/Notes.tsx
index 120ac4c63b1f..88956be73326 100644
--- a/packages/twenty-front/src/modules/activities/notes/components/Notes.tsx
+++ b/packages/twenty-front/src/modules/activities/notes/components/Notes.tsx
@@ -1,10 +1,10 @@
 import styled from '@emotion/styled';
+import { IconPlus } from 'twenty-ui';
 
 import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
 import { NoteList } from '@/activities/notes/components/NoteList';
 import { useNotes } from '@/activities/notes/hooks/useNotes';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { IconPlus } from '@/ui/display/icon';
 import { Button } from '@/ui/input/button/components/Button';
 import AnimatedPlaceholder from '@/ui/layout/animated-placeholder/components/AnimatedPlaceholder';
 import {
diff --git a/packages/twenty-front/src/modules/activities/notes/hooks/__tests__/useNotes.test.ts b/packages/twenty-front/src/modules/activities/notes/hooks/__tests__/useNotes.test.ts
new file mode 100644
index 000000000000..f64b745f0402
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/notes/hooks/__tests__/useNotes.test.ts
@@ -0,0 +1,45 @@
+import { renderHook } from '@testing-library/react';
+
+import { useNotes } from '@/activities/notes/hooks/useNotes';
+import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
+
+jest.mock('@/activities/hooks/useActivities', () => ({
+  useActivities: jest.fn(() => ({
+    activities: [{ id: '1', content: 'Example Note' }],
+    initialized: true,
+    loading: false,
+  })),
+}));
+
+jest.mock('recoil', () => {
+  const actualRecoil = jest.requireActual('recoil');
+  return {
+    ...actualRecoil,
+    useRecoilState: jest.fn(() => {
+      const mockCurrentNotesQueryVariables = {
+        filter: {
+          type: { eq: 'Note' },
+        },
+        orderBy: 'mockOrderBy',
+      };
+      return [mockCurrentNotesQueryVariables, jest.fn()];
+    }),
+    atom: jest.fn(),
+  };
+});
+
+describe('useNotes', () => {
+  it('should return notes, initialized, and loading as expected', () => {
+    const mockTargetableObject: ActivityTargetableObject = {
+      id: '1',
+      targetObjectNameSingular: 'Example Target',
+    };
+    const { result } = renderHook(() => useNotes(mockTargetableObject));
+
+    expect(result.current.notes).toEqual([
+      { id: '1', content: 'Example Note' },
+    ]);
+    expect(result.current.initialized).toBe(true);
+    expect(result.current.loading).toBe(false);
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/query-keys/CreateOneActivityQueryKey.ts b/packages/twenty-front/src/modules/activities/query-keys/CreateOneActivityQueryKey.ts
new file mode 100644
index 000000000000..acec84ba75f3
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/query-keys/CreateOneActivityQueryKey.ts
@@ -0,0 +1,34 @@
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { QueryKey } from '@/object-record/query-keys/types/QueryKey';
+
+export const CREATE_ONE_ACTIVITY_QUERY_KEY: QueryKey = {
+  objectNameSingular: CoreObjectNameSingular.Activity,
+  variables: {},
+  fields: {
+    id: true,
+    __typename: true,
+    createdAt: true,
+    updatedAt: true,
+    author: {
+      id: true,
+      name: true,
+      __typename: true,
+    },
+    authorId: true,
+    assigneeId: true,
+    assignee: {
+      id: true,
+      name: true,
+      __typename: true,
+    },
+    comments: true,
+    attachments: true,
+    body: true,
+    title: true,
+    completedAt: true,
+    dueAt: true,
+    reminderAt: true,
+    type: true,
+  },
+  depth: 1,
+};
diff --git a/packages/twenty-front/src/modules/activities/query-keys/FindManyActivitiesQueryKey.ts b/packages/twenty-front/src/modules/activities/query-keys/FindManyActivitiesQueryKey.ts
new file mode 100644
index 000000000000..09e6b04d6440
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/query-keys/FindManyActivitiesQueryKey.ts
@@ -0,0 +1,38 @@
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { QueryKey } from '@/object-record/query-keys/types/QueryKey';
+
+export const FIND_MANY_ACTIVITIES_QUERY_KEY: QueryKey = {
+  objectNameSingular: CoreObjectNameSingular.Activity,
+  variables: {},
+  fieldsFactory: (_objectMetadataItems: ObjectMetadataItem[]) => {
+    return {
+      id: true,
+      __typename: true,
+      createdAt: true,
+      updatedAt: true,
+      author: {
+        id: true,
+        name: true,
+        __typename: true,
+      },
+      authorId: true,
+      assigneeId: true,
+      assignee: {
+        id: true,
+        name: true,
+        __typename: true,
+      },
+      comments: true,
+      attachments: true,
+      body: true,
+      title: true,
+      completedAt: true,
+      dueAt: true,
+      reminderAt: true,
+      type: true,
+      activityTargets: true,
+    };
+  },
+  depth: 2,
+};
diff --git a/packages/twenty-front/src/modules/activities/query-keys/FindManyActivityTargetsQueryKey.ts b/packages/twenty-front/src/modules/activities/query-keys/FindManyActivityTargetsQueryKey.ts
new file mode 100644
index 000000000000..b0d34ff84a88
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/query-keys/FindManyActivityTargetsQueryKey.ts
@@ -0,0 +1,21 @@
+import { generateActivityTargetMorphFieldKeys } from '@/activities/utils/generateActivityTargetMorphFieldKeys';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { QueryKey } from '@/object-record/query-keys/types/QueryKey';
+
+export const FIND_MANY_ACTIVITY_TARGETS_QUERY_KEY: QueryKey = {
+  objectNameSingular: CoreObjectNameSingular.ActivityTarget,
+  variables: {},
+  fieldsFactory: (objectMetadataItems: ObjectMetadataItem[]) => {
+    return {
+      id: true,
+      __typename: true,
+      createdAt: true,
+      updatedAt: true,
+      activity: true,
+      activityId: true,
+      ...generateActivityTargetMorphFieldKeys(objectMetadataItems),
+    };
+  },
+  depth: 1,
+};
diff --git a/packages/twenty-front/src/modules/activities/right-drawer/components/ActivityActionBar.tsx b/packages/twenty-front/src/modules/activities/right-drawer/components/ActivityActionBar.tsx
index 397255487d0e..c374ab1e130d 100644
--- a/packages/twenty-front/src/modules/activities/right-drawer/components/ActivityActionBar.tsx
+++ b/packages/twenty-front/src/modules/activities/right-drawer/components/ActivityActionBar.tsx
@@ -1,34 +1,29 @@
-import { useLocation } from 'react-router-dom';
 import styled from '@emotion/styled';
-import { isNonEmptyArray } from '@sniptt/guards';
+import { isNonEmptyArray, isNonEmptyString } from '@sniptt/guards';
 import { useRecoilCallback, useRecoilState, useRecoilValue } from 'recoil';
+import { IconPlus, IconTrash } from 'twenty-ui';
 
-import { useDeleteActivityFromCache } from '@/activities/hooks/useDeleteActivityFromCache';
 import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
-import { useRemoveFromActivitiesQueries } from '@/activities/hooks/useRemoveFromActivitiesQueries';
-import { useRemoveFromActivityTargetsQueries } from '@/activities/hooks/useRemoveFromActivityTargetsQueries';
-import { currentNotesQueryVariablesState } from '@/activities/notes/states/currentNotesQueryVariablesState';
+import { useRefreshShowPageFindManyActivitiesQueries } from '@/activities/hooks/useRefreshShowPageFindManyActivitiesQueries';
 import { activityIdInDrawerState } from '@/activities/states/activityIdInDrawerState';
 import { activityTargetableEntityArrayState } from '@/activities/states/activityTargetableEntityArrayState';
 import { isActivityInCreateModeState } from '@/activities/states/isActivityInCreateModeState';
 import { isUpsertingActivityInDBState } from '@/activities/states/isCreatingActivityInDBState';
 import { temporaryActivityForEditorState } from '@/activities/states/temporaryActivityForEditorState';
 import { viewableActivityIdState } from '@/activities/states/viewableActivityIdState';
-import { currentCompletedTaskQueryVariablesState } from '@/activities/tasks/states/currentCompletedTaskQueryVariablesState';
-import { currentIncompleteTaskQueryVariablesState } from '@/activities/tasks/states/currentIncompleteTaskQueryVariablesState';
-import { FIND_MANY_TIMELINE_ACTIVITIES_ORDER_BY } from '@/activities/timeline/constants/FindManyTimelineActivitiesOrderBy';
 import { objectShowPageTargetableObjectState } from '@/activities/timeline/states/objectShowPageTargetableObjectIdState';
 import { Activity } from '@/activities/types/Activity';
+import { ActivityTarget } from '@/activities/types/ActivityTarget';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useDeleteRecordFromCache } from '@/object-record/cache/hooks/useDeleteRecordFromCache';
 import { useDeleteManyRecords } from '@/object-record/hooks/useDeleteManyRecords';
 import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import { getChildRelationArray } from '@/object-record/utils/getChildRelationArray';
 import { mapToRecordId } from '@/object-record/utils/mapToObjectId';
-import { IconPlus, IconTrash } from '@/ui/display/icon';
 import { IconButton } from '@/ui/input/button/components/IconButton';
 import { isRightDrawerOpenState } from '@/ui/layout/right-drawer/states/isRightDrawerOpenState';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 const StyledButtonContainer = styled.div`
   display: inline-flex;
@@ -56,7 +51,12 @@ export const ActivityActionBar = () => {
   const [temporaryActivityForEditor, setTemporaryActivityForEditor] =
     useRecoilState(temporaryActivityForEditorState);
 
-  const { deleteActivityFromCache } = useDeleteActivityFromCache();
+  const deleteActivityFromCache = useDeleteRecordFromCache({
+    objectNameSingular: CoreObjectNameSingular.Activity,
+  });
+  const deleteActivityTargetFromCache = useDeleteRecordFromCache({
+    objectNameSingular: CoreObjectNameSingular.ActivityTarget,
+  });
 
   const [isActivityInCreateMode] = useRecoilState(isActivityInCreateModeState);
   const [isUpsertingActivityInDB] = useRecoilState(
@@ -67,27 +67,10 @@ export const ActivityActionBar = () => {
     objectShowPageTargetableObjectState,
   );
 
-  const openCreateActivity = useOpenCreateActivityDrawer();
-
-  const currentCompletedTaskQueryVariables = useRecoilValue(
-    currentCompletedTaskQueryVariablesState,
-  );
-
-  const currentIncompleteTaskQueryVariables = useRecoilValue(
-    currentIncompleteTaskQueryVariablesState,
-  );
+  const { refreshShowPageFindManyActivitiesQueries } =
+    useRefreshShowPageFindManyActivitiesQueries();
 
-  const currentNotesQueryVariables = useRecoilValue(
-    currentNotesQueryVariablesState,
-  );
-
-  const { pathname } = useLocation();
-  const { removeFromActivitiesQueries } = useRemoveFromActivitiesQueries();
-  const { removeFromActivityTargetsQueries } =
-    useRemoveFromActivityTargetsQueries();
-
-  const weAreOnObjectShowPage = pathname.startsWith('/object');
-  const weAreOnTaskPage = pathname.startsWith('/tasks');
+  const openCreateActivity = useOpenCreateActivityDrawer();
 
   const deleteActivity = useRecoilCallback(
     ({ snapshot }) =>
@@ -108,112 +91,46 @@ export const ActivityActionBar = () => {
 
         setIsRightDrawerOpen(false);
 
-        if (viewableActivityId) {
-          if (
-            isActivityInCreateMode &&
-            isNonNullable(temporaryActivityForEditor)
-          ) {
-            deleteActivityFromCache(temporaryActivityForEditor);
-            setTemporaryActivityForEditor(null);
-          } else {
-            if (activityIdInDrawer) {
-              const activityTargetIdsToDelete: string[] =
-                activityTargets.map(mapToRecordId) ?? [];
-
-              if (weAreOnTaskPage) {
-                removeFromActivitiesQueries({
-                  activityIdToRemove: viewableActivityId,
-                  targetableObjects: [],
-                  activitiesFilters: currentCompletedTaskQueryVariables?.filter,
-                  activitiesOrderByVariables:
-                    currentCompletedTaskQueryVariables?.orderBy,
-                });
-
-                removeFromActivitiesQueries({
-                  activityIdToRemove: viewableActivityId,
-                  targetableObjects: [],
-                  activitiesFilters:
-                    currentIncompleteTaskQueryVariables?.filter,
-                  activitiesOrderByVariables:
-                    currentIncompleteTaskQueryVariables?.orderBy,
-                });
-              } else if (
-                weAreOnObjectShowPage &&
-                isNonNullable(objectShowPageTargetableObject)
-              ) {
-                removeFromActivitiesQueries({
-                  activityIdToRemove: viewableActivityId,
-                  targetableObjects: [objectShowPageTargetableObject],
-                  activitiesFilters: {},
-                  activitiesOrderByVariables:
-                    FIND_MANY_TIMELINE_ACTIVITIES_ORDER_BY,
-                });
-
-                if (isNonNullable(currentCompletedTaskQueryVariables)) {
-                  removeFromActivitiesQueries({
-                    activityIdToRemove: viewableActivityId,
-                    targetableObjects: [objectShowPageTargetableObject],
-                    activitiesFilters:
-                      currentCompletedTaskQueryVariables?.filter,
-                    activitiesOrderByVariables:
-                      currentCompletedTaskQueryVariables?.orderBy,
-                  });
-                }
+        if (!isNonEmptyString(viewableActivityId)) {
+          return;
+        }
 
-                if (isNonNullable(currentIncompleteTaskQueryVariables)) {
-                  removeFromActivitiesQueries({
-                    activityIdToRemove: viewableActivityId,
-                    targetableObjects: [objectShowPageTargetableObject],
-                    activitiesFilters:
-                      currentIncompleteTaskQueryVariables?.filter,
-                    activitiesOrderByVariables:
-                      currentIncompleteTaskQueryVariables?.orderBy,
-                  });
-                }
+        if (isActivityInCreateMode && isDefined(temporaryActivityForEditor)) {
+          deleteActivityFromCache(temporaryActivityForEditor);
+          setTemporaryActivityForEditor(null);
+          return;
+        }
 
-                if (isNonNullable(currentNotesQueryVariables)) {
-                  removeFromActivitiesQueries({
-                    activityIdToRemove: viewableActivityId,
-                    targetableObjects: [objectShowPageTargetableObject],
-                    activitiesFilters: currentNotesQueryVariables?.filter,
-                    activitiesOrderByVariables:
-                      currentNotesQueryVariables?.orderBy,
-                  });
-                }
+        if (isNonEmptyString(activityIdInDrawer)) {
+          const activityTargetIdsToDelete: string[] =
+            activityTargets.map(mapToRecordId) ?? [];
 
-                removeFromActivityTargetsQueries({
-                  activityTargetsToRemove: activity?.activityTargets ?? [],
-                  targetableObjects: [objectShowPageTargetableObject],
-                });
-              }
+          deleteActivityFromCache(activity);
+          activityTargets.forEach((activityTarget: ActivityTarget) => {
+            deleteActivityTargetFromCache(activityTarget);
+          });
 
-              if (isNonEmptyArray(activityTargetIdsToDelete)) {
-                await deleteManyActivityTargets(activityTargetIdsToDelete);
-              }
+          refreshShowPageFindManyActivitiesQueries();
 
-              await deleteOneActivity?.(viewableActivityId);
-            }
+          if (isNonEmptyArray(activityTargetIdsToDelete)) {
+            await deleteManyActivityTargets(activityTargetIdsToDelete);
           }
+
+          await deleteOneActivity?.(viewableActivityId);
         }
       },
     [
       activityIdInDrawer,
-      currentCompletedTaskQueryVariables,
-      currentIncompleteTaskQueryVariables,
-      currentNotesQueryVariables,
-      deleteActivityFromCache,
-      deleteManyActivityTargets,
-      deleteOneActivity,
+      setIsRightDrawerOpen,
+      viewableActivityId,
       isActivityInCreateMode,
-      objectShowPageTargetableObject,
-      removeFromActivitiesQueries,
-      removeFromActivityTargetsQueries,
-      setTemporaryActivityForEditor,
       temporaryActivityForEditor,
-      viewableActivityId,
-      weAreOnObjectShowPage,
-      weAreOnTaskPage,
-      setIsRightDrawerOpen,
+      deleteActivityFromCache,
+      setTemporaryActivityForEditor,
+      refreshShowPageFindManyActivitiesQueries,
+      deleteOneActivity,
+      deleteActivityTargetFromCache,
+      deleteManyActivityTargets,
     ],
   );
 
@@ -223,10 +140,10 @@ export const ActivityActionBar = () => {
 
   const addActivity = () => {
     setIsRightDrawerOpen(false);
-    if (record && objectShowPageTargetableObject) {
+    if (isDefined(record) && isDefined(objectShowPageTargetableObject)) {
       openCreateActivity({
-        type: record.type,
-        customAssignee: record.assignee,
+        type: record?.type,
+        customAssignee: record?.assignee,
         targetableObjects: activityTargetableEntityArray,
       });
     }
diff --git a/packages/twenty-front/src/modules/activities/right-drawer/components/RightDrawerActivityTopBar.tsx b/packages/twenty-front/src/modules/activities/right-drawer/components/RightDrawerActivityTopBar.tsx
index 628fc3893d8f..2e3c35fe4cf2 100644
--- a/packages/twenty-front/src/modules/activities/right-drawer/components/RightDrawerActivityTopBar.tsx
+++ b/packages/twenty-front/src/modules/activities/right-drawer/components/RightDrawerActivityTopBar.tsx
@@ -1,17 +1,20 @@
 import styled from '@emotion/styled';
 
 import { ActivityActionBar } from '@/activities/right-drawer/components/ActivityActionBar';
+import { RightDrawerTopBarCloseButton } from '@/ui/layout/right-drawer/components/RightDrawerTopBarCloseButton';
+import { RightDrawerTopBarExpandButton } from '@/ui/layout/right-drawer/components/RightDrawerTopBarExpandButton';
 import { StyledRightDrawerTopBar } from '@/ui/layout/right-drawer/components/StyledRightDrawerTopBar';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 
-import { RightDrawerTopBarCloseButton } from '../../../ui/layout/right-drawer/components/RightDrawerTopBarCloseButton';
-import { RightDrawerTopBarExpandButton } from '../../../ui/layout/right-drawer/components/RightDrawerTopBarExpandButton';
+type RightDrawerActivityTopBarProps = { showActionBar?: boolean };
 
 const StyledTopBarWrapper = styled.div`
   display: flex;
 `;
 
-export const RightDrawerActivityTopBar = () => {
+export const RightDrawerActivityTopBar = ({
+  showActionBar = true,
+}: RightDrawerActivityTopBarProps) => {
   const isMobile = useIsMobile();
 
   return (
@@ -20,7 +23,7 @@ export const RightDrawerActivityTopBar = () => {
         <RightDrawerTopBarCloseButton />
         {!isMobile && <RightDrawerTopBarExpandButton />}
       </StyledTopBarWrapper>
-      <ActivityActionBar />
+      {showActionBar && <ActivityActionBar />}
     </StyledRightDrawerTopBar>
   );
 };
diff --git a/packages/twenty-front/src/modules/activities/states/activityBodyFamilyState.ts b/packages/twenty-front/src/modules/activities/states/activityBodyFamilyState.ts
index 452dc0220182..b9d5579573a7 100644
--- a/packages/twenty-front/src/modules/activities/states/activityBodyFamilyState.ts
+++ b/packages/twenty-front/src/modules/activities/states/activityBodyFamilyState.ts
@@ -1,9 +1,9 @@
-import { atomFamily } from 'recoil';
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
 
-export const activityBodyFamilyState = atomFamily<
+export const activityBodyFamilyState = createFamilyState<
   string,
   { activityId: string }
 >({
   key: 'activityBodyFamilyState',
-  default: '',
+  defaultValue: '',
 });
diff --git a/packages/twenty-front/src/modules/activities/states/activityIdInDrawerState.ts b/packages/twenty-front/src/modules/activities/states/activityIdInDrawerState.ts
index 7bc9362fc225..8c2e46d9eb19 100644
--- a/packages/twenty-front/src/modules/activities/states/activityIdInDrawerState.ts
+++ b/packages/twenty-front/src/modules/activities/states/activityIdInDrawerState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const activityIdInDrawerState = atom<string | null>({
+export const activityIdInDrawerState = createState<string | null>({
   key: 'activityIdInDrawerState',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/activities/states/activityTargetableEntityArrayState.ts b/packages/twenty-front/src/modules/activities/states/activityTargetableEntityArrayState.ts
index c3a06d48f821..0d6e06ab4683 100644
--- a/packages/twenty-front/src/modules/activities/states/activityTargetableEntityArrayState.ts
+++ b/packages/twenty-front/src/modules/activities/states/activityTargetableEntityArrayState.ts
@@ -1,10 +1,10 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { ActivityTargetableObject } from '../types/ActivityTargetableEntity';
 
-export const activityTargetableEntityArrayState = atom<
+export const activityTargetableEntityArrayState = createState<
   ActivityTargetableObject[]
 >({
   key: 'activities/targetable-entity-array',
-  default: [],
+  defaultValue: [],
 });
diff --git a/packages/twenty-front/src/modules/activities/states/activityTitleFamilyState.ts b/packages/twenty-front/src/modules/activities/states/activityTitleFamilyState.ts
index 6196bae01d03..5a02e57fcb75 100644
--- a/packages/twenty-front/src/modules/activities/states/activityTitleFamilyState.ts
+++ b/packages/twenty-front/src/modules/activities/states/activityTitleFamilyState.ts
@@ -1,9 +1,9 @@
-import { atomFamily } from 'recoil';
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
 
-export const activityTitleFamilyState = atomFamily<
+export const activityTitleFamilyState = createFamilyState<
   string,
   { activityId: string }
 >({
   key: 'activityTitleFamilyState',
-  default: '',
+  defaultValue: '',
 });
diff --git a/packages/twenty-front/src/modules/activities/states/activityTitleHasBeenSetFamilyState.ts b/packages/twenty-front/src/modules/activities/states/activityTitleHasBeenSetFamilyState.ts
index 096df500dd5e..f47e13f84c43 100644
--- a/packages/twenty-front/src/modules/activities/states/activityTitleHasBeenSetFamilyState.ts
+++ b/packages/twenty-front/src/modules/activities/states/activityTitleHasBeenSetFamilyState.ts
@@ -1,9 +1,9 @@
-import { atomFamily } from 'recoil';
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
 
-export const activityTitleHasBeenSetFamilyState = atomFamily<
+export const activityTitleHasBeenSetFamilyState = createFamilyState<
   boolean,
   { activityId: string }
 >({
   key: 'activityTitleHasBeenSetFamilyState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/activities/states/canCreateActivityState.ts b/packages/twenty-front/src/modules/activities/states/canCreateActivityState.ts
index 6d10623714ae..5da7f60e1c66 100644
--- a/packages/twenty-front/src/modules/activities/states/canCreateActivityState.ts
+++ b/packages/twenty-front/src/modules/activities/states/canCreateActivityState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const canCreateActivityState = atom<boolean>({
+export const canCreateActivityState = createState<boolean>({
   key: 'canCreateActivityState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/activities/states/isActivityInCreateModeState.ts b/packages/twenty-front/src/modules/activities/states/isActivityInCreateModeState.ts
index d0f32a48374f..61aaf33d36db 100644
--- a/packages/twenty-front/src/modules/activities/states/isActivityInCreateModeState.ts
+++ b/packages/twenty-front/src/modules/activities/states/isActivityInCreateModeState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const isActivityInCreateModeState = atom<boolean>({
+export const isActivityInCreateModeState = createState<boolean>({
   key: 'isActivityInCreateModeState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/activities/states/isCreatingActivityInDBState.ts b/packages/twenty-front/src/modules/activities/states/isCreatingActivityInDBState.ts
index 315b623bb24f..278b2430c172 100644
--- a/packages/twenty-front/src/modules/activities/states/isCreatingActivityInDBState.ts
+++ b/packages/twenty-front/src/modules/activities/states/isCreatingActivityInDBState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const isUpsertingActivityInDBState = atom<boolean>({
+export const isUpsertingActivityInDBState = createState<boolean>({
   key: 'isUpsertingActivityInDBState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/activities/states/targetableObjectsInDrawerState.ts b/packages/twenty-front/src/modules/activities/states/targetableObjectsInDrawerState.ts
index 553c7511088d..61d7ee87b246 100644
--- a/packages/twenty-front/src/modules/activities/states/targetableObjectsInDrawerState.ts
+++ b/packages/twenty-front/src/modules/activities/states/targetableObjectsInDrawerState.ts
@@ -1,8 +1,10 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
 
-export const targetableObjectsInDrawerState = atom<ActivityTargetableObject[]>({
+export const targetableObjectsInDrawerState = createState<
+  ActivityTargetableObject[]
+>({
   key: 'targetableObjectsInDrawerState',
-  default: [],
+  defaultValue: [],
 });
diff --git a/packages/twenty-front/src/modules/activities/states/temporaryActivityForEditorState.ts b/packages/twenty-front/src/modules/activities/states/temporaryActivityForEditorState.ts
index 5b657a369885..b92ba320e920 100644
--- a/packages/twenty-front/src/modules/activities/states/temporaryActivityForEditorState.ts
+++ b/packages/twenty-front/src/modules/activities/states/temporaryActivityForEditorState.ts
@@ -1,8 +1,9 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { ActivityForEditor } from '@/activities/types/ActivityForEditor';
 
-export const temporaryActivityForEditorState = atom<ActivityForEditor | null>({
-  key: 'temporaryActivityForEditorState',
-  default: null,
-});
+export const temporaryActivityForEditorState =
+  createState<ActivityForEditor | null>({
+    key: 'temporaryActivityForEditorState',
+    defaultValue: null,
+  });
diff --git a/packages/twenty-front/src/modules/activities/states/viewableActivityIdState.ts b/packages/twenty-front/src/modules/activities/states/viewableActivityIdState.ts
index 95cfc1712bff..393a2f96aaa5 100644
--- a/packages/twenty-front/src/modules/activities/states/viewableActivityIdState.ts
+++ b/packages/twenty-front/src/modules/activities/states/viewableActivityIdState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const viewableActivityIdState = atom<string | null>({
+export const viewableActivityIdState = createState<string | null>({
   key: 'activities/viewable-activity-id',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/activities/table/components/CommentChip.tsx b/packages/twenty-front/src/modules/activities/table/components/CommentChip.tsx
index 2c64c650d810..66b30d107843 100644
--- a/packages/twenty-front/src/modules/activities/table/components/CommentChip.tsx
+++ b/packages/twenty-front/src/modules/activities/table/components/CommentChip.tsx
@@ -1,7 +1,6 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-
-import { IconComment } from '@/ui/display/icon';
+import { IconComment } from 'twenty-ui';
 
 export type CommentChipProps = {
   count: number;
diff --git a/packages/twenty-front/src/modules/activities/tasks/components/AddTaskButton.tsx b/packages/twenty-front/src/modules/activities/tasks/components/AddTaskButton.tsx
index 3c02ddb290b0..8dfacead3ca6 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/AddTaskButton.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/AddTaskButton.tsx
@@ -1,8 +1,8 @@
 import { isNonEmptyArray } from '@sniptt/guards';
+import { IconPlus } from 'twenty-ui';
 
 import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { IconPlus } from '@/ui/display/icon';
 import { Button } from '@/ui/input/button/components/Button';
 
 export const AddTaskButton = ({
diff --git a/packages/twenty-front/src/modules/activities/tasks/components/CurrentUserDueTaskCountEffect.tsx b/packages/twenty-front/src/modules/activities/tasks/components/CurrentUserDueTaskCountEffect.tsx
index f725249b40ac..802e03bb6b9d 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/CurrentUserDueTaskCountEffect.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/CurrentUserDueTaskCountEffect.tsx
@@ -3,6 +3,7 @@ import { DateTime } from 'luxon';
 import { useRecoilState, useRecoilValue } from 'recoil';
 
 import { currentUserDueTaskCountState } from '@/activities/tasks/states/currentUserTaskCountState';
+import { Activity } from '@/activities/types/Activity';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
@@ -15,8 +16,9 @@ export const CurrentUserDueTaskCountEffect = () => {
     currentUserDueTaskCountState,
   );
 
-  const { records: tasks } = useFindManyRecords({
+  const { records: tasks } = useFindManyRecords<Activity>({
     objectNameSingular: CoreObjectNameSingular.Activity,
+    depth: 0,
     filter: {
       type: { eq: 'Task' },
       completedAt: { is: 'NULL' },
diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskGroups.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskGroups.tsx
index bdc9b1c17049..4a52b3969204 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/TaskGroups.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskGroups.tsx
@@ -1,11 +1,11 @@
 import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
+import { IconPlus } from 'twenty-ui';
 
 import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
 import { TASKS_TAB_LIST_COMPONENT_ID } from '@/activities/tasks/constants/TasksTabListComponentId';
 import { useTasks } from '@/activities/tasks/hooks/useTasks';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { IconPlus } from '@/ui/display/icon';
 import { Button } from '@/ui/input/button/components/Button';
 import AnimatedPlaceholder from '@/ui/layout/animated-placeholder/components/AnimatedPlaceholder';
 import {
@@ -48,8 +48,8 @@ export const TaskGroups = ({
 
   const openCreateActivity = useOpenCreateActivityDrawer();
 
-  const { getActiveTabIdState } = useTabList(TASKS_TAB_LIST_COMPONENT_ID);
-  const activeTabId = useRecoilValue(getActiveTabIdState());
+  const { activeTabIdState } = useTabList(TASKS_TAB_LIST_COMPONENT_ID);
+  const activeTabId = useRecoilValue(activeTabIdState);
 
   if (!initialized) {
     return <></>;
diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
index b5e1501a190f..e8655637adc8 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
@@ -1,12 +1,12 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconCalendar, IconComment } from 'twenty-ui';
 
 import { ActivityTargetChips } from '@/activities/components/ActivityTargetChips';
 import { useActivityTargetObjectRecords } from '@/activities/hooks/useActivityTargetObjectRecords';
 import { useOpenActivityRightDrawer } from '@/activities/hooks/useOpenActivityRightDrawer';
 import { Activity } from '@/activities/types/Activity';
 import { getActivitySummary } from '@/activities/utils/getActivitySummary';
-import { IconCalendar, IconComment } from '@/ui/display/icon';
 import { OverflowingTextWithTooltip } from '@/ui/display/tooltip/OverflowingTextWithTooltip';
 import { Checkbox, CheckboxShape } from '@/ui/input/components/Checkbox';
 import { beautifyExactDate, hasDatePassed } from '~/utils/date-utils';
@@ -78,9 +78,7 @@ export const TaskRow = ({ task }: { task: Activity }) => {
   const body = getActivitySummary(task.body);
   const { completeTask } = useCompleteTask(task);
 
-  const { activityTargetObjectRecords } = useActivityTargetObjectRecords({
-    activityId: task.id,
-  });
+  const { activityTargetObjectRecords } = useActivityTargetObjectRecords(task);
 
   return (
     <StyledContainer
diff --git a/packages/twenty-front/src/modules/activities/tasks/hooks/__tests__/useCompleteTask.test.tsx b/packages/twenty-front/src/modules/activities/tasks/hooks/__tests__/useCompleteTask.test.tsx
new file mode 100644
index 000000000000..2302794caeab
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/tasks/hooks/__tests__/useCompleteTask.test.tsx
@@ -0,0 +1,85 @@
+import { ReactNode } from 'react';
+import { MockedProvider, MockedResponse } from '@apollo/client/testing';
+import { act, renderHook } from '@testing-library/react';
+import gql from 'graphql-tag';
+import { RecoilRoot } from 'recoil';
+
+import { useCompleteTask } from '@/activities/tasks/hooks/useCompleteTask';
+
+const task = { id: '123', completedAt: '2024-03-15T07:33:14.212Z' };
+
+const mockedDate = task.completedAt;
+const toISOStringMock = jest.fn(() => mockedDate);
+global.Date.prototype.toISOString = toISOStringMock;
+
+const mocks: MockedResponse[] = [
+  {
+    request: {
+      query: gql`
+        mutation UpdateOneActivity(
+          $idToUpdate: UUID!
+          $input: ActivityUpdateInput!
+        ) {
+          updateActivity(id: $idToUpdate, data: $input) {
+            __typename
+            createdAt
+            reminderAt
+            authorId
+            title
+            completedAt
+            updatedAt
+            body
+            dueAt
+            type
+            id
+            assigneeId
+          }
+        }
+      `,
+      variables: {
+        idToUpdate: task.id,
+        input: { completedAt: task.completedAt },
+      },
+    },
+    result: jest.fn(() => ({
+      data: {
+        updateActivity: {
+          __typename: 'Activity',
+          createdAt: '2024-03-15T07:33:14.212Z',
+          reminderAt: null,
+          authorId: '123',
+          title: 'Test',
+          completedAt: '2024-03-15T07:33:14.212Z',
+          updatedAt: '2024-03-15T07:33:14.212Z',
+          body: 'Test',
+          dueAt: '2024-03-15T07:33:14.212Z',
+          type: 'Task',
+          id: '123',
+          assigneeId: '123',
+        },
+      },
+    })),
+  },
+];
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>
+    <MockedProvider mocks={mocks} addTypename={false}>
+      {children}
+    </MockedProvider>
+  </RecoilRoot>
+);
+
+describe('useCompleteTask', () => {
+  it('should complete task', async () => {
+    const { result } = renderHook(() => useCompleteTask(task), {
+      wrapper: Wrapper,
+    });
+
+    await act(async () => {
+      await result.current.completeTask(true);
+    });
+
+    expect(mocks[0].result).toHaveBeenCalled();
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/tasks/hooks/__tests__/useCurrentUserTaskCount.test.tsx b/packages/twenty-front/src/modules/activities/tasks/hooks/__tests__/useCurrentUserTaskCount.test.tsx
new file mode 100644
index 000000000000..7d035958c4e4
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/tasks/hooks/__tests__/useCurrentUserTaskCount.test.tsx
@@ -0,0 +1,31 @@
+import { ReactNode } from 'react';
+import { renderHook } from '@testing-library/react';
+import { RecoilRoot } from 'recoil';
+
+import { useCurrentUserTaskCount } from '@/activities/tasks/hooks/useCurrentUserDueTaskCount';
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+import { mockedActivities } from '~/testing/mock-data/activities';
+
+const useFindManyRecordsMock = jest.fn(() => ({
+  records: [...mockedActivities, { id: '2' }],
+}));
+
+jest.mock('@/object-record/hooks/useFindManyRecords', () => ({
+  useFindManyRecords: jest.fn(),
+}));
+
+(useFindManyRecords as jest.Mock).mockImplementation(useFindManyRecordsMock);
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>{children}</RecoilRoot>
+);
+
+describe('useCurrentUserTaskCount', () => {
+  it('should return the current user task count', async () => {
+    const { result } = renderHook(() => useCurrentUserTaskCount(), {
+      wrapper: Wrapper,
+    });
+
+    expect(result.current.currentUserDueTaskCount).toBe(1);
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/tasks/hooks/__tests__/useTasks.test.tsx b/packages/twenty-front/src/modules/activities/tasks/hooks/__tests__/useTasks.test.tsx
new file mode 100644
index 000000000000..c7171a76ae0c
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/tasks/hooks/__tests__/useTasks.test.tsx
@@ -0,0 +1,85 @@
+import { ReactNode } from 'react';
+import { renderHook } from '@testing-library/react';
+import { RecoilRoot } from 'recoil';
+
+import { useActivities } from '@/activities/hooks/useActivities';
+import { useTasks } from '@/activities/tasks/hooks/useTasks';
+import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
+
+const completedTasks = [
+  {
+    id: '1',
+    completedAt: '2024-03-15T07:33:14.212Z',
+  },
+  {
+    id: '2',
+    completedAt: '2024-03-15T07:33:14.212Z',
+  },
+  {
+    id: '3',
+    completedAt: '2024-03-15T07:33:14.212Z',
+  },
+];
+
+const unscheduledTasks = [
+  {
+    id: '4',
+  },
+];
+
+const todayOrPreviousTasks = [
+  {
+    id: '5',
+    dueAt: '2024-03-15T07:33:14.212Z',
+  },
+  {
+    id: '6',
+    dueAt: '2024-03-15T07:33:14.212Z',
+  },
+];
+
+const useActivitiesMock = jest.fn(
+  ({
+    activitiesFilters,
+  }: {
+    activitiesFilters: { completedAt: { is: 'NULL' | 'NOT_NULL' } };
+  }) => {
+    const isCompletedFilter = activitiesFilters.completedAt.is === 'NOT_NULL';
+    return {
+      activities: isCompletedFilter
+        ? completedTasks
+        : [...todayOrPreviousTasks, ...unscheduledTasks],
+      initialized: true,
+    };
+  },
+);
+
+jest.mock('@/activities/hooks/useActivities', () => ({
+  useActivities: jest.fn(),
+}));
+
+(useActivities as jest.Mock).mockImplementation(useActivitiesMock);
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>
+    <ObjectFilterDropdownScope filterScopeId="entity-tasks-filter-scope">
+      {children}
+    </ObjectFilterDropdownScope>
+  </RecoilRoot>
+);
+
+describe('useTasks', () => {
+  it("should return a user's tasks", () => {
+    const { result } = renderHook(() => useTasks({ targetableObjects: [] }), {
+      wrapper: Wrapper,
+    });
+
+    expect(result.current).toEqual({
+      todayOrPreviousTasks,
+      upcomingTasks: [],
+      unscheduledTasks,
+      completedTasks,
+      initialized: true,
+    });
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/tasks/hooks/useTasks.ts b/packages/twenty-front/src/modules/activities/tasks/hooks/useTasks.ts
index b4d7b0179f00..0adbe01f18b3 100644
--- a/packages/twenty-front/src/modules/activities/tasks/hooks/useTasks.ts
+++ b/packages/twenty-front/src/modules/activities/tasks/hooks/useTasks.ts
@@ -1,7 +1,7 @@
 import { useEffect, useMemo } from 'react';
 import { isNonEmptyArray } from '@sniptt/guards';
 import { DateTime } from 'luxon';
-import { useRecoilState } from 'recoil';
+import { useRecoilState, useRecoilValue } from 'recoil';
 
 import { useActivities } from '@/activities/hooks/useActivities';
 import { currentCompletedTaskQueryVariablesState } from '@/activities/tasks/states/currentCompletedTaskQueryVariablesState';
@@ -23,10 +23,12 @@ export const useTasks = ({
   targetableObjects,
   filterDropdownId,
 }: UseTasksProps) => {
-  const { selectedFilter } = useFilterDropdown({
+  const { selectedFilterState } = useFilterDropdown({
     filterDropdownId,
   });
 
+  const selectedFilter = useRecoilValue(selectedFilterState);
+
   const assigneeIdFilter = useMemo(
     () =>
       selectedFilter
diff --git a/packages/twenty-front/src/modules/activities/tasks/states/currentUserTaskCountState.ts b/packages/twenty-front/src/modules/activities/tasks/states/currentUserTaskCountState.ts
index 4c7653ddfe67..aa0aa58e5b7a 100644
--- a/packages/twenty-front/src/modules/activities/tasks/states/currentUserTaskCountState.ts
+++ b/packages/twenty-front/src/modules/activities/tasks/states/currentUserTaskCountState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const currentUserDueTaskCountState = atom<number>({
-  default: 0,
+export const currentUserDueTaskCountState = createState<number>({
+  defaultValue: 0,
   key: 'currentUserDueTaskCountState',
 });
diff --git a/packages/twenty-front/src/modules/activities/timeline/components/TimelineActivity.tsx b/packages/twenty-front/src/modules/activities/timeline/components/TimelineActivity.tsx
index 3574022c4b69..5ff634826d4f 100644
--- a/packages/twenty-front/src/modules/activities/timeline/components/TimelineActivity.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline/components/TimelineActivity.tsx
@@ -2,11 +2,11 @@ import { Tooltip } from 'react-tooltip';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
+import { IconCheckbox, IconNotes } from 'twenty-ui';
 
 import { useOpenActivityRightDrawer } from '@/activities/hooks/useOpenActivityRightDrawer';
-import { timelineActivityWithoutTargetsFamilyState } from '@/activities/timeline/states/timelineActivityFirstLevelFamilySelector';
+import { timelineActivityWithoutTargetsFamilyState } from '@/activities/timeline/states/timelineActivityWithoutTargetsFamilyState';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
-import { IconCheckbox, IconNotes } from '@/ui/display/icon';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import { Avatar } from '@/users/components/Avatar';
 import {
diff --git a/packages/twenty-front/src/modules/activities/timeline/components/TimelineCreateButtonGroup.tsx b/packages/twenty-front/src/modules/activities/timeline/components/TimelineCreateButtonGroup.tsx
index b8542cd19fee..21c0c5713014 100644
--- a/packages/twenty-front/src/modules/activities/timeline/components/TimelineCreateButtonGroup.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline/components/TimelineCreateButtonGroup.tsx
@@ -1,13 +1,10 @@
 import { useSetRecoilState } from 'recoil';
-import { Button, ButtonGroup } from 'tsup.ui.index';
+import { IconCheckbox, IconNotes, IconPaperclip } from 'twenty-ui';
 
 import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import {
-  IconCheckbox,
-  IconNotes,
-  IconPaperclip,
-} from '@/ui/display/icon/index';
+import { Button } from '@/ui/input/button/components/Button';
+import { ButtonGroup } from '@/ui/input/button/components/ButtonGroup';
 import { TAB_LIST_COMPONENT_ID } from '@/ui/layout/show-page/components/ShowPageRightContainer';
 import { useTabList } from '@/ui/layout/tab/hooks/useTabList';
 
@@ -16,8 +13,8 @@ export const TimelineCreateButtonGroup = ({
 }: {
   targetableObject: ActivityTargetableObject;
 }) => {
-  const { getActiveTabIdState } = useTabList(TAB_LIST_COMPONENT_ID);
-  const setActiveTabId = useSetRecoilState(getActiveTabIdState());
+  const { activeTabIdState } = useTabList(TAB_LIST_COMPONENT_ID);
+  const setActiveTabId = useSetRecoilState(activeTabIdState);
 
   const openCreateActivity = useOpenCreateActivityDrawer();
 
diff --git a/packages/twenty-front/src/modules/activities/timeline/components/TimelineQueryEffect.tsx b/packages/twenty-front/src/modules/activities/timeline/components/TimelineQueryEffect.tsx
index 2f548e80a4c9..26a2b781b791 100644
--- a/packages/twenty-front/src/modules/activities/timeline/components/TimelineQueryEffect.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline/components/TimelineQueryEffect.tsx
@@ -7,12 +7,12 @@ import { objectShowPageTargetableObjectState } from '@/activities/timeline/state
 import { timelineActivitiesFammilyState } from '@/activities/timeline/states/timelineActivitiesFamilyState';
 import { timelineActivitiesForGroupState } from '@/activities/timeline/states/timelineActivitiesForGroupState';
 import { timelineActivitiesNetworkingState } from '@/activities/timeline/states/timelineActivitiesNetworkingState';
-import { timelineActivityWithoutTargetsFamilyState } from '@/activities/timeline/states/timelineActivityFirstLevelFamilySelector';
+import { timelineActivityWithoutTargetsFamilyState } from '@/activities/timeline/states/timelineActivityWithoutTargetsFamilyState';
 import { Activity } from '@/activities/types/Activity';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
 import { sortObjectRecordByDateField } from '@/object-record/utils/sortObjectRecordByDateField';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const TimelineQueryEffect = ({
   targetableObject,
@@ -31,7 +31,7 @@ export const TimelineQueryEffect = ({
     targetableObjects: [targetableObject],
     activitiesFilters: {},
     activitiesOrderByVariables: FIND_MANY_TIMELINE_ACTIVITIES_ORDER_BY,
-    skip: !isNonNullable(targetableObject),
+    skip: !isDefined(targetableObject),
   });
 
   const [timelineActivitiesNetworking, setTimelineActivitiesNetworking] =
@@ -41,7 +41,7 @@ export const TimelineQueryEffect = ({
     useRecoilState(timelineActivitiesForGroupState);
 
   useEffect(() => {
-    if (!isNonNullable(targetableObject)) {
+    if (!isDefined(targetableObject)) {
       return;
     }
 
diff --git a/packages/twenty-front/src/modules/activities/timeline/hooks/__tests__/useTimelineActivities.test.tsx b/packages/twenty-front/src/modules/activities/timeline/hooks/__tests__/useTimelineActivities.test.tsx
new file mode 100644
index 000000000000..59f931b041c5
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline/hooks/__tests__/useTimelineActivities.test.tsx
@@ -0,0 +1,38 @@
+import { ReactNode } from 'react';
+import { MockedProvider } from '@apollo/client/testing';
+import { renderHook } from '@testing-library/react';
+import { RecoilRoot } from 'recoil';
+
+import { useTimelineActivities } from '@/activities/timeline/hooks/useTimelineActivities';
+import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>
+    <MockedProvider addTypename={false}>
+      <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
+        {children}
+      </SnackBarProviderScope>
+    </MockedProvider>
+  </RecoilRoot>
+);
+
+// FIXME: The hook is re-rendering so many times that it's causing a maximum
+// update depth exceeded error. We need to fix this before we can write a proper test.
+describe('useTimelineActivities', () => {
+  it('works as expected', () => {
+    try {
+      renderHook(
+        () =>
+          useTimelineActivities({
+            targetableObject: {
+              id: '123',
+              targetObjectNameSingular: 'person',
+            },
+          }),
+        { wrapper: Wrapper },
+      );
+    } catch (e) {
+      expect((e as Error).message).toMatch(/^Maximum update depth exceeded/);
+    }
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/timeline/hooks/useInjectIntoTimelineActivitiesQueries.ts b/packages/twenty-front/src/modules/activities/timeline/hooks/useInjectIntoTimelineActivitiesQueries.ts
deleted file mode 100644
index 19539090e062..000000000000
--- a/packages/twenty-front/src/modules/activities/timeline/hooks/useInjectIntoTimelineActivitiesQueries.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { useInjectIntoActivitiesQueries } from '@/activities/hooks/useInjectIntoActivitiesQueries';
-import { Activity } from '@/activities/types/Activity';
-import { ActivityTarget } from '@/activities/types/ActivityTarget';
-import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-
-export const useInjectIntoTimelineActivitiesQueries = () => {
-  const { injectActivitiesQueries } = useInjectIntoActivitiesQueries();
-
-  const injectIntoTimelineActivitiesQueries = ({
-    activityToInject,
-    activityTargetsToInject,
-    timelineTargetableObject,
-  }: {
-    activityToInject: Activity;
-    activityTargetsToInject: ActivityTarget[];
-    timelineTargetableObject: ActivityTargetableObject;
-  }) => {
-    injectActivitiesQueries({
-      activitiesFilters: {},
-      activitiesOrderByVariables: {
-        createdAt: 'DescNullsFirst',
-      },
-      activityTargetsToInject,
-      activityToInject,
-      targetableObjects: [timelineTargetableObject],
-    });
-  };
-
-  return {
-    injectIntoTimelineActivitiesQueries,
-  };
-};
diff --git a/packages/twenty-front/src/modules/activities/timeline/hooks/useTimelineActivities.ts b/packages/twenty-front/src/modules/activities/timeline/hooks/useTimelineActivities.ts
index 8498ed4dac91..f114b3f8d90a 100644
--- a/packages/twenty-front/src/modules/activities/timeline/hooks/useTimelineActivities.ts
+++ b/packages/twenty-front/src/modules/activities/timeline/hooks/useTimelineActivities.ts
@@ -2,32 +2,28 @@ import { useEffect, useState } from 'react';
 import { isNonEmptyArray, isNonEmptyString } from '@sniptt/guards';
 import { useRecoilCallback, useRecoilState } from 'recoil';
 
-import { useActivityConnectionUtils } from '@/activities/hooks/useActivityConnectionUtils';
 import { useActivityTargetsForTargetableObject } from '@/activities/hooks/useActivityTargetsForTargetableObject';
 import { objectShowPageTargetableObjectState } from '@/activities/timeline/states/objectShowPageTargetableObjectIdState';
 import { makeTimelineActivitiesQueryVariables } from '@/activities/timeline/utils/makeTimelineActivitiesQueryVariables';
 import { Activity } from '@/activities/types/Activity';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { getRecordsFromRecordConnection } from '@/object-record/cache/utils/getRecordsFromRecordConnection';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import { sortByAscString } from '~/utils/array/sortByAscString';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const useTimelineActivities = ({
   targetableObject,
 }: {
   targetableObject: ActivityTargetableObject;
 }) => {
-  const { makeActivityWithoutConnection } = useActivityConnectionUtils();
-
   const [, setObjectShowPageTargetableObject] = useRecoilState(
     objectShowPageTargetableObjectState,
   );
 
   useEffect(() => {
-    if (isNonNullable(targetableObject)) {
+    if (isDefined(targetableObject)) {
       setObjectShowPageTargetableObject(targetableObject);
     }
   }, [targetableObject, setObjectShowPageTargetableObject]);
@@ -60,7 +56,7 @@ export const useTimelineActivities = ({
     },
   );
 
-  const { records: activitiesWithConnection, loading: loadingActivities } =
+  const { records: activities, loading: loadingActivities } =
     useFindManyRecords<Activity>({
       skip: loadingActivityTargets || !isNonEmptyArray(activityTargets),
       objectNameSingular: CoreObjectNameSingular.Activity,
@@ -68,15 +64,11 @@ export const useTimelineActivities = ({
       orderBy: timelineActivitiesQueryVariables.orderBy,
       onCompleted: useRecoilCallback(
         ({ set }) =>
-          (data) => {
+          (activities) => {
             if (!initialized) {
               setInitialized(true);
             }
 
-            const activities = getRecordsFromRecordConnection({
-              recordConnection: data,
-            });
-
             for (const activity of activities) {
               set(recordStoreFamilyState(activity.id), activity);
             }
@@ -97,11 +89,6 @@ export const useTimelineActivities = ({
 
   const loading = loadingActivities || loadingActivityTargets;
 
-  const activities = activitiesWithConnection
-    ?.map(makeActivityWithoutConnection as any)
-    .map(({ activity }: any) => activity as any)
-    .filter(isNonNullable);
-
   return {
     activities,
     loading,
diff --git a/packages/twenty-front/src/modules/activities/timeline/states/timelineActivitiesFamilyState.ts b/packages/twenty-front/src/modules/activities/timeline/states/timelineActivitiesFamilyState.ts
index de045ed03963..f2acc7a3312f 100644
--- a/packages/twenty-front/src/modules/activities/timeline/states/timelineActivitiesFamilyState.ts
+++ b/packages/twenty-front/src/modules/activities/timeline/states/timelineActivitiesFamilyState.ts
@@ -1,11 +1,10 @@
-import { atomFamily } from 'recoil';
-
 import { Activity } from '@/activities/types/Activity';
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
 
-export const timelineActivitiesFammilyState = atomFamily<
+export const timelineActivitiesFammilyState = createFamilyState<
   Activity | null,
   string
 >({
   key: 'timelineActivitiesFammilyState',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/activities/timeline/states/timelineActivitiesForGroupState.ts b/packages/twenty-front/src/modules/activities/timeline/states/timelineActivitiesForGroupState.ts
index ddbea64f2135..450dc5bc7ae5 100644
--- a/packages/twenty-front/src/modules/activities/timeline/states/timelineActivitiesForGroupState.ts
+++ b/packages/twenty-front/src/modules/activities/timeline/states/timelineActivitiesForGroupState.ts
@@ -1,10 +1,10 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { ActivityForActivityGroup } from '@/activities/timeline/utils/groupActivitiesByMonth';
 
-export const timelineActivitiesForGroupState = atom<ActivityForActivityGroup[]>(
-  {
-    key: 'timelineActivitiesForGroupState',
-    default: [],
-  },
-);
+export const timelineActivitiesForGroupState = createState<
+  ActivityForActivityGroup[]
+>({
+  key: 'timelineActivitiesForGroupState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/activities/timeline/states/timelineActivitiesNetworkingState.ts b/packages/twenty-front/src/modules/activities/timeline/states/timelineActivitiesNetworkingState.ts
index e3ca7a837680..24b4ecd6ec1a 100644
--- a/packages/twenty-front/src/modules/activities/timeline/states/timelineActivitiesNetworkingState.ts
+++ b/packages/twenty-front/src/modules/activities/timeline/states/timelineActivitiesNetworkingState.ts
@@ -1,11 +1,11 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const timelineActivitiesNetworkingState = atom<{
+export const timelineActivitiesNetworkingState = createState<{
   initialized: boolean;
   noActivities: boolean;
 }>({
   key: 'timelineActivitiesNetworkingState',
-  default: {
+  defaultValue: {
     initialized: false,
     noActivities: false,
   },
diff --git a/packages/twenty-front/src/modules/activities/timeline/states/timelineActivityFirstLevelFamilySelector.ts b/packages/twenty-front/src/modules/activities/timeline/states/timelineActivityFirstLevelFamilySelector.ts
deleted file mode 100644
index 767bb5e8f2b9..000000000000
--- a/packages/twenty-front/src/modules/activities/timeline/states/timelineActivityFirstLevelFamilySelector.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { atomFamily } from 'recoil';
-
-import { Activity } from '@/activities/types/Activity';
-
-export const timelineActivityWithoutTargetsFamilyState = atomFamily<
-  Pick<Activity, 'id' | 'title' | 'createdAt' | 'author' | 'type'> | null,
-  string
->({
-  key: 'timelineActivityFirstLevelFamilySelector',
-  default: null,
-});
diff --git a/packages/twenty-front/src/modules/activities/timeline/states/timelineActivityWithoutTargetsFamilyState.ts b/packages/twenty-front/src/modules/activities/timeline/states/timelineActivityWithoutTargetsFamilyState.ts
new file mode 100644
index 000000000000..ac8c0f208aac
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline/states/timelineActivityWithoutTargetsFamilyState.ts
@@ -0,0 +1,10 @@
+import { Activity } from '@/activities/types/Activity';
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
+
+export const timelineActivityWithoutTargetsFamilyState = createFamilyState<
+  Pick<Activity, 'id' | 'title' | 'createdAt' | 'author' | 'type'> | null,
+  string
+>({
+  key: 'timelineActivityWithoutTargetsFamilyState',
+  defaultValue: null,
+});
diff --git a/packages/twenty-front/src/modules/activities/timeline/utils/groupActivitiesByMonth.ts b/packages/twenty-front/src/modules/activities/timeline/utils/groupActivitiesByMonth.ts
index c93550dc03ad..44bf5b9e4005 100644
--- a/packages/twenty-front/src/modules/activities/timeline/utils/groupActivitiesByMonth.ts
+++ b/packages/twenty-front/src/modules/activities/timeline/utils/groupActivitiesByMonth.ts
@@ -1,4 +1,5 @@
 import { Activity } from '@/activities/types/Activity';
+import { isDefined } from '~/utils/isDefined';
 
 export type ActivityForActivityGroup = Pick<Activity, 'id' | 'createdAt'>;
 
@@ -21,7 +22,7 @@ export const groupActivitiesByMonth = (
     const matchingGroup = acitivityGroups.find(
       (x) => x.year === year && x.month === month,
     );
-    if (matchingGroup) {
+    if (isDefined(matchingGroup)) {
       matchingGroup.items.push(activity);
     } else {
       acitivityGroups.push({
diff --git a/packages/twenty-front/src/modules/activities/types/ActivityTargetObject.ts b/packages/twenty-front/src/modules/activities/types/ActivityTargetObject.ts
index ad119af39b1f..382ce817eacc 100644
--- a/packages/twenty-front/src/modules/activities/types/ActivityTargetObject.ts
+++ b/packages/twenty-front/src/modules/activities/types/ActivityTargetObject.ts
@@ -6,5 +6,4 @@ export type ActivityTargetWithTargetRecord = {
   targetObjectMetadataItem: ObjectMetadataItem;
   activityTarget: ActivityTarget;
   targetObject: ObjectRecord;
-  targetObjectNameSingular: string;
 };
diff --git a/packages/twenty-front/src/modules/activities/types/ActivityTargetableEntity.ts b/packages/twenty-front/src/modules/activities/types/ActivityTargetableEntity.ts
index 22d25858f1fc..72b17fb37a02 100644
--- a/packages/twenty-front/src/modules/activities/types/ActivityTargetableEntity.ts
+++ b/packages/twenty-front/src/modules/activities/types/ActivityTargetableEntity.ts
@@ -1,5 +1,4 @@
 export type ActivityTargetableObject = {
   id: string;
   targetObjectNameSingular: string;
-  relatedTargetableObjects?: ActivityTargetableObject[];
 };
diff --git a/packages/twenty-front/src/modules/activities/utils/__tests__/getTargetableEntitiesWithParents.test.ts b/packages/twenty-front/src/modules/activities/utils/__tests__/getTargetableEntitiesWithParents.test.ts
deleted file mode 100644
index 489364a1e120..000000000000
--- a/packages/twenty-front/src/modules/activities/utils/__tests__/getTargetableEntitiesWithParents.test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { flattenTargetableObjectsAndTheirRelatedTargetableObjects } from '@/activities/utils/flattenTargetableObjectsAndTheirRelatedTargetableObjects';
-
-describe('getTargetableEntitiesWithParents', () => {
-  it('should return the correct value', () => {
-    const entities: ActivityTargetableObject[] = [
-      {
-        id: '1',
-        targetObjectNameSingular: 'person',
-        relatedTargetableObjects: [
-          {
-            id: '2',
-            targetObjectNameSingular: 'company',
-          },
-        ],
-      },
-      {
-        id: '4',
-        targetObjectNameSingular: 'person',
-      },
-      {
-        id: '3',
-        targetObjectNameSingular: 'car',
-        relatedTargetableObjects: [
-          {
-            id: '6',
-            targetObjectNameSingular: 'person',
-          },
-          {
-            id: '5',
-            targetObjectNameSingular: 'company',
-          },
-        ],
-      },
-    ];
-
-    const res =
-      flattenTargetableObjectsAndTheirRelatedTargetableObjects(entities);
-
-    expect(res).toHaveLength(6);
-    expect(res[0].id).toBe('1');
-    expect(res[1].id).toBe('2');
-    expect(res[2].id).toBe('4');
-    expect(res[3].id).toBe('3');
-    expect(res[4].id).toBe('6');
-    expect(res[5].id).toBe('5');
-  });
-});
diff --git a/packages/twenty-front/src/modules/activities/utils/flattenTargetableObjectsAndTheirRelatedTargetableObjects.ts b/packages/twenty-front/src/modules/activities/utils/flattenTargetableObjectsAndTheirRelatedTargetableObjects.ts
deleted file mode 100644
index 1f30e422af57..000000000000
--- a/packages/twenty-front/src/modules/activities/utils/flattenTargetableObjectsAndTheirRelatedTargetableObjects.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ActivityTargetableObject } from '../types/ActivityTargetableEntity';
-
-export const flattenTargetableObjectsAndTheirRelatedTargetableObjects = (
-  targetableObjectsWithRelatedTargetableObjects: ActivityTargetableObject[],
-): ActivityTargetableObject[] => {
-  const flattenedTargetableObjects: ActivityTargetableObject[] = [];
-
-  for (const targetableObject of targetableObjectsWithRelatedTargetableObjects ??
-    []) {
-    flattenedTargetableObjects.push(targetableObject);
-
-    if (targetableObject.relatedTargetableObjects) {
-      for (const relatedEntity of targetableObject.relatedTargetableObjects ??
-        []) {
-        flattenedTargetableObjects.push(relatedEntity);
-      }
-    }
-  }
-
-  return flattenedTargetableObjects;
-};
diff --git a/packages/twenty-front/src/modules/activities/utils/generateActivityTargetMorphFieldKeys.ts b/packages/twenty-front/src/modules/activities/utils/generateActivityTargetMorphFieldKeys.ts
new file mode 100644
index 000000000000..b5994a93e700
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/utils/generateActivityTargetMorphFieldKeys.ts
@@ -0,0 +1,31 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+
+export const generateActivityTargetMorphFieldKeys = (
+  objectMetadataItems: ObjectMetadataItem[],
+) => {
+  const targetableObjects = Object.fromEntries(
+    objectMetadataItems
+      .filter(
+        (objectMetadataItem) =>
+          objectMetadataItem.isActive && !objectMetadataItem.isSystem,
+      )
+      .map((objectMetadataItem) => [objectMetadataItem.nameSingular, true]),
+  );
+
+  const targetableObjectIds = Object.fromEntries(
+    objectMetadataItems
+      .filter(
+        (objectMetadataItem) =>
+          objectMetadataItem.isActive && !objectMetadataItem.isSystem,
+      )
+      .map((objectMetadataItem) => [
+        `${objectMetadataItem.nameSingular}Id`,
+        true,
+      ]),
+  );
+
+  return {
+    ...targetableObjects,
+    ...targetableObjectIds,
+  };
+};
diff --git a/packages/twenty-front/src/modules/activities/utils/getActivitySummary.ts b/packages/twenty-front/src/modules/activities/utils/getActivitySummary.ts
index 88b27c9008eb..157cf0e45d57 100644
--- a/packages/twenty-front/src/modules/activities/utils/getActivitySummary.ts
+++ b/packages/twenty-front/src/modules/activities/utils/getActivitySummary.ts
@@ -1,4 +1,4 @@
-import { isArray } from '@sniptt/guards';
+import { isArray, isNonEmptyString } from '@sniptt/guards';
 
 export const getActivitySummary = (activityBody: string) => {
   const noteBody = activityBody ? JSON.parse(activityBody) : [];
@@ -13,7 +13,7 @@ export const getActivitySummary = (activityBody: string) => {
     return '';
   }
 
-  if (firstNoteBlockContent.text) {
+  if (isNonEmptyString(firstNoteBlockContent.text)) {
     return noteBody[0].content.text;
   }
 
diff --git a/packages/twenty-front/src/modules/activities/utils/getTargetObjectFilterFieldName.ts b/packages/twenty-front/src/modules/activities/utils/getActivityTargetObjectFieldIdName.ts
similarity index 100%
rename from packages/twenty-front/src/modules/activities/utils/getTargetObjectFilterFieldName.ts
rename to packages/twenty-front/src/modules/activities/utils/getActivityTargetObjectFieldIdName.ts
diff --git a/packages/twenty-front/src/modules/activities/utils/getActivityTargetObjectFieldName.ts b/packages/twenty-front/src/modules/activities/utils/getActivityTargetObjectFieldName.ts
new file mode 100644
index 000000000000..a4081e2a1085
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/utils/getActivityTargetObjectFieldName.ts
@@ -0,0 +1,7 @@
+export const getActivityTargetObjectFieldName = ({
+  nameSingular,
+}: {
+  nameSingular: string;
+}) => {
+  return `${nameSingular}`;
+};
diff --git a/packages/twenty-front/src/modules/activities/utils/getActivityTargetsFilter.ts b/packages/twenty-front/src/modules/activities/utils/getActivityTargetsFilter.ts
index c6a53c39eec4..5553632b1c7d 100644
--- a/packages/twenty-front/src/modules/activities/utils/getActivityTargetsFilter.ts
+++ b/packages/twenty-front/src/modules/activities/utils/getActivityTargetsFilter.ts
@@ -1,5 +1,5 @@
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { getActivityTargetObjectFieldIdName } from '@/activities/utils/getTargetObjectFilterFieldName';
+import { getActivityTargetObjectFieldIdName } from '@/activities/utils/getActivityTargetObjectFieldIdName';
 
 export const getActivityTargetsFilter = ({
   targetableObjects,
diff --git a/packages/twenty-front/src/modules/activities/utils/getActivityTargetsToCreateFromTargetableObjects.ts b/packages/twenty-front/src/modules/activities/utils/getActivityTargetsToCreateFromTargetableObjects.ts
index 20b8d009c256..dd20d678d8d9 100644
--- a/packages/twenty-front/src/modules/activities/utils/getActivityTargetsToCreateFromTargetableObjects.ts
+++ b/packages/twenty-front/src/modules/activities/utils/getActivityTargetsToCreateFromTargetableObjects.ts
@@ -1,48 +1,41 @@
 import { v4 } from 'uuid';
 
+import { Activity } from '@/activities/types/Activity';
 import { ActivityTarget } from '@/activities/types/ActivityTarget';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { flattenTargetableObjectsAndTheirRelatedTargetableObjects } from '@/activities/utils/flattenTargetableObjectsAndTheirRelatedTargetableObjects';
-import { getActivityTargetObjectFieldIdName } from '@/activities/utils/getTargetObjectFilterFieldName';
+import { getActivityTargetObjectFieldIdName } from '@/activities/utils/getActivityTargetObjectFieldIdName';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 
 export const makeActivityTargetsToCreateFromTargetableObjects = ({
   targetableObjects,
-  activityId,
+  activity,
   targetObjectRecords,
 }: {
   targetableObjects: ActivityTargetableObject[];
-  activityId: string;
+  activity: Activity;
   targetObjectRecords: ObjectRecord[];
 }): Partial<ActivityTarget>[] => {
-  const activityTargetableObjects = targetableObjects
-    ? flattenTargetableObjectsAndTheirRelatedTargetableObjects(
-        targetableObjects,
-      )
-    : [];
+  const activityTargetsToCreate = targetableObjects.map((targetableObject) => {
+    const targetableObjectFieldIdName = getActivityTargetObjectFieldIdName({
+      nameSingular: targetableObject.targetObjectNameSingular,
+    });
 
-  const activityTargetsToCreate = activityTargetableObjects.map(
-    (targetableObject) => {
-      const targetableObjectFieldIdName = getActivityTargetObjectFieldIdName({
-        nameSingular: targetableObject.targetObjectNameSingular,
-      });
+    const relatedObjectRecord = targetObjectRecords.find(
+      (record) => record.id === targetableObject.id,
+    );
 
-      const relatedObjectRecord = targetObjectRecords.find(
-        (record) => record.id === targetableObject.id,
-      );
+    const activityTarget = {
+      [targetableObject.targetObjectNameSingular]: relatedObjectRecord,
+      [targetableObjectFieldIdName]: targetableObject.id,
+      activity,
+      activityId: activity.id,
+      id: v4(),
+      updatedAt: new Date().toISOString(),
+      createdAt: new Date().toISOString(),
+    } as Partial<ActivityTarget>;
 
-      const activityTarget = {
-        [targetableObject.targetObjectNameSingular]: relatedObjectRecord,
-        [targetableObjectFieldIdName]: targetableObject.id,
-        activityId,
-        id: v4(),
-        updatedAt: new Date().toISOString(),
-        createdAt: new Date().toISOString(),
-      } as Partial<ActivityTarget>;
-
-      return activityTarget;
-    },
-  );
+    return activityTarget;
+  });
 
   return activityTargetsToCreate;
 };
diff --git a/packages/twenty-front/src/modules/analytics/graphql/queries/createEvent.ts b/packages/twenty-front/src/modules/analytics/graphql/queries/createEvent.ts
deleted file mode 100644
index 6183b9107325..000000000000
--- a/packages/twenty-front/src/modules/analytics/graphql/queries/createEvent.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const CREATE_EVENT = gql`
-  mutation CreateEvent($type: String!, $data: JSON!) {
-    createEvent(type: $type, data: $data) {
-      success
-    }
-  }
-`;
diff --git a/packages/twenty-front/src/modules/analytics/graphql/queries/track.ts b/packages/twenty-front/src/modules/analytics/graphql/queries/track.ts
new file mode 100644
index 000000000000..3aa7bba0fcf4
--- /dev/null
+++ b/packages/twenty-front/src/modules/analytics/graphql/queries/track.ts
@@ -0,0 +1,9 @@
+import { gql } from '@apollo/client';
+
+export const TRACK = gql`
+  mutation Track($type: String!, $data: JSON!) {
+    track(type: $type, data: $data) {
+      success
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/analytics/hooks/__tests__/useEventTracker.test.tsx b/packages/twenty-front/src/modules/analytics/hooks/__tests__/useEventTracker.test.tsx
index fe22734e8229..9b60f1ffa646 100644
--- a/packages/twenty-front/src/modules/analytics/hooks/__tests__/useEventTracker.test.tsx
+++ b/packages/twenty-front/src/modules/analytics/hooks/__tests__/useEventTracker.test.tsx
@@ -7,16 +7,12 @@ import { RecoilRoot } from 'recoil';
 
 import { useEventTracker } from '../useEventTracker';
 
-jest.mock('@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery', () => ({
-  useMapFieldMetadataToGraphQLQuery: () => () => '\n',
-}));
-
 const mocks: MockedResponse[] = [
   {
     request: {
       query: gql`
-        mutation CreateEvent($type: String!, $data: JSON!) {
-          createEvent(type: $type, data: $data) {
+        mutation Track($type: String!, $data: JSON!) {
+          track(type: $type, data: $data) {
             success
           }
         }
@@ -28,7 +24,7 @@ const mocks: MockedResponse[] = [
     },
     result: jest.fn(() => ({
       data: {
-        createEvent: {
+        track: {
           success: true,
         },
       },
diff --git a/packages/twenty-front/src/modules/analytics/hooks/__tests__/useTrackEvent.test.tsx b/packages/twenty-front/src/modules/analytics/hooks/__tests__/useTrackEvent.test.tsx
index 69eeecdf1ca8..f82b7323a658 100644
--- a/packages/twenty-front/src/modules/analytics/hooks/__tests__/useTrackEvent.test.tsx
+++ b/packages/twenty-front/src/modules/analytics/hooks/__tests__/useTrackEvent.test.tsx
@@ -4,10 +4,10 @@ import { RecoilRoot } from 'recoil';
 
 import { useTrackEvent } from '../useTrackEvent';
 
-const mockCreateEventMutation = jest.fn();
+const mockTrackMutation = jest.fn();
 
 jest.mock('~/generated/graphql', () => ({
-  useCreateEventMutation: () => [mockCreateEventMutation],
+  useTrackMutation: () => [mockTrackMutation],
 }));
 
 describe('useTrackEvent', () => {
@@ -17,8 +17,8 @@ describe('useTrackEvent', () => {
     renderHook(() => useTrackEvent(eventType, eventData), {
       wrapper: RecoilRoot,
     });
-    expect(mockCreateEventMutation).toHaveBeenCalledTimes(1);
-    expect(mockCreateEventMutation).toHaveBeenCalledWith({
+    expect(mockTrackMutation).toHaveBeenCalledTimes(1);
+    expect(mockTrackMutation).toHaveBeenCalledWith({
       variables: { type: eventType, data: eventData },
     });
   });
diff --git a/packages/twenty-front/src/modules/analytics/hooks/useEventTracker.ts b/packages/twenty-front/src/modules/analytics/hooks/useEventTracker.ts
index 6cb0fcf4d10b..88d1d656740b 100644
--- a/packages/twenty-front/src/modules/analytics/hooks/useEventTracker.ts
+++ b/packages/twenty-front/src/modules/analytics/hooks/useEventTracker.ts
@@ -1,8 +1,8 @@
 import { useCallback } from 'react';
-import { useRecoilState } from 'recoil';
+import { useRecoilValue } from 'recoil';
 
 import { telemetryState } from '@/client-config/states/telemetryState';
-import { useCreateEventMutation } from '~/generated/graphql';
+import { useTrackMutation } from '~/generated/graphql';
 
 interface EventLocation {
   pathname: string;
@@ -13,8 +13,8 @@ export interface EventData {
 }
 
 export const useEventTracker = () => {
-  const [telemetry] = useRecoilState(telemetryState);
-  const [createEventMutation] = useCreateEventMutation();
+  const telemetry = useRecoilValue(telemetryState);
+  const [createEventMutation] = useTrackMutation();
 
   return useCallback(
     (eventType: string, eventData: EventData) => {
diff --git a/packages/twenty-front/src/modules/apollo/components/ApolloProvider.tsx b/packages/twenty-front/src/modules/apollo/components/ApolloProvider.tsx
index 21a5015285de..c0d771c61f25 100644
--- a/packages/twenty-front/src/modules/apollo/components/ApolloProvider.tsx
+++ b/packages/twenty-front/src/modules/apollo/components/ApolloProvider.tsx
@@ -3,7 +3,9 @@ import { ApolloProvider as ApolloProviderBase } from '@apollo/client';
 import { useApolloFactory } from '@/apollo/hooks/useApolloFactory';
 
 export const ApolloProvider = ({ children }: React.PropsWithChildren) => {
-  const apolloClient = useApolloFactory();
+  const apolloClient = useApolloFactory({
+    connectToDevTools: true,
+  });
 
   // This will attach the right apollo client to Apollo Dev Tools
   window.__APOLLO_CLIENT__ = apolloClient;
diff --git a/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx b/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx
index bea66cc15c5f..59f99306a524 100644
--- a/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx
+++ b/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx
@@ -22,7 +22,7 @@ jest.mock('react-router-dom', () => {
 const Wrapper = ({ children }: { children: React.ReactNode }) => (
   <RecoilRoot>
     <MemoryRouter
-      initialEntries={['/sign-in', '/verify', '/opportunities']}
+      initialEntries={['/welcome', '/verify', '/opportunities']}
       initialIndex={2}
     >
       {children}
@@ -44,7 +44,7 @@ describe('useApolloFactory', () => {
     expect(res).toHaveProperty('query');
   });
 
-  it('should navigate to /sign-in on unauthenticated error', async () => {
+  it('should navigate to /welcome on unauthenticated error', async () => {
     const errors = [
       {
         extensions: {
@@ -77,8 +77,8 @@ describe('useApolloFactory', () => {
       await act(async () => {
         await result.current.factory.mutate({
           mutation: gql`
-            mutation CreateEvent($type: String!, $data: JSON!) {
-              createEvent(type: $type, data: $data) {
+            mutation Track($type: String!, $data: JSON!) {
+              track(type: $type, data: $data) {
                 success
               }
             }
@@ -90,7 +90,7 @@ describe('useApolloFactory', () => {
       expect((error as ApolloError).message).toBe('Error message not found.');
 
       expect(mockNavigate).toHaveBeenCalled();
-      expect(mockNavigate).toHaveBeenCalledWith('/sign-in');
+      expect(mockNavigate).toHaveBeenCalledWith('/welcome');
     }
   });
 });
diff --git a/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts b/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts
index cd2b62704f62..768142302afb 100644
--- a/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts
+++ b/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts
@@ -1,30 +1,41 @@
 import { useMemo, useRef } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import { InMemoryCache, NormalizedCacheObject } from '@apollo/client';
-import { useRecoilState } from 'recoil';
+import { useRecoilState, useRecoilValue } from 'recoil';
 
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { previousUrlState } from '@/auth/states/previousUrlState';
 import { tokenPairState } from '@/auth/states/tokenPairState';
 import { isDebugModeState } from '@/client-config/states/isDebugModeState';
 import { AppPath } from '@/types/AppPath';
 import { REACT_APP_SERVER_BASE_URL } from '~/config';
 import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
 import { useUpdateEffect } from '~/hooks/useUpdateEffect';
+import { isDefined } from '~/utils/isDefined';
 
-import { ApolloFactory } from '../services/apollo.factory';
+import { ApolloFactory, Options } from '../services/apollo.factory';
 
-export const useApolloFactory = () => {
+export const useApolloFactory = (options: Partial<Options<any>> = {}) => {
   // eslint-disable-next-line @nx/workspace-no-state-useref
   const apolloRef = useRef<ApolloFactory<NormalizedCacheObject> | null>(null);
+  const currentWorkspace = useRecoilValue(currentWorkspaceState);
   const [isDebugMode] = useRecoilState(isDebugModeState);
 
   const navigate = useNavigate();
   const isMatchingLocation = useIsMatchingLocation();
   const [tokenPair, setTokenPair] = useRecoilState(tokenPairState);
+  const [, setPreviousUrl] = useRecoilState(previousUrlState);
+  const location = useLocation();
 
   const apolloClient = useMemo(() => {
     apolloRef.current = new ApolloFactory({
       uri: `${REACT_APP_SERVER_BASE_URL}/graphql`,
       cache: new InMemoryCache(),
+      headers: {
+        ...(currentWorkspace?.currentCacheVersion && {
+          'X-Schema-Version': currentWorkspace.currentCacheVersion,
+        }),
+      },
       defaultOptions: {
         query: {
           fetchPolicy: 'cache-first',
@@ -40,24 +51,31 @@ export const useApolloFactory = () => {
         setTokenPair(null);
         if (
           !isMatchingLocation(AppPath.Verify) &&
-          !isMatchingLocation(AppPath.SignIn) &&
-          !isMatchingLocation(AppPath.SignUp) &&
+          !isMatchingLocation(AppPath.SignInUp) &&
           !isMatchingLocation(AppPath.Invite) &&
           !isMatchingLocation(AppPath.ResetPassword)
         ) {
-          navigate(AppPath.SignIn);
+          setPreviousUrl(`${location.pathname}${location.search}`);
+          navigate(AppPath.SignInUp);
         }
       },
       extraLinks: [],
       isDebugMode,
+      // Override options
+      ...options,
     });
 
     return apolloRef.current.getClient();
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [setTokenPair, isDebugMode]);
+  }, [
+    setTokenPair,
+    isDebugMode,
+    currentWorkspace?.currentCacheVersion,
+    setPreviousUrl,
+  ]);
 
   useUpdateEffect(() => {
-    if (apolloRef.current) {
+    if (isDefined(apolloRef.current)) {
       apolloRef.current.updateTokenPair(tokenPair);
     }
   }, [tokenPair]);
diff --git a/packages/twenty-front/src/modules/apollo/hooks/useCachedRootQuery.ts b/packages/twenty-front/src/modules/apollo/hooks/useCachedRootQuery.ts
deleted file mode 100644
index b16bb88947d5..000000000000
--- a/packages/twenty-front/src/modules/apollo/hooks/useCachedRootQuery.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { useApolloClient } from '@apollo/client/react/hooks/useApolloClient';
-import gql from 'graphql-tag';
-
-import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { QueryMethodName } from '@/object-metadata/types/QueryMethodName';
-
-export const useCachedRootQuery = ({
-  objectMetadataItem,
-  queryMethodName,
-}: {
-  objectMetadataItem: ObjectMetadataItem | undefined;
-  queryMethodName: QueryMethodName;
-}) => {
-  const mapFieldMetadataToGraphQLQuery = useMapFieldMetadataToGraphQLQuery();
-  const apolloClient = useApolloClient();
-
-  if (!objectMetadataItem) {
-    return { cachedRootQuery: null };
-  }
-
-  const buildRecordFieldsFragment = () => {
-    return objectMetadataItem.fields
-      .filter((field) => field.type !== 'RELATION')
-      .map((field) => mapFieldMetadataToGraphQLQuery({ field }))
-      .join(' \n');
-  };
-
-  const cacheReadFragment = gql`
-    fragment RootQuery on Query {
-      ${
-        QueryMethodName.FindMany === queryMethodName
-          ? objectMetadataItem.namePlural
-          : objectMetadataItem.nameSingular
-      } {
-        ${QueryMethodName.FindMany === queryMethodName ? 'edges { node { ' : ''}
-            ${buildRecordFieldsFragment()}
-        ${QueryMethodName.FindMany === queryMethodName ? '}}' : ''}
-
-      }
-    }
-  `;
-
-  const cachedRootQuery = apolloClient.readFragment({
-    id: 'ROOT_QUERY',
-    fragment: cacheReadFragment,
-  });
-
-  return { cachedRootQuery };
-};
diff --git a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/isCachedObjectRecordConnection.ts b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/isCachedObjectRecordConnection.ts
deleted file mode 100644
index 92186f3df316..000000000000
--- a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/isCachedObjectRecordConnection.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { StoreValue } from '@apollo/client';
-import { z } from 'zod';
-
-import { CachedObjectRecordConnection } from '@/apollo/types/CachedObjectRecordConnection';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const isCachedObjectRecordConnection = (
-  objectNameSingular: string,
-  storeValue: StoreValue,
-): storeValue is CachedObjectRecordConnection => {
-  const objectConnectionTypeName = `${capitalize(
-    objectNameSingular,
-  )}Connection`;
-  const objectEdgeTypeName = `${capitalize(objectNameSingular)}Edge`;
-  const cachedObjectConnectionSchema = z.object({
-    __typename: z.literal(objectConnectionTypeName),
-    edges: z.array(
-      z.object({
-        __typename: z.literal(objectEdgeTypeName),
-        node: z.object({
-          __ref: z.string().startsWith(`${capitalize(objectNameSingular)}:`),
-        }),
-      }),
-    ),
-  });
-  const cachedConnectionValidation =
-    cachedObjectConnectionSchema.safeParse(storeValue);
-
-  return cachedConnectionValidation.success;
-};
diff --git a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/sortCachedObjectEdges.ts b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/sortCachedObjectEdges.ts
index 536563efd0f7..10d4514af854 100644
--- a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/sortCachedObjectEdges.ts
+++ b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/sortCachedObjectEdges.ts
@@ -4,7 +4,7 @@ import { ReadFieldFunction } from '@apollo/client/cache/core/types/common';
 import { CachedObjectRecordEdge } from '@/apollo/types/CachedObjectRecordEdge';
 import { OrderBy } from '@/object-metadata/types/OrderBy';
 import { OrderByField } from '@/object-metadata/types/OrderByField';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 import { sortAsc, sortDesc, sortNullsFirst, sortNullsLast } from '~/utils/sort';
 
 export const sortCachedObjectEdges = ({
@@ -31,7 +31,7 @@ export const sortCachedObjectEdges = ({
         orderByFieldName,
         recordFromCache,
       ) ?? null;
-    const isSubFieldFilter = isNonNullable(fieldValue) && !!orderBySubFieldName;
+    const isSubFieldFilter = isDefined(fieldValue) && !!orderBySubFieldName;
 
     if (!isSubFieldFilter) return fieldValue as string | number | null;
 
diff --git a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerAttachRelationOptimisticEffect.ts b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerAttachRelationOptimisticEffect.ts
index 188d430834f9..67ba4f8c69e9 100644
--- a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerAttachRelationOptimisticEffect.ts
+++ b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerAttachRelationOptimisticEffect.ts
@@ -1,8 +1,8 @@
 import { ApolloCache, StoreObject } from '@apollo/client';
 
-import { isCachedObjectRecordConnection } from '@/apollo/optimistic-effect/utils/isCachedObjectRecordConnection';
 import { CachedObjectRecordEdge } from '@/apollo/types/CachedObjectRecordEdge';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isObjectRecordConnectionWithRefs } from '@/object-record/cache/utils/isObjectRecordConnectionWithRefs';
+import { isDefined } from '~/utils/isDefined';
 import { capitalize } from '~/utils/string/capitalize';
 
 export const triggerAttachRelationOptimisticEffect = ({
@@ -32,8 +32,8 @@ export const triggerAttachRelationOptimisticEffect = ({
     id: targetRecordCacheId,
     fields: {
       [fieldNameOnTargetRecord]: (targetRecordFieldValue, { toReference }) => {
-        const fieldValueIsCachedObjectRecordConnection =
-          isCachedObjectRecordConnection(
+        const fieldValueisObjectRecordConnectionWithRefs =
+          isObjectRecordConnectionWithRefs(
             sourceObjectNameSingular,
             targetRecordFieldValue,
           );
@@ -43,11 +43,11 @@ export const triggerAttachRelationOptimisticEffect = ({
           __typename: sourceRecordTypeName,
         });
 
-        if (!isNonNullable(sourceRecordReference)) {
+        if (!isDefined(sourceRecordReference)) {
           return targetRecordFieldValue;
         }
 
-        if (fieldValueIsCachedObjectRecordConnection) {
+        if (fieldValueisObjectRecordConnectionWithRefs) {
           const nextEdges: CachedObjectRecordEdge[] = [
             ...targetRecordFieldValue.edges,
             {
diff --git a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerCreateRecordsOptimisticEffect.ts b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerCreateRecordsOptimisticEffect.ts
index ec4061eef9e1..84d7aab6bf0e 100644
--- a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerCreateRecordsOptimisticEffect.ts
+++ b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerCreateRecordsOptimisticEffect.ts
@@ -1,11 +1,12 @@
 import { ApolloCache, StoreObject } from '@apollo/client';
+import { isNonEmptyString } from '@sniptt/guards';
 
-import { isCachedObjectRecordConnection } from '@/apollo/optimistic-effect/utils/isCachedObjectRecordConnection';
 import { triggerUpdateRelationsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerUpdateRelationsOptimisticEffect';
 import { CachedObjectRecord } from '@/apollo/types/CachedObjectRecord';
 import { CachedObjectRecordEdge } from '@/apollo/types/CachedObjectRecordEdge';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { getEdgeTypename } from '@/object-record/cache/utils/getEdgeTypename';
+import { isObjectRecordConnectionWithRefs } from '@/object-record/cache/utils/isObjectRecordConnectionWithRefs';
 
 /*
   TODO: for now new records are added to all cached record lists, no matter what the variables (filters, orderBy, etc.) are.
@@ -23,10 +24,6 @@ export const triggerCreateRecordsOptimisticEffect = ({
   recordsToCreate: CachedObjectRecord[];
   objectMetadataItems: ObjectMetadataItem[];
 }) => {
-  const objectEdgeTypeName = getEdgeTypename({
-    objectNameSingular: objectMetadataItem.nameSingular,
-  });
-
   recordsToCreate.forEach((record) =>
     triggerUpdateRelationsOptimisticEffect({
       cache,
@@ -48,7 +45,7 @@ export const triggerCreateRecordsOptimisticEffect = ({
           toReference,
         },
       ) => {
-        const shouldSkip = !isCachedObjectRecordConnection(
+        const shouldSkip = !isObjectRecordConnectionWithRefs(
           objectMetadataItem.nameSingular,
           rootQueryCachedResponse,
         );
@@ -76,7 +73,7 @@ export const triggerCreateRecordsOptimisticEffect = ({
 
         const hasAddedRecords = recordsToCreate
           .map((recordToCreate) => {
-            if (recordToCreate.id) {
+            if (isNonEmptyString(recordToCreate.id)) {
               const recordToCreateReference = toReference(recordToCreate);
 
               if (!recordToCreateReference) {
@@ -96,7 +93,7 @@ export const triggerCreateRecordsOptimisticEffect = ({
 
               if (recordToCreateReference && !recordAlreadyInCache) {
                 nextRootQueryCachedRecordEdges.unshift({
-                  __typename: objectEdgeTypeName,
+                  __typename: getEdgeTypename(objectMetadataItem.nameSingular),
                   node: recordToCreateReference,
                   cursor: '',
                 });
diff --git a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerDeleteRecordsOptimisticEffect.ts b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerDeleteRecordsOptimisticEffect.ts
index 6ffff14c72d4..7c381ac866fb 100644
--- a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerDeleteRecordsOptimisticEffect.ts
+++ b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerDeleteRecordsOptimisticEffect.ts
@@ -1,12 +1,12 @@
 import { ApolloCache, StoreObject } from '@apollo/client';
 
-import { isCachedObjectRecordConnection } from '@/apollo/optimistic-effect/utils/isCachedObjectRecordConnection';
 import { triggerUpdateRelationsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerUpdateRelationsOptimisticEffect';
 import { CachedObjectRecord } from '@/apollo/types/CachedObjectRecord';
 import { CachedObjectRecordEdge } from '@/apollo/types/CachedObjectRecordEdge';
 import { CachedObjectRecordQueryVariables } from '@/apollo/types/CachedObjectRecordQueryVariables';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isObjectRecordConnectionWithRefs } from '@/object-record/cache/utils/isObjectRecordConnectionWithRefs';
+import { isDefined } from '~/utils/isDefined';
 import { parseApolloStoreFieldName } from '~/utils/parseApolloStoreFieldName';
 
 export const triggerDeleteRecordsOptimisticEffect = ({
@@ -27,7 +27,7 @@ export const triggerDeleteRecordsOptimisticEffect = ({
         { DELETE, readField, storeFieldName },
       ) => {
         const rootQueryCachedResponseIsNotACachedObjectRecordConnection =
-          !isCachedObjectRecordConnection(
+          !isObjectRecordConnectionWithRefs(
             objectMetadataItem.nameSingular,
             rootQueryCachedResponse,
           );
@@ -68,7 +68,7 @@ export const triggerDeleteRecordsOptimisticEffect = ({
 
         // TODO: same as in update, should we trigger DELETE ?
         if (
-          isNonNullable(rootQueryVariables?.first) &&
+          isDefined(rootQueryVariables?.first) &&
           cachedEdges?.length === rootQueryVariables.first
         ) {
           return DELETE;
diff --git a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerDetachRelationOptimisticEffect.ts b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerDetachRelationOptimisticEffect.ts
index 3d0080526182..d32185298973 100644
--- a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerDetachRelationOptimisticEffect.ts
+++ b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerDetachRelationOptimisticEffect.ts
@@ -1,6 +1,6 @@
 import { ApolloCache, StoreObject } from '@apollo/client';
 
-import { isCachedObjectRecordConnection } from '@/apollo/optimistic-effect/utils/isCachedObjectRecordConnection';
+import { isObjectRecordConnectionWithRefs } from '@/object-record/cache/utils/isObjectRecordConnectionWithRefs';
 import { capitalize } from '~/utils/string/capitalize';
 
 export const triggerDetachRelationOptimisticEffect = ({
@@ -32,7 +32,7 @@ export const triggerDetachRelationOptimisticEffect = ({
         targetRecordFieldValue,
         { isReference, readField },
       ) => {
-        const isRecordConnection = isCachedObjectRecordConnection(
+        const isRecordConnection = isObjectRecordConnectionWithRefs(
           sourceObjectNameSingular,
           targetRecordFieldValue,
         );
diff --git a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffect.ts b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffect.ts
index 92890351c890..50c1faf7909c 100644
--- a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffect.ts
+++ b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffect.ts
@@ -1,6 +1,5 @@
 import { ApolloCache, StoreObject } from '@apollo/client';
 
-import { isCachedObjectRecordConnection } from '@/apollo/optimistic-effect/utils/isCachedObjectRecordConnection';
 import { sortCachedObjectEdges } from '@/apollo/optimistic-effect/utils/sortCachedObjectEdges';
 import { triggerUpdateRelationsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerUpdateRelationsOptimisticEffect';
 import { CachedObjectRecord } from '@/apollo/types/CachedObjectRecord';
@@ -8,8 +7,9 @@ import { CachedObjectRecordEdge } from '@/apollo/types/CachedObjectRecordEdge';
 import { CachedObjectRecordQueryVariables } from '@/apollo/types/CachedObjectRecordQueryVariables';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { getEdgeTypename } from '@/object-record/cache/utils/getEdgeTypename';
+import { isObjectRecordConnectionWithRefs } from '@/object-record/cache/utils/isObjectRecordConnectionWithRefs';
 import { isRecordMatchingFilter } from '@/object-record/record-filter/utils/isRecordMatchingFilter';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 import { parseApolloStoreFieldName } from '~/utils/parseApolloStoreFieldName';
 
 // TODO: add extensive unit tests for this function
@@ -27,10 +27,6 @@ export const triggerUpdateRecordOptimisticEffect = ({
   updatedRecord: CachedObjectRecord;
   objectMetadataItems: ObjectMetadataItem[];
 }) => {
-  const objectEdgeTypeName = getEdgeTypename({
-    objectNameSingular: objectMetadataItem.nameSingular,
-  });
-
   triggerUpdateRelationsOptimisticEffect({
     cache,
     sourceObjectMetadataItem: objectMetadataItem,
@@ -45,7 +41,7 @@ export const triggerUpdateRecordOptimisticEffect = ({
         rootQueryCachedResponse,
         { DELETE, readField, storeFieldName, toReference },
       ) => {
-        const shouldSkip = !isCachedObjectRecordConnection(
+        const shouldSkip = !isObjectRecordConnectionWithRefs(
           objectMetadataItem.nameSingular,
           rootQueryCachedResponse,
         );
@@ -71,7 +67,7 @@ export const triggerUpdateRecordOptimisticEffect = ({
         const rootQueryOrderBy = rootQueryVariables?.orderBy;
         const rootQueryLimit = rootQueryVariables?.first;
 
-        const shouldTryToMatchFilter = isNonNullable(rootQueryFilter);
+        const shouldTryToMatchFilter = isDefined(rootQueryFilter);
 
         if (shouldTryToMatchFilter) {
           const updatedRecordMatchesThisRootQueryFilter =
@@ -101,9 +97,9 @@ export const triggerUpdateRecordOptimisticEffect = ({
           if (updatedRecordShouldBeAddedToRootQueryEdges) {
             const updatedRecordNodeReference = toReference(updatedRecord);
 
-            if (isNonNullable(updatedRecordNodeReference)) {
+            if (isDefined(updatedRecordNodeReference)) {
               rootQueryNextEdges.push({
-                __typename: objectEdgeTypeName,
+                __typename: getEdgeTypename(objectMetadataItem.nameSingular),
                 node: updatedRecordNodeReference,
                 cursor: '',
               });
@@ -115,8 +111,7 @@ export const triggerUpdateRecordOptimisticEffect = ({
           }
         }
 
-        const rootQueryNextEdgesShouldBeSorted =
-          isNonNullable(rootQueryOrderBy);
+        const rootQueryNextEdgesShouldBeSorted = isDefined(rootQueryOrderBy);
 
         if (
           rootQueryNextEdgesShouldBeSorted &&
@@ -129,7 +124,7 @@ export const triggerUpdateRecordOptimisticEffect = ({
           });
         }
 
-        const shouldLimitNextRootQueryEdges = isNonNullable(rootQueryLimit);
+        const shouldLimitNextRootQueryEdges = isDefined(rootQueryLimit);
 
         // TODO: not sure that we should trigger a DELETE here, as it will trigger a network request
         // Is it the responsibility of this optimistic effect function to delete a root query that will trigger a network request ?
diff --git a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerUpdateRelationsOptimisticEffect.ts b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerUpdateRelationsOptimisticEffect.ts
index aa9eac813ad9..d8deb5119d3c 100644
--- a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerUpdateRelationsOptimisticEffect.ts
+++ b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerUpdateRelationsOptimisticEffect.ts
@@ -1,7 +1,6 @@
 import { ApolloCache } from '@apollo/client';
 
 import { getRelationDefinition } from '@/apollo/optimistic-effect/utils/getRelationDefinition';
-import { isObjectRecordConnection } from '@/apollo/optimistic-effect/utils/isObjectRecordConnection';
 import { triggerAttachRelationOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerAttachRelationOptimisticEffect';
 import { triggerDeleteRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerDeleteRecordsOptimisticEffect';
 import { triggerDetachRelationOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerDetachRelationOptimisticEffect';
@@ -9,10 +8,11 @@ import { CachedObjectRecord } from '@/apollo/types/CachedObjectRecord';
 import { CORE_OBJECT_NAMES_TO_DELETE_ON_TRIGGER_RELATION_DETACH } from '@/apollo/types/coreObjectNamesToDeleteOnRelationDetach';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { isObjectRecordConnection } from '@/object-record/cache/utils/isObjectRecordConnection';
 import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const triggerUpdateRelationsOptimisticEffect = ({
   cache,
@@ -26,128 +26,129 @@ export const triggerUpdateRelationsOptimisticEffect = ({
   currentSourceRecord: CachedObjectRecord | null;
   updatedSourceRecord: CachedObjectRecord | null;
   objectMetadataItems: ObjectMetadataItem[];
-}) =>
-  sourceObjectMetadataItem.fields.forEach((fieldMetadataItemOnSourceRecord) => {
-    const notARelationField =
-      fieldMetadataItemOnSourceRecord.type !== FieldMetadataType.Relation;
-
-    if (notARelationField) {
-      return;
-    }
-
-    const fieldDoesNotExist =
-      isNonNullable(updatedSourceRecord) &&
-      !(fieldMetadataItemOnSourceRecord.name in updatedSourceRecord);
-
-    if (fieldDoesNotExist) {
-      return;
-    }
-
-    const relationDefinition = getRelationDefinition({
-      fieldMetadataItemOnSourceRecord,
-      objectMetadataItems,
-    });
-
-    if (!relationDefinition) {
-      return;
-    }
-
-    const { targetObjectMetadataItem, fieldMetadataItemOnTargetRecord } =
-      relationDefinition;
-
-    const currentFieldValueOnSourceRecord:
-      | ObjectRecordConnection
-      | CachedObjectRecord
-      | null = currentSourceRecord?.[fieldMetadataItemOnSourceRecord.name];
-
-    const updatedFieldValueOnSourceRecord:
-      | ObjectRecordConnection
-      | CachedObjectRecord
-      | null = updatedSourceRecord?.[fieldMetadataItemOnSourceRecord.name];
-
-    if (
-      isDeeplyEqual(
-        currentFieldValueOnSourceRecord,
-        updatedFieldValueOnSourceRecord,
-      )
-    ) {
-      return;
-    }
-
-    // TODO: replace this by a relation type check, if it's one to many,
-    //   it's an object record connection (we can still check it though as a safeguard)
-    const currentFieldValueOnSourceRecordIsARecordConnection =
-      isObjectRecordConnection(
-        targetObjectMetadataItem.nameSingular,
-        currentFieldValueOnSourceRecord,
-      );
-
-    const targetRecordsToDetachFrom =
-      currentFieldValueOnSourceRecordIsARecordConnection
-        ? currentFieldValueOnSourceRecord.edges.map(
-            ({ node }) => node as CachedObjectRecord,
-          )
-        : [currentFieldValueOnSourceRecord].filter(isNonNullable);
-
-    const updatedFieldValueOnSourceRecordIsARecordConnection =
-      isObjectRecordConnection(
-        targetObjectMetadataItem.nameSingular,
-        updatedFieldValueOnSourceRecord,
-      );
-
-    const targetRecordsToAttachTo =
-      updatedFieldValueOnSourceRecordIsARecordConnection
-        ? updatedFieldValueOnSourceRecord.edges.map(
-            ({ node }) => node as CachedObjectRecord,
-          )
-        : [updatedFieldValueOnSourceRecord].filter(isNonNullable);
-
-    const shouldDetachSourceFromAllTargets =
-      isNonNullable(currentSourceRecord) &&
-      targetRecordsToDetachFrom.length > 0;
-
-    if (shouldDetachSourceFromAllTargets) {
-      // TODO: see if we can de-hardcode this, put cascade delete in relation metadata item
-      //   Instead of hardcoding it here
-      const shouldCascadeDeleteTargetRecords =
-        CORE_OBJECT_NAMES_TO_DELETE_ON_TRIGGER_RELATION_DETACH.includes(
-          targetObjectMetadataItem.nameSingular as CoreObjectNameSingular,
+}) => {
+  return sourceObjectMetadataItem.fields.forEach(
+    (fieldMetadataItemOnSourceRecord) => {
+      const notARelationField =
+        fieldMetadataItemOnSourceRecord.type !== FieldMetadataType.Relation;
+
+      if (notARelationField) {
+        return;
+      }
+
+      const fieldDoesNotExist =
+        isDefined(updatedSourceRecord) &&
+        !(fieldMetadataItemOnSourceRecord.name in updatedSourceRecord);
+
+      if (fieldDoesNotExist) {
+        return;
+      }
+
+      const relationDefinition = getRelationDefinition({
+        fieldMetadataItemOnSourceRecord,
+        objectMetadataItems,
+      });
+      if (!relationDefinition) {
+        return;
+      }
+
+      const { targetObjectMetadataItem, fieldMetadataItemOnTargetRecord } =
+        relationDefinition;
+
+      const currentFieldValueOnSourceRecord:
+        | ObjectRecordConnection
+        | CachedObjectRecord
+        | null = currentSourceRecord?.[fieldMetadataItemOnSourceRecord.name];
+
+      const updatedFieldValueOnSourceRecord:
+        | ObjectRecordConnection
+        | CachedObjectRecord
+        | null = updatedSourceRecord?.[fieldMetadataItemOnSourceRecord.name];
+
+      if (
+        isDeeplyEqual(
+          currentFieldValueOnSourceRecord,
+          updatedFieldValueOnSourceRecord,
+        )
+      ) {
+        return;
+      }
+
+      // TODO: replace this by a relation type check, if it's one to many,
+      //   it's an object record connection (we can still check it though as a safeguard)
+      const currentFieldValueOnSourceRecordIsARecordConnection =
+        isObjectRecordConnection(
+          targetObjectMetadataItem.nameSingular,
+          currentFieldValueOnSourceRecord,
         );
 
-      if (shouldCascadeDeleteTargetRecords) {
-        triggerDeleteRecordsOptimisticEffect({
-          cache,
-          objectMetadataItem: targetObjectMetadataItem,
-          recordsToDelete: targetRecordsToDetachFrom,
-          objectMetadataItems,
-        });
-      } else {
-        targetRecordsToDetachFrom.forEach((targetRecordToDetachFrom) => {
-          triggerDetachRelationOptimisticEffect({
+      const targetRecordsToDetachFrom =
+        currentFieldValueOnSourceRecordIsARecordConnection
+          ? currentFieldValueOnSourceRecord.edges.map(
+              ({ node }) => node as CachedObjectRecord,
+            )
+          : [currentFieldValueOnSourceRecord].filter(isDefined);
+
+      const updatedFieldValueOnSourceRecordIsARecordConnection =
+        isObjectRecordConnection(
+          targetObjectMetadataItem.nameSingular,
+          updatedFieldValueOnSourceRecord,
+        );
+
+      const targetRecordsToAttachTo =
+        updatedFieldValueOnSourceRecordIsARecordConnection
+          ? updatedFieldValueOnSourceRecord.edges.map(
+              ({ node }) => node as CachedObjectRecord,
+            )
+          : [updatedFieldValueOnSourceRecord].filter(isDefined);
+
+      const shouldDetachSourceFromAllTargets =
+        isDefined(currentSourceRecord) && targetRecordsToDetachFrom.length > 0;
+
+      if (shouldDetachSourceFromAllTargets) {
+        // TODO: see if we can de-hardcode this, put cascade delete in relation metadata item
+        //   Instead of hardcoding it here
+        const shouldCascadeDeleteTargetRecords =
+          CORE_OBJECT_NAMES_TO_DELETE_ON_TRIGGER_RELATION_DETACH.includes(
+            targetObjectMetadataItem.nameSingular as CoreObjectNameSingular,
+          );
+
+        if (shouldCascadeDeleteTargetRecords) {
+          triggerDeleteRecordsOptimisticEffect({
+            cache,
+            objectMetadataItem: targetObjectMetadataItem,
+            recordsToDelete: targetRecordsToDetachFrom,
+            objectMetadataItems,
+          });
+        } else {
+          targetRecordsToDetachFrom.forEach((targetRecordToDetachFrom) => {
+            triggerDetachRelationOptimisticEffect({
+              cache,
+              sourceObjectNameSingular: sourceObjectMetadataItem.nameSingular,
+              sourceRecordId: currentSourceRecord.id,
+              fieldNameOnTargetRecord: fieldMetadataItemOnTargetRecord.name,
+              targetObjectNameSingular: targetObjectMetadataItem.nameSingular,
+              targetRecordId: targetRecordToDetachFrom.id,
+            });
+          });
+        }
+      }
+
+      const shouldAttachSourceToAllTargets =
+        isDefined(updatedSourceRecord) && targetRecordsToAttachTo.length > 0;
+
+      if (shouldAttachSourceToAllTargets) {
+        targetRecordsToAttachTo.forEach((targetRecordToAttachTo) =>
+          triggerAttachRelationOptimisticEffect({
             cache,
             sourceObjectNameSingular: sourceObjectMetadataItem.nameSingular,
-            sourceRecordId: currentSourceRecord.id,
+            sourceRecordId: updatedSourceRecord.id,
             fieldNameOnTargetRecord: fieldMetadataItemOnTargetRecord.name,
             targetObjectNameSingular: targetObjectMetadataItem.nameSingular,
-            targetRecordId: targetRecordToDetachFrom.id,
-          });
-        });
+            targetRecordId: targetRecordToAttachTo.id,
+          }),
+        );
       }
-    }
-
-    const shouldAttachSourceToAllTargets =
-      updatedSourceRecord && targetRecordsToAttachTo.length;
-
-    if (shouldAttachSourceToAllTargets) {
-      targetRecordsToAttachTo.forEach((targetRecordToAttachTo) =>
-        triggerAttachRelationOptimisticEffect({
-          cache,
-          sourceObjectNameSingular: sourceObjectMetadataItem.nameSingular,
-          sourceRecordId: updatedSourceRecord.id,
-          fieldNameOnTargetRecord: fieldMetadataItemOnTargetRecord.name,
-          targetObjectNameSingular: targetObjectMetadataItem.nameSingular,
-          targetRecordId: targetRecordToAttachTo.id,
-        }),
-      );
-    }
-  });
+    },
+  );
+};
diff --git a/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.ts b/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.ts
index 7bd43be26a84..d0ba37512438 100644
--- a/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.ts
+++ b/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.ts
@@ -41,8 +41,8 @@ const makeRequest = async () => {
 
   await client.mutate({
     mutation: gql`
-      mutation CreateEvent($type: String!, $data: JSON!) {
-        createEvent(type: $type, data: $data) {
+      mutation Track($type: String!, $data: JSON!) {
+        track(type: $type, data: $data) {
           success
         }
       }
diff --git a/packages/twenty-front/src/modules/apollo/services/apollo.factory.ts b/packages/twenty-front/src/modules/apollo/services/apollo.factory.ts
index 23b4612f5bdc..bb7f3851e006 100644
--- a/packages/twenty-front/src/modules/apollo/services/apollo.factory.ts
+++ b/packages/twenty-front/src/modules/apollo/services/apollo.factory.ts
@@ -14,7 +14,7 @@ import { createUploadLink } from 'apollo-upload-client';
 
 import { renewToken } from '@/auth/services/AuthService';
 import { AuthTokenPair } from '~/generated/graphql';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 import { logDebug } from '~/utils/logDebug';
 
 import { ApolloManager } from '../types/apolloManager.interface';
@@ -60,6 +60,7 @@ export class ApolloFactory<TCacheShape> implements ApolloManager<TCacheShape> {
         return {
           headers: {
             ...headers,
+            ...options.headers,
             authorization: this.tokenPair?.accessToken.token
               ? `Bearer ${this.tokenPair?.accessToken.token}`
               : '',
@@ -78,7 +79,7 @@ export class ApolloFactory<TCacheShape> implements ApolloManager<TCacheShape> {
       });
       const errorLink = onError(
         ({ graphQLErrors, networkError, forward, operation }) => {
-          if (graphQLErrors) {
+          if (isDefined(graphQLErrors)) {
             onErrorCb?.(graphQLErrors);
 
             for (const graphQLError of graphQLErrors) {
@@ -86,7 +87,9 @@ export class ApolloFactory<TCacheShape> implements ApolloManager<TCacheShape> {
                 return fromPromise(
                   renewToken(uri, this.tokenPair)
                     .then((tokens) => {
-                      onTokenPairChange?.(tokens);
+                      if (isDefined(tokens)) {
+                        onTokenPairChange?.(tokens);
+                      }
                     })
                     .catch(() => {
                       onUnauthenticatedError?.();
@@ -99,7 +102,9 @@ export class ApolloFactory<TCacheShape> implements ApolloManager<TCacheShape> {
                   return fromPromise(
                     renewToken(uri, this.tokenPair)
                       .then((tokens) => {
-                        onTokenPairChange?.(tokens);
+                        if (isDefined(tokens)) {
+                          onTokenPairChange?.(tokens);
+                        }
                       })
                       .catch(() => {
                         onUnauthenticatedError?.();
@@ -107,7 +112,7 @@ export class ApolloFactory<TCacheShape> implements ApolloManager<TCacheShape> {
                   ).flatMap(() => forward(operation));
                 }
                 default:
-                  if (isDebugMode) {
+                  if (isDebugMode === true) {
                     logDebug(
                       `[GraphQL error]: Message: ${
                         graphQLError.message
@@ -122,8 +127,8 @@ export class ApolloFactory<TCacheShape> implements ApolloManager<TCacheShape> {
             }
           }
 
-          if (networkError) {
-            if (isDebugMode) {
+          if (isDefined(networkError)) {
+            if (isDebugMode === true) {
               logDebug(`[Network error]: ${networkError}`);
             }
             onNetworkError?.(networkError);
@@ -139,7 +144,7 @@ export class ApolloFactory<TCacheShape> implements ApolloManager<TCacheShape> {
           isDebugMode ? logger : null,
           retryLink,
           httpLink,
-        ].filter(isNonNullable),
+        ].filter(isDefined),
       );
     };
 
diff --git a/packages/twenty-front/src/modules/apollo/utils/index.ts b/packages/twenty-front/src/modules/apollo/utils/index.ts
index d182601aa129..b57f427cf192 100644
--- a/packages/twenty-front/src/modules/apollo/utils/index.ts
+++ b/packages/twenty-front/src/modules/apollo/utils/index.ts
@@ -1,5 +1,6 @@
 import { ApolloLink, gql, Operation } from '@apollo/client';
 
+import { isDefined } from '~/utils/isDefined';
 import { logDebug } from '~/utils/logDebug';
 import { logError } from '~/utils/logError';
 
@@ -29,7 +30,9 @@ export const loggerLink = (getSchemaName: (operation: Operation) => string) =>
     const operationType = (operation.query.definitions[0] as any).operation;
     const headers = operation.getContext().headers;
 
-    const [queryName, query] = parseQuery(operation.query.loc!.source.body);
+    const [queryName, query] = parseQuery(
+      operation.query.loc?.source.body ?? '',
+    );
 
     if (operationType === 'subscription') {
       const date = new Date().toLocaleTimeString();
@@ -64,7 +67,7 @@ export const loggerLink = (getSchemaName: (operation: Operation) => string) =>
 
         getGroup(!hasError)(...titleArgs);
 
-        if (errors) {
+        if (isDefined(errors)) {
           errors.forEach((err: any) => {
             logDebug(
               `%c${err.message}`,
@@ -82,10 +85,10 @@ export const loggerLink = (getSchemaName: (operation: Operation) => string) =>
 
         logDebug('QUERY', query);
 
-        if (result.data) {
+        if (isDefined(result.data)) {
           logDebug('RESULT', result.data);
         }
-        if (errors) {
+        if (isDefined(errors)) {
           logDebug('ERRORS', errors);
         }
 
@@ -95,7 +98,7 @@ export const loggerLink = (getSchemaName: (operation: Operation) => string) =>
         logDebug(
           `${operationType} ${schemaName}::${queryName} (in ${time} ms)`,
         );
-        if (errors) {
+        if (isDefined(errors)) {
           logError(errors);
         }
       }
diff --git a/packages/twenty-front/src/modules/attachments/types/Attachment.ts b/packages/twenty-front/src/modules/attachments/types/Attachment.ts
index 657ce6b480fe..21f316d8e03c 100644
--- a/packages/twenty-front/src/modules/attachments/types/Attachment.ts
+++ b/packages/twenty-front/src/modules/attachments/types/Attachment.ts
@@ -1,6 +1,6 @@
 export type Attachment = {
   id: string;
-  createdAt: Date;
-  updatedAt: Date;
-  deletedAt: Date | null;
+  createdAt: string;
+  updatedAt: string;
+  deletedAt: string | null;
 };
diff --git a/packages/twenty-front/src/pages/auth/VerifyEffect.tsx b/packages/twenty-front/src/modules/auth/components/VerifyEffect.tsx
similarity index 97%
rename from packages/twenty-front/src/pages/auth/VerifyEffect.tsx
rename to packages/twenty-front/src/modules/auth/components/VerifyEffect.tsx
index cda60b1bc447..81cb710659a3 100644
--- a/packages/twenty-front/src/pages/auth/VerifyEffect.tsx
+++ b/packages/twenty-front/src/modules/auth/components/VerifyEffect.tsx
@@ -20,7 +20,7 @@ export const VerifyEffect = () => {
   useEffect(() => {
     const getTokens = async () => {
       if (!loginToken) {
-        navigate(AppPath.SignIn);
+        navigate(AppPath.SignInUp);
       } else {
         await verify(loginToken);
 
diff --git a/packages/twenty-front/src/modules/auth/graphql/mutations/authorizeApp.ts b/packages/twenty-front/src/modules/auth/graphql/mutations/authorizeApp.ts
new file mode 100644
index 000000000000..5beaadc818be
--- /dev/null
+++ b/packages/twenty-front/src/modules/auth/graphql/mutations/authorizeApp.ts
@@ -0,0 +1,9 @@
+import { gql } from '@apollo/client';
+
+export const AUTHORIZE_APP = gql`
+  mutation authorizeApp($clientId: String!, $codeChallenge: String!) {
+    authorizeApp(clientId: $clientId, codeChallenge: $codeChallenge) {
+      redirectUrl
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/auth/graphql/mutations/generateJWT.ts b/packages/twenty-front/src/modules/auth/graphql/mutations/generateJWT.ts
new file mode 100644
index 000000000000..7f7d19ae71be
--- /dev/null
+++ b/packages/twenty-front/src/modules/auth/graphql/mutations/generateJWT.ts
@@ -0,0 +1,11 @@
+import { gql } from '@apollo/client';
+
+export const GENERATE_JWT = gql`
+  mutation GenerateJWT($workspaceId: String!) {
+    generateJWT(workspaceId: $workspaceId) {
+      tokens {
+        ...AuthTokensFragment
+      }
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/auth/graphql/mutations/renewToken.ts b/packages/twenty-front/src/modules/auth/graphql/mutations/renewToken.ts
index 6e7048faf932..46bf00ffe44e 100644
--- a/packages/twenty-front/src/modules/auth/graphql/mutations/renewToken.ts
+++ b/packages/twenty-front/src/modules/auth/graphql/mutations/renewToken.ts
@@ -1,8 +1,8 @@
 import { gql } from '@apollo/client';
 
 export const RENEW_TOKEN = gql`
-  mutation RenewToken($refreshToken: String!) {
-    renewToken(refreshToken: $refreshToken) {
+  mutation RenewToken($appToken: String!) {
+    renewToken(appToken: $appToken) {
       tokens {
         ...AuthTokensFragment
       }
diff --git a/packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts b/packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts
index ab47fa3afd21..c57337c914c9 100644
--- a/packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts
@@ -21,6 +21,9 @@ const currentWorkspace = {
   activationStatus: 'active',
   id: '1',
   allowImpersonation: true,
+  currentBillingSubscription: {
+    status: 'trialing',
+  },
 };
 const currentWorkspaceMember = {
   id: '1',
@@ -104,7 +107,13 @@ describe('useOnboardingStatus', () => {
         ...currentWorkspace,
         subscriptionStatus: 'canceled',
       });
-      setCurrentWorkspaceMember(currentWorkspaceMember);
+      setCurrentWorkspaceMember({
+        ...currentWorkspaceMember,
+        name: {
+          firstName: 'John',
+          lastName: 'Doe',
+        },
+      });
     });
 
     expect(result.current.onboardingStatus).toBe('canceled');
@@ -178,4 +187,91 @@ describe('useOnboardingStatus', () => {
 
     expect(result.current.onboardingStatus).toBe('completed');
   });
+
+  it('should return "past_due"', async () => {
+    const { result } = renderHooks();
+    const {
+      setTokenPair,
+      setBilling,
+      setCurrentWorkspace,
+      setCurrentWorkspaceMember,
+    } = result.current;
+
+    act(() => {
+      setTokenPair(tokenPair);
+      setBilling(billing);
+      setCurrentWorkspace({
+        ...currentWorkspace,
+        subscriptionStatus: 'past_due',
+      });
+      setCurrentWorkspaceMember({
+        ...currentWorkspaceMember,
+        name: {
+          firstName: 'John',
+          lastName: 'Doe',
+        },
+      });
+    });
+
+    expect(result.current.onboardingStatus).toBe('past_due');
+  });
+
+  it('should return "unpaid"', async () => {
+    const { result } = renderHooks();
+    const {
+      setTokenPair,
+      setBilling,
+      setCurrentWorkspace,
+      setCurrentWorkspaceMember,
+    } = result.current;
+
+    act(() => {
+      setTokenPair(tokenPair);
+      setBilling(billing);
+      setCurrentWorkspace({
+        ...currentWorkspace,
+        subscriptionStatus: 'unpaid',
+      });
+      setCurrentWorkspaceMember({
+        ...currentWorkspaceMember,
+        name: {
+          firstName: 'John',
+          lastName: 'Doe',
+        },
+      });
+    });
+
+    expect(result.current.onboardingStatus).toBe('unpaid');
+  });
+
+  it('should return "completed_without_subscription"', async () => {
+    const { result } = renderHooks();
+    const {
+      setTokenPair,
+      setBilling,
+      setCurrentWorkspace,
+      setCurrentWorkspaceMember,
+    } = result.current;
+
+    act(() => {
+      setTokenPair(tokenPair);
+      setBilling(billing);
+      setCurrentWorkspace({
+        ...currentWorkspace,
+        subscriptionStatus: 'trialing',
+        currentBillingSubscription: null,
+      });
+      setCurrentWorkspaceMember({
+        ...currentWorkspaceMember,
+        name: {
+          firstName: 'John',
+          lastName: 'Doe',
+        },
+      });
+    });
+
+    expect(result.current.onboardingStatus).toBe(
+      'completed_without_subscription',
+    );
+  });
 });
diff --git a/packages/twenty-front/src/modules/auth/hooks/useAuth.ts b/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
index 33c1170d8558..dce9f59424dd 100644
--- a/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
@@ -10,22 +10,26 @@ import {
 
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { isCurrentUserLoadedState } from '@/auth/states/isCurrentUserLoadingState.ts';
 import { isVerifyPendingState } from '@/auth/states/isVerifyPendingState';
+import { workspacesState } from '@/auth/states/workspaces';
 import { authProvidersState } from '@/client-config/states/authProvidersState';
 import { billingState } from '@/client-config/states/billingState';
+import { isClientConfigLoadedState } from '@/client-config/states/isClientConfigLoadedState';
 import { isDebugModeState } from '@/client-config/states/isDebugModeState';
 import { isSignInPrefilledState } from '@/client-config/states/isSignInPrefilledState';
 import { supportChatState } from '@/client-config/states/supportChatState';
 import { telemetryState } from '@/client-config/states/telemetryState';
 import { iconsState } from '@/ui/display/icon/states/iconsState';
 import { ColorScheme } from '@/workspace-member/types/WorkspaceMember';
-import { REACT_APP_SERVER_AUTH_URL } from '~/config';
+import { REACT_APP_SERVER_BASE_URL } from '~/config';
 import {
   useChallengeMutation,
   useCheckUserExistsLazyQuery,
   useSignUpMutation,
   useVerifyMutation,
 } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
 
 import { currentUserState } from '../states/currentUserState';
 import { tokenPairState } from '../states/tokenPairState';
@@ -39,6 +43,7 @@ export const useAuth = () => {
 
   const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
   const setIsVerifyPendingState = useSetRecoilState(isVerifyPendingState);
+  const setWorkspaces = useSetRecoilState(workspacesState);
 
   const [challenge] = useChallengeMutation();
   const [signUp] = useSignUpMutation();
@@ -59,7 +64,7 @@ export const useAuth = () => {
         },
       });
 
-      if (challengeResult.errors) {
+      if (isDefined(challengeResult.errors)) {
         throw challengeResult.errors;
       }
 
@@ -78,7 +83,7 @@ export const useAuth = () => {
         variables: { loginToken },
       });
 
-      if (verifyResult.errors) {
+      if (isDefined(verifyResult.errors)) {
         throw verifyResult.errors;
       }
 
@@ -91,7 +96,7 @@ export const useAuth = () => {
       const user = verifyResult.data?.verify.user;
       let workspaceMember = null;
       setCurrentUser(user);
-      if (user.workspaceMember) {
+      if (isDefined(user.workspaceMember)) {
         workspaceMember = {
           ...user.workspaceMember,
           colorScheme: user.workspaceMember?.colorScheme as ColorScheme,
@@ -100,6 +105,16 @@ export const useAuth = () => {
       }
       const workspace = user.defaultWorkspace ?? null;
       setCurrentWorkspace(workspace);
+      if (isDefined(verifyResult.data?.verify.user.workspaces)) {
+        const validWorkspaces = verifyResult.data?.verify.user.workspaces
+          .filter(
+            ({ workspace }) => workspace !== null && workspace !== undefined,
+          )
+          .map((validWorkspace) => validWorkspace.workspace)
+          .filter(isDefined);
+
+        setWorkspaces(validWorkspaces);
+      }
       return {
         user,
         workspaceMember,
@@ -113,6 +128,7 @@ export const useAuth = () => {
       setCurrentUser,
       setCurrentWorkspaceMember,
       setCurrentWorkspace,
+      setWorkspaces,
     ],
   );
 
@@ -151,8 +167,16 @@ export const useAuth = () => {
         const supportChat = snapshot.getLoadable(supportChatState).getValue();
         const telemetry = snapshot.getLoadable(telemetryState).getValue();
         const isDebugMode = snapshot.getLoadable(isDebugModeState).getValue();
+        const isClientConfigLoaded = snapshot
+          .getLoadable(isClientConfigLoadedState)
+          .getValue();
+        const isCurrentUserLoaded = snapshot
+          .getLoadable(isCurrentUserLoadedState)
+          .getValue();
 
         const initialSnapshot = emptySnapshot.map(({ set }) => {
+          set(isClientConfigLoadedState, isClientConfigLoaded);
+          set(isCurrentUserLoadedState, isCurrentUserLoaded);
           set(iconsState, iconsValue);
           set(authProvidersState, authProvidersValue);
           set(billingState, billing);
@@ -183,7 +207,7 @@ export const useAuth = () => {
         },
       });
 
-      if (signUpResult.errors) {
+      if (isDefined(signUpResult.errors)) {
         throw signUpResult.errors;
       }
 
@@ -203,9 +227,9 @@ export const useAuth = () => {
   );
 
   const handleGoogleLogin = useCallback((workspaceInviteHash?: string) => {
-    const authServerUrl = REACT_APP_SERVER_AUTH_URL;
+    const authServerUrl = REACT_APP_SERVER_BASE_URL;
     window.location.href =
-      `${authServerUrl}/google/${
+      `${authServerUrl}/auth/google/${
         workspaceInviteHash ? '?inviteHash=' + workspaceInviteHash : ''
       }` || '';
   }, []);
diff --git a/packages/twenty-front/src/modules/auth/services/AuthService.ts b/packages/twenty-front/src/modules/auth/services/AuthService.ts
index d39338d5090a..c4c8f1f43a13 100644
--- a/packages/twenty-front/src/modules/auth/services/AuthService.ts
+++ b/packages/twenty-front/src/modules/auth/services/AuthService.ts
@@ -13,15 +13,11 @@ import {
   RenewTokenMutation,
   RenewTokenMutationVariables,
 } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 const logger = loggerLink(() => 'Twenty-Refresh');
 
-/**
- * Renew token mutation with custom apollo client
- * @param uri string | UriFunction | undefined
- * @param refreshToken string
- * @returns RenewTokenMutation
- */
 const renewTokenMutation = async (
   uri: string | UriFunction | undefined,
   refreshToken: string,
@@ -40,23 +36,18 @@ const renewTokenMutation = async (
   >({
     mutation: RenewTokenDocument,
     variables: {
-      refreshToken: refreshToken,
+      appToken: refreshToken,
     },
     fetchPolicy: 'network-only',
   });
 
-  if (errors || !data) {
+  if (isDefined(errors) || isUndefinedOrNull(data)) {
     throw new Error('Something went wrong during token renewal');
   }
 
   return data;
 };
 
-/**
- * Renew token and update cookie storage
- * @param uri string | UriFunction | undefined
- * @returns TokenPair
- */
 export const renewToken = async (
   uri: string | UriFunction | undefined,
   tokenPair: AuthTokenPair | undefined | null,
@@ -67,5 +58,5 @@ export const renewToken = async (
 
   const data = await renewTokenMutation(uri, tokenPair.refreshToken.token);
 
-  return data.renewToken.tokens;
+  return data?.renewToken.tokens;
 };
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpForm.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpForm.tsx
index bc1997f2d483..1825542e4d8b 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpForm.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpForm.tsx
@@ -54,6 +54,7 @@ export const SignInUpForm = () => {
   const { form } = useSignInUpForm();
 
   const {
+    isInviteMode,
     signInUpStep,
     signInUpMode,
     continueWithCredentials,
@@ -70,8 +71,10 @@ export const SignInUpForm = () => {
       } else if (signInUpStep === SignInUpStep.Email) {
         continueWithCredentials();
       } else if (signInUpStep === SignInUpStep.Password) {
-        setShowErrors(true);
-        form.handleSubmit(submitCredentials)();
+        if (!form.formState.isSubmitting) {
+          setShowErrors(true);
+          form.handleSubmit(submitCredentials)();
+        }
       }
     }
   };
@@ -89,14 +92,21 @@ export const SignInUpForm = () => {
   }, [signInUpMode, signInUpStep]);
 
   const title = useMemo(() => {
-    if (signInUpMode === SignInUpMode.Invite) {
+    if (isInviteMode) {
       return `Join ${workspace?.displayName ?? ''} team`;
     }
 
+    if (
+      signInUpStep === SignInUpStep.Init ||
+      signInUpStep === SignInUpStep.Email
+    ) {
+      return 'Welcome to Twenty';
+    }
+
     return signInUpMode === SignInUpMode.SignIn
       ? 'Sign in to Twenty'
       : 'Sign up to Twenty';
-  }, [signInUpMode, workspace?.displayName]);
+  }, [signInUpMode, workspace?.displayName, isInviteMode, signInUpStep]);
 
   const theme = useTheme();
 
@@ -217,7 +227,7 @@ export const SignInUpForm = () => {
             }}
             Icon={() => form.formState.isSubmitting && <Loader />}
             disabled={
-              SignInUpStep.Init
+              signInUpStep === SignInUpStep.Init
                 ? false
                 : signInUpStep === SignInUpStep.Email
                   ? !form.watch('email')
@@ -229,14 +239,14 @@ export const SignInUpForm = () => {
           />
         </StyledForm>
       </StyledContentContainer>
-      {signInUpStep === SignInUpStep.Password ? (
+      {signInUpStep === SignInUpStep.Password && (
         <ActionLink onClick={handleResetPassword(form.getValues('email'))}>
           Forgot your password?
         </ActionLink>
-      ) : (
+      )}
+      {signInUpStep === SignInUpStep.Init && (
         <FooterNote>
-          By using Twenty, you agree to the Terms of Service and Data Processing
-          Agreement.
+          By using Twenty, you agree to the Terms of Service and Privacy Policy.
         </FooterNote>
       )}
     </>
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResetPassword.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResetPassword.ts
index b4dd9f67ec1d..0a0feb5f6323 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResetPassword.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResetPassword.ts
@@ -1,6 +1,6 @@
 import { useCallback } from 'react';
 
-import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar.tsx';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { useEmailPasswordResetLinkMutation } from '~/generated/graphql.tsx';
 
 export const useHandleResetPassword = () => {
@@ -22,7 +22,7 @@ export const useHandleResetPassword = () => {
             variables: { email },
           });
 
-          if (data?.emailPasswordResetLink?.success) {
+          if (data?.emailPasswordResetLink?.success === true) {
             enqueueSnackBar('Password reset link has been sent to the email', {
               variant: 'success',
             });
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useNavigateAfterSignInUp.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useNavigateAfterSignInUp.ts
index 1b93836b03a8..ef0e9b6cc81d 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useNavigateAfterSignInUp.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useNavigateAfterSignInUp.ts
@@ -3,6 +3,7 @@ import { useNavigate } from 'react-router-dom';
 import { useRecoilValue } from 'recoil';
 
 import { CurrentWorkspace } from '@/auth/states/currentWorkspaceState.ts';
+import { previousUrlState } from '@/auth/states/previousUrlState';
 import { billingState } from '@/client-config/states/billingState.ts';
 import { AppPath } from '@/types/AppPath.ts';
 import { WorkspaceMember } from '~/generated/graphql.tsx';
@@ -10,13 +11,14 @@ import { WorkspaceMember } from '~/generated/graphql.tsx';
 export const useNavigateAfterSignInUp = () => {
   const navigate = useNavigate();
   const billing = useRecoilValue(billingState);
+  const previousUrl = useRecoilValue(previousUrlState);
   const navigateAfterSignInUp = useCallback(
     (
       currentWorkspace: CurrentWorkspace,
       currentWorkspaceMember: WorkspaceMember | null,
     ) => {
       if (
-        billing?.isBillingEnabled &&
+        billing?.isBillingEnabled === true &&
         !['active', 'trialing'].includes(currentWorkspace.subscriptionStatus)
       ) {
         navigate(AppPath.PlanRequired);
@@ -35,10 +37,10 @@ export const useNavigateAfterSignInUp = () => {
         navigate(AppPath.CreateProfile);
         return;
       }
-
-      navigate(AppPath.Index);
+      if (previousUrl !== '') navigate(previousUrl);
+      else navigate(AppPath.Index);
     },
-    [billing, navigate],
+    [billing, previousUrl, navigate],
   );
   return { navigateAfterSignInUp };
 };
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.tsx
index cbc4d5192b08..c149943638ef 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.tsx
@@ -15,7 +15,6 @@ import { useAuth } from '../../hooks/useAuth';
 export enum SignInUpMode {
   SignIn = 'sign-in',
   SignUp = 'sign-up',
-  Invite = 'invite',
 }
 
 export enum SignInUpStep {
@@ -33,16 +32,14 @@ export const useSignInUp = (form: UseFormReturn<Form>) => {
 
   const { navigateAfterSignInUp } = useNavigateAfterSignInUp();
 
+  const [isInviteMode] = useState(() => isMatchingLocation(AppPath.Invite));
+
   const [signInUpStep, setSignInUpStep] = useState<SignInUpStep>(
     SignInUpStep.Init,
   );
 
   const [signInUpMode, setSignInUpMode] = useState<SignInUpMode>(() => {
-    if (isMatchingLocation(AppPath.Invite)) {
-      return SignInUpMode.Invite;
-    }
-
-    return isMatchingLocation(AppPath.SignIn)
+    return isMatchingLocation(AppPath.SignInUp)
       ? SignInUpMode.SignIn
       : SignInUpMode.SignUp;
   });
@@ -56,7 +53,7 @@ export const useSignInUp = (form: UseFormReturn<Form>) => {
   const continueWithEmail = useCallback(() => {
     setSignInUpStep(SignInUpStep.Email);
     setSignInUpMode(
-      isMatchingLocation(AppPath.SignIn)
+      isMatchingLocation(AppPath.SignInUp)
         ? SignInUpMode.SignIn
         : SignInUpMode.SignUp,
     );
@@ -72,24 +69,14 @@ export const useSignInUp = (form: UseFormReturn<Form>) => {
       },
       onCompleted: (data) => {
         if (data?.checkUserExists.exists) {
-          isMatchingLocation(AppPath.Invite)
-            ? setSignInUpMode(SignInUpMode.Invite)
-            : setSignInUpMode(SignInUpMode.SignIn);
+          setSignInUpMode(SignInUpMode.SignIn);
         } else {
-          isMatchingLocation(AppPath.Invite)
-            ? setSignInUpMode(SignInUpMode.Invite)
-            : setSignInUpMode(SignInUpMode.SignUp);
+          setSignInUpMode(SignInUpMode.SignUp);
         }
         setSignInUpStep(SignInUpStep.Password);
       },
     });
-  }, [
-    isMatchingLocation,
-    setSignInUpStep,
-    checkUserExistsQuery,
-    form,
-    setSignInUpMode,
-  ]);
+  }, [setSignInUpStep, checkUserExistsQuery, form, setSignInUpMode]);
 
   const submitCredentials: SubmitHandler<Form> = useCallback(
     async (data) => {
@@ -102,7 +89,7 @@ export const useSignInUp = (form: UseFormReturn<Form>) => {
           workspace: currentWorkspace,
           workspaceMember: currentWorkspaceMember,
         } =
-          signInUpMode === SignInUpMode.SignIn
+          signInUpMode === SignInUpMode.SignIn && !isInviteMode
             ? await signInWithCredentials(
                 data.email.toLowerCase().trim(),
                 data.password,
@@ -122,6 +109,7 @@ export const useSignInUp = (form: UseFormReturn<Form>) => {
     },
     [
       signInUpMode,
+      isInviteMode,
       signInWithCredentials,
       signUpWithCredentials,
       workspaceInviteHash,
@@ -156,6 +144,7 @@ export const useSignInUp = (form: UseFormReturn<Form>) => {
   );
 
   return {
+    isInviteMode,
     signInUpStep,
     signInUpMode,
     continueWithCredentials,
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUpForm.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUpForm.ts
index 591abf368fb2..77a555fa95b7 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUpForm.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUpForm.ts
@@ -29,7 +29,7 @@ export const useSignInUpForm = () => {
   });
 
   useEffect(() => {
-    if (isSignInPrefilled) {
+    if (isSignInPrefilled === true) {
       form.setValue('email', 'tim@apple.dev');
       form.setValue('password', 'Applecar2025');
     }
diff --git a/packages/twenty-front/src/modules/auth/states/currentUserState.ts b/packages/twenty-front/src/modules/auth/states/currentUserState.ts
index db3ed7b67dec..4f1b3130e3c1 100644
--- a/packages/twenty-front/src/modules/auth/states/currentUserState.ts
+++ b/packages/twenty-front/src/modules/auth/states/currentUserState.ts
@@ -1,4 +1,4 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { User } from '~/generated/graphql';
 
@@ -7,7 +7,7 @@ export type CurrentUser = Pick<
   'id' | 'email' | 'supportUserHash' | 'canImpersonate'
 >;
 
-export const currentUserState = atom<CurrentUser | null>({
+export const currentUserState = createState<CurrentUser | null>({
   key: 'currentUserState',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/auth/states/currentWorkspaceMemberState.ts b/packages/twenty-front/src/modules/auth/states/currentWorkspaceMemberState.ts
index 938e304a6f04..37140a4501c4 100644
--- a/packages/twenty-front/src/modules/auth/states/currentWorkspaceMemberState.ts
+++ b/packages/twenty-front/src/modules/auth/states/currentWorkspaceMemberState.ts
@@ -1,11 +1,11 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
 
-export const currentWorkspaceMemberState = atom<Omit<
+export const currentWorkspaceMemberState = createState<Omit<
   WorkspaceMember,
   'createdAt' | 'updatedAt' | 'userId' | 'userEmail'
 > | null>({
   key: 'currentWorkspaceMemberState',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts b/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts
index 594d16e1bb56..c9187c3ea694 100644
--- a/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts
+++ b/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts
@@ -1,4 +1,4 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { Workspace } from '~/generated/graphql';
 
@@ -12,9 +12,11 @@ export type CurrentWorkspace = Pick<
   | 'featureFlags'
   | 'subscriptionStatus'
   | 'activationStatus'
+  | 'currentBillingSubscription'
+  | 'currentCacheVersion'
 >;
 
-export const currentWorkspaceState = atom<CurrentWorkspace | null>({
+export const currentWorkspaceState = createState<CurrentWorkspace | null>({
   key: 'currentWorkspaceState',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/auth/states/isCurrentUserLoadingState.ts b/packages/twenty-front/src/modules/auth/states/isCurrentUserLoadingState.ts
new file mode 100644
index 000000000000..0a62d92ab4cf
--- /dev/null
+++ b/packages/twenty-front/src/modules/auth/states/isCurrentUserLoadingState.ts
@@ -0,0 +1,6 @@
+import { createState } from 'twenty-ui';
+
+export const isCurrentUserLoadedState = createState<boolean>({
+  key: 'isCurrentUserLoadedState',
+  defaultValue: false,
+});
diff --git a/packages/twenty-front/src/modules/auth/states/isVerifyPendingState.ts b/packages/twenty-front/src/modules/auth/states/isVerifyPendingState.ts
index 6986efab0d9c..567910389ba5 100644
--- a/packages/twenty-front/src/modules/auth/states/isVerifyPendingState.ts
+++ b/packages/twenty-front/src/modules/auth/states/isVerifyPendingState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const isVerifyPendingState = atom<boolean>({
+export const isVerifyPendingState = createState<boolean>({
   key: 'isVerifyPendingState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/auth/states/previousUrlState.ts b/packages/twenty-front/src/modules/auth/states/previousUrlState.ts
new file mode 100644
index 000000000000..1de274fb18c5
--- /dev/null
+++ b/packages/twenty-front/src/modules/auth/states/previousUrlState.ts
@@ -0,0 +1,6 @@
+import { createState } from 'twenty-ui';
+
+export const previousUrlState = createState<string>({
+  key: 'previousUrlState',
+  defaultValue: '',
+});
diff --git a/packages/twenty-front/src/modules/auth/states/tokenPairState.ts b/packages/twenty-front/src/modules/auth/states/tokenPairState.ts
index 2bf851df4212..f6262b5aef32 100644
--- a/packages/twenty-front/src/modules/auth/states/tokenPairState.ts
+++ b/packages/twenty-front/src/modules/auth/states/tokenPairState.ts
@@ -1,10 +1,10 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { AuthTokenPair } from '~/generated/graphql';
 import { cookieStorageEffect } from '~/utils/recoil-effects';
 
-export const tokenPairState = atom<AuthTokenPair | null>({
+export const tokenPairState = createState<AuthTokenPair | null>({
   key: 'tokenPairState',
-  default: null,
+  defaultValue: null,
   effects: [cookieStorageEffect('tokenPair')],
 });
diff --git a/packages/twenty-front/src/modules/auth/states/workspaces.ts b/packages/twenty-front/src/modules/auth/states/workspaces.ts
new file mode 100644
index 000000000000..d211351b08d2
--- /dev/null
+++ b/packages/twenty-front/src/modules/auth/states/workspaces.ts
@@ -0,0 +1,10 @@
+import { createState } from 'twenty-ui';
+
+import { Workspace } from '~/generated/graphql';
+
+export type Workspaces = Pick<Workspace, 'id' | 'logo' | 'displayName'>;
+
+export const workspacesState = createState<Workspaces[] | null>({
+  key: 'workspacesState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts b/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts
index 4479e730e5cd..1f12af76b291 100644
--- a/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts
+++ b/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts
@@ -4,10 +4,13 @@ import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
 export enum OnboardingStatus {
   Incomplete = 'incomplete',
   Canceled = 'canceled',
+  Unpaid = 'unpaid',
+  PastDue = 'past_due',
   OngoingUserCreation = 'ongoing_user_creation',
   OngoingWorkspaceActivation = 'ongoing_workspace_activation',
   OngoingProfileCreation = 'ongoing_profile_creation',
   Completed = 'completed',
+  CompletedWithoutSubscription = 'completed_without_subscription',
 }
 
 export const getOnboardingStatus = ({
@@ -35,16 +38,12 @@ export const getOnboardingStatus = ({
   }
 
   if (
-    isBillingEnabled &&
+    isBillingEnabled === true &&
     currentWorkspace.subscriptionStatus === 'incomplete'
   ) {
     return OnboardingStatus.Incomplete;
   }
 
-  if (isBillingEnabled && currentWorkspace.subscriptionStatus === 'canceled') {
-    return OnboardingStatus.Canceled;
-  }
-
   if (currentWorkspace.activationStatus !== 'active') {
     return OnboardingStatus.OngoingWorkspaceActivation;
   }
@@ -56,5 +55,33 @@ export const getOnboardingStatus = ({
     return OnboardingStatus.OngoingProfileCreation;
   }
 
+  if (
+    isBillingEnabled === true &&
+    currentWorkspace.subscriptionStatus === 'canceled'
+  ) {
+    return OnboardingStatus.Canceled;
+  }
+
+  if (
+    isBillingEnabled === true &&
+    currentWorkspace.subscriptionStatus === 'past_due'
+  ) {
+    return OnboardingStatus.PastDue;
+  }
+
+  if (
+    isBillingEnabled === true &&
+    currentWorkspace.subscriptionStatus === 'unpaid'
+  ) {
+    return OnboardingStatus.Unpaid;
+  }
+
+  if (
+    isBillingEnabled === true &&
+    !currentWorkspace.currentBillingSubscription
+  ) {
+    return OnboardingStatus.CompletedWithoutSubscription;
+  }
+
   return OnboardingStatus.Completed;
 };
diff --git a/packages/twenty-front/src/modules/billing/assets/cover-dark.png b/packages/twenty-front/src/modules/billing/assets/cover-dark.png
new file mode 100644
index 000000000000..d824a67048e0
Binary files /dev/null and b/packages/twenty-front/src/modules/billing/assets/cover-dark.png differ
diff --git a/packages/twenty-front/src/modules/billing/assets/cover-light.png b/packages/twenty-front/src/modules/billing/assets/cover-light.png
new file mode 100644
index 000000000000..31c4e56dd297
Binary files /dev/null and b/packages/twenty-front/src/modules/billing/assets/cover-light.png differ
diff --git a/packages/twenty-front/src/modules/billing/components/SettingsBillingCoverImage.tsx b/packages/twenty-front/src/modules/billing/components/SettingsBillingCoverImage.tsx
new file mode 100644
index 000000000000..b48ced04dd25
--- /dev/null
+++ b/packages/twenty-front/src/modules/billing/components/SettingsBillingCoverImage.tsx
@@ -0,0 +1,22 @@
+import styled from '@emotion/styled';
+
+import DarkCoverImage from '@/billing/assets/cover-dark.png';
+import LightCoverImage from '@/billing/assets/cover-light.png';
+
+const StyledCoverImageContainer = styled.div`
+  align-items: center;
+  background-image: ${({ theme }) =>
+    theme.name === 'light'
+      ? `url('${LightCoverImage.toString()}')`
+      : `url('${DarkCoverImage.toString()}')`};
+  background-size: contain;
+  background-repeat: no-repeat;
+  box-sizing: border-box;
+  display: flex;
+  height: 162px;
+  justify-content: center;
+  position: relative;
+`;
+export const SettingsBillingCoverImage = () => {
+  return <StyledCoverImageContainer />;
+};
diff --git a/packages/twenty-front/src/modules/billing/components/SubscriptionBenefit.tsx b/packages/twenty-front/src/modules/billing/components/SubscriptionBenefit.tsx
index 490d8f304790..f4feac748e1b 100644
--- a/packages/twenty-front/src/modules/billing/components/SubscriptionBenefit.tsx
+++ b/packages/twenty-front/src/modules/billing/components/SubscriptionBenefit.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-
-import { IconCheck } from '@/ui/display/icon';
+import { IconCheck } from 'twenty-ui';
 
 const StyledBenefitContainer = styled.div`
   color: ${({ theme }) => theme.font.color.secondary};
diff --git a/packages/twenty-front/src/modules/billing/graphql/billingPortalSession.ts b/packages/twenty-front/src/modules/billing/graphql/billingPortalSession.ts
new file mode 100644
index 000000000000..ba4f9ff3a1c0
--- /dev/null
+++ b/packages/twenty-front/src/modules/billing/graphql/billingPortalSession.ts
@@ -0,0 +1,9 @@
+import { gql } from '@apollo/client';
+
+export const BILLING_PORTAL_SESSION = gql`
+  query BillingPortalSession($returnUrlPath: String) {
+    billingPortalSession(returnUrlPath: $returnUrlPath) {
+      url
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/billing/graphql/checkout.ts b/packages/twenty-front/src/modules/billing/graphql/checkout.ts
deleted file mode 100644
index e2742d107494..000000000000
--- a/packages/twenty-front/src/modules/billing/graphql/checkout.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const CHECKOUT = gql`
-  mutation Checkout($recurringInterval: String!, $successUrlPath: String) {
-    checkout(
-      recurringInterval: $recurringInterval
-      successUrlPath: $successUrlPath
-    ) {
-      url
-    }
-  }
-`;
diff --git a/packages/twenty-front/src/modules/billing/graphql/checkoutSession.ts b/packages/twenty-front/src/modules/billing/graphql/checkoutSession.ts
new file mode 100644
index 000000000000..bff619a82f85
--- /dev/null
+++ b/packages/twenty-front/src/modules/billing/graphql/checkoutSession.ts
@@ -0,0 +1,15 @@
+import { gql } from '@apollo/client';
+
+export const CHECKOUT_SESSION = gql`
+  mutation CheckoutSession(
+    $recurringInterval: String!
+    $successUrlPath: String
+  ) {
+    checkoutSession(
+      recurringInterval: $recurringInterval
+      successUrlPath: $successUrlPath
+    ) {
+      url
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/billing/graphql/updateBillingSubscription.ts b/packages/twenty-front/src/modules/billing/graphql/updateBillingSubscription.ts
new file mode 100644
index 000000000000..2f75c7610b37
--- /dev/null
+++ b/packages/twenty-front/src/modules/billing/graphql/updateBillingSubscription.ts
@@ -0,0 +1,9 @@
+import { gql } from '@apollo/client';
+
+export const UPDATE_BILLING_SUBSCRIPTION = gql`
+  mutation UpdateBillingSubscription {
+    updateBillingSubscription {
+      success
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/client-config/components/ClientConfigProvider.tsx b/packages/twenty-front/src/modules/client-config/components/ClientConfigProvider.tsx
index f665c2b4e34c..671842687435 100644
--- a/packages/twenty-front/src/modules/client-config/components/ClientConfigProvider.tsx
+++ b/packages/twenty-front/src/modules/client-config/components/ClientConfigProvider.tsx
@@ -1,63 +1,11 @@
-import { useEffect } from 'react';
-import { useSetRecoilState } from 'recoil';
+import { useRecoilValue } from 'recoil';
 
-import { authProvidersState } from '@/client-config/states/authProvidersState';
-import { billingState } from '@/client-config/states/billingState';
-import { isDebugModeState } from '@/client-config/states/isDebugModeState';
-import { isSignInPrefilledState } from '@/client-config/states/isSignInPrefilledState';
-import { isSignUpDisabledState } from '@/client-config/states/isSignUpDisabledState';
-import { sentryConfigState } from '@/client-config/states/sentryConfigState';
-import { supportChatState } from '@/client-config/states/supportChatState';
-import { telemetryState } from '@/client-config/states/telemetryState';
-import { useGetClientConfigQuery } from '~/generated/graphql';
+import { isClientConfigLoadedState } from '@/client-config/states/isClientConfigLoadedState';
 
 export const ClientConfigProvider: React.FC<React.PropsWithChildren> = ({
   children,
 }) => {
-  const setAuthProviders = useSetRecoilState(authProvidersState);
-  const setIsDebugMode = useSetRecoilState(isDebugModeState);
+  const isClientConfigLoaded = useRecoilValue(isClientConfigLoadedState);
 
-  const setIsSignInPrefilled = useSetRecoilState(isSignInPrefilledState);
-  const setIsSignUpDisabled = useSetRecoilState(isSignUpDisabledState);
-
-  const setBilling = useSetRecoilState(billingState);
-  const setTelemetry = useSetRecoilState(telemetryState);
-  const setSupportChat = useSetRecoilState(supportChatState);
-
-  const setSentryConfig = useSetRecoilState(sentryConfigState);
-
-  const { data, loading } = useGetClientConfigQuery();
-
-  useEffect(() => {
-    if (data?.clientConfig) {
-      setAuthProviders({
-        google: data?.clientConfig.authProviders.google,
-        password: data?.clientConfig.authProviders.password,
-        magicLink: false,
-      });
-      setIsDebugMode(data?.clientConfig.debugMode);
-      setIsSignInPrefilled(data?.clientConfig.signInPrefilled);
-      setIsSignUpDisabled(data?.clientConfig.signUpDisabled);
-
-      setBilling(data?.clientConfig.billing);
-      setTelemetry(data?.clientConfig.telemetry);
-      setSupportChat(data?.clientConfig.support);
-
-      setSentryConfig({
-        dsn: data?.clientConfig?.sentry?.dsn,
-      });
-    }
-  }, [
-    data,
-    setAuthProviders,
-    setIsDebugMode,
-    setIsSignInPrefilled,
-    setIsSignUpDisabled,
-    setTelemetry,
-    setSupportChat,
-    setBilling,
-    setSentryConfig,
-  ]);
-
-  return loading ? <></> : <>{children}</>;
+  return isClientConfigLoaded ? <>{children}</> : <></>;
 };
diff --git a/packages/twenty-front/src/modules/client-config/components/ClientConfigProviderEffect.tsx b/packages/twenty-front/src/modules/client-config/components/ClientConfigProviderEffect.tsx
new file mode 100644
index 000000000000..976921d40742
--- /dev/null
+++ b/packages/twenty-front/src/modules/client-config/components/ClientConfigProviderEffect.tsx
@@ -0,0 +1,73 @@
+import { useEffect } from 'react';
+import { useRecoilState, useSetRecoilState } from 'recoil';
+
+import { authProvidersState } from '@/client-config/states/authProvidersState';
+import { billingState } from '@/client-config/states/billingState';
+import { isClientConfigLoadedState } from '@/client-config/states/isClientConfigLoadedState';
+import { isDebugModeState } from '@/client-config/states/isDebugModeState';
+import { isSignInPrefilledState } from '@/client-config/states/isSignInPrefilledState';
+import { isSignUpDisabledState } from '@/client-config/states/isSignUpDisabledState';
+import { sentryConfigState } from '@/client-config/states/sentryConfigState';
+import { supportChatState } from '@/client-config/states/supportChatState';
+import { telemetryState } from '@/client-config/states/telemetryState';
+import { useGetClientConfigQuery } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
+
+export const ClientConfigProviderEffect = () => {
+  const setAuthProviders = useSetRecoilState(authProvidersState);
+  const setIsDebugMode = useSetRecoilState(isDebugModeState);
+
+  const setIsSignInPrefilled = useSetRecoilState(isSignInPrefilledState);
+  const setIsSignUpDisabled = useSetRecoilState(isSignUpDisabledState);
+
+  const setBilling = useSetRecoilState(billingState);
+  const setTelemetry = useSetRecoilState(telemetryState);
+  const setSupportChat = useSetRecoilState(supportChatState);
+
+  const setSentryConfig = useSetRecoilState(sentryConfigState);
+  const [isClientConfigLoaded, setIsClientConfigLoaded] = useRecoilState(
+    isClientConfigLoadedState,
+  );
+
+  const { data, loading } = useGetClientConfigQuery({
+    skip: isClientConfigLoaded,
+  });
+
+  useEffect(() => {
+    if (!loading && isDefined(data?.clientConfig)) {
+      setIsClientConfigLoaded(true);
+      setAuthProviders({
+        google: data?.clientConfig.authProviders.google,
+        password: data?.clientConfig.authProviders.password,
+        magicLink: false,
+      });
+      setIsDebugMode(data?.clientConfig.debugMode);
+      setIsSignInPrefilled(data?.clientConfig.signInPrefilled);
+      setIsSignUpDisabled(data?.clientConfig.signUpDisabled);
+
+      setBilling(data?.clientConfig.billing);
+      setTelemetry(data?.clientConfig.telemetry);
+      setSupportChat(data?.clientConfig.support);
+
+      setSentryConfig({
+        dsn: data?.clientConfig?.sentry?.dsn,
+        release: data?.clientConfig?.sentry?.release,
+        environment: data?.clientConfig?.sentry?.environment,
+      });
+    }
+  }, [
+    data,
+    setAuthProviders,
+    setIsDebugMode,
+    setIsSignInPrefilled,
+    setIsSignUpDisabled,
+    setTelemetry,
+    setSupportChat,
+    setBilling,
+    setSentryConfig,
+    loading,
+    setIsClientConfigLoaded,
+  ]);
+
+  return <></>;
+};
diff --git a/packages/twenty-front/src/modules/client-config/graphql/queries/getClientConfig.ts b/packages/twenty-front/src/modules/client-config/graphql/queries/getClientConfig.ts
index aca84198a529..b076a544559a 100644
--- a/packages/twenty-front/src/modules/client-config/graphql/queries/getClientConfig.ts
+++ b/packages/twenty-front/src/modules/client-config/graphql/queries/getClientConfig.ts
@@ -25,6 +25,8 @@ export const GET_CLIENT_CONFIG = gql`
       }
       sentry {
         dsn
+        environment
+        release
       }
     }
   }
diff --git a/packages/twenty-front/src/modules/client-config/states/authProvidersState.ts b/packages/twenty-front/src/modules/client-config/states/authProvidersState.ts
index e0b087fa4073..6ea130303ac6 100644
--- a/packages/twenty-front/src/modules/client-config/states/authProvidersState.ts
+++ b/packages/twenty-front/src/modules/client-config/states/authProvidersState.ts
@@ -1,8 +1,8 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { AuthProviders } from '~/generated/graphql';
 
-export const authProvidersState = atom<AuthProviders>({
+export const authProvidersState = createState<AuthProviders>({
   key: 'authProvidersState',
-  default: { google: false, magicLink: false, password: true },
+  defaultValue: { google: false, magicLink: false, password: true },
 });
diff --git a/packages/twenty-front/src/modules/client-config/states/billingState.ts b/packages/twenty-front/src/modules/client-config/states/billingState.ts
index 4f0982b4978a..5634c510b33e 100644
--- a/packages/twenty-front/src/modules/client-config/states/billingState.ts
+++ b/packages/twenty-front/src/modules/client-config/states/billingState.ts
@@ -1,8 +1,8 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { Billing } from '~/generated/graphql';
 
-export const billingState = atom<Billing | null>({
+export const billingState = createState<Billing | null>({
   key: 'billingState',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/client-config/states/isClientConfigLoadedState.ts b/packages/twenty-front/src/modules/client-config/states/isClientConfigLoadedState.ts
new file mode 100644
index 000000000000..7b6cff0b3612
--- /dev/null
+++ b/packages/twenty-front/src/modules/client-config/states/isClientConfigLoadedState.ts
@@ -0,0 +1,6 @@
+import { createState } from 'twenty-ui';
+
+export const isClientConfigLoadedState = createState<boolean>({
+  key: 'isClientConfigLoadedState',
+  defaultValue: false,
+});
diff --git a/packages/twenty-front/src/modules/client-config/states/isDebugModeState.ts b/packages/twenty-front/src/modules/client-config/states/isDebugModeState.ts
index 82d8be49d12e..b2efbf8fc883 100644
--- a/packages/twenty-front/src/modules/client-config/states/isDebugModeState.ts
+++ b/packages/twenty-front/src/modules/client-config/states/isDebugModeState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const isDebugModeState = atom<boolean>({
+export const isDebugModeState = createState<boolean>({
   key: 'isDebugModeState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/client-config/states/isSignInPrefilledState.ts b/packages/twenty-front/src/modules/client-config/states/isSignInPrefilledState.ts
index 649f42d25c05..5105b617aef7 100644
--- a/packages/twenty-front/src/modules/client-config/states/isSignInPrefilledState.ts
+++ b/packages/twenty-front/src/modules/client-config/states/isSignInPrefilledState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const isSignInPrefilledState = atom<boolean>({
+export const isSignInPrefilledState = createState<boolean>({
   key: 'isSignInPrefilledState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/client-config/states/isSignUpDisabledState.ts b/packages/twenty-front/src/modules/client-config/states/isSignUpDisabledState.ts
index da7ec103e0ce..a82b1a821072 100644
--- a/packages/twenty-front/src/modules/client-config/states/isSignUpDisabledState.ts
+++ b/packages/twenty-front/src/modules/client-config/states/isSignUpDisabledState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const isSignUpDisabledState = atom<boolean>({
+export const isSignUpDisabledState = createState<boolean>({
   key: 'isSignUpDisabledState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/client-config/states/sentryConfigState.ts b/packages/twenty-front/src/modules/client-config/states/sentryConfigState.ts
index e88fd248391f..19ca0359955c 100644
--- a/packages/twenty-front/src/modules/client-config/states/sentryConfigState.ts
+++ b/packages/twenty-front/src/modules/client-config/states/sentryConfigState.ts
@@ -1,8 +1,8 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { Sentry } from '~/generated/graphql';
 
-export const sentryConfigState = atom<Sentry | null>({
+export const sentryConfigState = createState<Sentry | null>({
   key: 'sentryConfigState',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/client-config/states/supportChatState.ts b/packages/twenty-front/src/modules/client-config/states/supportChatState.ts
index 8597704935c0..cca337ba5816 100644
--- a/packages/twenty-front/src/modules/client-config/states/supportChatState.ts
+++ b/packages/twenty-front/src/modules/client-config/states/supportChatState.ts
@@ -1,10 +1,10 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { Support } from '~/generated/graphql';
 
-export const supportChatState = atom<Support>({
+export const supportChatState = createState<Support>({
   key: 'supportChatState',
-  default: {
+  defaultValue: {
     supportDriver: 'none',
     supportFrontChatId: null,
   },
diff --git a/packages/twenty-front/src/modules/client-config/states/telemetryState.ts b/packages/twenty-front/src/modules/client-config/states/telemetryState.ts
index c6d095807951..927cab28b43a 100644
--- a/packages/twenty-front/src/modules/client-config/states/telemetryState.ts
+++ b/packages/twenty-front/src/modules/client-config/states/telemetryState.ts
@@ -1,8 +1,8 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { Telemetry } from '~/generated/graphql';
 
-export const telemetryState = atom<Telemetry>({
+export const telemetryState = createState<Telemetry>({
   key: 'telemetryState',
-  default: { enabled: true, anonymizationEnabled: true },
+  defaultValue: { enabled: true, anonymizationEnabled: true },
 });
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenu.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenu.tsx
index 15bc43d088c6..d198cbbf6397 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenu.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenu.tsx
@@ -1,17 +1,19 @@
-import { useMemo, useRef, useState } from 'react';
+import { useMemo, useRef } from 'react';
 import styled from '@emotion/styled';
-import { useRecoilValue } from 'recoil';
+import { isNonEmptyString } from '@sniptt/guards';
+import { useRecoilState, useRecoilValue } from 'recoil';
 import { Key } from 'ts-key-enum';
+import { IconNotes } from 'twenty-ui';
 
 import { useOpenActivityRightDrawer } from '@/activities/hooks/useOpenActivityRightDrawer';
 import { Activity } from '@/activities/types/Activity';
+import { commandMenuSearchState } from '@/command-menu/states/commandMenuSearchState';
 import { Company } from '@/companies/types/Company';
 import { useKeyboardShortcutMenu } from '@/keyboard-shortcut-menu/hooks/useKeyboardShortcutMenu';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { makeOrFilterVariables } from '@/object-record/utils/makeOrFilterVariables';
 import { Person } from '@/people/types/Person';
-import { IconNotes } from '@/ui/display/icon';
 import { SelectableItem } from '@/ui/layout/selectable-list/components/SelectableItem';
 import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
@@ -21,6 +23,7 @@ import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
 import { Avatar } from '@/users/components/Avatar';
 import { getLogoUrlFromDomainName } from '~/utils';
+import { isDefined } from '~/utils/isDefined';
 
 import { useCommandMenu } from '../hooks/useCommandMenu';
 import { commandMenuCommandsState } from '../states/commandMenuCommandsState';
@@ -86,7 +89,8 @@ export const StyledList = styled.div`
 
 export const StyledInnerList = styled.div`
   padding-left: ${({ theme }) => theme.spacing(1)};
-  width: 100%;
+  padding-right: ${({ theme }) => theme.spacing(1)};
+  width: calc(100% - ${({ theme }) => theme.spacing(2)});
 `;
 
 export const StyledEmpty = styled.div`
@@ -105,23 +109,24 @@ export const CommandMenu = () => {
 
   const openActivityRightDrawer = useOpenActivityRightDrawer();
   const isCommandMenuOpened = useRecoilValue(isCommandMenuOpenedState);
-  const [search, setSearch] = useState('');
+  const [commandMenuSearch, setCommandMenuSearch] = useRecoilState(
+    commandMenuSearchState,
+  );
   const commandMenuCommands = useRecoilValue(commandMenuCommandsState);
   const { closeKeyboardShortcutMenu } = useKeyboardShortcutMenu();
 
   const handleSearchChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    setSearch(event.target.value);
+    setCommandMenuSearch(event.target.value);
   };
 
   useScopedHotkeys(
     'ctrl+k,meta+k',
     () => {
       closeKeyboardShortcutMenu();
-      setSearch('');
       toggleCommandMenu();
     },
     AppHotkeyScope.CommandMenu,
-    [toggleCommandMenu, setSearch],
+    [toggleCommandMenu],
   );
 
   useScopedHotkeys(
@@ -136,12 +141,12 @@ export const CommandMenu = () => {
   const { records: people } = useFindManyRecords<Person>({
     skip: !isCommandMenuOpened,
     objectNameSingular: CoreObjectNameSingular.Person,
-    filter: search
+    filter: commandMenuSearch
       ? makeOrFilterVariables([
-          { name: { firstName: { ilike: `%${search}%` } } },
-          { name: { lastName: { ilike: `%${search}%` } } },
-          { email: { ilike: `%${search}%` } },
-          { phone: { ilike: `%${search}%` } },
+          { name: { firstName: { ilike: `%${commandMenuSearch}%` } } },
+          { name: { lastName: { ilike: `%${commandMenuSearch}%` } } },
+          { email: { ilike: `%${commandMenuSearch}%` } },
+          { phone: { ilike: `%${commandMenuSearch}%` } },
         ])
       : undefined,
     limit: 3,
@@ -150,9 +155,9 @@ export const CommandMenu = () => {
   const { records: companies } = useFindManyRecords<Company>({
     skip: !isCommandMenuOpened,
     objectNameSingular: CoreObjectNameSingular.Company,
-    filter: search
+    filter: commandMenuSearch
       ? {
-          name: { ilike: `%${search}%` },
+          name: { ilike: `%${commandMenuSearch}%` },
         }
       : undefined,
     limit: 3,
@@ -161,10 +166,10 @@ export const CommandMenu = () => {
   const { records: activities } = useFindManyRecords<Activity>({
     skip: !isCommandMenuOpened,
     objectNameSingular: CoreObjectNameSingular.Activity,
-    filter: search
+    filter: commandMenuSearch
       ? makeOrFilterVariables([
-          { title: { ilike: `%${search}%` } },
-          { body: { ilike: `%${search}%` } },
+          { title: { ilike: `%${commandMenuSearch}%` } },
+          { body: { ilike: `%${commandMenuSearch}%` } },
         ])
       : undefined,
     limit: 3,
@@ -216,7 +221,7 @@ export const CommandMenu = () => {
   };
 
   const checkInLabels = (cmd: Command, search: string) => {
-    if (cmd.label) {
+    if (isNonEmptyString(cmd.label)) {
       return cmd.label.toLowerCase().includes(search.toLowerCase());
     }
     return false;
@@ -224,15 +229,17 @@ export const CommandMenu = () => {
 
   const matchingNavigateCommand = commandMenuCommands.filter(
     (cmd) =>
-      (search.length > 0
-        ? checkInShortcuts(cmd, search) || checkInLabels(cmd, search)
+      (commandMenuSearch.length > 0
+        ? checkInShortcuts(cmd, commandMenuSearch) ||
+          checkInLabels(cmd, commandMenuSearch)
         : true) && cmd.type === CommandType.Navigate,
   );
 
   const matchingCreateCommand = commandMenuCommands.filter(
     (cmd) =>
-      (search.length > 0
-        ? checkInShortcuts(cmd, search) || checkInLabels(cmd, search)
+      (commandMenuSearch.length > 0
+        ? checkInShortcuts(cmd, commandMenuSearch) ||
+          checkInLabels(cmd, commandMenuSearch)
         : true) && cmd.type === CommandType.Create,
   );
 
@@ -254,7 +261,7 @@ export const CommandMenu = () => {
         <StyledDialog ref={commandMenuRef}>
           <StyledInput
             autoFocus
-            value={search}
+            value={commandMenuSearch}
             placeholder="Search"
             onChange={handleSearchChange}
           />
@@ -272,7 +279,7 @@ export const CommandMenu = () => {
                       ...otherCommands,
                     ].find((cmd) => cmd.id === itemId);
 
-                    if (command) {
+                    if (isDefined(command)) {
                       const { to, onCommandClick } = command;
                       onItemClick(onCommandClick, to);
                     }
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx
index 52e4a307c3fb..e19cea30940f 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx
@@ -1,6 +1,7 @@
+import { isNonEmptyString } from '@sniptt/guards';
 import { useRecoilValue } from 'recoil';
+import { IconArrowUpRight } from 'twenty-ui';
 
-import { IconArrowUpRight } from '@/ui/display/icon';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
 import { MenuItemCommand } from '@/ui/navigation/menu-item/components/MenuItemCommand';
@@ -28,7 +29,7 @@ export const CommandMenuItem = ({
 }: CommandMenuItemProps) => {
   const { onItemClick } = useCommandMenu();
 
-  if (to && !Icon) {
+  if (isNonEmptyString(to) && !Icon) {
     Icon = IconArrowUpRight;
   }
 
diff --git a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx
index 6cf5c7fbf3c5..1ce66e1ecf00 100644
--- a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx
@@ -1,13 +1,14 @@
 import { useEffect } from 'react';
+import { action } from '@storybook/addon-actions';
 import { Meta, StoryObj } from '@storybook/react';
 import { expect, userEvent, within } from '@storybook/test';
 import { useSetRecoilState } from 'recoil';
+import { IconCheckbox, IconNotes } from 'twenty-ui';
 
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { CommandType } from '@/command-menu/types/Command';
-import { IconCheckbox, IconNotes } from '@/ui/display/icon';
 import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
 import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
@@ -46,7 +47,7 @@ const meta: Meta<typeof CommandMenu> = {
             label: 'Create Task',
             type: CommandType.Create,
             Icon: IconCheckbox,
-            onCommandClick: () => console.log('create task click'),
+            onCommandClick: action('create task click'),
           },
           {
             id: 'create-note',
@@ -54,7 +55,7 @@ const meta: Meta<typeof CommandMenu> = {
             label: 'Create Note',
             type: CommandType.Create,
             Icon: IconNotes,
-            onCommandClick: () => console.log('create note click'),
+            onCommandClick: action('create note click'),
           },
         ]);
         openCommandMenu();
diff --git a/packages/twenty-front/src/modules/command-menu/constants/CommandMenuCommands.ts b/packages/twenty-front/src/modules/command-menu/constants/CommandMenuCommands.ts
index 41fed702090c..6cfc5528098c 100644
--- a/packages/twenty-front/src/modules/command-menu/constants/CommandMenuCommands.ts
+++ b/packages/twenty-front/src/modules/command-menu/constants/CommandMenuCommands.ts
@@ -4,7 +4,7 @@ import {
   IconSettings,
   IconTargetArrow,
   IconUser,
-} from '@/ui/display/icon';
+} from 'twenty-ui';
 
 import { Command, CommandType } from '../types/Command';
 
diff --git a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts
index 0d806f586be3..1a8e085064e2 100644
--- a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts
+++ b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts
@@ -1,10 +1,13 @@
 import { useCallback } from 'react';
 import { useNavigate } from 'react-router-dom';
+import { isNonEmptyString } from '@sniptt/guards';
 import { useRecoilCallback, useSetRecoilState } from 'recoil';
 
+import { commandMenuSearchState } from '@/command-menu/states/commandMenuSearchState';
 import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
 import { AppHotkeyScope } from '@/ui/utilities/hotkey/types/AppHotkeyScope';
+import { isDefined } from '~/utils/isDefined';
 
 import { COMMAND_MENU_COMMANDS } from '../constants/CommandMenuCommands';
 import { commandMenuCommandsState } from '../states/commandMenuCommandsState';
@@ -21,10 +24,10 @@ export const useCommandMenu = () => {
     goBackToPreviousHotkeyScope,
   } = usePreviousHotkeyScope();
 
-  const openCommandMenu = () => {
+  const openCommandMenu = useCallback(() => {
     setIsCommandMenuOpened(true);
     setHotkeyScopeAndMemorizePreviousScope(AppHotkeyScope.CommandMenuOpen);
-  };
+  }, [setHotkeyScopeAndMemorizePreviousScope, setIsCommandMenuOpened]);
 
   const closeCommandMenu = useRecoilCallback(
     ({ snapshot }) =>
@@ -42,17 +45,23 @@ export const useCommandMenu = () => {
     [goBackToPreviousHotkeyScope, resetSelectedItem, setIsCommandMenuOpened],
   );
 
-  const toggleCommandMenu = useRecoilCallback(({ snapshot }) => async () => {
-    const isCommandMenuOpened = snapshot
-      .getLoadable(isCommandMenuOpenedState)
-      .getValue();
+  const toggleCommandMenu = useRecoilCallback(
+    ({ snapshot, set }) =>
+      async () => {
+        const isCommandMenuOpened = snapshot
+          .getLoadable(isCommandMenuOpenedState)
+          .getValue();
+
+        set(commandMenuSearchState, '');
 
-    if (isCommandMenuOpened) {
-      closeCommandMenu();
-    } else {
-      openCommandMenu();
-    }
-  });
+        if (isCommandMenuOpened) {
+          closeCommandMenu();
+        } else {
+          openCommandMenu();
+        }
+      },
+    [closeCommandMenu, openCommandMenu],
+  );
 
   const addToCommandMenu = useCallback(
     (addCommand: Command[]) => {
@@ -69,11 +78,11 @@ export const useCommandMenu = () => {
     (onClick?: () => void, to?: string) => {
       toggleCommandMenu();
 
-      if (onClick) {
+      if (isDefined(onClick)) {
         onClick();
         return;
       }
-      if (to) {
+      if (isNonEmptyString(to)) {
         navigate(to);
         return;
       }
diff --git a/packages/twenty-front/src/modules/command-menu/states/commandMenuCommandsState.ts b/packages/twenty-front/src/modules/command-menu/states/commandMenuCommandsState.ts
index cfd4c3596136..309754be2c67 100644
--- a/packages/twenty-front/src/modules/command-menu/states/commandMenuCommandsState.ts
+++ b/packages/twenty-front/src/modules/command-menu/states/commandMenuCommandsState.ts
@@ -1,10 +1,10 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { Command, CommandType } from '../types/Command';
 
-export const commandMenuCommandsState = atom<Command[]>({
+export const commandMenuCommandsState = createState<Command[]>({
   key: 'command-menu/commandMenuCommandsState',
-  default: [
+  defaultValue: [
     {
       id: '',
       to: '',
diff --git a/packages/twenty-front/src/modules/command-menu/states/commandMenuSearchState.ts b/packages/twenty-front/src/modules/command-menu/states/commandMenuSearchState.ts
new file mode 100644
index 000000000000..61f580a8ae17
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu/states/commandMenuSearchState.ts
@@ -0,0 +1,6 @@
+import { createState } from 'twenty-ui';
+
+export const commandMenuSearchState = createState<string>({
+  key: 'command-menu/commandMenuSearchState',
+  defaultValue: '',
+});
diff --git a/packages/twenty-front/src/modules/companies/__stories__/Board.stories.tsx b/packages/twenty-front/src/modules/companies/__stories__/Board.stories.tsx
deleted file mode 100644
index e862442481ca..000000000000
--- a/packages/twenty-front/src/modules/companies/__stories__/Board.stories.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
-import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
-import { graphqlMocks } from '~/testing/graphqlMocks';
-
-import { CompanyBoard } from '../board/components/CompanyBoard';
-
-const DoNotRenderEffect = () => <></>;
-
-const meta: Meta<typeof CompanyBoard> = {
-  title: 'Modules/Companies/Board',
-  component: DoNotRenderEffect,
-  decorators: [ComponentWithRouterDecorator, SnackBarDecorator],
-  parameters: {
-    msw: graphqlMocks,
-  },
-};
-
-export default meta;
-type Story = StoryObj<typeof CompanyBoard>;
-
-// FIXME: CompanyBoard is re-rendering so much and exceeding the maximum update depth for some reason.
-export const OneColumnBoard: Story = {};
diff --git a/packages/twenty-front/src/modules/companies/__stories__/CompanyChip.stories.tsx b/packages/twenty-front/src/modules/companies/__stories__/CompanyChip.stories.tsx
deleted file mode 100644
index 34b9e695cf68..000000000000
--- a/packages/twenty-front/src/modules/companies/__stories__/CompanyChip.stories.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
-
-import { CompanyChip } from '../components/CompanyChip';
-
-const meta: Meta<typeof CompanyChip> = {
-  title: 'Modules/Companies/CompanyChip',
-  component: CompanyChip,
-  decorators: [ComponentWithRouterDecorator],
-};
-
-export default meta;
-type Story = StoryObj<typeof CompanyChip>;
-
-export const SmallName: Story = {
-  args: {
-    opportunityId: 'airbnb',
-    companyName: 'Airbnb',
-    avatarUrl: 'https://api.faviconkit.com/airbnb.com/144',
-  },
-};
-
-export const BigName: Story = {
-  args: {
-    opportunityId: 'google',
-    companyName: 'Google with a real big name to overflow the cell',
-    avatarUrl: 'https://api.faviconkit.com/google.com/144',
-  },
-};
diff --git a/packages/twenty-front/src/modules/companies/__stories__/mock-data.ts b/packages/twenty-front/src/modules/companies/__stories__/mock-data.ts
deleted file mode 100644
index 6bfc08feb6ca..000000000000
--- a/packages/twenty-front/src/modules/companies/__stories__/mock-data.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { PipelineStep } from '@/pipeline/types/PipelineStep';
-
-export const pipelineSteps = [
-  {
-    id: 'pipeline-stage-1',
-    name: 'New',
-    position: 0,
-    color: 'red',
-  },
-  {
-    id: 'pipeline-stage-2',
-    name: 'Screening',
-    position: 1,
-    color: 'purple',
-  },
-  {
-    id: 'pipeline-stage-3',
-    name: 'Meeting',
-    position: 2,
-    color: 'sky',
-  },
-  {
-    id: 'pipeline-stage-4',
-    name: 'Proposal',
-    position: 3,
-    color: 'turquoise',
-  },
-  {
-    id: 'pipeline-stage-5',
-    name: 'Customer',
-    position: 4,
-    color: 'yellow',
-  },
-] as PipelineStep[];
diff --git a/packages/twenty-front/src/modules/companies/board/components/CompanyBoard.tsx b/packages/twenty-front/src/modules/companies/board/components/CompanyBoard.tsx
deleted file mode 100644
index 48bbf277f9df..000000000000
--- a/packages/twenty-front/src/modules/companies/board/components/CompanyBoard.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import { useCallback } from 'react';
-import styled from '@emotion/styled';
-
-import { mapBoardFieldDefinitionsToViewFields } from '@/companies/utils/mapBoardFieldDefinitionsToViewFields';
-import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
-import {
-  RecordBoardDeprecated,
-  RecordBoardDeprecatedProps,
-} from '@/object-record/record-board-deprecated/components/RecordBoardDeprecated';
-import { RecordBoardDeprecatedEffect } from '@/object-record/record-board-deprecated/components/RecordBoardDeprecatedEffect';
-import { BOARD_OPTIONS_DROPDOWN_ID } from '@/object-record/record-board-deprecated/constants/BoardOptionsDropdownId';
-import { RecordBoardDeprecatedOptionsDropdown } from '@/object-record/record-board-deprecated/options/components/RecordBoardDeprecatedOptionsDropdown';
-import { BoardColumnDefinition } from '@/object-record/record-board-deprecated/types/BoardColumnDefinition';
-import { ViewBar } from '@/views/components/ViewBar';
-import { useViewFields } from '@/views/hooks/internal/useViewFields';
-import { opportunitiesBoardOptions } from '~/pages/opportunities/opportunitiesBoardOptions';
-
-import { HooksCompanyBoardEffect } from '../../components/HooksCompanyBoardEffect';
-
-const StyledContainer = styled.div`
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  overflow: auto;
-  width: 100%;
-`;
-
-type CompanyBoardProps = Pick<
-  RecordBoardDeprecatedProps,
-  'onColumnAdd' | 'onColumnDelete' | 'onEditColumnTitle'
->;
-
-export const CompanyBoard = ({
-  onColumnAdd,
-  onColumnDelete,
-  onEditColumnTitle,
-}: CompanyBoardProps) => {
-  const viewBarId = 'company-board-view';
-  const recordBoardId = 'company-board';
-
-  const { persistViewFields } = useViewFields(viewBarId);
-
-  const { createOneRecord } = useCreateOneRecord({
-    objectNameSingular: 'pipelineStep',
-  });
-
-  const onStageAdd = useCallback(
-    (stage: BoardColumnDefinition) => {
-      createOneRecord({
-        name: stage.title,
-        color: stage.colorCode,
-        position: stage.position,
-        id: stage.id,
-      });
-    },
-    [createOneRecord],
-  );
-
-  return (
-    <StyledContainer>
-      <ViewBar
-        viewBarId={viewBarId}
-        optionsDropdownButton={
-          <RecordBoardDeprecatedOptionsDropdown
-            recordBoardId={recordBoardId}
-            onStageAdd={onStageAdd}
-          />
-        }
-        optionsDropdownScopeId={BOARD_OPTIONS_DROPDOWN_ID}
-      />
-
-      <HooksCompanyBoardEffect
-        viewBarId={viewBarId}
-        recordBoardId={recordBoardId}
-      />
-      <RecordBoardDeprecatedEffect
-        recordBoardId={recordBoardId}
-        onFieldsChange={(fields) => {
-          persistViewFields(mapBoardFieldDefinitionsToViewFields(fields));
-        }}
-      />
-
-      <RecordBoardDeprecated
-        recordBoardId={recordBoardId}
-        boardOptions={opportunitiesBoardOptions}
-        onColumnAdd={onColumnAdd}
-        onColumnDelete={onColumnDelete}
-        onEditColumnTitle={onEditColumnTitle}
-      />
-    </StyledContainer>
-  );
-};
diff --git a/packages/twenty-front/src/modules/companies/components/CompanyBoardCard.tsx b/packages/twenty-front/src/modules/companies/components/CompanyBoardCard.tsx
deleted file mode 100644
index 59e81cecf14c..000000000000
--- a/packages/twenty-front/src/modules/companies/components/CompanyBoardCard.tsx
+++ /dev/null
@@ -1,255 +0,0 @@
-import { ReactNode, useContext } from 'react';
-import styled from '@emotion/styled';
-import { useRecoilState, useRecoilValue } from 'recoil';
-
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { BoardCardIdContext } from '@/object-record/record-board-deprecated/contexts/BoardCardIdContext';
-import { useCurrentRecordBoardDeprecatedCardSelectedInternal } from '@/object-record/record-board-deprecated/hooks/internal/useCurrentRecordBoardDeprecatedCardSelectedInternal';
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { isRecordBoardDeprecatedCardInCompactViewFamilyState } from '@/object-record/record-board-deprecated/states/isRecordBoardDeprecatedCardInCompactViewFamilyState';
-import {
-  FieldContext,
-  RecordUpdateHook,
-  RecordUpdateHookParams,
-} from '@/object-record/record-field/contexts/FieldContext';
-import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
-import { InlineCellHotkeyScope } from '@/object-record/record-inline-cell/types/InlineCellHotkeyScope';
-import { EntityChipVariant } from '@/ui/display/chip/components/EntityChip';
-import { IconEye } from '@/ui/display/icon/index';
-import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
-import { Checkbox, CheckboxVariant } from '@/ui/input/components/Checkbox';
-import { AnimatedEaseInOut } from '@/ui/utilities/animation/components/AnimatedEaseInOut';
-import { getLogoUrlFromDomainName } from '~/utils';
-
-import { companyProgressesFamilyState } from '../states/companyProgressesFamilyState';
-
-import { CompanyChip } from './CompanyChip';
-
-const StyledBoardCard = styled.div<{ selected: boolean }>`
-  background-color: ${({ theme, selected }) =>
-    selected ? theme.accent.quaternary : theme.background.secondary};
-  border: 1px solid
-    ${({ theme, selected }) =>
-      selected ? theme.accent.secondary : theme.border.color.medium};
-  border-radius: ${({ theme }) => theme.border.radius.sm};
-  box-shadow: ${({ theme }) => theme.boxShadow.light};
-  color: ${({ theme }) => theme.font.color.primary};
-  &:hover {
-    background-color: ${({ theme, selected }) =>
-      selected && theme.accent.tertiary};
-    border: 1px solid
-      ${({ theme, selected }) =>
-        selected ? theme.accent.primary : theme.border.color.medium};
-  }
-  cursor: pointer;
-
-  .checkbox-container {
-    transition: all ease-in-out 160ms;
-    opacity: ${({ selected }) => (selected ? 1 : 0)};
-  }
-
-  &:hover .checkbox-container {
-    opacity: 1;
-  }
-
-  .compact-icon-container {
-    transition: all ease-in-out 160ms;
-    opacity: 0;
-  }
-  &:hover .compact-icon-container {
-    opacity: 1;
-  }
-`;
-
-const StyledBoardCardWrapper = styled.div`
-  padding-bottom: ${({ theme }) => theme.spacing(2)};
-  width: 100%;
-`;
-
-const StyledBoardCardHeader = styled.div<{
-  showCompactView: boolean;
-}>`
-  align-items: center;
-  display: flex;
-  flex-direction: row;
-  font-weight: ${({ theme }) => theme.font.weight.medium};
-  height: 24px;
-  padding-bottom: ${({ theme, showCompactView }) =>
-    theme.spacing(showCompactView ? 0 : 1)};
-  padding-left: ${({ theme }) => theme.spacing(2)};
-  padding-right: ${({ theme }) => theme.spacing(2)};
-  padding-top: ${({ theme }) => theme.spacing(2)};
-  transition: padding ease-in-out 160ms;
-
-  img {
-    height: ${({ theme }) => theme.icon.size.md}px;
-    margin-right: ${({ theme }) => theme.spacing(2)};
-    object-fit: cover;
-    width: ${({ theme }) => theme.icon.size.md}px;
-  }
-`;
-
-const StyledBoardCardBody = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: ${({ theme }) => theme.spacing(0.5)};
-  padding-bottom: ${({ theme }) => theme.spacing(2)};
-  padding-left: ${({ theme }) => theme.spacing(2.5)};
-  padding-right: ${({ theme }) => theme.spacing(2)};
-  span {
-    align-items: center;
-    display: flex;
-    flex-direction: row;
-    svg {
-      color: ${({ theme }) => theme.font.color.tertiary};
-      margin-right: ${({ theme }) => theme.spacing(2)};
-    }
-  }
-`;
-
-const StyledCheckboxContainer = styled.div`
-  display: flex;
-  flex: 1;
-  justify-content: end;
-`;
-
-const StyledFieldContainer = styled.div`
-  display: flex;
-  flex-direction: row;
-  width: 100%;
-`;
-
-const StyledCompactIconContainer = styled.div`
-  align-items: center;
-  display: flex;
-  justify-content: center;
-`;
-
-export const CompanyBoardCard = () => {
-  const { isCurrentCardSelected, setCurrentCardSelected } =
-    useCurrentRecordBoardDeprecatedCardSelectedInternal();
-  const boardCardId = useContext(BoardCardIdContext);
-
-  const [companyProgress] = useRecoilState(
-    companyProgressesFamilyState(boardCardId ?? ''),
-  );
-
-  const { isCompactViewEnabledState, visibleBoardCardFieldsSelector } =
-    useRecordBoardDeprecatedScopedStates();
-
-  const [isCompactViewEnabled] = useRecoilState(isCompactViewEnabledState);
-
-  const [isCardInCompactView, setIsCardInCompactView] = useRecoilState(
-    isRecordBoardDeprecatedCardInCompactViewFamilyState(boardCardId ?? ''),
-  );
-
-  const showCompactView = isCompactViewEnabled && isCardInCompactView;
-
-  const { opportunity, company } = companyProgress ?? {};
-
-  const visibleBoardCardFields = useRecoilValue(visibleBoardCardFieldsSelector);
-
-  const useUpdateOneRecordMutation: RecordUpdateHook = () => {
-    const { updateOneRecord: updateOneOpportunity } = useUpdateOneRecord({
-      objectNameSingular: CoreObjectNameSingular.Opportunity,
-    });
-
-    const updateEntity = ({ variables }: RecordUpdateHookParams) => {
-      updateOneOpportunity?.({
-        idToUpdate: variables.where.id as string,
-        updateOneRecordInput: variables.updateOneRecordInput,
-      });
-    };
-
-    return [updateEntity, { loading: false }];
-  };
-
-  // boardCardId check can be moved to a wrapper to avoid unnecessary logic above
-  if (!company || !opportunity || !boardCardId) {
-    return null;
-  }
-
-  const PreventSelectOnClickContainer = ({
-    children,
-  }: {
-    children: ReactNode;
-  }) => (
-    <StyledFieldContainer
-      onClick={(e) => {
-        e.stopPropagation();
-      }}
-    >
-      {children}
-    </StyledFieldContainer>
-  );
-
-  const OnMouseLeaveBoard = () => {
-    setIsCardInCompactView(true);
-  };
-
-  return (
-    <StyledBoardCardWrapper>
-      <StyledBoardCard
-        selected={isCurrentCardSelected}
-        onMouseLeave={OnMouseLeaveBoard}
-        onClick={() => setCurrentCardSelected(!isCurrentCardSelected)}
-      >
-        <StyledBoardCardHeader showCompactView={showCompactView}>
-          <CompanyChip
-            opportunityId={opportunity.id}
-            companyName={company.name}
-            avatarUrl={getLogoUrlFromDomainName(company.domainName)}
-            variant={EntityChipVariant.Transparent}
-          />
-          {showCompactView && (
-            <StyledCompactIconContainer className="compact-icon-container">
-              <LightIconButton
-                Icon={IconEye}
-                accent="tertiary"
-                onClick={(e) => {
-                  e.stopPropagation();
-                  setIsCardInCompactView(false);
-                }}
-              />
-            </StyledCompactIconContainer>
-          )}
-          <StyledCheckboxContainer className="checkbox-container">
-            <Checkbox
-              checked={isCurrentCardSelected}
-              onChange={() => setCurrentCardSelected(!isCurrentCardSelected)}
-              variant={CheckboxVariant.Secondary}
-            />
-          </StyledCheckboxContainer>
-        </StyledBoardCardHeader>
-        <StyledBoardCardBody>
-          <AnimatedEaseInOut isOpen={!showCompactView} initial={false}>
-            {visibleBoardCardFields.map((viewField) => (
-              <PreventSelectOnClickContainer key={viewField.fieldMetadataId}>
-                <FieldContext.Provider
-                  value={{
-                    entityId: boardCardId,
-                    maxWidth: 156,
-                    recoilScopeId: boardCardId + viewField.fieldMetadataId,
-                    isLabelIdentifier: false,
-                    fieldDefinition: {
-                      fieldMetadataId: viewField.fieldMetadataId,
-                      label: viewField.label,
-                      iconName: viewField.iconName,
-                      type: viewField.type,
-                      metadata: viewField.metadata,
-                    },
-                    useUpdateRecord: useUpdateOneRecordMutation,
-                    hotkeyScope: InlineCellHotkeyScope.InlineCell,
-                  }}
-                >
-                  <RecordInlineCell />
-                </FieldContext.Provider>
-              </PreventSelectOnClickContainer>
-            ))}
-          </AnimatedEaseInOut>
-        </StyledBoardCardBody>
-      </StyledBoardCard>
-    </StyledBoardCardWrapper>
-  );
-};
diff --git a/packages/twenty-front/src/modules/companies/components/CompanyChip.tsx b/packages/twenty-front/src/modules/companies/components/CompanyChip.tsx
deleted file mode 100644
index 3fd8921066a4..000000000000
--- a/packages/twenty-front/src/modules/companies/components/CompanyChip.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import {
-  EntityChip,
-  EntityChipVariant,
-} from '@/ui/display/chip/components/EntityChip';
-
-type CompanyChipProps = {
-  opportunityId: string;
-  companyName: string;
-  avatarUrl?: string;
-  variant?: EntityChipVariant;
-};
-
-export const CompanyChip = ({
-  opportunityId,
-  companyName,
-  avatarUrl,
-  variant = EntityChipVariant.Regular,
-}: CompanyChipProps) => (
-  <EntityChip
-    entityId={opportunityId}
-    linkToEntity={`/object/opportunity/${opportunityId}`}
-    name={companyName}
-    avatarType="squared"
-    avatarUrl={avatarUrl}
-    variant={variant}
-  />
-);
diff --git a/packages/twenty-front/src/modules/companies/components/HooksCompanyBoardEffect.tsx b/packages/twenty-front/src/modules/companies/components/HooksCompanyBoardEffect.tsx
deleted file mode 100644
index eb955d3444b6..000000000000
--- a/packages/twenty-front/src/modules/companies/components/HooksCompanyBoardEffect.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import { useEffect } from 'react';
-import { useRecoilValue } from 'recoil';
-
-import { useColumnDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { availableRecordBoardDeprecatedCardFieldsScopedState } from '@/object-record/record-board-deprecated/states/availableRecordBoardDeprecatedCardFieldsScopedState';
-import { recordBoardCardFieldsScopedState } from '@/object-record/record-board-deprecated/states/recordBoardDeprecatedCardFieldsScopedState';
-import { recordBoardFiltersScopedState } from '@/object-record/record-board-deprecated/states/recordBoardDeprecatedFiltersScopedState';
-import { recordBoardSortsScopedState } from '@/object-record/record-board-deprecated/states/recordBoardDeprecatedSortsScopedState';
-import { useSetRecoilScopedStateV2 } from '@/ui/utilities/recoil-scope/hooks/useSetRecoilScopedStateV2';
-import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
-import { useViewBar } from '@/views/hooks/useViewBar';
-import { mapViewFieldsToBoardFieldDefinitions } from '@/views/utils/mapViewFieldsToBoardFieldDefinitions';
-
-type HooksCompanyBoardEffectProps = {
-  viewBarId: string;
-  recordBoardId: string;
-};
-
-export const HooksCompanyBoardEffect = ({
-  viewBarId,
-  recordBoardId,
-}: HooksCompanyBoardEffectProps) => {
-  const {
-    setAvailableFilterDefinitions,
-    setAvailableSortDefinitions,
-    setAvailableFieldDefinitions,
-    setViewObjectMetadataId,
-  } = useViewBar({ viewBarId });
-
-  const { objectMetadataItem } = useObjectMetadataItem({
-    objectNameSingular: CoreObjectNameSingular.Opportunity,
-  });
-
-  const { columnDefinitions, filterDefinitions, sortDefinitions } =
-    useColumnDefinitionsFromFieldMetadata(objectMetadataItem);
-
-  const setAvailableBoardCardFields = useSetRecoilScopedStateV2(
-    availableRecordBoardDeprecatedCardFieldsScopedState,
-    'company-board',
-  );
-
-  useEffect(() => {
-    if (!objectMetadataItem) {
-      return;
-    }
-    setAvailableFilterDefinitions?.(filterDefinitions);
-    setAvailableSortDefinitions?.(sortDefinitions);
-    setAvailableFieldDefinitions?.(columnDefinitions);
-  }, [
-    columnDefinitions,
-    filterDefinitions,
-    objectMetadataItem,
-    setAvailableFieldDefinitions,
-    setAvailableFilterDefinitions,
-    setAvailableSortDefinitions,
-    sortDefinitions,
-  ]);
-
-  useEffect(() => {
-    setAvailableBoardCardFields(columnDefinitions);
-  }, [columnDefinitions, setAvailableBoardCardFields]);
-
-  useEffect(() => {
-    if (!objectMetadataItem) {
-      return;
-    }
-    setViewObjectMetadataId?.(objectMetadataItem.id);
-  }, [objectMetadataItem, setViewObjectMetadataId]);
-
-  const {
-    currentViewFieldsState,
-    currentViewFiltersState,
-    currentViewSortsState,
-  } = useViewScopedStates({ viewScopeId: viewBarId });
-
-  const currentViewFields = useRecoilValue(currentViewFieldsState);
-  const currentViewFilters = useRecoilValue(currentViewFiltersState);
-  const currentViewSorts = useRecoilValue(currentViewSortsState);
-
-  //TODO: Modify to use scopeId
-  const setBoardCardFields = useSetRecoilScopedStateV2(
-    recordBoardCardFieldsScopedState,
-    'company-board',
-  );
-  const setBoardCardFilters = useSetRecoilScopedStateV2(
-    recordBoardFiltersScopedState,
-    'company-board',
-  );
-
-  const setBoardCardSorts = useSetRecoilScopedStateV2(
-    recordBoardSortsScopedState,
-    'company-board',
-  );
-
-  useEffect(() => {
-    if (currentViewFields) {
-      setBoardCardFields(
-        mapViewFieldsToBoardFieldDefinitions(
-          currentViewFields,
-          columnDefinitions,
-        ),
-      );
-    }
-  }, [columnDefinitions, currentViewFields, setBoardCardFields]);
-
-  useEffect(() => {
-    if (currentViewFilters) {
-      setBoardCardFilters(currentViewFilters);
-    }
-  }, [currentViewFilters, setBoardCardFilters]);
-
-  useEffect(() => {
-    if (currentViewSorts) {
-      setBoardCardSorts(currentViewSorts);
-    }
-  }, [currentViewSorts, setBoardCardSorts]);
-
-  const { setEntityCountInCurrentView } = useViewBar({ viewBarId });
-
-  const { savedOpportunitiesState } = useRecordBoardDeprecatedScopedStates({
-    recordBoardScopeId: recordBoardId,
-  });
-
-  const savedOpportunities = useRecoilValue(savedOpportunitiesState);
-
-  useEffect(() => {
-    setEntityCountInCurrentView(savedOpportunities.length);
-  }, [savedOpportunities.length, setEntityCountInCurrentView]);
-
-  return <></>;
-};
diff --git a/packages/twenty-front/src/modules/companies/components/NewOpportunityButton.tsx b/packages/twenty-front/src/modules/companies/components/NewOpportunityButton.tsx
deleted file mode 100644
index 193adfbed20b..000000000000
--- a/packages/twenty-front/src/modules/companies/components/NewOpportunityButton.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { useCallback, useContext, useState } from 'react';
-
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { NewButton } from '@/object-record/record-board-deprecated/components/NewButton';
-import { BoardColumnContext } from '@/object-record/record-board-deprecated/contexts/BoardColumnContext';
-import { useCreateOpportunity } from '@/object-record/record-board-deprecated/hooks/internal/useCreateOpportunity';
-import { SingleEntitySelect } from '@/object-record/relation-picker/components/SingleEntitySelect';
-import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
-import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
-import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
-
-export const NewOpportunityButton = () => {
-  const [isCreatingCard, setIsCreatingCard] = useState(false);
-  const column = useContext(BoardColumnContext);
-
-  const pipelineStepId = column?.columnDefinition.id || '';
-
-  const { enqueueSnackBar } = useSnackBar();
-  const createOpportunity = useCreateOpportunity();
-
-  const {
-    goBackToPreviousHotkeyScope,
-    setHotkeyScopeAndMemorizePreviousScope,
-  } = usePreviousHotkeyScope();
-
-  const handleEntitySelect = (company: any) => {
-    setIsCreatingCard(false);
-    goBackToPreviousHotkeyScope();
-
-    if (!pipelineStepId) {
-      enqueueSnackBar('Pipeline stage id is not defined', {
-        variant: 'error',
-      });
-
-      throw new Error('Pipeline stage id is not defined');
-    }
-
-    createOpportunity(company.id, pipelineStepId);
-  };
-
-  const handleNewClick = useCallback(() => {
-    setIsCreatingCard(true);
-    setHotkeyScopeAndMemorizePreviousScope(
-      RelationPickerHotkeyScope.RelationPicker,
-    );
-  }, [setIsCreatingCard, setHotkeyScopeAndMemorizePreviousScope]);
-
-  const handleCancel = () => {
-    goBackToPreviousHotkeyScope();
-    setIsCreatingCard(false);
-  };
-
-  return (
-    <>
-      {isCreatingCard ? (
-        <SingleEntitySelect
-          disableBackgroundBlur
-          onCancel={handleCancel}
-          onEntitySelected={handleEntitySelect}
-          relationObjectNameSingular={CoreObjectNameSingular.Company}
-          relationPickerScopeId="relation-picker"
-          selectedRelationRecordIds={[]}
-        />
-      ) : (
-        <NewButton onClick={handleNewClick} />
-      )}
-    </>
-  );
-};
diff --git a/packages/twenty-front/src/modules/companies/components/OpportunityPicker.tsx b/packages/twenty-front/src/modules/companies/components/OpportunityPicker.tsx
deleted file mode 100644
index 2e5bc39701d7..000000000000
--- a/packages/twenty-front/src/modules/companies/components/OpportunityPicker.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import { useEffect, useMemo, useRef, useState } from 'react';
-import { useRecoilValue } from 'recoil';
-
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { SingleEntitySelectMenuItemsWithSearch } from '@/object-record/relation-picker/components/SingleEntitySelectMenuItemsWithSearch';
-import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
-import { currentPipelineStepsState } from '@/pipeline/states/currentPipelineStepsState';
-import { IconChevronDown } from '@/ui/display/icon';
-import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
-import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
-
-export type OpportunityPickerProps = {
-  companyId: string | null;
-  onSubmit: (
-    newCompany: EntityForSelect | null,
-    newPipelineStepId: string | null,
-  ) => void;
-  onCancel?: () => void;
-};
-
-export const OpportunityPicker = ({
-  onSubmit,
-  onCancel,
-}: OpportunityPickerProps) => {
-  const containerRef = useRef<HTMLDivElement>(null);
-
-  const [isProgressSelectionUnfolded, setIsProgressSelectionUnfolded] =
-    useState(false);
-
-  const [selectedPipelineStepId, setSelectedPipelineStepId] = useState<
-    string | null
-  >(null);
-
-  const currentPipelineSteps = useRecoilValue(currentPipelineStepsState);
-
-  const handlePipelineStepChange = (newPipelineStepId: string) => {
-    setSelectedPipelineStepId(newPipelineStepId);
-    setIsProgressSelectionUnfolded(false);
-  };
-
-  const handleEntitySelected = async (
-    selectedCompany: EntityForSelect | null | undefined,
-  ) => {
-    onSubmit(selectedCompany ?? null, selectedPipelineStepId);
-  };
-
-  useEffect(() => {
-    if (currentPipelineSteps?.[0]?.id) {
-      setSelectedPipelineStepId(currentPipelineSteps?.[0]?.id);
-    }
-  }, [currentPipelineSteps]);
-
-  const selectedPipelineStep = useMemo(
-    () =>
-      currentPipelineSteps.find(
-        (pipelineStep: any) => pipelineStep.id === selectedPipelineStepId,
-      ),
-    [currentPipelineSteps, selectedPipelineStepId],
-  );
-
-  return (
-    <DropdownMenu
-      ref={containerRef}
-      data-testid={`company-progress-dropdown-menu`}
-    >
-      {isProgressSelectionUnfolded ? (
-        <DropdownMenuItemsContainer>
-          {currentPipelineSteps.map((pipelineStep: any, index: number) => (
-            <MenuItem
-              key={pipelineStep.id}
-              testId={`select-pipeline-stage-${index}`}
-              onClick={() => {
-                handlePipelineStepChange(pipelineStep.id);
-              }}
-              text={pipelineStep.name}
-            />
-          ))}
-        </DropdownMenuItemsContainer>
-      ) : (
-        <>
-          <DropdownMenuHeader
-            testId="selected-pipeline-stage"
-            EndIcon={IconChevronDown}
-            onClick={() => setIsProgressSelectionUnfolded(true)}
-          >
-            {selectedPipelineStep?.name}
-          </DropdownMenuHeader>
-          <DropdownMenuSeparator />
-          <SingleEntitySelectMenuItemsWithSearch
-            onCancel={onCancel}
-            onEntitySelected={handleEntitySelected}
-            relationObjectNameSingular={CoreObjectNameSingular.Company}
-            selectedRelationRecordIds={[]}
-          />
-        </>
-      )}
-    </DropdownMenu>
-  );
-};
diff --git a/packages/twenty-front/src/modules/companies/editable-field/types/EditableFieldHotkeyScope.ts b/packages/twenty-front/src/modules/companies/editable-field/types/EditableFieldHotkeyScope.ts
deleted file mode 100644
index 309495c8f26a..000000000000
--- a/packages/twenty-front/src/modules/companies/editable-field/types/EditableFieldHotkeyScope.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export enum EditableFieldHotkeyScope {
-  EditableField = 'editable-field',
-}
diff --git a/packages/twenty-front/src/modules/companies/states/companyProgressesFamilyState.ts b/packages/twenty-front/src/modules/companies/states/companyProgressesFamilyState.ts
deleted file mode 100644
index 5b920ef303a3..000000000000
--- a/packages/twenty-front/src/modules/companies/states/companyProgressesFamilyState.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { atomFamily } from 'recoil';
-
-import { CompanyProgress } from '@/companies/types/CompanyProgress';
-
-export const companyProgressesFamilyState = atomFamily<
-  CompanyProgress | undefined,
-  string
->({
-  key: 'companyProgressesFamilyState',
-  default: undefined,
-});
diff --git a/packages/twenty-front/src/modules/companies/states/recoil-scope-contexts/CompanyBoardViewBarRecoilScopeContext.ts b/packages/twenty-front/src/modules/companies/states/recoil-scope-contexts/CompanyBoardViewBarRecoilScopeContext.ts
deleted file mode 100644
index d5e5436e0d5f..000000000000
--- a/packages/twenty-front/src/modules/companies/states/recoil-scope-contexts/CompanyBoardViewBarRecoilScopeContext.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { createContext } from 'react';
-
-export const CompanyBoardViewBarRecoilScopeContext = createContext<
-  string | null
->(null);
diff --git a/packages/twenty-front/src/modules/companies/types/CompanyProgress.ts b/packages/twenty-front/src/modules/companies/types/CompanyProgress.ts
deleted file mode 100644
index ab797dca2603..000000000000
--- a/packages/twenty-front/src/modules/companies/types/CompanyProgress.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Company } from '@/companies/types/Company';
-import { Opportunity } from '@/pipeline/types/Opportunity';
-
-export type CompanyForBoard = Pick<Company, 'id' | 'name' | 'domainName'>;
-
-export type CompanyProgress = {
-  company: CompanyForBoard;
-  opportunity: Opportunity;
-};
-
-export type CompanyProgressDict = {
-  [key: string]: CompanyProgress;
-};
diff --git a/packages/twenty-front/src/modules/companies/utils/mapBoardFieldDefinitionsToViewFields.ts b/packages/twenty-front/src/modules/companies/utils/mapBoardFieldDefinitionsToViewFields.ts
deleted file mode 100644
index f02d992af8f3..000000000000
--- a/packages/twenty-front/src/modules/companies/utils/mapBoardFieldDefinitionsToViewFields.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { v4 } from 'uuid';
-
-import { BoardFieldDefinition } from '@/object-record/record-board-deprecated/types/BoardFieldDefinition';
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { ViewField } from '@/views/types/ViewField';
-
-export const mapBoardFieldDefinitionsToViewFields = (
-  fieldsDefinitions: BoardFieldDefinition<FieldMetadata>[],
-): ViewField[] => {
-  return fieldsDefinitions.map(
-    (fieldDefinition): ViewField => ({
-      id: fieldDefinition.viewFieldId || v4(),
-      fieldMetadataId: fieldDefinition.fieldMetadataId,
-      size: 0,
-      position: fieldDefinition.position,
-      isVisible: fieldDefinition.isVisible ?? true,
-      definition: fieldDefinition,
-    }),
-  );
-};
diff --git a/packages/twenty-front/src/modules/databases/graphql/fragments/databaseConnectionFragment.ts b/packages/twenty-front/src/modules/databases/graphql/fragments/databaseConnectionFragment.ts
new file mode 100644
index 000000000000..73b3c0c322a7
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/graphql/fragments/databaseConnectionFragment.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+export const DATABASE_CONNECTION_FRAGMENT = gql`
+  fragment RemoteServerFields on RemoteServer {
+    id
+    createdAt
+    foreignDataWrapperId
+    foreignDataWrapperOptions
+    foreignDataWrapperType
+    updatedAt
+  }
+`;
diff --git a/packages/twenty-front/src/modules/databases/graphql/fragments/remoteTableFragment.ts b/packages/twenty-front/src/modules/databases/graphql/fragments/remoteTableFragment.ts
new file mode 100644
index 000000000000..a14cdfa3888a
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/graphql/fragments/remoteTableFragment.ts
@@ -0,0 +1,9 @@
+import { gql } from '@apollo/client';
+
+export const REMOTE_TABLE_FRAGMENT = gql`
+  fragment RemoteTableFields on RemoteTable {
+    name
+    schema
+    status
+  }
+`;
diff --git a/packages/twenty-front/src/modules/databases/graphql/mutations/createOneDatabaseConnection.ts b/packages/twenty-front/src/modules/databases/graphql/mutations/createOneDatabaseConnection.ts
new file mode 100644
index 000000000000..4c77e0508eb3
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/graphql/mutations/createOneDatabaseConnection.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+import { DATABASE_CONNECTION_FRAGMENT } from '@/databases/graphql/fragments/databaseConnectionFragment';
+
+export const CREATE_ONE_DATABASE_CONNECTION = gql`
+  ${DATABASE_CONNECTION_FRAGMENT}
+  mutation createServer($input: CreateRemoteServerInput!) {
+    createOneRemoteServer(input: $input) {
+      ...RemoteServerFields
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/databases/graphql/mutations/deleteOneDatabaseConnection.ts b/packages/twenty-front/src/modules/databases/graphql/mutations/deleteOneDatabaseConnection.ts
new file mode 100644
index 000000000000..c2f9974ba598
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/graphql/mutations/deleteOneDatabaseConnection.ts
@@ -0,0 +1,9 @@
+import { gql } from '@apollo/client';
+
+export const DELETE_ONE_DATABASE_CONNECTION = gql`
+  mutation deleteServer($input: RemoteServerIdInput!) {
+    deleteOneRemoteServer(input: $input) {
+      id
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/databases/graphql/mutations/syncRemoteTable.ts b/packages/twenty-front/src/modules/databases/graphql/mutations/syncRemoteTable.ts
new file mode 100644
index 000000000000..acb45746774a
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/graphql/mutations/syncRemoteTable.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+import { REMOTE_TABLE_FRAGMENT } from '@/databases/graphql/fragments/remoteTableFragment';
+
+export const SYNC_REMOTE_TABLE = gql`
+  ${REMOTE_TABLE_FRAGMENT}
+  mutation syncRemoteTable($input: RemoteTableInput!) {
+    syncRemoteTable(input: $input) {
+      ...RemoteTableFields
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/databases/graphql/mutations/unsyncRemoteTable.ts b/packages/twenty-front/src/modules/databases/graphql/mutations/unsyncRemoteTable.ts
new file mode 100644
index 000000000000..300696154b46
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/graphql/mutations/unsyncRemoteTable.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+import { REMOTE_TABLE_FRAGMENT } from '@/databases/graphql/fragments/remoteTableFragment';
+
+export const UNSYNC_REMOTE_TABLE = gql`
+  ${REMOTE_TABLE_FRAGMENT}
+  mutation unsyncRemoteTable($input: RemoteTableInput!) {
+    unsyncRemoteTable(input: $input) {
+      ...RemoteTableFields
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/databases/graphql/queries/findManyDatabaseConnections.ts b/packages/twenty-front/src/modules/databases/graphql/queries/findManyDatabaseConnections.ts
new file mode 100644
index 000000000000..5b33e4f04400
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/graphql/queries/findManyDatabaseConnections.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+import { DATABASE_CONNECTION_FRAGMENT } from '@/databases/graphql/fragments/databaseConnectionFragment';
+
+export const GET_MANY_DATABASE_CONNECTIONS = gql`
+  ${DATABASE_CONNECTION_FRAGMENT}
+  query GetManyDatabaseConnections($input: RemoteServerTypeInput!) {
+    findManyRemoteServersByType(input: $input) {
+      ...RemoteServerFields
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/databases/graphql/queries/findManyRemoteTables.ts b/packages/twenty-front/src/modules/databases/graphql/queries/findManyRemoteTables.ts
new file mode 100644
index 000000000000..69eca2bf8296
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/graphql/queries/findManyRemoteTables.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+import { REMOTE_TABLE_FRAGMENT } from '@/databases/graphql/fragments/remoteTableFragment';
+
+export const GET_MANY_REMOTE_TABLES = gql`
+  ${REMOTE_TABLE_FRAGMENT}
+  query GetManyRemoteTables($input: RemoteServerIdInput!) {
+    findAvailableRemoteTablesByServerId(input: $input) {
+      ...RemoteTableFields
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/databases/graphql/queries/findOneDatabaseConnection.ts b/packages/twenty-front/src/modules/databases/graphql/queries/findOneDatabaseConnection.ts
new file mode 100644
index 000000000000..4658e133b208
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/graphql/queries/findOneDatabaseConnection.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+import { DATABASE_CONNECTION_FRAGMENT } from '@/databases/graphql/fragments/databaseConnectionFragment';
+
+export const GET_ONE_DATABASE_CONNECTION = gql`
+  ${DATABASE_CONNECTION_FRAGMENT}
+  query GetOneDatabaseConnection($input: RemoteServerIdInput!) {
+    findOneRemoteServerById(input: $input) {
+      ...RemoteServerFields
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/databases/hooks/useCreateOneDatabaseConnection.ts b/packages/twenty-front/src/modules/databases/hooks/useCreateOneDatabaseConnection.ts
new file mode 100644
index 000000000000..3221c305c77a
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/hooks/useCreateOneDatabaseConnection.ts
@@ -0,0 +1,38 @@
+import { ApolloClient, useMutation } from '@apollo/client';
+import { getOperationName } from '@apollo/client/utilities';
+
+import { CREATE_ONE_DATABASE_CONNECTION } from '@/databases/graphql/mutations/createOneDatabaseConnection';
+import { GET_MANY_DATABASE_CONNECTIONS } from '@/databases/graphql/queries/findManyDatabaseConnections';
+import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient';
+import {
+  CreateRemoteServerInput,
+  CreateServerMutation,
+  CreateServerMutationVariables,
+} from '~/generated-metadata/graphql';
+
+export const useCreateOneDatabaseConnection = () => {
+  const apolloMetadataClient = useApolloMetadataClient();
+
+  const [mutate] = useMutation<
+    CreateServerMutation,
+    CreateServerMutationVariables
+  >(CREATE_ONE_DATABASE_CONNECTION, {
+    client: apolloMetadataClient ?? ({} as ApolloClient<any>),
+  });
+
+  const createOneDatabaseConnection = async (
+    input: CreateRemoteServerInput,
+  ) => {
+    return await mutate({
+      variables: {
+        input,
+      },
+      awaitRefetchQueries: true,
+      refetchQueries: [getOperationName(GET_MANY_DATABASE_CONNECTIONS) ?? ''],
+    });
+  };
+
+  return {
+    createOneDatabaseConnection,
+  };
+};
diff --git a/packages/twenty-front/src/modules/databases/hooks/useDeleteOneDatabaseConnection.ts b/packages/twenty-front/src/modules/databases/hooks/useDeleteOneDatabaseConnection.ts
new file mode 100644
index 000000000000..eae2f4a42d49
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/hooks/useDeleteOneDatabaseConnection.ts
@@ -0,0 +1,36 @@
+import { ApolloClient, useMutation } from '@apollo/client';
+import { getOperationName } from '@apollo/client/utilities';
+
+import { DELETE_ONE_DATABASE_CONNECTION } from '@/databases/graphql/mutations/deleteOneDatabaseConnection';
+import { GET_MANY_DATABASE_CONNECTIONS } from '@/databases/graphql/queries/findManyDatabaseConnections';
+import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient';
+import {
+  DeleteServerMutation,
+  DeleteServerMutationVariables,
+  RemoteServerIdInput,
+} from '~/generated-metadata/graphql';
+
+export const useDeleteOneDatabaseConnection = () => {
+  const apolloMetadataClient = useApolloMetadataClient();
+
+  const [mutate] = useMutation<
+    DeleteServerMutation,
+    DeleteServerMutationVariables
+  >(DELETE_ONE_DATABASE_CONNECTION, {
+    client: apolloMetadataClient ?? ({} as ApolloClient<any>),
+  });
+
+  const deleteOneDatabaseConnection = async (input: RemoteServerIdInput) => {
+    return await mutate({
+      variables: {
+        input,
+      },
+      awaitRefetchQueries: true,
+      refetchQueries: [getOperationName(GET_MANY_DATABASE_CONNECTIONS) ?? ''],
+    });
+  };
+
+  return {
+    deleteOneDatabaseConnection,
+  };
+};
diff --git a/packages/twenty-front/src/modules/databases/hooks/useGetDatabaseConnection.ts b/packages/twenty-front/src/modules/databases/hooks/useGetDatabaseConnection.ts
new file mode 100644
index 000000000000..5d13777dfb8a
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/hooks/useGetDatabaseConnection.ts
@@ -0,0 +1,47 @@
+import { useQuery } from '@apollo/client';
+
+import { GET_ONE_DATABASE_CONNECTION } from '@/databases/graphql/queries/findOneDatabaseConnection';
+import { getForeignDataWrapperType } from '@/databases/utils/getForeignDataWrapperType';
+import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient';
+import {
+  GetOneDatabaseConnectionQuery,
+  GetOneDatabaseConnectionQueryVariables,
+} from '~/generated-metadata/graphql';
+
+type UseGetDatabaseConnectionParams = {
+  databaseKey: string;
+  connectionId: string;
+  skip?: boolean;
+};
+
+export const useGetDatabaseConnection = ({
+  databaseKey,
+  connectionId,
+  skip,
+}: UseGetDatabaseConnectionParams) => {
+  const apolloMetadataClient = useApolloMetadataClient();
+  const foreignDataWrapperType = getForeignDataWrapperType(databaseKey);
+
+  const { data, loading } = useQuery<
+    GetOneDatabaseConnectionQuery,
+    GetOneDatabaseConnectionQueryVariables
+  >(GET_ONE_DATABASE_CONNECTION, {
+    client: apolloMetadataClient ?? undefined,
+    skip: skip || !apolloMetadataClient || !foreignDataWrapperType,
+    variables: {
+      input: {
+        id: connectionId,
+      },
+    },
+  });
+
+  const connection = data?.findOneRemoteServerById ?? null;
+
+  return {
+    connection:
+      connection?.foreignDataWrapperType === foreignDataWrapperType
+        ? connection
+        : null,
+    loading,
+  };
+};
diff --git a/packages/twenty-front/src/modules/databases/hooks/useGetDatabaseConnectionTables.ts b/packages/twenty-front/src/modules/databases/hooks/useGetDatabaseConnectionTables.ts
new file mode 100644
index 000000000000..6548222e65fe
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/hooks/useGetDatabaseConnectionTables.ts
@@ -0,0 +1,37 @@
+import { useQuery } from '@apollo/client';
+
+import { GET_MANY_REMOTE_TABLES } from '@/databases/graphql/queries/findManyRemoteTables';
+import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient';
+import {
+  GetManyRemoteTablesQuery,
+  GetManyRemoteTablesQueryVariables,
+} from '~/generated-metadata/graphql';
+
+type UseGetDatabaseConnectionTablesParams = {
+  connectionId: string;
+  skip?: boolean;
+};
+
+export const useGetDatabaseConnectionTables = ({
+  connectionId,
+  skip,
+}: UseGetDatabaseConnectionTablesParams) => {
+  const apolloMetadataClient = useApolloMetadataClient();
+
+  const { data } = useQuery<
+    GetManyRemoteTablesQuery,
+    GetManyRemoteTablesQueryVariables
+  >(GET_MANY_REMOTE_TABLES, {
+    client: apolloMetadataClient ?? undefined,
+    skip: skip || !apolloMetadataClient,
+    variables: {
+      input: {
+        id: connectionId,
+      },
+    },
+  });
+
+  return {
+    tables: data?.findAvailableRemoteTablesByServerId || [],
+  };
+};
diff --git a/packages/twenty-front/src/modules/databases/hooks/useGetDatabaseConnections.ts b/packages/twenty-front/src/modules/databases/hooks/useGetDatabaseConnections.ts
new file mode 100644
index 000000000000..979249183da7
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/hooks/useGetDatabaseConnections.ts
@@ -0,0 +1,39 @@
+import { useQuery } from '@apollo/client';
+
+import { GET_MANY_DATABASE_CONNECTIONS } from '@/databases/graphql/queries/findManyDatabaseConnections';
+import { getForeignDataWrapperType } from '@/databases/utils/getForeignDataWrapperType';
+import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient';
+import {
+  GetManyDatabaseConnectionsQuery,
+  GetManyDatabaseConnectionsQueryVariables,
+} from '~/generated-metadata/graphql';
+
+type UseGetDatabaseConnectionsParams = {
+  databaseKey: string;
+  skip?: boolean;
+};
+
+export const useGetDatabaseConnections = ({
+  databaseKey,
+  skip,
+}: UseGetDatabaseConnectionsParams) => {
+  const apolloMetadataClient = useApolloMetadataClient();
+  const foreignDataWrapperType = getForeignDataWrapperType(databaseKey);
+
+  const { data } = useQuery<
+    GetManyDatabaseConnectionsQuery,
+    GetManyDatabaseConnectionsQueryVariables
+  >(GET_MANY_DATABASE_CONNECTIONS, {
+    client: apolloMetadataClient ?? undefined,
+    skip: skip || !apolloMetadataClient || !foreignDataWrapperType,
+    variables: {
+      input: {
+        foreignDataWrapperType: foreignDataWrapperType || '',
+      },
+    },
+  });
+
+  return {
+    connections: data?.findManyRemoteServersByType || [],
+  };
+};
diff --git a/packages/twenty-front/src/modules/databases/hooks/useSyncRemoteTable.ts b/packages/twenty-front/src/modules/databases/hooks/useSyncRemoteTable.ts
new file mode 100644
index 000000000000..7a3a39ecb7a2
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/hooks/useSyncRemoteTable.ts
@@ -0,0 +1,60 @@
+import { useCallback } from 'react';
+import { ApolloClient, useApolloClient, useMutation } from '@apollo/client';
+import { getOperationName } from '@apollo/client/utilities';
+
+import { SYNC_REMOTE_TABLE } from '@/databases/graphql/mutations/syncRemoteTable';
+import { GET_MANY_REMOTE_TABLES } from '@/databases/graphql/queries/findManyRemoteTables';
+import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient';
+import { useFindManyObjectMetadataItems } from '@/object-metadata/hooks/useFindManyObjectMetadataItems';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecordsQuery';
+import {
+  RemoteTableInput,
+  SyncRemoteTableMutation,
+  SyncRemoteTableMutationVariables,
+} from '~/generated-metadata/graphql';
+
+export const useSyncRemoteTable = () => {
+  const apolloMetadataClient = useApolloMetadataClient();
+  const apolloClient = useApolloClient();
+
+  const { refetch: refetchObjectMetadataItems } =
+    useFindManyObjectMetadataItems();
+
+  const { findManyRecordsQuery: findManyViewsQuery } = useFindManyRecordsQuery({
+    objectNameSingular: CoreObjectNameSingular.View,
+  });
+
+  const [mutate] = useMutation<
+    SyncRemoteTableMutation,
+    SyncRemoteTableMutationVariables
+  >(SYNC_REMOTE_TABLE, {
+    client: apolloMetadataClient ?? ({} as ApolloClient<any>),
+  });
+
+  const syncRemoteTable = useCallback(
+    async (input: RemoteTableInput) => {
+      const remoteTable = await mutate({
+        variables: {
+          input,
+        },
+        awaitRefetchQueries: true,
+        refetchQueries: [getOperationName(GET_MANY_REMOTE_TABLES) ?? ''],
+      });
+
+      // TODO: we should return the tables with the columns and store in cache instead of refetching
+      await refetchObjectMetadataItems();
+      await apolloClient.query({
+        query: findManyViewsQuery,
+        fetchPolicy: 'network-only',
+      });
+
+      return remoteTable;
+    },
+    [apolloClient, findManyViewsQuery, mutate, refetchObjectMetadataItems],
+  );
+
+  return {
+    syncRemoteTable,
+  };
+};
diff --git a/packages/twenty-front/src/modules/databases/hooks/useUnsyncRemoteTable.ts b/packages/twenty-front/src/modules/databases/hooks/useUnsyncRemoteTable.ts
new file mode 100644
index 000000000000..6bc85507fe21
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/hooks/useUnsyncRemoteTable.ts
@@ -0,0 +1,47 @@
+import { useCallback } from 'react';
+import { ApolloClient, useMutation } from '@apollo/client';
+import { getOperationName } from '@apollo/client/utilities';
+
+import { UNSYNC_REMOTE_TABLE } from '@/databases/graphql/mutations/unsyncRemoteTable';
+import { GET_MANY_REMOTE_TABLES } from '@/databases/graphql/queries/findManyRemoteTables';
+import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient';
+import { useFindManyObjectMetadataItems } from '@/object-metadata/hooks/useFindManyObjectMetadataItems';
+import {
+  RemoteTableInput,
+  UnsyncRemoteTableMutation,
+  UnsyncRemoteTableMutationVariables,
+} from '~/generated-metadata/graphql';
+
+export const useUnsyncRemoteTable = () => {
+  const apolloMetadataClient = useApolloMetadataClient();
+  const { refetch: refetchObjectMetadataItems } =
+    useFindManyObjectMetadataItems();
+
+  const [mutate] = useMutation<
+    UnsyncRemoteTableMutation,
+    UnsyncRemoteTableMutationVariables
+  >(UNSYNC_REMOTE_TABLE, {
+    client: apolloMetadataClient ?? ({} as ApolloClient<any>),
+  });
+
+  const unsyncRemoteTable = useCallback(
+    async (input: RemoteTableInput) => {
+      const remoteTable = await mutate({
+        variables: {
+          input,
+        },
+        awaitRefetchQueries: true,
+        refetchQueries: [getOperationName(GET_MANY_REMOTE_TABLES) ?? ''],
+      });
+
+      await refetchObjectMetadataItems();
+
+      return remoteTable;
+    },
+    [mutate, refetchObjectMetadataItems],
+  );
+
+  return {
+    unsyncRemoteTable,
+  };
+};
diff --git a/packages/twenty-front/src/modules/databases/utils/getForeignDataWrapperType.ts b/packages/twenty-front/src/modules/databases/utils/getForeignDataWrapperType.ts
new file mode 100644
index 000000000000..af50a62419d6
--- /dev/null
+++ b/packages/twenty-front/src/modules/databases/utils/getForeignDataWrapperType.ts
@@ -0,0 +1,8 @@
+export const getForeignDataWrapperType = (databaseKey: string) => {
+  switch (databaseKey) {
+    case 'postgresql':
+      return 'postgres_fdw';
+    default:
+      return null;
+  }
+};
diff --git a/packages/twenty-front/src/modules/error-handler/components/GenericErrorFallback.tsx b/packages/twenty-front/src/modules/error-handler/components/GenericErrorFallback.tsx
index f482dbd91f37..73b9a64c615f 100644
--- a/packages/twenty-front/src/modules/error-handler/components/GenericErrorFallback.tsx
+++ b/packages/twenty-front/src/modules/error-handler/components/GenericErrorFallback.tsx
@@ -1,7 +1,7 @@
 import { FallbackProps } from 'react-error-boundary';
-import { Button } from 'tsup.ui.index';
+import { IconRefresh } from 'twenty-ui';
 
-import { IconRefresh } from '@/ui/display/icon';
+import { Button } from '@/ui/input/button/components/Button';
 import AnimatedPlaceholder from '@/ui/layout/animated-placeholder/components/AnimatedPlaceholder';
 import {
   AnimatedPlaceholderEmptyContainer,
diff --git a/packages/twenty-front/src/modules/error-handler/components/SentryInitiEffect.tsx b/packages/twenty-front/src/modules/error-handler/components/SentryInitiEffect.tsx
index cd8160e4f01b..16b1ed014e48 100644
--- a/packages/twenty-front/src/modules/error-handler/components/SentryInitiEffect.tsx
+++ b/packages/twenty-front/src/modules/error-handler/components/SentryInitiEffect.tsx
@@ -1,5 +1,6 @@
 import { useEffect, useState } from 'react';
 import * as Sentry from '@sentry/react';
+import { isNonEmptyString } from '@sniptt/guards';
 import { useRecoilValue } from 'recoil';
 
 import { currentUserState } from '@/auth/states/currentUserState';
@@ -7,6 +8,7 @@ import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMembe
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { sentryConfigState } from '@/client-config/states/sentryConfigState';
 import { REACT_APP_SERVER_BASE_URL } from '~/config';
+import { isDefined } from '~/utils/isDefined';
 
 export const SentryInitEffect = () => {
   const sentryConfig = useRecoilValue(sentryConfigState);
@@ -18,8 +20,10 @@ export const SentryInitEffect = () => {
   const [isSentryInitialized, setIsSentryInitialized] = useState(false);
 
   useEffect(() => {
-    if (sentryConfig?.dsn && !isSentryInitialized) {
+    if (isNonEmptyString(sentryConfig?.dsn) && !isSentryInitialized) {
       Sentry.init({
+        environment: sentryConfig?.environment ?? undefined,
+        release: sentryConfig?.release ?? undefined,
         dsn: sentryConfig?.dsn,
         integrations: [
           new Sentry.BrowserTracing({
@@ -38,7 +42,7 @@ export const SentryInitEffect = () => {
       setIsSentryInitialized(true);
     }
 
-    if (currentUser) {
+    if (isDefined(currentUser)) {
       Sentry.setUser({
         email: currentUser?.email,
         id: currentUser?.id,
diff --git a/packages/twenty-front/src/modules/favorites/components/Favorites.tsx b/packages/twenty-front/src/modules/favorites/components/Favorites.tsx
index bda4a5db6e32..cd6ee5d8b158 100644
--- a/packages/twenty-front/src/modules/favorites/components/Favorites.tsx
+++ b/packages/twenty-front/src/modules/favorites/components/Favorites.tsx
@@ -13,6 +13,22 @@ const StyledContainer = styled(NavigationDrawerSection)`
   width: 100%;
 `;
 
+const StyledAvatar = styled(Avatar)`
+  :hover {
+    cursor: grab;
+  }
+`;
+
+const StyledNavigationDrawerItem = styled(NavigationDrawerItem)`
+  :active {
+    cursor: grabbing;
+
+    .fav-avatar:hover {
+      cursor: grabbing;
+    }
+  }
+`;
+
 export const Favorites = () => {
   const { favorites, handleReorderFavorite } = useFavorites();
 
@@ -41,15 +57,16 @@ export const Favorites = () => {
                   draggableId={id}
                   index={index}
                   itemComponent={
-                    <NavigationDrawerItem
+                    <StyledNavigationDrawerItem
                       key={id}
                       label={labelIdentifier}
                       Icon={() => (
-                        <Avatar
+                        <StyledAvatar
                           entityId={recordId}
                           avatarUrl={avatarUrl}
                           type={avatarType}
                           placeholder={labelIdentifier}
+                          className="fav-avatar"
                         />
                       )}
                       to={link}
diff --git a/packages/twenty-front/src/modules/favorites/hooks/__mocks__/useFavorites.ts b/packages/twenty-front/src/modules/favorites/hooks/__mocks__/useFavorites.ts
index e616ba797d64..d98c0bbc08bf 100644
--- a/packages/twenty-front/src/modules/favorites/hooks/__mocks__/useFavorites.ts
+++ b/packages/twenty-front/src/modules/favorites/hooks/__mocks__/useFavorites.ts
@@ -84,8 +84,77 @@ export const mocks = [
       query: gql`
         mutation CreateOneFavorite($input: FavoriteCreateInput!) {
           createFavorite(data: $input) {
-            id
+        __typename
+        id
+        companyId
+        createdAt
+        personId
+        person {
+          __typename
+          xLink {
+            label
+            url
+          }
+          id
+          createdAt
+          city
+          email
+          jobTitle
+          name {
+            firstName
+            lastName
+          }
+          phone
+          linkedinLink {
+            label
+            url
+          }
+          updatedAt
+          avatarUrl
+          companyId
+        }
+        position
+        workspaceMemberId
+        workspaceMember {
+          __typename
+          colorScheme
+          name {
+            firstName
+            lastName
           }
+          locale
+          userId
+          avatarUrl
+          createdAt
+          updatedAt
+          id
+        }
+        company {
+          __typename
+          xLink {
+            label
+            url
+          }
+          linkedinLink {
+            label
+            url
+          }
+          domainName
+          annualRecurringRevenue {
+            amountMicros
+            currencyCode
+          }
+          createdAt
+          address
+          updatedAt
+          name
+          accountOwnerId
+          employees
+          id
+          idealCustomerProfile
+        }
+        updatedAt
+      }
         }
       `,
       variables: {
@@ -108,7 +177,7 @@ export const mocks = [
   {
     request: {
       query: gql`
-        mutation DeleteOneFavorite($idToDelete: ID!) {
+        mutation DeleteOneFavorite($idToDelete: UUID!) {
           deleteFavorite(id: $idToDelete) {
             id
           }
@@ -128,12 +197,81 @@ export const mocks = [
     request: {
       query: gql`
         mutation UpdateOneFavorite(
-          $idToUpdate: ID!
+          $idToUpdate: UUID!
           $input: FavoriteUpdateInput!
         ) {
           updateFavorite(id: $idToUpdate, data: $input) {
-            id
+        __typename
+        id
+        companyId
+        createdAt
+        personId
+        person {
+          __typename
+          xLink {
+            label
+            url
+          }
+          id
+          createdAt
+          city
+          email
+          jobTitle
+          name {
+            firstName
+            lastName
+          }
+          phone
+          linkedinLink {
+            label
+            url
+          }
+          updatedAt
+          avatarUrl
+          companyId
+        }
+        position
+        workspaceMemberId
+        workspaceMember {
+          __typename
+          colorScheme
+          name {
+            firstName
+            lastName
           }
+          locale
+          userId
+          avatarUrl
+          createdAt
+          updatedAt
+          id
+        }
+        company {
+          __typename
+          xLink {
+            label
+            url
+          }
+          linkedinLink {
+            label
+            url
+          }
+          domainName
+          annualRecurringRevenue {
+            amountMicros
+            currencyCode
+          }
+          createdAt
+          address
+          updatedAt
+          name
+          accountOwnerId
+          employees
+          id
+          idealCustomerProfile
+        }
+        updatedAt
+      }
         }
       `,
       variables: {
diff --git a/packages/twenty-front/src/modules/favorites/hooks/__tests__/useFavorites.test.tsx b/packages/twenty-front/src/modules/favorites/hooks/__tests__/useFavorites.test.tsx
index f7fb44d6f525..6a4b83b77d9b 100644
--- a/packages/twenty-front/src/modules/favorites/hooks/__tests__/useFavorites.test.tsx
+++ b/packages/twenty-front/src/modules/favorites/hooks/__tests__/useFavorites.test.tsx
@@ -25,10 +25,6 @@ jest.mock('uuid', () => ({
   v4: jest.fn(() => mockId),
 }));
 
-jest.mock('@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery', () => ({
-  useMapFieldMetadataToGraphQLQuery: () => () => '\n',
-}));
-
 jest.mock('@/object-record/hooks/useFindManyRecords', () => ({
   useFindManyRecords: () => ({ records: initialFavorites }),
 }));
@@ -150,7 +146,7 @@ describe('useFavorites', () => {
       };
 
       const responderProvided: ResponderProvided = {
-        announce: (message: string) => console.log(message),
+        announce: () => {},
       };
 
       result.current.handleReorderFavorite(
diff --git a/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts b/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts
index 8614bfc60d1c..f01cdd1d4fc2 100644
--- a/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts
+++ b/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts
@@ -6,38 +6,38 @@ import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMembe
 import { Favorite } from '@/favorites/types/Favorite';
 import { useGetObjectRecordIdentifierByNameSingular } from '@/object-metadata/hooks/useGetObjectRecordIdentifierByNameSingular';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
-import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
+import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
+import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const useFavorites = () => {
   const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
 
-  const favoriteObjectNameSingular = 'favorite';
-
   const { objectMetadataItem: favoriteObjectMetadataItem } =
     useObjectMetadataItem({
-      objectNameSingular: favoriteObjectNameSingular,
+      objectNameSingular: CoreObjectNameSingular.Favorite,
     });
 
   const { deleteOneRecord } = useDeleteOneRecord({
-    objectNameSingular: favoriteObjectNameSingular,
+    objectNameSingular: CoreObjectNameSingular.Favorite,
   });
 
   const { updateOneRecord: updateOneFavorite } = useUpdateOneRecord({
-    objectNameSingular: favoriteObjectNameSingular,
+    objectNameSingular: CoreObjectNameSingular.Favorite,
   });
 
   const { createOneRecord: createOneFavorite } = useCreateOneRecord({
-    objectNameSingular: favoriteObjectNameSingular,
+    objectNameSingular: CoreObjectNameSingular.Favorite,
   });
 
-  const { records: favorites } = useFindManyRecords<Favorite>({
-    objectNameSingular: favoriteObjectNameSingular,
-  });
+  const { records: favorites } = usePrefetchedData<Favorite>(
+    PrefetchKey.AllFavorites,
+  );
 
   const favoriteRelationFieldMetadataItems = useMemo(
     () =>
@@ -56,7 +56,7 @@ export const useFavorites = () => {
     return favorites
       .map((favorite) => {
         for (const relationField of favoriteRelationFieldMetadataItems) {
-          if (isNonNullable(favorite[relationField.name])) {
+          if (isDefined(favorite[relationField.name])) {
             const relationObject = favorite[relationField.name];
 
             const relationObjectNameSingular =
diff --git a/packages/twenty-front/src/modules/favorites/states/favoritesState.ts b/packages/twenty-front/src/modules/favorites/states/favoritesState.ts
index 298de69af83f..95e6c828f1e8 100644
--- a/packages/twenty-front/src/modules/favorites/states/favoritesState.ts
+++ b/packages/twenty-front/src/modules/favorites/states/favoritesState.ts
@@ -1,8 +1,8 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { Favorite } from '@/favorites/types/Favorite';
 
-export const favoritesState = atom<Favorite[]>({
+export const favoritesState = createState<Favorite[]>({
   key: 'favoritesState',
-  default: [],
+  defaultValue: [],
 });
diff --git a/packages/twenty-front/src/modules/favorites/utils/mapFavorites.ts b/packages/twenty-front/src/modules/favorites/utils/mapFavorites.ts
index ae9fae903014..c0e5deff1551 100644
--- a/packages/twenty-front/src/modules/favorites/utils/mapFavorites.ts
+++ b/packages/twenty-front/src/modules/favorites/utils/mapFavorites.ts
@@ -1,10 +1,10 @@
 import { getLogoUrlFromDomainName } from '~/utils';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const mapFavorites = (favorites: any) => {
   return favorites
     .map((favorite: any) => {
-      const recordInformation = isNonNullable(favorite?.person)
+      const recordInformation = isDefined(favorite?.person)
         ? {
             id: favorite.person.id,
             labelIdentifier:
@@ -15,7 +15,7 @@ export const mapFavorites = (favorites: any) => {
             avatarType: 'rounded',
             link: `/object/person/${favorite.person.id}`,
           }
-        : isNonNullable(favorite?.company)
+        : isDefined(favorite?.company)
           ? {
               id: favorite.company.id,
               labelIdentifier: favorite.company.name,
@@ -32,6 +32,6 @@ export const mapFavorites = (favorites: any) => {
         position: favorite?.position,
       };
     })
-    .filter(isNonNullable)
+    .filter(isDefined)
     .sort((a: any, b: any) => a.position - b.position);
 };
diff --git a/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenuDialog.tsx b/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenuDialog.tsx
index c185d7c8e445..80cc5c6b516f 100644
--- a/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenuDialog.tsx
+++ b/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenuDialog.tsx
@@ -1,4 +1,5 @@
-import { IconX } from '@/ui/display/icon';
+import { IconX } from 'twenty-ui';
+
 import { IconButton } from '@/ui/input/button/components/IconButton';
 
 import {
diff --git a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerItems.tsx b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerItems.tsx
index 9ac6d6850f35..1147a7d888a3 100644
--- a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerItems.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerItems.tsx
@@ -1,18 +1,11 @@
 import { useLocation, useNavigate } from 'react-router-dom';
 import { useRecoilValue, useSetRecoilState } from 'recoil';
-
+import { IconCheckbox, IconInbox, IconSearch, IconSettings, IconMail } from 'twenty-ui';
 import { CurrentUserDueTaskCountEffect } from '@/activities/tasks/components/CurrentUserDueTaskCountEffect';
 import { currentUserDueTaskCountState } from '@/activities/tasks/states/currentUserTaskCountState';
 import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { Favorites } from '@/favorites/components/Favorites';
-import { ObjectMetadataNavItems } from '@/object-metadata/components/ObjectMetadataNavItems';
-import {
-  IconBell,
-  IconCheckbox,
-  IconMail,
-  IconSearch,
-  IconSettings,
-} from '@/ui/display/icon';
+import { ObjectMetadataNavItems } from '@/object-metadata/components/ObjectMetadataNavItems'
 import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
 import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection';
 import { NavigationDrawerSectionTitle } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle';
@@ -43,9 +36,9 @@ export const MainNavigationDrawerItems = () => {
             keyboard={['⌘', 'K']}
           />
           <NavigationDrawerItem
-            label="Notifications"
+            label="Inbox"
             to="/inbox"
-            Icon={IconBell}
+            Icon={IconInbox}
             soon
           />
           <NavigationDrawerItem
diff --git a/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx b/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
index 3680415ba45a..593f57ff3c9f 100644
--- a/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
@@ -1,15 +1,10 @@
 import { useNavigate } from 'react-router-dom';
 import { useRecoilState } from 'recoil';
+import { IconCheckbox, IconList, IconSearch, IconSettings } from 'twenty-ui';
 
 import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { isCommandMenuOpenedState } from '@/command-menu/states/isCommandMenuOpenedState';
 import { AppPath } from '@/types/AppPath';
-import {
-  IconCheckbox,
-  IconList,
-  IconSearch,
-  IconSettings,
-} from '@/ui/display/icon';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 import { NavigationBar } from '@/ui/navigation/navigation-bar/components/NavigationBar';
 import { isNavigationDrawerOpenState } from '@/ui/navigation/states/isNavigationDrawerOpenState';
diff --git a/packages/twenty-front/src/modules/navigation/states/currentMobileNavigationDrawerState.ts b/packages/twenty-front/src/modules/navigation/states/currentMobileNavigationDrawerState.ts
index acd302d4427a..c376b1953102 100644
--- a/packages/twenty-front/src/modules/navigation/states/currentMobileNavigationDrawerState.ts
+++ b/packages/twenty-front/src/modules/navigation/states/currentMobileNavigationDrawerState.ts
@@ -1,6 +1,8 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const currentMobileNavigationDrawerState = atom<'main' | 'settings'>({
+export const currentMobileNavigationDrawerState = createState<
+  'main' | 'settings'
+>({
   key: 'currentMobileNavigationDrawerState',
-  default: 'main',
+  defaultValue: 'main',
 });
diff --git a/packages/twenty-front/src/modules/object-metadata/components/ApolloMetadataClientProvider.tsx b/packages/twenty-front/src/modules/object-metadata/components/ApolloMetadataClientProvider.tsx
index de90c844b8fc..737811846893 100644
--- a/packages/twenty-front/src/modules/object-metadata/components/ApolloMetadataClientProvider.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/components/ApolloMetadataClientProvider.tsx
@@ -1,8 +1,4 @@
-import { useMemo } from 'react';
-import { ApolloClient, InMemoryCache } from '@apollo/client';
-import { useRecoilState } from 'recoil';
-
-import { tokenPairState } from '@/auth/states/tokenPairState';
+import { useApolloFactory } from '@/apollo/hooks/useApolloFactory';
 import { REACT_APP_SERVER_BASE_URL } from '~/config';
 
 import { ApolloMetadataClientContext } from '../context/ApolloClientMetadataContext';
@@ -12,20 +8,10 @@ export const ApolloMetadataClientProvider = ({
 }: {
   children: React.ReactNode;
 }) => {
-  const [tokenPair] = useRecoilState(tokenPairState);
-  const apolloMetadataClient = useMemo(() => {
-    if (tokenPair?.accessToken.token) {
-      return new ApolloClient({
-        uri: `${REACT_APP_SERVER_BASE_URL}/metadata`,
-        cache: new InMemoryCache(),
-        headers: {
-          Authorization: `Bearer ${tokenPair.accessToken.token}`,
-        },
-      });
-    } else {
-      return null;
-    }
-  }, [tokenPair]);
+  const apolloMetadataClient = useApolloFactory({
+    uri: `${REACT_APP_SERVER_BASE_URL}/metadata`,
+    connectToDevTools: false,
+  });
 
   return (
     <ApolloMetadataClientContext.Provider value={apolloMetadataClient}>
diff --git a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx
index 9288ec017b39..11a60715b43b 100644
--- a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx
@@ -1,13 +1,18 @@
 import { useEffect } from 'react';
-import { useRecoilState } from 'recoil';
+import { useRecoilState, useRecoilValue } from 'recoil';
 
+import { currentUserState } from '@/auth/states/currentUserState';
 import { useFindManyObjectMetadataItems } from '@/object-metadata/hooks/useFindManyObjectMetadataItems';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 export const ObjectMetadataItemsLoadEffect = () => {
+  const currentUser = useRecoilValue(currentUserState);
   const { objectMetadataItems: newObjectMetadataItems } =
-    useFindManyObjectMetadataItems();
+    useFindManyObjectMetadataItems({
+      skip: isUndefinedOrNull(currentUser),
+    });
 
   const [objectMetadataItems, setObjectMetadataItems] = useRecoilState(
     objectMetadataItemsState,
diff --git a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsProvider.tsx b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsProvider.tsx
index b8e1eb3d86f9..0c3ebdadc586 100644
--- a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsProvider.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsProvider.tsx
@@ -11,16 +11,14 @@ export const ObjectMetadataItemsProvider = ({
 }: React.PropsWithChildren) => {
   const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
   const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
-  const shouldDisplayChildren = () => {
-    if (objectMetadataItems.length) {
-      return true;
-    }
-    return !currentWorkspaceMember;
-  };
+
+  const shouldDisplayChildren =
+    objectMetadataItems.length > 0 || !currentWorkspaceMember;
+
   return (
     <>
       <ObjectMetadataItemsLoadEffect />
-      {shouldDisplayChildren() && (
+      {shouldDisplayChildren && (
         <RelationPickerScope relationPickerScopeId="relation-picker">
           {children}
         </RelationPickerScope>
diff --git a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataNavItems.tsx b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataNavItems.tsx
index 765475cfa198..6bcd4c81948f 100644
--- a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataNavItems.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataNavItems.tsx
@@ -1,37 +1,22 @@
 import { useLocation, useNavigate } from 'react-router-dom';
 
-import { useCachedRootQuery } from '@/apollo/hooks/useCachedRootQuery';
-import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { QueryMethodName } from '@/object-metadata/types/QueryMethodName';
-import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
+import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
+import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
 import { useIcons } from '@/ui/display/icon/hooks/useIcons';
 import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
+import { GraphQLView } from '@/views/types/GraphQLView';
+import { getObjectMetadataItemViews } from '@/views/utils/getObjectMetadataItemViews';
 
 export const ObjectMetadataNavItems = () => {
-  const { activeObjectMetadataItems, findObjectMetadataItemByNamePlural } =
-    useObjectMetadataItemForSettings();
+  const { activeObjectMetadataItems } = useFilteredObjectMetadataItems();
   const navigate = useNavigate();
   const { getIcon } = useIcons();
   const currentPath = useLocation().pathname;
 
-  const viewObjectMetadataItem = findObjectMetadataItemByNamePlural('views');
-
-  const { cachedRootQuery } = useCachedRootQuery({
-    objectMetadataItem: viewObjectMetadataItem,
-    queryMethodName: QueryMethodName.FindMany,
-  });
-
-  const { records } = useFindManyRecords({
-    skip: cachedRootQuery?.views,
-    objectNameSingular: CoreObjectNameSingular.View,
-    useRecordsWithoutConnection: true,
-  });
-
-  const views =
-    records.length > 0
-      ? records
-      : cachedRootQuery?.views?.edges?.map((edge: any) => edge?.node);
+  const { records: views } = usePrefetchedData<GraphQLView>(
+    PrefetchKey.AllViews,
+  );
 
   return (
     <>
@@ -63,9 +48,11 @@ export const ObjectMetadataNavItems = () => {
               : -1;
           }),
       ].map((objectMetadataItem) => {
-        const viewId = views?.find(
-          (view: any) => view?.objectMetadataId === objectMetadataItem.id,
-        )?.id;
+        const objectMetadataViews = getObjectMetadataItemViews(
+          objectMetadataItem.id,
+          views,
+        );
+        const viewId = objectMetadataViews[0]?.id;
 
         const navigationPath = `/objects/${objectMetadataItem.namePlural}${
           viewId ? `?view=${viewId}` : ''
diff --git a/packages/twenty-front/src/modules/object-metadata/components/__stories__/ObjectMetadataNavItems.stories.tsx b/packages/twenty-front/src/modules/object-metadata/components/__stories__/ObjectMetadataNavItems.stories.tsx
new file mode 100644
index 000000000000..5d97e61db06f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/components/__stories__/ObjectMetadataNavItems.stories.tsx
@@ -0,0 +1,37 @@
+import { expect } from '@storybook/jest';
+import { Meta, StoryObj } from '@storybook/react';
+import { within } from '@storybook/test';
+
+import { ComponentWithRecoilScopeDecorator } from '~/testing/decorators/ComponentWithRecoilScopeDecorator';
+import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
+import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
+import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
+import { graphqlMocks } from '~/testing/graphqlMocks';
+
+import { ObjectMetadataNavItems } from '../ObjectMetadataNavItems';
+
+const meta: Meta<typeof ObjectMetadataNavItems> = {
+  title: 'Modules/ObjectMetadata/ObjectMetadataNavItems',
+  component: ObjectMetadataNavItems,
+  decorators: [
+    ObjectMetadataItemsDecorator,
+    ComponentWithRouterDecorator,
+    ComponentWithRecoilScopeDecorator,
+    SnackBarDecorator,
+  ],
+  parameters: {
+    msw: graphqlMocks,
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof ObjectMetadataNavItems>;
+
+export const Default: Story = {
+  play: async () => {
+    const canvas = within(document.body);
+    expect(await canvas.findByText('People')).toBeInTheDocument();
+    expect(await canvas.findByText('Companies')).toBeInTheDocument();
+    expect(await canvas.findByText('Opportunities')).toBeInTheDocument();
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/constants/LabelIdentifierFieldMetadataTypes.ts b/packages/twenty-front/src/modules/object-metadata/constants/LabelIdentifierFieldMetadataTypes.ts
new file mode 100644
index 000000000000..fe25319198b2
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/constants/LabelIdentifierFieldMetadataTypes.ts
@@ -0,0 +1,6 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+export const LABEL_IDENTIFIER_FIELD_METADATA_TYPES = [
+  FieldMetadataType.Number,
+  FieldMetadataType.Text,
+];
diff --git a/packages/twenty-front/src/modules/object-metadata/graphql/mutations.ts b/packages/twenty-front/src/modules/object-metadata/graphql/mutations.ts
index f9ac8b9f56c4..2fce4c3b2a2b 100644
--- a/packages/twenty-front/src/modules/object-metadata/graphql/mutations.ts
+++ b/packages/twenty-front/src/modules/object-metadata/graphql/mutations.ts
@@ -58,7 +58,7 @@ export const CREATE_ONE_RELATION_METADATA_ITEM = gql`
 
 export const UPDATE_ONE_FIELD_METADATA_ITEM = gql`
   mutation UpdateOneFieldMetadataItem(
-    $idToUpdate: ID!
+    $idToUpdate: UUID!
     $updatePayload: UpdateFieldInput!
   ) {
     updateOneField(input: { id: $idToUpdate, update: $updatePayload }) {
@@ -79,7 +79,7 @@ export const UPDATE_ONE_FIELD_METADATA_ITEM = gql`
 
 export const UPDATE_ONE_OBJECT_METADATA_ITEM = gql`
   mutation UpdateOneObjectMetadataItem(
-    $idToUpdate: ID!
+    $idToUpdate: UUID!
     $updatePayload: UpdateObjectInput!
   ) {
     updateOneObject(input: { id: $idToUpdate, update: $updatePayload }) {
@@ -102,7 +102,7 @@ export const UPDATE_ONE_OBJECT_METADATA_ITEM = gql`
 `;
 
 export const DELETE_ONE_OBJECT_METADATA_ITEM = gql`
-  mutation DeleteOneObjectMetadataItem($idToDelete: ID!) {
+  mutation DeleteOneObjectMetadataItem($idToDelete: UUID!) {
     deleteOneObject(input: { id: $idToDelete }) {
       id
       dataSourceId
@@ -123,7 +123,7 @@ export const DELETE_ONE_OBJECT_METADATA_ITEM = gql`
 `;
 
 export const DELETE_ONE_FIELD_METADATA_ITEM = gql`
-  mutation DeleteOneFieldMetadataItem($idToDelete: ID!) {
+  mutation DeleteOneFieldMetadataItem($idToDelete: UUID!) {
     deleteOneField(input: { id: $idToDelete }) {
       id
       type
diff --git a/packages/twenty-front/src/modules/object-metadata/graphql/queries.ts b/packages/twenty-front/src/modules/object-metadata/graphql/queries.ts
index 1c1b34da6fd1..838c1d143d0b 100644
--- a/packages/twenty-front/src/modules/object-metadata/graphql/queries.ts
+++ b/packages/twenty-front/src/modules/object-metadata/graphql/queries.ts
@@ -17,6 +17,7 @@ export const FIND_MANY_OBJECT_METADATA_ITEMS = gql`
           description
           icon
           isCustom
+          isRemote
           isActive
           isSystem
           createdAt
@@ -64,6 +65,27 @@ export const FIND_MANY_OBJECT_METADATA_ITEMS = gql`
                 }
                 defaultValue
                 options
+                relationDefinition {
+                  direction
+                  sourceObjectMetadata {
+                    id
+                    nameSingular
+                    namePlural
+                  }
+                  sourceFieldMetadata {
+                    id
+                    name
+                  }
+                  targetObjectMetadata {
+                    id
+                    nameSingular
+                    namePlural
+                  }
+                  targetFieldMetadata {
+                    id
+                    name
+                  }
+                }
               }
             }
             pageInfo {
@@ -72,7 +94,6 @@ export const FIND_MANY_OBJECT_METADATA_ITEMS = gql`
               startCursor
               endCursor
             }
-            totalCount
           }
         }
       }
@@ -82,7 +103,6 @@ export const FIND_MANY_OBJECT_METADATA_ITEMS = gql`
         startCursor
         endCursor
       }
-      totalCount
     }
   }
 `;
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/ApolloMetadataClientProvider.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/ApolloMetadataClientProvider.tsx
index 61a829cc9615..ad2c13a5b71a 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/ApolloMetadataClientProvider.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/ApolloMetadataClientProvider.tsx
@@ -1,21 +1,16 @@
 import { ReactNode } from 'react';
-import {
-  ApolloClient,
-  NormalizedCacheObject,
-  useApolloClient,
-} from '@apollo/client';
 
 import { ApolloMetadataClientContext } from '@/object-metadata/context/ApolloClientMetadataContext';
+import { mockedMetadataApolloClient } from '~/testing/mockedMetadataApolloClient';
 
-export const TestApolloMetadataClientProvider = ({
+export const ApolloMetadataClientMockedProvider = ({
   children,
 }: {
   children: ReactNode;
 }) => {
-  const client = useApolloClient() as ApolloClient<NormalizedCacheObject>;
   return (
-    <ApolloMetadataClientContext.Provider value={client}>
-      {client ? children : ''}
+    <ApolloMetadataClientContext.Provider value={mockedMetadataApolloClient}>
+      {mockedMetadataApolloClient ? children : ''}
     </ApolloMetadataClientContext.Provider>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useCreateOneObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useCreateOneObjectMetadataItem.ts
new file mode 100644
index 000000000000..61df6cf56869
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useCreateOneObjectMetadataItem.ts
@@ -0,0 +1,76 @@
+import { gql } from '@apollo/client';
+
+export const query = gql`
+  mutation CreateOneObjectMetadataItem($input: CreateOneObjectInput!) {
+    createOneObject(input: $input) {
+      id
+      dataSourceId
+      nameSingular
+      namePlural
+      labelSingular
+      labelPlural
+      description
+      icon
+      isCustom
+      isActive
+      createdAt
+      updatedAt
+      labelIdentifierFieldMetadataId
+      imageIdentifierFieldMetadataId
+    }
+  }
+`;
+
+export const findManyViewsQuery = gql`
+ query FindManyViews($filter: ViewFilterInput, $orderBy: ViewOrderByInput, $lastCursor: String, $limit: Float) {
+      views(filter: $filter, orderBy: $orderBy, first: $limit, after: $lastCursor) {
+        edges {
+          node {
+            __typename
+            id
+            objectMetadataId
+            type
+            createdAt
+            name
+            updatedAt
+          }
+          cursor
+        }
+        pageInfo {
+          hasNextPage
+          startCursor
+          endCursor
+        }
+        totalCount
+      }
+    }
+`;
+
+export const variables = {
+  input: {
+    object: {
+      icon: 'IconPlus',
+      labelPlural: 'View Filters',
+      labelSingular: 'View Filter',
+      nameSingular: 'viewFilter',
+      namePlural: 'viewFilters',
+    },
+  },
+};
+
+export const responseData = {
+  id: '',
+  dataSourceId: '',
+  nameSingular: 'viewFilter',
+  namePlural: 'viewFilters',
+  labelSingular: 'View Filter',
+  labelPlural: 'View Filters',
+  description: '',
+  icon: '',
+  isCustom: false,
+  isActive: true,
+  createdAt: '',
+  updatedAt: '',
+  labelIdentifierFieldMetadataId: '',
+  imageIdentifierFieldMetadataId: '',
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useCreateOneObjectRecordMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useCreateOneObjectRecordMetadataItem.ts
deleted file mode 100644
index 37adb3417a88..000000000000
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useCreateOneObjectRecordMetadataItem.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const query = gql`
-  mutation CreateOneObjectMetadataItem($input: CreateOneObjectInput!) {
-    createOneObject(input: $input) {
-      id
-      dataSourceId
-      nameSingular
-      namePlural
-      labelSingular
-      labelPlural
-      description
-      icon
-      isCustom
-      isActive
-      createdAt
-      updatedAt
-      labelIdentifierFieldMetadataId
-      imageIdentifierFieldMetadataId
-    }
-  }
-`;
-
-export const variables = {
-  input: {
-    object: {
-      labelPlural: 'View Filters',
-      labelSingular: 'View Filter',
-      nameSingular: 'viewFilter',
-      namePlural: 'viewFilters',
-    },
-  },
-};
-
-export const responseData = {
-  id: '',
-  dataSourceId: '',
-  nameSingular: 'viewFilter',
-  namePlural: 'viewFilters',
-  labelSingular: 'View Filter',
-  labelPlural: 'View Filters',
-  description: '',
-  icon: '',
-  isCustom: false,
-  isActive: true,
-  createdAt: '',
-  updatedAt: '',
-  labelIdentifierFieldMetadataId: '',
-  imageIdentifierFieldMetadataId: '',
-};
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useDeleteOneObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useDeleteOneObjectMetadataItem.ts
index 42ca0a9952f8..e7be9105bf9f 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useDeleteOneObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useDeleteOneObjectMetadataItem.ts
@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client';
 
 export const query = gql`
-  mutation DeleteOneObjectMetadataItem($idToDelete: ID!) {
+  mutation DeleteOneObjectMetadataItem($idToDelete: UUID!) {
     deleteOneObject(input: { id: $idToDelete }) {
       id
       dataSourceId
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFieldMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFieldMetadataItem.ts
index 66a29db3f7cd..14302051e09e 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFieldMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFieldMetadataItem.ts
@@ -16,7 +16,7 @@ const baseFields = `
 
 export const queries = {
   eraseMetadataField: gql`
-    mutation DeleteOneFieldMetadataItem($idToDelete: ID!) {
+    mutation DeleteOneFieldMetadataItem($idToDelete: UUID!) {
       deleteOneField(input: { id: $idToDelete }) {
         ${baseFields}
       }
@@ -24,7 +24,7 @@ export const queries = {
   `,
   activateMetadataField: gql`
     mutation UpdateOneFieldMetadataItem(
-      $idToUpdate: ID!
+      $idToUpdate: UUID!
       $updatePayload: UpdateFieldInput!
     ) {
       updateOneField(input: { id: $idToUpdate, update: $updatePayload }) {
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFilteredObjectMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFilteredObjectMetadataItems.ts
new file mode 100644
index 000000000000..fa99fc04c4d3
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFilteredObjectMetadataItems.ts
@@ -0,0 +1,55 @@
+import { gql } from '@apollo/client';
+
+export const query = gql`
+  mutation UpdateOneObjectMetadataItem(
+    $idToUpdate: UUID!
+    $updatePayload: UpdateObjectInput!
+  ) {
+    updateOneObject(input: { id: $idToUpdate, update: $updatePayload }) {
+      id
+      dataSourceId
+      nameSingular
+      namePlural
+      labelSingular
+      labelPlural
+      description
+      icon
+      isCustom
+      isActive
+      createdAt
+      updatedAt
+      labelIdentifierFieldMetadataId
+      imageIdentifierFieldMetadataId
+    }
+  }
+`;
+
+export const variables = {
+  idToUpdate: 'idToUpdate',
+  updatePayload: {
+    description: 'newDescription',
+    icon: undefined,
+    labelIdentifierFieldMetadataId: null,
+    labelPlural: 'labelPlural',
+    labelSingular: 'labelSingular',
+    namePlural: 'labelPlural',
+    nameSingular: 'labelSingular',
+  },
+};
+
+export const responseData = {
+  id: 'idToUpdate',
+  dataSourceId: 'dataSourceId',
+  nameSingular: 'nameSingular',
+  namePlural: 'namePlural',
+  labelSingular: 'labelSingular',
+  labelPlural: 'labelPlural',
+  description: 'newDescription',
+  icon: '',
+  isCustom: false,
+  isActive: true,
+  createdAt: '',
+  updatedAt: '',
+  labelIdentifierFieldMetadataId: '',
+  imageIdentifierFieldMetadataId: '',
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFindManyObjectMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFindManyObjectMetadataItems.ts
index e24af05de4a0..951b2742fbef 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFindManyObjectMetadataItems.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFindManyObjectMetadataItems.ts
@@ -17,6 +17,7 @@ export const query = gql`
           description
           icon
           isCustom
+          isRemote
           isActive
           isSystem
           createdAt
@@ -72,7 +73,6 @@ export const query = gql`
               startCursor
               endCursor
             }
-            totalCount
           }
         }
       }
@@ -82,7 +82,6 @@ export const query = gql`
         startCursor
         endCursor
       }
-      totalCount
     }
   }
 `;
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useObjectMetadataItemForSettings.ts b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useObjectMetadataItemForSettings.ts
deleted file mode 100644
index a9b8aadea751..000000000000
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useObjectMetadataItemForSettings.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const query = gql`
-  mutation UpdateOneObjectMetadataItem(
-    $idToUpdate: ID!
-    $updatePayload: UpdateObjectInput!
-  ) {
-    updateOneObject(input: { id: $idToUpdate, update: $updatePayload }) {
-      id
-      dataSourceId
-      nameSingular
-      namePlural
-      labelSingular
-      labelPlural
-      description
-      icon
-      isCustom
-      isActive
-      createdAt
-      updatedAt
-      labelIdentifierFieldMetadataId
-      imageIdentifierFieldMetadataId
-    }
-  }
-`;
-
-export const variables = {
-  idToUpdate: 'idToUpdate',
-  updatePayload: {
-    description: 'newDescription',
-    icon: undefined,
-    labelIdentifierFieldMetadataId: null,
-    labelPlural: 'labelPlural',
-    labelSingular: 'labelSingular',
-    namePlural: 'labelPlural',
-    nameSingular: 'labelSingular',
-  },
-};
-
-export const responseData = {
-  id: 'idToUpdate',
-  dataSourceId: 'dataSourceId',
-  nameSingular: 'nameSingular',
-  namePlural: 'namePlural',
-  labelSingular: 'labelSingular',
-  labelPlural: 'labelPlural',
-  description: 'newDescription',
-  icon: '',
-  isCustom: false,
-  isActive: true,
-  createdAt: '',
-  updatedAt: '',
-  labelIdentifierFieldMetadataId: '',
-  imageIdentifierFieldMetadataId: '',
-};
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneObjectMetadataItem.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneObjectMetadataItem.test.tsx
new file mode 100644
index 000000000000..03443712d9de
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneObjectMetadataItem.test.tsx
@@ -0,0 +1,76 @@
+import { ReactNode } from 'react';
+import { MockedProvider } from '@apollo/client/testing';
+import { act, renderHook } from '@testing-library/react';
+import { RecoilRoot } from 'recoil';
+
+import { useCreateOneObjectMetadataItem } from '@/object-metadata/hooks/useCreateOneObjectMetadataItem';
+
+import {
+  findManyViewsQuery,
+  query,
+  responseData,
+  variables,
+} from '../__mocks__/useCreateOneObjectMetadataItem';
+
+const mocks = [
+  {
+    request: {
+      query,
+      variables,
+    },
+    result: jest.fn(() => ({
+      data: {
+        createOneObject: responseData,
+      },
+    })),
+  },
+  {
+    request: {
+      query: findManyViewsQuery,
+      variables: {},
+    },
+    result: jest.fn(() => ({
+      data: {
+        views: {
+          __typename: 'ViewConnection',
+          totalCount: 0,
+          pageInfo: {
+            __typename: 'PageInfo',
+            hasNextPage: false,
+            startCursor: '',
+            endCursor: '',
+          },
+          edges: [],
+        },
+      },
+    })),
+  },
+];
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>
+    <MockedProvider mocks={mocks} addTypename={false}>
+      {children}
+    </MockedProvider>
+  </RecoilRoot>
+);
+
+describe('useCreateOneObjectMetadataItem', () => {
+  it('should work as expected', async () => {
+    const { result } = renderHook(() => useCreateOneObjectMetadataItem(), {
+      wrapper: Wrapper,
+    });
+
+    await act(async () => {
+      const res = await result.current.createOneObjectMetadataItem({
+        icon: 'IconPlus',
+        labelPlural: 'View Filters',
+        labelSingular: 'View Filter',
+        namePlural: 'viewFilters',
+        nameSingular: 'viewFilter',
+      });
+
+      expect(res.data).toEqual({ createOneObject: responseData });
+    });
+  });
+});
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneObjectRecordMetadataItem.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneObjectRecordMetadataItem.test.tsx
deleted file mode 100644
index 588e6d9a04c2..000000000000
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneObjectRecordMetadataItem.test.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { ReactNode } from 'react';
-import { MockedProvider } from '@apollo/client/testing';
-import { act, renderHook } from '@testing-library/react';
-import { RecoilRoot } from 'recoil';
-
-import { useCreateOneObjectRecordMetadataItem } from '@/object-metadata/hooks/useCreateOneObjectMetadataItem';
-
-import { TestApolloMetadataClientProvider } from '../__mocks__/ApolloMetadataClientProvider';
-import {
-  query,
-  responseData,
-  variables,
-} from '../__mocks__/useCreateOneObjectRecordMetadataItem';
-
-const mocks = [
-  {
-    request: {
-      query,
-      variables,
-    },
-    result: jest.fn(() => ({
-      data: {
-        createOneObject: responseData,
-      },
-    })),
-  },
-];
-
-const Wrapper = ({ children }: { children: ReactNode }) => (
-  <RecoilRoot>
-    <MockedProvider mocks={mocks} addTypename={false}>
-      <TestApolloMetadataClientProvider>
-        {children}
-      </TestApolloMetadataClientProvider>
-    </MockedProvider>
-  </RecoilRoot>
-);
-
-describe('useCreateOneObjectRecordMetadataItem', () => {
-  it('should work as expected', async () => {
-    const { result } = renderHook(
-      () => useCreateOneObjectRecordMetadataItem(),
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    await act(async () => {
-      const res = await result.current.createOneObjectMetadataItem({
-        labelPlural: 'View Filters',
-        labelSingular: 'View Filter',
-        nameSingular: 'viewFilter',
-        namePlural: 'viewFilters',
-      });
-
-      expect(res.data).toEqual({ createOneObject: responseData });
-    });
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneRelationMetadataItem.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneRelationMetadataItem.test.tsx
index 46e41021a0eb..2d9b7f3e3f01 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneRelationMetadataItem.test.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneRelationMetadataItem.test.tsx
@@ -6,7 +6,6 @@ import { RecoilRoot } from 'recoil';
 import { useCreateOneRelationMetadataItem } from '@/object-metadata/hooks/useCreateOneRelationMetadataItem';
 import { RelationMetadataType } from '~/generated/graphql';
 
-import { TestApolloMetadataClientProvider } from '../__mocks__/ApolloMetadataClientProvider';
 import {
   query,
   responseData,
@@ -30,9 +29,7 @@ const mocks = [
 const Wrapper = ({ children }: { children: ReactNode }) => (
   <RecoilRoot>
     <MockedProvider mocks={mocks} addTypename={false}>
-      <TestApolloMetadataClientProvider>
-        {children}
-      </TestApolloMetadataClientProvider>
+      {children}
     </MockedProvider>
   </RecoilRoot>
 );
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useDeleteOneObjectMetadataItem.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useDeleteOneObjectMetadataItem.test.tsx
index f4e6a96d6a39..03954953f7ab 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useDeleteOneObjectMetadataItem.test.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useDeleteOneObjectMetadataItem.test.tsx
@@ -5,7 +5,6 @@ import { RecoilRoot } from 'recoil';
 
 import { useDeleteOneObjectMetadataItem } from '@/object-metadata/hooks/useDeleteOneObjectMetadataItem';
 
-import { TestApolloMetadataClientProvider } from '../__mocks__/ApolloMetadataClientProvider';
 import {
   query,
   responseData,
@@ -29,9 +28,7 @@ const mocks = [
 const Wrapper = ({ children }: { children: ReactNode }) => (
   <RecoilRoot>
     <MockedProvider mocks={mocks} addTypename={false}>
-      <TestApolloMetadataClientProvider>
-        {children}
-      </TestApolloMetadataClientProvider>
+      {children}
     </MockedProvider>
   </RecoilRoot>
 );
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx
index 7527677e7a12..d35e7bb602ae 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx
@@ -7,7 +7,6 @@ import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataIt
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { FieldMetadataType } from '~/generated/graphql';
 
-import { TestApolloMetadataClientProvider } from '../__mocks__/ApolloMetadataClientProvider';
 import {
   objectMetadataId,
   queries,
@@ -85,9 +84,7 @@ const mocks = [
 const Wrapper = ({ children }: { children: ReactNode }) => (
   <RecoilRoot>
     <MockedProvider mocks={mocks} addTypename={false}>
-      <TestApolloMetadataClientProvider>
-        {children}
-      </TestApolloMetadataClientProvider>
+      {children}
     </MockedProvider>
   </RecoilRoot>
 );
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFilteredObjectMetadataItems.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFilteredObjectMetadataItems.test.tsx
new file mode 100644
index 000000000000..f745f257670f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFilteredObjectMetadataItems.test.tsx
@@ -0,0 +1,102 @@
+import { ReactNode } from 'react';
+import { MockedProvider } from '@apollo/client/testing';
+import { act, renderHook } from '@testing-library/react';
+import { RecoilRoot, useSetRecoilState } from 'recoil';
+
+import {
+  query,
+  responseData,
+  variables,
+} from '@/object-metadata/hooks/__mocks__/useFilteredObjectMetadataItems';
+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
+
+const mocks = [
+  {
+    request: {
+      query,
+      variables,
+    },
+    result: jest.fn(() => ({
+      data: {
+        updateOneObject: responseData,
+      },
+    })),
+  },
+];
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>
+    <MockedProvider mocks={mocks} addTypename={false}>
+      {children}
+    </MockedProvider>
+  </RecoilRoot>
+);
+
+const mockObjectMetadataItems = getObjectMetadataItemsMock();
+
+describe('useFilteredObjectMetadataItems', () => {
+  it('should findActiveObjectMetadataItemBySlug', async () => {
+    const { result } = renderHook(
+      () => {
+        const setMetadataItems = useSetRecoilState(objectMetadataItemsState);
+        setMetadataItems(mockObjectMetadataItems);
+
+        return useFilteredObjectMetadataItems();
+      },
+      {
+        wrapper: Wrapper,
+      },
+    );
+
+    act(() => {
+      const res = result.current.findActiveObjectMetadataItemBySlug('people');
+      expect(res).toBeDefined();
+      expect(res?.namePlural).toBe('people');
+    });
+  });
+
+  it('should findObjectMetadataItemById', async () => {
+    const { result } = renderHook(
+      () => {
+        const setMetadataItems = useSetRecoilState(objectMetadataItemsState);
+        setMetadataItems(mockObjectMetadataItems);
+
+        return useFilteredObjectMetadataItems();
+      },
+      {
+        wrapper: Wrapper,
+      },
+    );
+
+    act(() => {
+      const res = result.current.findObjectMetadataItemById(
+        '20202020-480c-434e-b4c7-e22408b97047',
+      );
+      expect(res).toBeDefined();
+      expect(res?.namePlural).toBe('companies');
+    });
+  });
+
+  it('should findObjectMetadataItemByNamePlural', async () => {
+    const { result } = renderHook(
+      () => {
+        const setMetadataItems = useSetRecoilState(objectMetadataItemsState);
+        setMetadataItems(mockObjectMetadataItems);
+
+        return useFilteredObjectMetadataItems();
+      },
+      {
+        wrapper: Wrapper,
+      },
+    );
+
+    act(() => {
+      const res =
+        result.current.findObjectMetadataItemByNamePlural('opportunities');
+      expect(res).toBeDefined();
+      expect(res?.namePlural).toBe('opportunities');
+    });
+  });
+});
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFindManyObjectMetadataItems.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFindManyObjectMetadataItems.test.tsx
index 44967e53c3f8..acb7d7ce439a 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFindManyObjectMetadataItems.test.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFindManyObjectMetadataItems.test.tsx
@@ -6,7 +6,6 @@ import { RecoilRoot } from 'recoil';
 import { useFindManyObjectMetadataItems } from '@/object-metadata/hooks/useFindManyObjectMetadataItems';
 import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
 
-import { TestApolloMetadataClientProvider } from '../__mocks__/ApolloMetadataClientProvider';
 import {
   query,
   responseData,
@@ -30,11 +29,9 @@ const mocks = [
 const Wrapper = ({ children }: { children: ReactNode }) => (
   <RecoilRoot>
     <MockedProvider mocks={mocks} addTypename={false}>
-      <TestApolloMetadataClientProvider>
-        <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
-          {children}
-        </SnackBarProviderScope>
-      </TestApolloMetadataClientProvider>
+      <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
+        {children}
+      </SnackBarProviderScope>
     </MockedProvider>
   </RecoilRoot>
 );
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useGetObjectOrderByField.test.ts b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useGetObjectOrderByField.test.ts
deleted file mode 100644
index c71a90358fb1..000000000000
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useGetObjectOrderByField.test.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { renderHook } from '@testing-library/react';
-
-import { useGetObjectOrderByField } from '@/object-metadata/hooks/useGetObjectOrderByField';
-import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
-
-const mockObjectMetadataItems = getObjectMetadataItemsMock();
-
-describe('useGetObjectOrderByField', () => {
-  it('should work as expected', () => {
-    const objectMetadataItem = mockObjectMetadataItems.find(
-      (item) => item.nameSingular === 'person',
-    )!;
-
-    const { result } = renderHook(() =>
-      useGetObjectOrderByField({ objectMetadataItem })('AscNullsLast'),
-    );
-    expect(result.current).toEqual({
-      name: { firstName: 'AscNullsLast', lastName: 'AscNullsLast' },
-    });
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useGetObjectOrderByField.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useGetObjectOrderByField.test.tsx
new file mode 100644
index 000000000000..646806c9762a
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useGetObjectOrderByField.test.tsx
@@ -0,0 +1,33 @@
+import { ReactNode } from 'react';
+import { MockedProvider } from '@apollo/client/testing';
+import { renderHook } from '@testing-library/react';
+import { RecoilRoot } from 'recoil';
+
+import { useGetObjectOrderByField } from '@/object-metadata/hooks/useGetObjectOrderByField';
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>
+    <MockedProvider addTypename={false}>{children}</MockedProvider>
+  </RecoilRoot>
+);
+
+describe('useGetObjectOrderByField', () => {
+  it('should work as expected', () => {
+    const { result } = renderHook(
+      () => {
+        const { getObjectOrderByField } = useGetObjectOrderByField({
+          objectNameSingular: 'person',
+        });
+
+        return getObjectOrderByField('AscNullsLast');
+      },
+      {
+        wrapper: Wrapper,
+      },
+    );
+
+    expect(result.current).toEqual({
+      name: { firstName: 'AscNullsLast', lastName: 'AscNullsLast' },
+    });
+  });
+});
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useGetRelationMetadata.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useGetRelationMetadata.test.tsx
index b13554ed6e14..55c7a7f09efc 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useGetRelationMetadata.test.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useGetRelationMetadata.test.tsx
@@ -7,15 +7,9 @@ import { useGetRelationMetadata } from '@/object-metadata/hooks/useGetRelationMe
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
 import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
 
-import { TestApolloMetadataClientProvider } from '../__mocks__/ApolloMetadataClientProvider';
-
 const Wrapper = ({ children }: { children: ReactNode }) => (
   <RecoilRoot>
-    <MockedProvider addTypename={false}>
-      <TestApolloMetadataClientProvider>
-        {children}
-      </TestApolloMetadataClientProvider>
-    </MockedProvider>
+    <MockedProvider addTypename={false}>{children}</MockedProvider>
   </RecoilRoot>
 );
 
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useMapFieldMetadataToGraphQLQuery.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useMapFieldMetadataToGraphQLQuery.test.tsx
deleted file mode 100644
index 0425726a6e60..000000000000
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useMapFieldMetadataToGraphQLQuery.test.tsx
+++ /dev/null
@@ -1,250 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import { RecoilRoot, useSetRecoilState } from 'recoil';
-
-import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
-import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
-import { RelationMetadataType } from '~/generated/graphql';
-
-const mockObjectMetadataItems = getObjectMetadataItemsMock();
-
-const formatGQLString = (inputString: string) =>
-  inputString.replace(/^\s*[\r\n]/gm, '');
-
-const getOneToManyRelation = () => {
-  const objectMetadataItem = mockObjectMetadataItems.find(
-    (item) => item.nameSingular === 'opportunity',
-  )!;
-
-  return {
-    field: objectMetadataItem.fields.find((field) => field.name === 'company')!,
-    res: `company
-    {
-      __typename
-      id
-      xLink
-      {
-        label
-        url
-      }
-accountOwner
-    {
-      __typename
-      id
-    }
-      linkedinLink
-      {
-        label
-        url
-      }
-attachments
-      {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-domainName
-opportunities
-      {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-      annualRecurringRevenue
-      {
-        amountMicros
-        currencyCode
-      }
-createdAt
-address
-updatedAt
-activityTargets
-      {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-favorites
-      {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-people
-      {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-name
-accountOwnerId
-employees
-id
-idealCustomerProfile
-    }`,
-  };
-};
-
-const getOneToOneRelationField = () => {
-  const objectMetadataItem = mockObjectMetadataItems.find(
-    (item) => item.nameSingular === 'opportunity',
-  )!;
-
-  const oneToManyfield = objectMetadataItem.fields.find(
-    (field) => field.name === 'company',
-  )!;
-
-  const field: FieldMetadataItem = {
-    ...oneToManyfield,
-    toRelationMetadata: {
-      ...oneToManyfield.toRelationMetadata!,
-      relationType: RelationMetadataType.OneToOne,
-    },
-  };
-
-  return field;
-};
-
-const getOneToManyFromRelationField = () => {
-  const objectMetadataItem = mockObjectMetadataItems.find(
-    (item) => item.nameSingular === 'person',
-  )!;
-
-  const field = objectMetadataItem.fields.find(
-    (field) => field.name === 'opportunities',
-  )!;
-
-  return {
-    field,
-    res: `opportunities
-      {
-        edges {
-          node {
-            __typename
-            id
-            personId
-pointOfContactId
-updatedAt
-company
-    {
-      __typename
-      id
-    }
-companyId
-pipelineStepId
-probability
-pipelineStep
-    {
-      __typename
-      id
-    }
-closeDate
-      amount
-      {
-        amountMicros
-        currencyCode
-      }
-id
-createdAt
-pointOfContact
-    {
-      __typename
-      id
-    }
-person
-    {
-      __typename
-      id
-    }
-          }
-        }
-      }`,
-  };
-};
-
-const getFullNameRelation = () => {
-  const objectMetadataItem = mockObjectMetadataItems.find(
-    (item) => item.nameSingular === 'person',
-  )!;
-
-  const field = objectMetadataItem.fields.find(
-    (field) => field.name === 'name',
-  )!;
-
-  return {
-    field,
-    res: `\n      name\n      {\n        firstName\n        lastName\n      }\n    `,
-  };
-};
-
-describe('useMapFieldMetadataToGraphQLQuery', () => {
-  it('should work as expected', async () => {
-    const { result } = renderHook(
-      () => {
-        const setMetadataItems = useSetRecoilState(objectMetadataItemsState);
-        setMetadataItems(mockObjectMetadataItems);
-
-        return {
-          mapFieldMetadataToGraphQLQuery: useMapFieldMetadataToGraphQLQuery(),
-        };
-      },
-      {
-        wrapper: RecoilRoot,
-      },
-    );
-
-    const oneToManyRelation = getOneToManyRelation();
-
-    const { mapFieldMetadataToGraphQLQuery } = result.current;
-
-    const oneToManyRelationFieldRes = mapFieldMetadataToGraphQLQuery({
-      field: oneToManyRelation.field,
-    });
-
-    expect(formatGQLString(oneToManyRelationFieldRes)).toEqual(
-      oneToManyRelation.res,
-    );
-
-    const oneToOneRelation = getOneToOneRelationField();
-
-    const oneToOneRelationFieldRes = mapFieldMetadataToGraphQLQuery({
-      field: oneToOneRelation,
-    });
-
-    expect(formatGQLString(oneToOneRelationFieldRes)).toEqual(
-      oneToManyRelation.res,
-    );
-
-    const oneToManyFromRelation = getOneToManyFromRelationField();
-    const oneToManyFromRelationFieldRes = mapFieldMetadataToGraphQLQuery({
-      field: oneToManyFromRelation.field,
-    });
-
-    expect(formatGQLString(oneToManyFromRelationFieldRes)).toEqual(
-      oneToManyFromRelation.res,
-    );
-
-    const fullNameRelation = getFullNameRelation();
-    const fullNameFieldRes = mapFieldMetadataToGraphQLQuery({
-      field: fullNameRelation.field,
-    });
-
-    expect(fullNameFieldRes).toEqual(fullNameRelation.res);
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useMapToObjectRecordIdentifier.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useMapToObjectRecordIdentifier.test.tsx
index 11fb35d6e7cf..17337fd905f6 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useMapToObjectRecordIdentifier.test.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useMapToObjectRecordIdentifier.test.tsx
@@ -2,21 +2,19 @@ import { renderHook } from '@testing-library/react';
 import { RecoilRoot } from 'recoil';
 
 import { useMapToObjectRecordIdentifier } from '@/object-metadata/hooks/useMapToObjectRecordIdentifier';
-import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
-
-const mockObjectMetadataItems = getObjectMetadataItemsMock();
 
 describe('useMapToObjectRecordIdentifier', () => {
   it('should work as expected', async () => {
     const { result } = renderHook(
       () => {
-        const objectMetadataItem = mockObjectMetadataItems.find(
-          (item) => item.nameSingular === 'person',
-        )!;
+        const { mapToObjectRecordIdentifier } = useMapToObjectRecordIdentifier({
+          objectNameSingular: 'person',
+        });
 
-        return useMapToObjectRecordIdentifier({
-          objectMetadataItem,
-        })({ id: 'id', name: { firstName: 'Sheldon', lastName: 'Cooper' } });
+        return mapToObjectRecordIdentifier({
+          id: 'id',
+          name: { firstName: 'Sheldon', lastName: 'Cooper' },
+        });
       },
       {
         wrapper: RecoilRoot,
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useObjectMetadataItem.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useObjectMetadataItem.test.tsx
index e8d124ce8e36..7c232e600e3d 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useObjectMetadataItem.test.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useObjectMetadataItem.test.tsx
@@ -5,18 +5,13 @@ import { RecoilRoot } from 'recoil';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 
-import { TestApolloMetadataClientProvider } from '../__mocks__/ApolloMetadataClientProvider';
-
 const Wrapper = ({ children }: { children: ReactNode }) => (
   <RecoilRoot>
-    <MockedProvider addTypename={false}>
-      <TestApolloMetadataClientProvider>
-        {children}
-      </TestApolloMetadataClientProvider>
-    </MockedProvider>
+    <MockedProvider addTypename={false}>{children}</MockedProvider>
   </RecoilRoot>
 );
 
+// Split into tests for each new hook
 describe('useObjectMetadataItem', () => {
   it('should return correct properties', async () => {
     const { result } = renderHook(
@@ -26,41 +21,8 @@ describe('useObjectMetadataItem', () => {
       },
     );
 
-    const {
-      basePathToShowPage,
-      objectMetadataItem,
-      labelIdentifierFieldMetadata,
-      getRecordFromCache,
-      findManyRecordsQuery,
-      modifyRecordFromCache,
-      findOneRecordQuery,
-      createOneRecordMutation,
-      updateOneRecordMutation,
-      deleteOneRecordMutation,
-      executeQuickActionOnOneRecordMutation,
-      createManyRecordsMutation,
-      deleteManyRecordsMutation,
-      mapToObjectRecordIdentifier,
-      getObjectOrderByField,
-    } = result.current;
+    const { objectMetadataItem } = result.current;
 
-    expect(labelIdentifierFieldMetadata).toBeUndefined();
-    expect(basePathToShowPage).toBe('/object/opportunity/');
     expect(objectMetadataItem.id).toBe('20202020-cae9-4ff4-9579-f7d9fe44c937');
-    expect(typeof getRecordFromCache).toBe('function');
-    expect(typeof modifyRecordFromCache).toBe('function');
-    expect(typeof mapToObjectRecordIdentifier).toBe('function');
-    expect(typeof getObjectOrderByField).toBe('function');
-    expect(findManyRecordsQuery).toHaveProperty('kind', 'Document');
-    expect(findOneRecordQuery).toHaveProperty('kind', 'Document');
-    expect(createOneRecordMutation).toHaveProperty('kind', 'Document');
-    expect(updateOneRecordMutation).toHaveProperty('kind', 'Document');
-    expect(deleteOneRecordMutation).toHaveProperty('kind', 'Document');
-    expect(executeQuickActionOnOneRecordMutation).toHaveProperty(
-      'kind',
-      'Document',
-    );
-    expect(createManyRecordsMutation).toHaveProperty('kind', 'Document');
-    expect(deleteManyRecordsMutation).toHaveProperty('kind', 'Document');
   });
 });
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useObjectMetadataItemForSettings.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useObjectMetadataItemForSettings.test.tsx
deleted file mode 100644
index dd382ebcb6ba..000000000000
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useObjectMetadataItemForSettings.test.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import { ReactNode } from 'react';
-import { MockedProvider } from '@apollo/client/testing';
-import { act, renderHook } from '@testing-library/react';
-import { RecoilRoot, useSetRecoilState } from 'recoil';
-
-import {
-  query,
-  responseData,
-  variables,
-} from '@/object-metadata/hooks/__mocks__/useObjectMetadataItemForSettings';
-import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
-import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
-
-import { TestApolloMetadataClientProvider } from '../__mocks__/ApolloMetadataClientProvider';
-
-const mocks = [
-  {
-    request: {
-      query,
-      variables,
-    },
-    result: jest.fn(() => ({
-      data: {
-        updateOneObject: responseData,
-      },
-    })),
-  },
-];
-
-const Wrapper = ({ children }: { children: ReactNode }) => (
-  <RecoilRoot>
-    <MockedProvider mocks={mocks} addTypename={false}>
-      <TestApolloMetadataClientProvider>
-        {children}
-      </TestApolloMetadataClientProvider>
-    </MockedProvider>
-  </RecoilRoot>
-);
-
-const mockObjectMetadataItems = getObjectMetadataItemsMock();
-
-describe('useObjectMetadataItemForSettings', () => {
-  it('should findActiveObjectMetadataItemBySlug', async () => {
-    const { result } = renderHook(
-      () => {
-        const setMetadataItems = useSetRecoilState(objectMetadataItemsState);
-        setMetadataItems(mockObjectMetadataItems);
-
-        return useObjectMetadataItemForSettings();
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    act(() => {
-      const res = result.current.findActiveObjectMetadataItemBySlug('people');
-      expect(res).toBeDefined();
-      expect(res?.namePlural).toBe('people');
-    });
-  });
-
-  it('should findObjectMetadataItemById', async () => {
-    const { result } = renderHook(
-      () => {
-        const setMetadataItems = useSetRecoilState(objectMetadataItemsState);
-        setMetadataItems(mockObjectMetadataItems);
-
-        return useObjectMetadataItemForSettings();
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    act(() => {
-      const res = result.current.findObjectMetadataItemById(
-        '20202020-480c-434e-b4c7-e22408b97047',
-      );
-      expect(res).toBeDefined();
-      expect(res?.namePlural).toBe('companies');
-    });
-  });
-
-  it('should findObjectMetadataItemByNamePlural', async () => {
-    const { result } = renderHook(
-      () => {
-        const setMetadataItems = useSetRecoilState(objectMetadataItemsState);
-        setMetadataItems(mockObjectMetadataItems);
-
-        return useObjectMetadataItemForSettings();
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    act(() => {
-      const res =
-        result.current.findObjectMetadataItemByNamePlural('opportunities');
-      expect(res).toBeDefined();
-      expect(res?.namePlural).toBe('opportunities');
-    });
-  });
-
-  it('should editObjectMetadataItem', async () => {
-    const { result } = renderHook(
-      () => {
-        const setMetadataItems = useSetRecoilState(objectMetadataItemsState);
-        setMetadataItems(mockObjectMetadataItems);
-
-        return useObjectMetadataItemForSettings();
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    await act(async () => {
-      const res = await result.current.editObjectMetadataItem({
-        id: 'idToUpdate',
-        description: 'newDescription',
-        labelPlural: 'labelPlural',
-        labelSingular: 'labelSingular',
-      });
-      expect(res.data).toEqual({ updateOneObject: responseData });
-    });
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useApolloMetadataClient.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useApolloMetadataClient.ts
index 01a262e0287d..5618138ae89f 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useApolloMetadataClient.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useApolloMetadataClient.ts
@@ -1,9 +1,15 @@
 import { useContext } from 'react';
+import { useApolloClient } from '@apollo/client';
 
 import { ApolloMetadataClientContext } from '../context/ApolloClientMetadataContext';
 
 export const useApolloMetadataClient = () => {
   const apolloMetadataClient = useContext(ApolloMetadataClientContext);
+  const apolloClient = useApolloClient();
+
+  if (process.env.NODE_ENV === 'test') {
+    return apolloClient;
+  }
 
   return apolloMetadataClient;
 };
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata.ts
index 5f516def5197..f673adee7ea4 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata.ts
@@ -23,6 +23,14 @@ export const useColumnDefinitionsFromFieldMetadata = (
     [objectMetadataItem],
   );
 
+  const filterDefinitions = formatFieldMetadataItemsAsFilterDefinitions({
+    fields: activeFieldMetadataItems,
+  });
+
+  const sortDefinitions = formatFieldMetadataItemsAsSortDefinitions({
+    fields: activeFieldMetadataItems,
+  });
+
   const columnDefinitions: ColumnDefinition<FieldMetadata>[] = useMemo(
     () =>
       objectMetadataItem
@@ -35,17 +43,29 @@ export const useColumnDefinitionsFromFieldMetadata = (
               }),
             )
             .filter(filterAvailableTableColumns)
-        : [],
-    [activeFieldMetadataItems, objectMetadataItem],
-  );
+            .map((column) => {
+              const existsInFilterDefinitions = filterDefinitions.some(
+                (filter) => filter.fieldMetadataId === column.fieldMetadataId,
+              );
 
-  const filterDefinitions = formatFieldMetadataItemsAsFilterDefinitions({
-    fields: activeFieldMetadataItems,
-  });
+              const existsInSortDefinitions = sortDefinitions.some(
+                (sort) => sort.fieldMetadataId === column.fieldMetadataId,
+              );
 
-  const sortDefinitions = formatFieldMetadataItemsAsSortDefinitions({
-    fields: activeFieldMetadataItems,
-  });
+              return {
+                ...column,
+                isFilterable: existsInFilterDefinitions,
+                isSortable: existsInSortDefinitions,
+              };
+            })
+        : [],
+    [
+      activeFieldMetadataItems,
+      objectMetadataItem,
+      filterDefinitions,
+      sortDefinitions,
+    ],
+  );
 
   return {
     columnDefinitions,
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneFieldMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneFieldMetadataItem.ts
index e6a0dd894812..d272404c7df0 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneFieldMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneFieldMetadataItem.ts
@@ -1,11 +1,10 @@
 import { ApolloClient, useMutation } from '@apollo/client';
 import { getOperationName } from '@apollo/client/utilities';
 
-import { FieldType } from '@/object-record/record-field/types/FieldType';
 import {
+  CreateFieldInput,
   CreateOneFieldMetadataItemMutation,
   CreateOneFieldMetadataItemMutationVariables,
-  FieldMetadataType,
 } from '~/generated-metadata/graphql';
 
 import { CREATE_ONE_FIELD_METADATA_ITEM } from '../graphql/mutations';
@@ -13,13 +12,6 @@ import { FIND_MANY_OBJECT_METADATA_ITEMS } from '../graphql/queries';
 
 import { useApolloMetadataClient } from './useApolloMetadataClient';
 
-type CreateOneFieldMetadataItemArgs = Omit<
-  CreateOneFieldMetadataItemMutationVariables['input']['field'],
-  'type'
-> & {
-  type: FieldType;
-};
-
 export const useCreateOneFieldMetadataItem = () => {
   const apolloMetadataClient = useApolloMetadataClient();
 
@@ -30,16 +22,11 @@ export const useCreateOneFieldMetadataItem = () => {
     client: apolloMetadataClient ?? ({} as ApolloClient<any>),
   });
 
-  const createOneFieldMetadataItem = async (
-    input: CreateOneFieldMetadataItemArgs,
-  ) => {
+  const createOneFieldMetadataItem = async (input: CreateFieldInput) => {
     return await mutate({
       variables: {
         input: {
-          field: {
-            ...input,
-            type: input.type as FieldMetadataType, // Todo improve typing once we have aligned backend and frontend
-          },
+          field: input,
         },
       },
       awaitRefetchQueries: true,
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneObjectMetadataItem.ts
index e3794488100f..19df20de7c30 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneObjectMetadataItem.ts
@@ -1,7 +1,10 @@
-import { ApolloClient, useMutation } from '@apollo/client';
+import { ApolloClient, useApolloClient, useMutation } from '@apollo/client';
 import { getOperationName } from '@apollo/client/utilities';
 
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecordsQuery';
 import {
+  CreateObjectInput,
   CreateOneObjectMetadataItemMutation,
   CreateOneObjectMetadataItemMutationVariables,
 } from '~/generated-metadata/graphql';
@@ -11,8 +14,13 @@ import { FIND_MANY_OBJECT_METADATA_ITEMS } from '../graphql/queries';
 
 import { useApolloMetadataClient } from './useApolloMetadataClient';
 
-export const useCreateOneObjectRecordMetadataItem = () => {
+export const useCreateOneObjectMetadataItem = () => {
   const apolloMetadataClient = useApolloMetadataClient();
+  const apolloClient = useApolloClient();
+
+  const { findManyRecordsQuery } = useFindManyRecordsQuery({
+    objectNameSingular: CoreObjectNameSingular.View,
+  });
 
   const [mutate] = useMutation<
     CreateOneObjectMetadataItemMutation,
@@ -21,20 +29,21 @@ export const useCreateOneObjectRecordMetadataItem = () => {
     client: apolloMetadataClient ?? ({} as ApolloClient<any>),
   });
 
-  const createOneObjectMetadataItem = async (
-    input: CreateOneObjectMetadataItemMutationVariables['input']['object'],
-  ) => {
-    return await mutate({
+  const createOneObjectMetadataItem = async (input: CreateObjectInput) => {
+    const createdObjectMetadata = await mutate({
       variables: {
-        input: {
-          object: {
-            ...input,
-          },
-        },
+        input: { object: input },
       },
       awaitRefetchQueries: true,
       refetchQueries: [getOperationName(FIND_MANY_OBJECT_METADATA_ITEMS) ?? ''],
     });
+
+    await apolloClient.query({
+      query: findManyRecordsQuery,
+      fetchPolicy: 'network-only',
+    });
+
+    return createdObjectMetadata;
   };
 
   return {
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts
index d2606ad926b5..51c9000999b4 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts
@@ -1,11 +1,10 @@
 import { v4 } from 'uuid';
 
-import { FieldType } from '@/object-record/record-field/types/FieldType';
+import { FieldMetadataOption } from '@/object-metadata/types/FieldMetadataOption.ts';
+import { getDefaultValueForBackend } from '@/object-metadata/utils/getDefaultValueForBackend';
 import { Field } from '~/generated/graphql';
-import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { FieldMetadataItem } from '../types/FieldMetadataItem';
-import { FieldMetadataOption } from '../types/FieldMetadataOption';
 import { formatFieldMetadataItemInput } from '../utils/formatFieldMetadataItemInput';
 
 import { useCreateOneFieldMetadataItem } from './useCreateOneFieldMetadataItem';
@@ -18,36 +17,60 @@ export const useFieldMetadataItem = () => {
   const { deleteOneFieldMetadataItem } = useDeleteOneFieldMetadataItem();
 
   const createMetadataField = (
-    input: Pick<Field, 'label' | 'icon' | 'description'> & {
-      defaultValue?: unknown;
+    input: Pick<
+      Field,
+      'label' | 'icon' | 'description' | 'defaultValue' | 'type' | 'options'
+    > & {
       objectMetadataId: string;
-      options?: Omit<FieldMetadataOption, 'id'>[];
-      type: FieldMetadataType;
     },
-  ) =>
-    createOneFieldMetadataItem({
-      ...formatFieldMetadataItemInput(input),
-      defaultValue: input.defaultValue,
+  ) => {
+    const formattedInput = formatFieldMetadataItemInput(input);
+
+    const defaultValue = getDefaultValueForBackend(
+      input.defaultValue ?? formattedInput.defaultValue,
+      input.type,
+    );
+
+    return createOneFieldMetadataItem({
+      ...formattedInput,
+      defaultValue,
       objectMetadataId: input.objectMetadataId,
-      type: input.type as FieldType,
+      type: input.type,
     });
+  };
 
   const editMetadataField = (
-    input: Pick<Field, 'id' | 'label' | 'icon' | 'description'> & {
-      options?: FieldMetadataOption[];
-    },
-  ) =>
-    updateOneFieldMetadataItem({
+    input: Pick<
+      Field,
+      | 'id'
+      | 'label'
+      | 'icon'
+      | 'description'
+      | 'defaultValue'
+      | 'type'
+      | 'options'
+    >,
+  ) => {
+    const formattedInput = formatFieldMetadataItemInput(input);
+    const defaultValue = input.defaultValue
+      ? typeof input.defaultValue == 'string'
+        ? `'${input.defaultValue}'`
+        : input.defaultValue
+      : formattedInput.defaultValue ?? undefined;
+
+    return updateOneFieldMetadataItem({
       fieldMetadataIdToUpdate: input.id,
       updatePayload: formatFieldMetadataItemInput({
         ...input,
+        defaultValue,
         // In Edit mode, all options need an id,
         // so we generate an id for newly created options.
-        options: input.options?.map((option) =>
+        options: input.options?.map((option: FieldMetadataOption) =>
           option.id ? option : { ...option, id: v4() },
         ),
       }),
     });
+  };
 
   const activateMetadataField = (metadataField: FieldMetadataItem) =>
     updateOneFieldMetadataItem({
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useFilterOutUnexistingObjectMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useFilterOutUnexistingObjectMetadataItems.ts
index 75ad0aed1c53..8241aeffb1f1 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useFilterOutUnexistingObjectMetadataItems.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useFilterOutUnexistingObjectMetadataItems.ts
@@ -2,7 +2,7 @@ import { useRecoilValue } from 'recoil';
 
 import { objectMetadataItemsByNameSingularMapSelector } from '@/object-metadata/states/objectMetadataItemsByNameSingularMapSelector';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const useFilterOutUnexistingObjectMetadataItems = () => {
   const objectMetadataItemsByNameSingularMap = useRecoilValue(
@@ -12,7 +12,7 @@ export const useFilterOutUnexistingObjectMetadataItems = () => {
   const filterOutUnexistingObjectMetadataItems = (
     objectMetadatItem: ObjectMetadataItem,
   ) =>
-    isNonNullable(
+    isDefined(
       objectMetadataItemsByNameSingularMap.get(objectMetadatItem.nameSingular),
     );
 
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useFilteredObjectMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useFilteredObjectMetadataItems.ts
new file mode 100644
index 000000000000..2ac05fa4f9d3
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useFilteredObjectMetadataItems.ts
@@ -0,0 +1,41 @@
+import { useRecoilValue } from 'recoil';
+
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+
+import { getObjectSlug } from '../utils/getObjectSlug';
+
+export const useFilteredObjectMetadataItems = () => {
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
+
+  const activeObjectMetadataItems = objectMetadataItems.filter(
+    ({ isActive, isSystem }) => isActive && !isSystem,
+  );
+  const inactiveObjectMetadataItems = objectMetadataItems.filter(
+    ({ isActive, isSystem }) => !isActive && !isSystem,
+  );
+
+  const findActiveObjectMetadataItemBySlug = (slug: string) =>
+    activeObjectMetadataItems.find(
+      (activeObjectMetadataItem) =>
+        getObjectSlug(activeObjectMetadataItem) === slug,
+    );
+
+  const findObjectMetadataItemById = (id: string) =>
+    objectMetadataItems.find(
+      (objectMetadataItem) => objectMetadataItem.id === id,
+    );
+
+  const findObjectMetadataItemByNamePlural = (namePlural: string) =>
+    objectMetadataItems.find(
+      (objectMetadataItem) => objectMetadataItem.namePlural === namePlural,
+    );
+
+  return {
+    activeObjectMetadataItems,
+    findActiveObjectMetadataItemBySlug,
+    findObjectMetadataItemById,
+    findObjectMetadataItemByNamePlural,
+    inactiveObjectMetadataItems,
+    objectMetadataItems,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useFindManyObjectMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useFindManyObjectMetadataItems.ts
index b90dd55c3259..203550cb61aa 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useFindManyObjectMetadataItems.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useFindManyObjectMetadataItems.ts
@@ -28,7 +28,7 @@ export const useFindManyObjectMetadataItems = ({
 
   const { enqueueSnackBar } = useSnackBar();
 
-  const { data, loading, error } = useQuery<
+  const { data, loading, error, refetch } = useQuery<
     ObjectMetadataItemsQuery,
     ObjectMetadataItemsQueryVariables
   >(FIND_MANY_OBJECT_METADATA_ITEMS, {
@@ -59,5 +59,6 @@ export const useFindManyObjectMetadataItems = ({
     objectMetadataItems,
     loading,
     error,
+    refetch,
   };
 };
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useGetObjectOrderByField.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useGetObjectOrderByField.ts
index bd7bd3702058..111058a5efec 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useGetObjectOrderByField.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useGetObjectOrderByField.ts
@@ -1,14 +1,20 @@
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { OrderBy } from '@/object-metadata/types/OrderBy';
 import { OrderByField } from '@/object-metadata/types/OrderByField';
-import { getObjectOrderByField } from '@/object-metadata/utils/getObjectOrderByField';
+import { getOrderByFieldForObjectMetadataItem } from '@/object-metadata/utils/getObjectOrderByField';
 
 export const useGetObjectOrderByField = ({
-  objectMetadataItem,
+  objectNameSingular,
 }: {
-  objectMetadataItem: ObjectMetadataItem;
+  objectNameSingular: string;
 }) => {
-  return (orderBy: OrderBy): OrderByField => {
-    return getObjectOrderByField(objectMetadataItem, orderBy);
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const getObjectOrderByField = (orderBy: OrderBy): OrderByField => {
+    return getOrderByFieldForObjectMetadataItem(objectMetadataItem, orderBy);
   };
+
+  return { getObjectOrderByField };
 };
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useGetRelationMetadata.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useGetRelationMetadata.ts
index 8b8765d4fe4f..052caea6c53e 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useGetRelationMetadata.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useGetRelationMetadata.ts
@@ -46,7 +46,7 @@ export const useGetRelationMetadata = () =>
               objectNameType: 'singular',
             }),
           )
-          .valueOrThrow();
+          .getValue();
 
         if (!relationObjectMetadataItem) return null;
 
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useLabelIdentifierFieldMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useLabelIdentifierFieldMetadataItem.ts
new file mode 100644
index 000000000000..9970267052f8
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useLabelIdentifierFieldMetadataItem.ts
@@ -0,0 +1,17 @@
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/getLabelIdentifierFieldMetadataItem';
+
+export const useLabelIdentifierFieldMetadataItem = ({
+  objectNameSingular,
+}: {
+  objectNameSingular: string;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const labelIdentifierFieldMetadataItem =
+    getLabelIdentifierFieldMetadataItem(objectMetadataItem);
+
+  return { labelIdentifierFieldMetadataItem };
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery.ts
deleted file mode 100644
index 7c775d4adef8..000000000000
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-import { useRecoilValue } from 'recoil';
-
-import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { FieldType } from '@/object-record/record-field/types/FieldType';
-
-import { FieldMetadataItem } from '../types/FieldMetadataItem';
-
-export const useMapFieldMetadataToGraphQLQuery = () => {
-  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
-
-  const mapFieldMetadataToGraphQLQuery = ({
-    field,
-    maxDepthForRelations = 2,
-    onlyTypenameAndIdOnDeepestRelationFields = false,
-  }: {
-    field: FieldMetadataItem;
-    maxDepthForRelations?: number;
-    onlyTypenameAndIdOnDeepestRelationFields?: boolean;
-  }): any => {
-    if (maxDepthForRelations <= 0) {
-      return '';
-    }
-
-    // TODO: parse
-    const fieldType = field.type as FieldType;
-
-    const fieldIsSimpleValue = (
-      [
-        'UUID',
-        'TEXT',
-        'PHONE',
-        'DATE_TIME',
-        'EMAIL',
-        'NUMBER',
-        'BOOLEAN',
-        'RATING',
-        'SELECT',
-      ] as FieldType[]
-    ).includes(fieldType);
-
-    if (fieldIsSimpleValue) {
-      return field.name;
-    } else if (
-      fieldType === 'RELATION' &&
-      field.toRelationMetadata?.relationType === 'ONE_TO_MANY'
-    ) {
-      const relationMetadataItem = objectMetadataItems.find(
-        (objectMetadataItem) =>
-          objectMetadataItem.id ===
-          (field.toRelationMetadata as any)?.fromObjectMetadata?.id,
-      );
-
-      let subfieldQuery = '';
-
-      if (maxDepthForRelations > 0) {
-        subfieldQuery = `${(relationMetadataItem?.fields ?? [])
-          .map((field) =>
-            mapFieldMetadataToGraphQLQuery({
-              field,
-              maxDepthForRelations: maxDepthForRelations - 1,
-              onlyTypenameAndIdOnDeepestRelationFields,
-            }),
-          )
-          .join('\n')}`;
-      }
-
-      return `${field.name}
-    {
-      __typename
-      id
-      ${subfieldQuery}
-    }`;
-    } else if (
-      fieldType === 'RELATION' &&
-      field.toRelationMetadata?.relationType === 'ONE_TO_ONE'
-    ) {
-      const relationMetadataItem = objectMetadataItems.find(
-        (objectMetadataItem) =>
-          objectMetadataItem.id ===
-          (field.toRelationMetadata as any)?.fromObjectMetadata?.id,
-      );
-
-      let subfieldQuery = '';
-
-      if (maxDepthForRelations > 0) {
-        subfieldQuery = `${(relationMetadataItem?.fields ?? [])
-          .map((field) =>
-            mapFieldMetadataToGraphQLQuery({
-              field,
-              maxDepthForRelations: maxDepthForRelations - 1,
-              onlyTypenameAndIdOnDeepestRelationFields,
-            }),
-          )
-          .join('\n')}`;
-      }
-
-      return `${field.name}
-    {
-      __typename
-      id
-      ${subfieldQuery}
-    }`;
-    } else if (
-      fieldType === 'RELATION' &&
-      field.fromRelationMetadata?.relationType === 'ONE_TO_MANY'
-    ) {
-      const relationMetadataItem = objectMetadataItems.find(
-        (objectMetadataItem) =>
-          objectMetadataItem.id ===
-          (field.fromRelationMetadata as any)?.toObjectMetadata?.id,
-      );
-
-      let subfieldQuery = '';
-
-      if (maxDepthForRelations > 0) {
-        subfieldQuery = `${(relationMetadataItem?.fields ?? [])
-          .map((field) =>
-            mapFieldMetadataToGraphQLQuery({
-              field,
-              maxDepthForRelations: maxDepthForRelations - 1,
-              onlyTypenameAndIdOnDeepestRelationFields,
-            }),
-          )
-          .join('\n')}`;
-      }
-
-      return `${field.name}
-      {
-        edges {
-          node {
-            __typename
-            id
-            ${subfieldQuery}
-          }
-        }
-      }`;
-    } else if (fieldType === 'LINK') {
-      return `
-      ${field.name}
-      {
-        label
-        url
-      }
-    `;
-    } else if (fieldType === 'CURRENCY') {
-      return `
-      ${field.name}
-      {
-        amountMicros
-        currencyCode
-      }
-    `;
-    } else if (fieldType === 'FULL_NAME') {
-      return `
-      ${field.name}
-      {
-        firstName
-        lastName
-      }
-    `;
-    }
-  };
-
-  return mapFieldMetadataToGraphQLQuery;
-};
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useMapToObjectRecordIdentifier.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useMapToObjectRecordIdentifier.ts
index f25b74293374..4de7ad2c9ea8 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useMapToObjectRecordIdentifier.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useMapToObjectRecordIdentifier.ts
@@ -1,8 +1,19 @@
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { getObjectRecordIdentifier } from '@/object-metadata/utils/getObjectRecordIdentifier';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 
-export const useMapToObjectRecordIdentifier =
-  ({ objectMetadataItem }: { objectMetadataItem: ObjectMetadataItem }) =>
-  (record: ObjectRecord) =>
-    getObjectRecordIdentifier({ objectMetadataItem, record });
+export const useMapToObjectRecordIdentifier = ({
+  objectNameSingular,
+}: {
+  objectNameSingular: string;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const mapToObjectRecordIdentifier = (record: ObjectRecord) => {
+    return getObjectRecordIdentifier({ objectMetadataItem, record });
+  };
+
+  return { mapToObjectRecordIdentifier };
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataItem.ts
index 95b88de5e9f1..5c8472a54e47 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataItem.ts
@@ -1,46 +1,17 @@
-import { gql } from '@apollo/client';
 import { useRecoilValue } from 'recoil';
 
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState.ts';
 import { ObjectMetadataItemNotFoundError } from '@/object-metadata/errors/ObjectMetadataNotFoundError';
-import { useGetObjectOrderByField } from '@/object-metadata/hooks/useGetObjectOrderByField';
-import { useMapToObjectRecordIdentifier } from '@/object-metadata/hooks/useMapToObjectRecordIdentifier';
 import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objectMetadataItemFamilySelector';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { getBasePathToShowPage } from '@/object-metadata/utils/getBasePathToShowPage';
-import { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/getLabelIdentifierFieldMetadataItem';
 import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
-import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
-import { useModifyRecordFromCache } from '@/object-record/cache/hooks/useModifyRecordFromCache';
-import { useGenerateCreateManyRecordMutation } from '@/object-record/hooks/useGenerateCreateManyRecordMutation';
-import { useGenerateCreateOneRecordMutation } from '@/object-record/hooks/useGenerateCreateOneRecordMutation';
-import { useGenerateDeleteManyRecordMutation } from '@/object-record/hooks/useGenerateDeleteManyRecordMutation';
-import { useGenerateExecuteQuickActionOnOneRecordMutation } from '@/object-record/hooks/useGenerateExecuteQuickActionOnOneRecordMutation';
-import { useGenerateFindDuplicateRecordsQuery } from '@/object-record/hooks/useGenerateFindDuplicateRecordsQuery';
-import { useGenerateFindManyRecordsQuery } from '@/object-record/hooks/useGenerateFindManyRecordsQuery';
-import { useGenerateFindOneRecordQuery } from '@/object-record/hooks/useGenerateFindOneRecordQuery';
-import { useGenerateUpdateOneRecordMutation } from '@/object-record/hooks/useGenerateUpdateOneRecordMutation';
-import { generateDeleteOneRecordMutation } from '@/object-record/utils/generateDeleteOneRecordMutation';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 import { ObjectMetadataItemIdentifier } from '../types/ObjectMetadataItemIdentifier';
 
-export const EMPTY_QUERY = gql`
-  query EmptyQuery {
-    empty
-  }
-`;
-
-export const EMPTY_MUTATION = gql`
-  mutation EmptyMutation {
-    empty
-  }
-`;
-
-export const useObjectMetadataItem = (
-  { objectNameSingular }: ObjectMetadataItemIdentifier,
-  depth?: number,
-) => {
+export const useObjectMetadataItem = ({
+  objectNameSingular,
+}: ObjectMetadataItemIdentifier) => {
   const currentWorkspace = useRecoilValue(currentWorkspaceState);
 
   const mockObjectMetadataItems = getObjectMetadataItemsMock();
@@ -63,96 +34,14 @@ export const useObjectMetadataItem = (
     objectMetadataItems = mockObjectMetadataItems;
   }
 
-  if (!isNonNullable(objectMetadataItem)) {
+  if (!isDefined(objectMetadataItem)) {
     throw new ObjectMetadataItemNotFoundError(
       objectNameSingular,
       objectMetadataItems,
     );
   }
 
-  const mapToObjectRecordIdentifier = useMapToObjectRecordIdentifier({
-    objectMetadataItem,
-  });
-
-  const getObjectOrderByField = useGetObjectOrderByField({
-    objectMetadataItem,
-  });
-
-  const getRecordFromCache = useGetRecordFromCache({
-    objectMetadataItem,
-  });
-
-  const modifyRecordFromCache = useModifyRecordFromCache({
-    objectMetadataItem,
-  });
-
-  const generateFindManyRecordsQuery = useGenerateFindManyRecordsQuery();
-  const findManyRecordsQuery = generateFindManyRecordsQuery({
-    objectMetadataItem,
-    depth,
-  });
-
-  const generateFindDuplicateRecordsQuery =
-    useGenerateFindDuplicateRecordsQuery();
-  const findDuplicateRecordsQuery = generateFindDuplicateRecordsQuery({
-    objectMetadataItem,
-    depth,
-  });
-
-  const generateFindOneRecordQuery = useGenerateFindOneRecordQuery();
-  const findOneRecordQuery = generateFindOneRecordQuery({
-    objectMetadataItem,
-    depth,
-  });
-
-  const createOneRecordMutation = useGenerateCreateOneRecordMutation({
-    objectMetadataItem,
-  });
-
-  const createManyRecordsMutation = useGenerateCreateManyRecordMutation({
-    objectMetadataItem,
-  });
-
-  const updateOneRecordMutation = useGenerateUpdateOneRecordMutation({
-    objectMetadataItem,
-  });
-
-  const deleteOneRecordMutation = generateDeleteOneRecordMutation({
-    objectMetadataItem,
-  });
-
-  const deleteManyRecordsMutation = useGenerateDeleteManyRecordMutation({
-    objectMetadataItem,
-  });
-
-  const executeQuickActionOnOneRecordMutation =
-    useGenerateExecuteQuickActionOnOneRecordMutation({
-      objectMetadataItem,
-    });
-
-  const labelIdentifierFieldMetadata =
-    getLabelIdentifierFieldMetadataItem(objectMetadataItem);
-
-  const basePathToShowPage = getBasePathToShowPage({
-    objectMetadataItem,
-  });
-
   return {
-    labelIdentifierFieldMetadata,
-    basePathToShowPage,
     objectMetadataItem,
-    getRecordFromCache,
-    modifyRecordFromCache,
-    findManyRecordsQuery,
-    findDuplicateRecordsQuery,
-    findOneRecordQuery,
-    createOneRecordMutation,
-    updateOneRecordMutation,
-    deleteOneRecordMutation,
-    executeQuickActionOnOneRecordMutation,
-    createManyRecordsMutation,
-    deleteManyRecordsMutation,
-    mapToObjectRecordIdentifier,
-    getObjectOrderByField,
   };
 };
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataItemForSettings.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataItemForSettings.ts
deleted file mode 100644
index 773a46713340..000000000000
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataItemForSettings.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import { useRecoilValue } from 'recoil';
-
-import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-
-import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
-import { formatObjectMetadataItemInput } from '../utils/formatObjectMetadataItemInput';
-import { getObjectSlug } from '../utils/getObjectSlug';
-
-import { useCreateOneObjectRecordMetadataItem } from './useCreateOneObjectMetadataItem';
-import { useDeleteOneObjectMetadataItem } from './useDeleteOneObjectMetadataItem';
-import { useUpdateOneObjectMetadataItem } from './useUpdateOneObjectMetadataItem';
-
-export const useObjectMetadataItemForSettings = () => {
-  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
-
-  const activeObjectMetadataItems = objectMetadataItems.filter(
-    ({ isActive, isSystem }) => isActive && !isSystem,
-  );
-  const disabledObjectMetadataItems = objectMetadataItems.filter(
-    ({ isActive, isSystem }) => !isActive && !isSystem,
-  );
-
-  const findActiveObjectMetadataItemBySlug = (slug: string) =>
-    activeObjectMetadataItems.find(
-      (activeObjectMetadataItem) =>
-        getObjectSlug(activeObjectMetadataItem) === slug,
-    );
-
-  const findObjectMetadataItemById = (id: string) =>
-    objectMetadataItems.find(
-      (objectMetadataItem) => objectMetadataItem.id === id,
-    );
-
-  const findObjectMetadataItemByNamePlural = (namePlural: string) =>
-    objectMetadataItems.find(
-      (objectMetadataItem) => objectMetadataItem.namePlural === namePlural,
-    );
-
-  const { createOneObjectMetadataItem } =
-    useCreateOneObjectRecordMetadataItem();
-  const { updateOneObjectMetadataItem } = useUpdateOneObjectMetadataItem();
-  const { deleteOneObjectMetadataItem } = useDeleteOneObjectMetadataItem();
-
-  const createObjectMetadataItem = (
-    input: Pick<
-      ObjectMetadataItem,
-      'labelPlural' | 'labelSingular' | 'icon' | 'description'
-    >,
-  ) => createOneObjectMetadataItem(formatObjectMetadataItemInput(input));
-
-  const editObjectMetadataItem = (
-    input: Pick<
-      ObjectMetadataItem,
-      | 'description'
-      | 'icon'
-      | 'id'
-      | 'labelIdentifierFieldMetadataId'
-      | 'labelPlural'
-      | 'labelSingular'
-    >,
-  ) =>
-    updateOneObjectMetadataItem({
-      idToUpdate: input.id,
-      updatePayload: formatObjectMetadataItemInput(input),
-    });
-
-  const activateObjectMetadataItem = (
-    objectMetadataItem: Pick<ObjectMetadataItem, 'id'>,
-  ) =>
-    updateOneObjectMetadataItem({
-      idToUpdate: objectMetadataItem.id,
-      updatePayload: { isActive: true },
-    });
-
-  const disableObjectMetadataItem = (
-    objectMetadataItem: Pick<ObjectMetadataItem, 'id'>,
-  ) =>
-    updateOneObjectMetadataItem({
-      idToUpdate: objectMetadataItem.id,
-      updatePayload: { isActive: false },
-    });
-
-  const eraseObjectMetadataItem = (
-    objectMetadataItem: Pick<ObjectMetadataItem, 'id'>,
-  ) => deleteOneObjectMetadataItem(objectMetadataItem.id);
-
-  return {
-    activateObjectMetadataItem,
-    activeObjectMetadataItems,
-    createObjectMetadataItem,
-    disabledObjectMetadataItems,
-    disableObjectMetadataItem,
-    editObjectMetadataItem,
-    eraseObjectMetadataItem,
-    findActiveObjectMetadataItemBySlug,
-    findObjectMetadataItemById,
-    findObjectMetadataItemByNamePlural,
-    objectMetadataItems,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataItemOnly.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataItemOnly.ts
deleted file mode 100644
index 12dc6f28e1e8..000000000000
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataItemOnly.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { useRecoilValue } from 'recoil';
-
-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState.ts';
-import { ObjectMetadataItemNotFoundError } from '@/object-metadata/errors/ObjectMetadataNotFoundError';
-import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objectMetadataItemFamilySelector';
-import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
-import { isNonNullable } from '~/utils/isNonNullable';
-
-import { ObjectMetadataItemIdentifier } from '../types/ObjectMetadataItemIdentifier';
-
-export const useObjectMetadataItemOnly = ({
-  objectNameSingular,
-}: ObjectMetadataItemIdentifier) => {
-  const currentWorkspace = useRecoilValue(currentWorkspaceState);
-
-  const mockObjectMetadataItems = getObjectMetadataItemsMock();
-
-  let objectMetadataItem = useRecoilValue(
-    objectMetadataItemFamilySelector({
-      objectName: objectNameSingular,
-      objectNameType: 'singular',
-    }),
-  );
-
-  let objectMetadataItems = useRecoilValue(objectMetadataItemsState);
-
-  if (currentWorkspace?.activationStatus !== 'active') {
-    objectMetadataItem =
-      mockObjectMetadataItems.find(
-        (objectMetadataItem) =>
-          objectMetadataItem.nameSingular === objectNameSingular,
-      ) ?? null;
-    objectMetadataItems = mockObjectMetadataItems;
-  }
-
-  if (!isNonNullable(objectMetadataItem)) {
-    throw new ObjectMetadataItemNotFoundError(
-      objectNameSingular,
-      objectMetadataItems,
-    );
-  }
-
-  return {
-    objectMetadataItem,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNamePluralFromSingular.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNamePluralFromSingular.ts
index 41200610824e..3cf1c60bbb7c 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNamePluralFromSingular.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNamePluralFromSingular.ts
@@ -3,7 +3,7 @@ import { useRecoilValue } from 'recoil';
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState.ts';
 import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objectMetadataItemFamilySelector';
 import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const useObjectNamePluralFromSingular = ({
   objectNameSingular,
@@ -28,7 +28,7 @@ export const useObjectNamePluralFromSingular = ({
       ) ?? null;
   }
 
-  if (!isNonNullable(objectMetadataItem)) {
+  if (!isDefined(objectMetadataItem)) {
     throw new Error(
       `Object metadata item not found for ${objectNameSingular} object`,
     );
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNameSingularFromPlural.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNameSingularFromPlural.ts
index 6a00794f8a5f..432a3b718700 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNameSingularFromPlural.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNameSingularFromPlural.ts
@@ -3,7 +3,7 @@ import { useRecoilValue } from 'recoil';
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState.ts';
 import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objectMetadataItemFamilySelector';
 import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const useObjectNameSingularFromPlural = ({
   objectNamePlural,
@@ -29,7 +29,7 @@ export const useObjectNameSingularFromPlural = ({
       ) ?? null;
   }
 
-  if (!isNonNullable(objectMetadataItem)) {
+  if (!isDefined(objectMetadataItem)) {
     throw new Error(
       `Object metadata item not found for ${objectNamePlural} object`,
     );
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneObjectMetadataItem.ts
index fe0ef2854ccb..aaa7b0ae7754 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneObjectMetadataItem.ts
@@ -2,6 +2,7 @@ import { useMutation } from '@apollo/client';
 import { getOperationName } from '@apollo/client/utilities';
 
 import {
+  UpdateObjectInput,
   UpdateOneObjectMetadataItemMutation,
   UpdateOneObjectMetadataItemMutationVariables,
 } from '~/generated-metadata/graphql';
@@ -27,16 +28,7 @@ export const useUpdateOneObjectMetadataItem = () => {
     updatePayload,
   }: {
     idToUpdate: UpdateOneObjectMetadataItemMutationVariables['idToUpdate'];
-    updatePayload: Pick<
-      UpdateOneObjectMetadataItemMutationVariables['updatePayload'],
-      | 'description'
-      | 'icon'
-      | 'isActive'
-      | 'labelPlural'
-      | 'labelSingular'
-      | 'namePlural'
-      | 'nameSingular'
-    >;
+    updatePayload: UpdateObjectInput;
   }) => {
     return await mutate({
       variables: {
diff --git a/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsState.ts b/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsState.ts
index 516a64403718..5c247fe0e1e5 100644
--- a/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsState.ts
+++ b/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsState.ts
@@ -1,8 +1,8 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 
-export const objectMetadataItemsState = atom<ObjectMetadataItem[]>({
+export const objectMetadataItemsState = createState<ObjectMetadataItem[]>({
   key: 'objectMetadataItemsState',
-  default: [],
+  defaultValue: [],
 });
diff --git a/packages/twenty-front/src/modules/object-metadata/types/CoreObjectNameSingular.ts b/packages/twenty-front/src/modules/object-metadata/types/CoreObjectNameSingular.ts
index e148338d90e4..18405ff2232c 100644
--- a/packages/twenty-front/src/modules/object-metadata/types/CoreObjectNameSingular.ts
+++ b/packages/twenty-front/src/modules/object-metadata/types/CoreObjectNameSingular.ts
@@ -4,9 +4,12 @@ export enum CoreObjectNameSingular {
   ApiKey = 'apiKey',
   Attachment = 'attachment',
   Blocklist = 'blocklist',
+  CalendarChannel = 'calendarChannel',
+  CalendarEvent = 'calendarEvent',
   Comment = 'comment',
   Company = 'company',
   ConnectedAccount = 'connectedAccount',
+  Event = 'event',
   Favorite = 'favorite',
   Message = 'message',
   MessageChannel = 'messageChannel',
@@ -14,7 +17,6 @@ export enum CoreObjectNameSingular {
   MessageThread = 'messageThread',
   Opportunity = 'opportunity',
   Person = 'person',
-  PipelineStep = 'pipelineStep',
   View = 'view',
   ViewField = 'viewField',
   ViewFilter = 'viewFilter',
diff --git a/packages/twenty-front/src/modules/object-metadata/types/FieldMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/types/FieldMetadataItem.ts
index 9cf5f15d3480..396fdf4af8e2 100644
--- a/packages/twenty-front/src/modules/object-metadata/types/FieldMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/types/FieldMetadataItem.ts
@@ -1,5 +1,18 @@
 import { ThemeColor } from '@/ui/theme/constants/MainColorNames';
-import { Field, Relation } from '~/generated-metadata/graphql';
+import {
+  Field,
+  Object as MetadataObject,
+  Relation,
+  RelationDefinitionType,
+} from '~/generated-metadata/graphql';
+
+export type FieldMetadataItemOption = {
+  color: ThemeColor;
+  id: string;
+  label: string;
+  position: number;
+  value: string;
+};
 
 export type FieldMetadataItem = Omit<
   Field,
@@ -8,6 +21,7 @@ export type FieldMetadataItem = Omit<
   | 'toRelationMetadata'
   | 'defaultValue'
   | 'options'
+  | 'relationDefinition'
 > & {
   __typename?: string;
   fromRelationMetadata?:
@@ -27,11 +41,18 @@ export type FieldMetadataItem = Omit<
       })
     | null;
   defaultValue?: any;
-  options?: {
-    color: ThemeColor;
-    id: string;
-    label: string;
-    position: number;
-    value: string;
-  }[];
+  options?: FieldMetadataItemOption[];
+  relationDefinition?: {
+    direction: RelationDefinitionType;
+    sourceFieldMetadata: Pick<Field, 'id' | 'name'>;
+    sourceObjectMetadata: Pick<
+      MetadataObject,
+      'id' | 'nameSingular' | 'namePlural'
+    >;
+    targetFieldMetadata: Pick<Field, 'id' | 'name'>;
+    targetObjectMetadata: Pick<
+      MetadataObject,
+      'id' | 'nameSingular' | 'namePlural'
+    >;
+  } | null;
 };
diff --git a/packages/twenty-front/src/modules/object-metadata/types/Position.ts b/packages/twenty-front/src/modules/object-metadata/types/Position.ts
new file mode 100644
index 000000000000..d7316c41d055
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/types/Position.ts
@@ -0,0 +1 @@
+export type Position = number | 'first' | 'last';
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/formatFieldMetadataItemInput.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/formatFieldMetadataItemInput.test.ts
index 12e724bbfade..a85741c63476 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/formatFieldMetadataItemInput.test.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/formatFieldMetadataItemInput.test.ts
@@ -1,3 +1,5 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql.ts';
+
 import {
   formatFieldMetadataItemInput,
   getOptionValueFromLabel,
@@ -46,6 +48,7 @@ describe('formatFieldMetadataItemInput', () => {
     const input = {
       label: 'Example Label',
       icon: 'example-icon',
+      type: FieldMetadataType.Select,
       description: 'Example description',
       options: [
         { id: '1', label: 'Option 1', color: 'red' as const, isDefault: true },
@@ -74,7 +77,7 @@ describe('formatFieldMetadataItemInput', () => {
           value: 'OPTION_2',
         },
       ],
-      defaultValue: 'OPTION_1',
+      defaultValue: "'OPTION_1'",
     };
 
     const result = formatFieldMetadataItemInput(input);
@@ -86,6 +89,70 @@ describe('formatFieldMetadataItemInput', () => {
     const input = {
       label: 'Example Label',
       icon: 'example-icon',
+      type: FieldMetadataType.Select,
+      description: 'Example description',
+    };
+
+    const expected = {
+      description: 'Example description',
+      icon: 'example-icon',
+      label: 'Example Label',
+      name: 'exampleLabel',
+      options: undefined,
+      defaultValue: undefined,
+    };
+
+    const result = formatFieldMetadataItemInput(input);
+
+    expect(result).toEqual(expected);
+  });
+
+  it('should format the field metadata item multi select input correctly', () => {
+    const input = {
+      label: 'Example Label',
+      icon: 'example-icon',
+      type: FieldMetadataType.MultiSelect,
+      description: 'Example description',
+      options: [
+        { id: '1', label: 'Option 1', color: 'red' as const, isDefault: true },
+        { id: '2', label: 'Option 2', color: 'blue' as const, isDefault: true },
+      ],
+    };
+
+    const expected = {
+      description: 'Example description',
+      icon: 'example-icon',
+      label: 'Example Label',
+      name: 'exampleLabel',
+      options: [
+        {
+          id: '1',
+          label: 'Option 1',
+          color: 'red',
+          position: 0,
+          value: 'OPTION_1',
+        },
+        {
+          id: '2',
+          label: 'Option 2',
+          color: 'blue',
+          position: 1,
+          value: 'OPTION_2',
+        },
+      ],
+      defaultValue: ["'OPTION_1'", "'OPTION_2'"],
+    };
+
+    const result = formatFieldMetadataItemInput(input);
+
+    expect(result).toEqual(expected);
+  });
+
+  it('should handle multi select input without options', () => {
+    const input = {
+      label: 'Example Label',
+      icon: 'example-icon',
+      type: FieldMetadataType.MultiSelect,
       description: 'Example description',
     };
 
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getObjectOrderByField.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getObjectOrderByField.test.ts
index 591711e36683..7cecf5668b25 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getObjectOrderByField.test.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getObjectOrderByField.test.ts
@@ -1,5 +1,5 @@
 import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
-import { getObjectOrderByField } from '@/object-metadata/utils/getObjectOrderByField';
+import { getOrderByFieldForObjectMetadataItem } from '@/object-metadata/utils/getObjectOrderByField';
 
 const mockObjectMetadataItems = getObjectMetadataItemsMock();
 
@@ -8,7 +8,7 @@ describe('getObjectOrderByField', () => {
     const objectMetadataItem = mockObjectMetadataItems.find(
       (item) => item.nameSingular === 'person',
     )!;
-    const res = getObjectOrderByField(objectMetadataItem);
+    const res = getOrderByFieldForObjectMetadataItem(objectMetadataItem);
     expect(res).toEqual({
       name: { firstName: 'AscNullsLast', lastName: 'AscNullsLast' },
     });
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapFieldMetadataToGraphQLQuery.test.tsx b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapFieldMetadataToGraphQLQuery.test.tsx
new file mode 100644
index 000000000000..c13ec68d54a6
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapFieldMetadataToGraphQLQuery.test.tsx
@@ -0,0 +1,343 @@
+import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
+import { mapFieldMetadataToGraphQLQuery } from '@/object-metadata/utils/mapFieldMetadataToGraphQLQuery';
+
+const mockObjectMetadataItems = getObjectMetadataItemsMock();
+
+const formatGQLString = (inputString: string) =>
+  inputString.replace(/^\s*[\r\n]/gm, '');
+
+const personObjectMetadataItem = mockObjectMetadataItems.find(
+  (item) => item.nameSingular === 'person',
+);
+
+if (!personObjectMetadataItem) {
+  throw new Error('ObjectMetadataItem not found');
+}
+
+describe('mapFieldMetadataToGraphQLQuery', () => {
+  it('should return fieldName if simpleValue', async () => {
+    const res = mapFieldMetadataToGraphQLQuery({
+      objectMetadataItems: mockObjectMetadataItems,
+      field: personObjectMetadataItem.fields.find(
+        (field) => field.name === 'id',
+      )!,
+    });
+    expect(formatGQLString(res)).toEqual('id');
+  });
+  it('should return fieldName if composite', async () => {
+    const res = mapFieldMetadataToGraphQLQuery({
+      objectMetadataItems: mockObjectMetadataItems,
+      field: personObjectMetadataItem.fields.find(
+        (field) => field.name === 'name',
+      )!,
+    });
+    expect(formatGQLString(res)).toEqual(`name
+{
+  firstName
+  lastName
+}`);
+  });
+  it('should not return relation if depth is < 1', async () => {
+    const res = mapFieldMetadataToGraphQLQuery({
+      objectMetadataItems: mockObjectMetadataItems,
+      depth: 0,
+      field: personObjectMetadataItem.fields.find(
+        (field) => field.name === 'company',
+      )!,
+    });
+    expect(formatGQLString(res)).toEqual('');
+  });
+
+  it('should return relation if it matches depth', async () => {
+    const res = mapFieldMetadataToGraphQLQuery({
+      objectMetadataItems: mockObjectMetadataItems,
+      depth: 1,
+      field: personObjectMetadataItem.fields.find(
+        (field) => field.name === 'company',
+      )!,
+    });
+    expect(formatGQLString(res)).toEqual(`company
+{
+__typename
+xLink
+{
+  label
+  url
+}
+linkedinLink
+{
+  label
+  url
+}
+domainName
+annualRecurringRevenue
+{
+  amountMicros
+  currencyCode
+}
+createdAt
+address
+updatedAt
+name
+accountOwnerId
+employees
+id
+idealCustomerProfile
+}`);
+  });
+  it('should return relation with all sub relations if it matches depth', async () => {
+    const res = mapFieldMetadataToGraphQLQuery({
+      objectMetadataItems: mockObjectMetadataItems,
+      depth: 2,
+      field: personObjectMetadataItem.fields.find(
+        (field) => field.name === 'company',
+      )!,
+    });
+    expect(formatGQLString(res)).toEqual(`company
+{
+__typename
+xLink
+{
+  label
+  url
+}
+accountOwner
+{
+__typename
+colorScheme
+name
+{
+  firstName
+  lastName
+}
+locale
+userId
+avatarUrl
+createdAt
+updatedAt
+id
+}
+linkedinLink
+{
+  label
+  url
+}
+attachments
+{
+  edges {
+    node {
+__typename
+updatedAt
+createdAt
+name
+personId
+activityId
+companyId
+id
+authorId
+type
+fullPath
+}
+  }
+}
+domainName
+opportunities
+{
+  edges {
+    node {
+__typename
+personId
+pointOfContactId
+updatedAt
+companyId
+probability
+closeDate
+amount
+{
+  amountMicros
+  currencyCode
+}
+id
+createdAt
+}
+  }
+}
+annualRecurringRevenue
+{
+  amountMicros
+  currencyCode
+}
+createdAt
+address
+updatedAt
+activityTargets
+{
+  edges {
+    node {
+__typename
+updatedAt
+createdAt
+personId
+activityId
+companyId
+id
+}
+  }
+}
+favorites
+{
+  edges {
+    node {
+__typename
+id
+companyId
+createdAt
+personId
+position
+workspaceMemberId
+updatedAt
+}
+  }
+}
+people
+{
+  edges {
+    node {
+__typename
+xLink
+{
+  label
+  url
+}
+id
+createdAt
+city
+email
+jobTitle
+name
+{
+  firstName
+  lastName
+}
+phone
+linkedinLink
+{
+  label
+  url
+}
+updatedAt
+avatarUrl
+companyId
+}
+  }
+}
+name
+accountOwnerId
+employees
+id
+idealCustomerProfile
+}`);
+  });
+
+  it('should return GraphQL fields based on queryFields', async () => {
+    const res = mapFieldMetadataToGraphQLQuery({
+      objectMetadataItems: mockObjectMetadataItems,
+      depth: 2,
+      queryFields: {
+        accountOwner: true,
+        people: true,
+        xLink: true,
+        linkedinLink: true,
+        domainName: true,
+        annualRecurringRevenue: true,
+        createdAt: true,
+        address: true,
+        updatedAt: true,
+        name: true,
+        accountOwnerId: true,
+        employees: true,
+        id: true,
+        idealCustomerProfile: true,
+      },
+      field: personObjectMetadataItem.fields.find(
+        (field) => field.name === 'company',
+      )!,
+    });
+    expect(formatGQLString(res)).toEqual(`company
+{
+__typename
+xLink
+{
+  label
+  url
+}
+accountOwner
+{
+__typename
+colorScheme
+name
+{
+  firstName
+  lastName
+}
+locale
+userId
+avatarUrl
+createdAt
+updatedAt
+id
+}
+linkedinLink
+{
+  label
+  url
+}
+domainName
+annualRecurringRevenue
+{
+  amountMicros
+  currencyCode
+}
+createdAt
+address
+updatedAt
+people
+{
+  edges {
+    node {
+__typename
+xLink
+{
+  label
+  url
+}
+id
+createdAt
+city
+email
+jobTitle
+name
+{
+  firstName
+  lastName
+}
+phone
+linkedinLink
+{
+  label
+  url
+}
+updatedAt
+avatarUrl
+companyId
+}
+  }
+}
+name
+accountOwnerId
+employees
+id
+idealCustomerProfile
+}`);
+  });
+});
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapObjectMetadataToGraphQLQuery.test.tsx b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapObjectMetadataToGraphQLQuery.test.tsx
new file mode 100644
index 000000000000..f8f32cead243
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapObjectMetadataToGraphQLQuery.test.tsx
@@ -0,0 +1,339 @@
+import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
+import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+
+const mockObjectMetadataItems = getObjectMetadataItemsMock();
+
+const formatGQLString = (inputString: string) =>
+  inputString.replace(/^\s*[\r\n]/gm, '');
+
+const personObjectMetadataItem = mockObjectMetadataItems.find(
+  (item) => item.nameSingular === 'person',
+);
+
+if (!personObjectMetadataItem) {
+  throw new Error('ObjectMetadataItem not found');
+}
+
+describe('mapObjectMetadataToGraphQLQuery', () => {
+  it('should return typename if depth < 0', async () => {
+    const res = mapObjectMetadataToGraphQLQuery({
+      objectMetadataItems: mockObjectMetadataItems,
+      objectMetadataItem: personObjectMetadataItem,
+      depth: -1,
+    });
+    expect(formatGQLString(res)).toEqual(`{
+__typename
+}`);
+  });
+
+  it('should return depth 0 if depth = 0', async () => {
+    const res = mapObjectMetadataToGraphQLQuery({
+      objectMetadataItems: mockObjectMetadataItems,
+      objectMetadataItem: personObjectMetadataItem,
+      depth: 0,
+    });
+    expect(formatGQLString(res)).toEqual(`{
+__typename
+xLink
+{
+  label
+  url
+}
+id
+createdAt
+city
+email
+jobTitle
+name
+{
+  firstName
+  lastName
+}
+phone
+linkedinLink
+{
+  label
+  url
+}
+updatedAt
+avatarUrl
+companyId
+}`);
+  });
+
+  it('should return depth 1 if depth = 1', async () => {
+    const res = mapObjectMetadataToGraphQLQuery({
+      objectMetadataItems: mockObjectMetadataItems,
+      objectMetadataItem: personObjectMetadataItem,
+      depth: 1,
+    });
+    expect(formatGQLString(res)).toEqual(`{
+__typename
+opportunities
+{
+  edges {
+    node {
+__typename
+personId
+pointOfContactId
+updatedAt
+companyId
+probability
+closeDate
+amount
+{
+  amountMicros
+  currencyCode
+}
+id
+createdAt
+}
+  }
+}
+xLink
+{
+  label
+  url
+}
+id
+pointOfContactForOpportunities
+{
+  edges {
+    node {
+__typename
+personId
+pointOfContactId
+updatedAt
+companyId
+probability
+closeDate
+amount
+{
+  amountMicros
+  currencyCode
+}
+id
+createdAt
+}
+  }
+}
+createdAt
+company
+{
+__typename
+xLink
+{
+  label
+  url
+}
+linkedinLink
+{
+  label
+  url
+}
+domainName
+annualRecurringRevenue
+{
+  amountMicros
+  currencyCode
+}
+createdAt
+address
+updatedAt
+name
+accountOwnerId
+employees
+id
+idealCustomerProfile
+}
+city
+email
+activityTargets
+{
+  edges {
+    node {
+__typename
+updatedAt
+createdAt
+personId
+activityId
+companyId
+id
+}
+  }
+}
+jobTitle
+favorites
+{
+  edges {
+    node {
+__typename
+id
+companyId
+createdAt
+personId
+position
+workspaceMemberId
+updatedAt
+}
+  }
+}
+attachments
+{
+  edges {
+    node {
+__typename
+updatedAt
+createdAt
+name
+personId
+activityId
+companyId
+id
+authorId
+type
+fullPath
+}
+  }
+}
+name
+{
+  firstName
+  lastName
+}
+phone
+linkedinLink
+{
+  label
+  url
+}
+updatedAt
+avatarUrl
+companyId
+}`);
+  });
+
+  it('should query  only specified queryFields', async () => {
+    const res = mapObjectMetadataToGraphQLQuery({
+      objectMetadataItems: mockObjectMetadataItems,
+      objectMetadataItem: personObjectMetadataItem,
+      queryFields: {
+        company: true,
+        xLink: true,
+        id: true,
+        createdAt: true,
+        city: true,
+        email: true,
+        jobTitle: true,
+        name: true,
+        phone: true,
+        linkedinLink: true,
+        updatedAt: true,
+        avatarUrl: true,
+        companyId: true,
+      },
+      depth: 1,
+    });
+    expect(formatGQLString(res)).toEqual(`{
+__typename
+xLink
+{
+  label
+  url
+}
+id
+createdAt
+company
+{
+__typename
+xLink
+{
+  label
+  url
+}
+linkedinLink
+{
+  label
+  url
+}
+domainName
+annualRecurringRevenue
+{
+  amountMicros
+  currencyCode
+}
+createdAt
+address
+updatedAt
+name
+accountOwnerId
+employees
+id
+idealCustomerProfile
+}
+city
+email
+jobTitle
+name
+{
+  firstName
+  lastName
+}
+phone
+linkedinLink
+{
+  label
+  url
+}
+updatedAt
+avatarUrl
+companyId
+}`);
+  });
+
+  it('should load only specified query fields', async () => {
+    const res = mapObjectMetadataToGraphQLQuery({
+      objectMetadataItems: mockObjectMetadataItems,
+      objectMetadataItem: personObjectMetadataItem,
+      queryFields: { company: true, id: true, name: true },
+      depth: 1,
+    });
+    expect(formatGQLString(res)).toEqual(`{
+__typename
+id
+company
+{
+__typename
+xLink
+{
+  label
+  url
+}
+linkedinLink
+{
+  label
+  url
+}
+domainName
+annualRecurringRevenue
+{
+  amountMicros
+  currencyCode
+}
+createdAt
+address
+updatedAt
+name
+accountOwnerId
+employees
+id
+idealCustomerProfile
+}
+name
+{
+  firstName
+  lastName
+}
+}`);
+  });
+});
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/shouldFieldBeQueried.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/shouldFieldBeQueried.test.ts
new file mode 100644
index 000000000000..32992648d24d
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/shouldFieldBeQueried.test.ts
@@ -0,0 +1,117 @@
+import { shouldFieldBeQueried } from '@/object-metadata/utils/shouldFieldBeQueried';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+describe('shouldFieldBeQueried', () => {
+  describe('if field is not relation', () => {
+    it('should be queried if depth is undefined', () => {
+      const res = shouldFieldBeQueried({
+        field: { name: 'fieldName', type: FieldMetadataType.Boolean },
+      });
+      expect(res).toBe(true);
+    });
+
+    it('should be queried depth = 0', () => {
+      const res = shouldFieldBeQueried({
+        depth: 0,
+        field: { name: 'fieldName', type: FieldMetadataType.Boolean },
+      });
+      expect(res).toBe(true);
+    });
+
+    it('should be queried depth > 0', () => {
+      const res = shouldFieldBeQueried({
+        depth: 1,
+        field: { name: 'fieldName', type: FieldMetadataType.Boolean },
+      });
+      expect(res).toBe(true);
+    });
+
+    it('should NOT be queried depth < 0', () => {
+      const res = shouldFieldBeQueried({
+        depth: -1,
+        field: { name: 'fieldName', type: FieldMetadataType.Boolean },
+      });
+      expect(res).toBe(false);
+    });
+
+    it('should not depends on queryFields', () => {
+      const res = shouldFieldBeQueried({
+        depth: 0,
+        queryFields: {
+          fieldName: true,
+        },
+        field: { name: 'fieldName', type: FieldMetadataType.Boolean },
+      });
+      expect(res).toBe(true);
+    });
+  });
+
+  describe('if field is relation', () => {
+    it('should be queried if queryFields and depth are undefined', () => {
+      const res = shouldFieldBeQueried({
+        field: { name: 'fieldName', type: FieldMetadataType.Relation },
+      });
+      expect(res).toBe(true);
+    });
+
+    it('should be queried if queryFields is undefined and depth = 1', () => {
+      const res = shouldFieldBeQueried({
+        depth: 1,
+        field: { name: 'fieldName', type: FieldMetadataType.Relation },
+      });
+      expect(res).toBe(true);
+    });
+
+    it('should be queried if queryFields is undefined and depth > 1', () => {
+      const res = shouldFieldBeQueried({
+        depth: 2,
+        field: { name: 'fieldName', type: FieldMetadataType.Relation },
+      });
+      expect(res).toBe(true);
+    });
+
+    it('should NOT be queried if queryFields is undefined and depth < 1', () => {
+      const res = shouldFieldBeQueried({
+        depth: 0,
+        field: { name: 'fieldName', type: FieldMetadataType.Relation },
+      });
+      expect(res).toBe(false);
+    });
+
+    it('should be queried if queryFields is matching and depth > 1', () => {
+      const res = shouldFieldBeQueried({
+        depth: 1,
+        queryFields: { fieldName: true },
+        field: { name: 'fieldName', type: FieldMetadataType.Relation },
+      });
+      expect(res).toBe(true);
+    });
+
+    it('should NOT be queried if queryFields is matching and depth < 1', () => {
+      const res = shouldFieldBeQueried({
+        depth: 0,
+        queryFields: { fieldName: true },
+        field: { name: 'fieldName', type: FieldMetadataType.Relation },
+      });
+      expect(res).toBe(false);
+    });
+
+    it('should NOT be queried if queryFields is not matching (falsy) and depth < 1', () => {
+      const res = shouldFieldBeQueried({
+        depth: 1,
+        queryFields: { fieldName: false },
+        field: { name: 'fieldName', type: FieldMetadataType.Relation },
+      });
+      expect(res).toBe(false);
+    });
+
+    it('should NOT be queried if queryFields is not matching and depth < 1', () => {
+      const res = shouldFieldBeQueried({
+        depth: 0,
+        queryFields: { anotherFieldName: true },
+        field: { name: 'fieldName', type: FieldMetadataType.Relation },
+      });
+      expect(res).toBe(false);
+    });
+  });
+});
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition.ts b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition.ts
index 3679055c4c11..0b8ec528ba07 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition.ts
@@ -3,8 +3,6 @@ import { parseFieldRelationType } from '@/object-metadata/utils/parseFieldRelati
 
 import { FieldMetadataItem } from '../types/FieldMetadataItem';
 
-import { parseFieldType } from './parseFieldType';
-
 export type FieldMetadataItemAsFieldDefinitionProps = {
   field: FieldMetadataItem;
   objectMetadataItem: ObjectMetadataItem;
@@ -31,7 +29,7 @@ export const formatFieldMetadataItemAsFieldDefinition = ({
     label: field.label,
     showLabel,
     labelWidth,
-    type: parseFieldType(field.type),
+    type: field.type,
     metadata: {
       fieldName: field.name,
       placeHolder: field.label,
@@ -45,5 +43,6 @@ export const formatFieldMetadataItemAsFieldDefinition = ({
       options: field.options,
     },
     iconName: field.icon ?? 'Icon123',
+    defaultValue: field.defaultValue,
   };
 };
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemInput.ts b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemInput.ts
index 805726352260..26f2def0b958 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemInput.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemInput.ts
@@ -1,7 +1,8 @@
 import toCamelCase from 'lodash.camelcase';
 import toSnakeCase from 'lodash.snakecase';
 
-import { Field } from '~/generated-metadata/graphql';
+import { Field, FieldMetadataType } from '~/generated-metadata/graphql';
+import { isDefined } from '~/utils/isDefined.ts';
 
 import { FieldMetadataOption } from '../types/FieldMetadataOption';
 
@@ -20,21 +21,51 @@ export const getOptionValueFromLabel = (label: string) => {
 };
 
 export const formatFieldMetadataItemInput = (
-  input: Pick<Field, 'label' | 'icon' | 'description' | 'defaultValue'> & {
-    options?: FieldMetadataOption[];
-  },
+  input: Pick<
+    Field,
+    'label' | 'icon' | 'description' | 'defaultValue' | 'type' | 'options'
+  >,
 ) => {
-  const defaultOption = input.options?.find((option) => option.isDefault);
+  const options = input.options as FieldMetadataOption[];
+  let defaultValue = input.defaultValue;
+  if (input.type === FieldMetadataType.MultiSelect) {
+    const defaultOptions = options?.filter((option) => option.isDefault);
+    if (isDefined(defaultOptions)) {
+      defaultValue = defaultOptions.map(
+        (defaultOption) => `'${getOptionValueFromLabel(defaultOption.label)}'`,
+      );
+    }
+  }
+  if (input.type === FieldMetadataType.Select) {
+    const defaultOption = options?.find((option) => option.isDefault);
+    defaultValue = isDefined(defaultOption)
+      ? `'${getOptionValueFromLabel(defaultOption.label)}'`
+      : undefined;
+  }
+
+  // Check if options has unique values
+  if (options !== undefined) {
+    // Compute the values based on the label
+    const values = options.map((option) =>
+      getOptionValueFromLabel(option.label),
+    );
+
+    if (new Set(values).size !== options.length) {
+      throw new Error(
+        `Options must have unique values, but contains the following duplicates ${values.join(
+          ', ',
+        )}`,
+      );
+    }
+  }
 
   return {
-    defaultValue: defaultOption
-      ? getOptionValueFromLabel(defaultOption.label)
-      : undefined,
+    defaultValue,
     description: input.description?.trim() ?? null,
     icon: input.icon,
     label: input.label.trim(),
     name: toCamelCase(input.label.trim()),
-    options: input.options?.map((option, index) => ({
+    options: options?.map((option, index) => ({
       color: option.color,
       id: option.id,
       label: option.label.trim(),
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts
index 59e622f86c4b..3915413cbf37 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts
@@ -1,5 +1,6 @@
 import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { isDefined } from '~/utils/isDefined';
 
 import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
 
@@ -17,7 +18,10 @@ export const formatFieldMetadataItemsAsFilterDefinitions = ({
         FieldMetadataType.Number,
         FieldMetadataType.Link,
         FieldMetadataType.FullName,
+        FieldMetadataType.Address,
         FieldMetadataType.Relation,
+        FieldMetadataType.Select,
+        FieldMetadataType.MultiSelect,
         FieldMetadataType.Currency,
       ].includes(field.type)
     ) {
@@ -30,7 +34,7 @@ export const formatFieldMetadataItemsAsFilterDefinitions = ({
     }
 
     if (field.type === FieldMetadataType.Relation) {
-      if (field.fromRelationMetadata) {
+      if (isDefined(field.fromRelationMetadata)) {
         return acc;
       }
     }
@@ -50,22 +54,36 @@ export const formatFieldMetadataItemAsFilterDefinition = ({
     field.toRelationMetadata?.fromObjectMetadata.namePlural,
   relationObjectMetadataNameSingular:
     field.toRelationMetadata?.fromObjectMetadata.nameSingular,
-  type:
-    field.type === FieldMetadataType.DateTime
-      ? 'DATE_TIME'
-      : field.type === FieldMetadataType.Link
-        ? 'LINK'
-        : field.type === FieldMetadataType.FullName
-          ? 'FULL_NAME'
-          : field.type === FieldMetadataType.Number
-            ? 'NUMBER'
-            : field.type === FieldMetadataType.Currency
-              ? 'CURRENCY'
-              : field.type === FieldMetadataType.Email
-                ? 'TEXT'
-                : field.type === FieldMetadataType.Phone
-                  ? 'TEXT'
-                  : field.type === FieldMetadataType.Relation
-                    ? 'RELATION'
-                    : 'TEXT',
+  type: getFilterTypeFromFieldType(field.type),
 });
+
+export const getFilterTypeFromFieldType = (fieldType: FieldMetadataType) => {
+  switch (fieldType) {
+    case FieldMetadataType.DateTime:
+      return 'DATE_TIME';
+    case FieldMetadataType.Date:
+      return 'DATE';
+    case FieldMetadataType.Link:
+      return 'LINK';
+    case FieldMetadataType.FullName:
+      return 'FULL_NAME';
+    case FieldMetadataType.Number:
+      return 'NUMBER';
+    case FieldMetadataType.Currency:
+      return 'CURRENCY';
+    case FieldMetadataType.Email:
+      return 'EMAIL';
+    case FieldMetadataType.Phone:
+      return 'PHONE';
+    case FieldMetadataType.Relation:
+      return 'RELATION';
+    case FieldMetadataType.Select:
+      return 'SELECT';
+    case FieldMetadataType.MultiSelect:
+      return 'MULTI_SELECT';
+    case FieldMetadataType.Address:
+      return 'ADDRESS';
+    default:
+      return 'TEXT';
+  }
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsSortDefinitions.ts b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsSortDefinitions.ts
index 736b8b51273f..5138491cd0e4 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsSortDefinitions.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsSortDefinitions.ts
@@ -12,9 +12,11 @@ export const formatFieldMetadataItemsAsSortDefinitions = ({
     if (
       ![
         FieldMetadataType.DateTime,
+        FieldMetadataType.Date,
         FieldMetadataType.Number,
         FieldMetadataType.Text,
         FieldMetadataType.Boolean,
+        FieldMetadataType.Select,
       ].includes(field.type)
     ) {
       return acc;
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/formatObjectMetadataItemInput.ts b/packages/twenty-front/src/modules/object-metadata/utils/formatObjectMetadataItemInput.ts
deleted file mode 100644
index 0afceb29498f..000000000000
--- a/packages/twenty-front/src/modules/object-metadata/utils/formatObjectMetadataItemInput.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import toCamelCase from 'lodash.camelcase';
-
-import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
-
-export const formatObjectMetadataItemInput = (
-  input: Pick<
-    ObjectMetadataItem,
-    | 'description'
-    | 'icon'
-    | 'labelIdentifierFieldMetadataId'
-    | 'labelPlural'
-    | 'labelSingular'
-  >,
-) => ({
-  description: input.description?.trim() ?? null,
-  icon: input.icon,
-  labelIdentifierFieldMetadataId:
-    input.labelIdentifierFieldMetadataId?.trim() ?? null,
-  labelPlural: input.labelPlural.trim(),
-  labelSingular: input.labelSingular.trim(),
-  namePlural: toCamelCase(input.labelPlural.trim()),
-  nameSingular: toCamelCase(input.labelSingular.trim()),
-});
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/formatRelationMetadataInput.ts b/packages/twenty-front/src/modules/object-metadata/utils/formatRelationMetadataInput.ts
index 94de1d58a116..12db079c1f8b 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/formatRelationMetadataInput.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/formatRelationMetadataInput.ts
@@ -9,10 +9,10 @@ import { formatFieldMetadataItemInput } from './formatFieldMetadataItemInput';
 
 export type FormatRelationMetadataInputParams = {
   relationType: RelationType;
-  field: Pick<Field, 'label' | 'icon' | 'description'>;
+  field: Pick<Field, 'label' | 'icon' | 'description' | 'type'>;
   objectMetadataId: string;
   connect: {
-    field: Pick<Field, 'label' | 'icon'>;
+    field: Pick<Field, 'label' | 'icon' | 'type'>;
     objectMetadataId: string;
   };
 };
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getActiveFieldMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/utils/getActiveFieldMetadataItems.ts
new file mode 100644
index 000000000000..e174c2b00489
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getActiveFieldMetadataItems.ts
@@ -0,0 +1,9 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+
+export const getActiveFieldMetadataItems = (
+  objectMetadataItem: Pick<ObjectMetadataItem, 'fields'>,
+) =>
+  objectMetadataItem.fields.filter(
+    (fieldMetadataItem) =>
+      fieldMetadataItem.isActive && !fieldMetadataItem.isSystem,
+  );
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getBasePathToShowPage.ts b/packages/twenty-front/src/modules/object-metadata/utils/getBasePathToShowPage.ts
index 7a42595acb0c..1d5999c97ad1 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/getBasePathToShowPage.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getBasePathToShowPage.ts
@@ -1,11 +1,9 @@
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-
 export const getBasePathToShowPage = ({
-  objectMetadataItem,
+  objectNameSingular,
 }: {
-  objectMetadataItem: ObjectMetadataItem;
+  objectNameSingular: string;
 }) => {
-  const basePathToShowPage = `/object/${objectMetadataItem.nameSingular}/`;
+  const basePathToShowPage = `/object/${objectNameSingular}/`;
 
   return basePathToShowPage;
 };
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getDefaultValueForBackend.ts b/packages/twenty-front/src/modules/object-metadata/utils/getDefaultValueForBackend.ts
new file mode 100644
index 000000000000..ccd122331dd7
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getDefaultValueForBackend.ts
@@ -0,0 +1,19 @@
+import { FieldCurrencyValue } from '@/object-record/record-field/types/FieldMetadata';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+export const getDefaultValueForBackend = (
+  defaultValue: any,
+  fieldMetadataType: FieldMetadataType,
+) => {
+  if (fieldMetadataType === FieldMetadataType.Currency) {
+    const currencyDefaultValue = defaultValue as FieldCurrencyValue;
+    return {
+      amountMicros: currencyDefaultValue.amountMicros,
+      currencyCode: `'${currencyDefaultValue.currencyCode}'` as any,
+    } satisfies FieldCurrencyValue;
+  } else if (typeof defaultValue === 'string') {
+    return `'${defaultValue}'`;
+  }
+
+  return defaultValue;
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getDisabledFieldMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/utils/getDisabledFieldMetadataItems.ts
new file mode 100644
index 000000000000..52f781ccc203
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getDisabledFieldMetadataItems.ts
@@ -0,0 +1,9 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+
+export const getDisabledFieldMetadataItems = (
+  objectMetadataItem: Pick<ObjectMetadataItem, 'fields'>,
+) =>
+  objectMetadataItem.fields.filter(
+    (fieldMetadataItem) =>
+      !fieldMetadataItem.isActive && !fieldMetadataItem.isSystem,
+  );
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getFieldRelationDirections.ts b/packages/twenty-front/src/modules/object-metadata/utils/getFieldRelationDirections.ts
new file mode 100644
index 000000000000..6b8929c32457
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getFieldRelationDirections.ts
@@ -0,0 +1,38 @@
+import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { RelationDirections } from '@/object-record/record-field/types/FieldDefinition';
+import {
+  FieldMetadataType,
+  RelationDefinitionType,
+} from '~/generated-metadata/graphql';
+
+export const getFieldRelationDirections = (
+  field: Pick<FieldMetadataItem, 'type' | 'relationDefinition'> | undefined,
+): RelationDirections => {
+  if (!field || field.type !== FieldMetadataType.Relation) {
+    throw new Error(`Field is not a relation field.`);
+  }
+
+  switch (field.relationDefinition?.direction) {
+    case RelationDefinitionType.ManyToMany:
+      throw new Error(`Many to many relations are not supported.`);
+    case RelationDefinitionType.OneToMany:
+      return {
+        from: 'FROM_ONE_OBJECT',
+        to: 'TO_MANY_OBJECTS',
+      };
+    case RelationDefinitionType.ManyToOne:
+      return {
+        from: 'FROM_MANY_OBJECTS',
+        to: 'TO_ONE_OBJECT',
+      };
+    case RelationDefinitionType.OneToOne:
+      return {
+        from: 'FROM_ONE_OBJECT',
+        to: 'TO_ONE_OBJECT',
+      };
+    default:
+      throw new Error(
+        `Invalid relation definition type direction : ${field.relationDefinition?.direction}`,
+      );
+  }
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getObjectMetadataIdentifierFields.ts b/packages/twenty-front/src/modules/object-metadata/utils/getObjectMetadataIdentifierFields.ts
new file mode 100644
index 000000000000..65d4e41ee6bb
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getObjectMetadataIdentifierFields.ts
@@ -0,0 +1,20 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/getLabelIdentifierFieldMetadataItem';
+
+export const getObjectMetadataIdentifierFields = ({
+  objectMetadataItem,
+}: {
+  objectMetadataItem: ObjectMetadataItem;
+}) => {
+  const labelIdentifierFieldMetadataItem =
+    getLabelIdentifierFieldMetadataItem(objectMetadataItem);
+
+  const imageIdentifierFieldMetadataItem = objectMetadataItem.fields.find(
+    (field) => field.id === objectMetadataItem.imageIdentifierFieldMetadataId,
+  );
+
+  return {
+    labelIdentifierFieldMetadataItem,
+    imageIdentifierFieldMetadataItem,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getObjectMetadataItemsMock.ts b/packages/twenty-front/src/modules/object-metadata/utils/getObjectMetadataItemsMock.ts
index d6b0c4350942..3edc7af06ed1 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/getObjectMetadataItemsMock.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getObjectMetadataItemsMock.ts
@@ -13,6 +13,7 @@ export const getObjectMetadataItemsMock = () => {
       description: 'A webhook',
       icon: 'IconRobot',
       isCustom: false,
+      isRemote: false,
       isActive: true,
       isSystem: true,
       createdAt: '2023-11-30T11:13:15.206Z',
@@ -30,6 +31,7 @@ export const getObjectMetadataItemsMock = () => {
       description: 'An api key',
       icon: 'IconRobot',
       isCustom: false,
+      isRemote: false,
       isActive: true,
       isSystem: true,
       createdAt: '2023-11-30T11:13:15.206Z',
@@ -150,6 +152,7 @@ export const getObjectMetadataItemsMock = () => {
       description: '(System) View Sorts',
       icon: 'IconArrowsSort',
       isCustom: false,
+      isRemote: false,
       isActive: true,
       isSystem: true,
       createdAt: '2023-11-30T11:13:15.206Z',
@@ -271,6 +274,24 @@ export const getObjectMetadataItemsMock = () => {
         },
       ],
     },
+    {
+      __typename: 'object',
+      id: '20202020-ddee-40de-9c9b-5f82a3503361',
+      dataSourceId: '20202020-7f63-47a9-b1b3-6c7290ca9fb1',
+      nameSingular: 'calendarEvent',
+      namePlural: 'calendarEvents',
+      labelSingular: 'Calendar Event',
+      labelPlural: 'Calendar Events',
+      description: 'A calendar event',
+      icon: 'IconCalendarEvent',
+      isCustom: false,
+      isRemote: false,
+      isActive: true,
+      isSystem: true,
+      createdAt: '2023-11-30T11:13:15.206Z',
+      updatedAt: '2023-11-30T11:13:15.206Z',
+      fields: [],
+    },
     {
       __typename: 'object',
       id: '20202020-cae9-4ff4-9579-f7d9fe44c937',
@@ -282,6 +303,7 @@ export const getObjectMetadataItemsMock = () => {
       description: 'An opportunity',
       icon: 'IconTargetArrow',
       isCustom: false,
+      isRemote: false,
       isActive: true,
       isSystem: false,
       createdAt: '2023-11-30T11:13:15.206Z',
@@ -384,23 +406,6 @@ export const getObjectMetadataItemsMock = () => {
           fromRelationMetadata: null,
           toRelationMetadata: null,
         },
-        {
-          __typename: 'field',
-          id: '20202020-0a2e-4676-8011-3fdb2c30d7f8',
-          type: 'UUID',
-          name: 'pipelineStepId',
-          label: 'Pipeline Step ID (foreign key)',
-          description: 'Foreign key for pipeline step',
-          icon: null,
-          isCustom: false,
-          isActive: true,
-          isSystem: true,
-          isNullable: true,
-          createdAt: '2023-11-30T11:13:15.308Z',
-          updatedAt: '2023-11-30T11:13:15.308Z',
-          fromRelationMetadata: null,
-          toRelationMetadata: null,
-        },
         {
           __typename: 'field',
           id: '20202020-3b9c-4e58-a3d2-c617d3b596b1',
@@ -419,32 +424,63 @@ export const getObjectMetadataItemsMock = () => {
           toRelationMetadata: null,
         },
         {
-          __typename: 'field',
-          id: '20202020-0a2e-4676-8011-3fdb2c30c258',
-          type: 'RELATION',
-          name: 'pipelineStep',
-          label: 'Pipeline Step',
-          description: 'Opportunity pipeline step',
-          icon: 'IconKanban',
-          isCustom: false,
-          isActive: true,
-          isSystem: true,
-          isNullable: true,
-          createdAt: '2023-11-30T11:13:15.308Z',
-          updatedAt: '2023-11-30T11:13:15.308Z',
-          fromRelationMetadata: null,
-          toRelationMetadata: {
-            __typename: 'relation',
-            id: 'dfb44970-3e09-49f2-9f1d-51c8c451b8f5',
-            relationType: 'ONE_TO_MANY',
-            fromObjectMetadata: {
-              __typename: 'object',
-              id: '20202020-1029-4661-9e91-83bad932bdcd',
-              dataSourceId: '20202020-7f63-47a9-b1b3-6c7290ca9fb1',
-              nameSingular: 'pipelineStep',
-              namePlural: 'pipelineSteps',
+          __typename: 'fieldEdge',
+          node: {
+            __typename: 'field',
+            id: '20202020-46cc-42bb-90d5-c724921a012d',
+            type: 'SELECT',
+            name: 'stage',
+            label: 'Stage',
+            description: 'Opportunity stage',
+            icon: 'IconProgressCheck',
+            isCustom: false,
+            isActive: true,
+            isSystem: false,
+            isNullable: false,
+            createdAt: '2024-03-21T16:48:40.384Z',
+            updatedAt: '2024-03-21T16:48:40.384Z',
+            defaultValue: {
+              value: 'NEW',
             },
-            fromFieldMetadataId: '20202020-22c4-443a-b114-43c97dda5867',
+            options: [
+              {
+                id: '20202020-aa3b-4c0b-bd90-9d071e3b9bf2',
+                color: 'red',
+                label: 'New',
+                value: 'NEW',
+                position: 0,
+              },
+              {
+                id: '20202020-8f9b-4bc3-b0a0-ce6a5085c1cf',
+                color: 'purple',
+                label: 'Screening',
+                value: 'SCREENING',
+                position: 1,
+              },
+              {
+                id: '20202020-9797-448d-81e4-49b055a1d19b',
+                color: 'sky',
+                label: 'Meeting',
+                value: 'MEETING',
+                position: 2,
+              },
+              {
+                id: '20202020-d542-479c-bc88-3c6d4ee78d09',
+                color: 'turquoise',
+                label: 'Proposal',
+                value: 'PROPOSAL',
+                position: 3,
+              },
+              {
+                id: '20202020-b69a-4c9c-ac16-adcba0ec972d',
+                color: 'yellow',
+                label: 'Customer',
+                value: 'CUSTOMER',
+                position: 4,
+              },
+            ],
+            fromRelationMetadata: null,
+            toRelationMetadata: null,
           },
         },
         {
@@ -586,6 +622,7 @@ export const getObjectMetadataItemsMock = () => {
       description: 'A person',
       icon: 'IconUser',
       isCustom: false,
+      isRemote: false,
       isActive: true,
       isSystem: false,
       createdAt: '2023-11-30T11:13:15.206Z',
@@ -819,7 +856,7 @@ export const getObjectMetadataItemsMock = () => {
           icon: 'IconHeart',
           isCustom: false,
           isActive: true,
-          isSystem: false,
+          isSystem: true,
           isNullable: true,
           createdAt: '2023-11-30T11:13:15.331Z',
           updatedAt: '2023-11-30T11:13:15.331Z',
@@ -982,6 +1019,7 @@ export const getObjectMetadataItemsMock = () => {
       description: 'A workspace member',
       icon: 'IconUserCircle',
       isCustom: false,
+      isRemote: false,
       isActive: true,
       isSystem: true,
       createdAt: '2023-11-30T11:13:15.206Z',
@@ -1065,7 +1103,7 @@ export const getObjectMetadataItemsMock = () => {
           icon: 'IconHeart',
           isCustom: false,
           isActive: true,
-          isSystem: false,
+          isSystem: true,
           isNullable: true,
           createdAt: '2023-11-30T11:13:15.392Z',
           updatedAt: '2023-11-30T11:13:15.392Z',
@@ -3011,7 +3049,7 @@ export const getObjectMetadataItemsMock = () => {
           icon: 'IconHeart',
           isCustom: false,
           isActive: true,
-          isSystem: false,
+          isSystem: true,
           isNullable: true,
           createdAt: '2023-11-30T11:13:15.292Z',
           updatedAt: '2023-11-30T11:13:15.292Z',
@@ -3520,155 +3558,6 @@ export const getObjectMetadataItemsMock = () => {
         },
       ],
     },
-    {
-      __typename: 'object',
-      id: '20202020-1029-4661-9e91-83bad932bdcd',
-      dataSourceId: '20202020-7f63-47a9-b1b3-6c7290ca9fb1',
-      nameSingular: 'pipelineStep',
-      namePlural: 'pipelineSteps',
-      labelSingular: 'Pipeline Step',
-      labelPlural: 'Pipeline Steps',
-      description: 'A pipeline step',
-      icon: 'IconLayoutKanban',
-      isCustom: false,
-      isActive: true,
-      isSystem: true,
-      createdAt: '2023-11-30T11:13:15.206Z',
-      updatedAt: '2023-11-30T11:13:15.206Z',
-      fields: [
-        {
-          __typename: 'field',
-          id: '20202020-f294-430e-b800-3a411fc05ad3',
-          type: 'TEXT',
-          name: 'name',
-          label: 'Name',
-          description: 'Pipeline Step name',
-          icon: 'IconCurrencyDollar',
-          isCustom: false,
-          isActive: true,
-          isSystem: false,
-          isNullable: false,
-          createdAt: '2023-11-30T11:13:15.337Z',
-          updatedAt: '2023-11-30T11:13:15.337Z',
-          fromRelationMetadata: null,
-          toRelationMetadata: null,
-        },
-        {
-          __typename: 'field',
-          id: '20202020-039a-4fbd-b4c1-66dfa9e4bd3f',
-          type: 'UUID',
-          name: 'id',
-          label: 'Id',
-          description: null,
-          icon: null,
-          isCustom: false,
-          isActive: true,
-          isSystem: true,
-          isNullable: false,
-          createdAt: '2023-11-30T11:13:15.337Z',
-          updatedAt: '2023-11-30T11:13:15.337Z',
-          fromRelationMetadata: null,
-          toRelationMetadata: null,
-        },
-        {
-          __typename: 'field',
-          id: '20202020-816f-4861-9b36-4a2f8ae2791c',
-          type: 'DATE_TIME',
-          name: 'createdAt',
-          label: 'Creation date',
-          description: null,
-          icon: 'IconCalendar',
-          isCustom: false,
-          isActive: true,
-          isSystem: true,
-          isNullable: false,
-          createdAt: '2023-11-30T11:13:15.337Z',
-          updatedAt: '2023-11-30T11:13:15.337Z',
-          fromRelationMetadata: null,
-          toRelationMetadata: null,
-        },
-        {
-          __typename: 'field',
-          id: '20202020-22c4-443a-b114-43c97dda5867',
-          type: 'RELATION',
-          name: 'opportunities',
-          label: 'Opportunities',
-          description: 'Opportunities linked to the step.',
-          icon: 'IconTargetArrow',
-          isCustom: false,
-          isActive: true,
-          isSystem: false,
-          isNullable: true,
-          createdAt: '2023-11-30T11:13:15.337Z',
-          updatedAt: '2023-11-30T11:13:15.337Z',
-          fromRelationMetadata: {
-            __typename: 'relation',
-            id: 'dfb44970-3e09-49f2-9f1d-51c8c451b8f5',
-            relationType: 'ONE_TO_MANY',
-            toObjectMetadata: {
-              __typename: 'object',
-              id: '20202020-cae9-4ff4-9579-f7d9fe44c937',
-              dataSourceId: '20202020-7f63-47a9-b1b3-6c7290ca9fb1',
-              nameSingular: 'opportunity',
-              namePlural: 'opportunities',
-            },
-            toFieldMetadataId: '20202020-0a2e-4676-8011-3fdb2c30c258',
-          },
-          toRelationMetadata: null,
-        },
-        {
-          __typename: 'field',
-          id: '20202020-6296-4cab-aafb-121ef5822b13',
-          type: 'NUMBER',
-          name: 'position',
-          label: 'Position',
-          description: 'Pipeline Step position',
-          icon: 'IconHierarchy2',
-          isCustom: false,
-          isActive: true,
-          isSystem: false,
-          isNullable: false,
-          createdAt: '2023-11-30T11:13:15.337Z',
-          updatedAt: '2023-11-30T11:13:15.337Z',
-          fromRelationMetadata: null,
-          toRelationMetadata: null,
-        },
-        {
-          __typename: 'field',
-          id: '20202020-5b93-4b28-8c45-7988ea68f91b',
-          type: 'TEXT',
-          name: 'color',
-          label: 'Color',
-          description: 'Pipeline Step color',
-          icon: 'IconColorSwatch',
-          isCustom: false,
-          isActive: true,
-          isSystem: false,
-          isNullable: false,
-          createdAt: '2023-11-30T11:13:15.337Z',
-          updatedAt: '2023-11-30T11:13:15.337Z',
-          fromRelationMetadata: null,
-          toRelationMetadata: null,
-        },
-        {
-          __typename: 'field',
-          id: '20202020-2d73-4829-b774-522c2f5627d7',
-          type: 'DATE_TIME',
-          name: 'updatedAt',
-          label: 'Update date',
-          description: null,
-          icon: 'IconCalendar',
-          isCustom: false,
-          isActive: true,
-          isSystem: true,
-          isNullable: false,
-          createdAt: '2023-11-30T11:13:15.337Z',
-          updatedAt: '2023-11-30T11:13:15.337Z',
-          fromRelationMetadata: null,
-          toRelationMetadata: null,
-        },
-      ],
-    },
   ];
 
   // Todo fix typing here (the backend is not in sync with the frontend)
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getObjectOrderByField.ts b/packages/twenty-front/src/modules/object-metadata/utils/getObjectOrderByField.ts
index 0fc1ae8e8608..2219b1a0246b 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/getObjectOrderByField.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getObjectOrderByField.ts
@@ -3,15 +3,16 @@ import { OrderBy } from '@/object-metadata/types/OrderBy';
 import { OrderByField } from '@/object-metadata/types/OrderByField';
 import { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/getLabelIdentifierFieldMetadataItem';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { isDefined } from '~/utils/isDefined';
 
-export const getObjectOrderByField = (
+export const getOrderByFieldForObjectMetadataItem = (
   objectMetadataItem: ObjectMetadataItem,
   orderBy?: OrderBy | null,
 ): OrderByField => {
   const labelIdentifierFieldMetadata =
     getLabelIdentifierFieldMetadataItem(objectMetadataItem);
 
-  if (labelIdentifierFieldMetadata) {
+  if (isDefined(labelIdentifierFieldMetadata)) {
     switch (labelIdentifierFieldMetadata.type) {
       case FieldMetadataType.FullName:
         return {
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getObjectRecordIdentifier.ts b/packages/twenty-front/src/modules/object-metadata/utils/getObjectRecordIdentifier.ts
index 41d4cea56a46..6b2fb1dfaee5 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/getObjectRecordIdentifier.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getObjectRecordIdentifier.ts
@@ -68,7 +68,7 @@ export const getObjectRecordIdentifier = ({
         : imageIdentifierFieldValue) ?? '';
 
   const basePathToShowPage = getBasePathToShowPage({
-    objectMetadataItem,
+    objectNameSingular: objectMetadataItem.nameSingular,
   });
 
   const isWorkspaceMemberObjectMetadata =
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/isLabelIdentifierField.ts b/packages/twenty-front/src/modules/object-metadata/utils/isLabelIdentifierField.ts
index 489ea0e266df..06bc0c57613c 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/isLabelIdentifierField.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/isLabelIdentifierField.ts
@@ -1,6 +1,6 @@
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const DEFAULT_LABEL_IDENTIFIER_FIELD_NAME = 'name';
 
@@ -14,6 +14,6 @@ export const isLabelIdentifierField = ({
     'labelIdentifierFieldMetadataId'
   >;
 }) =>
-  isNonNullable(objectMetadataItem.labelIdentifierFieldMetadataId)
+  isDefined(objectMetadataItem.labelIdentifierFieldMetadataId)
     ? fieldMetadataItem.id === objectMetadataItem.labelIdentifierFieldMetadataId
     : fieldMetadataItem.name === DEFAULT_LABEL_IDENTIFIER_FIELD_NAME;
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts b/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
new file mode 100644
index 000000000000..172288fc9f31
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
@@ -0,0 +1,134 @@
+import { isUndefined } from '@sniptt/guards';
+
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+import { FieldMetadataItem } from '../types/FieldMetadataItem';
+
+// TODO: change ObjectMetadataItems mock before refactoring with relationDefinition computed field
+export const mapFieldMetadataToGraphQLQuery = ({
+  objectMetadataItems,
+  field,
+  depth = 0,
+  queryFields,
+  computeReferences = false,
+}: {
+  objectMetadataItems: ObjectMetadataItem[];
+  field: Pick<
+    FieldMetadataItem,
+    'name' | 'type' | 'toRelationMetadata' | 'fromRelationMetadata'
+  >;
+  depth?: number;
+  queryFields?: Record<string, any>;
+  computeReferences?: boolean;
+}): any => {
+  const fieldType = field.type;
+
+  const fieldIsSimpleValue = (
+    [
+      'UUID',
+      'TEXT',
+      'PHONE',
+      'DATE_TIME',
+      'DATE',
+      'EMAIL',
+      'NUMBER',
+      'BOOLEAN',
+      'RATING',
+      'SELECT',
+      'MULTI_SELECT',
+      'POSITION',
+      'RAW_JSON',
+    ] as FieldMetadataType[]
+  ).includes(fieldType);
+
+  if (fieldIsSimpleValue) {
+    return field.name;
+  } else if (
+    fieldType === 'RELATION' &&
+    field.toRelationMetadata?.relationType === 'ONE_TO_MANY' &&
+    depth > 0
+  ) {
+    const relationMetadataItem = objectMetadataItems.find(
+      (objectMetadataItem) =>
+        objectMetadataItem.id ===
+        (field.toRelationMetadata as any)?.fromObjectMetadata?.id,
+    );
+
+    if (isUndefined(relationMetadataItem)) {
+      return '';
+    }
+
+    return `${field.name}
+${mapObjectMetadataToGraphQLQuery({
+  objectMetadataItems,
+  objectMetadataItem: relationMetadataItem,
+  depth: depth - 1,
+  queryFields,
+  computeReferences: computeReferences,
+  isRootLevel: false,
+})}`;
+  } else if (
+    fieldType === 'RELATION' &&
+    field.fromRelationMetadata?.relationType === 'ONE_TO_MANY' &&
+    depth > 0
+  ) {
+    const relationMetadataItem = objectMetadataItems.find(
+      (objectMetadataItem) =>
+        objectMetadataItem.id ===
+        (field.fromRelationMetadata as any)?.toObjectMetadata?.id,
+    );
+
+    if (isUndefined(relationMetadataItem)) {
+      return '';
+    }
+
+    return `${field.name}
+{
+  edges {
+    node ${mapObjectMetadataToGraphQLQuery({
+      objectMetadataItems,
+      objectMetadataItem: relationMetadataItem,
+      depth: depth - 1,
+      queryFields,
+      computeReferences,
+      isRootLevel: false,
+    })}
+  }
+}`;
+  } else if (fieldType === 'LINK') {
+    return `${field.name}
+{
+  label
+  url
+}`;
+  } else if (fieldType === 'CURRENCY') {
+    return `${field.name}
+{
+  amountMicros
+  currencyCode
+}
+    `;
+  } else if (fieldType === 'FULL_NAME') {
+    return `${field.name}
+{
+  firstName
+  lastName
+}`;
+  } else if (fieldType === 'ADDRESS') {
+    return `${field.name}
+{
+  addressStreet1
+  addressStreet2
+  addressCity
+  addressState
+  addressCountry
+  addressPostcode
+  addressLat
+  addressLng
+}`;
+  }
+
+  return '';
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/mapObjectMetadataToGraphQLQuery.ts b/packages/twenty-front/src/modules/object-metadata/utils/mapObjectMetadataToGraphQLQuery.ts
new file mode 100644
index 000000000000..ebd05e796528
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/mapObjectMetadataToGraphQLQuery.ts
@@ -0,0 +1,54 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { mapFieldMetadataToGraphQLQuery } from '@/object-metadata/utils/mapFieldMetadataToGraphQLQuery';
+import { shouldFieldBeQueried } from '@/object-metadata/utils/shouldFieldBeQueried';
+
+export const mapObjectMetadataToGraphQLQuery = ({
+  objectMetadataItems,
+  objectMetadataItem,
+  depth = 1,
+  queryFields,
+  computeReferences = false,
+  isRootLevel = true,
+}: {
+  objectMetadataItems: ObjectMetadataItem[];
+  objectMetadataItem: Pick<ObjectMetadataItem, 'nameSingular' | 'fields'>;
+  depth?: number;
+  queryFields?: Record<string, any>;
+  computeReferences?: boolean;
+  isRootLevel?: boolean;
+}): any => {
+  const fieldsThatShouldBeQueried =
+    objectMetadataItem?.fields
+      .filter((field) => field.isActive)
+      .filter((field) =>
+        shouldFieldBeQueried({
+          field,
+          depth,
+          queryFields,
+        }),
+      ) ?? [];
+
+  if (!isRootLevel && computeReferences) {
+    return `{
+      __ref
+    }`;
+  }
+
+  return `{
+__typename
+${fieldsThatShouldBeQueried
+  .map((field) =>
+    mapFieldMetadataToGraphQLQuery({
+      objectMetadataItems,
+      field,
+      depth,
+      queryFields:
+        typeof queryFields?.[field.name] === 'boolean'
+          ? undefined
+          : queryFields?.[field.name],
+      computeReferences,
+    }),
+  )
+  .join('\n')}
+}`;
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/parseFieldRelationType.ts b/packages/twenty-front/src/modules/object-metadata/utils/parseFieldRelationType.ts
index de9d705e4743..65a90c8fa72d 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/parseFieldRelationType.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/parseFieldRelationType.ts
@@ -4,7 +4,7 @@ import {
   FieldMetadataType,
   RelationMetadataType,
 } from '~/generated-metadata/graphql';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const parseFieldRelationType = (
   field: FieldMetadataItem | undefined,
@@ -30,14 +30,14 @@ export const parseFieldRelationType = (
   };
 
   if (
-    isNonNullable(field.fromRelationMetadata) &&
+    isDefined(field.fromRelationMetadata) &&
     field.fromRelationMetadata.relationType in config
   ) {
     return config[field.fromRelationMetadata.relationType].from;
   }
 
   if (
-    isNonNullable(field.toRelationMetadata) &&
+    isDefined(field.toRelationMetadata) &&
     field.toRelationMetadata.relationType in config
   ) {
     return config[field.toRelationMetadata.relationType].to;
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/parseFieldType.ts b/packages/twenty-front/src/modules/object-metadata/utils/parseFieldType.ts
deleted file mode 100644
index 84ac0e1a99ad..000000000000
--- a/packages/twenty-front/src/modules/object-metadata/utils/parseFieldType.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { FieldType } from '@/object-record/record-field/types/FieldType';
-import { FieldMetadataType } from '~/generated-metadata/graphql';
-
-export const parseFieldType = (fieldType: FieldMetadataType): FieldType => {
-  if (fieldType === FieldMetadataType.Link) {
-    return 'LINK';
-  }
-
-  if (fieldType === FieldMetadataType.Currency) {
-    return 'CURRENCY';
-  }
-
-  return fieldType as FieldType;
-};
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts b/packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts
new file mode 100644
index 000000000000..f663359ad8a8
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts
@@ -0,0 +1,36 @@
+import { isUndefined } from '@sniptt/guards';
+
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { isDefined } from '~/utils/isDefined';
+
+import { FieldMetadataItem } from '../types/FieldMetadataItem';
+
+export const shouldFieldBeQueried = ({
+  field,
+  depth,
+  queryFields,
+}: {
+  field: Pick<FieldMetadataItem, 'name' | 'type'>;
+  depth?: number;
+  objectRecord?: ObjectRecord;
+  queryFields?: Record<string, any>;
+}): any => {
+  if (!isUndefined(depth) && depth < 0) {
+    return false;
+  }
+
+  if (
+    !isUndefined(depth) &&
+    depth < 1 &&
+    field.type === FieldMetadataType.Relation
+  ) {
+    return false;
+  }
+
+  if (isDefined(queryFields) && !queryFields[field.name]) {
+    return false;
+  }
+
+  return true;
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/validation-schemas/__tests__/objectMetadataItemSchema.test.ts b/packages/twenty-front/src/modules/object-metadata/validation-schemas/__tests__/objectMetadataItemSchema.test.ts
new file mode 100644
index 000000000000..48db78980598
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/validation-schemas/__tests__/objectMetadataItemSchema.test.ts
@@ -0,0 +1,48 @@
+import { SafeParseSuccess } from 'zod';
+
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { mockedCompanyObjectMetadataItem } from '@/object-record/record-field/__mocks__/fieldDefinitions';
+
+import { objectMetadataItemSchema } from '../objectMetadataItemSchema';
+
+describe('objectMetadataItemSchema', () => {
+  it('validates a valid object metadata item', () => {
+    // Given
+    const validObjectMetadataItem = mockedCompanyObjectMetadataItem;
+
+    // When
+    const result = objectMetadataItemSchema.safeParse(validObjectMetadataItem);
+
+    // Then
+    expect(result.success).toBe(true);
+    expect((result as SafeParseSuccess<ObjectMetadataItem>).data).toEqual(
+      validObjectMetadataItem,
+    );
+  });
+
+  it('fails for an invalid object metadata item', () => {
+    // Given
+    const invalidObjectMetadataItem = {
+      createdAt: 'invalid date',
+      dataSourceId: 'invalid uuid',
+      fields: 'not an array',
+      icon: 'invalid icon',
+      isActive: 'not a boolean',
+      isCustom: 'not a boolean',
+      isSystem: 'not a boolean',
+      labelPlural: 123,
+      labelSingular: 123,
+      namePlural: 'notCamelCase',
+      nameSingular: 'notCamelCase',
+      updatedAt: 'invalid date',
+    };
+
+    // When
+    const result = objectMetadataItemSchema.safeParse(
+      invalidObjectMetadataItem,
+    );
+
+    // Then
+    expect(result.success).toBe(false);
+  });
+});
diff --git a/packages/twenty-front/src/modules/object-metadata/validation-schemas/fieldMetadataItemSchema.ts b/packages/twenty-front/src/modules/object-metadata/validation-schemas/fieldMetadataItemSchema.ts
new file mode 100644
index 000000000000..0943a2e83240
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/validation-schemas/fieldMetadataItemSchema.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod';
+
+import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+
+// TODO: implement fieldMetadataItemSchema
+export const fieldMetadataItemSchema: z.ZodType<FieldMetadataItem> = z.any();
diff --git a/packages/twenty-front/src/modules/object-metadata/validation-schemas/objectMetadataItemSchema.ts b/packages/twenty-front/src/modules/object-metadata/validation-schemas/objectMetadataItemSchema.ts
new file mode 100644
index 000000000000..bbd31e87cd53
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/validation-schemas/objectMetadataItemSchema.ts
@@ -0,0 +1,26 @@
+import { z } from 'zod';
+
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { fieldMetadataItemSchema } from '@/object-metadata/validation-schemas/fieldMetadataItemSchema';
+import { camelCaseStringSchema } from '~/utils/validation-schemas/camelCaseStringSchema';
+
+export const objectMetadataItemSchema = z.object({
+  __typename: z.literal('object').optional(),
+  createdAt: z.string().datetime(),
+  dataSourceId: z.string().uuid(),
+  description: z.string().trim().nullable().optional(),
+  fields: z.array(fieldMetadataItemSchema),
+  icon: z.string().startsWith('Icon').trim(),
+  id: z.string().uuid(),
+  imageIdentifierFieldMetadataId: z.string().uuid().nullable(),
+  isActive: z.boolean(),
+  isCustom: z.boolean(),
+  isRemote: z.boolean(),
+  isSystem: z.boolean(),
+  labelIdentifierFieldMetadataId: z.string().uuid().nullable(),
+  labelPlural: z.string().trim().min(1),
+  labelSingular: z.string().trim().min(1),
+  namePlural: camelCaseStringSchema,
+  nameSingular: camelCaseStringSchema,
+  updatedAt: z.string().datetime(),
+}) satisfies z.ZodType<ObjectMetadataItem>;
diff --git a/packages/twenty-front/src/modules/object-record/cache/hooks/useAddRecordInCache.ts b/packages/twenty-front/src/modules/object-record/cache/hooks/useAddRecordInCache.ts
deleted file mode 100644
index afc2af6e5b49..000000000000
--- a/packages/twenty-front/src/modules/object-record/cache/hooks/useAddRecordInCache.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { useApolloClient } from '@apollo/client';
-import gql from 'graphql-tag';
-import { useRecoilCallback } from 'recoil';
-
-import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { MAX_QUERY_DEPTH_FOR_CACHE_INJECTION } from '@/object-record/cache/constants/MaxQueryDepthForCacheInjection';
-import { useInjectIntoFindOneRecordQueryCache } from '@/object-record/cache/hooks/useInjectIntoFindOneRecordQueryCache';
-import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const useAddRecordInCache = ({
-  objectMetadataItem,
-}: {
-  objectMetadataItem: ObjectMetadataItem;
-}) => {
-  const mapFieldMetadataToGraphQLQuery = useMapFieldMetadataToGraphQLQuery();
-  const apolloClient = useApolloClient();
-
-  const { injectIntoFindOneRecordQueryCache } =
-    useInjectIntoFindOneRecordQueryCache({
-      objectMetadataItem,
-    });
-
-  return useRecoilCallback(
-    ({ set }) =>
-      (record: ObjectRecord) => {
-        const fragment = gql`
-          fragment Create${capitalize(
-            objectMetadataItem.nameSingular,
-          )}InCache on ${capitalize(objectMetadataItem.nameSingular)} {
-            __typename
-            id
-            ${objectMetadataItem.fields
-              .map((field) =>
-                mapFieldMetadataToGraphQLQuery({
-                  field,
-                  maxDepthForRelations: MAX_QUERY_DEPTH_FOR_CACHE_INJECTION,
-                }),
-              )
-              .join('\n')}
-          }
-        `;
-
-        const cachedObjectRecord = {
-          __typename: `${capitalize(objectMetadataItem.nameSingular)}`,
-          ...record,
-        };
-
-        apolloClient.writeFragment({
-          id: `${capitalize(objectMetadataItem.nameSingular)}:${record.id}`,
-          fragment,
-          data: cachedObjectRecord,
-        });
-
-        // TODO: should we keep this here ? Or should the caller of createOneRecordInCache/createManyRecordsInCache be responsible for this ?
-        injectIntoFindOneRecordQueryCache(cachedObjectRecord);
-
-        // TODO: remove this once we get rid of entityFieldsFamilyState
-        set(recordStoreFamilyState(record.id), record);
-      },
-    [
-      objectMetadataItem,
-      apolloClient,
-      mapFieldMetadataToGraphQLQuery,
-      injectIntoFindOneRecordQueryCache,
-    ],
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/cache/hooks/useAppendToFindManyRecordsQueryInCache.ts b/packages/twenty-front/src/modules/object-record/cache/hooks/useAppendToFindManyRecordsQueryInCache.ts
deleted file mode 100644
index a7fe89f4da37..000000000000
--- a/packages/twenty-front/src/modules/object-record/cache/hooks/useAppendToFindManyRecordsQueryInCache.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { useReadFindManyRecordsQueryInCache } from '@/object-record/cache/hooks/useReadFindManyRecordsQueryInCache';
-import { useUpsertFindManyRecordsQueryInCache } from '@/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { ObjectRecordQueryVariables } from '@/object-record/types/ObjectRecordQueryVariables';
-
-export const useAppendToFindManyRecordsQueryInCache = ({
-  objectMetadataItem,
-}: {
-  objectMetadataItem: ObjectMetadataItem;
-}) => {
-  const { readFindManyRecordsQueryInCache } =
-    useReadFindManyRecordsQueryInCache({
-      objectMetadataItem,
-    });
-
-  const {
-    upsertFindManyRecordsQueryInCache: overwriteFindManyRecordsQueryInCache,
-  } = useUpsertFindManyRecordsQueryInCache({
-    objectMetadataItem,
-  });
-
-  const appendToFindManyRecordsQueryInCache = <
-    T extends ObjectRecord = ObjectRecord,
-  >({
-    queryVariables,
-    objectRecordsToAppend,
-  }: {
-    queryVariables: ObjectRecordQueryVariables;
-    objectRecordsToAppend: T[];
-  }) => {
-    const existingObjectRecords = readFindManyRecordsQueryInCache({
-      queryVariables,
-    });
-
-    const newObjectRecordList = [
-      ...existingObjectRecords,
-      ...objectRecordsToAppend,
-    ];
-
-    overwriteFindManyRecordsQueryInCache({
-      objectRecordsToOverwrite: newObjectRecordList,
-      queryVariables,
-    });
-  };
-
-  return {
-    appendToFindManyRecordsQueryInCache,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/cache/hooks/useCreateManyRecordsInCache.ts b/packages/twenty-front/src/modules/object-record/cache/hooks/useCreateManyRecordsInCache.ts
new file mode 100644
index 000000000000..31fb896556d8
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/cache/hooks/useCreateManyRecordsInCache.ts
@@ -0,0 +1,42 @@
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
+import { useCreateOneRecordInCache } from '@/object-record/cache/hooks/useCreateOneRecordInCache';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { prefillRecord } from '@/object-record/utils/prefillRecord';
+import { isDefined } from '~/utils/isDefined';
+
+export const useCreateManyRecordsInCache = <T extends ObjectRecord>({
+  objectNameSingular,
+}: ObjectMetadataItemIdentifier) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const createOneRecordInCache = useCreateOneRecordInCache({
+    objectMetadataItem,
+  });
+
+  const createManyRecordsInCache = (recordsToCreate: Partial<T>[]) => {
+    const recordsWithId = recordsToCreate
+      .map((record) => {
+        return prefillRecord<T>({
+          input: record,
+          objectMetadataItem,
+        });
+      })
+      .filter(isDefined);
+
+    const createdRecordsInCache = [] as T[];
+
+    for (const record of recordsWithId) {
+      if (isDefined(record)) {
+        createOneRecordInCache(record);
+        createdRecordsInCache.push(record);
+      }
+    }
+
+    return createdRecordsInCache;
+  };
+
+  return { createManyRecordsInCache };
+};
diff --git a/packages/twenty-front/src/modules/object-record/cache/hooks/useCreateOneRecordInCache.ts b/packages/twenty-front/src/modules/object-record/cache/hooks/useCreateOneRecordInCache.ts
new file mode 100644
index 000000000000..4ee8ad510f88
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/cache/hooks/useCreateOneRecordInCache.ts
@@ -0,0 +1,62 @@
+import { useApolloClient } from '@apollo/client';
+import gql from 'graphql-tag';
+import { useRecoilValue } from 'recoil';
+
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
+import { getRecordNodeFromRecord } from '@/object-record/cache/utils/getRecordNodeFromRecord';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { prefillRecord } from '@/object-record/utils/prefillRecord';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const useCreateOneRecordInCache = <T extends ObjectRecord>({
+  objectMetadataItem,
+}: {
+  objectMetadataItem: ObjectMetadataItem;
+}) => {
+  const getRecordFromCache = useGetRecordFromCache({
+    objectNameSingular: objectMetadataItem.nameSingular,
+  });
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
+  const apolloClient = useApolloClient();
+
+  return (record: ObjectRecord) => {
+    const fragment = gql`
+          fragment Create${capitalize(
+            objectMetadataItem.nameSingular,
+          )}InCache on ${capitalize(
+            objectMetadataItem.nameSingular,
+          )} ${mapObjectMetadataToGraphQLQuery({
+            objectMetadataItems,
+            objectMetadataItem,
+            computeReferences: true,
+          })}
+        `;
+
+    const prefilledRecord = prefillRecord({
+      objectMetadataItem,
+      input: record,
+      depth: 1,
+    });
+
+    const recordToCreateWithNestedConnections = getRecordNodeFromRecord({
+      record: prefilledRecord,
+      objectMetadataItem,
+      objectMetadataItems,
+    });
+
+    const cachedObjectRecord = {
+      __typename: `${capitalize(objectMetadataItem.nameSingular)}`,
+      ...recordToCreateWithNestedConnections,
+    };
+
+    apolloClient.writeFragment({
+      id: `${capitalize(objectMetadataItem.nameSingular)}:${record.id}`,
+      fragment,
+      data: cachedObjectRecord,
+    });
+    return getRecordFromCache(record.id) as T;
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/cache/hooks/useDeleteRecordFromCache.ts b/packages/twenty-front/src/modules/object-record/cache/hooks/useDeleteRecordFromCache.ts
new file mode 100644
index 000000000000..693236975e51
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/cache/hooks/useDeleteRecordFromCache.ts
@@ -0,0 +1,29 @@
+import { useApolloClient } from '@apollo/client';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
+import { deleteRecordFromCache } from '@/object-record/cache/utils/deleteRecordFromCache';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+
+export const useDeleteRecordFromCache = ({
+  objectNameSingular,
+}: {
+  objectNameSingular: string;
+}) => {
+  const apolloClient = useApolloClient();
+
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { objectMetadataItems } = useObjectMetadataItems();
+
+  return (recordToDelete: ObjectRecord) => {
+    deleteRecordFromCache({
+      objectMetadataItem,
+      objectMetadataItems,
+      recordToDelete,
+      cache: apolloClient.cache,
+    });
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/cache/hooks/useGenerateObjectRecordOptimisticResponse.ts b/packages/twenty-front/src/modules/object-record/cache/hooks/useGenerateObjectRecordOptimisticResponse.ts
deleted file mode 100644
index 348c0cc54c5c..000000000000
--- a/packages/twenty-front/src/modules/object-record/cache/hooks/useGenerateObjectRecordOptimisticResponse.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { v4 } from 'uuid';
-import { z } from 'zod';
-
-import { useGetRelationMetadata } from '@/object-metadata/hooks/useGetRelationMetadata';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { generateEmptyFieldValue } from '@/object-record/utils/generateEmptyFieldValue';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const useGenerateObjectRecordOptimisticResponse = ({
-  objectMetadataItem,
-}: {
-  objectMetadataItem: ObjectMetadataItem;
-}) => {
-  const getRelationMetadata = useGetRelationMetadata();
-
-  const generateObjectRecordOptimisticResponse = <
-    GeneratedObjectRecord extends ObjectRecord,
-  >(
-    input: Record<string, unknown>,
-  ) => {
-    const recordSchema = z.object(
-      Object.fromEntries(
-        objectMetadataItem.fields.map((fieldMetadataItem) => [
-          fieldMetadataItem.name,
-          z.unknown().default(generateEmptyFieldValue(fieldMetadataItem)),
-        ]),
-      ),
-    );
-
-    const inputWithRelationFields = objectMetadataItem.fields.reduce(
-      (result, fieldMetadataItem) => {
-        const relationIdFieldName = `${fieldMetadataItem.name}Id`;
-
-        if (!(relationIdFieldName in input)) return result;
-
-        const relationMetadata = getRelationMetadata({ fieldMetadataItem });
-
-        if (!relationMetadata) return result;
-
-        const relationRecordTypeName = capitalize(
-          relationMetadata.relationObjectMetadataItem.nameSingular,
-        );
-        const relationRecordId = result[relationIdFieldName] as string | null;
-
-        const relationRecord = input[fieldMetadataItem.name] as
-          | ObjectRecord
-          | undefined;
-
-        return {
-          ...result,
-          [fieldMetadataItem.name]: relationRecordId
-            ? {
-                __typename: relationRecordTypeName,
-                id: relationRecordId,
-                // TODO: there are too many bugs if we don't include the entire relation record
-                //   See if we can find a way to work only with the id and typename
-                ...relationRecord,
-              }
-            : null,
-        };
-      },
-      input,
-    );
-
-    return {
-      __typename: capitalize(objectMetadataItem.nameSingular),
-      ...recordSchema.parse({
-        id: v4(),
-        createdAt: new Date().toISOString(),
-        ...inputWithRelationFields,
-      }),
-    } as GeneratedObjectRecord & { __typename: string };
-  };
-
-  return {
-    generateObjectRecordOptimisticResponse,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/cache/hooks/useGetRecordFromCache.ts b/packages/twenty-front/src/modules/object-record/cache/hooks/useGetRecordFromCache.ts
index 7253e25f468f..edf234883af8 100644
--- a/packages/twenty-front/src/modules/object-record/cache/hooks/useGetRecordFromCache.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/hooks/useGetRecordFromCache.ts
@@ -1,45 +1,37 @@
-import { gql, useApolloClient } from '@apollo/client';
+import { useCallback } from 'react';
+import { useApolloClient } from '@apollo/client';
+import { useRecoilValue } from 'recoil';
 
-import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { getRecordFromCache } from '@/object-record/cache/utils/getRecordFromCache';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { capitalize } from '~/utils/string/capitalize';
 
 export const useGetRecordFromCache = ({
-  objectMetadataItem,
+  objectNameSingular,
 }: {
-  objectMetadataItem: ObjectMetadataItem;
+  objectNameSingular: string;
 }) => {
-  const mapFieldMetadataToGraphQLQuery = useMapFieldMetadataToGraphQLQuery();
-  const apolloClient = useApolloClient();
-
-  return <CachedObjectRecord extends ObjectRecord = ObjectRecord>(
-    recordId: string,
-    cache = apolloClient.cache,
-  ) => {
-    if (!objectMetadataItem) {
-      return null;
-    }
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
 
-    const capitalizedObjectName = capitalize(objectMetadataItem.nameSingular);
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
 
-    const cacheReadFragment = gql`
-      fragment ${capitalizedObjectName}Fragment on ${capitalizedObjectName} {
-        id
-        ${objectMetadataItem.fields
-          .map((field) => mapFieldMetadataToGraphQLQuery({ field }))
-          .join('\n')}
-      }
-    `;
-
-    const cachedRecordId = cache.identify({
-      __typename: capitalize(objectMetadataItem.nameSingular),
-      id: recordId,
-    });
+  const apolloClient = useApolloClient();
 
-    return cache.readFragment<CachedObjectRecord & { __typename: string }>({
-      id: cachedRecordId,
-      fragment: cacheReadFragment,
-    });
-  };
+  return useCallback(
+    <CachedObjectRecord extends ObjectRecord = ObjectRecord>(
+      recordId: string,
+      cache = apolloClient.cache,
+    ) => {
+      return getRecordFromCache<CachedObjectRecord>({
+        cache,
+        recordId,
+        objectMetadataItems,
+        objectMetadataItem,
+      });
+    },
+    [objectMetadataItem, objectMetadataItems, apolloClient],
+  );
 };
diff --git a/packages/twenty-front/src/modules/object-record/cache/hooks/useInjectIntoFindOneRecordQueryCache.ts b/packages/twenty-front/src/modules/object-record/cache/hooks/useInjectIntoFindOneRecordQueryCache.ts
deleted file mode 100644
index 9e153f991394..000000000000
--- a/packages/twenty-front/src/modules/object-record/cache/hooks/useInjectIntoFindOneRecordQueryCache.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { useApolloClient } from '@apollo/client';
-
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { useGenerateFindOneRecordQuery } from '@/object-record/hooks/useGenerateFindOneRecordQuery';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const useInjectIntoFindOneRecordQueryCache = ({
-  objectMetadataItem,
-}: {
-  objectMetadataItem: ObjectMetadataItem;
-}) => {
-  const apolloClient = useApolloClient();
-
-  const generateFindOneRecordQuery = useGenerateFindOneRecordQuery();
-
-  const injectIntoFindOneRecordQueryCache = <
-    T extends ObjectRecord = ObjectRecord,
-  >(
-    record: T,
-  ) => {
-    const findOneRecordQueryForCacheInjection = generateFindOneRecordQuery({
-      objectMetadataItem,
-      depth: 1,
-    });
-
-    apolloClient.writeQuery({
-      query: findOneRecordQueryForCacheInjection,
-      variables: {
-        objectRecordId: record.id,
-      },
-      data: {
-        [objectMetadataItem.nameSingular]: {
-          __typename: `${capitalize(objectMetadataItem.nameSingular)}`,
-          ...record,
-        },
-      },
-    });
-  };
-
-  return {
-    injectIntoFindOneRecordQueryCache,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/cache/hooks/useModifyRecordFromCache.ts b/packages/twenty-front/src/modules/object-record/cache/hooks/useModifyRecordFromCache.ts
deleted file mode 100644
index 3d87f6d4ea58..000000000000
--- a/packages/twenty-front/src/modules/object-record/cache/hooks/useModifyRecordFromCache.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { useApolloClient } from '@apollo/client';
-import { Modifiers } from '@apollo/client/cache';
-
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const useModifyRecordFromCache = ({
-  objectMetadataItem,
-}: {
-  objectMetadataItem: ObjectMetadataItem;
-}) => {
-  const { cache } = useApolloClient();
-
-  return <CachedObjectRecord extends ObjectRecord = ObjectRecord>(
-    recordId: string,
-    fieldModifiers: Modifiers<CachedObjectRecord>,
-  ) => {
-    if (!objectMetadataItem) return;
-
-    const cachedRecordId = cache.identify({
-      __typename: capitalize(objectMetadataItem.nameSingular),
-      id: recordId,
-    });
-
-    cache.modify<CachedObjectRecord>({
-      id: cachedRecordId,
-      fields: fieldModifiers,
-    });
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/cache/hooks/useReadFindManyRecordsQueryInCache.ts b/packages/twenty-front/src/modules/object-record/cache/hooks/useReadFindManyRecordsQueryInCache.ts
index 56e7e09cdafd..405815034d4d 100644
--- a/packages/twenty-front/src/modules/object-record/cache/hooks/useReadFindManyRecordsQueryInCache.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/hooks/useReadFindManyRecordsQueryInCache.ts
@@ -1,12 +1,13 @@
 import { useApolloClient } from '@apollo/client';
 
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { getRecordsFromRecordConnection } from '@/object-record/cache/utils/getRecordsFromRecordConnection';
-import { useGenerateFindManyRecordsQuery } from '@/object-record/hooks/useGenerateFindManyRecordsQuery';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { ObjectRecordQueryResult } from '@/object-record/types/ObjectRecordQueryResult';
 import { ObjectRecordQueryVariables } from '@/object-record/types/ObjectRecordQueryVariables';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { generateFindManyRecordsQuery } from '@/object-record/utils/generateFindManyRecordsQuery';
+import { isDefined } from '~/utils/isDefined';
 
 export const useReadFindManyRecordsQueryInCache = ({
   objectMetadataItem,
@@ -15,17 +16,24 @@ export const useReadFindManyRecordsQueryInCache = ({
 }) => {
   const apolloClient = useApolloClient();
 
-  const generateFindManyRecordsQuery = useGenerateFindManyRecordsQuery();
+  const { objectMetadataItems } = useObjectMetadataItems();
 
   const readFindManyRecordsQueryInCache = <
     T extends ObjectRecord = ObjectRecord,
   >({
     queryVariables,
+    queryFields,
+    depth,
   }: {
     queryVariables: ObjectRecordQueryVariables;
+    queryFields?: Record<string, any>;
+    depth?: number;
   }) => {
     const findManyRecordsQueryForCacheRead = generateFindManyRecordsQuery({
       objectMetadataItem,
+      objectMetadataItems,
+      queryFields,
+      depth,
     });
 
     const existingRecordsQueryResult = apolloClient.readQuery<
@@ -38,7 +46,7 @@ export const useReadFindManyRecordsQueryInCache = ({
     const existingRecordConnection =
       existingRecordsQueryResult?.[objectMetadataItem.namePlural];
 
-    const existingObjectRecords = isNonNullable(existingRecordConnection)
+    const existingObjectRecords = isDefined(existingRecordConnection)
       ? getRecordsFromRecordConnection({
           recordConnection: existingRecordConnection,
         })
diff --git a/packages/twenty-front/src/modules/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache.ts b/packages/twenty-front/src/modules/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache.ts
index 210ecee55c61..01be96226139 100644
--- a/packages/twenty-front/src/modules/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache.ts
@@ -1,11 +1,13 @@
 import { useApolloClient } from '@apollo/client';
+import { useRecoilValue } from 'recoil';
 
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { MAX_QUERY_DEPTH_FOR_CACHE_INJECTION } from '@/object-record/cache/constants/MaxQueryDepthForCacheInjection';
 import { getRecordConnectionFromRecords } from '@/object-record/cache/utils/getRecordConnectionFromRecords';
-import { useGenerateFindManyRecordsQuery } from '@/object-record/hooks/useGenerateFindManyRecordsQuery';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { ObjectRecordQueryVariables } from '@/object-record/types/ObjectRecordQueryVariables';
+import { generateFindManyRecordsQuery } from '@/object-record/utils/generateFindManyRecordsQuery';
 
 export const useUpsertFindManyRecordsQueryInCache = ({
   objectMetadataItem,
@@ -14,25 +16,37 @@ export const useUpsertFindManyRecordsQueryInCache = ({
 }) => {
   const apolloClient = useApolloClient();
 
-  const generateFindManyRecordsQuery = useGenerateFindManyRecordsQuery();
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
 
   const upsertFindManyRecordsQueryInCache = <
     T extends ObjectRecord = ObjectRecord,
   >({
     queryVariables,
+    depth = MAX_QUERY_DEPTH_FOR_CACHE_INJECTION,
     objectRecordsToOverwrite,
+    queryFields,
+    computeReferences = false,
   }: {
     queryVariables: ObjectRecordQueryVariables;
+    depth?: number;
     objectRecordsToOverwrite: T[];
+    queryFields?: Record<string, any>;
+    computeReferences?: boolean;
   }) => {
     const findManyRecordsQueryForCacheOverwrite = generateFindManyRecordsQuery({
       objectMetadataItem,
-      depth: MAX_QUERY_DEPTH_FOR_CACHE_INJECTION, // TODO: fix this
+      objectMetadataItems,
+      depth,
+      queryFields,
+      computeReferences,
     });
 
     const newObjectRecordConnection = getRecordConnectionFromRecords({
-      objectNameSingular: objectMetadataItem.nameSingular,
+      objectMetadataItems: objectMetadataItems,
+      objectMetadataItem: objectMetadataItem,
       records: objectRecordsToOverwrite,
+      queryFields,
+      computeReferences,
     });
 
     apolloClient.writeQuery({
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/deleteRecordFromCache.ts b/packages/twenty-front/src/modules/object-record/cache/utils/deleteRecordFromCache.ts
new file mode 100644
index 000000000000..ec9ec8b3a4a3
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/deleteRecordFromCache.ts
@@ -0,0 +1,30 @@
+import { ApolloCache } from '@apollo/client';
+
+import { triggerDeleteRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerDeleteRecordsOptimisticEffect';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { getObjectTypename } from '@/object-record/cache/utils/getObjectTypename';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+
+export const deleteRecordFromCache = ({
+  objectMetadataItem,
+  objectMetadataItems,
+  recordToDelete,
+  cache,
+}: {
+  objectMetadataItem: ObjectMetadataItem;
+  objectMetadataItems: ObjectMetadataItem[];
+  recordToDelete: ObjectRecord;
+  cache: ApolloCache<object>;
+}) => {
+  triggerDeleteRecordsOptimisticEffect({
+    cache,
+    objectMetadataItem,
+    objectMetadataItems,
+    recordsToDelete: [
+      {
+        ...recordToDelete,
+        __typename: getObjectTypename(objectMetadataItem.nameSingular),
+      },
+    ],
+  });
+};
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getCacheReferenceFromRecord.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getCacheReferenceFromRecord.ts
deleted file mode 100644
index dd6e94295a9f..000000000000
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getCacheReferenceFromRecord.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { ApolloClient, makeReference, Reference } from '@apollo/client';
-
-import { getCachedRecordFromRecord } from '@/object-record/cache/utils/getCachedRecordFromRecord';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-
-export const getCacheReferenceFromRecord = <T extends ObjectRecord>({
-  apolloClient,
-  objectNameSingular,
-  record,
-}: {
-  apolloClient: ApolloClient<object>;
-  objectNameSingular: string;
-  record: T;
-}): Reference => {
-  const cachedRecord = getCachedRecordFromRecord({
-    objectNameSingular,
-    record,
-  });
-
-  const id = apolloClient.cache.identify(cachedRecord);
-
-  if (!id) {
-    throw new Error(
-      `Could not identify record "${objectNameSingular}", id : "${record.id}"`,
-    );
-  }
-
-  const recordReference = makeReference(id);
-
-  return recordReference;
-};
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getCachedRecordEdgesFromRecords.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getCachedRecordEdgesFromRecords.ts
deleted file mode 100644
index 11f1cec67583..000000000000
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getCachedRecordEdgesFromRecords.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { ApolloClient, makeReference } from '@apollo/client';
-
-import { CachedObjectRecordEdge } from '@/apollo/types/CachedObjectRecordEdge';
-import { getCachedRecordFromRecord } from '@/object-record/cache/utils/getCachedRecordFromRecord';
-import { getEdgeTypename } from '@/object-record/cache/utils/getEdgeTypename';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-
-export const getCachedRecordEdgesFromRecords = <T extends ObjectRecord>({
-  apolloClient,
-  objectNameSingular,
-  records,
-}: {
-  apolloClient: ApolloClient<object>;
-  objectNameSingular: string;
-  records: T[];
-}): CachedObjectRecordEdge[] => {
-  const cachedRecordEdges = records.map((record) => {
-    const cachedRecord = getCachedRecordFromRecord({
-      objectNameSingular,
-      record,
-    });
-
-    const id = apolloClient.cache.identify(cachedRecord);
-
-    if (!id) {
-      throw new Error(
-        `Could not identify record "${objectNameSingular}", id : "${record.id}"`,
-      );
-    }
-
-    const reference = makeReference(id);
-
-    const cachedObjectRecordEdge: CachedObjectRecordEdge = {
-      cursor: '',
-      node: reference,
-      __typename: getEdgeTypename({ objectNameSingular }),
-    };
-
-    return cachedObjectRecordEdge;
-  });
-
-  return cachedRecordEdges;
-};
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getCachedRecordFromRecord.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getCachedRecordFromRecord.ts
deleted file mode 100644
index 31a72e8de475..000000000000
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getCachedRecordFromRecord.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { CachedObjectRecord } from '@/apollo/types/CachedObjectRecord';
-import { getNodeTypename } from '@/object-record/cache/utils/getNodeTypename';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-
-export const getCachedRecordFromRecord = <T extends ObjectRecord>({
-  objectNameSingular,
-  record,
-}: {
-  objectNameSingular: string;
-  record: T;
-}): CachedObjectRecord<T> => {
-  return {
-    __typename: getNodeTypename({ objectNameSingular }),
-    ...record,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getConnectionTypename.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getConnectionTypename.ts
index 6c2139148fc9..7b827c2ba1da 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getConnectionTypename.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getConnectionTypename.ts
@@ -1,9 +1,6 @@
+import { getObjectTypename } from '@/object-record/cache/utils/getObjectTypename';
 import { capitalize } from '~/utils/string/capitalize';
 
-export const getConnectionTypename = ({
-  objectNameSingular,
-}: {
-  objectNameSingular: string;
-}) => {
-  return `${capitalize(objectNameSingular)}Connection`;
+export const getConnectionTypename = (objectNameSingular: string) => {
+  return `${capitalize(getObjectTypename(objectNameSingular))}Connection`;
 };
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getEdgeTypename.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getEdgeTypename.ts
index da024846a995..f2cd62ff4c16 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getEdgeTypename.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getEdgeTypename.ts
@@ -1,9 +1,6 @@
+import { getObjectTypename } from '@/object-record/cache/utils/getObjectTypename';
 import { capitalize } from '~/utils/string/capitalize';
 
-export const getEdgeTypename = ({
-  objectNameSingular,
-}: {
-  objectNameSingular: string;
-}) => {
-  return `${capitalize(objectNameSingular)}Edge`;
+export const getEdgeTypename = (objectNameSingular: string) => {
+  return `${capitalize(getObjectTypename(objectNameSingular))}Edge`;
 };
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getNodeTypename.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getNodeTypename.ts
index c058a5349763..16d3122c34b6 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getNodeTypename.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getNodeTypename.ts
@@ -1,9 +1,6 @@
+import { getObjectTypename } from '@/object-record/cache/utils/getObjectTypename';
 import { capitalize } from '~/utils/string/capitalize';
 
-export const getNodeTypename = ({
-  objectNameSingular,
-}: {
-  objectNameSingular: string;
-}) => {
-  return capitalize(objectNameSingular);
+export const getNodeTypename = (objectNameSingular: string) => {
+  return capitalize(getObjectTypename(objectNameSingular));
 };
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getObjectTypename.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getObjectTypename.ts
new file mode 100644
index 000000000000..7a799bf9d2ba
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getObjectTypename.ts
@@ -0,0 +1,5 @@
+import { capitalize } from '~/utils/string/capitalize';
+
+export const getObjectTypename = (objectNameSingular: string) => {
+  return capitalize(objectNameSingular);
+};
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordConnectionFromEdges.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordConnectionFromEdges.ts
deleted file mode 100644
index f43ce56e008d..000000000000
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordConnectionFromEdges.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { getConnectionTypename } from '@/object-record/cache/utils/getConnectionTypename';
-import { getEmptyPageInfo } from '@/object-record/cache/utils/getEmptyPageInfo';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
-import { ObjectRecordEdge } from '@/object-record/types/ObjectRecordEdge';
-
-export const getRecordConnectionFromEdges = <T extends ObjectRecord>({
-  objectNameSingular,
-  edges,
-}: {
-  objectNameSingular: string;
-  edges: ObjectRecordEdge<T>[];
-}) => {
-  return {
-    __typename: getConnectionTypename({ objectNameSingular }),
-    edges: edges,
-    pageInfo: getEmptyPageInfo(),
-  } as ObjectRecordConnection<T>;
-};
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordConnectionFromRecords.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordConnectionFromRecords.ts
index affe038e996e..70090d490c3a 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordConnectionFromRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordConnectionFromRecords.ts
@@ -1,3 +1,4 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { getConnectionTypename } from '@/object-record/cache/utils/getConnectionTypename';
 import { getEmptyPageInfo } from '@/object-record/cache/utils/getEmptyPageInfo';
 import { getRecordEdgeFromRecord } from '@/object-record/cache/utils/getRecordEdgeFromRecord';
@@ -5,21 +6,41 @@ import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
 
 export const getRecordConnectionFromRecords = <T extends ObjectRecord>({
-  objectNameSingular,
+  objectMetadataItems,
+  objectMetadataItem,
   records,
+  queryFields,
+  withPageInfo = true,
+  computeReferences = false,
+  isRootLevel = true,
+  depth = 1,
 }: {
-  objectNameSingular: string;
+  objectMetadataItems: ObjectMetadataItem[];
+  objectMetadataItem: Pick<
+    ObjectMetadataItem,
+    'fields' | 'namePlural' | 'nameSingular'
+  >;
   records: T[];
+  queryFields?: Record<string, any>;
+  withPageInfo?: boolean;
+  isRootLevel?: boolean;
+  computeReferences?: boolean;
+  depth?: number;
 }) => {
   return {
-    __typename: getConnectionTypename({ objectNameSingular }),
+    __typename: getConnectionTypename(objectMetadataItem.nameSingular),
     edges: records.map((record) => {
       return getRecordEdgeFromRecord({
-        objectNameSingular,
+        objectMetadataItems,
+        objectMetadataItem,
+        queryFields,
         record,
+        isRootLevel,
+        computeReferences,
+        depth,
       });
     }),
-    pageInfo: getEmptyPageInfo(),
-    totalCount: records.length,
+    ...(withPageInfo && { pageInfo: getEmptyPageInfo() }),
+    ...(withPageInfo && { totalCount: records.length }),
   } as ObjectRecordConnection<T>;
 };
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordEdgeFromRecord.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordEdgeFromRecord.ts
index 8921edae21e7..7327e2e169e3 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordEdgeFromRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordEdgeFromRecord.ts
@@ -1,20 +1,40 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { getEdgeTypename } from '@/object-record/cache/utils/getEdgeTypename';
-import { getNodeTypename } from '@/object-record/cache/utils/getNodeTypename';
+import { getRecordNodeFromRecord } from '@/object-record/cache/utils/getRecordNodeFromRecord';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { ObjectRecordEdge } from '@/object-record/types/ObjectRecordEdge';
 
 export const getRecordEdgeFromRecord = <T extends ObjectRecord>({
-  objectNameSingular,
+  objectMetadataItems,
+  objectMetadataItem,
+  queryFields,
   record,
+  computeReferences = false,
+  isRootLevel = false,
 }: {
-  objectNameSingular: string;
+  objectMetadataItems: ObjectMetadataItem[];
+  objectMetadataItem: Pick<
+    ObjectMetadataItem,
+    'fields' | 'namePlural' | 'nameSingular'
+  >;
+  queryFields?: Record<string, any>;
+  computeReferences?: boolean;
+  isRootLevel?: boolean;
+  depth?: number;
   record: T;
 }) => {
   return {
-    __typename: getEdgeTypename({ objectNameSingular }),
+    __typename: getEdgeTypename(objectMetadataItem.nameSingular),
     node: {
-      __typename: getNodeTypename({ objectNameSingular }),
-      ...record,
+      ...getRecordNodeFromRecord({
+        objectMetadataItems,
+        objectMetadataItem,
+        queryFields,
+        record,
+        computeReferences,
+        isRootLevel,
+        depth: 1,
+      }),
     },
     cursor: '',
   } as ObjectRecordEdge<T>;
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordFromCache.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordFromCache.ts
new file mode 100644
index 000000000000..5db9a5e65f0e
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordFromCache.ts
@@ -0,0 +1,55 @@
+import { ApolloCache, gql } from '@apollo/client';
+
+import { CachedObjectRecord } from '@/apollo/types/CachedObjectRecord';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { getRecordFromRecordNode } from '@/object-record/cache/utils/getRecordFromRecordNode';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const getRecordFromCache = <T extends ObjectRecord = ObjectRecord>({
+  objectMetadataItem,
+  objectMetadataItems,
+  cache,
+  recordId,
+}: {
+  cache: ApolloCache<object>;
+  recordId: string;
+  objectMetadataItems: ObjectMetadataItem[];
+  objectMetadataItem: ObjectMetadataItem;
+}) => {
+  if (isUndefinedOrNull(objectMetadataItem)) {
+    return null;
+  }
+
+  const capitalizedObjectName = capitalize(objectMetadataItem.nameSingular);
+
+  const cacheReadFragment = gql`
+      fragment ${capitalizedObjectName}Fragment on ${capitalizedObjectName} ${mapObjectMetadataToGraphQLQuery(
+        {
+          objectMetadataItems,
+          objectMetadataItem,
+        },
+      )}
+    `;
+
+  const cachedRecordId = cache.identify({
+    __typename: capitalize(objectMetadataItem.nameSingular),
+    id: recordId,
+  });
+
+  const record = cache.readFragment<T & { __typename: string }>({
+    id: cachedRecordId,
+    fragment: cacheReadFragment,
+    returnPartialData: true,
+  });
+
+  if (isUndefinedOrNull(record)) {
+    return null;
+  }
+
+  return getRecordFromRecordNode({
+    recordNode: record,
+  }) as CachedObjectRecord<T>;
+};
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordFromRecordNode.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordFromRecordNode.ts
new file mode 100644
index 000000000000..9a7d59538818
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordFromRecordNode.ts
@@ -0,0 +1,36 @@
+import { getRecordsFromRecordConnection } from '@/object-record/cache/utils/getRecordsFromRecordConnection';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+
+export const getRecordFromRecordNode = <T extends ObjectRecord>({
+  recordNode,
+}: {
+  recordNode: T;
+}): T => {
+  return {
+    ...Object.fromEntries(
+      Object.entries(recordNode).map(([fieldName, value]) => {
+        if (isUndefinedOrNull(value)) {
+          return [fieldName, value];
+        }
+
+        if (Array.isArray(value)) {
+          return [fieldName, value];
+        }
+
+        if (typeof value !== 'object') {
+          return [fieldName, value];
+        }
+
+        return isDefined(value.edges)
+          ? [
+              fieldName,
+              getRecordsFromRecordConnection({ recordConnection: value }),
+            ]
+          : [fieldName, getRecordFromRecordNode<T>({ recordNode: value })];
+      }),
+    ),
+    id: recordNode.id,
+  } as T;
+};
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts
new file mode 100644
index 000000000000..886cbd6b93a0
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts
@@ -0,0 +1,166 @@
+import { isNull, isUndefined } from '@sniptt/guards';
+
+import { CachedObjectRecord } from '@/apollo/types/CachedObjectRecord';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { getNodeTypename } from '@/object-record/cache/utils/getNodeTypename';
+import { getObjectTypename } from '@/object-record/cache/utils/getObjectTypename';
+import { getRecordConnectionFromRecords } from '@/object-record/cache/utils/getRecordConnectionFromRecords';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import {
+  FieldMetadataType,
+  RelationDefinitionType,
+} from '~/generated-metadata/graphql';
+import { isDefined } from '~/utils/isDefined';
+import { lowerAndCapitalize } from '~/utils/string/lowerAndCapitalize';
+
+export const getRecordNodeFromRecord = <T extends ObjectRecord>({
+  objectMetadataItems,
+  objectMetadataItem,
+  queryFields,
+  record,
+  computeReferences = true,
+  isRootLevel = true,
+  depth = 1,
+}: {
+  objectMetadataItems: ObjectMetadataItem[];
+  objectMetadataItem: Pick<
+    ObjectMetadataItem,
+    'fields' | 'namePlural' | 'nameSingular'
+  >;
+  queryFields?: Record<string, any>;
+  computeReferences?: boolean;
+  isRootLevel?: boolean;
+  record: T | null;
+  depth?: number;
+}) => {
+  if (isNull(record)) {
+    return null;
+  }
+
+  const nodeTypeName = getNodeTypename(objectMetadataItem.nameSingular);
+
+  if (!isRootLevel && computeReferences) {
+    return {
+      __ref: `${nodeTypeName}:${record.id}`,
+    } as unknown as CachedObjectRecord<T>; // Todo Fix typing
+  }
+
+  const nestedRecord = Object.fromEntries(
+    Object.entries(record)
+      .map(([fieldName, value]) => {
+        if (isDefined(queryFields) && !queryFields[fieldName]) {
+          return undefined;
+        }
+
+        const field = objectMetadataItem.fields.find(
+          (field) => field.name === fieldName,
+        );
+
+        if (isUndefined(field)) {
+          return undefined;
+        }
+
+        if (
+          !isUndefined(depth) &&
+          depth < 1 &&
+          field.type === FieldMetadataType.Relation
+        ) {
+          return undefined;
+        }
+
+        if (
+          field.type === FieldMetadataType.Relation &&
+          field.relationDefinition?.direction ===
+            RelationDefinitionType.OneToMany
+        ) {
+          const oneToManyObjectMetadataItem = objectMetadataItems.find(
+            (item) => item.namePlural === fieldName,
+          );
+
+          if (!oneToManyObjectMetadataItem) {
+            return undefined;
+          }
+
+          return [
+            fieldName,
+            getRecordConnectionFromRecords({
+              objectMetadataItems,
+              objectMetadataItem: oneToManyObjectMetadataItem,
+              records: value as ObjectRecord[],
+              queryFields:
+                queryFields?.[fieldName] === true ||
+                isUndefined(queryFields?.[fieldName])
+                  ? undefined
+                  : queryFields?.[fieldName],
+              withPageInfo: false,
+              isRootLevel: false,
+              computeReferences,
+              depth: depth - 1,
+            }),
+          ];
+        }
+
+        switch (field.type) {
+          case FieldMetadataType.Relation: {
+            if (
+              isUndefined(
+                field.relationDefinition?.targetObjectMetadata.nameSingular,
+              )
+            ) {
+              return undefined;
+            }
+
+            if (isNull(value)) {
+              return [fieldName, null];
+            }
+
+            if (isUndefined(value?.id)) {
+              return undefined;
+            }
+
+            const typeName = getObjectTypename(
+              field.relationDefinition?.targetObjectMetadata.nameSingular,
+            );
+
+            if (computeReferences) {
+              return [
+                fieldName,
+                {
+                  __ref: `${typeName}:${value.id}`,
+                },
+              ];
+            }
+
+            return [
+              fieldName,
+              {
+                __typename: typeName,
+                ...value,
+              },
+            ];
+          }
+          case FieldMetadataType.Link:
+          case FieldMetadataType.Address:
+          case FieldMetadataType.FullName:
+          case FieldMetadataType.Currency: {
+            return [
+              fieldName,
+              {
+                ...value,
+                __typename: lowerAndCapitalize(field.type),
+              },
+            ];
+          }
+          default: {
+            return [fieldName, value];
+          }
+        }
+      })
+      .filter(isDefined),
+  ) as T; // Todo fix typing once we have investigated apollo edges / nodes removal
+
+  return {
+    __typename: getNodeTypename(objectMetadataItem.nameSingular),
+    ...nestedRecord,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordsFromRecordConnection.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordsFromRecordConnection.ts
index f52d8e0fb7b5..c427bd0559c4 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordsFromRecordConnection.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordsFromRecordConnection.ts
@@ -1,3 +1,4 @@
+import { getRecordFromRecordNode } from '@/object-record/cache/utils/getRecordFromRecordNode';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
 
@@ -6,5 +7,7 @@ export const getRecordsFromRecordConnection = <T extends ObjectRecord>({
 }: {
   recordConnection: ObjectRecordConnection<T>;
 }): T[] => {
-  return recordConnection.edges.map((edge) => edge.node);
+  return recordConnection.edges.map((edge) =>
+    getRecordFromRecordNode<T>({ recordNode: edge.node }),
+  );
 };
diff --git a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/isObjectRecordConnection.ts b/packages/twenty-front/src/modules/object-record/cache/utils/isObjectRecordConnection.ts
similarity index 100%
rename from packages/twenty-front/src/modules/apollo/optimistic-effect/utils/isObjectRecordConnection.ts
rename to packages/twenty-front/src/modules/object-record/cache/utils/isObjectRecordConnection.ts
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/isObjectRecordConnectionWithRefs.ts b/packages/twenty-front/src/modules/object-record/cache/utils/isObjectRecordConnectionWithRefs.ts
new file mode 100644
index 000000000000..a893901960f5
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/isObjectRecordConnectionWithRefs.ts
@@ -0,0 +1,30 @@
+import { StoreValue } from '@apollo/client';
+import { z } from 'zod';
+
+import { CachedObjectRecordConnection } from '@/apollo/types/CachedObjectRecordConnection';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const isObjectRecordConnectionWithRefs = (
+  objectNameSingular: string,
+  storeValue: StoreValue,
+): storeValue is CachedObjectRecordConnection => {
+  const objectConnectionTypeName = `${capitalize(
+    objectNameSingular,
+  )}Connection`;
+  const objectEdgeTypeName = `${capitalize(objectNameSingular)}Edge`;
+  const cachedObjectConnectionSchema = z.object({
+    __typename: z.literal(objectConnectionTypeName),
+    edges: z.array(
+      z.object({
+        __typename: z.literal(objectEdgeTypeName),
+        node: z.object({
+          __ref: z.string().startsWith(`${capitalize(objectNameSingular)}:`),
+        }),
+      }),
+    ),
+  });
+  const cachedConnectionValidation =
+    cachedObjectConnectionSchema.safeParse(storeValue);
+
+  return cachedConnectionValidation.success;
+};
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/modifyRecordFromCache.ts b/packages/twenty-front/src/modules/object-record/cache/utils/modifyRecordFromCache.ts
new file mode 100644
index 000000000000..3100edffa6d8
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/modifyRecordFromCache.ts
@@ -0,0 +1,33 @@
+import { ApolloCache, Modifiers } from '@apollo/client/cache';
+
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const modifyRecordFromCache = <
+  CachedObjectRecord extends ObjectRecord = ObjectRecord,
+>({
+  objectMetadataItem,
+  cache,
+  fieldModifiers,
+  recordId,
+}: {
+  objectMetadataItem: ObjectMetadataItem;
+  cache: ApolloCache<object>;
+  fieldModifiers: Modifiers<CachedObjectRecord>;
+  recordId: string;
+}) => {
+  if (isUndefinedOrNull(objectMetadataItem)) return;
+
+  const cachedRecordId = cache.identify({
+    __typename: capitalize(objectMetadataItem.nameSingular),
+    id: recordId,
+  });
+
+  cache.modify<CachedObjectRecord>({
+    id: cachedRecordId,
+    fields: fieldModifiers,
+    optimistic: true,
+  });
+};
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/updateRecordFromCache.ts b/packages/twenty-front/src/modules/object-record/cache/utils/updateRecordFromCache.ts
new file mode 100644
index 000000000000..15636bc744d2
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/updateRecordFromCache.ts
@@ -0,0 +1,59 @@
+import { ApolloCache } from '@apollo/client/cache';
+import gql from 'graphql-tag';
+
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { getRecordNodeFromRecord } from '@/object-record/cache/utils/getRecordNodeFromRecord';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const updateRecordFromCache = <T extends ObjectRecord>({
+  objectMetadataItems,
+  objectMetadataItem,
+  cache,
+  record,
+}: {
+  objectMetadataItems: ObjectMetadataItem[];
+  objectMetadataItem: ObjectMetadataItem;
+  cache: ApolloCache<object>;
+  record: T;
+}) => {
+  if (isUndefinedOrNull(objectMetadataItem)) {
+    return null;
+  }
+
+  const capitalizedObjectName = capitalize(objectMetadataItem.nameSingular);
+
+  const cacheWriteFragment = gql`
+      fragment ${capitalizedObjectName}Fragment on ${capitalizedObjectName} ${mapObjectMetadataToGraphQLQuery(
+        {
+          objectMetadataItems,
+          objectMetadataItem,
+          computeReferences: true,
+        },
+      )}
+    `;
+
+  const cachedRecordId = cache.identify({
+    __typename: capitalize(objectMetadataItem.nameSingular),
+    id: record.id,
+  });
+
+  const recordWithConnection = getRecordNodeFromRecord<T>({
+    objectMetadataItems,
+    objectMetadataItem,
+    record,
+    depth: 1,
+  });
+
+  if (isUndefinedOrNull(recordWithConnection)) {
+    return;
+  }
+
+  cache.writeFragment<T & { __typename: string }>({
+    id: cachedRecordId,
+    fragment: cacheWriteFragment,
+    data: recordWithConnection,
+  });
+};
diff --git a/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx b/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx
index 0da8ecf3b793..20ef7dd1eaf9 100644
--- a/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx
+++ b/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react';
 
 import { useMapToObjectRecordIdentifier } from '@/object-metadata/hooks/useMapToObjectRecordIdentifier';
-import { useObjectMetadataItemOnly } from '@/object-metadata/hooks/useObjectMetadataItemOnly';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { EntityChip } from '@/ui/display/chip/components/EntityChip';
 
@@ -18,14 +17,10 @@ export const RecordChip = ({
   maxWidth,
   className,
 }: RecordChipProps) => {
-  const { objectMetadataItem } = useObjectMetadataItemOnly({
+  const { mapToObjectRecordIdentifier } = useMapToObjectRecordIdentifier({
     objectNameSingular,
   });
 
-  const mapToObjectRecordIdentifier = useMapToObjectRecordIdentifier({
-    objectMetadataItem,
-  });
-
   const objectRecordIdentifier = mapToObjectRecordIdentifier(record);
 
   return (
diff --git a/packages/twenty-front/src/modules/object-record/constants/EmptyMutation.ts b/packages/twenty-front/src/modules/object-record/constants/EmptyMutation.ts
new file mode 100644
index 000000000000..21a255ac56f3
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/constants/EmptyMutation.ts
@@ -0,0 +1,7 @@
+import gql from 'graphql-tag';
+
+export const EMPTY_MUTATION = gql`
+  mutation EmptyMutation {
+    empty
+  }
+`;
diff --git a/packages/twenty-front/src/modules/object-record/constants/EmptyQuery.ts b/packages/twenty-front/src/modules/object-record/constants/EmptyQuery.ts
new file mode 100644
index 000000000000..e046ec1726ad
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/constants/EmptyQuery.ts
@@ -0,0 +1,7 @@
+import gql from 'graphql-tag';
+
+export const EMPTY_QUERY = gql`
+  query EmptyQuery {
+    empty
+  }
+`;
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useCreateManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useCreateManyRecords.ts
index 7fd08fc2e7ea..87cab48baaa6 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useCreateManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useCreateManyRecords.ts
@@ -5,72 +5,28 @@ import { Person } from '@/people/types/Person';
 export const query = gql`
   mutation CreatePeople($data: [PersonCreateInput!]!) {
     createPeople(data: $data) {
-      id
-      opportunities {
-        edges {
-          node {
-            __typename
-            id
-          }
+      __typename
+        xLink {
+          label
+          url
         }
-      }
-      xLink {
-        label
-        url
-      }
-      id
-      pointOfContactForOpportunities {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-      createdAt
-      company {
-        __typename
         id
-      }
-      city
-      email
-      activityTargets {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-      jobTitle
-      favorites {
-        edges {
-          node {
-            __typename
-            id
-          }
+        createdAt
+        city
+        email
+        jobTitle
+        name {
+          firstName
+          lastName
         }
-      }
-      attachments {
-        edges {
-          node {
-            __typename
-            id
-          }
+        phone
+        linkedinLink {
+          label
+          url
         }
-      }
-      name {
-        firstName
-        lastName
-      }
-      phone
-      linkedinLink {
-        label
-        url
-      }
-      updatedAt
-      avatarUrl
-      companyId
+        updatedAt
+        avatarUrl
+        companyId
     }
   }
 `;
@@ -86,32 +42,15 @@ const data = [
 export const variables = { data };
 
 export const responseData = {
-  opportunities: {
-    edges: [],
-  },
+  __typeName: '',
   xLink: {
     label: '',
     url: '',
   },
-  pointOfContactForOpportunities: {
-    edges: [],
-  },
   createdAt: '',
-  company: {
-    id: '',
-  },
   city: '',
   email: '',
-  activityTargets: {
-    edges: [],
-  },
   jobTitle: '',
-  favorites: {
-    edges: [],
-  },
-  attachments: {
-    edges: [],
-  },
   name: {
     firstName: '',
     lastName: '',
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useCreateOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useCreateOneRecord.ts
index b7a2ebc0e359..764a78610248 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useCreateOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useCreateOneRecord.ts
@@ -3,72 +3,28 @@ import { gql } from '@apollo/client';
 export const query = gql`
   mutation CreateOnePerson($input: PersonCreateInput!) {
     createPerson(data: $input) {
-      id
-      opportunities {
-        edges {
-          node {
-            __typename
-            id
-          }
+      __typename
+        xLink {
+          label
+          url
         }
-      }
-      xLink {
-        label
-        url
-      }
-      id
-      pointOfContactForOpportunities {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-      createdAt
-      company {
-        __typename
         id
-      }
-      city
-      email
-      activityTargets {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-      jobTitle
-      favorites {
-        edges {
-          node {
-            __typename
-            id
-          }
+        createdAt
+        city
+        email
+        jobTitle
+        name {
+          firstName
+          lastName
         }
-      }
-      attachments {
-        edges {
-          node {
-            __typename
-            id
-          }
+        phone
+        linkedinLink {
+          label
+          url
         }
-      }
-      name {
-        firstName
-        lastName
-      }
-      phone
-      linkedinLink {
-        label
-        url
-      }
-      updatedAt
-      avatarUrl
-      companyId
+        updatedAt
+        avatarUrl
+        companyId
     }
   }
 `;
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useDeleteOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useDeleteOneRecord.ts
index f31b210e089b..d0110d92f9d4 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useDeleteOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useDeleteOneRecord.ts
@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client';
 
 export const query = gql`
-  mutation DeleteOnePerson($idToDelete: ID!) {
+  mutation DeleteOnePerson($idToDelete: UUID!) {
     deletePerson(id: $idToDelete) {
       id
     }
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useExecuteQuickActionOnOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useExecuteQuickActionOnOneRecord.ts
index 343e3e59e5c1..7f096be5f02a 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useExecuteQuickActionOnOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useExecuteQuickActionOnOneRecord.ts
@@ -3,74 +3,30 @@ import { gql } from '@apollo/client';
 export { responseData } from './useUpdateOneRecord';
 
 export const query = gql`
-  mutation ExecuteQuickActionOnOnePerson($idToExecuteQuickActionOn: ID!) {
+  mutation ExecuteQuickActionOnOnePerson($idToExecuteQuickActionOn: UUID!) {
     executeQuickActionOnPerson(id: $idToExecuteQuickActionOn) {
-      id
-      opportunities {
-        edges {
-          node {
-            __typename
-            id
-          }
+      __typename
+        xLink {
+          label
+          url
         }
-      }
-      xLink {
-        label
-        url
-      }
-      id
-      pointOfContactForOpportunities {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-      createdAt
-      company {
-        __typename
         id
-      }
-      city
-      email
-      activityTargets {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-      jobTitle
-      favorites {
-        edges {
-          node {
-            __typename
-            id
-          }
+        createdAt
+        city
+        email
+        jobTitle
+        name {
+          firstName
+          lastName
         }
-      }
-      attachments {
-        edges {
-          node {
-            __typename
-            id
-          }
+        phone
+        linkedinLink {
+          label
+          url
         }
-      }
-      name {
-        firstName
-        lastName
-      }
-      phone
-      linkedinLink {
-        label
-        url
-      }
-      updatedAt
-      avatarUrl
-      companyId
+        updatedAt
+        avatarUrl
+        companyId
     }
   }
 `;
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useFindManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useFindManyRecords.ts
index 84eb553d97e9..7a756cac76ef 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useFindManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useFindManyRecords.ts
@@ -26,7 +26,7 @@ export const query = gql`
                 pointOfContactId
                 updatedAt
                 companyId
-                pipelineStepId
+                stage
                 probability
                 closeDate
                 amount {
@@ -52,7 +52,7 @@ export const query = gql`
                 pointOfContactId
                 updatedAt
                 companyId
-                pipelineStepId
+                stage
                 probability
                 closeDate
                 amount {
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useFindOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useFindOneRecord.ts
index d5695be62d95..d0907398b836 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useFindOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useFindOneRecord.ts
@@ -3,74 +3,30 @@ import { gql } from '@apollo/client';
 import { responseData as person } from './useUpdateOneRecord';
 
 export const query = gql`
-  query FindOneperson($objectRecordId: UUID!) {
+  query FindOnePerson($objectRecordId: UUID!) {
     person(filter: { id: { eq: $objectRecordId } }) {
-      id
-      opportunities {
-        edges {
-          node {
-            __typename
-            id
+      __typename
+          xLink {
+            label
+            url
           }
-        }
-      }
-      xLink {
-        label
-        url
-      }
-      id
-      pointOfContactForOpportunities {
-        edges {
-          node {
-            __typename
-            id
+          id
+          createdAt
+          city
+          email
+          jobTitle
+          name {
+            firstName
+            lastName
           }
-        }
-      }
-      createdAt
-      company {
-        __typename
-        id
-      }
-      city
-      email
-      activityTargets {
-        edges {
-          node {
-            __typename
-            id
+          phone
+          linkedinLink {
+            label
+            url
           }
-        }
-      }
-      jobTitle
-      favorites {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-      attachments {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-      name {
-        firstName
-        lastName
-      }
-      phone
-      linkedinLink {
-        label
-        url
-      }
-      updatedAt
-      avatarUrl
-      companyId
+          updatedAt
+          avatarUrl
+          companyId
     }
   }
 `;
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useMapConnectionToRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useMapConnectionToRecords.ts
deleted file mode 100644
index 847b5c0e6cd4..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useMapConnectionToRecords.ts
+++ /dev/null
@@ -1,783 +0,0 @@
-import { Company } from '@/companies/types/Company';
-import { Favorite } from '@/favorites/types/Favorite';
-import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
-import { Person } from '@/people/types/Person';
-
-export const emptyConnectionMock: ObjectRecordConnection = {
-  edges: [],
-  pageInfo: {
-    hasNextPage: false,
-    hasPreviousPage: false,
-    startCursor: '',
-    endCursor: '',
-  },
-  totalCount: 0,
-  __typename: 'ObjectRecordConnection',
-};
-
-export const companiesConnectionWithPeopleConnectionWithFavoritesConnectionMock: ObjectRecordConnection<
-  Partial<Company> &
-    Pick<Company, 'id'> & {
-      people: ObjectRecordConnection<
-        Pick<Person, 'id' | 'name'> & {
-          favorites: ObjectRecordConnection<
-            Pick<Favorite, 'id' | 'personId' | 'companyId' | 'position'>
-          >;
-        }
-      >;
-    }
-> = {
-  pageInfo: {
-    endCursor: 'WyJmZTI1NmIzOS0zZWMzLTRmZTMtODk5Ny1iNzZhYTBiZmE0MDgiXQ==',
-    hasNextPage: true,
-    hasPreviousPage: false,
-    startCursor: 'WyIwNGIyZTlmNS0wNzEzLTQwYTUtODIxNi04MjgwMjQwMWQzM2UiXQ==',
-  },
-  edges: [
-    {
-      cursor: 'WyIwNGIyZTlmNS0wNzEzLTQwYTUtODIxNi04MjgwMjQwMWQzM2UiXQ==',
-      node: {
-        id: '04b2e9f5-0713-40a5-8216-82802401d33e',
-        name: 'Qonto',
-        people: {
-          edges: [],
-          pageInfo: {
-            endCursor: null,
-            hasNextPage: false,
-            hasPreviousPage: false,
-            startCursor: null,
-          },
-          totalCount: 0,
-        },
-      },
-    },
-    {
-      cursor: 'WyIwZDk0MDk5Ny1jMjFlLTRlYzItODczYi1kZTQyNjRkODkwMjUiXQ==',
-      node: {
-        id: '0d940997-c21e-4ec2-873b-de4264d89025',
-        name: 'Google',
-        people: {
-          edges: [
-            {
-              cursor:
-                'WyIyNDBkYTJlYy0yZDQwLTRlNDktOGRmNC05YzZhMDQ5MTkwZGYiXQ==',
-              node: {
-                id: '240da2ec-2d40-4e49-8df4-9c6a049190df',
-                name: {
-                  firstName: 'Bertrand',
-                  lastName: 'Voulzy',
-                },
-                favorites: {
-                  edges: [
-                    {
-                      cursor:
-                        'WyJjODVhODY3Yy01YThmLTQ4NjEtOGVkMi05NmMzOTAyNDg0MjMiXQ==',
-                      node: {
-                        id: 'c85a867c-5a8f-4861-8ed2-96c390248423',
-                        personId: '240da2ec-2d40-4e49-8df4-9c6a049190df',
-                        companyId: null,
-                        position: 2,
-                      },
-                    },
-                  ],
-                  pageInfo: {
-                    endCursor:
-                      'WyJjODVhODY3Yy01YThmLTQ4NjEtOGVkMi05NmMzOTAyNDg0MjMiXQ==',
-                    hasNextPage: false,
-                    hasPreviousPage: false,
-                    startCursor:
-                      'WyJjODVhODY3Yy01YThmLTQ4NjEtOGVkMi05NmMzOTAyNDg0MjMiXQ==',
-                  },
-                  totalCount: 1,
-                },
-              },
-            },
-            {
-              cursor:
-                'WyIyNDBkYTJlYy0yZDQwLTRlNDktOGRmNC05YzZhMDQ5MTkwZWYiXQ==',
-              node: {
-                id: '240da2ec-2d40-4e49-8df4-9c6a049190ef',
-                name: {
-                  firstName: 'Madison',
-                  lastName: 'Perez',
-                },
-                favorites: {
-                  edges: [],
-                  pageInfo: {
-                    endCursor: null,
-                    hasNextPage: false,
-                    hasPreviousPage: false,
-                    startCursor: null,
-                  },
-                  totalCount: 0,
-                },
-              },
-            },
-            {
-              cursor:
-                'WyI1Njk1NTQyMi01ZDU0LTQxYjctYmEzNi1mMGQyMGUxNDE3YWUiXQ==',
-              node: {
-                id: '56955422-5d54-41b7-ba36-f0d20e1417ae',
-                name: {
-                  firstName: 'Avery',
-                  lastName: 'Carter',
-                },
-                favorites: {
-                  edges: [],
-                  pageInfo: {
-                    endCursor: null,
-                    hasNextPage: false,
-                    hasPreviousPage: false,
-                    startCursor: null,
-                  },
-                  totalCount: 0,
-                },
-              },
-            },
-            {
-              cursor:
-                'WyI3NTUwMzVkYi02MjNkLTQxZmUtOTJlNy1kZDQ1YjdjNTY4ZTEiXQ==',
-              node: {
-                id: '755035db-623d-41fe-92e7-dd45b7c568e1',
-                name: {
-                  firstName: 'Ethan',
-                  lastName: 'Mitchell',
-                },
-                favorites: {
-                  edges: [],
-                  pageInfo: {
-                    endCursor: null,
-                    hasNextPage: false,
-                    hasPreviousPage: false,
-                    startCursor: null,
-                  },
-                  totalCount: 0,
-                },
-              },
-            },
-            {
-              cursor:
-                'WyJhMmU3OGE1Zi0zMzhiLTQ2ZGYtODgxMS1mYTA4YzdkMTlkMzUiXQ==',
-              node: {
-                id: 'a2e78a5f-338b-46df-8811-fa08c7d19d35',
-                name: {
-                  firstName: 'Elizabeth',
-                  lastName: 'Baker',
-                },
-                favorites: {
-                  edges: [],
-                  pageInfo: {
-                    endCursor: null,
-                    hasNextPage: false,
-                    hasPreviousPage: false,
-                    startCursor: null,
-                  },
-                  totalCount: 0,
-                },
-              },
-            },
-            {
-              cursor:
-                'WyJjYTFmNWJmMy02NGFkLTRiMGUtYmJmZC1lOWZkNzk1YjcwMTYiXQ==',
-              node: {
-                id: 'ca1f5bf3-64ad-4b0e-bbfd-e9fd795b7016',
-                name: {
-                  firstName: 'Christopher',
-                  lastName: 'Nelson',
-                },
-                favorites: {
-                  edges: [],
-                  pageInfo: {
-                    endCursor: null,
-                    hasNextPage: false,
-                    hasPreviousPage: false,
-                    startCursor: null,
-                  },
-                  totalCount: 0,
-                },
-              },
-            },
-          ],
-          pageInfo: {
-            endCursor:
-              'WyJjYTFmNWJmMy02NGFkLTRiMGUtYmJmZC1lOWZkNzk1YjcwMTYiXQ==',
-            hasNextPage: false,
-            hasPreviousPage: false,
-            startCursor:
-              'WyIyNDBkYTJlYy0yZDQwLTRlNDktOGRmNC05YzZhMDQ5MTkwZGYiXQ==',
-          },
-          totalCount: 6,
-        },
-      },
-    },
-    {
-      cursor: 'WyIxMTg5OTVmMy01ZDgxLTQ2ZDYtYmY4My1mN2ZkMzNlYTYxMDIiXQ==',
-      node: {
-        id: '118995f3-5d81-46d6-bf83-f7fd33ea6102',
-        name: 'Facebook',
-        people: {
-          edges: [
-            {
-              cursor:
-                'WyI5M2M3MmQyZS1mNTE3LTQyZmQtODBhZS0xNDE3M2IzYjcwYWUiXQ==',
-              node: {
-                id: '93c72d2e-f517-42fd-80ae-14173b3b70ae',
-                name: {
-                  firstName: 'Christopher',
-                  lastName: 'Gonzalez',
-                },
-                favorites: {
-                  edges: [],
-                  pageInfo: {
-                    endCursor: null,
-                    hasNextPage: false,
-                    hasPreviousPage: false,
-                    startCursor: null,
-                  },
-                  totalCount: 0,
-                },
-              },
-            },
-            {
-              cursor:
-                'WyJlZWVhY2FjZi1lZWUxLTQ2OTAtYWQyYy04NjE5ZTViNTZhMmUiXQ==',
-              node: {
-                id: 'eeeacacf-eee1-4690-ad2c-8619e5b56a2e',
-                name: {
-                  firstName: 'Ashley',
-                  lastName: 'Parker',
-                },
-                favorites: {
-                  edges: [],
-                  pageInfo: {
-                    endCursor: null,
-                    hasNextPage: false,
-                    hasPreviousPage: false,
-                    startCursor: null,
-                  },
-                  totalCount: 0,
-                },
-              },
-            },
-          ],
-          pageInfo: {
-            endCursor:
-              'WyJlZWVhY2FjZi1lZWUxLTQ2OTAtYWQyYy04NjE5ZTViNTZhMmUiXQ==',
-            hasNextPage: false,
-            hasPreviousPage: false,
-            startCursor:
-              'WyI5M2M3MmQyZS1mNTE3LTQyZmQtODBhZS0xNDE3M2IzYjcwYWUiXQ==',
-          },
-          totalCount: 2,
-        },
-      },
-    },
-    {
-      cursor: 'WyIxZDNhMWM2ZS03MDdlLTQ0ZGMtYTFkMi0zMDAzMGJmMWE5NDQiXQ==',
-      node: {
-        id: '1d3a1c6e-707e-44dc-a1d2-30030bf1a944',
-        name: 'Netflix',
-        people: {
-          edges: [],
-          pageInfo: {
-            endCursor: null,
-            hasNextPage: false,
-            hasPreviousPage: false,
-            startCursor: null,
-          },
-          totalCount: 0,
-        },
-      },
-    },
-    {
-      cursor: 'WyI0NjBiNmZiMS1lZDg5LTQxM2EtYjMxYS05NjI5ODZlNjdiYjQiXQ==',
-      node: {
-        id: '460b6fb1-ed89-413a-b31a-962986e67bb4',
-        name: 'Microsoft',
-        people: {
-          edges: [
-            {
-              cursor:
-                'WyIxZDE1MTg1Mi00OTBmLTQ0NjYtODM5MS03MzNjZmQ2NmEwYzgiXQ==',
-              node: {
-                id: '1d151852-490f-4466-8391-733cfd66a0c8',
-                name: {
-                  firstName: 'Isabella',
-                  lastName: 'Scott',
-                },
-                favorites: {
-                  edges: [],
-                  pageInfo: {
-                    endCursor: null,
-                    hasNextPage: false,
-                    hasPreviousPage: false,
-                    startCursor: null,
-                  },
-                  totalCount: 0,
-                },
-              },
-            },
-            {
-              cursor:
-                'WyI5ODQwNmUyNi04MGYxLTRkZmYtYjU3MC1hNzQ5NDI1MjhkZTMiXQ==',
-              node: {
-                id: '98406e26-80f1-4dff-b570-a74942528de3',
-                name: {
-                  firstName: 'Matthew',
-                  lastName: 'Green',
-                },
-                favorites: {
-                  edges: [],
-                  pageInfo: {
-                    endCursor: null,
-                    hasNextPage: false,
-                    hasPreviousPage: false,
-                    startCursor: null,
-                  },
-                  totalCount: 0,
-                },
-              },
-            },
-            {
-              cursor:
-                'WyI5YjMyNGE4OC02Nzg0LTQ0NDktYWZkZi1kYzYyY2I4NzAyZjIiXQ==',
-              node: {
-                id: '9b324a88-6784-4449-afdf-dc62cb8702f2',
-                name: {
-                  firstName: 'Nicholas',
-                  lastName: 'Wright',
-                },
-                favorites: {
-                  edges: [],
-                  pageInfo: {
-                    endCursor: null,
-                    hasNextPage: false,
-                    hasPreviousPage: false,
-                    startCursor: null,
-                  },
-                  totalCount: 0,
-                },
-              },
-            },
-          ],
-          pageInfo: {
-            endCursor:
-              'WyI5YjMyNGE4OC02Nzg0LTQ0NDktYWZkZi1kYzYyY2I4NzAyZjIiXQ==',
-            hasNextPage: false,
-            hasPreviousPage: false,
-            startCursor:
-              'WyIxZDE1MTg1Mi00OTBmLTQ0NjYtODM5MS03MzNjZmQ2NmEwYzgiXQ==',
-          },
-          totalCount: 3,
-        },
-      },
-    },
-    {
-      cursor: 'WyI3YTkzZDFlNS0zZjc0LTQ5MmQtYTEwMS0yYTcwZjUwYTE2NDUiXQ==',
-      node: {
-        id: '7a93d1e5-3f74-492d-a101-2a70f50a1645',
-        name: 'Libeo',
-        people: {
-          edges: [],
-          pageInfo: {
-            endCursor: null,
-            hasNextPage: false,
-            hasPreviousPage: false,
-            startCursor: null,
-          },
-          totalCount: 0,
-        },
-      },
-    },
-    {
-      cursor: 'WyI4OWJiODI1Yy0xNzFlLTRiY2MtOWNmNy00MzQ0OGQ2ZmIyNzgiXQ==',
-      node: {
-        id: '89bb825c-171e-4bcc-9cf7-43448d6fb278',
-        name: 'Airbnb',
-        people: {
-          edges: [],
-          pageInfo: {
-            endCursor: null,
-            hasNextPage: false,
-            hasPreviousPage: false,
-            startCursor: null,
-          },
-          totalCount: 0,
-        },
-      },
-    },
-    {
-      cursor: 'WyI5ZDE2MmRlNi1jZmJmLTQxNTYtYTc5MC1lMzk4NTRkY2Q0ZWIiXQ==',
-      node: {
-        id: '9d162de6-cfbf-4156-a790-e39854dcd4eb',
-        name: 'Claap',
-        people: {
-          edges: [],
-          pageInfo: {
-            endCursor: null,
-            hasNextPage: false,
-            hasPreviousPage: false,
-            startCursor: null,
-          },
-          totalCount: 0,
-        },
-      },
-    },
-    {
-      cursor: 'WyJhNjc0ZmE2Yy0xNDU1LTRjNTctYWZhZi1kZDVkYzA4NjM2MWQiXQ==',
-      node: {
-        id: 'a674fa6c-1455-4c57-afaf-dd5dc086361d',
-        name: 'Algolia',
-        people: {
-          edges: [
-            {
-              cursor:
-                'WyIyNDBkYTJlYy0yZDQwLTRlNDktOGRmNC05YzZhMDQ5MTkxZGYiXQ==',
-              node: {
-                id: '240da2ec-2d40-4e49-8df4-9c6a049191df',
-                name: {
-                  firstName: 'Lorie',
-                  lastName: 'Vladim',
-                },
-                favorites: {
-                  edges: [],
-                  pageInfo: {
-                    endCursor: null,
-                    hasNextPage: false,
-                    hasPreviousPage: false,
-                    startCursor: null,
-                  },
-                  totalCount: 0,
-                },
-              },
-            },
-          ],
-          pageInfo: {
-            endCursor:
-              'WyIyNDBkYTJlYy0yZDQwLTRlNDktOGRmNC05YzZhMDQ5MTkxZGYiXQ==',
-            hasNextPage: false,
-            hasPreviousPage: false,
-            startCursor:
-              'WyIyNDBkYTJlYy0yZDQwLTRlNDktOGRmNC05YzZhMDQ5MTkxZGYiXQ==',
-          },
-          totalCount: 1,
-        },
-      },
-    },
-    {
-      cursor: 'WyJhN2JjNjhkNS1mNzllLTQwZGQtYmQwNi1jMzZlNmFiYjQ2NzgiXQ==',
-      node: {
-        id: 'a7bc68d5-f79e-40dd-bd06-c36e6abb4678',
-        name: 'Samsung',
-        people: {
-          edges: [
-            {
-              cursor:
-                'WyIyNDBkYTJlYy0yZDQwLTRlNDktOGRmNC05YzZhMDQ5MTkxZGUiXQ==',
-              node: {
-                id: '240da2ec-2d40-4e49-8df4-9c6a049191de',
-                name: {
-                  firstName: 'Louis',
-                  lastName: 'Duss',
-                },
-                favorites: {
-                  edges: [],
-                  pageInfo: {
-                    endCursor: null,
-                    hasNextPage: false,
-                    hasPreviousPage: false,
-                    startCursor: null,
-                  },
-                  totalCount: 0,
-                },
-              },
-            },
-          ],
-          pageInfo: {
-            endCursor:
-              'WyIyNDBkYTJlYy0yZDQwLTRlNDktOGRmNC05YzZhMDQ5MTkxZGUiXQ==',
-            hasNextPage: false,
-            hasPreviousPage: false,
-            startCursor:
-              'WyIyNDBkYTJlYy0yZDQwLTRlNDktOGRmNC05YzZhMDQ5MTkxZGUiXQ==',
-          },
-          totalCount: 1,
-        },
-      },
-    },
-    {
-      cursor: 'WyJhYWZmY2ZiZC1mODZiLTQxOWYtYjc5NC0wMjMxOWFiZTg2MzciXQ==',
-      node: {
-        id: 'aaffcfbd-f86b-419f-b794-02319abe8637',
-        name: 'Hasura',
-        people: {
-          edges: [],
-          pageInfo: {
-            endCursor: null,
-            hasNextPage: false,
-            hasPreviousPage: false,
-            startCursor: null,
-          },
-          totalCount: 0,
-        },
-      },
-    },
-    {
-      cursor: 'WyJmMzNkYzI0Mi01NTE4LTQ1NTMtOTQzMy00MmQ4ZWI4MjgzNGIiXQ==',
-      node: {
-        id: 'f33dc242-5518-4553-9433-42d8eb82834b',
-        name: 'Wework',
-        people: {
-          edges: [],
-          pageInfo: {
-            endCursor: null,
-            hasNextPage: false,
-            hasPreviousPage: false,
-            startCursor: null,
-          },
-          totalCount: 0,
-        },
-      },
-    },
-    {
-      cursor: 'WyJmZTI1NmIzOS0zZWMzLTRmZTMtODk5Ny1iNzZhYTBiZmE0MDgiXQ==',
-      node: {
-        id: 'fe256b39-3ec3-4fe3-8997-b76aa0bfa408',
-        name: 'Linkedin',
-        people: {
-          edges: [
-            {
-              cursor:
-                'WyIwYWEwMGJlYi1hYzczLTQ3OTctODI0ZS04N2ExZjVhZWE5ZTAiXQ==',
-              node: {
-                id: '0aa00beb-ac73-4797-824e-87a1f5aea9e0',
-                name: {
-                  firstName: 'Sylvie',
-                  lastName: 'Palmer',
-                },
-                favorites: {
-                  edges: [
-                    {
-                      cursor:
-                        'WyIzN2I5NzE0MC0yNmI5LTQ5OGMtODM3Yi00ZjNkZTQ5OWFkODMiXQ==',
-                      node: {
-                        id: '37b97140-26b9-498c-837b-4f3de499ad83',
-                        personId: '0aa00beb-ac73-4797-824e-87a1f5aea9e0',
-                        companyId: null,
-                        position: 1,
-                      },
-                    },
-                  ],
-                  pageInfo: {
-                    endCursor:
-                      'WyIzN2I5NzE0MC0yNmI5LTQ5OGMtODM3Yi00ZjNkZTQ5OWFkODMiXQ==',
-                    hasNextPage: false,
-                    hasPreviousPage: false,
-                    startCursor:
-                      'WyIzN2I5NzE0MC0yNmI5LTQ5OGMtODM3Yi00ZjNkZTQ5OWFkODMiXQ==',
-                  },
-                  totalCount: 1,
-                },
-              },
-            },
-            {
-              cursor:
-                'WyI4NjA4MzE0MS0xYzBlLTQ5NGMtYTFiNi04NWIxYzZmZWZhYTUiXQ==',
-              node: {
-                id: '86083141-1c0e-494c-a1b6-85b1c6fefaa5',
-                name: {
-                  firstName: 'Christoph',
-                  lastName: 'Callisto',
-                },
-                favorites: {
-                  edges: [],
-                  pageInfo: {
-                    endCursor: null,
-                    hasNextPage: false,
-                    hasPreviousPage: false,
-                    startCursor: null,
-                  },
-                  totalCount: 0,
-                },
-              },
-            },
-          ],
-          pageInfo: {
-            endCursor:
-              'WyI4NjA4MzE0MS0xYzBlLTQ5NGMtYTFiNi04NWIxYzZmZWZhYTUiXQ==',
-            hasNextPage: false,
-            hasPreviousPage: false,
-            startCursor:
-              'WyIwYWEwMGJlYi1hYzczLTQ3OTctODI0ZS04N2ExZjVhZWE5ZTAiXQ==',
-          },
-          totalCount: 2,
-        },
-      },
-    },
-  ],
-  totalCount: 13,
-};
-
-export const peopleWithTheirUniqueCompanies: ObjectRecordConnection<
-  Pick<Person, 'id'> & { company: Pick<Company, 'id' | 'name'> }
-> = {
-  pageInfo: {
-    endCursor: 'WyJlZWVhY2FjZi1lZWUxLTQ2OTAtYWQyYy04NjE5ZTViNTZhMmUiXQ==',
-    hasNextPage: false,
-    hasPreviousPage: false,
-    startCursor: 'WyIwYWEwMGJlYi1hYzczLTQ3OTctODI0ZS04N2ExZjVhZWE5ZTAiXQ==',
-  },
-  totalCount: 15,
-  edges: [
-    {
-      cursor: 'WyIwYWEwMGJlYi1hYzczLTQ3OTctODI0ZS04N2ExZjVhZWE5ZTAiXQ==',
-      node: {
-        id: '0aa00beb-ac73-4797-824e-87a1f5aea9e0',
-        company: {
-          id: 'fe256b39-3ec3-4fe3-8997-b76aa0bfa408',
-          name: 'Linkedin',
-        },
-      },
-    },
-    {
-      cursor: 'WyIxZDE1MTg1Mi00OTBmLTQ0NjYtODM5MS03MzNjZmQ2NmEwYzgiXQ==',
-      node: {
-        id: '1d151852-490f-4466-8391-733cfd66a0c8',
-        company: {
-          id: '460b6fb1-ed89-413a-b31a-962986e67bb4',
-          name: 'Microsoft',
-        },
-      },
-    },
-    {
-      cursor: 'WyIyNDBkYTJlYy0yZDQwLTRlNDktOGRmNC05YzZhMDQ5MTkwZGYiXQ==',
-      node: {
-        id: '240da2ec-2d40-4e49-8df4-9c6a049190df',
-        company: {
-          id: '0d940997-c21e-4ec2-873b-de4264d89025',
-          name: 'Google',
-        },
-      },
-    },
-    {
-      cursor: 'WyIyNDBkYTJlYy0yZDQwLTRlNDktOGRmNC05YzZhMDQ5MTkwZWYiXQ==',
-      node: {
-        id: '240da2ec-2d40-4e49-8df4-9c6a049190ef',
-        company: {
-          id: '0d940997-c21e-4ec2-873b-de4264d89025',
-          name: 'Google',
-        },
-      },
-    },
-    {
-      cursor: 'WyIyNDBkYTJlYy0yZDQwLTRlNDktOGRmNC05YzZhMDQ5MTkxZGUiXQ==',
-      node: {
-        id: '240da2ec-2d40-4e49-8df4-9c6a049191de',
-        company: {
-          id: 'a7bc68d5-f79e-40dd-bd06-c36e6abb4678',
-          name: 'Samsung',
-        },
-      },
-    },
-    {
-      cursor: 'WyIyNDBkYTJlYy0yZDQwLTRlNDktOGRmNC05YzZhMDQ5MTkxZGYiXQ==',
-      node: {
-        id: '240da2ec-2d40-4e49-8df4-9c6a049191df',
-        company: {
-          id: 'a674fa6c-1455-4c57-afaf-dd5dc086361d',
-          name: 'Algolia',
-        },
-      },
-    },
-    {
-      cursor: 'WyI1Njk1NTQyMi01ZDU0LTQxYjctYmEzNi1mMGQyMGUxNDE3YWUiXQ==',
-      node: {
-        id: '56955422-5d54-41b7-ba36-f0d20e1417ae',
-        company: {
-          id: '0d940997-c21e-4ec2-873b-de4264d89025',
-          name: 'Google',
-        },
-      },
-    },
-    {
-      cursor: 'WyI3NTUwMzVkYi02MjNkLTQxZmUtOTJlNy1kZDQ1YjdjNTY4ZTEiXQ==',
-      node: {
-        id: '755035db-623d-41fe-92e7-dd45b7c568e1',
-        company: {
-          id: '0d940997-c21e-4ec2-873b-de4264d89025',
-          name: 'Google',
-        },
-      },
-    },
-    {
-      cursor: 'WyI4NjA4MzE0MS0xYzBlLTQ5NGMtYTFiNi04NWIxYzZmZWZhYTUiXQ==',
-      node: {
-        id: '86083141-1c0e-494c-a1b6-85b1c6fefaa5',
-        company: {
-          id: 'fe256b39-3ec3-4fe3-8997-b76aa0bfa408',
-          name: 'Linkedin',
-        },
-      },
-    },
-    {
-      cursor: 'WyI5M2M3MmQyZS1mNTE3LTQyZmQtODBhZS0xNDE3M2IzYjcwYWUiXQ==',
-      node: {
-        id: '93c72d2e-f517-42fd-80ae-14173b3b70ae',
-        company: {
-          id: '118995f3-5d81-46d6-bf83-f7fd33ea6102',
-          name: 'Facebook',
-        },
-      },
-    },
-    {
-      cursor: 'WyI5ODQwNmUyNi04MGYxLTRkZmYtYjU3MC1hNzQ5NDI1MjhkZTMiXQ==',
-      node: {
-        id: '98406e26-80f1-4dff-b570-a74942528de3',
-        company: {
-          id: '460b6fb1-ed89-413a-b31a-962986e67bb4',
-          name: 'Microsoft',
-        },
-      },
-    },
-    {
-      cursor: 'WyI5YjMyNGE4OC02Nzg0LTQ0NDktYWZkZi1kYzYyY2I4NzAyZjIiXQ==',
-      node: {
-        id: '9b324a88-6784-4449-afdf-dc62cb8702f2',
-        company: {
-          id: '460b6fb1-ed89-413a-b31a-962986e67bb4',
-          name: 'Microsoft',
-        },
-      },
-    },
-    {
-      cursor: 'WyJhMmU3OGE1Zi0zMzhiLTQ2ZGYtODgxMS1mYTA4YzdkMTlkMzUiXQ==',
-      node: {
-        id: 'a2e78a5f-338b-46df-8811-fa08c7d19d35',
-        company: {
-          id: '0d940997-c21e-4ec2-873b-de4264d89025',
-          name: 'Google',
-        },
-      },
-    },
-    {
-      cursor: 'WyJjYTFmNWJmMy02NGFkLTRiMGUtYmJmZC1lOWZkNzk1YjcwMTYiXQ==',
-      node: {
-        id: 'ca1f5bf3-64ad-4b0e-bbfd-e9fd795b7016',
-        company: {
-          id: '0d940997-c21e-4ec2-873b-de4264d89025',
-          name: 'Google',
-        },
-      },
-    },
-    {
-      cursor: 'WyJlZWVhY2FjZi1lZWUxLTQ2OTAtYWQyYy04NjE5ZTViNTZhMmUiXQ==',
-      node: {
-        id: 'eeeacacf-eee1-4690-ad2c-8619e5b56a2e',
-        company: {
-          id: '118995f3-5d81-46d6-bf83-f7fd33ea6102',
-          name: 'Facebook',
-        },
-      },
-    },
-  ],
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useUpdateOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useUpdateOneRecord.ts
index e78e9e27b8d7..6b86c1a9f70c 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useUpdateOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useUpdateOneRecord.ts
@@ -1,74 +1,30 @@
 import { gql } from '@apollo/client';
 
 export const query = gql`
-  mutation UpdateOnePerson($idToUpdate: ID!, $input: PersonUpdateInput!) {
+  mutation UpdateOnePerson($idToUpdate: UUID!, $input: PersonUpdateInput!) {
     updatePerson(id: $idToUpdate, data: $input) {
-      id
-      opportunities {
-        edges {
-          node {
-            __typename
-            id
-          }
+      __typename
+        xLink {
+          label
+          url
         }
-      }
-      xLink {
-        label
-        url
-      }
-      id
-      pointOfContactForOpportunities {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-      createdAt
-      company {
-        __typename
         id
-      }
-      city
-      email
-      activityTargets {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-      jobTitle
-      favorites {
-        edges {
-          node {
-            __typename
-            id
-          }
+        createdAt
+        city
+        email
+        jobTitle
+        name {
+          firstName
+          lastName
         }
-      }
-      attachments {
-        edges {
-          node {
-            __typename
-            id
-          }
+        phone
+        linkedinLink {
+          label
+          url
         }
-      }
-      name {
-        firstName
-        lastName
-      }
-      phone
-      linkedinLink {
-        label
-        url
-      }
-      updatedAt
-      avatarUrl
-      companyId
+        updatedAt
+        avatarUrl
+        companyId
     }
   }
 `;
@@ -127,6 +83,6 @@ export const variables = {
 };
 
 export const responseData = {
-  ...basePerson,
+  ...{ ...basePerson, __typename: 'Person' },
   ...connectedObjects,
 };
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useCreateOneRecord.test.tsx b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useCreateOneRecord.test.tsx
index 58a9e3fc221e..837af4dd2bf6 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useCreateOneRecord.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useCreateOneRecord.test.tsx
@@ -53,7 +53,6 @@ describe('useCreateOneRecord', () => {
 
     await act(async () => {
       const res = await result.current.createOneRecord(input);
-      console.log('res', res);
       expect(res).toBeDefined();
       expect(res).toHaveProperty('id', personId);
     });
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useFindManyRecords.test.tsx b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useFindManyRecords.test.tsx
index 480e74bab650..57e18be23cba 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useFindManyRecords.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useFindManyRecords.test.tsx
@@ -84,14 +84,5 @@ describe('useFindManyRecords', () => {
     expect(result.current.loading).toBe(true);
     expect(result.current.error).toBeUndefined();
     expect(result.current.records.length).toBe(0);
-
-    // FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory
-    // await waitFor(() => {
-    //   expect(result.current.loading).toBe(false);
-    //   expect(result.current.records).toBeDefined();
-
-    //   console.log({ res: result.current.records });
-    //   expect(result.current.records.length > 0).toBe(true);
-    // });
   });
 });
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useGenerateFindManyRecordsForMultipleMetadataItemsQuery.test.tsx b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useGenerateFindManyRecordsForMultipleMetadataItemsQuery.test.tsx
index 2b1ef39614ea..df7c904261a4 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useGenerateFindManyRecordsForMultipleMetadataItemsQuery.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useGenerateFindManyRecordsForMultipleMetadataItemsQuery.test.tsx
@@ -3,7 +3,7 @@ import { renderHook } from '@testing-library/react';
 import { RecoilRoot } from 'recoil';
 
 import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
-import { useGenerateFindManyRecordsForMultipleMetadataItemsQuery } from '@/object-record/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery';
+import { useGenerateFindManyRecordsForMultipleMetadataItemsQuery } from '@/object-record/multiple-objects/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery';
 
 const Wrapper = ({ children }: { children: ReactNode }) => (
   <RecoilRoot>{children}</RecoilRoot>
@@ -16,7 +16,7 @@ describe('useGenerateFindManyRecordsForMultipleMetadataItemsQuery', () => {
         const mockObjectMetadataItems = getObjectMetadataItemsMock();
 
         return useGenerateFindManyRecordsForMultipleMetadataItemsQuery({
-          objectMetadataItems: mockObjectMetadataItems.slice(0, 2),
+          targetObjectMetadataItems: mockObjectMetadataItems.slice(0, 2),
         });
       },
       {
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useMapConnectionToRecords.test.tsx b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useMapConnectionToRecords.test.tsx
deleted file mode 100644
index 9694cc6cee6b..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useMapConnectionToRecords.test.tsx
+++ /dev/null
@@ -1,190 +0,0 @@
-import { isNonEmptyArray } from '@sniptt/guards';
-import { renderHook } from '@testing-library/react';
-
-import { Company } from '@/companies/types/Company';
-import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
-import {
-  companiesConnectionWithPeopleConnectionWithFavoritesConnectionMock,
-  emptyConnectionMock,
-  peopleWithTheirUniqueCompanies,
-} from '@/object-record/hooks/__mocks__/useMapConnectionToRecords';
-import { useMapConnectionToRecords } from '@/object-record/hooks/useMapConnectionToRecords';
-import { Person } from '@/people/types/Person';
-import { getJestHookWrapper } from '~/testing/jest/getJestHookWrapper';
-import { isNonNullable } from '~/utils/isNonNullable';
-
-const Wrapper = getJestHookWrapper({
-  apolloMocks: [],
-  onInitializeRecoilSnapshot: (snapshot) => {
-    snapshot.set(objectMetadataItemsState, getObjectMetadataItemsMock());
-  },
-});
-
-describe('useMapConnectionToRecords', () => {
-  it('Empty edges - should return an empty array if no edge', async () => {
-    const { result } = renderHook(
-      () => {
-        const mapConnectionToRecords = useMapConnectionToRecords();
-
-        const records = mapConnectionToRecords({
-          objectNameSingular: CoreObjectNameSingular.Company,
-          objectRecordConnection: emptyConnectionMock,
-          depth: 5,
-        });
-
-        return records;
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    expect(Array.isArray(result.current)).toBe(true);
-  });
-
-  it('No relation fields - should return an array of company records', async () => {
-    const { result } = renderHook(
-      () => {
-        const mapConnectionToRecords = useMapConnectionToRecords();
-
-        const records = mapConnectionToRecords({
-          objectNameSingular: CoreObjectNameSingular.Company,
-          objectRecordConnection:
-            companiesConnectionWithPeopleConnectionWithFavoritesConnectionMock,
-          depth: 5,
-        });
-
-        return records;
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    expect(Array.isArray(result.current)).toBe(true);
-  });
-
-  it('n+1 relation fields - should return an array of company records with their people records', async () => {
-    const { result } = renderHook(
-      () => {
-        const mapConnectionToRecords = useMapConnectionToRecords();
-
-        const records = mapConnectionToRecords({
-          objectNameSingular: CoreObjectNameSingular.Company,
-          objectRecordConnection:
-            companiesConnectionWithPeopleConnectionWithFavoritesConnectionMock,
-          depth: 5,
-        });
-
-        return records;
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    const secondCompanyMock =
-      companiesConnectionWithPeopleConnectionWithFavoritesConnectionMock
-        .edges[1];
-
-    const secondCompanyPeopleMock = secondCompanyMock.node.people.edges.map(
-      (edge) => edge.node,
-    );
-
-    const companiesResult = result.current;
-    const secondCompanyResult = result.current[1];
-    const secondCompanyPeopleResult = secondCompanyResult.people;
-
-    expect(isNonEmptyArray(companiesResult)).toBe(true);
-    expect(secondCompanyResult.id).toBe(secondCompanyMock.node.id);
-    expect(isNonEmptyArray(secondCompanyPeopleResult)).toBe(true);
-    expect(secondCompanyPeopleResult[0].id).toEqual(
-      secondCompanyPeopleMock[0].id,
-    );
-  });
-
-  it('n+2 relation fields - should return an array of company records with their people records with their favorites records', async () => {
-    const { result } = renderHook(
-      () => {
-        const mapConnectionToRecords = useMapConnectionToRecords();
-
-        const records = mapConnectionToRecords({
-          objectNameSingular: CoreObjectNameSingular.Company,
-          objectRecordConnection:
-            companiesConnectionWithPeopleConnectionWithFavoritesConnectionMock,
-          depth: 5,
-        });
-
-        return records;
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    const secondCompanyMock =
-      companiesConnectionWithPeopleConnectionWithFavoritesConnectionMock
-        .edges[1];
-
-    const secondCompanyPeopleMock = secondCompanyMock.node.people;
-
-    const secondCompanyFirstPersonMock = secondCompanyPeopleMock.edges[0].node;
-
-    const secondCompanyFirstPersonFavoritesMock =
-      secondCompanyFirstPersonMock.favorites;
-
-    const companiesResult = result.current;
-    const secondCompanyResult = companiesResult[1];
-    const secondCompanyPeopleResult = secondCompanyResult.people;
-    const secondCompanyFirstPersonResult = secondCompanyPeopleResult[0];
-    const secondCompanyFirstPersonFavoritesResult =
-      secondCompanyFirstPersonResult.favorites;
-
-    expect(isNonEmptyArray(companiesResult)).toBe(true);
-    expect(secondCompanyResult.id).toBe(secondCompanyMock.node.id);
-    expect(isNonEmptyArray(secondCompanyPeopleResult)).toBe(true);
-    expect(secondCompanyFirstPersonResult.id).toEqual(
-      secondCompanyFirstPersonMock.id,
-    );
-    expect(isNonEmptyArray(secondCompanyFirstPersonFavoritesResult)).toBe(true);
-    expect(secondCompanyFirstPersonFavoritesResult[0].id).toEqual(
-      secondCompanyFirstPersonFavoritesMock.edges[0].node.id,
-    );
-  });
-
-  it("n+1 relation field TO_ONE_OBJECT - should return an array of people records with their company, mapConnectionToRecords shouldn't try to parse TO_ONE_OBJECT", async () => {
-    const { result } = renderHook(
-      () => {
-        const mapConnectionToRecords = useMapConnectionToRecords();
-
-        const records = mapConnectionToRecords({
-          objectNameSingular: CoreObjectNameSingular.Person,
-          objectRecordConnection: peopleWithTheirUniqueCompanies,
-          depth: 5,
-        });
-
-        return records as (Person & { company: Company })[];
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    const firstPersonMock = peopleWithTheirUniqueCompanies.edges[0].node;
-
-    const firstPersonsCompanyMock = firstPersonMock.company;
-
-    const peopleResult = result.current;
-
-    const firstPersonResult = result.current[0];
-    const firstPersonsCompanyresult = firstPersonResult.company;
-
-    expect(isNonEmptyArray(peopleResult)).toBe(true);
-    expect(firstPersonResult.id).toBe(firstPersonMock.id);
-
-    expect(isNonNullable(firstPersonsCompanyresult)).toBe(true);
-    expect(firstPersonsCompanyresult.id).toEqual(firstPersonsCompanyMock.id);
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useModifyRecordFromCache.test.tsx b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useModifyRecordFromCache.test.tsx
deleted file mode 100644
index 9d1ac683d28d..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useModifyRecordFromCache.test.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { ReactNode } from 'react';
-import { useApolloClient } from '@apollo/client';
-import { MockedProvider } from '@apollo/client/testing';
-import { act, renderHook } from '@testing-library/react';
-import { RecoilRoot } from 'recoil';
-
-import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
-import { useModifyRecordFromCache } from '@/object-record/cache/hooks/useModifyRecordFromCache';
-
-const Wrapper = ({ children }: { children: ReactNode }) => (
-  <MockedProvider addTypename={false}>
-    <RecoilRoot>{children}</RecoilRoot>
-  </MockedProvider>
-);
-
-const recordId = '91408718-a29f-4678-b573-c791e8664c2a';
-
-describe('useModifyRecordFromCache', () => {
-  it('should work as expected', async () => {
-    const { result } = renderHook(
-      () => {
-        const apolloClient = useApolloClient();
-        const mockObjectMetadataItems = getObjectMetadataItemsMock();
-
-        const personMetadataItem = mockObjectMetadataItems.find(
-          (item) => item.nameSingular === 'person',
-        )!;
-
-        return {
-          modifyRecordFromCache: useModifyRecordFromCache({
-            objectMetadataItem: personMetadataItem,
-          }),
-          cache: apolloClient.cache,
-        };
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    const spy = jest.spyOn(result.current.cache, 'modify');
-
-    act(() => {
-      result.current.modifyRecordFromCache(recordId, {});
-    });
-
-    expect(spy).toHaveBeenCalledWith({
-      id: `Person:${recordId}`,
-      fields: {},
-    });
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useObjectRecordBoard.test.tsx b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useObjectRecordBoard.test.tsx
deleted file mode 100644
index a294d9d598aa..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useObjectRecordBoard.test.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { ReactNode } from 'react';
-import { MockedProvider } from '@apollo/client/testing';
-import { renderHook } from '@testing-library/react';
-import { RecoilRoot } from 'recoil';
-
-import { useObjectRecordBoardDeprecated } from '@/object-record/hooks/useObjectRecordBoardDeprecated';
-import { RecordBoardDeprecatedScope } from '@/object-record/record-board-deprecated/scopes/RecordBoardDeprecatedScope';
-import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
-
-const recordBoardId = '783932a0-28c7-4607-b2ce-6543fa2be892';
-
-const Wrapper = ({ children }: { children: ReactNode }) => (
-  <RecoilRoot>
-    <RecordBoardDeprecatedScope recordBoardScopeId={recordBoardId}>
-      <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
-        <MockedProvider addTypename={false}>{children}</MockedProvider>
-      </SnackBarProviderScope>
-    </RecordBoardDeprecatedScope>
-  </RecoilRoot>
-);
-
-describe('useObjectRecordBoardDeprecated', () => {
-  it('should skip fetch if currentWorkspace is undefined', async () => {
-    const { result } = renderHook(() => useObjectRecordBoardDeprecated(), {
-      wrapper: Wrapper,
-    });
-
-    expect(result.current.loading).toBe(false);
-    expect(Array.isArray(result.current.opportunities)).toBe(true);
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecords.ts
index 5e133b86882f..1a62d1e46e49 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecords.ts
@@ -2,56 +2,84 @@ import { useApolloClient } from '@apollo/client';
 import { v4 } from 'uuid';
 
 import { triggerCreateRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerCreateRecordsOptimisticEffect';
+import { CachedObjectRecord } from '@/apollo/types/CachedObjectRecord';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
-import { useGenerateObjectRecordOptimisticResponse } from '@/object-record/cache/hooks/useGenerateObjectRecordOptimisticResponse';
-import { getCreateManyRecordsMutationResponseField } from '@/object-record/hooks/useGenerateCreateManyRecordMutation';
+import { useCreateOneRecordInCache } from '@/object-record/cache/hooks/useCreateOneRecordInCache';
+import { useCreateManyRecordsMutation } from '@/object-record/hooks/useCreateManyRecordsMutation';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { getCreateManyRecordsMutationResponseField } from '@/object-record/utils/getCreateManyRecordsMutationResponseField';
 import { sanitizeRecordInput } from '@/object-record/utils/sanitizeRecordInput';
+import { isDefined } from '~/utils/isDefined';
 
-type CreateManyRecordsOptions = {
-  skipOptimisticEffect?: boolean;
+type useCreateManyRecordsProps = {
+  objectNameSingular: string;
+  queryFields?: Record<string, any>;
+  depth?: number;
+  skipPostOptmisticEffect?: boolean;
 };
 
 export const useCreateManyRecords = <
   CreatedObjectRecord extends ObjectRecord = ObjectRecord,
 >({
   objectNameSingular,
-}: ObjectMetadataItemIdentifier) => {
+  queryFields,
+  depth = 1,
+  skipPostOptmisticEffect = false,
+}: useCreateManyRecordsProps) => {
   const apolloClient = useApolloClient();
 
-  const { objectMetadataItem, createManyRecordsMutation } =
-    useObjectMetadataItem({
-      objectNameSingular,
-    });
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
 
-  const { generateObjectRecordOptimisticResponse } =
-    useGenerateObjectRecordOptimisticResponse({
-      objectMetadataItem,
-    });
+  const { createManyRecordsMutation } = useCreateManyRecordsMutation({
+    objectNameSingular,
+    queryFields,
+    depth,
+  });
+
+  const createOneRecordInCache = useCreateOneRecordInCache<CachedObjectRecord>({
+    objectMetadataItem,
+  });
 
   const { objectMetadataItems } = useObjectMetadataItems();
 
   const createManyRecords = async (
-    data: Partial<CreatedObjectRecord>[],
-    options?: CreateManyRecordsOptions,
+    recordsToCreate: Partial<CreatedObjectRecord>[],
   ) => {
-    const sanitizedCreateManyRecordsInput = data.map((input) => {
-      const idForCreation = input.id ?? v4();
+    const sanitizedCreateManyRecordsInput = recordsToCreate.map(
+      (recordToCreate) => {
+        const idForCreation = recordToCreate?.id ?? v4();
+
+        return {
+          ...sanitizeRecordInput({
+            objectMetadataItem,
+            recordInput: recordToCreate,
+          }),
+          id: idForCreation,
+        };
+      },
+    );
 
-      const sanitizedRecordInput = sanitizeRecordInput({
-        objectMetadataItem,
-        recordInput: { ...input, id: idForCreation },
-      });
+    const recordsCreatedInCache = [];
 
-      return sanitizedRecordInput;
-    });
+    for (const recordToCreate of sanitizedCreateManyRecordsInput) {
+      const recordCreatedInCache = createOneRecordInCache(recordToCreate);
 
-    const optimisticallyCreatedRecords = sanitizedCreateManyRecordsInput.map(
-      (record) =>
-        generateObjectRecordOptimisticResponse<CreatedObjectRecord>(record),
-    );
+      if (isDefined(recordCreatedInCache)) {
+        recordsCreatedInCache.push(recordCreatedInCache);
+      }
+    }
+
+    if (recordsCreatedInCache.length > 0) {
+      triggerCreateRecordsOptimisticEffect({
+        cache: apolloClient.cache,
+        objectMetadataItem,
+        recordsToCreate: recordsCreatedInCache,
+        objectMetadataItems,
+      });
+    }
 
     const mutationResponseField = getCreateManyRecordsMutationResponseField(
       objectMetadataItem.namePlural,
@@ -62,25 +90,18 @@ export const useCreateManyRecords = <
       variables: {
         data: sanitizedCreateManyRecordsInput,
       },
-      optimisticResponse: options?.skipOptimisticEffect
-        ? undefined
-        : {
-            [mutationResponseField]: optimisticallyCreatedRecords,
-          },
-      update: options?.skipOptimisticEffect
-        ? undefined
-        : (cache, { data }) => {
-            const records = data?.[mutationResponseField];
-
-            if (!records?.length) return;
-
-            triggerCreateRecordsOptimisticEffect({
-              cache,
-              objectMetadataItem,
-              recordsToCreate: records,
-              objectMetadataItems,
-            });
-          },
+      update: (cache, { data }) => {
+        const records = data?.[mutationResponseField];
+
+        if (!records?.length || skipPostOptmisticEffect) return;
+
+        triggerCreateRecordsOptimisticEffect({
+          cache,
+          objectMetadataItem,
+          recordsToCreate: records,
+          objectMetadataItems,
+        });
+      },
     });
 
     return createdObjects.data?.[mutationResponseField] ?? [];
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecordsInCache.ts b/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecordsInCache.ts
deleted file mode 100644
index 426e4176f91c..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecordsInCache.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { v4 } from 'uuid';
-
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
-import { useAddRecordInCache } from '@/object-record/cache/hooks/useAddRecordInCache';
-import { useGenerateObjectRecordOptimisticResponse } from '@/object-record/cache/hooks/useGenerateObjectRecordOptimisticResponse';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-
-export const useCreateManyRecordsInCache = <T extends ObjectRecord>({
-  objectNameSingular,
-}: ObjectMetadataItemIdentifier) => {
-  const { objectMetadataItem } = useObjectMetadataItem({
-    objectNameSingular,
-  });
-
-  const { generateObjectRecordOptimisticResponse } =
-    useGenerateObjectRecordOptimisticResponse({
-      objectMetadataItem,
-    });
-
-  const addRecordInCache = useAddRecordInCache({
-    objectMetadataItem,
-  });
-
-  const createManyRecordsInCache = (data: Partial<T>[]) => {
-    const recordsWithId = data.map((record) => ({
-      ...record,
-      id: (record.id as string) ?? v4(),
-    }));
-
-    const createdRecordsInCache = [] as T[];
-
-    for (const record of recordsWithId) {
-      const generatedCachedObjectRecord =
-        generateObjectRecordOptimisticResponse<T>(record);
-
-      if (generatedCachedObjectRecord) {
-        addRecordInCache(generatedCachedObjectRecord);
-
-        createdRecordsInCache.push(generatedCachedObjectRecord);
-      }
-    }
-
-    return createdRecordsInCache;
-  };
-
-  return { createManyRecordsInCache };
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecordsMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecordsMutation.ts
new file mode 100644
index 000000000000..5c43384ad851
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecordsMutation.ts
@@ -0,0 +1,50 @@
+import gql from 'graphql-tag';
+import { useRecoilValue } from 'recoil';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
+import { getCreateManyRecordsMutationResponseField } from '@/object-record/utils/getCreateManyRecordsMutationResponseField';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const useCreateManyRecordsMutation = ({
+  objectNameSingular,
+  queryFields,
+  depth,
+}: {
+  objectNameSingular: string;
+  queryFields?: Record<string, any>;
+  depth?: number;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
+
+  if (isUndefinedOrNull(objectMetadataItem)) {
+    return { createManyRecordsMutation: EMPTY_MUTATION };
+  }
+
+  const mutationResponseField = getCreateManyRecordsMutationResponseField(
+    objectMetadataItem.namePlural,
+  );
+
+  const createManyRecordsMutation = gql`
+    mutation Create${capitalize(
+      objectMetadataItem.namePlural,
+    )}($data: [${capitalize(objectMetadataItem.nameSingular)}CreateInput!]!)  {
+      ${mutationResponseField}(data: $data) ${mapObjectMetadataToGraphQLQuery({
+        objectMetadataItems,
+        objectMetadataItem,
+        queryFields,
+        depth,
+      })}
+  }`;
+
+  return {
+    createManyRecordsMutation,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecord.ts
index 938f848a896d..ba227173d7cf 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecord.ts
@@ -2,55 +2,71 @@ import { useApolloClient } from '@apollo/client';
 import { v4 } from 'uuid';
 
 import { triggerCreateRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerCreateRecordsOptimisticEffect';
+import { CachedObjectRecord } from '@/apollo/types/CachedObjectRecord';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { useGenerateObjectRecordOptimisticResponse } from '@/object-record/cache/hooks/useGenerateObjectRecordOptimisticResponse';
-import { getCreateOneRecordMutationResponseField } from '@/object-record/hooks/useGenerateCreateOneRecordMutation';
+import { useCreateOneRecordInCache } from '@/object-record/cache/hooks/useCreateOneRecordInCache';
+import { useCreateOneRecordMutation } from '@/object-record/hooks/useCreateOneRecordMutation';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { getCreateOneRecordMutationResponseField } from '@/object-record/utils/getCreateOneRecordMutationResponseField';
 import { sanitizeRecordInput } from '@/object-record/utils/sanitizeRecordInput';
+import { isDefined } from '~/utils/isDefined';
 
 type useCreateOneRecordProps = {
   objectNameSingular: string;
-};
-
-type CreateOneRecordOptions = {
-  skipOptimisticEffect?: boolean;
+  queryFields?: Record<string, any>;
+  depth?: number;
+  skipPostOptmisticEffect?: boolean;
 };
 
 export const useCreateOneRecord = <
   CreatedObjectRecord extends ObjectRecord = ObjectRecord,
 >({
   objectNameSingular,
+  queryFields,
+  skipPostOptmisticEffect = false,
 }: useCreateOneRecordProps) => {
   const apolloClient = useApolloClient();
 
-  const { objectMetadataItem, createOneRecordMutation } = useObjectMetadataItem(
-    { objectNameSingular },
-  );
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
 
-  const { generateObjectRecordOptimisticResponse } =
-    useGenerateObjectRecordOptimisticResponse({
-      objectMetadataItem,
-    });
+  const { createOneRecordMutation } = useCreateOneRecordMutation({
+    objectNameSingular,
+    queryFields,
+  });
+
+  const createOneRecordInCache = useCreateOneRecordInCache<CachedObjectRecord>({
+    objectMetadataItem,
+  });
 
   const { objectMetadataItems } = useObjectMetadataItems();
 
-  const createOneRecord = async (
-    input: Partial<CreatedObjectRecord>,
-    options?: CreateOneRecordOptions,
-  ) => {
+  const createOneRecord = async (input: Partial<CreatedObjectRecord>) => {
     const idForCreation = input.id ?? v4();
 
-    const sanitizedCreateOneRecordInput = sanitizeRecordInput({
-      objectMetadataItem,
-      recordInput: { ...input, id: idForCreation },
+    const sanitizedInput = {
+      ...sanitizeRecordInput({
+        objectMetadataItem,
+        recordInput: input,
+      }),
+      id: idForCreation,
+    };
+
+    const recordCreatedInCache = createOneRecordInCache({
+      ...input,
+      id: idForCreation,
     });
 
-    const optimisticallyCreatedRecord =
-      generateObjectRecordOptimisticResponse<CreatedObjectRecord>({
-        ...input,
-        ...sanitizedCreateOneRecordInput,
+    if (isDefined(recordCreatedInCache)) {
+      triggerCreateRecordsOptimisticEffect({
+        cache: apolloClient.cache,
+        objectMetadataItem,
+        recordsToCreate: [recordCreatedInCache],
+        objectMetadataItems,
       });
+    }
 
     const mutationResponseField =
       getCreateOneRecordMutationResponseField(objectNameSingular);
@@ -58,27 +74,20 @@ export const useCreateOneRecord = <
     const createdObject = await apolloClient.mutate({
       mutation: createOneRecordMutation,
       variables: {
-        input: sanitizedCreateOneRecordInput,
+        input: sanitizedInput,
+      },
+      update: (cache, { data }) => {
+        const record = data?.[mutationResponseField];
+
+        if (!record || skipPostOptmisticEffect) return;
+
+        triggerCreateRecordsOptimisticEffect({
+          cache,
+          objectMetadataItem,
+          recordsToCreate: [record],
+          objectMetadataItems,
+        });
       },
-      optimisticResponse: options?.skipOptimisticEffect
-        ? undefined
-        : {
-            [mutationResponseField]: optimisticallyCreatedRecord,
-          },
-      update: options?.skipOptimisticEffect
-        ? undefined
-        : (cache, { data }) => {
-            const record = data?.[mutationResponseField];
-
-            if (!record) return;
-
-            triggerCreateRecordsOptimisticEffect({
-              cache,
-              objectMetadataItem,
-              recordsToCreate: [record],
-              objectMetadataItems,
-            });
-          },
     });
 
     return createdObject.data?.[mutationResponseField] ?? null;
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecordInCache.ts b/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecordInCache.ts
deleted file mode 100644
index ebd22838c45c..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecordInCache.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useAddRecordInCache } from '@/object-record/cache/hooks/useAddRecordInCache';
-import { useGenerateObjectRecordOptimisticResponse } from '@/object-record/cache/hooks/useGenerateObjectRecordOptimisticResponse';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-
-type useCreateOneRecordInCacheProps = {
-  objectNameSingular: string;
-};
-
-export const useCreateOneRecordInCache = <T>({
-  objectNameSingular,
-}: useCreateOneRecordInCacheProps) => {
-  const { objectMetadataItem } = useObjectMetadataItem({
-    objectNameSingular,
-  });
-
-  const { generateObjectRecordOptimisticResponse } =
-    useGenerateObjectRecordOptimisticResponse({
-      objectMetadataItem,
-    });
-
-  const addRecordInCache = useAddRecordInCache({
-    objectMetadataItem,
-  });
-
-  const createOneRecordInCache = (input: ObjectRecord) => {
-    const generatedCachedObjectRecord =
-      generateObjectRecordOptimisticResponse(input);
-
-    addRecordInCache(generatedCachedObjectRecord);
-
-    return generatedCachedObjectRecord as T;
-  };
-
-  return {
-    createOneRecordInCache,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecordMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecordMutation.ts
new file mode 100644
index 000000000000..679133685553
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecordMutation.ts
@@ -0,0 +1,51 @@
+import gql from 'graphql-tag';
+import { useRecoilValue } from 'recoil';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
+import { getCreateOneRecordMutationResponseField } from '@/object-record/utils/getCreateOneRecordMutationResponseField';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const useCreateOneRecordMutation = ({
+  objectNameSingular,
+  queryFields,
+  depth,
+}: {
+  objectNameSingular: string;
+  queryFields?: Record<string, any>;
+  depth?: number;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
+
+  if (isUndefinedOrNull(objectMetadataItem)) {
+    return { createOneRecordMutation: EMPTY_MUTATION };
+  }
+
+  const capitalizedObjectName = capitalize(objectMetadataItem.nameSingular);
+
+  const mutationResponseField = getCreateOneRecordMutationResponseField(
+    objectMetadataItem.nameSingular,
+  );
+
+  const createOneRecordMutation = gql`
+    mutation CreateOne${capitalizedObjectName}($input: ${capitalizedObjectName}CreateInput!)  {
+      ${mutationResponseField}(data: $input) ${mapObjectMetadataToGraphQLQuery({
+        objectMetadataItems,
+        objectMetadataItem,
+        queryFields,
+        depth,
+      })}
+    }
+  `;
+
+  return {
+    createOneRecordMutation,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts
index 7b2f392cf261..f189d516da1b 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts
@@ -3,8 +3,10 @@ import { useApolloClient } from '@apollo/client';
 import { triggerDeleteRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerDeleteRecordsOptimisticEffect';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { getDeleteManyRecordsMutationResponseField } from '@/object-record/hooks/useGenerateDeleteManyRecordMutation';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
+import { useDeleteManyRecordsMutation } from '@/object-record/hooks/useDeleteManyRecordsMutation';
+import { getDeleteManyRecordsMutationResponseField } from '@/object-record/utils/getDeleteManyRecordsMutationResponseField';
+import { isDefined } from '~/utils/isDefined';
 import { capitalize } from '~/utils/string/capitalize';
 
 type useDeleteOneRecordProps = {
@@ -21,8 +23,17 @@ export const useDeleteManyRecords = ({
 }: useDeleteOneRecordProps) => {
   const apolloClient = useApolloClient();
 
-  const { objectMetadataItem, deleteManyRecordsMutation, getRecordFromCache } =
-    useObjectMetadataItem({ objectNameSingular });
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const getRecordFromCache = useGetRecordFromCache({
+    objectNameSingular,
+  });
+
+  const { deleteManyRecordsMutation } = useDeleteManyRecordsMutation({
+    objectNameSingular,
+  });
 
   const { objectMetadataItems } = useObjectMetadataItems();
 
@@ -56,7 +67,7 @@ export const useDeleteManyRecords = ({
 
             const cachedRecords = records
               .map((record) => getRecordFromCache(record.id, cache))
-              .filter(isNonNullable);
+              .filter(isDefined);
 
             triggerDeleteRecordsOptimisticEffect({
               cache,
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecordsMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecordsMutation.ts
new file mode 100644
index 000000000000..2e13249be8aa
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecordsMutation.ts
@@ -0,0 +1,41 @@
+import gql from 'graphql-tag';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
+import { getDeleteManyRecordsMutationResponseField } from '@/object-record/utils/getDeleteManyRecordsMutationResponseField';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const useDeleteManyRecordsMutation = ({
+  objectNameSingular,
+}: {
+  objectNameSingular: string;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  if (isUndefinedOrNull(objectMetadataItem)) {
+    return { deleteManyRecordsMutation: EMPTY_MUTATION };
+  }
+
+  const capitalizedObjectName = capitalize(objectMetadataItem.namePlural);
+
+  const mutationResponseField = getDeleteManyRecordsMutationResponseField(
+    objectMetadataItem.namePlural,
+  );
+
+  const deleteManyRecordsMutation = gql`
+    mutation DeleteMany${capitalizedObjectName}($filter: ${capitalize(
+      objectMetadataItem.nameSingular,
+    )}FilterInput!)  {
+      ${mutationResponseField}(filter: $filter) {
+        id
+      }
+    }
+  `;
+
+  return {
+    deleteManyRecordsMutation,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useDeleteOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/useDeleteOneRecord.ts
index e43a30e85ade..bf7dcd778fd0 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useDeleteOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useDeleteOneRecord.ts
@@ -4,7 +4,9 @@ import { useApolloClient } from '@apollo/client';
 import { triggerDeleteRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerDeleteRecordsOptimisticEffect';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { getDeleteOneRecordMutationResponseField } from '@/object-record/utils/generateDeleteOneRecordMutation';
+import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
+import { useDeleteOneRecordMutation } from '@/object-record/hooks/useDeleteOneRecordMutation';
+import { getDeleteOneRecordMutationResponseField } from '@/object-record/utils/getDeleteOneRecordMutationResponseField';
 import { capitalize } from '~/utils/string/capitalize';
 
 type useDeleteOneRecordProps = {
@@ -17,8 +19,17 @@ export const useDeleteOneRecord = ({
 }: useDeleteOneRecordProps) => {
   const apolloClient = useApolloClient();
 
-  const { objectMetadataItem, deleteOneRecordMutation, getRecordFromCache } =
-    useObjectMetadataItem({ objectNameSingular });
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const getRecordFromCache = useGetRecordFromCache({
+    objectNameSingular,
+  });
+
+  const { deleteOneRecordMutation } = useDeleteOneRecordMutation({
+    objectNameSingular,
+  });
 
   const { objectMetadataItems } = useObjectMetadataItems();
 
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useDeleteOneRecordMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useDeleteOneRecordMutation.ts
new file mode 100644
index 000000000000..46dcb9422568
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/hooks/useDeleteOneRecordMutation.ts
@@ -0,0 +1,39 @@
+import gql from 'graphql-tag';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
+import { getDeleteOneRecordMutationResponseField } from '@/object-record/utils/getDeleteOneRecordMutationResponseField';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const useDeleteOneRecordMutation = ({
+  objectNameSingular,
+}: {
+  objectNameSingular: string;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  if (isUndefinedOrNull(objectMetadataItem)) {
+    return { deleteOneRecordMutation: EMPTY_MUTATION };
+  }
+
+  const capitalizedObjectName = capitalize(objectMetadataItem.nameSingular);
+
+  const mutationResponseField = getDeleteOneRecordMutationResponseField(
+    objectMetadataItem.nameSingular,
+  );
+
+  const deleteOneRecordMutation = gql`
+    mutation DeleteOne${capitalizedObjectName}($idToDelete: UUID!)  {
+      ${mutationResponseField}(id: $idToDelete) {
+        id
+      }
+    }
+  `;
+
+  return {
+    deleteOneRecordMutation,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useExecuteQuickActionOnOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/useExecuteQuickActionOnOneRecord.ts
index fc9884473e70..10b67d64182a 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useExecuteQuickActionOnOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useExecuteQuickActionOnOneRecord.ts
@@ -3,6 +3,8 @@ import { useApolloClient } from '@apollo/client';
 import { getOperationName } from '@apollo/client/utilities';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useExecuteQuickActionOnOneRecordMutation } from '@/object-record/hooks/useExecuteQuickActionOnOneRecordMutation';
+import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecordsQuery';
 import { capitalize } from '~/utils/string/capitalize';
 
 type useExecuteQuickActionOnOneRecordProps = {
@@ -12,11 +14,16 @@ type useExecuteQuickActionOnOneRecordProps = {
 export const useExecuteQuickActionOnOneRecord = <T>({
   objectNameSingular,
 }: useExecuteQuickActionOnOneRecordProps) => {
-  const {
-    objectMetadataItem,
-    executeQuickActionOnOneRecordMutation,
-    findManyRecordsQuery,
-  } = useObjectMetadataItem({
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { executeQuickActionOnOneRecordMutation } =
+    useExecuteQuickActionOnOneRecordMutation({
+      objectNameSingular,
+    });
+
+  const { findManyRecordsQuery } = useFindManyRecordsQuery({
     objectNameSingular,
   });
 
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useExecuteQuickActionOnOneRecordMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useExecuteQuickActionOnOneRecordMutation.ts
new file mode 100644
index 000000000000..38ed43f84c42
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/hooks/useExecuteQuickActionOnOneRecordMutation.ts
@@ -0,0 +1,53 @@
+import { gql } from '@apollo/client';
+import { useRecoilValue } from 'recoil';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const getExecuteQuickActionOnOneRecordMutationGraphQLField = ({
+  objectNameSingular,
+}: {
+  objectNameSingular: string;
+}) => {
+  return `executeQuickActionOn${capitalize(objectNameSingular)}`;
+};
+
+export const useExecuteQuickActionOnOneRecordMutation = ({
+  objectNameSingular,
+}: {
+  objectNameSingular: string;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
+
+  if (isUndefinedOrNull(objectMetadataItem)) {
+    return { executeQuickActionOnOneRecordMutation: EMPTY_MUTATION };
+  }
+
+  const capitalizedObjectName = capitalize(objectMetadataItem.nameSingular);
+
+  const graphQLFieldForExecuteQuickActionOnOneRecordMutation =
+    getExecuteQuickActionOnOneRecordMutationGraphQLField({
+      objectNameSingular: objectMetadataItem.nameSingular,
+    });
+
+  const executeQuickActionOnOneRecordMutation = gql`
+    mutation ExecuteQuickActionOnOne${capitalizedObjectName}($idToExecuteQuickActionOn: UUID!)  {
+       ${graphQLFieldForExecuteQuickActionOnOneRecordMutation}(id: $idToExecuteQuickActionOn) ${mapObjectMetadataToGraphQLQuery(
+         {
+           objectMetadataItems,
+           objectMetadataItem,
+         },
+       )}
+    }
+  `;
+
+  return { executeQuickActionOnOneRecordMutation };
+};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFieldContext.tsx b/packages/twenty-front/src/modules/object-record/hooks/useFieldContext.tsx
index 3429c83406e5..a2ea0646b173 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFieldContext.tsx
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFieldContext.tsx
@@ -2,6 +2,7 @@ import { ReactNode } from 'react';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
+import { getBasePathToShowPage } from '@/object-metadata/utils/getBasePathToShowPage';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
 import {
   FieldContext,
@@ -27,7 +28,11 @@ export const useFieldContext = ({
   objectRecordId: string;
   customUseUpdateOneObjectHook?: RecordUpdateHook;
 }) => {
-  const { basePathToShowPage, objectMetadataItem } = useObjectMetadataItem({
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const basePathToShowPage = getBasePathToShowPage({
     objectNameSingular,
   });
 
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindDuplicateRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindDuplicateRecords.ts
index 3a88f95ce871..f1c2efbec9d7 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFindDuplicateRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFindDuplicateRecords.ts
@@ -3,10 +3,11 @@ import { useQuery } from '@apollo/client';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
-import { getFindDuplicateRecordsQueryResponseField } from '@/object-record/hooks/useGenerateFindDuplicateRecordsQuery';
-import { useMapConnectionToRecords } from '@/object-record/hooks/useMapConnectionToRecords';
+import { getRecordsFromRecordConnection } from '@/object-record/cache/utils/getRecordsFromRecordConnection';
+import { useFindDuplicateRecordsQuery } from '@/object-record/hooks/useFindDuplicatesRecordsQuery';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
+import { getFindDuplicateRecordsQueryResponseField } from '@/object-record/utils/getFindDuplicateRecordsQueryResponseField';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { logError } from '~/utils/logError';
 
@@ -25,8 +26,14 @@ export const useFindDuplicateRecords = <T extends ObjectRecord = ObjectRecord>({
 }) => {
   const findDuplicateQueryStateIdentifier = objectNameSingular;
 
-  const { objectMetadataItem, findDuplicateRecordsQuery } =
-    useObjectMetadataItem({ objectNameSingular }, depth);
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { findDuplicateRecordsQuery } = useFindDuplicateRecordsQuery({
+    objectNameSingular,
+    depth,
+  });
 
   const { enqueueSnackBar } = useSnackBar();
 
@@ -60,16 +67,14 @@ export const useFindDuplicateRecords = <T extends ObjectRecord = ObjectRecord>({
 
   const objectRecordConnection = data?.[queryResponseField];
 
-  const mapConnectionToRecords = useMapConnectionToRecords();
-
   const records = useMemo(
     () =>
-      mapConnectionToRecords({
-        objectRecordConnection,
-        objectNameSingular,
-        depth: 5,
-      }) as T[],
-    [mapConnectionToRecords, objectRecordConnection, objectNameSingular],
+      objectRecordConnection
+        ? (getRecordsFromRecordConnection({
+            recordConnection: objectRecordConnection,
+          }) as T[])
+        : [],
+    [objectRecordConnection],
   );
 
   return {
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindDuplicatesRecordsQuery.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindDuplicatesRecordsQuery.ts
new file mode 100644
index 000000000000..ae0a89ba7bb2
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFindDuplicatesRecordsQuery.ts
@@ -0,0 +1,51 @@
+import gql from 'graphql-tag';
+import { useRecoilValue } from 'recoil';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { getFindDuplicateRecordsQueryResponseField } from '@/object-record/utils/getFindDuplicateRecordsQueryResponseField';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const useFindDuplicateRecordsQuery = ({
+  objectNameSingular,
+  depth,
+}: {
+  objectNameSingular: string;
+  depth?: number;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
+
+  const findDuplicateRecordsQuery = gql`
+    query FindDuplicate${capitalize(
+      objectMetadataItem.nameSingular,
+    )}($id: UUID) {
+      ${getFindDuplicateRecordsQueryResponseField(
+        objectMetadataItem.nameSingular,
+      )}(id: $id) {
+        edges {
+          node ${mapObjectMetadataToGraphQLQuery({
+            objectMetadataItems,
+            objectMetadataItem,
+            depth,
+          })}
+          cursor
+        }
+        pageInfo {
+          hasNextPage
+          startCursor
+          endCursor
+        }
+        totalCount
+      }
+    }
+  `;
+
+  return {
+    findDuplicateRecordsQuery,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts
index d3651828b8c5..c32e0c17f9cd 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts
@@ -7,13 +7,15 @@ import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
-import { useMapConnectionToRecords } from '@/object-record/hooks/useMapConnectionToRecords';
+import { getRecordsFromRecordConnection } from '@/object-record/cache/utils/getRecordsFromRecordConnection';
+import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecordsQuery';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
 import { ObjectRecordEdge } from '@/object-record/types/ObjectRecordEdge';
 import { ObjectRecordQueryVariables } from '@/object-record/types/ObjectRecordQueryVariables';
 import { filterUniqueRecordEdgesByCursor } from '@/object-record/utils/filterUniqueRecordEdgesByCursor';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { isDefined } from '~/utils/isDefined';
 import { logError } from '~/utils/logError';
 import { capitalize } from '~/utils/string/capitalize';
 
@@ -21,7 +23,6 @@ import { cursorFamilyState } from '../states/cursorFamilyState';
 import { hasNextPageFamilyState } from '../states/hasNextPageFamilyState';
 import { isFetchingMoreRecordsFamilyState } from '../states/isFetchingMoreRecordsFamilyState';
 import { ObjectRecordQueryResult } from '../types/ObjectRecordQueryResult';
-import { mapPaginatedRecordsToRecords } from '../utils/mapPaginatedRecordsToRecords';
 
 export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
   objectNameSingular,
@@ -30,17 +31,19 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
   limit,
   onCompleted,
   skip,
-  useRecordsWithoutConnection = false,
-  depth,
+  queryFields,
 }: ObjectMetadataItemIdentifier &
   ObjectRecordQueryVariables & {
     onCompleted?: (
-      data: ObjectRecordConnection<T>,
-      pageInfo: ObjectRecordConnection<T>['pageInfo'],
+      records: T[],
+      options?: {
+        pageInfo?: ObjectRecordConnection['pageInfo'];
+        totalCount?: number;
+      },
     ) => void;
     skip?: boolean;
-    useRecordsWithoutConnection?: boolean;
     depth?: number;
+    queryFields?: Record<string, any>;
   }) => {
   const findManyQueryStateIdentifier =
     objectNameSingular +
@@ -60,12 +63,14 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
     isFetchingMoreRecordsFamilyState(findManyQueryStateIdentifier),
   );
 
-  const { objectMetadataItem, findManyRecordsQuery } = useObjectMetadataItem(
-    {
-      objectNameSingular,
-    },
-    depth,
-  );
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { findManyRecordsQuery } = useFindManyRecordsQuery({
+    objectNameSingular,
+    queryFields,
+  });
 
   const { enqueueSnackBar } = useSnackBar();
   const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
@@ -80,11 +85,22 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
       orderBy,
     },
     onCompleted: (data) => {
+      if (!isDefined(data)) {
+        onCompleted?.([]);
+      }
+
       const pageInfo = data?.[objectMetadataItem.namePlural]?.pageInfo;
 
-      onCompleted?.(data[objectMetadataItem.namePlural], pageInfo);
+      const records = getRecordsFromRecordConnection({
+        recordConnection: data?.[objectMetadataItem.namePlural],
+      }) as T[];
+
+      onCompleted?.(records, {
+        pageInfo,
+        totalCount: data?.[objectMetadataItem.namePlural]?.totalCount,
+      });
 
-      if (data?.[objectMetadataItem.namePlural]) {
+      if (isDefined(data?.[objectMetadataItem.namePlural])) {
         setLastCursor(pageInfo.endCursor ?? '');
         setHasNextPage(pageInfo.hasNextPage ?? false);
       }
@@ -131,24 +147,24 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
 
             const pageInfo =
               fetchMoreResult?.[objectMetadataItem.namePlural]?.pageInfo;
-            if (data?.[objectMetadataItem.namePlural]) {
+
+            if (isDefined(data?.[objectMetadataItem.namePlural])) {
               setLastCursor(pageInfo.endCursor ?? '');
               setHasNextPage(pageInfo.hasNextPage ?? false);
             }
 
-            onCompleted?.(
-              {
-                __typename: `${capitalize(
-                  objectMetadataItem.nameSingular,
-                )}Connection`,
+            const records = getRecordsFromRecordConnection({
+              recordConnection: {
                 edges: newEdges,
-                pageInfo:
-                  fetchMoreResult?.[objectMetadataItem.namePlural].pageInfo,
-                totalCount:
-                  fetchMoreResult?.[objectMetadataItem.namePlural].totalCount,
+                pageInfo,
               },
+            }) as T[];
+
+            onCompleted?.(records, {
               pageInfo,
-            );
+              totalCount:
+                fetchMoreResult?.[objectMetadataItem.namePlural]?.totalCount,
+            });
 
             return Object.assign({}, prev, {
               [objectMetadataItem.namePlural]: {
@@ -195,40 +211,23 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
     enqueueSnackBar,
   ]);
 
-  // TODO: remove this and use only mapConnectionToRecords when we've finished the refactor
+  const totalCount = data?.[objectMetadataItem.namePlural].totalCount ?? 0;
+
   const records = useMemo(
     () =>
-      mapPaginatedRecordsToRecords({
-        pagedRecords: data,
-        objectNamePlural: objectMetadataItem.namePlural,
-      }) as T[],
-    [data, objectMetadataItem],
-  );
+      data?.[objectMetadataItem.namePlural]
+        ? getRecordsFromRecordConnection({
+            recordConnection: data?.[objectMetadataItem.namePlural],
+          })
+        : ([] as T[]),
 
-  const mapConnectionToRecords = useMapConnectionToRecords();
-
-  const recordsWithoutConnection = useMemo(
-    () =>
-      useRecordsWithoutConnection
-        ? (mapConnectionToRecords({
-            objectRecordConnection: data?.[objectMetadataItem.namePlural],
-            objectNameSingular,
-            depth: 5,
-          }) as T[])
-        : [],
-    [
-      data,
-      objectNameSingular,
-      objectMetadataItem.namePlural,
-      mapConnectionToRecords,
-      useRecordsWithoutConnection,
-    ],
+    [data, objectMetadataItem.namePlural],
   );
 
   return {
     objectMetadataItem,
-    records: useRecordsWithoutConnection ? recordsWithoutConnection : records,
-    totalCount: data?.[objectMetadataItem.namePlural].totalCount || 0,
+    records,
+    totalCount,
     loading,
     error,
     fetchMoreRecords,
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecordsQuery.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecordsQuery.ts
new file mode 100644
index 000000000000..e41481c41c3d
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecordsQuery.ts
@@ -0,0 +1,36 @@
+import { useRecoilValue } from 'recoil';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { QueryFields } from '@/object-record/query-keys/types/QueryFields';
+import { generateFindManyRecordsQuery } from '@/object-record/utils/generateFindManyRecordsQuery';
+
+export const useFindManyRecordsQuery = ({
+  objectNameSingular,
+  queryFields,
+  depth,
+  computeReferences,
+}: {
+  objectNameSingular: string;
+  queryFields?: QueryFields;
+  depth?: number;
+  computeReferences?: boolean;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
+
+  const findManyRecordsQuery = generateFindManyRecordsQuery({
+    objectMetadataItem,
+    objectMetadataItems,
+    queryFields,
+    depth,
+    computeReferences,
+  });
+
+  return {
+    findManyRecordsQuery,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts
index ade2c951e30d..acb2f92c45ed 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts
@@ -1,26 +1,33 @@
+import { useMemo } from 'react';
 import { useQuery } from '@apollo/client';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
+import { getRecordFromRecordNode } from '@/object-record/cache/utils/getRecordFromRecordNode';
+import { useFindOneRecordQuery } from '@/object-record/hooks/useFindOneRecordQuery';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { isDefined } from '~/utils/isDefined';
 
-// TODO: fix connection in relation => automatically change to an array
 export const useFindOneRecord = <T extends ObjectRecord = ObjectRecord>({
   objectNameSingular,
   objectRecordId = '',
   onCompleted,
-  depth,
   skip,
+  depth,
 }: ObjectMetadataItemIdentifier & {
   objectRecordId: string | undefined;
   onCompleted?: (data: T) => void;
   skip?: boolean;
   depth?: number;
 }) => {
-  const { objectMetadataItem, findOneRecordQuery } = useObjectMetadataItem(
-    { objectNameSingular },
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { findOneRecordQuery } = useFindOneRecordQuery({
+    objectNameSingular,
     depth,
-  );
+  });
 
   const { data, loading, error } = useQuery<
     { [nameSingular: string]: T },
@@ -28,11 +35,30 @@ export const useFindOneRecord = <T extends ObjectRecord = ObjectRecord>({
   >(findOneRecordQuery, {
     skip: !objectMetadataItem || !objectRecordId || skip,
     variables: { objectRecordId },
-    onCompleted: (data) => onCompleted?.(data[objectNameSingular]),
+    onCompleted: (data) => {
+      const recordWithoutConnection = getRecordFromRecordNode({
+        recordNode: { ...data[objectNameSingular] },
+      });
+
+      if (isDefined(recordWithoutConnection)) {
+        onCompleted?.(recordWithoutConnection);
+      }
+    },
   });
 
+  // TODO: Remove connection from record
+  const recordWithoutConnection = useMemo(
+    () =>
+      data?.[objectNameSingular]
+        ? getRecordFromRecordNode({
+            recordNode: data?.[objectNameSingular],
+          })
+        : undefined,
+    [data, objectNameSingular],
+  );
+
   return {
-    record: data?.[objectNameSingular] || undefined,
+    record: recordWithoutConnection,
     loading,
     error,
   };
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecordQuery.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecordQuery.ts
new file mode 100644
index 000000000000..87f141f5cbc1
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecordQuery.ts
@@ -0,0 +1,41 @@
+import gql from 'graphql-tag';
+import { useRecoilValue } from 'recoil';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const useFindOneRecordQuery = ({
+  objectNameSingular,
+  depth,
+}: {
+  objectNameSingular: string;
+  depth?: number;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
+
+  const findOneRecordQuery = gql`
+      query FindOne${capitalize(
+        objectMetadataItem.nameSingular,
+      )}($objectRecordId: UUID!) {
+        ${objectMetadataItem.nameSingular}(filter: {
+          id: {
+            eq: $objectRecordId
+          }
+        })${mapObjectMetadataToGraphQLQuery({
+          objectMetadataItems,
+          objectMetadataItem,
+          depth,
+        })}
+      }
+  `;
+
+  return {
+    findOneRecordQuery,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useGenerateCreateManyRecordMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useGenerateCreateManyRecordMutation.ts
deleted file mode 100644
index 1f9a92b4970e..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/useGenerateCreateManyRecordMutation.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { gql } from '@apollo/client';
-
-import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
-import { EMPTY_MUTATION } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const getCreateManyRecordsMutationResponseField = (
-  objectNamePlural: string,
-) => `create${capitalize(objectNamePlural)}`;
-
-export const useGenerateCreateManyRecordMutation = ({
-  objectMetadataItem,
-}: {
-  objectMetadataItem: ObjectMetadataItem;
-}) => {
-  const mapFieldMetadataToGraphQLQuery = useMapFieldMetadataToGraphQLQuery();
-
-  if (!objectMetadataItem) {
-    return EMPTY_MUTATION;
-  }
-
-  const mutationResponseField = getCreateManyRecordsMutationResponseField(
-    objectMetadataItem.namePlural,
-  );
-
-  return gql`
-    mutation Create${capitalize(
-      objectMetadataItem.namePlural,
-    )}($data: [${capitalize(objectMetadataItem.nameSingular)}CreateInput!]!)  {
-      ${mutationResponseField}(data: $data) { 
-        id
-        ${objectMetadataItem.fields
-          .map((field) =>
-            mapFieldMetadataToGraphQLQuery({
-              field,
-            }),
-          )
-          .join('\n')}
-    }
-  }`;
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useGenerateCreateOneRecordMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useGenerateCreateOneRecordMutation.ts
deleted file mode 100644
index cd607c83faac..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/useGenerateCreateOneRecordMutation.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { gql } from '@apollo/client';
-
-import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
-import { EMPTY_MUTATION } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const getCreateOneRecordMutationResponseField = (
-  objectNameSingular: string,
-) => `create${capitalize(objectNameSingular)}`;
-
-export const useGenerateCreateOneRecordMutation = ({
-  objectMetadataItem,
-}: {
-  objectMetadataItem: ObjectMetadataItem;
-}) => {
-  const mapFieldMetadataToGraphQLQuery = useMapFieldMetadataToGraphQLQuery();
-
-  if (!objectMetadataItem) {
-    return EMPTY_MUTATION;
-  }
-
-  const capitalizedObjectName = capitalize(objectMetadataItem.nameSingular);
-
-  const mutationResponseField = getCreateOneRecordMutationResponseField(
-    objectMetadataItem.nameSingular,
-  );
-
-  return gql`
-    mutation CreateOne${capitalizedObjectName}($input: ${capitalizedObjectName}CreateInput!)  {
-      ${mutationResponseField}(data: $input) {
-        id
-        ${objectMetadataItem.fields
-          .map((field) =>
-            mapFieldMetadataToGraphQLQuery({
-              field,
-            }),
-          )
-          .join('\n')}
-      }
-    }
-  `;
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useGenerateDeleteManyRecordMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useGenerateDeleteManyRecordMutation.ts
deleted file mode 100644
index af80fd645343..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/useGenerateDeleteManyRecordMutation.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { gql } from '@apollo/client';
-
-import { EMPTY_MUTATION } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const getDeleteManyRecordsMutationResponseField = (
-  objectNamePlural: string,
-) => `delete${capitalize(objectNamePlural)}`;
-
-export const useGenerateDeleteManyRecordMutation = ({
-  objectMetadataItem,
-}: {
-  objectMetadataItem: ObjectMetadataItem;
-}) => {
-  if (!objectMetadataItem) {
-    return EMPTY_MUTATION;
-  }
-
-  const capitalizedObjectName = capitalize(objectMetadataItem.namePlural);
-
-  const mutationResponseField = getDeleteManyRecordsMutationResponseField(
-    objectMetadataItem.namePlural,
-  );
-
-  return gql`
-    mutation DeleteMany${capitalizedObjectName}($filter: ${capitalize(
-      objectMetadataItem.nameSingular,
-    )}FilterInput!)  {
-      ${mutationResponseField}(filter: $filter) {
-        id
-      }
-    }
-  `;
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useGenerateExecuteQuickActionOnOneRecordMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useGenerateExecuteQuickActionOnOneRecordMutation.ts
deleted file mode 100644
index 743eee38f65d..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/useGenerateExecuteQuickActionOnOneRecordMutation.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { gql } from '@apollo/client';
-
-import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
-import { EMPTY_MUTATION } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const getExecuteQuickActionOnOneRecordMutationGraphQLField = ({
-  objectNameSingular,
-}: {
-  objectNameSingular: string;
-}) => {
-  return `executeQuickActionOn${capitalize(objectNameSingular)}`;
-};
-
-export const useGenerateExecuteQuickActionOnOneRecordMutation = ({
-  objectMetadataItem,
-}: {
-  objectMetadataItem: ObjectMetadataItem;
-}) => {
-  const mapFieldMetadataToGraphQLQuery = useMapFieldMetadataToGraphQLQuery();
-
-  if (!objectMetadataItem) {
-    return EMPTY_MUTATION;
-  }
-
-  const capitalizedObjectName = capitalize(objectMetadataItem.nameSingular);
-
-  const graphQLFieldForExecuteQuickActionOnOneRecordMutation =
-    getExecuteQuickActionOnOneRecordMutationGraphQLField({
-      objectNameSingular: objectMetadataItem.nameSingular,
-    });
-
-  return gql`
-    mutation ExecuteQuickActionOnOne${capitalizedObjectName}($idToExecuteQuickActionOn: ID!)  {
-       ${graphQLFieldForExecuteQuickActionOnOneRecordMutation}(id: $idToExecuteQuickActionOn) {
-        id
-        ${objectMetadataItem.fields
-          .map((field) =>
-            mapFieldMetadataToGraphQLQuery({
-              field,
-            }),
-          )
-          .join('\n')}
-      }
-    }
-  `;
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useGenerateFindDuplicateRecordsQuery.ts b/packages/twenty-front/src/modules/object-record/hooks/useGenerateFindDuplicateRecordsQuery.ts
deleted file mode 100644
index 0f5911b71c14..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/useGenerateFindDuplicateRecordsQuery.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { gql } from '@apollo/client';
-
-import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const getFindDuplicateRecordsQueryResponseField = (
-  objectNameSingular: string,
-) => `${objectNameSingular}Duplicates`;
-
-export const useGenerateFindDuplicateRecordsQuery = () => {
-  const mapFieldMetadataToGraphQLQuery = useMapFieldMetadataToGraphQLQuery();
-
-  return ({
-    objectMetadataItem,
-    depth,
-  }: {
-    objectMetadataItem: ObjectMetadataItem;
-    depth?: number;
-  }) => gql`
-    query FindDuplicate${capitalize(objectMetadataItem.nameSingular)}($id: ID) {
-      ${getFindDuplicateRecordsQueryResponseField(
-        objectMetadataItem.nameSingular,
-      )}(id: $id) {
-        edges {
-          node {
-            id
-            ${objectMetadataItem.fields
-              .map((field) =>
-                mapFieldMetadataToGraphQLQuery({
-                  field,
-                  maxDepthForRelations: depth,
-                }),
-              )
-              .join('\n')}
-          }
-          cursor
-        }
-        pageInfo {
-          hasNextPage
-          startCursor
-          endCursor
-        }
-        totalCount
-      }
-    }
-  `;
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery.ts b/packages/twenty-front/src/modules/object-record/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery.ts
deleted file mode 100644
index 3ae1bf241e27..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { gql } from '@apollo/client';
-
-import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { isNonEmptyArray } from '~/utils/isNonEmptyArray';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const useGenerateFindManyRecordsForMultipleMetadataItemsQuery = ({
-  objectMetadataItems,
-  depth,
-}: {
-  objectMetadataItems: ObjectMetadataItem[];
-  depth?: number;
-}) => {
-  const mapFieldMetadataToGraphQLQuery = useMapFieldMetadataToGraphQLQuery();
-
-  const capitalizedObjectNameSingulars = objectMetadataItems.map(
-    ({ nameSingular }) => capitalize(nameSingular),
-  );
-
-  if (!isNonEmptyArray(capitalizedObjectNameSingulars)) {
-    return null;
-  }
-
-  const filterPerMetadataItemArray = capitalizedObjectNameSingulars
-    .map(
-      (capitalizedObjectNameSingular) =>
-        `$filter${capitalizedObjectNameSingular}: ${capitalizedObjectNameSingular}FilterInput`,
-    )
-    .join(', ');
-
-  const orderByPerMetadataItemArray = capitalizedObjectNameSingulars
-    .map(
-      (capitalizedObjectNameSingular) =>
-        `$orderBy${capitalizedObjectNameSingular}: ${capitalizedObjectNameSingular}OrderByInput`,
-    )
-    .join(', ');
-
-  const lastCursorPerMetadataItemArray = capitalizedObjectNameSingulars
-    .map(
-      (capitalizedObjectNameSingular) =>
-        `$lastCursor${capitalizedObjectNameSingular}: String`,
-    )
-    .join(', ');
-
-  const limitPerMetadataItemArray = capitalizedObjectNameSingulars
-    .map(
-      (capitalizedObjectNameSingular) =>
-        `$limit${capitalizedObjectNameSingular}: Float = 5`,
-    )
-    .join(', ');
-
-  return gql`
-    query FindManyRecordsMultipleMetadataItems(
-      ${filterPerMetadataItemArray}, 
-      ${orderByPerMetadataItemArray}, 
-      ${lastCursorPerMetadataItemArray}, 
-      ${limitPerMetadataItemArray}
-    ) {
-      ${objectMetadataItems
-        .map(
-          ({ namePlural, nameSingular, fields }) =>
-            `${namePlural}(filter: $filter${capitalize(
-              nameSingular,
-            )}, orderBy: $orderBy${capitalize(
-              nameSingular,
-            )}, first: $limit${capitalize(
-              nameSingular,
-            )}, after: $lastCursor${capitalize(nameSingular)}){
-          edges {
-            node {
-              id
-              ${fields
-                .map((field) =>
-                  mapFieldMetadataToGraphQLQuery({
-                    field,
-                    maxDepthForRelations: depth,
-                  }),
-                )
-                .join('\n')}
-            }
-            cursor
-          }
-          pageInfo {
-            hasNextPage
-            startCursor
-            endCursor
-          }
-        }`,
-        )
-        .join('\n')}
-    }
-  `;
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useGenerateFindManyRecordsQuery.ts b/packages/twenty-front/src/modules/object-record/hooks/useGenerateFindManyRecordsQuery.ts
deleted file mode 100644
index 46cd279fc29a..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/useGenerateFindManyRecordsQuery.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { gql } from '@apollo/client';
-
-import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const useGenerateFindManyRecordsQuery = () => {
-  const mapFieldMetadataToGraphQLQuery = useMapFieldMetadataToGraphQLQuery();
-
-  return ({
-    objectMetadataItem,
-    depth,
-  }: {
-    objectMetadataItem: ObjectMetadataItem;
-    depth?: number;
-  }) => gql`
-    query FindMany${capitalize(
-      objectMetadataItem.namePlural,
-    )}($filter: ${capitalize(
-      objectMetadataItem.nameSingular,
-    )}FilterInput, $orderBy: ${capitalize(
-      objectMetadataItem.nameSingular,
-    )}OrderByInput, $lastCursor: String, $limit: Float) {
-      ${
-        objectMetadataItem.namePlural
-      }(filter: $filter, orderBy: $orderBy, first: $limit, after: $lastCursor){
-        edges {
-          node {
-            id
-            ${objectMetadataItem.fields
-              .map((field) =>
-                mapFieldMetadataToGraphQLQuery({
-                  field,
-                  maxDepthForRelations: depth,
-                }),
-              )
-              .join('\n')}
-          }
-          cursor
-        }
-        pageInfo {
-          hasNextPage
-          startCursor
-          endCursor
-        }
-        totalCount
-      }
-    }
-  `;
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useGenerateFindOneRecordQuery.ts b/packages/twenty-front/src/modules/object-record/hooks/useGenerateFindOneRecordQuery.ts
deleted file mode 100644
index aee59872abb1..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/useGenerateFindOneRecordQuery.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { gql } from '@apollo/client';
-
-import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-
-export const useGenerateFindOneRecordQuery = () => {
-  const mapFieldMetadataToGraphQLQuery = useMapFieldMetadataToGraphQLQuery();
-
-  return ({
-    objectMetadataItem,
-    depth,
-  }: {
-    objectMetadataItem: Pick<ObjectMetadataItem, 'nameSingular' | 'fields'>;
-    depth?: number;
-  }) => {
-    return gql`
-      query FindOne${objectMetadataItem.nameSingular}($objectRecordId: UUID!) {
-        ${objectMetadataItem.nameSingular}(filter: {
-          id: {
-            eq: $objectRecordId
-          }
-        }){
-          id
-          ${objectMetadataItem.fields
-            .map((field) =>
-              mapFieldMetadataToGraphQLQuery({
-                field,
-                maxDepthForRelations: depth,
-              }),
-            )
-            .join('\n')}
-        }
-      }
-  `;
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useGenerateUpdateOneRecordMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useGenerateUpdateOneRecordMutation.ts
deleted file mode 100644
index 8a00f1beef0c..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/useGenerateUpdateOneRecordMutation.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { gql } from '@apollo/client';
-
-import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
-import { EMPTY_MUTATION } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const getUpdateOneRecordMutationResponseField = (
-  objectNameSingular: string,
-) => `update${capitalize(objectNameSingular)}`;
-
-export const useGenerateUpdateOneRecordMutation = ({
-  objectMetadataItem,
-}: {
-  objectMetadataItem: ObjectMetadataItem;
-}) => {
-  const mapFieldMetadataToGraphQLQuery = useMapFieldMetadataToGraphQLQuery();
-
-  if (!objectMetadataItem) {
-    return EMPTY_MUTATION;
-  }
-
-  const capitalizedObjectName = capitalize(objectMetadataItem.nameSingular);
-
-  const mutationResponseField = getUpdateOneRecordMutationResponseField(
-    objectMetadataItem.nameSingular,
-  );
-
-  return gql`
-    mutation UpdateOne${capitalizedObjectName}($idToUpdate: ID!, $input: ${capitalizedObjectName}UpdateInput!)  {
-       ${mutationResponseField}(id: $idToUpdate, data: $input) {
-        id
-        ${objectMetadataItem.fields
-          .map((field) => mapFieldMetadataToGraphQLQuery({ field }))
-          .join('\n')}
-      }
-    }
-  `;
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useLazyFindOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/useLazyFindOneRecord.ts
new file mode 100644
index 000000000000..a97a4cca87d9
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/hooks/useLazyFindOneRecord.ts
@@ -0,0 +1,45 @@
+import { useLazyQuery } from '@apollo/client';
+
+import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
+import { getRecordFromRecordNode } from '@/object-record/cache/utils/getRecordFromRecordNode';
+import { useFindOneRecordQuery } from '@/object-record/hooks/useFindOneRecordQuery';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+
+type UseLazyFindOneRecordParams = ObjectMetadataItemIdentifier & {
+  depth?: number;
+};
+
+type FindOneRecordParams<T extends ObjectRecord> = {
+  objectRecordId: string | undefined;
+  onCompleted?: (data: T) => void;
+};
+
+export const useLazyFindOneRecord = <T extends ObjectRecord = ObjectRecord>({
+  objectNameSingular,
+  depth,
+}: UseLazyFindOneRecordParams) => {
+  const { findOneRecordQuery } = useFindOneRecordQuery({
+    objectNameSingular,
+    depth,
+  });
+
+  const [findOneRecord, { loading, error, data, called }] =
+    useLazyQuery(findOneRecordQuery);
+
+  return {
+    findOneRecord: ({ objectRecordId, onCompleted }: FindOneRecordParams<T>) =>
+      findOneRecord({
+        variables: { objectRecordId },
+        onCompleted: (data) => {
+          const record = getRecordFromRecordNode<T>({
+            recordNode: data[objectNameSingular],
+          });
+          onCompleted?.(record);
+        },
+      }),
+    called,
+    error,
+    loading,
+    record: data?.[objectNameSingular] || undefined,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useMapConnectionToRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useMapConnectionToRecords.ts
deleted file mode 100644
index 03b599846183..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/useMapConnectionToRecords.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import { useCallback } from 'react';
-import { isNonEmptyArray } from '@sniptt/guards';
-import { produce } from 'immer';
-import { useRecoilValue } from 'recoil';
-
-import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { parseFieldRelationType } from '@/object-metadata/utils/parseFieldRelationType';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
-import { FieldMetadataType } from '~/generated/graphql';
-import { isNonNullable } from '~/utils/isNonNullable';
-
-export const useMapConnectionToRecords = () => {
-  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
-
-  const mapConnectionToRecords = useCallback(
-    <T extends ObjectRecord>({
-      objectRecordConnection,
-      objectNameSingular,
-      objectNamePlural,
-      depth,
-    }: {
-      objectRecordConnection: ObjectRecordConnection<T> | undefined | null;
-      objectNameSingular?: string;
-      objectNamePlural?: string;
-      depth: number;
-    }): ObjectRecord[] => {
-      if (
-        !isNonNullable(objectRecordConnection) ||
-        !isNonEmptyArray(objectMetadataItems)
-      ) {
-        return [];
-      }
-
-      const currentLevelObjectMetadataItem = objectMetadataItems.find(
-        (objectMetadataItem) =>
-          objectMetadataItem.nameSingular === objectNameSingular ||
-          objectMetadataItem.namePlural === objectNamePlural,
-      );
-
-      if (!currentLevelObjectMetadataItem) {
-        throw new Error(
-          `Could not find object metadata item for object name singular "${objectNameSingular}" in mapConnectionToRecords`,
-        );
-      }
-
-      const relationFields = currentLevelObjectMetadataItem.fields.filter(
-        (field) => field.type === FieldMetadataType.Relation,
-      );
-
-      const objectRecords = [
-        ...(objectRecordConnection.edges?.map((edge) => edge.node) ?? []),
-      ];
-
-      return produce(objectRecords, (objectRecordsDraft) => {
-        for (const objectRecordDraft of objectRecordsDraft) {
-          for (const relationField of relationFields) {
-            const relationType = parseFieldRelationType(relationField);
-
-            if (
-              relationType === 'TO_ONE_OBJECT' ||
-              relationType === 'FROM_ONE_OBJECT'
-            ) {
-              continue;
-            }
-
-            const relatedObjectMetadataSingularName =
-              relationField.toRelationMetadata?.fromObjectMetadata
-                .nameSingular ??
-              relationField.fromRelationMetadata?.toObjectMetadata
-                .nameSingular ??
-              null;
-
-            const relationFieldMetadataItem = objectMetadataItems.find(
-              (objectMetadataItem) =>
-                objectMetadataItem.nameSingular ===
-                relatedObjectMetadataSingularName,
-            );
-
-            if (
-              !relationFieldMetadataItem ||
-              !isNonNullable(relatedObjectMetadataSingularName)
-            ) {
-              throw new Error(
-                `Could not find relation object metadata item for object name plural ${relationField.name} in mapConnectionToRecords`,
-              );
-            }
-
-            const relationConnection = objectRecordDraft?.[
-              relationField.name
-            ] as ObjectRecordConnection | undefined | null;
-
-            if (!isNonNullable(relationConnection)) {
-              continue;
-            }
-
-            const relationConnectionMappedToRecords = mapConnectionToRecords({
-              objectRecordConnection: relationConnection,
-              objectNameSingular: relatedObjectMetadataSingularName,
-              depth: depth - 1,
-            });
-
-            (objectRecordDraft as any)[relationField.name] =
-              relationConnectionMappedToRecords;
-          }
-        }
-      }) as ObjectRecord[];
-    },
-    [objectMetadataItems],
-  );
-
-  return mapConnectionToRecords;
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useObjectRecordBoardDeprecated.ts b/packages/twenty-front/src/modules/object-record/hooks/useObjectRecordBoardDeprecated.ts
deleted file mode 100644
index 84c6d3112339..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/useObjectRecordBoardDeprecated.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import { useCallback } from 'react';
-import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
-
-import { Company } from '@/companies/types/Company';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { turnSortsIntoOrderBy } from '@/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy';
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { turnObjectDropdownFilterIntoQueryFilter } from '@/object-record/record-filter/utils/turnObjectDropdownFilterIntoQueryFilter';
-import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
-import { Opportunity } from '@/pipeline/types/Opportunity';
-import { PipelineStep } from '@/pipeline/types/PipelineStep';
-
-import { useFindManyRecords } from './useFindManyRecords';
-
-export const useObjectRecordBoardDeprecated = () => {
-  const objectNameSingular = 'opportunity';
-
-  const { objectMetadataItem: foundObjectMetadataItem } = useObjectMetadataItem(
-    {
-      objectNameSingular,
-    },
-  );
-
-  const {
-    isBoardLoadedState,
-    boardFiltersState,
-    boardSortsState,
-    savedCompaniesState,
-    savedOpportunitiesState,
-    savedPipelineStepsState,
-  } = useRecordBoardDeprecatedScopedStates();
-
-  const setIsBoardLoaded = useSetRecoilState(isBoardLoadedState);
-
-  const boardFilters = useRecoilValue(boardFiltersState);
-  const boardSorts = useRecoilValue(boardSortsState);
-
-  const setSavedCompanies = useSetRecoilState(savedCompaniesState);
-
-  const [savedOpportunities] = useRecoilState(savedOpportunitiesState);
-
-  const [savedPipelineSteps, setSavedPipelineSteps] = useRecoilState(
-    savedPipelineStepsState,
-  );
-
-  const filter = turnObjectDropdownFilterIntoQueryFilter(
-    boardFilters,
-    foundObjectMetadataItem?.fields ?? [],
-  );
-  const orderBy = turnSortsIntoOrderBy(
-    boardSorts,
-    foundObjectMetadataItem?.fields ?? [],
-  );
-
-  useFindManyRecords({
-    objectNameSingular: CoreObjectNameSingular.PipelineStep,
-    filter,
-    onCompleted: useCallback(
-      (data: ObjectRecordConnection<PipelineStep>) => {
-        setSavedPipelineSteps(data.edges.map((edge) => edge.node));
-      },
-      [setSavedPipelineSteps],
-    ),
-  });
-
-  const {
-    records: opportunities,
-    loading,
-    fetchMoreRecords: fetchMoreOpportunities,
-  } = useFindManyRecords<Opportunity>({
-    skip: !savedPipelineSteps.length,
-    objectNameSingular: CoreObjectNameSingular.Opportunity,
-    filter,
-    orderBy,
-    onCompleted: useCallback(() => {
-      setIsBoardLoaded(true);
-    }, [setIsBoardLoaded]),
-  });
-
-  const { fetchMoreRecords: fetchMoreCompanies } = useFindManyRecords({
-    skip: !savedOpportunities.length,
-    objectNameSingular: CoreObjectNameSingular.Company,
-    filter: {
-      id: {
-        in: savedOpportunities.map(
-          (opportunity) => opportunity.companyId || '',
-        ),
-      },
-    },
-    onCompleted: useCallback(
-      (data: ObjectRecordConnection<Company>) => {
-        setSavedCompanies(data.edges.map((edge) => edge.node));
-      },
-      [setSavedCompanies],
-    ),
-  });
-
-  return {
-    opportunities,
-    loading,
-    fetchMoreOpportunities,
-    fetchMoreCompanies,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useUpdateOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/useUpdateOneRecord.ts
index c76431c24cc5..a9c50331ba31 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useUpdateOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useUpdateOneRecord.ts
@@ -3,29 +3,40 @@ import { useApolloClient } from '@apollo/client';
 import { triggerUpdateRecordOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffect';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { useGenerateObjectRecordOptimisticResponse } from '@/object-record/cache/hooks/useGenerateObjectRecordOptimisticResponse';
-import { getUpdateOneRecordMutationResponseField } from '@/object-record/hooks/useGenerateUpdateOneRecordMutation';
+import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
+import { getRecordNodeFromRecord } from '@/object-record/cache/utils/getRecordNodeFromRecord';
+import { updateRecordFromCache } from '@/object-record/cache/utils/updateRecordFromCache';
+import { useUpdateOneRecordMutation } from '@/object-record/hooks/useUpdateOneRecordMutation';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { getUpdateOneRecordMutationResponseField } from '@/object-record/utils/getUpdateOneRecordMutationResponseField';
 import { sanitizeRecordInput } from '@/object-record/utils/sanitizeRecordInput';
 
 type useUpdateOneRecordProps = {
   objectNameSingular: string;
+  queryFields?: Record<string, any>;
+  depth?: number;
 };
 
 export const useUpdateOneRecord = <
   UpdatedObjectRecord extends ObjectRecord = ObjectRecord,
 >({
   objectNameSingular,
+  queryFields,
+  depth = 1,
 }: useUpdateOneRecordProps) => {
   const apolloClient = useApolloClient();
 
-  const { objectMetadataItem, updateOneRecordMutation, getRecordFromCache } =
-    useObjectMetadataItem({ objectNameSingular });
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
 
-  const { generateObjectRecordOptimisticResponse } =
-    useGenerateObjectRecordOptimisticResponse({
-      objectMetadataItem,
-    });
+  const getRecordFromCache = useGetRecordFromCache({
+    objectNameSingular,
+  });
+
+  const { updateOneRecordMutation } = useUpdateOneRecordMutation({
+    objectNameSingular,
+  });
 
   const { objectMetadataItems } = useObjectMetadataItems();
 
@@ -36,17 +47,57 @@ export const useUpdateOneRecord = <
     idToUpdate: string;
     updateOneRecordInput: Partial<Omit<UpdatedObjectRecord, 'id'>>;
   }) => {
+    const sanitizedInput = {
+      ...sanitizeRecordInput({
+        objectMetadataItem,
+        recordInput: updateOneRecordInput,
+      }),
+    };
+
     const cachedRecord = getRecordFromCache<UpdatedObjectRecord>(idToUpdate);
 
-    const sanitizedUpdateOneRecordInput = sanitizeRecordInput({
+    const cachedRecordWithConnection = getRecordNodeFromRecord<ObjectRecord>({
+      record: cachedRecord,
+      objectMetadataItem,
+      objectMetadataItems,
+      depth,
+      queryFields,
+      computeReferences: true,
+    });
+
+    const optimisticRecord = {
+      ...cachedRecord,
+      ...sanitizedInput,
+      ...{ id: idToUpdate },
+    };
+
+    const optimisticRecordWithConnection =
+      getRecordNodeFromRecord<ObjectRecord>({
+        record: optimisticRecord,
+        objectMetadataItem,
+        objectMetadataItems,
+        depth,
+        queryFields,
+        computeReferences: true,
+      });
+
+    if (!optimisticRecordWithConnection || !cachedRecordWithConnection) {
+      return null;
+    }
+
+    updateRecordFromCache({
+      objectMetadataItems,
       objectMetadataItem,
-      recordInput: updateOneRecordInput,
+      cache: apolloClient.cache,
+      record: optimisticRecord,
     });
 
-    const optimisticallyUpdatedRecord = generateObjectRecordOptimisticResponse({
-      ...(cachedRecord ?? {}),
-      ...sanitizedUpdateOneRecordInput,
-      id: idToUpdate,
+    triggerUpdateRecordOptimisticEffect({
+      cache: apolloClient.cache,
+      objectMetadataItem,
+      currentRecord: cachedRecordWithConnection,
+      updatedRecord: optimisticRecordWithConnection,
+      objectMetadataItems,
     });
 
     const mutationResponseField =
@@ -56,10 +107,7 @@ export const useUpdateOneRecord = <
       mutation: updateOneRecordMutation,
       variables: {
         idToUpdate,
-        input: sanitizedUpdateOneRecordInput,
-      },
-      optimisticResponse: {
-        [mutationResponseField]: optimisticallyUpdatedRecord,
+        input: sanitizedInput,
       },
       update: (cache, { data }) => {
         const record = data?.[mutationResponseField];
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useUpdateOneRecordMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useUpdateOneRecordMutation.ts
new file mode 100644
index 000000000000..04bf3967375e
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/hooks/useUpdateOneRecordMutation.ts
@@ -0,0 +1,53 @@
+import gql from 'graphql-tag';
+import { useRecoilValue } from 'recoil';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
+import { getUpdateOneRecordMutationResponseField } from '@/object-record/utils/getUpdateOneRecordMutationResponseField';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const useUpdateOneRecordMutation = ({
+  objectNameSingular,
+  computeReferences = false,
+  depth,
+}: {
+  objectNameSingular: string;
+  computeReferences?: boolean;
+  depth?: number;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
+
+  if (isUndefinedOrNull(objectMetadataItem)) {
+    return { updateOneRecordMutation: EMPTY_MUTATION };
+  }
+
+  const capitalizedObjectName = capitalize(objectMetadataItem.nameSingular);
+
+  const mutationResponseField = getUpdateOneRecordMutationResponseField(
+    objectMetadataItem.nameSingular,
+  );
+
+  const updateOneRecordMutation = gql`
+    mutation UpdateOne${capitalizedObjectName}($idToUpdate: UUID!, $input: ${capitalizedObjectName}UpdateInput!)  {
+       ${mutationResponseField}(id: $idToUpdate, data: $input) ${mapObjectMetadataToGraphQLQuery(
+         {
+           objectMetadataItems,
+           objectMetadataItem,
+           depth,
+           computeReferences,
+         },
+       )}
+    }
+  `;
+
+  return {
+    updateOneRecordMutation,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useUpsertRecordFieldFromState.ts b/packages/twenty-front/src/modules/object-record/hooks/useUpsertRecordFieldFromState.ts
deleted file mode 100644
index b89bb5e3b265..000000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/useUpsertRecordFieldFromState.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useRecoilCallback } from 'recoil';
-
-import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
-import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
-
-export const useUpsertRecordFieldFromState = () =>
-  useRecoilCallback(
-    ({ set }) =>
-      <T extends { id: string }, F extends keyof T>({
-        record,
-        fieldName,
-      }: {
-        record: T;
-        fieldName: F extends string ? F : never;
-      }) =>
-        set(
-          recordStoreFamilySelector({ recordId: record.id, fieldName }),
-          (previousField) =>
-            isDeeplyEqual(previousField, record[fieldName])
-              ? previousField
-              : record[fieldName],
-        ),
-    [],
-  );
diff --git a/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/useFindManyRecordsForMultipleMetadataItems.ts b/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/useFindManyRecordsForMultipleMetadataItems.ts
new file mode 100644
index 000000000000..3640dee6a618
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/useFindManyRecordsForMultipleMetadataItems.ts
@@ -0,0 +1,44 @@
+import { useQuery } from '@apollo/client';
+
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { getRecordsFromRecordConnection } from '@/object-record/cache/utils/getRecordsFromRecordConnection';
+import { EMPTY_QUERY } from '@/object-record/constants/EmptyQuery';
+import { useGenerateFindManyRecordsForMultipleMetadataItemsQuery } from '@/object-record/multiple-objects/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery';
+import { MultiObjectRecordQueryResult } from '@/object-record/relation-picker/hooks/useMultiObjectRecordsQueryResultFormattedAsObjectRecordForSelectArray';
+
+export const useFindManyRecordsForMultipleMetadataItems = ({
+  objectMetadataItems,
+  skip = false,
+  depth = 2,
+}: {
+  objectMetadataItems: ObjectMetadataItem[];
+  skip: boolean;
+  depth?: number;
+}) => {
+  const findManyQuery = useGenerateFindManyRecordsForMultipleMetadataItemsQuery(
+    {
+      targetObjectMetadataItems: objectMetadataItems,
+      depth,
+    },
+  );
+
+  const { data } = useQuery<MultiObjectRecordQueryResult>(
+    findManyQuery ?? EMPTY_QUERY,
+    {
+      skip,
+    },
+  );
+
+  const resultWithoutConnection = Object.fromEntries(
+    Object.entries(data ?? {}).map(([namePlural, objectRecordConnection]) => [
+      namePlural,
+      getRecordsFromRecordConnection({
+        recordConnection: objectRecordConnection,
+      }),
+    ]),
+  );
+
+  return {
+    result: resultWithoutConnection,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery.ts b/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery.ts
new file mode 100644
index 000000000000..60b1ca38f086
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery.ts
@@ -0,0 +1,92 @@
+import { gql } from '@apollo/client';
+import { useRecoilValue } from 'recoil';
+
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { isNonEmptyArray } from '~/utils/isNonEmptyArray';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const useGenerateFindManyRecordsForMultipleMetadataItemsQuery = ({
+  targetObjectMetadataItems,
+  depth,
+}: {
+  targetObjectMetadataItems: ObjectMetadataItem[];
+  depth?: number;
+}) => {
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
+  const capitalizedObjectNameSingulars = targetObjectMetadataItems.map(
+    ({ nameSingular }) => capitalize(nameSingular),
+  );
+
+  if (!isNonEmptyArray(capitalizedObjectNameSingulars)) {
+    return null;
+  }
+
+  const filterPerMetadataItemArray = capitalizedObjectNameSingulars
+    .map(
+      (capitalizedObjectNameSingular) =>
+        `$filter${capitalizedObjectNameSingular}: ${capitalizedObjectNameSingular}FilterInput`,
+    )
+    .join(', ');
+
+  const orderByPerMetadataItemArray = capitalizedObjectNameSingulars
+    .map(
+      (capitalizedObjectNameSingular) =>
+        `$orderBy${capitalizedObjectNameSingular}: ${capitalizedObjectNameSingular}OrderByInput`,
+    )
+    .join(', ');
+
+  const lastCursorPerMetadataItemArray = capitalizedObjectNameSingulars
+    .map(
+      (capitalizedObjectNameSingular) =>
+        `$lastCursor${capitalizedObjectNameSingular}: String`,
+    )
+    .join(', ');
+
+  const limitPerMetadataItemArray = capitalizedObjectNameSingulars
+    .map(
+      (capitalizedObjectNameSingular) =>
+        `$limit${capitalizedObjectNameSingular}: Float`,
+    )
+    .join(', ');
+
+  return gql`
+    query FindManyRecordsMultipleMetadataItems(
+      ${filterPerMetadataItemArray}, 
+      ${orderByPerMetadataItemArray}, 
+      ${lastCursorPerMetadataItemArray}, 
+      ${limitPerMetadataItemArray}
+    ) {
+      ${targetObjectMetadataItems
+        .map(
+          (objectMetadataItem) =>
+            `${objectMetadataItem.namePlural}(filter: $filter${capitalize(
+              objectMetadataItem.nameSingular,
+            )}, orderBy: $orderBy${capitalize(
+              objectMetadataItem.nameSingular,
+            )}, first: $limit${capitalize(
+              objectMetadataItem.nameSingular,
+            )}, after: $lastCursor${capitalize(
+              objectMetadataItem.nameSingular,
+            )}){
+          edges {
+            node ${mapObjectMetadataToGraphQLQuery({
+              objectMetadataItems: objectMetadataItems,
+              objectMetadataItem,
+              depth,
+            })}
+            cursor
+          }
+          pageInfo {
+            hasNextPage
+            startCursor
+            endCursor
+          }
+          totalCount
+        }`,
+        )
+        .join('\n')}
+    }
+  `;
+};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton.tsx
index 0de22274d78e..1fb257f79baf 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton.tsx
@@ -1,6 +1,7 @@
+import { IconPlus } from 'twenty-ui';
+
 import { OBJECT_FILTER_DROPDOWN_ID } from '@/object-record/object-filter-dropdown/constants/ObjectFilterDropdownId';
 import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
-import { IconPlus } from '@/ui/display/icon';
 import { LightButton } from '@/ui/input/button/components/LightButton';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx
index 67dc3c3d4d48..1ab04fd6820e 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx
@@ -1,13 +1,16 @@
-import { ObjectFilterDropdownRecordSearchInput } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchInput';
+import { useRecoilValue } from 'recoil';
+
+import { ObjectFilterDropdownSearchInput } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownSearchInput';
 import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 
 import { MultipleFiltersDropdownFilterOnFilterChangedEffect } from './MultipleFiltersDropdownFilterOnFilterChangedEffect';
-import { ObjectFilterDropdownDateSearchInput } from './ObjectFilterDropdownDateSearchInput';
+import { ObjectFilterDropdownDateInput } from './ObjectFilterDropdownDateInput';
 import { ObjectFilterDropdownFilterSelect } from './ObjectFilterDropdownFilterSelect';
-import { ObjectFilterDropdownNumberSearchInput } from './ObjectFilterDropdownNumberSearchInput';
+import { ObjectFilterDropdownNumberInput } from './ObjectFilterDropdownNumberInput';
 import { ObjectFilterDropdownOperandButton } from './ObjectFilterDropdownOperandButton';
 import { ObjectFilterDropdownOperandSelect } from './ObjectFilterDropdownOperandSelect';
+import { ObjectFilterDropdownOptionSelect } from './ObjectFilterDropdownOptionSelect';
 import { ObjectFilterDropdownRecordSelect } from './ObjectFilterDropdownRecordSelect';
 import { ObjectFilterDropdownTextSearchInput } from './ObjectFilterDropdownTextSearchInput';
 
@@ -19,11 +22,21 @@ export const MultipleFiltersDropdownContent = ({
   filterDropdownId,
 }: MultipleFiltersDropdownContentProps) => {
   const {
-    isObjectFilterDropdownOperandSelectUnfolded,
-    filterDefinitionUsedInDropdown,
-    selectedOperandInDropdown,
+    isObjectFilterDropdownOperandSelectUnfoldedState,
+    filterDefinitionUsedInDropdownState,
+    selectedOperandInDropdownState,
   } = useFilterDropdown({ filterDropdownId });
 
+  const isObjectFilterDropdownOperandSelectUnfolded = useRecoilValue(
+    isObjectFilterDropdownOperandSelectUnfoldedState,
+  );
+  const filterDefinitionUsedInDropdown = useRecoilValue(
+    filterDefinitionUsedInDropdownState,
+  );
+  const selectedOperandInDropdown = useRecoilValue(
+    selectedOperandInDropdownState,
+  );
+
   return (
     <>
       {!filterDefinitionUsedInDropdown ? (
@@ -35,22 +48,36 @@ export const MultipleFiltersDropdownContent = ({
           <>
             <ObjectFilterDropdownOperandButton />
             <DropdownMenuSeparator />
-            {['TEXT', 'EMAIL', 'PHONE', 'FULL_NAME', 'LINK'].includes(
-              filterDefinitionUsedInDropdown.type,
-            ) && <ObjectFilterDropdownTextSearchInput />}
+            {[
+              'TEXT',
+              'EMAIL',
+              'PHONE',
+              'FULL_NAME',
+              'LINK',
+              'ADDRESS',
+            ].includes(filterDefinitionUsedInDropdown.type) && (
+              <ObjectFilterDropdownTextSearchInput />
+            )}
             {['NUMBER', 'CURRENCY'].includes(
               filterDefinitionUsedInDropdown.type,
-            ) && <ObjectFilterDropdownNumberSearchInput />}
+            ) && <ObjectFilterDropdownNumberInput />}
             {filterDefinitionUsedInDropdown.type === 'DATE_TIME' && (
-              <ObjectFilterDropdownDateSearchInput />
+              <ObjectFilterDropdownDateInput />
             )}
             {filterDefinitionUsedInDropdown.type === 'RELATION' && (
               <>
-                <ObjectFilterDropdownRecordSearchInput />
+                <ObjectFilterDropdownSearchInput />
                 <DropdownMenuSeparator />
                 <ObjectFilterDropdownRecordSelect />
               </>
             )}
+            {filterDefinitionUsedInDropdown.type === 'SELECT' && (
+              <>
+                <ObjectFilterDropdownSearchInput />
+                <DropdownMenuSeparator />
+                <ObjectFilterDropdownOptionSelect />
+              </>
+            )}
           </>
         )
       )}
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton.tsx
index 0a4a16e62b41..3b5672783714 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton.tsx
@@ -1,3 +1,5 @@
+import { useRecoilValue } from 'recoil';
+
 import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
 import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
@@ -14,9 +16,14 @@ export const ObjectFilterDropdownButton = ({
   filterDropdownId,
   hotkeyScope,
 }: ObjectFilterDropdownButtonProps) => {
-  const { availableFilterDefinitions } = useFilterDropdown({
+  const { availableFilterDefinitionsState } = useFilterDropdown({
     filterDropdownId: filterDropdownId,
   });
+
+  const availableFilterDefinitions = useRecoilValue(
+    availableFilterDefinitionsState,
+  );
+
   const hasOnlyOneEntityFilter =
     availableFilterDefinitions.length === 1 &&
     availableFilterDefinitions[0].type === 'RELATION';
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx
new file mode 100644
index 000000000000..11c9f1ab2820
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx
@@ -0,0 +1,43 @@
+import { useRecoilValue } from 'recoil';
+
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { InternalDatePicker } from '@/ui/input/components/internal/date/components/InternalDatePicker';
+import { isDefined } from '~/utils/isDefined';
+
+export const ObjectFilterDropdownDateInput = () => {
+  const {
+    filterDefinitionUsedInDropdownState,
+    selectedOperandInDropdownState,
+    setIsObjectFilterDropdownUnfolded,
+    selectFilter,
+  } = useFilterDropdown();
+
+  const filterDefinitionUsedInDropdown = useRecoilValue(
+    filterDefinitionUsedInDropdownState,
+  );
+  const selectedOperandInDropdown = useRecoilValue(
+    selectedOperandInDropdownState,
+  );
+
+  const handleChange = (date: Date | null) => {
+    if (!filterDefinitionUsedInDropdown || !selectedOperandInDropdown) return;
+
+    selectFilter?.({
+      fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
+      value: isDefined(date) ? date.toISOString() : '',
+      operand: selectedOperandInDropdown,
+      displayValue: isDefined(date) ? date.toLocaleString() : '',
+      definition: filterDefinitionUsedInDropdown,
+    });
+
+    setIsObjectFilterDropdownUnfolded(false);
+  };
+
+  return (
+    <InternalDatePicker
+      date={new Date()}
+      onChange={handleChange}
+      onMouseSelect={handleChange}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateSearchInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateSearchInput.tsx
deleted file mode 100644
index f397312f4b2b..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateSearchInput.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
-import { InternalDatePicker } from '@/ui/input/components/internal/date/components/InternalDatePicker';
-import { isNonNullable } from '~/utils/isNonNullable';
-
-export const ObjectFilterDropdownDateSearchInput = () => {
-  const {
-    filterDefinitionUsedInDropdown,
-    selectedOperandInDropdown,
-    setIsObjectFilterDropdownUnfolded,
-    selectFilter,
-  } = useFilterDropdown();
-
-  const handleChange = (date: Date | null) => {
-    if (!filterDefinitionUsedInDropdown || !selectedOperandInDropdown) return;
-
-    selectFilter?.({
-      fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
-      value: isNonNullable(date) ? date.toISOString() : '',
-      operand: selectedOperandInDropdown,
-      displayValue: isNonNullable(date) ? date.toLocaleString() : '',
-      definition: filterDefinitionUsedInDropdown,
-    });
-
-    setIsObjectFilterDropdownUnfolded(false);
-  };
-
-  return (
-    <InternalDatePicker
-      date={new Date()}
-      onChange={handleChange}
-      onMouseSelect={handleChange}
-    />
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchInput.tsx
deleted file mode 100644
index 19db840d2569..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchInput.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { ChangeEvent } from 'react';
-
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
-
-export const ObjectFilterDropdownRecordSearchInput = () => {
-  const {
-    filterDefinitionUsedInDropdown,
-    selectedOperandInDropdown,
-    objectFilterDropdownSearchInput,
-    setObjectFilterDropdownSearchInput,
-  } = useFilterDropdown();
-
-  return (
-    filterDefinitionUsedInDropdown &&
-    selectedOperandInDropdown && (
-      <DropdownMenuSearchInput
-        autoFocus
-        type="text"
-        value={objectFilterDropdownSearchInput}
-        placeholder={filterDefinitionUsedInDropdown.label}
-        onChange={(event: ChangeEvent<HTMLInputElement>) => {
-          setObjectFilterDropdownSearchInput(event.target.value);
-        }}
-      />
-    )
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchSelect.tsx
index 0d19879da2ca..27b155975058 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchSelect.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
+import { useRecoilValue } from 'recoil';
 
 import { OBJECT_FILTER_DROPDOWN_ID } from '@/object-record/object-filter-dropdown/constants/ObjectFilterDropdownId';
 import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
@@ -15,13 +16,24 @@ export const ObjectFilterDropdownEntitySearchSelect = ({
 }) => {
   const {
     setObjectFilterDropdownSelectedEntityId,
-    filterDefinitionUsedInDropdown,
-    selectedOperandInDropdown,
-    objectFilterDropdownSearchInput,
-    selectedFilter,
+    filterDefinitionUsedInDropdownState,
+    selectedOperandInDropdownState,
+    objectFilterDropdownSearchInputState,
+    selectedFilterState,
     selectFilter,
   } = useFilterDropdown();
 
+  const filterDefinitionUsedInDropdown = useRecoilValue(
+    filterDefinitionUsedInDropdownState,
+  );
+  const selectedOperandInDropdown = useRecoilValue(
+    selectedOperandInDropdownState,
+  );
+  const objectFilterDropdownSearchInput = useRecoilValue(
+    objectFilterDropdownSearchInputState,
+  );
+  const selectedFilter = useRecoilValue(selectedFilterState);
+
   const { closeDropdown } = useDropdown(OBJECT_FILTER_DROPDOWN_ID);
 
   const [isAllEntitySelected, setIsAllEntitySelected] = useState(false);
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx
index 93bc71a1be4b..676fcb9a32bb 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx
@@ -1,3 +1,5 @@
+import { useRecoilValue } from 'recoil';
+
 import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
 import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
 import { useIcons } from '@/ui/display/icon/hooks/useIcons';
@@ -12,9 +14,13 @@ export const ObjectFilterDropdownFilterSelect = () => {
     setFilterDefinitionUsedInDropdown,
     setSelectedOperandInDropdown,
     setObjectFilterDropdownSearchInput,
-    availableFilterDefinitions,
+    availableFilterDefinitionsState,
   } = useFilterDropdown();
 
+  const availableFilterDefinitions = useRecoilValue(
+    availableFilterDefinitionsState,
+  );
+
   const { getIcon } = useIcons();
 
   const setHotkeyScope = useSetHotkeyScope();
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberInput.tsx
new file mode 100644
index 000000000000..d6cc92eaaf1f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberInput.tsx
@@ -0,0 +1,40 @@
+import { ChangeEvent } from 'react';
+import { useRecoilValue } from 'recoil';
+
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { DropdownMenuInput } from '@/ui/layout/dropdown/components/DropdownMenuInput';
+
+export const ObjectFilterDropdownNumberInput = () => {
+  const {
+    selectedOperandInDropdownState,
+    filterDefinitionUsedInDropdownState,
+    selectFilter,
+  } = useFilterDropdown();
+
+  const filterDefinitionUsedInDropdown = useRecoilValue(
+    filterDefinitionUsedInDropdownState,
+  );
+  const selectedOperandInDropdown = useRecoilValue(
+    selectedOperandInDropdownState,
+  );
+
+  return (
+    filterDefinitionUsedInDropdown &&
+    selectedOperandInDropdown && (
+      <DropdownMenuInput
+        autoFocus
+        type="number"
+        placeholder={filterDefinitionUsedInDropdown.label}
+        onChange={(event: ChangeEvent<HTMLInputElement>) => {
+          selectFilter?.({
+            fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
+            value: event.target.value,
+            operand: selectedOperandInDropdown,
+            displayValue: event.target.value,
+            definition: filterDefinitionUsedInDropdown,
+          });
+        }}
+      />
+    )
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberSearchInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberSearchInput.tsx
deleted file mode 100644
index e99411065a5f..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberSearchInput.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { ChangeEvent } from 'react';
-
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
-
-export const ObjectFilterDropdownNumberSearchInput = () => {
-  const {
-    selectedOperandInDropdown,
-    filterDefinitionUsedInDropdown,
-    selectFilter,
-  } = useFilterDropdown();
-
-  return (
-    filterDefinitionUsedInDropdown &&
-    selectedOperandInDropdown && (
-      <DropdownMenuSearchInput
-        autoFocus
-        type="number"
-        placeholder={filterDefinitionUsedInDropdown.label}
-        onChange={(event: ChangeEvent<HTMLInputElement>) => {
-          selectFilter?.({
-            fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
-            value: event.target.value,
-            operand: selectedOperandInDropdown,
-            displayValue: event.target.value,
-            definition: filterDefinitionUsedInDropdown,
-          });
-        }}
-      />
-    )
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandButton.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandButton.tsx
index 7c5e0b251353..4aa675ec3539 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandButton.tsx
@@ -1,16 +1,25 @@
+import { useRecoilValue } from 'recoil';
+import { IconChevronDown } from 'twenty-ui';
+
 import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
-import { IconChevronDown } from '@/ui/display/icon';
 import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
 
 import { getOperandLabel } from '../utils/getOperandLabel';
 
 export const ObjectFilterDropdownOperandButton = () => {
   const {
-    selectedOperandInDropdown,
+    selectedOperandInDropdownState,
     setIsObjectFilterDropdownOperandSelectUnfolded,
-    isObjectFilterDropdownOperandSelectUnfolded,
+    isObjectFilterDropdownOperandSelectUnfoldedState,
   } = useFilterDropdown();
 
+  const selectedOperandInDropdown = useRecoilValue(
+    selectedOperandInDropdownState,
+  );
+  const isObjectFilterDropdownOperandSelectUnfolded = useRecoilValue(
+    isObjectFilterDropdownOperandSelectUnfoldedState,
+  );
+
   if (isObjectFilterDropdownOperandSelectUnfolded) {
     return null;
   }
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect.tsx
index c9d604d1d2b6..d3f0ccccfd6a 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect.tsx
@@ -1,21 +1,34 @@
+import { useRecoilValue } from 'recoil';
+
 import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
+import { isDefined } from '~/utils/isDefined';
 
 import { getOperandLabel } from '../utils/getOperandLabel';
 import { getOperandsForFilterType } from '../utils/getOperandsForFilterType';
 
 export const ObjectFilterDropdownOperandSelect = () => {
   const {
-    filterDefinitionUsedInDropdown,
+    filterDefinitionUsedInDropdownState,
     setSelectedOperandInDropdown,
-    isObjectFilterDropdownOperandSelectUnfolded,
+    isObjectFilterDropdownOperandSelectUnfoldedState,
     setIsObjectFilterDropdownOperandSelectUnfolded,
-    selectedFilter,
+    selectedFilterState,
     selectFilter,
   } = useFilterDropdown();
 
+  const filterDefinitionUsedInDropdown = useRecoilValue(
+    filterDefinitionUsedInDropdownState,
+  );
+
+  const isObjectFilterDropdownOperandSelectUnfolded = useRecoilValue(
+    isObjectFilterDropdownOperandSelectUnfoldedState,
+  );
+
+  const selectedFilter = useRecoilValue(selectedFilterState);
+
   const operandsForFilterType = getOperandsForFilterType(
     filterDefinitionUsedInDropdown?.type,
   );
@@ -24,7 +37,10 @@ export const ObjectFilterDropdownOperandSelect = () => {
     setSelectedOperandInDropdown(newOperand);
     setIsObjectFilterDropdownOperandSelectUnfolded(false);
 
-    if (filterDefinitionUsedInDropdown && selectedFilter) {
+    if (
+      isDefined(filterDefinitionUsedInDropdown) &&
+      isDefined(selectedFilter)
+    ) {
       selectFilter?.({
         fieldMetadataId: selectedFilter.fieldMetadataId,
         displayValue: selectedFilter.displayValue,
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx
new file mode 100644
index 000000000000..46b294b1ebd8
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx
@@ -0,0 +1,133 @@
+import { useEffect, useState } from 'react';
+import { useRecoilValue } from 'recoil';
+
+import { FieldMetadataItemOption } from '@/object-metadata/types/FieldMetadataItem';
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { useOptionsForSelect } from '@/object-record/object-filter-dropdown/hooks/useOptionsForSelect';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
+import { MenuItemMultiSelect } from '@/ui/navigation/menu-item/components/MenuItemMultiSelect';
+import { isDefined } from '~/utils/isDefined';
+
+export const EMPTY_FILTER_VALUE = '';
+export const MAX_OPTIONS_TO_DISPLAY = 3;
+
+type SelectOptionForFilter = FieldMetadataItemOption & {
+  isSelected: boolean;
+};
+
+export const ObjectFilterDropdownOptionSelect = () => {
+  const {
+    filterDefinitionUsedInDropdownState,
+    objectFilterDropdownSearchInputState,
+    selectedOperandInDropdownState,
+    objectFilterDropdownSelectedOptionValuesState,
+    selectFilter,
+  } = useFilterDropdown();
+
+  const filterDefinitionUsedInDropdown = useRecoilValue(
+    filterDefinitionUsedInDropdownState,
+  );
+  const selectedOperandInDropdown = useRecoilValue(
+    selectedOperandInDropdownState,
+  );
+  const objectFilterDropdownSearchInput = useRecoilValue(
+    objectFilterDropdownSearchInputState,
+  );
+  const objectFilterDropdownSelectedOptionValues = useRecoilValue(
+    objectFilterDropdownSelectedOptionValuesState,
+  );
+
+  const fieldMetaDataId = filterDefinitionUsedInDropdown?.fieldMetadataId ?? '';
+
+  const { selectOptions } = useOptionsForSelect(fieldMetaDataId);
+
+  const [selectableOptions, setSelectableOptions] = useState<
+    SelectOptionForFilter[]
+  >([]);
+
+  useEffect(() => {
+    if (isDefined(selectOptions)) {
+      const options = selectOptions.map((option) => {
+        const isSelected =
+          objectFilterDropdownSelectedOptionValues?.includes(option.value) ??
+          false;
+
+        return {
+          ...option,
+          isSelected,
+        };
+      });
+
+      setSelectableOptions(options);
+    }
+  }, [objectFilterDropdownSelectedOptionValues, selectOptions]);
+
+  const handleMultipleOptionSelectChange = (
+    optionChanged: SelectOptionForFilter,
+    isSelected: boolean,
+  ) => {
+    if (!selectOptions) {
+      return;
+    }
+
+    const newSelectableOptions = selectableOptions.map((option) =>
+      option.id === optionChanged.id ? { ...option, isSelected } : option,
+    );
+
+    setSelectableOptions(newSelectableOptions);
+
+    const selectedOptions = newSelectableOptions.filter(
+      (option) => option.isSelected,
+    );
+
+    const filterDisplayValue =
+      selectedOptions.length > MAX_OPTIONS_TO_DISPLAY
+        ? `${selectedOptions.length} options`
+        : selectedOptions.map((option) => option.label).join(', ');
+
+    if (
+      isDefined(filterDefinitionUsedInDropdown) &&
+      isDefined(selectedOperandInDropdown)
+    ) {
+      const newFilterValue =
+        selectedOptions.length > 0
+          ? JSON.stringify(selectedOptions.map((option) => option.value))
+          : EMPTY_FILTER_VALUE;
+
+      selectFilter({
+        definition: filterDefinitionUsedInDropdown,
+        operand: selectedOperandInDropdown,
+        displayValue: filterDisplayValue,
+        fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
+        value: newFilterValue,
+      });
+    }
+  };
+
+  const optionsInDropdown = selectableOptions?.filter((option) =>
+    option.label
+      .toLowerCase()
+      .includes(objectFilterDropdownSearchInput.toLowerCase()),
+  );
+
+  const showNoResult = optionsInDropdown?.length === 0;
+
+  return (
+    <DropdownMenuItemsContainer hasMaxHeight>
+      {optionsInDropdown?.map((option) => (
+        <MenuItemMultiSelect
+          key={option.id}
+          selected={option.isSelected}
+          onSelectChange={(selected) =>
+            handleMultipleOptionSelectChange(option, selected)
+          }
+          text={option.label}
+          color={option.color}
+          className=""
+        />
+      ))}
+      {showNoResult && <MenuItem text="No result" />}
+    </DropdownMenuItemsContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordRemoveFilterMenuItem.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordRemoveFilterMenuItem.tsx
index 6cf124fd3b08..74f3ed364fa3 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordRemoveFilterMenuItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordRemoveFilterMenuItem.tsx
@@ -1,9 +1,9 @@
-import { MenuItem } from 'tsup.ui.index';
+import { IconFilterOff } from 'twenty-ui';
 
 import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
-import { IconFilterOff } from '@/ui/display/icon';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
 
 export const ObjectFilterDropdownRecordRemoveFilterMenuItem = () => {
   const { emptyFilterButKeepDefinition } = useFilterDropdown();
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
index c711e872c715..65a2c3263dc3 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
@@ -1,22 +1,38 @@
+import { useRecoilValue } from 'recoil';
+
 import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
 import { MultipleRecordSelectDropdown } from '@/object-record/select/components/MultipleRecordSelectDropdown';
 import { useRecordsForSelect } from '@/object-record/select/hooks/useRecordsForSelect';
 import { SelectableRecord } from '@/object-record/select/types/SelectableRecord';
+import { isDefined } from '~/utils/isDefined';
 
 export const EMPTY_FILTER_VALUE = '[]';
 export const MAX_RECORDS_TO_DISPLAY = 3;
 
 export const ObjectFilterDropdownRecordSelect = () => {
   const {
-    filterDefinitionUsedInDropdown,
-    objectFilterDropdownSearchInput,
-    selectedOperandInDropdown,
+    filterDefinitionUsedInDropdownState,
+    objectFilterDropdownSearchInputState,
+    selectedOperandInDropdownState,
     setObjectFilterDropdownSelectedRecordIds,
-    objectFilterDropdownSelectedRecordIds,
+    objectFilterDropdownSelectedRecordIdsState,
     selectFilter,
     emptyFilterButKeepDefinition,
   } = useFilterDropdown();
 
+  const filterDefinitionUsedInDropdown = useRecoilValue(
+    filterDefinitionUsedInDropdownState,
+  );
+  const objectFilterDropdownSearchInput = useRecoilValue(
+    objectFilterDropdownSearchInputState,
+  );
+  const selectedOperandInDropdown = useRecoilValue(
+    selectedOperandInDropdownState,
+  );
+  const objectFilterDropdownSelectedRecordIds = useRecoilValue(
+    objectFilterDropdownSelectedRecordIdsState,
+  );
+
   const objectNameSingular =
     filterDefinitionUsedInDropdown?.relationObjectMetadataNameSingular ?? '';
 
@@ -66,7 +82,10 @@ export const ObjectFilterDropdownRecordSelect = () => {
         ? `${selectedRecordNames.length} companies`
         : selectedRecordNames.join(', ');
 
-    if (filterDefinitionUsedInDropdown && selectedOperandInDropdown) {
+    if (
+      isDefined(filterDefinitionUsedInDropdown) &&
+      isDefined(selectedOperandInDropdown)
+    ) {
       const newFilterValue =
         newSelectedRecordIds.length > 0
           ? JSON.stringify(newSelectedRecordIds)
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSearchInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSearchInput.tsx
new file mode 100644
index 000000000000..d84d2e4dde8e
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSearchInput.tsx
@@ -0,0 +1,39 @@
+import { ChangeEvent } from 'react';
+import { useRecoilValue } from 'recoil';
+
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
+
+export const ObjectFilterDropdownSearchInput = () => {
+  const {
+    filterDefinitionUsedInDropdownState,
+    selectedOperandInDropdownState,
+    objectFilterDropdownSearchInputState,
+    setObjectFilterDropdownSearchInput,
+  } = useFilterDropdown();
+
+  const filterDefinitionUsedInDropdown = useRecoilValue(
+    filterDefinitionUsedInDropdownState,
+  );
+  const selectedOperandInDropdown = useRecoilValue(
+    selectedOperandInDropdownState,
+  );
+  const objectFilterDropdownSearchInput = useRecoilValue(
+    objectFilterDropdownSearchInputState,
+  );
+
+  return (
+    filterDefinitionUsedInDropdown &&
+    selectedOperandInDropdown && (
+      <DropdownMenuSearchInput
+        autoFocus
+        type="text"
+        value={objectFilterDropdownSearchInput}
+        placeholder={filterDefinitionUsedInDropdown.label}
+        onChange={(event: ChangeEvent<HTMLInputElement>) => {
+          setObjectFilterDropdownSearchInput(event.target.value);
+        }}
+      />
+    )
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput.tsx
index 999fd6403020..445d080ad699 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput.tsx
@@ -1,18 +1,30 @@
 import { ChangeEvent } from 'react';
+import { useRecoilValue } from 'recoil';
 
 import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
 import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
 
 export const ObjectFilterDropdownTextSearchInput = () => {
   const {
-    filterDefinitionUsedInDropdown,
-    selectedOperandInDropdown,
-    objectFilterDropdownSearchInput,
+    filterDefinitionUsedInDropdownState,
+    selectedOperandInDropdownState,
+    objectFilterDropdownSearchInputState,
     setObjectFilterDropdownSearchInput,
-    selectedFilter,
+    selectedFilterState,
     selectFilter,
   } = useFilterDropdown();
 
+  const filterDefinitionUsedInDropdown = useRecoilValue(
+    filterDefinitionUsedInDropdownState,
+  );
+  const selectedOperandInDropdown = useRecoilValue(
+    selectedOperandInDropdownState,
+  );
+  const objectFilterDropdownSearchInput = useRecoilValue(
+    objectFilterDropdownSearchInputState,
+  );
+  const selectedFilter = useRecoilValue(selectedFilterState);
+
   return (
     filterDefinitionUsedInDropdown &&
     selectedOperandInDropdown && (
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx
index aa978a47dc14..7ddbdb5f5d59 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx
@@ -1,9 +1,10 @@
 import React from 'react';
 import { useTheme } from '@emotion/react';
+import { useRecoilValue } from 'recoil';
+import { IconChevronDown } from 'twenty-ui';
 
 import { ObjectFilterDropdownRecordRemoveFilterMenuItem } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordRemoveFilterMenuItem';
 import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
-import { IconChevronDown } from '@/ui/display/icon/index';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';
@@ -13,8 +14,8 @@ import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { getOperandsForFilterType } from '../utils/getOperandsForFilterType';
 
 import { GenericEntityFilterChip } from './GenericEntityFilterChip';
-import { ObjectFilterDropdownRecordSearchInput } from './ObjectFilterDropdownEntitySearchInput';
 import { ObjectFilterDropdownRecordSelect } from './ObjectFilterDropdownRecordSelect';
+import { ObjectFilterDropdownSearchInput } from './ObjectFilterDropdownSearchInput';
 
 export const SingleEntityObjectFilterDropdownButton = ({
   hotkeyScope,
@@ -22,12 +23,17 @@ export const SingleEntityObjectFilterDropdownButton = ({
   hotkeyScope: HotkeyScope;
 }) => {
   const {
-    availableFilterDefinitions,
-    selectedFilter,
+    availableFilterDefinitionsState,
+    selectedFilterState,
     setFilterDefinitionUsedInDropdown,
     setSelectedOperandInDropdown,
   } = useFilterDropdown();
 
+  const availableFilterDefinitions = useRecoilValue(
+    availableFilterDefinitionsState,
+  );
+  const selectedFilter = useRecoilValue(selectedFilterState);
+
   const availableFilter = availableFilterDefinitions[0];
 
   React.useEffect(() => {
@@ -66,7 +72,7 @@ export const SingleEntityObjectFilterDropdownButton = ({
       }
       dropdownComponents={
         <>
-          <ObjectFilterDropdownRecordSearchInput />
+          <ObjectFilterDropdownSearchInput />
           <DropdownMenuSeparator />
           <ObjectFilterDropdownRecordRemoveFilterMenuItem />
           <ObjectFilterDropdownRecordSelect />
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/__tests__/useFilterDropdown.test.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/__tests__/useFilterDropdown.test.tsx
index 76316b9dcd8d..311764d5892a 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/__tests__/useFilterDropdown.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/__tests__/useFilterDropdown.test.tsx
@@ -1,8 +1,9 @@
 import { expect } from '@storybook/test';
 import { act, renderHook, waitFor } from '@testing-library/react';
-import { RecoilRoot } from 'recoil';
+import { RecoilRoot, useRecoilState } from 'recoil';
 
 import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { useFilterDropdownStates } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdownStates';
 import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
 import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
@@ -31,10 +32,15 @@ const mockFilter: Filter = {
 
 describe('useFilterDropdown', () => {
   it('should set availableFilterDefinitions', async () => {
-    const { result } = renderHook(
-      () => useFilterDropdown({ filterDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      useFilterDropdown({ filterDropdownId });
+      const { availableFilterDefinitionsState } =
+        useFilterDropdownStates(filterDropdownId);
+
+      const [availableFilterDefinitions, setAvailableFilterDefinitions] =
+        useRecoilState(availableFilterDefinitionsState);
+      return { availableFilterDefinitions, setAvailableFilterDefinitions };
+    }, renderHookConfig);
 
     expect(result.current.availableFilterDefinitions).toEqual([]);
 
@@ -50,10 +56,14 @@ describe('useFilterDropdown', () => {
   });
 
   it('should set onFilterSelect', async () => {
-    const { result } = renderHook(
-      () => useFilterDropdown({ filterDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      useFilterDropdown({ filterDropdownId });
+      const { onFilterSelectState } = useFilterDropdownStates(filterDropdownId);
+
+      const [onFilterSelect, setOnFilterSelect] =
+        useRecoilState(onFilterSelectState);
+      return { onFilterSelect, setOnFilterSelect };
+    }, renderHookConfig);
 
     expect(result.current.onFilterSelect).toBeUndefined();
 
@@ -68,10 +78,16 @@ describe('useFilterDropdown', () => {
   });
 
   it('should set selectedOperandInDropdown', async () => {
-    const { result } = renderHook(
-      () => useFilterDropdown({ filterDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      useFilterDropdown({ filterDropdownId });
+      const { selectedOperandInDropdownState } =
+        useFilterDropdownStates(filterDropdownId);
+
+      const [selectedOperandInDropdown, setSelectedOperandInDropdown] =
+        useRecoilState(selectedOperandInDropdownState);
+      return { selectedOperandInDropdown, setSelectedOperandInDropdown };
+    }, renderHookConfig);
+
     const mockOperand = ViewFilterOperand.Contains;
 
     expect(result.current.selectedOperandInDropdown).toBeNull();
@@ -84,10 +100,14 @@ describe('useFilterDropdown', () => {
   });
 
   it('should set selectedFilter', async () => {
-    const { result } = renderHook(
-      () => useFilterDropdown({ filterDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      useFilterDropdown({ filterDropdownId });
+      const { selectedFilterState } = useFilterDropdownStates(filterDropdownId);
+
+      const [selectedFilter, setSelectedFilter] =
+        useRecoilState(selectedFilterState);
+      return { selectedFilter, setSelectedFilter };
+    }, renderHookConfig);
 
     expect(result.current.selectedFilter).toBeUndefined();
 
@@ -101,10 +121,20 @@ describe('useFilterDropdown', () => {
   });
 
   it('should set filterDefinitionUsedInDropdown', async () => {
-    const { result } = renderHook(
-      () => useFilterDropdown({ filterDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      useFilterDropdown({ filterDropdownId });
+      const { filterDefinitionUsedInDropdownState } =
+        useFilterDropdownStates(filterDropdownId);
+
+      const [
+        filterDefinitionUsedInDropdown,
+        setFilterDefinitionUsedInDropdown,
+      ] = useRecoilState(filterDefinitionUsedInDropdownState);
+      return {
+        filterDefinitionUsedInDropdown,
+        setFilterDefinitionUsedInDropdown,
+      };
+    }, renderHookConfig);
 
     expect(result.current.filterDefinitionUsedInDropdown).toBeNull();
 
@@ -121,10 +151,20 @@ describe('useFilterDropdown', () => {
 
   it('should set objectFilterDropdownSearchInput', async () => {
     const mockResult = 'value';
-    const { result } = renderHook(
-      () => useFilterDropdown({ filterDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      useFilterDropdown({ filterDropdownId });
+      const { objectFilterDropdownSearchInputState } =
+        useFilterDropdownStates(filterDropdownId);
+
+      const [
+        objectFilterDropdownSearchInput,
+        setObjectFilterDropdownSearchInput,
+      ] = useRecoilState(objectFilterDropdownSearchInputState);
+      return {
+        objectFilterDropdownSearchInput,
+        setObjectFilterDropdownSearchInput,
+      };
+    }, renderHookConfig);
 
     expect(result.current.objectFilterDropdownSearchInput).toBe('');
 
@@ -139,10 +179,20 @@ describe('useFilterDropdown', () => {
 
   it('should set objectFilterDropdownSelectedEntityId', async () => {
     const mockResult = 'value';
-    const { result } = renderHook(
-      () => useFilterDropdown({ filterDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      useFilterDropdown({ filterDropdownId });
+      const { objectFilterDropdownSelectedEntityIdState } =
+        useFilterDropdownStates(filterDropdownId);
+
+      const [
+        objectFilterDropdownSelectedEntityId,
+        setObjectFilterDropdownSelectedEntityId,
+      ] = useRecoilState(objectFilterDropdownSelectedEntityIdState);
+      return {
+        objectFilterDropdownSelectedEntityId,
+        setObjectFilterDropdownSelectedEntityId,
+      };
+    }, renderHookConfig);
 
     expect(result.current.objectFilterDropdownSelectedEntityId).toBeNull();
 
@@ -159,10 +209,20 @@ describe('useFilterDropdown', () => {
 
   it('should set objectFilterDropdownSelectedRecordIds', async () => {
     const mockResult = ['id-0', 'id-1', 'id-2'];
-    const { result } = renderHook(
-      () => useFilterDropdown({ filterDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      useFilterDropdown({ filterDropdownId });
+      const { objectFilterDropdownSelectedRecordIdsState } =
+        useFilterDropdownStates(filterDropdownId);
+
+      const [
+        objectFilterDropdownSelectedRecordIds,
+        setObjectFilterDropdownSelectedRecordIds,
+      ] = useRecoilState(objectFilterDropdownSelectedRecordIdsState);
+      return {
+        objectFilterDropdownSelectedRecordIds,
+        setObjectFilterDropdownSelectedRecordIds,
+      };
+    }, renderHookConfig);
 
     expect(result.current.objectFilterDropdownSelectedRecordIds).toHaveLength(
       0,
@@ -180,10 +240,20 @@ describe('useFilterDropdown', () => {
   });
 
   it('should set isObjectFilterDropdownOperandSelectUnfolded', async () => {
-    const { result } = renderHook(
-      () => useFilterDropdown({ filterDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      useFilterDropdown({ filterDropdownId });
+      const { isObjectFilterDropdownOperandSelectUnfoldedState } =
+        useFilterDropdownStates(filterDropdownId);
+
+      const [
+        isObjectFilterDropdownOperandSelectUnfolded,
+        setIsObjectFilterDropdownOperandSelectUnfolded,
+      ] = useRecoilState(isObjectFilterDropdownOperandSelectUnfoldedState);
+      return {
+        isObjectFilterDropdownOperandSelectUnfolded,
+        setIsObjectFilterDropdownOperandSelectUnfolded,
+      };
+    }, renderHookConfig);
 
     expect(result.current.isObjectFilterDropdownOperandSelectUnfolded).toBe(
       false,
@@ -201,10 +271,20 @@ describe('useFilterDropdown', () => {
   });
 
   it('should set isObjectFilterDropdownUnfolded', async () => {
-    const { result } = renderHook(
-      () => useFilterDropdown({ filterDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      useFilterDropdown({ filterDropdownId });
+      const { isObjectFilterDropdownUnfoldedState } =
+        useFilterDropdownStates(filterDropdownId);
+
+      const [
+        isObjectFilterDropdownUnfolded,
+        setIsObjectFilterDropdownUnfolded,
+      ] = useRecoilState(isObjectFilterDropdownUnfoldedState);
+      return {
+        isObjectFilterDropdownUnfolded,
+        setIsObjectFilterDropdownUnfolded,
+      };
+    }, renderHookConfig);
 
     expect(result.current.isObjectFilterDropdownUnfolded).toBe(false);
 
@@ -218,10 +298,16 @@ describe('useFilterDropdown', () => {
   });
 
   it('should reset filter', async () => {
-    const { result } = renderHook(
-      () => useFilterDropdown({ filterDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      const { selectFilter, resetFilter } = useFilterDropdown({
+        filterDropdownId,
+      });
+      const { selectedFilterState } = useFilterDropdownStates(filterDropdownId);
+
+      const [selectedFilter, setSelectedFilter] =
+        useRecoilState(selectedFilterState);
+      return { selectedFilter, setSelectedFilter, selectFilter, resetFilter };
+    }, renderHookConfig);
 
     act(() => {
       result.current.selectFilter(mockFilter);
@@ -241,10 +327,14 @@ describe('useFilterDropdown', () => {
   });
 
   it('should call onFilterSelect when a filter option is set', async () => {
-    const { result } = renderHook(
-      () => useFilterDropdown({ filterDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      const { selectFilter } = useFilterDropdown({ filterDropdownId });
+      const { onFilterSelectState } = useFilterDropdownStates(filterDropdownId);
+
+      const [onFilterSelect, setOnFilterSelect] =
+        useRecoilState(onFilterSelectState);
+      return { onFilterSelect, setOnFilterSelect, selectFilter };
+    }, renderHookConfig);
     const onFilterSelectMock = jest.fn();
 
     expect(result.current.onFilterSelect).toBeUndefined();
@@ -261,7 +351,7 @@ describe('useFilterDropdown', () => {
   });
 
   it('should handle scopeId undefined on initial values', () => {
-    console.error = jest.fn();
+    global.console.error = jest.fn();
 
     const renderFunction = () => {
       renderHook(() => useFilterDropdown(), renderHookConfig);
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdown.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdown.ts
index 2b4932cbadf5..945d19c68954 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdown.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdown.ts
@@ -1,7 +1,8 @@
-import { useCallback } from 'react';
+import { useRecoilCallback, useSetRecoilState } from 'recoil';
 
 import { useFilterDropdownStates } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdownStates';
 import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
+import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
 
 import { ObjectFilterDropdownScopeInternalContext } from '../scopes/scope-internal-context/ObjectFilterDropdownScopeInternalContext';
 import { Filter } from '../types/Filter';
@@ -17,88 +18,122 @@ export const useFilterDropdown = (props?: UseFilterDropdownProps) => {
   );
 
   const {
-    availableFilterDefinitions,
-    setAvailableFilterDefinitions,
-    filterDefinitionUsedInDropdown,
-    setFilterDefinitionUsedInDropdown,
-    objectFilterDropdownSearchInput,
-    setObjectFilterDropdownSearchInput,
-    objectFilterDropdownSelectedEntityId,
-    setObjectFilterDropdownSelectedEntityId,
-    objectFilterDropdownSelectedRecordIds,
-    setObjectFilterDropdownSelectedRecordIds,
-    isObjectFilterDropdownOperandSelectUnfolded,
-    setIsObjectFilterDropdownOperandSelectUnfolded,
-    isObjectFilterDropdownUnfolded,
-    setIsObjectFilterDropdownUnfolded,
-    selectedFilter,
-    setSelectedFilter,
-    selectedOperandInDropdown,
-    setSelectedOperandInDropdown,
-    onFilterSelect,
-    setOnFilterSelect,
+    availableFilterDefinitionsState,
+    filterDefinitionUsedInDropdownState,
+    objectFilterDropdownSearchInputState,
+    objectFilterDropdownSelectedEntityIdState,
+    objectFilterDropdownSelectedRecordIdsState,
+    objectFilterDropdownSelectedOptionValuesState,
+    isObjectFilterDropdownOperandSelectUnfoldedState,
+    isObjectFilterDropdownUnfoldedState,
+    selectedFilterState,
+    selectedOperandInDropdownState,
+    onFilterSelectState,
   } = useFilterDropdownStates(scopeId);
 
-  const selectFilter = useCallback(
-    (filter: Filter | null) => {
-      setSelectedFilter(filter);
-      onFilterSelect?.(filter);
-    },
-    [setSelectedFilter, onFilterSelect],
+  const selectFilter = useRecoilCallback(
+    ({ set, snapshot }) =>
+      (filter: Filter | null) => {
+        set(selectedFilterState, filter);
+        const onFilterSelect = getSnapshotValue(snapshot, onFilterSelectState);
+
+        onFilterSelect?.(filter);
+      },
+    [selectedFilterState, onFilterSelectState],
   );
 
-  const emptyFilterButKeepDefinition = useCallback(() => {
-    setObjectFilterDropdownSearchInput('');
-    setObjectFilterDropdownSelectedEntityId(null);
-    setObjectFilterDropdownSelectedRecordIds([]);
-    setSelectedFilter(undefined);
-  }, [
-    setSelectedFilter,
-    setObjectFilterDropdownSelectedRecordIds,
-    setObjectFilterDropdownSelectedEntityId,
-    setObjectFilterDropdownSearchInput,
-  ]);
+  const emptyFilterButKeepDefinition = useRecoilCallback(
+    ({ set }) =>
+      () => {
+        set(objectFilterDropdownSearchInputState, '');
+        set(objectFilterDropdownSelectedEntityIdState, null);
+        set(objectFilterDropdownSelectedRecordIdsState, []);
+        set(selectedFilterState, undefined);
+      },
+    [
+      objectFilterDropdownSearchInputState,
+      objectFilterDropdownSelectedEntityIdState,
+      objectFilterDropdownSelectedRecordIdsState,
+      selectedFilterState,
+    ],
+  );
 
-  const resetFilter = useCallback(() => {
-    setObjectFilterDropdownSearchInput('');
-    setObjectFilterDropdownSelectedEntityId(null);
-    setObjectFilterDropdownSelectedRecordIds([]);
-    setSelectedFilter(undefined);
-    setFilterDefinitionUsedInDropdown(null);
-    setSelectedOperandInDropdown(null);
-  }, [
-    setFilterDefinitionUsedInDropdown,
-    setObjectFilterDropdownSearchInput,
-    setObjectFilterDropdownSelectedEntityId,
-    setObjectFilterDropdownSelectedRecordIds,
-    setSelectedFilter,
-    setSelectedOperandInDropdown,
-  ]);
+  const resetFilter = useRecoilCallback(
+    ({ set }) =>
+      () => {
+        set(objectFilterDropdownSearchInputState, '');
+        set(objectFilterDropdownSelectedEntityIdState, null);
+        set(objectFilterDropdownSelectedRecordIdsState, []);
+        set(selectedFilterState, undefined);
+        set(filterDefinitionUsedInDropdownState, null);
+        set(selectedOperandInDropdownState, null);
+      },
+    [
+      filterDefinitionUsedInDropdownState,
+      objectFilterDropdownSearchInputState,
+      objectFilterDropdownSelectedEntityIdState,
+      objectFilterDropdownSelectedRecordIdsState,
+      selectedFilterState,
+      selectedOperandInDropdownState,
+    ],
+  );
+
+  const setAvailableFilterDefinitions = useSetRecoilState(
+    availableFilterDefinitionsState,
+  );
+  const setSelectedFilter = useSetRecoilState(selectedFilterState);
+  const setSelectedOperandInDropdown = useSetRecoilState(
+    selectedOperandInDropdownState,
+  );
+  const setFilterDefinitionUsedInDropdown = useSetRecoilState(
+    filterDefinitionUsedInDropdownState,
+  );
+  const setObjectFilterDropdownSearchInput = useSetRecoilState(
+    objectFilterDropdownSearchInputState,
+  );
+  const setObjectFilterDropdownSelectedEntityId = useSetRecoilState(
+    objectFilterDropdownSelectedEntityIdState,
+  );
+  const setObjectFilterDropdownSelectedRecordIds = useSetRecoilState(
+    objectFilterDropdownSelectedRecordIdsState,
+  );
+  const setObjectFilterDropdownSelectedOptionValues = useSetRecoilState(
+    objectFilterDropdownSelectedOptionValuesState,
+  );
+  const setIsObjectFilterDropdownOperandSelectUnfolded = useSetRecoilState(
+    isObjectFilterDropdownOperandSelectUnfoldedState,
+  );
+  const setIsObjectFilterDropdownUnfolded = useSetRecoilState(
+    isObjectFilterDropdownUnfoldedState,
+  );
+  const setOnFilterSelect = useSetRecoilState(onFilterSelectState);
 
   return {
     scopeId,
-    availableFilterDefinitions,
+    selectFilter,
+    resetFilter,
+    setSelectedFilter,
+    setSelectedOperandInDropdown,
     setAvailableFilterDefinitions,
-    filterDefinitionUsedInDropdown,
     setFilterDefinitionUsedInDropdown,
-    objectFilterDropdownSearchInput,
     setObjectFilterDropdownSearchInput,
-    objectFilterDropdownSelectedEntityId,
     setObjectFilterDropdownSelectedEntityId,
-    objectFilterDropdownSelectedRecordIds,
     setObjectFilterDropdownSelectedRecordIds,
-    isObjectFilterDropdownOperandSelectUnfolded,
+    setObjectFilterDropdownSelectedOptionValues,
     setIsObjectFilterDropdownOperandSelectUnfolded,
-    isObjectFilterDropdownUnfolded,
     setIsObjectFilterDropdownUnfolded,
-    selectedFilter,
-    setSelectedFilter,
-    selectedOperandInDropdown,
-    setSelectedOperandInDropdown,
-    selectFilter,
-    resetFilter,
-    onFilterSelect,
     setOnFilterSelect,
     emptyFilterButKeepDefinition,
+    availableFilterDefinitionsState,
+    filterDefinitionUsedInDropdownState,
+    objectFilterDropdownSearchInputState,
+    objectFilterDropdownSelectedEntityIdState,
+    objectFilterDropdownSelectedRecordIdsState,
+    objectFilterDropdownSelectedOptionValuesState,
+    isObjectFilterDropdownOperandSelectUnfoldedState,
+    isObjectFilterDropdownUnfoldedState,
+    selectedFilterState,
+    selectedOperandInDropdownState,
+    onFilterSelectState,
   };
 };
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownStates.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownStates.ts
index 3e6d2589145f..47a4835c1d18 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownStates.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownStates.ts
@@ -1,86 +1,84 @@
-import { objectFilterDropdownSelectedRecordIdsScopedState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsScopedState';
-import { onFilterSelectScopedState } from '@/object-record/object-filter-dropdown/states/onFilterSelectScopedState';
-import { useRecoilScopedStateV2 } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedStateV2';
-
-import { availableFilterDefinitionsScopedState } from '../states/availableFilterDefinitionsScopedState';
-import { filterDefinitionUsedInDropdownScopedState } from '../states/filterDefinitionUsedInDropdownScopedState';
-import { isObjectFilterDropdownOperandSelectUnfoldedScopedState } from '../states/isObjectFilterDropdownOperandSelectUnfoldedScopedState';
-import { isObjectFilterDropdownUnfoldedScopedState } from '../states/isObjectFilterDropdownUnfoldedScopedState';
-import { objectFilterDropdownSearchInputScopedState } from '../states/objectFilterDropdownSearchInputScopedState';
-import { objectFilterDropdownSelectedEntityIdScopedState } from '../states/objectFilterDropdownSelectedEntityIdScopedState';
-import { selectedFilterScopedState } from '../states/selectedFilterScopedState';
-import { selectedOperandInDropdownScopedState } from '../states/selectedOperandInDropdownScopedState';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { isObjectFilterDropdownOperandSelectUnfoldedComponentState } from '@/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedComponentState';
+import { isObjectFilterDropdownUnfoldedComponentState } from '@/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedComponentState';
+import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';
+import { objectFilterDropdownSelectedEntityIdComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedEntityIdComponentState';
+import { objectFilterDropdownSelectedOptionValuesComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState';
+import { objectFilterDropdownSelectedRecordIdsComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsComponentState';
+import { onFilterSelectComponentState } from '@/object-record/object-filter-dropdown/states/onFilterSelectComponentState';
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
+import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
+import { availableFilterDefinitionsComponentState } from '@/views/states/availableFilterDefinitionsComponentState';
 
 export const useFilterDropdownStates = (scopeId: string) => {
-  const [availableFilterDefinitions, setAvailableFilterDefinitions] =
-    useRecoilScopedStateV2(availableFilterDefinitionsScopedState, scopeId);
+  const availableFilterDefinitionsState = extractComponentState(
+    availableFilterDefinitionsComponentState,
+    scopeId,
+  );
 
-  const [filterDefinitionUsedInDropdown, setFilterDefinitionUsedInDropdown] =
-    useRecoilScopedStateV2(filterDefinitionUsedInDropdownScopedState, scopeId);
+  const filterDefinitionUsedInDropdownState = extractComponentState(
+    filterDefinitionUsedInDropdownComponentState,
+    scopeId,
+  );
 
-  const [objectFilterDropdownSearchInput, setObjectFilterDropdownSearchInput] =
-    useRecoilScopedStateV2(objectFilterDropdownSearchInputScopedState, scopeId);
+  const objectFilterDropdownSearchInputState = extractComponentState(
+    objectFilterDropdownSearchInputComponentState,
+    scopeId,
+  );
 
-  const [
-    objectFilterDropdownSelectedEntityId,
-    setObjectFilterDropdownSelectedEntityId,
-  ] = useRecoilScopedStateV2(
-    objectFilterDropdownSelectedEntityIdScopedState,
+  const objectFilterDropdownSelectedEntityIdState = extractComponentState(
+    objectFilterDropdownSelectedEntityIdComponentState,
     scopeId,
   );
 
-  const [
-    objectFilterDropdownSelectedRecordIds,
-    setObjectFilterDropdownSelectedRecordIds,
-  ] = useRecoilScopedStateV2(
-    objectFilterDropdownSelectedRecordIdsScopedState,
+  const objectFilterDropdownSelectedRecordIdsState = extractComponentState(
+    objectFilterDropdownSelectedRecordIdsComponentState,
     scopeId,
   );
 
-  const [
-    isObjectFilterDropdownOperandSelectUnfolded,
-    setIsObjectFilterDropdownOperandSelectUnfolded,
-  ] = useRecoilScopedStateV2(
-    isObjectFilterDropdownOperandSelectUnfoldedScopedState,
+  const objectFilterDropdownSelectedOptionValuesState = extractComponentState(
+    objectFilterDropdownSelectedOptionValuesComponentState,
     scopeId,
   );
 
-  const [isObjectFilterDropdownUnfolded, setIsObjectFilterDropdownUnfolded] =
-    useRecoilScopedStateV2(isObjectFilterDropdownUnfoldedScopedState, scopeId);
+  const isObjectFilterDropdownOperandSelectUnfoldedState =
+    extractComponentState(
+      isObjectFilterDropdownOperandSelectUnfoldedComponentState,
+      scopeId,
+    );
+
+  const isObjectFilterDropdownUnfoldedState = extractComponentState(
+    isObjectFilterDropdownUnfoldedComponentState,
+    scopeId,
+  );
 
-  const [selectedFilter, setSelectedFilter] = useRecoilScopedStateV2(
-    selectedFilterScopedState,
+  const selectedFilterState = extractComponentState(
+    selectedFilterComponentState,
     scopeId,
   );
 
-  const [selectedOperandInDropdown, setSelectedOperandInDropdown] =
-    useRecoilScopedStateV2(selectedOperandInDropdownScopedState, scopeId);
+  const selectedOperandInDropdownState = extractComponentState(
+    selectedOperandInDropdownComponentState,
+    scopeId,
+  );
 
-  const [onFilterSelect, setOnFilterSelect] = useRecoilScopedStateV2(
-    onFilterSelectScopedState,
+  const onFilterSelectState = extractComponentState(
+    onFilterSelectComponentState,
     scopeId,
   );
 
   return {
-    availableFilterDefinitions,
-    setAvailableFilterDefinitions,
-    filterDefinitionUsedInDropdown,
-    setFilterDefinitionUsedInDropdown,
-    objectFilterDropdownSearchInput,
-    setObjectFilterDropdownSearchInput,
-    objectFilterDropdownSelectedEntityId,
-    setObjectFilterDropdownSelectedEntityId,
-    objectFilterDropdownSelectedRecordIds,
-    setObjectFilterDropdownSelectedRecordIds,
-    isObjectFilterDropdownOperandSelectUnfolded,
-    setIsObjectFilterDropdownOperandSelectUnfolded,
-    isObjectFilterDropdownUnfolded,
-    setIsObjectFilterDropdownUnfolded,
-    selectedFilter,
-    setSelectedFilter,
-    selectedOperandInDropdown,
-    setSelectedOperandInDropdown,
-    onFilterSelect,
-    setOnFilterSelect,
+    availableFilterDefinitionsState,
+    filterDefinitionUsedInDropdownState,
+    objectFilterDropdownSearchInputState,
+    objectFilterDropdownSelectedEntityIdState,
+    objectFilterDropdownSelectedRecordIdsState,
+    objectFilterDropdownSelectedOptionValuesState,
+    isObjectFilterDropdownOperandSelectUnfoldedState,
+    isObjectFilterDropdownUnfoldedState,
+    selectedFilterState,
+    selectedOperandInDropdownState,
+    onFilterSelectState,
   };
 };
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useOptionsForSelect.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useOptionsForSelect.ts
new file mode 100644
index 000000000000..cf8440a10f9f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useOptionsForSelect.ts
@@ -0,0 +1,28 @@
+import { useParams } from 'react-router-dom';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
+
+export const DEFAULT_SEARCH_REQUEST_LIMIT = 60;
+
+export const useOptionsForSelect = (fieldMetadataId: string) => {
+  const objectNamePlural = useParams().objectNamePlural ?? '';
+
+  const { objectNameSingular } = useObjectNameSingularFromPlural({
+    objectNamePlural,
+  });
+
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const fieldMetadataItem = objectMetadataItem.fields.find(
+    (field) => field.id === fieldMetadataId,
+  );
+
+  const selectOptions = fieldMetadataItem?.options;
+
+  return {
+    selectOptions,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/scopes/scope-internal-context/ObjectFilterDropdownScopeInternalContext.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/scopes/scope-internal-context/ObjectFilterDropdownScopeInternalContext.ts
index 30869a8a6188..1c29844bd5f6 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/scopes/scope-internal-context/ObjectFilterDropdownScopeInternalContext.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/scopes/scope-internal-context/ObjectFilterDropdownScopeInternalContext.ts
@@ -1,7 +1,7 @@
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
 import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
-type ObjectFilterDropdownScopeInternalContextProps = StateScopeMapKey;
+type ObjectFilterDropdownScopeInternalContextProps = ComponentStateKey;
 
 export const ObjectFilterDropdownScopeInternalContext =
   createScopeInternalContext<ObjectFilterDropdownScopeInternalContextProps>();
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/availableFilterDefinitionsComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/availableFilterDefinitionsComponentState.ts
new file mode 100644
index 000000000000..9a3f649ea491
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/availableFilterDefinitionsComponentState.ts
@@ -0,0 +1,9 @@
+import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const availableFilterDefinitionsComponentState = createComponentState<
+  FilterDefinition[]
+>({
+  key: 'availableFilterDefinitionsComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/availableFilterDefinitionsScopedState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/availableFilterDefinitionsScopedState.ts
deleted file mode 100644
index 4ed3c9ce7778..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/availableFilterDefinitionsScopedState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const availableFilterDefinitionsScopedState = createStateScopeMap<
-  FilterDefinition[]
->({
-  key: 'availableFilterDefinitionsScopedState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState.ts
new file mode 100644
index 000000000000..c7fd89f92902
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState.ts
@@ -0,0 +1,9 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+import { FilterDefinition } from '../types/FilterDefinition';
+
+export const filterDefinitionUsedInDropdownComponentState =
+  createComponentState<FilterDefinition | null>({
+    key: 'filterDefinitionUsedInDropdownComponentState',
+    defaultValue: null,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownScopedState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownScopedState.ts
deleted file mode 100644
index 1ee8f0b45d72..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownScopedState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { FilterDefinition } from '../types/FilterDefinition';
-
-export const filterDefinitionUsedInDropdownScopedState =
-  createStateScopeMap<FilterDefinition | null>({
-    key: 'filterDefinitionUsedInDropdownScopedState',
-    defaultValue: null,
-  });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedComponentState.ts
new file mode 100644
index 000000000000..389c6d30f928
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const isObjectFilterDropdownOperandSelectUnfoldedComponentState =
+  createComponentState<boolean>({
+    key: 'isObjectFilterDropdownOperandSelectUnfoldedComponentState',
+    defaultValue: false,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedScopedState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedScopedState.ts
deleted file mode 100644
index bec9fee84d3b..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedScopedState.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const isObjectFilterDropdownOperandSelectUnfoldedScopedState =
-  createStateScopeMap<boolean>({
-    key: 'isObjectFilterDropdownOperandSelectUnfoldedScopedState',
-    defaultValue: false,
-  });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedComponentState.ts
new file mode 100644
index 000000000000..cfd6dea10c8f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const isObjectFilterDropdownUnfoldedComponentState =
+  createComponentState<boolean>({
+    key: 'isObjectFilterDropdownUnfoldedScopedState',
+    defaultValue: false,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedScopedState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedScopedState.ts
deleted file mode 100644
index 432df3475552..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedScopedState.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const isObjectFilterDropdownUnfoldedScopedState =
-  createStateScopeMap<boolean>({
-    key: 'isObjectFilterDropdownUnfoldedScopedState',
-    defaultValue: false,
-  });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState.ts
new file mode 100644
index 000000000000..8addf2fb6cc6
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const objectFilterDropdownSearchInputComponentState =
+  createComponentState<string>({
+    key: 'objectFilterDropdownSearchInputComponentState',
+    defaultValue: '',
+  });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputScopedState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputScopedState.ts
deleted file mode 100644
index b5cd0c1e43ad..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputScopedState.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const objectFilterDropdownSearchInputScopedState =
-  createStateScopeMap<string>({
-    key: 'objectFilterDropdownSearchInputScopedState',
-    defaultValue: '',
-  });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedEntityIdComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedEntityIdComponentState.ts
new file mode 100644
index 000000000000..3f62c3d65b1b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedEntityIdComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const objectFilterDropdownSelectedEntityIdComponentState =
+  createComponentState<string | null>({
+    key: 'objectFilterDropdownSelectedEntityIdComponentState',
+    defaultValue: null,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedEntityIdScopedState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedEntityIdScopedState.ts
deleted file mode 100644
index a96a2c5e94e5..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedEntityIdScopedState.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const objectFilterDropdownSelectedEntityIdScopedState =
-  createStateScopeMap<string | null>({
-    key: 'objectFilterDropdownSelectedEntityIdScopedState',
-    defaultValue: null,
-  });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState.ts
new file mode 100644
index 000000000000..feef87220c1e
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const objectFilterDropdownSelectedOptionValuesComponentState =
+  createComponentState<string[]>({
+    key: 'objectFilterDropdownSelectedOptionValuesComponentState',
+    defaultValue: [],
+  });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsComponentState.ts
new file mode 100644
index 000000000000..de23b3b0daa5
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const objectFilterDropdownSelectedRecordIdsComponentState =
+  createComponentState<string[]>({
+    key: 'objectFilterDropdownSelectedRecordIdsComponentState',
+    defaultValue: [],
+  });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsScopedState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsScopedState.ts
deleted file mode 100644
index 10c1dab0b6a1..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsScopedState.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const objectFilterDropdownSelectedRecordIdsScopedState =
-  createStateScopeMap<string[]>({
-    key: 'objectFilterDropdownSelectedRecordIdsScopedState',
-    defaultValue: [],
-  });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/onFilterSelectComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/onFilterSelectComponentState.ts
new file mode 100644
index 000000000000..b73c2cbe962f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/onFilterSelectComponentState.ts
@@ -0,0 +1,10 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+import { Filter } from '../types/Filter';
+
+export const onFilterSelectComponentState = createComponentState<
+  ((filter: Filter | null) => void) | undefined
+>({
+  key: 'onFilterSelectComponentState',
+  defaultValue: undefined,
+});
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/onFilterSelectScopedState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/onFilterSelectScopedState.ts
deleted file mode 100644
index 04c2199ce928..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/onFilterSelectScopedState.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { Filter } from '../types/Filter';
-
-export const onFilterSelectScopedState = createStateScopeMap<
-  ((filter: Filter | null) => void) | undefined
->({
-  key: 'onFilterSelectScopedState',
-  defaultValue: undefined,
-});
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedFilterComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedFilterComponentState.ts
new file mode 100644
index 000000000000..7b4183c74841
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedFilterComponentState.ts
@@ -0,0 +1,10 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+import { Filter } from '../types/Filter';
+
+export const selectedFilterComponentState = createComponentState<
+  Filter | undefined | null
+>({
+  key: 'selectedFilterComponentState',
+  defaultValue: undefined,
+});
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedFilterScopedState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedFilterScopedState.ts
deleted file mode 100644
index 7e45134475fa..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedFilterScopedState.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { Filter } from '../types/Filter';
-
-export const selectedFilterScopedState = createStateScopeMap<
-  Filter | undefined | null
->({
-  key: 'selectedFilterScopedState',
-  defaultValue: undefined,
-});
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState.ts
new file mode 100644
index 000000000000..eef8fe552a96
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
+
+export const selectedOperandInDropdownComponentState =
+  createComponentState<ViewFilterOperand | null>({
+    key: 'selectedOperandInDropdownComponentState',
+    defaultValue: null,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownScopedState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownScopedState.ts
deleted file mode 100644
index 2cb8e270c6b1..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownScopedState.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
-
-export const selectedOperandInDropdownScopedState =
-  createStateScopeMap<ViewFilterOperand | null>({
-    key: 'selectedOperandInDropdownScopedState',
-    defaultValue: null,
-  });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterType.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterType.ts
index 2c182f0a8bc1..7aa1bed31ec1 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterType.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterType.ts
@@ -3,8 +3,12 @@ export type FilterType =
   | 'PHONE'
   | 'EMAIL'
   | 'DATE_TIME'
+  | 'DATE'
   | 'NUMBER'
   | 'CURRENCY'
   | 'FULL_NAME'
   | 'LINK'
-  | 'RELATION';
+  | 'RELATION'
+  | 'ADDRESS'
+  | 'SELECT'
+  | 'MULTI_SELECT';
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/getOperandsForFilterType.test.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/getOperandsForFilterType.test.tsx
index 1486146d8170..7c6f09e6e118 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/getOperandsForFilterType.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/getOperandsForFilterType.test.tsx
@@ -11,6 +11,7 @@ describe('getOperandsForFilterType', () => {
       'FULL_NAME',
       [ViewFilterOperand.Contains, ViewFilterOperand.DoesNotContain],
     ],
+    ['ADDRESS', [ViewFilterOperand.Contains, ViewFilterOperand.DoesNotContain]],
     ['LINK', [ViewFilterOperand.Contains, ViewFilterOperand.DoesNotContain]],
     ['CURRENCY', [ViewFilterOperand.GreaterThan, ViewFilterOperand.LessThan]],
     ['NUMBER', [ViewFilterOperand.GreaterThan, ViewFilterOperand.LessThan]],
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getOperandsForFilterType.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getOperandsForFilterType.ts
index cd70c9334ff1..741293e0d7ca 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getOperandsForFilterType.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getOperandsForFilterType.ts
@@ -9,13 +9,16 @@ export const getOperandsForFilterType = (
     case 'TEXT':
     case 'EMAIL':
     case 'FULL_NAME':
+    case 'ADDRESS':
     case 'LINK':
       return [ViewFilterOperand.Contains, ViewFilterOperand.DoesNotContain];
     case 'CURRENCY':
     case 'NUMBER':
     case 'DATE_TIME':
+    case 'DATE':
       return [ViewFilterOperand.GreaterThan, ViewFilterOperand.LessThan];
     case 'RELATION':
+    case 'SELECT':
       return [ViewFilterOperand.Is, ViewFilterOperand.IsNot];
     default:
       return [];
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
index 4487463fa5e1..89da251bcdfc 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
@@ -1,21 +1,18 @@
-import { useCallback, useState } from 'react';
+import { IconChevronDown } from 'twenty-ui';
 
 import { OBJECT_SORT_DROPDOWN_ID } from '@/object-record/object-sort-dropdown/constants/ObjectSortDropdownId';
-import { useSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useSortDropdown';
+import { useObjectSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useObjectSortDropdown';
 import { ObjectSortDropdownScope } from '@/object-record/object-sort-dropdown/scopes/ObjectSortDropdownScope';
-import { IconChevronDown } from '@/ui/display/icon';
 import { useIcons } from '@/ui/display/icon/hooks/useIcons';
 import { LightButton } from '@/ui/input/button/components/LightButton';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
-import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
 
-import { SortDefinition } from '../types/SortDefinition';
-import { SORT_DIRECTIONS, SortDirection } from '../types/SortDirection';
+import { SORT_DIRECTIONS } from '../types/SortDirection';
 
 export type ObjectSortDropdownButtonProps = {
   sortDropdownId: string;
@@ -26,39 +23,20 @@ export const ObjectSortDropdownButton = ({
   sortDropdownId,
   hotkeyScope,
 }: ObjectSortDropdownButtonProps) => {
-  const [isSortDirectionMenuUnfolded, setIsSortDirectionMenuUnfolded] =
-    useState(false);
-
-  const [selectedSortDirection, setSelectedSortDirection] =
-    useState<SortDirection>('asc');
-
-  const resetState = useCallback(() => {
-    setIsSortDirectionMenuUnfolded(false);
-    setSelectedSortDirection('asc');
-  }, []);
-
-  const { isSortSelected } = useSortDropdown({
-    sortDropdownId: sortDropdownId,
-  });
-
-  const { toggleDropdown } = useDropdown(OBJECT_SORT_DROPDOWN_ID);
+  const {
+    isSortDirectionMenuUnfolded,
+    setIsSortDirectionMenuUnfolded,
+    selectedSortDirection,
+    setSelectedSortDirection,
+    toggleSortDropdown,
+    resetState,
+    isSortSelected,
+    availableSortDefinitions,
+    handleAddSort,
+  } = useObjectSortDropdown();
 
   const handleButtonClick = () => {
-    toggleDropdown();
-    resetState();
-  };
-
-  const { availableSortDefinitions, onSortSelect } = useSortDropdown({
-    sortDropdownId: sortDropdownId,
-  });
-
-  const handleAddSort = (selectedSortDefinition: SortDefinition) => {
-    toggleDropdown();
-    onSortSelect?.({
-      fieldMetadataId: selectedSortDefinition.fieldMetadataId,
-      direction: selectedSortDirection,
-      definition: selectedSortDefinition,
-    });
+    toggleSortDropdown();
   };
 
   const handleDropdownButtonClose = () => {
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/constants/ObjectSortDropdownId.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/constants/ObjectSortDropdownId.ts
index 5cc1f9c8fc65..18e7cdb32164 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/constants/ObjectSortDropdownId.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/constants/ObjectSortDropdownId.ts
@@ -1 +1,5 @@
-export const OBJECT_SORT_DROPDOWN_ID = 'sort-dropdown';
+/* eslint-disable @nx/workspace-max-consts-per-file */
+const OBJECT_SORT_DROPDOWN_ID = 'sort-dropdown';
+const VIEW_SORT_DROPDOWN_ID = 'view-sort';
+
+export { OBJECT_SORT_DROPDOWN_ID, VIEW_SORT_DROPDOWN_ID };
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/__tests__/useSortDropdown.test.tsx b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/__tests__/useSortDropdown.test.tsx
index 108055202573..6bf6ddf0d53e 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/__tests__/useSortDropdown.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/__tests__/useSortDropdown.test.tsx
@@ -1,7 +1,9 @@
+import { expect } from '@storybook/test';
 import { act, renderHook, waitFor } from '@testing-library/react';
-import { RecoilRoot } from 'recoil';
+import { RecoilRoot, useRecoilState } from 'recoil';
 
 import { useSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useSortDropdown';
+import { useSortDropdownStates } from '@/object-record/object-sort-dropdown/hooks/useSortDropdownStates';
 import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
 import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
 
@@ -20,10 +22,19 @@ const sortDefinitions: SortDefinition[] = [
 
 describe('useSortDropdown', () => {
   it('should set availableSortDefinitions', async () => {
-    const { result } = renderHook(
-      () => useSortDropdown({ sortDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      useSortDropdown({ sortDropdownId });
+      const { availableSortDefinitionsState } =
+        useSortDropdownStates(sortDropdownId);
+
+      const [availableSortDefinitions, setAvailableSortDefinitions] =
+        useRecoilState(availableSortDefinitionsState);
+
+      return {
+        availableSortDefinitions,
+        setAvailableSortDefinitions,
+      };
+    }, renderHookConfig);
     expect(result.current.availableSortDefinitions).toEqual([]);
     act(() => {
       result.current.setAvailableSortDefinitions(sortDefinitions);
@@ -35,10 +46,18 @@ describe('useSortDropdown', () => {
   });
 
   it('should set isSortSelected', async () => {
-    const { result } = renderHook(
-      () => useSortDropdown({ sortDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      useSortDropdown({ sortDropdownId });
+      const { isSortSelectedState } = useSortDropdownStates(sortDropdownId);
+
+      const [isSortSelected, setIsSortSelected] =
+        useRecoilState(isSortSelectedState);
+
+      return {
+        isSortSelected,
+        setIsSortSelected,
+      };
+    }, renderHookConfig);
 
     expect(result.current.isSortSelected).toBe(false);
 
@@ -54,10 +73,17 @@ describe('useSortDropdown', () => {
   it('should set onSortSelect', async () => {
     const OnSortSelectFunction = () => {};
     const mockOnSortSelect = jest.fn(() => OnSortSelectFunction);
-    const { result } = renderHook(
-      () => useSortDropdown({ sortDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      useSortDropdown({ sortDropdownId });
+      const { onSortSelectState } = useSortDropdownStates(sortDropdownId);
+
+      const [onSortSelect, setOnSortSelect] = useRecoilState(onSortSelectState);
+
+      return {
+        onSortSelect,
+        setOnSortSelect,
+      };
+    }, renderHookConfig);
 
     expect(result.current.onSortSelect).toBeUndefined();
 
@@ -78,10 +104,17 @@ describe('useSortDropdown', () => {
       definition: sortDefinitions[0],
     };
 
-    const { result } = renderHook(
-      () => useSortDropdown({ sortDropdownId }),
-      renderHookConfig,
-    );
+    const { result } = renderHook(() => {
+      useSortDropdown({ sortDropdownId });
+      const { onSortSelectState } = useSortDropdownStates(sortDropdownId);
+
+      const [onSortSelect, setOnSortSelect] = useRecoilState(onSortSelectState);
+
+      return {
+        onSortSelect,
+        setOnSortSelect,
+      };
+    }, renderHookConfig);
 
     act(() => {
       result.current.setOnSortSelect(mockOnSortSelect);
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useObjectSortDropdown.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useObjectSortDropdown.ts
new file mode 100644
index 000000000000..85322c628b7b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useObjectSortDropdown.ts
@@ -0,0 +1,77 @@
+import { useCallback } from 'react';
+import { useRecoilState, useRecoilValue } from 'recoil';
+
+import { useSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useSortDropdown';
+import isSortDirectionMenuUnfoldedState from '@/object-record/object-sort-dropdown/states/isSortDirectionMenuUnfoldedState';
+import selectedSortDirectionState from '@/object-record/object-sort-dropdown/states/selectedSortDirectionState';
+import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
+import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+
+import {
+  OBJECT_SORT_DROPDOWN_ID,
+  VIEW_SORT_DROPDOWN_ID,
+} from '../constants/ObjectSortDropdownId';
+
+// TODO: merge this with useSortDropdown
+export const useObjectSortDropdown = () => {
+  const [isSortDirectionMenuUnfolded, setIsSortDirectionMenuUnfolded] =
+    useRecoilState(isSortDirectionMenuUnfoldedState);
+
+  const [selectedSortDirection, setSelectedSortDirection] = useRecoilState(
+    selectedSortDirectionState,
+  );
+
+  const resetState = useCallback(() => {
+    setIsSortDirectionMenuUnfolded(false);
+    setSelectedSortDirection('asc');
+  }, [setIsSortDirectionMenuUnfolded, setSelectedSortDirection]);
+
+  const { toggleDropdown, closeDropdown } = useDropdown(
+    OBJECT_SORT_DROPDOWN_ID,
+  );
+
+  const toggleSortDropdown = () => {
+    toggleDropdown();
+    resetState();
+  };
+
+  const closeSortDropdown = () => {
+    closeDropdown();
+    resetState();
+  };
+
+  const {
+    availableSortDefinitionsState,
+    onSortSelectState,
+    isSortSelectedState,
+  } = useSortDropdown({
+    sortDropdownId: VIEW_SORT_DROPDOWN_ID,
+  });
+
+  const isSortSelected = useRecoilValue(isSortSelectedState);
+  const availableSortDefinitions = useRecoilValue(
+    availableSortDefinitionsState,
+  );
+  const onSortSelect = useRecoilValue(onSortSelectState);
+
+  const handleAddSort = (selectedSortDefinition: SortDefinition) => {
+    closeSortDropdown();
+    onSortSelect?.({
+      fieldMetadataId: selectedSortDefinition.fieldMetadataId,
+      direction: selectedSortDirection,
+      definition: selectedSortDefinition,
+    });
+  };
+
+  return {
+    isSortDirectionMenuUnfolded,
+    setIsSortDirectionMenuUnfolded,
+    selectedSortDirection,
+    setSelectedSortDirection,
+    toggleSortDropdown,
+    resetState,
+    isSortSelected,
+    availableSortDefinitions,
+    handleAddSort,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdown.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdown.ts
index 696dae8cd631..aee777aa1217 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdown.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdown.ts
@@ -13,21 +13,15 @@ export const useSortDropdown = (props?: UseSortProps) => {
     props?.sortDropdownId,
   );
   const {
-    availableSortDefinitions,
-    setAvailableSortDefinitions,
-    isSortSelected,
-    setIsSortSelected,
-    onSortSelect,
-    setOnSortSelect,
+    availableSortDefinitionsState,
+    isSortSelectedState,
+    onSortSelectState,
   } = useSortDropdownStates(scopeId);
 
   return {
     scopeId,
-    availableSortDefinitions,
-    isSortSelected,
-    setIsSortSelected,
-    setAvailableSortDefinitions,
-    onSortSelect,
-    setOnSortSelect,
+    availableSortDefinitionsState,
+    isSortSelectedState,
+    onSortSelectState,
   };
 };
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdownStates.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdownStates.ts
index 9453508fee46..74c6bdb5481a 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdownStates.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdownStates.ts
@@ -1,29 +1,27 @@
-import { onSortSelectScopedState } from '@/object-record/object-sort-dropdown/states/onSortSelectScopedState';
-import { useRecoilScopedStateV2 } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedStateV2';
-
-import { availableSortDefinitionsScopedState } from '../states/availableSortDefinitionsScopedState';
-import { isSortSelectedScopedState } from '../states/isSortSelectedScopedState';
+import { isSortSelectedComponentState } from '@/object-record/object-sort-dropdown/states/isSortSelectedScopedState';
+import { onSortSelectComponentState } from '@/object-record/object-sort-dropdown/states/onSortSelectScopedState';
+import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
+import { availableSortDefinitionsComponentState } from '@/views/states/availableSortDefinitionsComponentState';
 
 export const useSortDropdownStates = (scopeId: string) => {
-  const [availableSortDefinitions, setAvailableSortDefinitions] =
-    useRecoilScopedStateV2(availableSortDefinitionsScopedState, scopeId);
+  const availableSortDefinitionsState = extractComponentState(
+    availableSortDefinitionsComponentState,
+    scopeId,
+  );
 
-  const [isSortSelected, setIsSortSelected] = useRecoilScopedStateV2(
-    isSortSelectedScopedState,
+  const isSortSelectedState = extractComponentState(
+    isSortSelectedComponentState,
     scopeId,
   );
 
-  const [onSortSelect, setOnSortSelect] = useRecoilScopedStateV2(
-    onSortSelectScopedState,
+  const onSortSelectState = extractComponentState(
+    onSortSelectComponentState,
     scopeId,
   );
 
   return {
-    availableSortDefinitions,
-    setAvailableSortDefinitions,
-    isSortSelected,
-    setIsSortSelected,
-    onSortSelect,
-    setOnSortSelect,
+    availableSortDefinitionsState,
+    isSortSelectedState,
+    onSortSelectState,
   };
 };
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/scopes/scope-internal-context/ObjectSortDropdownScopeInternalContext.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/scopes/scope-internal-context/ObjectSortDropdownScopeInternalContext.ts
index 45a636d5fcb2..8454813f3d87 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/scopes/scope-internal-context/ObjectSortDropdownScopeInternalContext.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/scopes/scope-internal-context/ObjectSortDropdownScopeInternalContext.ts
@@ -1,9 +1,9 @@
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
 import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
 import { Sort } from '../../types/Sort';
 
-type ObjectSortDropdownScopeInternalContextProps = StateScopeMapKey & {
+type ObjectSortDropdownScopeInternalContextProps = ComponentStateKey & {
   onSortSelect?: (sort: Sort) => void;
 };
 
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/availableSortDefinitionsComponentState.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/availableSortDefinitionsComponentState.ts
new file mode 100644
index 000000000000..db559fa52f6b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/availableSortDefinitionsComponentState.ts
@@ -0,0 +1,10 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+import { SortDefinition } from '../types/SortDefinition';
+
+export const availableSortDefinitionsComponentState = createComponentState<
+  SortDefinition[]
+>({
+  key: 'availableSortDefinitionsComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/availableSortDefinitionsScopedState.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/availableSortDefinitionsScopedState.ts
deleted file mode 100644
index 27da40c6b74e..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/availableSortDefinitionsScopedState.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { SortDefinition } from '../types/SortDefinition';
-
-export const availableSortDefinitionsScopedState = createStateScopeMap<
-  SortDefinition[]
->({
-  key: 'availableSortDefinitionsScopedState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isSortDirectionMenuUnfoldedState.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isSortDirectionMenuUnfoldedState.ts
new file mode 100644
index 000000000000..ebf779b94a37
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isSortDirectionMenuUnfoldedState.ts
@@ -0,0 +1,8 @@
+import { atom } from 'recoil';
+
+const isSortDirectionMenuUnfoldedState = atom({
+  key: 'isSortDirectionMenuUnfoldedState',
+  default: false,
+});
+
+export default isSortDirectionMenuUnfoldedState;
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isSortSelectedScopedState.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isSortSelectedScopedState.ts
index 02514a4c4d4f..180a2f017221 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isSortSelectedScopedState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isSortSelectedScopedState.ts
@@ -1,6 +1,6 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
 
-export const isSortSelectedScopedState = createStateScopeMap<boolean>({
-  key: 'isSortSelectedScopedState',
+export const isSortSelectedComponentState = createComponentState<boolean>({
+  key: 'isSortSelectedComponentState',
   defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/onSortSelectScopedState.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/onSortSelectScopedState.ts
index 0b76031e6abb..8b6ca0a8cb35 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/onSortSelectScopedState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/onSortSelectScopedState.ts
@@ -1,10 +1,10 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
 
 import { Sort } from '../types/Sort';
 
-export const onSortSelectScopedState = createStateScopeMap<
+export const onSortSelectComponentState = createComponentState<
   ((sort: Sort) => void) | undefined
 >({
-  key: 'onSortSelectScopedState',
+  key: 'onSortSelectComponentState',
   defaultValue: undefined,
 });
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/selectedSortDirectionState.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/selectedSortDirectionState.ts
new file mode 100644
index 000000000000..327f9691752d
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/selectedSortDirectionState.ts
@@ -0,0 +1,10 @@
+import { atom } from 'recoil';
+
+import { SortDirection } from '@/object-record/object-sort-dropdown/types/SortDirection';
+
+const selectedSortDirectionState = atom<SortDirection>({
+  key: 'selectedSortDirectionState',
+  default: 'asc',
+});
+
+export default selectedSortDirectionState;
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.tsx b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.tsx
index b46ee87ac717..5a9dc2de62a5 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.tsx
@@ -55,7 +55,7 @@ describe('turnSortsIntoOrderBy', () => {
     });
   });
 
-  it('should throw error if field not found', () => {
+  it('should ignore if field not found', () => {
     const sorts: Sort[] = [
       {
         fieldMetadataId: 'invalidField',
@@ -63,8 +63,8 @@ describe('turnSortsIntoOrderBy', () => {
         definition: sortDefinition,
       },
     ];
-    expect(() => turnSortsIntoOrderBy(sorts, [])).toThrow(
-      'Could not find field invalidField in metadata object',
-    );
+    expect(turnSortsIntoOrderBy(sorts, [])).toEqual({
+      position: 'AscNullsFirst',
+    });
   });
 });
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy.ts
index fde1df2537b8..85452ddfcf65 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy.ts
@@ -2,6 +2,8 @@ import { OrderBy } from '@/object-metadata/types/OrderBy';
 import { OrderByField } from '@/object-metadata/types/OrderByField';
 import { Field } from '~/generated/graphql';
 import { mapArrayToObject } from '~/utils/array/mapArrayToObject';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 import { Sort } from '../types/Sort';
 
@@ -11,20 +13,20 @@ export const turnSortsIntoOrderBy = (
 ): OrderByField => {
   const fieldsById = mapArrayToObject(fields, ({ id }) => id);
   const sortsOrderBy = Object.fromEntries(
-    sorts.map((sort) => {
-      const correspondingField = fieldsById[sort.fieldMetadataId];
+    sorts
+      .map((sort) => {
+        const correspondingField = fieldsById[sort.fieldMetadataId];
 
-      if (!correspondingField) {
-        throw new Error(
-          `Could not find field ${sort.fieldMetadataId} in metadata object`,
-        );
-      }
+        if (isUndefinedOrNull(correspondingField)) {
+          return undefined;
+        }
 
-      const direction: OrderBy =
-        sort.direction === 'asc' ? 'AscNullsFirst' : 'DescNullsLast';
+        const direction: OrderBy =
+          sort.direction === 'asc' ? 'AscNullsFirst' : 'DescNullsLast';
 
-      return [correspondingField.name, direction];
-    }),
+        return [correspondingField.name, direction];
+      })
+      .filter(isDefined),
   );
 
   return {
diff --git a/packages/twenty-front/src/modules/object-record/query-keys/types/QueryFields.ts b/packages/twenty-front/src/modules/object-record/query-keys/types/QueryFields.ts
new file mode 100644
index 000000000000..78b2e21c3bc3
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/query-keys/types/QueryFields.ts
@@ -0,0 +1 @@
+export type QueryFields = Record<string, any>;
diff --git a/packages/twenty-front/src/modules/object-record/query-keys/types/QueryKey.ts b/packages/twenty-front/src/modules/object-record/query-keys/types/QueryKey.ts
new file mode 100644
index 000000000000..c1a7a598495b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/query-keys/types/QueryKey.ts
@@ -0,0 +1,10 @@
+import { QueryFields } from '@/object-record/query-keys/types/QueryFields';
+import { ObjectRecordQueryVariables } from '@/object-record/types/ObjectRecordQueryVariables';
+
+export type QueryKey = {
+  objectNameSingular: string;
+  variables: ObjectRecordQueryVariables;
+  depth?: number;
+  fields?: QueryFields; // Todo: Fields should be required
+  fieldsFactory?: (fieldsFactoryParam: any) => QueryFields;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-action-bar/hooks/useRecordActionBar.tsx b/packages/twenty-front/src/modules/object-record/record-action-bar/hooks/useRecordActionBar.tsx
index a609203749cd..f8370cfb24d9 100644
--- a/packages/twenty-front/src/modules/object-record/record-action-bar/hooks/useRecordActionBar.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-action-bar/hooks/useRecordActionBar.tsx
@@ -1,24 +1,28 @@
-import { useCallback, useMemo } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 import { isNonEmptyString } from '@sniptt/guards';
 import { useRecoilCallback, useSetRecoilState } from 'recoil';
-
-import { useFavorites } from '@/favorites/hooks/useFavorites';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { useDeleteManyRecords } from '@/object-record/hooks/useDeleteManyRecords';
-import { useExecuteQuickActionOnOneRecord } from '@/object-record/hooks/useExecuteQuickActionOnOneRecord';
-import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import {
   IconClick,
+  IconFileExport,
   IconHeart,
   IconHeartOff,
   IconMail,
   IconPuzzle,
   IconTrash,
-} from '@/ui/display/icon';
+} from 'twenty-ui';
+
+import { useFavorites } from '@/favorites/hooks/useFavorites';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { useDeleteManyRecords } from '@/object-record/hooks/useDeleteManyRecords';
+import { useExecuteQuickActionOnOneRecord } from '@/object-record/hooks/useExecuteQuickActionOnOneRecord';
+import { useExportTableData } from '@/object-record/record-index/options/hooks/useExportTableData';
+import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
 import { actionBarEntriesState } from '@/ui/navigation/action-bar/states/actionBarEntriesState';
 import { contextMenuEntriesState } from '@/ui/navigation/context-menu/states/contextMenuEntriesState';
 import { ContextMenuEntry } from '@/ui/navigation/context-menu/types/ContextMenuEntry';
 import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { isDefined } from '~/utils/isDefined';
 
 type useRecordActionBarProps = {
   objectMetadataItem: ObjectMetadataItem;
@@ -33,6 +37,8 @@ export const useRecordActionBar = ({
 }: useRecordActionBarProps) => {
   const setContextMenuEntries = useSetRecoilState(contextMenuEntriesState);
   const setActionBarEntriesState = useSetRecoilState(actionBarEntriesState);
+  const [isDeleteRecordsModalOpen, setIsDeleteRecordsModalOpen] =
+    useState(false);
 
   const { createFavorite, favorites, deleteFavorite } = useFavorites();
 
@@ -44,29 +50,40 @@ export const useRecordActionBar = ({
     objectNameSingular: objectMetadataItem.nameSingular,
   });
 
-  const handleFavoriteButtonClick = useRecoilCallback(({ snapshot }) => () => {
-    if (selectedRecordIds.length > 1) {
-      return;
-    }
-
-    const selectedRecordId = selectedRecordIds[0];
-    const selectedRecord = snapshot
-      .getLoadable(recordStoreFamilyState(selectedRecordId))
-      .getValue();
-
-    const foundFavorite = favorites?.find(
-      (favorite) => favorite.recordId === selectedRecordId,
-    );
-
-    const isFavorite = !!selectedRecordId && !!foundFavorite;
-
-    if (isFavorite) {
-      deleteFavorite(foundFavorite.id);
-    } else if (selectedRecord) {
-      createFavorite(selectedRecord, objectMetadataItem.nameSingular);
-    }
-    callback?.();
-  });
+  const handleFavoriteButtonClick = useRecoilCallback(
+    ({ snapshot }) =>
+      () => {
+        if (selectedRecordIds.length > 1) {
+          return;
+        }
+
+        const selectedRecordId = selectedRecordIds[0];
+        const selectedRecord = snapshot
+          .getLoadable(recordStoreFamilyState(selectedRecordId))
+          .getValue();
+
+        const foundFavorite = favorites?.find(
+          (favorite) => favorite.recordId === selectedRecordId,
+        );
+
+        const isFavorite = !!selectedRecordId && !!foundFavorite;
+
+        if (isFavorite) {
+          deleteFavorite(foundFavorite.id);
+        } else if (isDefined(selectedRecord)) {
+          createFavorite(selectedRecord, objectMetadataItem.nameSingular);
+        }
+        callback?.();
+      },
+    [
+      callback,
+      createFavorite,
+      deleteFavorite,
+      favorites,
+      objectMetadataItem.nameSingular,
+      selectedRecordIds,
+    ],
+  );
 
   const handleDeleteClick = useCallback(async () => {
     callback?.();
@@ -82,16 +99,58 @@ export const useRecordActionBar = ({
     );
   }, [callback, executeQuickActionOnOneRecord, selectedRecordIds]);
 
+  const { progress, download } = useExportTableData({
+    delayMs: 100,
+    filename: `${objectMetadataItem.nameSingular}.csv`,
+    objectNameSingular: objectMetadataItem.nameSingular,
+    recordIndexId: objectMetadataItem.namePlural,
+  });
+
+  const isRemoteObject = objectMetadataItem.isRemote;
+
   const baseActions: ContextMenuEntry[] = useMemo(
+    () => [
+      {
+        label: `${progress === undefined ? `Export` : `Export (${progress}%)`}`,
+        Icon: IconFileExport,
+        accent: 'default',
+        onClick: () => download(),
+      },
+    ],
+    [download, progress],
+  );
+
+  const deletionActions: ContextMenuEntry[] = useMemo(
     () => [
       {
         label: 'Delete',
         Icon: IconTrash,
         accent: 'danger',
-        onClick: () => handleDeleteClick(),
+        onClick: () => setIsDeleteRecordsModalOpen(true),
+        ConfirmationModal: (
+          <ConfirmationModal
+            isOpen={isDeleteRecordsModalOpen}
+            setIsOpen={setIsDeleteRecordsModalOpen}
+            title={`Delete ${selectedRecordIds.length} ${
+              selectedRecordIds.length === 1 ? `record` : 'records'
+            }`}
+            subtitle={`This action cannot be undone. This will permanently delete ${
+              selectedRecordIds.length === 1 ? 'this record' : 'these records'
+            }`}
+            onConfirmClick={() => handleDeleteClick()}
+            deleteButtonText={`Delete ${
+              selectedRecordIds.length > 1 ? 'Records' : 'Record'
+            }`}
+          />
+        ),
       },
     ],
-    [handleDeleteClick],
+    [
+      handleDeleteClick,
+      selectedRecordIds,
+      isDeleteRecordsModalOpen,
+      setIsDeleteRecordsModalOpen,
+    ],
   );
 
   const dataExecuteQuickActionOnmentEnabled = useIsFeatureEnabled(
@@ -107,8 +166,9 @@ export const useRecordActionBar = ({
   return {
     setContextMenuEntries: useCallback(() => {
       setContextMenuEntries([
+        ...(isRemoteObject ? [] : deletionActions),
         ...baseActions,
-        ...(isFavorite && hasOnlyOneRecordSelected
+        ...(!isRemoteObject && isFavorite && hasOnlyOneRecordSelected
           ? [
               {
                 label: 'Remove from favorites',
@@ -117,7 +177,7 @@ export const useRecordActionBar = ({
               },
             ]
           : []),
-        ...(!isFavorite && hasOnlyOneRecordSelected
+        ...(!isRemoteObject && !isFavorite && hasOnlyOneRecordSelected
           ? [
               {
                 label: 'Add to favorites',
@@ -129,9 +189,11 @@ export const useRecordActionBar = ({
       ]);
     }, [
       baseActions,
+      deletionActions,
       handleFavoriteButtonClick,
       hasOnlyOneRecordSelected,
       isFavorite,
+      isRemoteObject,
       setContextMenuEntries,
     ]),
 
@@ -156,12 +218,15 @@ export const useRecordActionBar = ({
               },
             ]
           : []),
+        ...(isRemoteObject ? [] : deletionActions),
         ...baseActions,
       ]);
     }, [
       baseActions,
       dataExecuteQuickActionOnmentEnabled,
+      deletionActions,
       handleExecuteQuickActionOnClick,
+      isRemoteObject,
       setActionBarEntriesState,
     ]),
   };
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/action-bar/components/RecordBoardDeprecatedActionBar.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/action-bar/components/RecordBoardDeprecatedActionBar.tsx
deleted file mode 100644
index b2e01c273a1e..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/action-bar/components/RecordBoardDeprecatedActionBar.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import { useRecoilValue } from 'recoil';
-
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { ActionBar } from '@/ui/navigation/action-bar/components/ActionBar';
-
-export const RecordBoardDeprecatedActionBar = () => {
-  const { selectedCardIdsSelector } = useRecordBoardDeprecatedScopedStates();
-  const selectedCardIds = useRecoilValue(selectedCardIdsSelector);
-
-  if (!selectedCardIds.length) {
-    return null;
-  }
-
-  return <ActionBar />;
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/NewButton.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/NewButton.tsx
deleted file mode 100644
index 867a57063890..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/NewButton.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { useTheme } from '@emotion/react';
-import styled from '@emotion/styled';
-
-import { IconPlus } from '@/ui/display/icon/index';
-
-const StyledButton = styled.button`
-  align-items: center;
-  align-self: baseline;
-  background-color: ${({ theme }) => theme.background.primary};
-  border: none;
-  border-radius: ${({ theme }) => theme.border.radius.sm};
-  color: ${({ theme }) => theme.font.color.tertiary};
-  cursor: pointer;
-  display: flex;
-  gap: ${({ theme }) => theme.spacing(1)};
-  padding: ${({ theme }) => theme.spacing(1)};
-
-  &:hover {
-    background-color: ${({ theme }) => theme.background.tertiary};
-  }
-`;
-
-type NewButtonProps = {
-  onClick: () => void;
-};
-
-export const NewButton = ({ onClick }: NewButtonProps) => {
-  const theme = useTheme();
-
-  return (
-    <StyledButton onClick={onClick}>
-      <IconPlus size={theme.icon.size.md} />
-      New
-    </StyledButton>
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecated.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecated.tsx
deleted file mode 100644
index 854a138297d3..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecated.tsx
+++ /dev/null
@@ -1,162 +0,0 @@
-import { useCallback, useRef } from 'react';
-import styled from '@emotion/styled';
-import { DragDropContext, OnDragEndResponder } from '@hello-pangea/dnd'; // Atlassian dnd does not support StrictMode from RN 18, so we use a fork @hello-pangea/dnd https://github.com/atlassian/react-beautiful-dnd/issues/2350
-import { useRecoilValue } from 'recoil';
-
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { RecordBoardDeprecatedActionBar } from '@/object-record/record-board-deprecated/action-bar/components/RecordBoardDeprecatedActionBar';
-import { RecordBoardDeprecatedInternalEffect } from '@/object-record/record-board-deprecated/components/RecordBoardDeprecatedInternalEffect';
-import { RecordBoardDeprecatedContextMenu } from '@/object-record/record-board-deprecated/context-menu/components/RecordBoardDeprecatedContextMenu';
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { useSetRecordBoardDeprecatedCardSelectedInternal } from '@/object-record/record-board-deprecated/hooks/internal/useSetRecordBoardDeprecatedCardSelectedInternal';
-import { RecordBoardDeprecatedScope } from '@/object-record/record-board-deprecated/scopes/RecordBoardDeprecatedScope';
-import { Opportunity } from '@/pipeline/types/Opportunity';
-import { DragSelect } from '@/ui/utilities/drag-select/components/DragSelect';
-import { useListenClickOutsideByClassName } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
-import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
-import { logError } from '~/utils/logError';
-
-import { BoardColumnDefinition } from '../types/BoardColumnDefinition';
-import { BoardOptions } from '../types/BoardOptions';
-
-import { RecordBoardDeprecatedColumn } from './RecordBoardDeprecatedColumn';
-
-export type RecordBoardDeprecatedProps = {
-  recordBoardId: string;
-  boardOptions: BoardOptions;
-  onColumnAdd?: (boardColumn: BoardColumnDefinition) => void;
-  onColumnDelete?: (boardColumnId: string) => void;
-  onEditColumnTitle: (params: {
-    columnId: string;
-    title: string;
-    color: string;
-  }) => void;
-};
-
-const StyledBoard = styled.div`
-  border-top: 1px solid ${({ theme }) => theme.border.color.light};
-  display: flex;
-  flex: 1;
-  flex-direction: row;
-  margin-left: ${({ theme }) => theme.spacing(2)};
-  margin-right: ${({ theme }) => theme.spacing(2)};
-`;
-
-const StyledWrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  overflow: hidden;
-  position: relative;
-  width: 100%;
-`;
-
-const StyledBoardHeader = styled.div`
-  position: relative;
-  z-index: 1;
-`;
-
-export const RecordBoardDeprecated = ({
-  recordBoardId,
-  boardOptions,
-  onColumnDelete,
-  onEditColumnTitle,
-}: RecordBoardDeprecatedProps) => {
-  const recordBoardScopeId = recordBoardId;
-
-  const { boardColumnsState } = useRecordBoardDeprecatedScopedStates({
-    recordBoardScopeId,
-  });
-  const boardColumns = useRecoilValue(boardColumnsState);
-
-  const { updateOneRecord: updateOneOpportunity } =
-    useUpdateOneRecord<Opportunity>({
-      objectNameSingular: CoreObjectNameSingular.Opportunity,
-    });
-
-  const { unselectAllActiveCards, setCardSelected } =
-    useSetRecordBoardDeprecatedCardSelectedInternal({ recordBoardScopeId });
-
-  const updatePipelineProgressStageInDB = useCallback(
-    async (pipelineProgressId: string, pipelineStepId: string) => {
-      await updateOneOpportunity?.({
-        idToUpdate: pipelineProgressId,
-        updateOneRecordInput: {
-          pipelineStepId: pipelineStepId,
-        },
-      });
-    },
-    [updateOneOpportunity],
-  );
-
-  useListenClickOutsideByClassName({
-    classNames: ['entity-board-card'],
-    excludeClassNames: ['action-bar', 'context-menu'],
-    callback: unselectAllActiveCards,
-  });
-
-  const onDragEnd: OnDragEndResponder = useCallback(
-    async (result) => {
-      if (!boardColumns) return;
-
-      try {
-        const draggedEntityId = result.draggableId;
-        const destinationColumnId = result.destination?.droppableId;
-
-        if (
-          draggedEntityId &&
-          destinationColumnId &&
-          updatePipelineProgressStageInDB
-        ) {
-          await updatePipelineProgressStageInDB(
-            draggedEntityId,
-            destinationColumnId,
-          );
-        }
-      } catch (e) {
-        logError(e);
-      }
-    },
-    [boardColumns, updatePipelineProgressStageInDB],
-  );
-
-  const sortedBoardColumns = [...boardColumns].sort((a, b) => {
-    return a.position - b.position;
-  });
-
-  const boardRef = useRef<HTMLDivElement>(null);
-
-  return (
-    <RecordBoardDeprecatedScope recordBoardScopeId={recordBoardId}>
-      <RecordBoardDeprecatedContextMenu />
-      <RecordBoardDeprecatedActionBar />
-      <RecordBoardDeprecatedInternalEffect />
-
-      <StyledWrapper>
-        <StyledBoardHeader />
-        <ScrollWrapper>
-          <StyledBoard ref={boardRef}>
-            <DragDropContext onDragEnd={onDragEnd}>
-              {sortedBoardColumns.map((column) => (
-                <RecordBoardDeprecatedColumn
-                  key={column.id}
-                  recordBoardColumnId={column.id}
-                  columnDefinition={column}
-                  recordBoardColumnTotal={sortedBoardColumns.length}
-                  recordBoardOptions={boardOptions}
-                  onDelete={onColumnDelete}
-                  onTitleEdit={onEditColumnTitle}
-                />
-              ))}
-            </DragDropContext>
-          </StyledBoard>
-        </ScrollWrapper>
-        <DragSelect
-          dragSelectable={boardRef}
-          onDragSelectionChange={setCardSelected}
-        />
-      </StyledWrapper>
-    </RecordBoardDeprecatedScope>
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedCard.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedCard.tsx
deleted file mode 100644
index c4e630f783b3..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedCard.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Draggable } from '@hello-pangea/dnd';
-import { useSetRecoilState } from 'recoil';
-
-import { contextMenuIsOpenState } from '@/ui/navigation/context-menu/states/contextMenuIsOpenState';
-import { contextMenuPositionState } from '@/ui/navigation/context-menu/states/contextMenuPositionState';
-
-import { useCurrentRecordBoardDeprecatedCardSelectedInternal } from '../hooks/internal/useCurrentRecordBoardDeprecatedCardSelectedInternal';
-import { BoardOptions } from '../types/BoardOptions';
-
-export const RecordBoardDeprecatedCard = ({
-  recordBoardOptions,
-  cardId,
-  index,
-}: {
-  recordBoardOptions: BoardOptions;
-  cardId: string;
-  index: number;
-}) => {
-  const setContextMenuPosition = useSetRecoilState(contextMenuPositionState);
-  const setContextMenuOpenState = useSetRecoilState(contextMenuIsOpenState);
-
-  const { setCurrentCardSelected } =
-    useCurrentRecordBoardDeprecatedCardSelectedInternal();
-
-  const handleContextMenu = (event: React.MouseEvent) => {
-    event.preventDefault();
-    setCurrentCardSelected(true);
-    setContextMenuPosition({
-      x: event.clientX,
-      y: event.clientY,
-    });
-    setContextMenuOpenState(true);
-  };
-
-  return (
-    <Draggable key={cardId} draggableId={cardId} index={index}>
-      {(draggableProvided) => (
-        <div
-          ref={draggableProvided?.innerRef}
-          // eslint-disable-next-line react/jsx-props-no-spreading
-          {...draggableProvided?.dragHandleProps}
-          // eslint-disable-next-line react/jsx-props-no-spreading
-          {...draggableProvided?.draggableProps}
-          className="entity-board-card"
-          data-selectable-id={cardId}
-          data-select-disable
-          onContextMenu={handleContextMenu}
-        >
-          {<recordBoardOptions.CardComponent />}
-        </div>
-      )}
-    </Draggable>
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedColumn.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedColumn.tsx
deleted file mode 100644
index 7566c71355c0..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedColumn.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-import React from 'react';
-import styled from '@emotion/styled';
-import { Draggable, Droppable, DroppableProvided } from '@hello-pangea/dnd';
-import { useRecoilValue } from 'recoil';
-
-import { RecordBoardDeprecatedCard } from '@/object-record/record-board-deprecated/components/RecordBoardDeprecatedCard';
-import { RecordBoardDeprecatedColumnHeader } from '@/object-record/record-board-deprecated/components/RecordBoardDeprecatedColumnHeader';
-import { BoardCardIdContext } from '@/object-record/record-board-deprecated/contexts/BoardCardIdContext';
-import { BoardColumnDefinition } from '@/object-record/record-board-deprecated/types/BoardColumnDefinition';
-
-import { BoardColumnContext } from '../contexts/BoardColumnContext';
-import { recordBoardCardIdsByColumnIdFamilyState } from '../states/recordBoardCardIdsByColumnIdFamilyState';
-import { BoardOptions } from '../types/BoardOptions';
-
-const StyledPlaceholder = styled.div`
-  min-height: 1px;
-`;
-
-const StyledNewCardButtonContainer = styled.div`
-  padding-bottom: ${({ theme }) => theme.spacing(4)};
-`;
-
-const StyledColumnCardsContainer = styled.div`
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-`;
-
-const StyledColumn = styled.div<{ isFirstColumn: boolean }>`
-  background-color: ${({ theme }) => theme.background.primary};
-  border-left: 1px solid
-    ${({ theme, isFirstColumn }) =>
-      isFirstColumn ? 'none' : theme.border.color.light};
-  display: flex;
-  flex-direction: column;
-  max-width: 200px;
-  min-width: 200px;
-
-  padding: ${({ theme }) => theme.spacing(2)};
-  position: relative;
-`;
-
-type BoardColumnCardsContainerProps = {
-  children: React.ReactNode;
-  droppableProvided: DroppableProvided;
-};
-
-type RecordBoardDeprecatedColumnProps = {
-  recordBoardColumnId: string;
-  columnDefinition: BoardColumnDefinition;
-  recordBoardOptions: BoardOptions;
-  recordBoardColumnTotal: number;
-  onDelete?: (columnId: string) => void;
-  onTitleEdit: (params: {
-    columnId: string;
-    title: string;
-    color: string;
-  }) => void;
-};
-
-const BoardColumnCardsContainer = ({
-  children,
-  droppableProvided,
-}: BoardColumnCardsContainerProps) => {
-  return (
-    <StyledColumnCardsContainer
-      ref={droppableProvided?.innerRef}
-      // eslint-disable-next-line react/jsx-props-no-spreading
-      {...droppableProvided?.droppableProps}
-    >
-      {children}
-      <StyledPlaceholder>{droppableProvided?.placeholder}</StyledPlaceholder>
-    </StyledColumnCardsContainer>
-  );
-};
-
-export const RecordBoardDeprecatedColumn = ({
-  recordBoardColumnId,
-  columnDefinition,
-  recordBoardOptions,
-  recordBoardColumnTotal,
-  onDelete,
-  onTitleEdit,
-}: RecordBoardDeprecatedColumnProps) => {
-  const cardIds = useRecoilValue(
-    recordBoardCardIdsByColumnIdFamilyState(recordBoardColumnId),
-  );
-
-  const isFirstColumn = columnDefinition.position === 0;
-
-  return (
-    <BoardColumnContext.Provider
-      value={{
-        id: recordBoardColumnId,
-        columnDefinition: columnDefinition,
-        isFirstColumn: columnDefinition.position === 0,
-        isLastColumn: columnDefinition.position === recordBoardColumnTotal - 1,
-        onTitleEdit: ({ title, color }) =>
-          onTitleEdit({ columnId: recordBoardColumnId, title, color }),
-      }}
-    >
-      <Droppable droppableId={recordBoardColumnId}>
-        {(droppableProvided) => (
-          <StyledColumn isFirstColumn={isFirstColumn}>
-            <RecordBoardDeprecatedColumnHeader
-              recordBoardColumnId={recordBoardColumnId}
-              columnDefinition={columnDefinition}
-              onDelete={onDelete}
-            />
-            <BoardColumnCardsContainer droppableProvided={droppableProvided}>
-              {cardIds.map((cardId, index) => (
-                <BoardCardIdContext.Provider value={cardId} key={cardId}>
-                  <RecordBoardDeprecatedCard
-                    index={index}
-                    cardId={cardId}
-                    recordBoardOptions={recordBoardOptions}
-                  />
-                </BoardCardIdContext.Provider>
-              ))}
-              <Draggable
-                draggableId={`new-${recordBoardColumnId}`}
-                index={cardIds.length}
-                isDragDisabled={true}
-              >
-                {(draggableProvided) => (
-                  <div
-                    ref={draggableProvided?.innerRef}
-                    // eslint-disable-next-line react/jsx-props-no-spreading
-                    {...draggableProvided?.draggableProps}
-                  >
-                    <StyledNewCardButtonContainer>
-                      {recordBoardOptions.newCardComponent}
-                    </StyledNewCardButtonContainer>
-                  </div>
-                )}
-              </Draggable>
-            </BoardColumnCardsContainer>
-          </StyledColumn>
-        )}
-      </Droppable>
-    </BoardColumnContext.Provider>
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedColumnDropdownMenu.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedColumnDropdownMenu.tsx
deleted file mode 100644
index 69e99b95d02b..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedColumnDropdownMenu.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import { useCallback, useContext, useRef, useState } from 'react';
-import styled from '@emotion/styled';
-import { Key } from 'ts-key-enum';
-
-import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
-import { IconArrowLeft, IconArrowRight, IconPencil } from '@/ui/display/icon';
-import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
-import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
-import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
-import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
-
-import { BoardColumnContext } from '../contexts/BoardColumnContext';
-import { useBoardColumnsInternal } from '../hooks/internal/useRecordBoardDeprecatedColumnsInternal';
-import { BoardColumnHotkeyScope } from '../types/BoardColumnHotkeyScope';
-
-import { RecordBoardDeprecatedColumnEditTitleMenu } from './RecordBoardDeprecatedColumnEditTitleMenu';
-const StyledMenuContainer = styled.div`
-  position: absolute;
-  top: ${({ theme }) => theme.spacing(10)};
-  width: 200px;
-  z-index: 1;
-`;
-
-type RecordBoardDeprecatedColumnDropdownMenuProps = {
-  onClose: () => void;
-  onDelete?: (id: string) => void;
-  stageId: string;
-};
-
-type Menu = 'actions' | 'add' | 'title';
-
-export const RecordBoardDeprecatedColumnDropdownMenu = ({
-  onClose,
-  onDelete,
-  stageId,
-}: RecordBoardDeprecatedColumnDropdownMenuProps) => {
-  const [currentMenu, setCurrentMenu] = useState('actions');
-  const column = useContext(BoardColumnContext);
-
-  const boardColumnMenuRef = useRef<HTMLDivElement>(null);
-
-  const { handleMoveBoardColumn } = useBoardColumnsInternal();
-
-  const {
-    setHotkeyScopeAndMemorizePreviousScope,
-    goBackToPreviousHotkeyScope,
-  } = usePreviousHotkeyScope();
-
-  const closeMenu = useCallback(() => {
-    goBackToPreviousHotkeyScope();
-    onClose();
-  }, [goBackToPreviousHotkeyScope, onClose]);
-
-  const setMenu = (menu: Menu) => {
-    if (menu === 'add') {
-      setHotkeyScopeAndMemorizePreviousScope(
-        RelationPickerHotkeyScope.RelationPicker,
-      );
-    }
-    setCurrentMenu(menu);
-  };
-
-  useListenClickOutside({
-    refs: [boardColumnMenuRef],
-    callback: closeMenu,
-  });
-
-  useScopedHotkeys(
-    [Key.Escape, Key.Enter],
-    () => {
-      closeMenu();
-    },
-    BoardColumnHotkeyScope.BoardColumn,
-    [],
-  );
-
-  if (!column) return <></>;
-
-  const { isFirstColumn, isLastColumn, columnDefinition } = column;
-
-  const handleColumnMoveLeft = () => {
-    closeMenu();
-    if (isFirstColumn) {
-      return;
-    }
-    handleMoveBoardColumn('left', columnDefinition);
-  };
-
-  const handleColumnMoveRight = () => {
-    closeMenu();
-    if (isLastColumn) {
-      return;
-    }
-    handleMoveBoardColumn('right', columnDefinition);
-  };
-
-  return (
-    <StyledMenuContainer ref={boardColumnMenuRef}>
-      <DropdownMenu data-select-disable>
-        {currentMenu === 'actions' && (
-          <DropdownMenuItemsContainer>
-            <MenuItem
-              onClick={() => setMenu('title')}
-              LeftIcon={IconPencil}
-              text="Edit"
-            />
-            <MenuItem
-              LeftIcon={IconArrowLeft}
-              onClick={handleColumnMoveLeft}
-              text="Move left"
-            />
-            <MenuItem
-              LeftIcon={IconArrowRight}
-              onClick={handleColumnMoveRight}
-              text="Move right"
-            />
-            {/* <MenuItem
-              onClick={() => setMenu('add')}
-              LeftIcon={IconPlus}
-              text="New opportunity"
-            /> */}
-          </DropdownMenuItemsContainer>
-        )}
-        {currentMenu === 'title' && (
-          <RecordBoardDeprecatedColumnEditTitleMenu
-            color={columnDefinition.colorCode ?? 'gray'}
-            onClose={closeMenu}
-            title={columnDefinition.title}
-            onDelete={onDelete}
-            stageId={stageId}
-          />
-        )}
-        {currentMenu === 'add' && (
-          <div>add</div>
-          // <SingleEntitySelect
-          //   disableBackgroundBlur
-          //   entitiesToSelect={companies.entitiesToSelect}
-          //   loading={companies.loading}
-          //   onCancel={closeMenu}
-          //   onEntitySelected={handleCompanySelected}
-          //   selectedEntity={companies.selectedEntities[0]}
-          // />
-        )}
-      </DropdownMenu>
-    </StyledMenuContainer>
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedColumnEditTitleMenu.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedColumnEditTitleMenu.tsx
deleted file mode 100644
index 4caf7d2482b0..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedColumnEditTitleMenu.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import { ChangeEvent, useCallback, useContext, useState } from 'react';
-import styled from '@emotion/styled';
-import debounce from 'lodash.debounce';
-
-import { IconTrash } from '@/ui/display/icon';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
-import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
-import { MenuItemSelectColor } from '@/ui/navigation/menu-item/components/MenuItemSelectColor';
-import {
-  MAIN_COLOR_NAMES,
-  ThemeColor,
-} from '@/ui/theme/constants/MainColorNames';
-import { TEXT_INPUT_STYLE } from '@/ui/theme/constants/TextInputStyle';
-
-import { BoardColumnContext } from '../contexts/BoardColumnContext';
-import { useRecordBoardDeprecated } from '../hooks/useRecordBoardDeprecated';
-
-const StyledEditTitleContainer = styled.div`
-  --vertical-padding: ${({ theme }) => theme.spacing(1)};
-
-  align-items: center;
-
-  display: flex;
-  flex-direction: row;
-  height: calc(36px - 2 * var(--vertical-padding));
-  padding: var(--vertical-padding) 0;
-
-  width: calc(100%);
-`;
-
-const StyledEditModeInput = styled.input`
-  ${TEXT_INPUT_STYLE}
-
-  background: ${({ theme }) => theme.background.transparent.lighter};
-  border-color: ${({ theme }) => theme.color.blue};
-  border-radius: ${({ theme }) => theme.border.radius.sm};
-  border-style: solid;
-  border-width: 1px;
-  box-shadow: 0px 0px 0px 3px rgba(25, 97, 237, 0.1);
-  font-size: ${({ theme }) => theme.font.size.sm};
-  height: 100%;
-  width: 100%;
-`;
-
-type RecordBoardDeprecatedColumnEditTitleMenuProps = {
-  onClose: () => void;
-  onDelete?: (id: string) => void;
-  title: string;
-  color: ThemeColor;
-  stageId: string;
-};
-
-export const RecordBoardDeprecatedColumnEditTitleMenu = ({
-  onClose,
-  onDelete,
-  stageId,
-  title,
-  color,
-}: RecordBoardDeprecatedColumnEditTitleMenuProps) => {
-  const [internalValue, setInternalValue] = useState(title);
-  const { onTitleEdit } = useContext(BoardColumnContext) || {};
-
-  const { setBoardColumns } = useRecordBoardDeprecated({
-    recordBoardScopeId: 'company-board',
-  });
-
-  const debouncedOnUpdateTitle = debounce(
-    (newTitle) => onTitleEdit?.({ title: newTitle, color }),
-    200,
-  );
-  const handleChange = (event: ChangeEvent<HTMLInputElement>) => {
-    const title = event.target.value;
-    setInternalValue(title);
-    debouncedOnUpdateTitle(title);
-
-    setBoardColumns((previousBoardColumns) =>
-      previousBoardColumns.map((column) =>
-        column.id === stageId ? { ...column, title: title } : column,
-      ),
-    );
-  };
-
-  const handleColorChange = (newColor: ThemeColor) => {
-    onTitleEdit?.({ title, color: newColor });
-    onClose();
-    setBoardColumns((previousBoardColumns) =>
-      previousBoardColumns.map((column) =>
-        column.id === stageId
-          ? { ...column, colorCode: newColor ? newColor : 'gray' }
-          : column,
-      ),
-    );
-  };
-
-  const handleDelete = useCallback(() => {
-    setBoardColumns((previousBoardColumns) =>
-      previousBoardColumns.filter((column) => column.id !== stageId),
-    );
-    onDelete?.(stageId);
-    onClose();
-  }, [onClose, onDelete, setBoardColumns, stageId]);
-
-  return (
-    <DropdownMenuItemsContainer>
-      <StyledEditTitleContainer>
-        <StyledEditModeInput
-          value={internalValue}
-          onChange={handleChange}
-          autoComplete="off"
-          autoFocus
-        />
-      </StyledEditTitleContainer>
-      <DropdownMenuSeparator />
-      {MAIN_COLOR_NAMES.map((colorName) => (
-        <MenuItemSelectColor
-          key={colorName}
-          onClick={() => handleColorChange(colorName)}
-          color={colorName}
-          selected={colorName === color}
-          variant="pipeline"
-        />
-      ))}
-      <DropdownMenuSeparator />
-      <MenuItem
-        onClick={handleDelete}
-        LeftIcon={IconTrash}
-        text="Delete"
-        accent="danger"
-      />
-    </DropdownMenuItemsContainer>
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedColumnHeader.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedColumnHeader.tsx
deleted file mode 100644
index 81c7bd81a60b..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedColumnHeader.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-import React, { useState } from 'react';
-import styled from '@emotion/styled';
-import { useRecoilValue } from 'recoil';
-
-import { recordBoardColumnTotalsFamilySelector } from '@/object-record/record-board-deprecated/states/selectors/recordBoardDeprecatedColumnTotalsFamilySelector';
-import { BoardColumnDefinition } from '@/object-record/record-board-deprecated/types/BoardColumnDefinition';
-import { IconDotsVertical } from '@/ui/display/icon';
-import { Tag } from '@/ui/display/tag/components/Tag';
-import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
-import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
-
-import { recordBoardCardIdsByColumnIdFamilyState } from '../states/recordBoardCardIdsByColumnIdFamilyState';
-import { BoardColumnHotkeyScope } from '../types/BoardColumnHotkeyScope';
-
-import { RecordBoardDeprecatedColumnDropdownMenu } from './RecordBoardDeprecatedColumnDropdownMenu';
-
-const StyledHeader = styled.div`
-  align-items: center;
-  cursor: pointer;
-  display: flex;
-  flex-direction: row;
-  height: 24px;
-  justify-content: left;
-  margin-bottom: ${({ theme }) => theme.spacing(2)};
-  width: 100%;
-`;
-
-const StyledAmount = styled.div`
-  color: ${({ theme }) => theme.font.color.tertiary};
-  margin-left: ${({ theme }) => theme.spacing(2)};
-`;
-
-const StyledNumChildren = styled.div`
-  align-items: center;
-  background-color: ${({ theme }) => theme.background.tertiary};
-  border-radius: ${({ theme }) => theme.border.radius.rounded};
-  color: ${({ theme }) => theme.font.color.tertiary};
-  display: flex;
-  height: 20px;
-  justify-content: center;
-  line-height: ${({ theme }) => theme.text.lineHeight.lg};
-  margin-left: auto;
-  width: 16px;
-`;
-
-const StyledHeaderActions = styled.div`
-  display: flex;
-  margin-left: auto;
-`;
-
-type RecordBoardDeprecatedColumnHeaderProps = {
-  recordBoardColumnId: string;
-  columnDefinition: BoardColumnDefinition;
-  onDelete?: (columnId: string) => void;
-};
-
-export const RecordBoardDeprecatedColumnHeader = ({
-  recordBoardColumnId,
-  columnDefinition,
-  onDelete,
-}: RecordBoardDeprecatedColumnHeaderProps) => {
-  const [isBoardColumnMenuOpen, setIsBoardColumnMenuOpen] = useState(false);
-  const [isHeaderHovered, setIsHeaderHovered] = useState(false);
-
-  const {
-    setHotkeyScopeAndMemorizePreviousScope,
-    goBackToPreviousHotkeyScope,
-  } = usePreviousHotkeyScope();
-
-  const handleBoardColumnMenuOpen = () => {
-    setIsBoardColumnMenuOpen(true);
-    setHotkeyScopeAndMemorizePreviousScope(BoardColumnHotkeyScope.BoardColumn, {
-      goto: false,
-    });
-  };
-
-  const handleBoardColumnMenuClose = () => {
-    goBackToPreviousHotkeyScope();
-    setIsBoardColumnMenuOpen(false);
-  };
-
-  const boardColumnTotal = useRecoilValue(
-    recordBoardColumnTotalsFamilySelector(recordBoardColumnId),
-  );
-
-  const cardIds = useRecoilValue(
-    recordBoardCardIdsByColumnIdFamilyState(recordBoardColumnId),
-  );
-
-  return (
-    <>
-      <StyledHeader
-        onMouseEnter={() => setIsHeaderHovered(true)}
-        onMouseLeave={() => setIsHeaderHovered(false)}
-      >
-        <Tag
-          onClick={handleBoardColumnMenuOpen}
-          color={columnDefinition.colorCode ?? 'gray'}
-          text={columnDefinition.title}
-        />
-        {!!boardColumnTotal && <StyledAmount>${boardColumnTotal}</StyledAmount>}
-        {!isHeaderHovered && (
-          <StyledNumChildren>{cardIds.length}</StyledNumChildren>
-        )}
-        {isHeaderHovered && (
-          <StyledHeaderActions>
-            <LightIconButton
-              accent="tertiary"
-              Icon={IconDotsVertical}
-              onClick={handleBoardColumnMenuOpen}
-            />
-            {/* <LightIconButton
-                  accent="tertiary"
-                  Icon={IconPlus}
-                  onClick={() => {}}
-                /> */}
-          </StyledHeaderActions>
-        )}
-      </StyledHeader>
-      {isBoardColumnMenuOpen && (
-        <RecordBoardDeprecatedColumnDropdownMenu
-          onClose={handleBoardColumnMenuClose}
-          onDelete={onDelete}
-          stageId={recordBoardColumnId}
-        />
-      )}
-    </>
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedEffect.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedEffect.tsx
deleted file mode 100644
index 1e73d9410d6a..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedEffect.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { useEffect } from 'react';
-
-import { useRecordBoardDeprecated } from '@/object-record/record-board-deprecated/hooks/useRecordBoardDeprecated';
-import { BoardFieldDefinition } from '@/object-record/record-board-deprecated/types/BoardFieldDefinition';
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-
-type RecordBoardDeprecatedEffectProps = {
-  recordBoardId: string;
-  onFieldsChange: (fields: BoardFieldDefinition<FieldMetadata>[]) => void;
-};
-
-export const RecordBoardDeprecatedEffect = ({
-  recordBoardId,
-  onFieldsChange,
-}: RecordBoardDeprecatedEffectProps) => {
-  const { setOnFieldsChange } = useRecordBoardDeprecated({
-    recordBoardScopeId: recordBoardId,
-  });
-
-  useEffect(() => {
-    setOnFieldsChange(() => onFieldsChange);
-  }, [onFieldsChange, setOnFieldsChange]);
-
-  return <></>;
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedInternalEffect.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedInternalEffect.tsx
deleted file mode 100644
index f9c916d32ada..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedInternalEffect.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import { useEffect } from 'react';
-import { useRecoilState, useRecoilValue } from 'recoil';
-
-import { useObjectRecordBoardDeprecated } from '@/object-record/hooks/useObjectRecordBoardDeprecated';
-import { useRecordBoardDeprecatedActionBarEntriesInternal } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedActionBarEntriesInternal';
-import { useRecordBoardDeprecatedContextMenuEntriesInternal } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedContextMenuEntriesInternal';
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { useUpdateCompanyBoardColumnsInternal } from '@/object-record/record-board-deprecated/hooks/internal/useUpdateCompanyBoardColumnsInternal';
-import { isNonNullable } from '~/utils/isNonNullable';
-
-export type RecordBoardDeprecatedInternalEffectProps = {
-  onFieldsChange: (fields: any) => void;
-};
-
-export const RecordBoardDeprecatedInternalEffect = () => {
-  const updateCompanyColumnsBoardInternal =
-    useUpdateCompanyBoardColumnsInternal();
-  const { setActionBarEntries } =
-    useRecordBoardDeprecatedActionBarEntriesInternal();
-  const { setContextMenuEntries } =
-    useRecordBoardDeprecatedContextMenuEntriesInternal();
-
-  const {
-    savedPipelineStepsState,
-    savedOpportunitiesState,
-    savedCompaniesState,
-  } = useRecordBoardDeprecatedScopedStates();
-
-  const { fetchMoreOpportunities, fetchMoreCompanies, opportunities } =
-    useObjectRecordBoardDeprecated();
-
-  const [savedOpportunities, setSavedOpportunities] = useRecoilState(
-    savedOpportunitiesState,
-  );
-  const savedPipelineSteps = useRecoilValue(savedPipelineStepsState);
-  const savedCompanies = useRecoilValue(savedCompaniesState);
-
-  useEffect(() => {
-    setSavedOpportunities(opportunities);
-  }, [opportunities, setSavedOpportunities]);
-
-  useEffect(() => {
-    if (isNonNullable(fetchMoreOpportunities)) {
-      fetchMoreOpportunities();
-    }
-  }, [fetchMoreOpportunities]);
-
-  useEffect(() => {
-    if (isNonNullable(fetchMoreCompanies)) {
-      fetchMoreCompanies();
-    }
-  }, [fetchMoreCompanies]);
-
-  useEffect(() => {
-    if (savedOpportunities && savedCompanies) {
-      setActionBarEntries();
-      setContextMenuEntries();
-
-      updateCompanyColumnsBoardInternal(
-        savedPipelineSteps,
-        savedOpportunities,
-        savedCompanies,
-      );
-    }
-  }, [
-    savedCompanies,
-    savedOpportunities,
-    savedPipelineSteps,
-    setActionBarEntries,
-    setContextMenuEntries,
-    updateCompanyColumnsBoardInternal,
-  ]);
-
-  return <></>;
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/__stories__/RecordBoardColumnEditTitleMenu.stories.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/__stories__/RecordBoardColumnEditTitleMenu.stories.tsx
deleted file mode 100644
index 99d7262f5dfa..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/components/__stories__/RecordBoardColumnEditTitleMenu.stories.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-
-import { RecordBoardDeprecatedColumnEditTitleMenu } from '../RecordBoardDeprecatedColumnEditTitleMenu';
-
-const meta: Meta<typeof RecordBoardDeprecatedColumnEditTitleMenu> = {
-  title: 'UI/Layout/Board/BoardColumnMenu',
-  component: RecordBoardDeprecatedColumnEditTitleMenu,
-  decorators: [ComponentDecorator],
-  args: { color: 'green', title: 'Column title' },
-};
-
-export default meta;
-type Story = StoryObj<typeof RecordBoardDeprecatedColumnEditTitleMenu>;
-
-export const AllTags: Story = {};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/constants/BoardOptionsDropdownId.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/constants/BoardOptionsDropdownId.ts
deleted file mode 100644
index 77727d5947f8..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/constants/BoardOptionsDropdownId.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const BOARD_OPTIONS_DROPDOWN_ID = 'board-options-dropdown-id';
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/context-menu/components/RecordBoardDeprecatedContextMenu.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/context-menu/components/RecordBoardDeprecatedContextMenu.tsx
deleted file mode 100644
index 900d3d19952e..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/context-menu/components/RecordBoardDeprecatedContextMenu.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { useRecoilValue } from 'recoil';
-
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { ContextMenu } from '@/ui/navigation/context-menu/components/ContextMenu';
-
-export const RecordBoardDeprecatedContextMenu = () => {
-  const { selectedCardIdsSelector } = useRecordBoardDeprecatedScopedStates();
-  const selectedCardIds = useRecoilValue(selectedCardIdsSelector);
-
-  if (!selectedCardIds.length) {
-    return null;
-  }
-  return <ContextMenu />;
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/contexts/BoardCardIdContext.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/contexts/BoardCardIdContext.ts
deleted file mode 100644
index b135559a75d6..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/contexts/BoardCardIdContext.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { createContext } from 'react';
-
-export const BoardCardIdContext = createContext<string | null>(null);
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/contexts/BoardColumnContext.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/contexts/BoardColumnContext.ts
deleted file mode 100644
index d1b3b57cbe59..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/contexts/BoardColumnContext.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { createContext } from 'react';
-
-import { BoardColumnDefinition } from '../types/BoardColumnDefinition';
-
-type BoardColumnContextProps = {
-  id: string;
-  columnDefinition: BoardColumnDefinition;
-  isFirstColumn: boolean;
-  isLastColumn: boolean;
-  onTitleEdit: (params: { title: string; color: string }) => void;
-};
-
-export const BoardColumnContext = createContext<BoardColumnContextProps | null>(
-  null,
-);
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/__tests__/useRecordBoard.test.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/__tests__/useRecordBoard.test.tsx
deleted file mode 100644
index f891ba118418..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/__tests__/useRecordBoard.test.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { act, renderHook, waitFor } from '@testing-library/react';
-import { RecoilRoot, useRecoilValue } from 'recoil';
-
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { useRecordBoardDeprecated } from '@/object-record/record-board-deprecated/hooks/useRecordBoardDeprecated';
-
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
-  <MockedProvider>
-    <RecoilRoot>{children}</RecoilRoot>
-  </MockedProvider>
-);
-
-const recordBoardScopeId = 'recordBoardScopeId';
-
-const renderHookConfig = {
-  wrapper: Wrapper,
-};
-
-const useRecordBoardDeprecatedHook = () => {
-  const recordBoard = useRecordBoardDeprecated({ recordBoardScopeId });
-  const { isBoardLoadedState, boardColumnsState, onFieldsChangeState } =
-    useRecordBoardDeprecatedScopedStates({
-      recordBoardScopeId: recordBoardScopeId,
-    });
-  const isBoardLoaded = useRecoilValue(isBoardLoadedState);
-  const boardColumns = useRecoilValue(boardColumnsState);
-  const onFieldsChange = useRecoilValue(onFieldsChangeState);
-
-  return {
-    recordBoard,
-    isBoardLoaded,
-    boardColumns,
-    onFieldsChange,
-  };
-};
-
-describe('useRecordBoardDeprecated', () => {
-  it('should set isBoardLoadedState', async () => {
-    const { result } = renderHook(
-      () => useRecordBoardDeprecatedHook(),
-      renderHookConfig,
-    );
-
-    act(() => {
-      result.current.recordBoard.setIsBoardLoaded(true);
-    });
-
-    await waitFor(() => {
-      expect(result.current.isBoardLoaded).toBe(true);
-    });
-  });
-
-  it('should set boardColumnsState', async () => {
-    const columns = [
-      {
-        id: '1',
-        title: '1',
-        position: 1,
-      },
-      {
-        id: '1',
-        title: '1',
-        position: 1,
-      },
-    ];
-    const { result } = renderHook(
-      () => useRecordBoardDeprecatedHook(),
-      renderHookConfig,
-    );
-
-    act(() => {
-      result.current.recordBoard.setBoardColumns(columns);
-    });
-
-    await waitFor(() => {
-      expect(result.current.boardColumns).toEqual(columns);
-    });
-  });
-
-  it('should set setOnFieldsChange', async () => {
-    const onFieldsChangeFunction = () => {};
-    const onFieldsChange = jest.fn(() => onFieldsChangeFunction);
-    const { result } = renderHook(
-      () => useRecordBoardDeprecatedHook(),
-      renderHookConfig,
-    );
-
-    act(() => {
-      result.current.recordBoard.setOnFieldsChange(onFieldsChange);
-    });
-
-    await waitFor(() => {
-      expect(result.current.onFieldsChange).toEqual(onFieldsChangeFunction);
-    });
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useCreateOpportunity.test.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useCreateOpportunity.test.tsx
deleted file mode 100644
index 8c7e8a85c68d..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useCreateOpportunity.test.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { act, renderHook } from '@testing-library/react';
-import gql from 'graphql-tag';
-import { RecoilRoot, useRecoilValue } from 'recoil';
-
-import { useCreateOpportunity } from '@/object-record/record-board-deprecated/hooks/internal/useCreateOpportunity';
-import { recordBoardCardIdsByColumnIdFamilyState } from '@/object-record/record-board-deprecated/states/recordBoardCardIdsByColumnIdFamilyState';
-
-const mockedUuid = 'mocked-uuid';
-jest.mock('uuid', () => ({
-  v4: () => mockedUuid,
-}));
-
-jest.mock('@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery', () => ({
-  useMapFieldMetadataToGraphQLQuery: () => () => '\n',
-}));
-
-const mocks = [
-  {
-    request: {
-      query: gql`
-        mutation CreateOneOpportunity($input: OpportunityCreateInput!) {
-          createOpportunity(data: $input) {
-            id
-          }
-        }
-      `,
-      variables: {
-        input: {
-          id: mockedUuid,
-          pipelineStepId: 'pipelineStepId',
-          companyId: 'New Opportunity',
-        },
-      },
-    },
-    result: jest.fn(() => ({
-      data: { createOpportunity: { id: '' } },
-    })),
-  },
-];
-
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
-  <MockedProvider mocks={mocks} addTypename={false}>
-    <RecoilRoot>{children}</RecoilRoot>
-  </MockedProvider>
-);
-
-const renderHookConfig = {
-  wrapper: Wrapper,
-};
-
-describe('useCreateOpportunity', () => {
-  it('should create opportunity successfully', () => {
-    const companyIdname = 'New Opportunity';
-    const opportunityPipelineStepId = 'pipelineStepId';
-
-    const { result } = renderHook(
-      () => ({
-        createOpportunity: useCreateOpportunity(),
-        recordBoardCardIdsByColumnId: useRecoilValue(
-          recordBoardCardIdsByColumnIdFamilyState(opportunityPipelineStepId),
-        ),
-      }),
-      renderHookConfig,
-    );
-
-    act(() => {
-      result.current.createOpportunity(
-        companyIdname,
-        opportunityPipelineStepId,
-      );
-    });
-
-    expect(result.current.recordBoardCardIdsByColumnId).toStrictEqual([
-      mockedUuid,
-    ]);
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useCurrentRecordBoardCardSelectedInternal.test.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useCurrentRecordBoardCardSelectedInternal.test.tsx
deleted file mode 100644
index b638147660e1..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useCurrentRecordBoardCardSelectedInternal.test.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { act, renderHook } from '@testing-library/react';
-import { RecoilRoot, useRecoilValue } from 'recoil';
-
-import { BoardCardIdContext } from '@/object-record/record-board-deprecated/contexts/BoardCardIdContext';
-import { useCurrentRecordBoardDeprecatedCardSelectedInternal } from '@/object-record/record-board-deprecated/hooks/internal/useCurrentRecordBoardDeprecatedCardSelectedInternal';
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { RecordBoardDeprecatedScope } from '@/object-record/record-board-deprecated/scopes/RecordBoardDeprecatedScope';
-import { actionBarOpenState } from '@/ui/navigation/action-bar/states/actionBarIsOpenState';
-
-const scopeId = 'scopeId';
-const boardCardId = 'boardCardId';
-
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
-  <RecordBoardDeprecatedScope recordBoardScopeId={scopeId}>
-    <BoardCardIdContext.Provider value={boardCardId}>
-      <RecoilRoot>{children}</RecoilRoot>
-    </BoardCardIdContext.Provider>
-  </RecordBoardDeprecatedScope>
-);
-
-describe('useCurrentRecordBoardDeprecatedCardSelectedInternal', () => {
-  it('should update the data when selecting and deselecting the cardId', () => {
-    const { result } = renderHook(
-      () => ({
-        currentCardSelect:
-          useCurrentRecordBoardDeprecatedCardSelectedInternal(),
-        activeCardIdsState: useRecoilValue(
-          useRecordBoardDeprecatedScopedStates().activeCardIdsState,
-        ),
-        actionBarOpenState: useRecoilValue(actionBarOpenState),
-      }),
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    expect(result.current.activeCardIdsState).toStrictEqual([]);
-    expect(result.current.actionBarOpenState).toBe(false);
-    expect(result.current.currentCardSelect.isCurrentCardSelected).toBe(false);
-
-    act(() => {
-      result.current.currentCardSelect.setCurrentCardSelected(true);
-    });
-
-    expect(result.current.activeCardIdsState).toStrictEqual([boardCardId]);
-    expect(result.current.actionBarOpenState).toBe(true);
-    expect(result.current.currentCardSelect.isCurrentCardSelected).toBe(true);
-
-    act(() => {
-      result.current.currentCardSelect.setCurrentCardSelected(false);
-    });
-
-    expect(result.current.activeCardIdsState).toStrictEqual([]);
-    expect(result.current.actionBarOpenState).toBe(false);
-    expect(result.current.currentCardSelect.isCurrentCardSelected).toBe(false);
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useDeleteSelectedRecordBoardCardsInternal.test.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useDeleteSelectedRecordBoardCardsInternal.test.tsx
deleted file mode 100644
index cfaf7edc41d8..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useDeleteSelectedRecordBoardCardsInternal.test.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { act, renderHook, waitFor } from '@testing-library/react';
-import gql from 'graphql-tag';
-import { RecoilRoot, useRecoilValue, useSetRecoilState } from 'recoil';
-
-import { BoardCardIdContext } from '@/object-record/record-board-deprecated/contexts/BoardCardIdContext';
-import { useCreateOpportunity } from '@/object-record/record-board-deprecated/hooks/internal/useCreateOpportunity';
-import { useCurrentRecordBoardDeprecatedCardSelectedInternal } from '@/object-record/record-board-deprecated/hooks/internal/useCurrentRecordBoardDeprecatedCardSelectedInternal';
-import { useDeleteSelectedRecordBoardDeprecatedCardsInternal } from '@/object-record/record-board-deprecated/hooks/internal/useDeleteSelectedRecordBoardDeprecatedCardsInternal';
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { RecordBoardDeprecatedScope } from '@/object-record/record-board-deprecated/scopes/RecordBoardDeprecatedScope';
-import { recordBoardCardIdsByColumnIdFamilyState } from '@/object-record/record-board-deprecated/states/recordBoardCardIdsByColumnIdFamilyState';
-
-jest.mock('@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery', () => ({
-  useMapFieldMetadataToGraphQLQuery: jest.fn().mockReturnValue(() => '\n'),
-}));
-
-const mockedUuid = 'mocked-uuid';
-jest.mock('uuid', () => ({ v4: () => mockedUuid }));
-
-const mocks = [
-  {
-    request: {
-      query: gql`
-        mutation DeleteManyOpportunities($filter: OpportunityFilterInput!) {
-          deleteOpportunities(filter: $filter) {
-            id
-          }
-        }
-      `,
-      variables: { filter: { id: { in: [mockedUuid] } } },
-    },
-    result: jest.fn(() => ({
-      data: { deleteOpportunities: { id: '' } },
-    })),
-  },
-  {
-    request: {
-      query: gql`
-        mutation CreateOneOpportunity($input: OpportunityCreateInput!) {
-          createOpportunity(data: $input) {
-            id
-          }
-        }
-      `,
-      variables: {
-        input: {
-          id: mockedUuid,
-          pipelineStepId: 'pipelineStepId',
-          companyId: 'New Opportunity',
-        },
-      },
-    },
-    result: jest.fn(() => ({
-      data: { createOpportunity: { id: '' } },
-    })),
-  },
-];
-
-const scopeId = 'scopeId';
-
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
-  <MockedProvider mocks={mocks} addTypename={false}>
-    <RecordBoardDeprecatedScope recordBoardScopeId={scopeId}>
-      <BoardCardIdContext.Provider value={mockedUuid}>
-        <RecoilRoot>{children}</RecoilRoot>
-      </BoardCardIdContext.Provider>
-    </RecordBoardDeprecatedScope>
-  </MockedProvider>
-);
-
-describe('useDeleteSelectedRecordBoardDeprecatedCardsInternal', () => {
-  it('should run apollo mutation and update recoil state when delete selected cards', async () => {
-    const companyIdname = 'New Opportunity';
-    const opportunityPipelineStepId = 'pipelineStepId';
-
-    const { result } = renderHook(
-      () => ({
-        createOpportunity: useCreateOpportunity(),
-        deleteSelectedCards:
-          useDeleteSelectedRecordBoardDeprecatedCardsInternal(),
-        setBoardColumns: useSetRecoilState(
-          useRecordBoardDeprecatedScopedStates({
-            recordBoardScopeId: scopeId,
-          }).boardColumnsState,
-        ),
-        recordBoardCardIdsByColumnId: useRecoilValue(
-          recordBoardCardIdsByColumnIdFamilyState(opportunityPipelineStepId),
-        ),
-        currentSelect: useCurrentRecordBoardDeprecatedCardSelectedInternal(),
-      }),
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    act(() => {
-      result.current.currentSelect.setCurrentCardSelected(true);
-      result.current.setBoardColumns([
-        {
-          id: opportunityPipelineStepId,
-          title: '1',
-          position: 1,
-        },
-      ]);
-      result.current.createOpportunity(
-        companyIdname,
-        opportunityPipelineStepId,
-      );
-    });
-
-    expect(result.current.recordBoardCardIdsByColumnId).toStrictEqual([
-      mockedUuid,
-    ]);
-    await act(async () => {
-      await result.current.deleteSelectedCards();
-    });
-
-    await waitFor(() => {
-      expect(result.current.recordBoardCardIdsByColumnId).toStrictEqual([]);
-      expect(mocks[0].result).toHaveBeenCalled();
-    });
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useRecordBoardActionBarEntriesInternal.test.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useRecordBoardActionBarEntriesInternal.test.tsx
deleted file mode 100644
index 8977a5caa30c..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useRecordBoardActionBarEntriesInternal.test.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { act, renderHook, waitFor } from '@testing-library/react';
-import { RecoilRoot, useRecoilValue } from 'recoil';
-
-import { useDeleteSelectedRecordBoardDeprecatedCardsInternal } from '@/object-record/record-board-deprecated/hooks/internal/useDeleteSelectedRecordBoardDeprecatedCardsInternal';
-import { useRecordBoardDeprecatedActionBarEntriesInternal } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedActionBarEntriesInternal';
-import { RecordBoardDeprecatedScope } from '@/object-record/record-board-deprecated/scopes/RecordBoardDeprecatedScope';
-import { IconTrash } from '@/ui/display/icon';
-import { actionBarEntriesState } from '@/ui/navigation/action-bar/states/actionBarEntriesState';
-
-const scopeId = 'scopeId';
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
-  <MockedProvider>
-    <RecordBoardDeprecatedScope recordBoardScopeId={scopeId}>
-      <RecoilRoot>{children}</RecoilRoot>
-    </RecordBoardDeprecatedScope>
-  </MockedProvider>
-);
-
-const renderHookConfig = {
-  wrapper: Wrapper,
-};
-
-describe('useRecordBoardDeprecatedActionBarEntriesInternal', () => {
-  it('should update actionBarEntries', async () => {
-    const { result } = renderHook(() => {
-      const deleteSelectedBoardCards =
-        useDeleteSelectedRecordBoardDeprecatedCardsInternal();
-      const newActionBarEntry = {
-        label: 'Delete',
-        Icon: IconTrash,
-        accent: 'danger',
-        onClick: deleteSelectedBoardCards,
-      };
-      return {
-        setActionBarEntries: useRecordBoardDeprecatedActionBarEntriesInternal(),
-        actionBarEntries: useRecoilValue(actionBarEntriesState),
-        newActionBarEntry,
-      };
-    }, renderHookConfig);
-
-    expect(result.current.actionBarEntries).toStrictEqual([]);
-
-    act(() => {
-      result.current.setActionBarEntries.setActionBarEntries();
-    });
-
-    await waitFor(() => {
-      expect(JSON.stringify(result.current.actionBarEntries)).toBe(
-        JSON.stringify([result.current.newActionBarEntry]),
-      );
-    });
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useRecordBoardCardFieldsInternal.test.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useRecordBoardCardFieldsInternal.test.tsx
deleted file mode 100644
index 175b5bc7408b..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useRecordBoardCardFieldsInternal.test.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import { act } from 'react-dom/test-utils';
-import { renderHook, waitFor } from '@testing-library/react';
-import { RecoilRoot, useRecoilState, useRecoilValue } from 'recoil';
-
-import { useRecordBoardDeprecatedCardFieldsInternal } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedCardFieldsInternal';
-import { onFieldsChangeScopedState } from '@/object-record/record-board-deprecated/states/onFieldsChangeScopedState';
-import { recordBoardCardFieldsScopedState } from '@/object-record/record-board-deprecated/states/recordBoardDeprecatedCardFieldsScopedState';
-import { savedRecordBoardDeprecatedCardFieldsScopedState } from '@/object-record/record-board-deprecated/states/savedRecordBoardDeprecatedCardFieldsScopedState';
-import { FieldType } from '@/object-record/record-field/types/FieldType';
-
-const recordBoardScopeId = 'recordBoardScopeId';
-
-const renderHookConfig = {
-  wrapper: RecoilRoot,
-};
-
-describe('useRecordBoardDeprecatedCardFieldsInternal', () => {
-  it('should toggle field visibility', async () => {
-    const { result } = renderHook(() => {
-      const [cardFieldsList, setCardFieldsList] = useRecoilState(
-        recordBoardCardFieldsScopedState({ scopeId: recordBoardScopeId }),
-      );
-      return {
-        boardCardFields: useRecordBoardDeprecatedCardFieldsInternal({
-          recordBoardScopeId,
-        }),
-        cardFieldsList,
-        setCardFieldsList,
-      };
-    }, renderHookConfig);
-
-    const field = {
-      position: 0,
-      fieldMetadataId: 'id',
-      label: 'label',
-      iconName: 'icon',
-      type: 'TEXT' as FieldType,
-      metadata: {
-        fieldName: 'fieldName',
-      },
-      isVisible: true,
-    };
-
-    act(() => {
-      result.current.setCardFieldsList([field]);
-    });
-
-    expect(result.current.cardFieldsList[0].isVisible).toBe(true);
-
-    act(() => {
-      result.current.boardCardFields.handleFieldVisibilityChange({
-        ...field,
-        isVisible: true,
-      });
-    });
-
-    waitFor(() => {
-      expect(result.current.cardFieldsList[0].isVisible).toBe(false);
-    });
-
-    act(() => {
-      result.current.boardCardFields.handleFieldVisibilityChange({
-        ...field,
-        isVisible: false,
-      });
-    });
-
-    waitFor(() => {
-      expect(result.current.cardFieldsList[0].isVisible).toBe(true);
-    });
-  });
-
-  it('should call the onFieldsChange callback and update board card states', async () => {
-    const { result } = renderHook(() => {
-      const [onFieldsChange, setOnFieldsChange] = useRecoilState(
-        onFieldsChangeScopedState({ scopeId: recordBoardScopeId }),
-      );
-      return {
-        boardCardFieldsHook: useRecordBoardDeprecatedCardFieldsInternal({
-          recordBoardScopeId,
-        }),
-        boardCardFieldsList: useRecoilValue(
-          recordBoardCardFieldsScopedState({ scopeId: recordBoardScopeId }),
-        ),
-        savedBoardCardFieldsList: useRecoilValue(
-          savedRecordBoardDeprecatedCardFieldsScopedState({
-            scopeId: recordBoardScopeId,
-          }),
-        ),
-        onFieldsChange,
-        setOnFieldsChange,
-      };
-    }, renderHookConfig);
-
-    const field = {
-      position: 0,
-      fieldMetadataId: 'id',
-      label: 'label',
-      iconName: 'icon',
-      type: 'TEXT' as FieldType,
-      metadata: {
-        fieldName: 'fieldName',
-      },
-      isVisible: true,
-    };
-    const onChangeFunction = jest.fn();
-
-    await act(async () => {
-      result.current.setOnFieldsChange(() => onChangeFunction);
-      result.current.boardCardFieldsHook.handleFieldsReorder([field]);
-    });
-
-    expect(onChangeFunction).toHaveBeenCalledWith([field]);
-    expect(result.current.savedBoardCardFieldsList).toStrictEqual([field]);
-    expect(result.current.boardCardFieldsList).toStrictEqual([field]);
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useRecordBoardColumnsInternal.test.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useRecordBoardColumnsInternal.test.tsx
deleted file mode 100644
index 805eb178c01a..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useRecordBoardColumnsInternal.test.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { act, renderHook, waitFor } from '@testing-library/react';
-import gql from 'graphql-tag';
-import { RecoilRoot, useRecoilState, useSetRecoilState } from 'recoil';
-
-import { useBoardColumnsInternal } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedColumnsInternal';
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { RecordBoardDeprecatedScope } from '@/object-record/record-board-deprecated/scopes/RecordBoardDeprecatedScope';
-import { BoardColumnDefinition } from '@/object-record/record-board-deprecated/types/BoardColumnDefinition';
-
-jest.mock('@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery', () => ({
-  useMapFieldMetadataToGraphQLQuery: jest.fn().mockReturnValue(() => '\n'),
-}));
-
-const mocks = [
-  {
-    request: {
-      query: gql`
-        mutation UpdateOnePipelineStep(
-          $idToUpdate: ID!
-          $input: PipelineStepUpdateInput!
-        ) {
-          updatePipelineStep(id: $idToUpdate, data: $input) {
-            id
-          }
-        }
-      `,
-      variables: { idToUpdate: '1', input: { position: 0 } },
-    },
-    result: jest.fn(() => ({
-      data: { updatePipelineStep: { id: '' } },
-    })),
-  },
-];
-
-const scopeId = 'scopeId';
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
-  <MockedProvider mocks={mocks} addTypename={false}>
-    <RecordBoardDeprecatedScope recordBoardScopeId={scopeId}>
-      <RecoilRoot>{children}</RecoilRoot>
-    </RecordBoardDeprecatedScope>
-  </MockedProvider>
-);
-
-const renderHookConfig = {
-  wrapper: Wrapper,
-};
-
-describe('useBoardColumnsInternal', () => {
-  it('should update boardColumns state when moving to left and right', async () => {
-    const { result } = renderHook(() => {
-      const [boardColumnsList, setBoardColumnsList] = useRecoilState(
-        useRecordBoardDeprecatedScopedStates().boardColumnsState,
-      );
-      return {
-        boardColumns: useBoardColumnsInternal(),
-        boardColumnsList,
-        setBoardColumnsList,
-      };
-    }, renderHookConfig);
-    const columns: BoardColumnDefinition[] = [
-      {
-        id: '1',
-        title: '1',
-        position: 0,
-      },
-      {
-        id: '2',
-        title: '2',
-        position: 1,
-      },
-    ];
-    act(() => {
-      result.current.setBoardColumnsList(columns);
-    });
-
-    act(() => {
-      result.current.boardColumns.handleMoveBoardColumn('right', columns[0]);
-    });
-
-    await waitFor(() => {
-      expect(result.current.boardColumnsList).toStrictEqual([
-        { id: '2', title: '2', position: 0, index: 0 },
-        { id: '1', title: '1', position: 1, index: 1 },
-      ]);
-    });
-
-    act(() => {
-      result.current.boardColumns.handleMoveBoardColumn('left', columns[0]);
-    });
-
-    await waitFor(() => {
-      expect(result.current.boardColumnsList).toStrictEqual([
-        { id: '1', title: '1', position: 0, index: 0 },
-        { id: '2', title: '2', position: 1, index: 1 },
-      ]);
-    });
-  });
-
-  it('should call apollo mutation after persistBoardColumns', async () => {
-    const { result } = renderHook(() => {
-      return {
-        boardColumns: useBoardColumnsInternal(),
-        setBoardColumnsList: useSetRecoilState(
-          useRecordBoardDeprecatedScopedStates().boardColumnsState,
-        ),
-      };
-    }, renderHookConfig);
-    const columns: BoardColumnDefinition[] = [
-      {
-        id: '1',
-        title: '1',
-        position: 0,
-      },
-    ];
-    act(() => {
-      result.current.setBoardColumnsList(columns);
-    });
-
-    act(() => {
-      result.current.boardColumns.persistBoardColumns();
-    });
-
-    await waitFor(() => {
-      expect(mocks[0].result).toHaveBeenCalled();
-    });
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useRecordBoardContextMenuEntriesInternal.test.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useRecordBoardContextMenuEntriesInternal.test.tsx
deleted file mode 100644
index a5b7b02aafbb..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useRecordBoardContextMenuEntriesInternal.test.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { act, renderHook, waitFor } from '@testing-library/react';
-import { RecoilRoot, useRecoilValue } from 'recoil';
-
-import { useDeleteSelectedRecordBoardDeprecatedCardsInternal } from '@/object-record/record-board-deprecated/hooks/internal/useDeleteSelectedRecordBoardDeprecatedCardsInternal';
-import { useRecordBoardDeprecatedContextMenuEntriesInternal } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedContextMenuEntriesInternal';
-import { RecordBoardDeprecatedScope } from '@/object-record/record-board-deprecated/scopes/RecordBoardDeprecatedScope';
-import { IconTrash } from '@/ui/display/icon';
-import { contextMenuEntriesState } from '@/ui/navigation/context-menu/states/contextMenuEntriesState';
-
-const scopeId = 'scopeId';
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
-  <MockedProvider>
-    <RecordBoardDeprecatedScope recordBoardScopeId={scopeId}>
-      <RecoilRoot>{children}</RecoilRoot>
-    </RecordBoardDeprecatedScope>
-  </MockedProvider>
-);
-
-describe('useRecordBoardDeprecatedContextMenuEntriesInternal', () => {
-  it('should update contextEntries', async () => {
-    const { result } = renderHook(
-      () => {
-        const deleteSelectedBoardCards =
-          useDeleteSelectedRecordBoardDeprecatedCardsInternal();
-        const newContextEntry = {
-          label: 'Delete',
-          Icon: IconTrash,
-          accent: 'danger',
-          onClick: deleteSelectedBoardCards,
-        };
-        return {
-          setContextEntries:
-            useRecordBoardDeprecatedContextMenuEntriesInternal(),
-          contextEntries: useRecoilValue(contextMenuEntriesState),
-          newContextEntry,
-        };
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    expect(result.current.contextEntries).toStrictEqual([]);
-
-    act(() => {
-      result.current.setContextEntries.setContextMenuEntries();
-    });
-
-    await waitFor(() => {
-      expect(JSON.stringify(result.current.contextEntries)).toBe(
-        JSON.stringify([result.current.newContextEntry]),
-      );
-    });
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useSetRecordBoardCardSelectedInternal.test.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useSetRecordBoardCardSelectedInternal.test.tsx
deleted file mode 100644
index 849567126128..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useSetRecordBoardCardSelectedInternal.test.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { act, renderHook } from '@testing-library/react';
-import { RecoilRoot, useRecoilValue } from 'recoil';
-
-import { useSetRecordBoardDeprecatedCardSelectedInternal } from '@/object-record/record-board-deprecated/hooks/internal/useSetRecordBoardDeprecatedCardSelectedInternal';
-import { RecordBoardDeprecatedScope } from '@/object-record/record-board-deprecated/scopes/RecordBoardDeprecatedScope';
-import { isRecordBoardDeprecatedCardSelectedFamilyState } from '@/object-record/record-board-deprecated/states/isRecordBoardDeprecatedCardSelectedFamilyState';
-
-const scopeId = 'scopeId';
-const boardCardId = 'boardCardId';
-
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
-  <RecordBoardDeprecatedScope recordBoardScopeId={scopeId}>
-    <RecoilRoot>{children}</RecoilRoot>
-  </RecordBoardDeprecatedScope>
-);
-
-const recordBoardScopeId = 'recordBoardScopeId';
-
-describe('useSetRecordBoardDeprecatedCardSelectedInternal', () => {
-  it('should update the data when selecting and deselecting the cardId', async () => {
-    const { result } = renderHook(
-      () => {
-        return {
-          cardSelect: useSetRecordBoardDeprecatedCardSelectedInternal({
-            recordBoardScopeId,
-          }),
-          isSelected: useRecoilValue(
-            isRecordBoardDeprecatedCardSelectedFamilyState(boardCardId),
-          ),
-        };
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    expect(result.current.isSelected).toBe(false);
-
-    act(() => {
-      result.current.cardSelect.setCardSelected(boardCardId, true);
-    });
-
-    expect(result.current.isSelected).toBe(true);
-
-    act(() => {
-      result.current.cardSelect.setCardSelected(boardCardId, false);
-    });
-
-    expect(result.current.isSelected).toBe(false);
-
-    act(() => {
-      result.current.cardSelect.setCardSelected(boardCardId, true);
-      result.current.cardSelect.unselectAllActiveCards();
-    });
-
-    expect(result.current.isSelected).toBe(false);
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useUpdateCompanyBoardColumnsInternal.test.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useUpdateCompanyBoardColumnsInternal.test.tsx
deleted file mode 100644
index eadecd26865f..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/__tests__/useUpdateCompanyBoardColumnsInternal.test.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { act, renderHook } from '@testing-library/react';
-import { RecoilRoot, useRecoilValue } from 'recoil';
-
-import { CompanyForBoard } from '@/companies/types/CompanyProgress';
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { useUpdateCompanyBoardColumnsInternal } from '@/object-record/record-board-deprecated/hooks/internal/useUpdateCompanyBoardColumnsInternal';
-import { RecordBoardDeprecatedScope } from '@/object-record/record-board-deprecated/scopes/RecordBoardDeprecatedScope';
-import { recordBoardCardIdsByColumnIdFamilyState } from '@/object-record/record-board-deprecated/states/recordBoardCardIdsByColumnIdFamilyState';
-import { currentPipelineStepsState } from '@/pipeline/states/currentPipelineStepsState';
-import { Opportunity } from '@/pipeline/types/Opportunity';
-import { PipelineStep } from '@/pipeline/types/PipelineStep';
-
-const scopeId = 'scopeId';
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
-  <RecordBoardDeprecatedScope recordBoardScopeId={scopeId}>
-    <RecoilRoot>{children}</RecoilRoot>
-  </RecordBoardDeprecatedScope>
-);
-
-describe('useUpdateCompanyBoardColumnsInternal', () => {
-  it('should update recoil state after updateCompanyBoardColumns call ', async () => {
-    const { result } = renderHook(
-      () => {
-        return {
-          updateCompanyBoardColumns: useUpdateCompanyBoardColumnsInternal(),
-          currentPipeline: useRecoilValue(currentPipelineStepsState),
-          boardColumns: useRecoilValue(
-            useRecordBoardDeprecatedScopedStates().boardColumnsState,
-          ),
-          savedBoardColumns: useRecoilValue(
-            useRecordBoardDeprecatedScopedStates().savedBoardColumnsState,
-          ),
-          idsByColumnId: useRecoilValue(
-            recordBoardCardIdsByColumnIdFamilyState('1'),
-          ),
-        };
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    const pipelineSteps: PipelineStep[] = [
-      {
-        id: '1',
-        name: 'Step 1',
-        color: 'red',
-        position: 1,
-        createdAt: '2024-01-12',
-        updatedAt: '2024-01-12',
-      },
-      {
-        id: '2',
-        name: 'Step 2',
-        color: 'blue',
-        position: 1,
-        createdAt: '2024-01-12',
-        updatedAt: '2024-01-12',
-      },
-    ];
-    const opportunity: Opportunity = {
-      id: '123',
-      amount: {
-        amountMicros: 1000000,
-        currencyCode: 'USD',
-      },
-      closeDate: new Date('2024-02-01'),
-      probability: 0.75,
-      pipelineStepId: '1',
-      pipelineStep: pipelineSteps[0],
-      pointOfContactId: '456',
-      pointOfContact: {
-        id: '456',
-        name: {
-          firstName: 'John',
-          lastName: 'Doe',
-        },
-        avatarUrl: 'https://example.com/avatar.jpg',
-      },
-    };
-
-    const companyForBoard: CompanyForBoard = {
-      id: '789',
-      name: 'Acme Inc.',
-      domainName: 'acme.com',
-    };
-
-    expect(result.current.currentPipeline).toStrictEqual([]);
-    expect(result.current.savedBoardColumns).toStrictEqual([]);
-    expect(result.current.boardColumns).toStrictEqual([]);
-    expect(result.current.idsByColumnId).toStrictEqual([]);
-
-    act(() => {
-      result.current.updateCompanyBoardColumns(
-        pipelineSteps,
-        [opportunity],
-        [companyForBoard],
-      );
-    });
-
-    const expectedBoardColumns = [
-      { id: '1', title: 'Step 1', colorCode: 'red', position: 1 },
-      { id: '2', title: 'Step 2', colorCode: 'blue', position: 1 },
-    ];
-
-    expect(result.current.currentPipeline).toStrictEqual(pipelineSteps);
-    expect(result.current.savedBoardColumns).toStrictEqual(
-      expectedBoardColumns,
-    );
-    expect(result.current.boardColumns).toStrictEqual(expectedBoardColumns);
-    expect(result.current.idsByColumnId).toStrictEqual([opportunity.id]);
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useCreateOpportunity.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useCreateOpportunity.ts
deleted file mode 100644
index fe241054fc2e..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useCreateOpportunity.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { useRecoilCallback } from 'recoil';
-import { v4 } from 'uuid';
-
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
-import { recordBoardCardIdsByColumnIdFamilyState } from '@/object-record/record-board-deprecated/states/recordBoardCardIdsByColumnIdFamilyState';
-import { Opportunity } from '@/pipeline/types/Opportunity';
-
-export const useCreateOpportunity = () => {
-  const { createOneRecord: createOneOpportunity } =
-    useCreateOneRecord<Opportunity>({
-      objectNameSingular: CoreObjectNameSingular.Opportunity,
-    });
-
-  const createOpportunity = useRecoilCallback(
-    ({ set }) =>
-      async (companyId: string, pipelineStepId: string) => {
-        const newUuid = v4();
-
-        set(
-          recordBoardCardIdsByColumnIdFamilyState(pipelineStepId),
-          (oldValue) => [...oldValue, newUuid],
-        );
-
-        await createOneOpportunity?.({
-          id: newUuid,
-          name: 'Opportunity',
-          pipelineStepId,
-          companyId: companyId,
-        });
-      },
-    [createOneOpportunity],
-  );
-
-  return createOpportunity;
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useCurrentRecordBoardDeprecatedCardSelectedInternal.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useCurrentRecordBoardDeprecatedCardSelectedInternal.ts
deleted file mode 100644
index 29f333e1cb98..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useCurrentRecordBoardDeprecatedCardSelectedInternal.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { useContext } from 'react';
-import { useRecoilCallback, useRecoilValue, useSetRecoilState } from 'recoil';
-
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { actionBarOpenState } from '@/ui/navigation/action-bar/states/actionBarIsOpenState';
-
-import { BoardCardIdContext } from '../../contexts/BoardCardIdContext';
-import { isRecordBoardDeprecatedCardSelectedFamilyState } from '../../states/isRecordBoardDeprecatedCardSelectedFamilyState';
-
-export const useCurrentRecordBoardDeprecatedCardSelectedInternal = () => {
-  const currentCardId = useContext(BoardCardIdContext);
-
-  const isCurrentCardSelected = useRecoilValue(
-    isRecordBoardDeprecatedCardSelectedFamilyState(currentCardId ?? ''),
-  );
-
-  const { activeCardIdsState } = useRecordBoardDeprecatedScopedStates();
-
-  const setActiveCardIds = useSetRecoilState(activeCardIdsState);
-
-  const setCurrentCardSelected = useRecoilCallback(
-    ({ set }) =>
-      (selected: boolean) => {
-        if (!currentCardId) return;
-
-        set(
-          isRecordBoardDeprecatedCardSelectedFamilyState(currentCardId),
-          selected,
-        );
-        set(actionBarOpenState, selected);
-
-        if (selected) {
-          setActiveCardIds((prevActiveCardIds) => [
-            ...prevActiveCardIds,
-            currentCardId,
-          ]);
-        } else {
-          setActiveCardIds((prevActiveCardIds) =>
-            prevActiveCardIds.filter((id) => id !== currentCardId),
-          );
-        }
-      },
-    [currentCardId, setActiveCardIds],
-  );
-
-  return {
-    isCurrentCardSelected,
-    setCurrentCardSelected,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useDeleteSelectedRecordBoardDeprecatedCardsInternal.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useDeleteSelectedRecordBoardDeprecatedCardsInternal.ts
deleted file mode 100644
index eae6d8196278..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useDeleteSelectedRecordBoardDeprecatedCardsInternal.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { useApolloClient } from '@apollo/client';
-import { useRecoilCallback } from 'recoil';
-
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useDeleteManyRecords } from '@/object-record/hooks/useDeleteManyRecords';
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-
-import { useRemoveRecordBoardDeprecatedCardIdsInternal } from './useRemoveRecordBoardDeprecatedCardIdsInternal';
-
-export const useDeleteSelectedRecordBoardDeprecatedCardsInternal = () => {
-  const removeCardIds = useRemoveRecordBoardDeprecatedCardIdsInternal();
-  const apolloClient = useApolloClient();
-
-  const { deleteManyRecords: deleteManyOpportunities } = useDeleteManyRecords({
-    objectNameSingular: CoreObjectNameSingular.Opportunity,
-  });
-
-  const { selectedCardIdsSelector } = useRecordBoardDeprecatedScopedStates();
-
-  const deleteSelectedBoardCards = useRecoilCallback(
-    ({ snapshot }) =>
-      async () => {
-        const selectedCardIds = snapshot
-          .getLoadable(selectedCardIdsSelector)
-          .getValue();
-
-        await deleteManyOpportunities?.(selectedCardIds);
-        removeCardIds(selectedCardIds);
-        selectedCardIds.forEach((id) => {
-          apolloClient.cache.evict({ id: `Opportunity:${id}` });
-        });
-      },
-    [
-      selectedCardIdsSelector,
-      removeCardIds,
-      deleteManyOpportunities,
-      apolloClient.cache,
-    ],
-  );
-
-  return deleteSelectedBoardCards;
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedActionBarEntriesInternal.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedActionBarEntriesInternal.ts
deleted file mode 100644
index 12f9a0e18672..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedActionBarEntriesInternal.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useCallback } from 'react';
-import { useSetRecoilState } from 'recoil';
-
-import { useDeleteSelectedRecordBoardDeprecatedCardsInternal } from '@/object-record/record-board-deprecated/hooks/internal/useDeleteSelectedRecordBoardDeprecatedCardsInternal';
-import { IconTrash } from '@/ui/display/icon';
-import { actionBarEntriesState } from '@/ui/navigation/action-bar/states/actionBarEntriesState';
-
-export const useRecordBoardDeprecatedActionBarEntriesInternal = () => {
-  const setActionBarEntriesRecoil = useSetRecoilState(actionBarEntriesState);
-
-  const deleteSelectedBoardCards =
-    useDeleteSelectedRecordBoardDeprecatedCardsInternal();
-
-  const setActionBarEntries = useCallback(() => {
-    setActionBarEntriesRecoil([
-      {
-        label: 'Delete',
-        Icon: IconTrash,
-        accent: 'danger',
-        onClick: deleteSelectedBoardCards,
-      },
-    ]);
-  }, [deleteSelectedBoardCards, setActionBarEntriesRecoil]);
-
-  return {
-    setActionBarEntries,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedCardFieldsInternal.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedCardFieldsInternal.ts
deleted file mode 100644
index 6ee2c04f4d50..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedCardFieldsInternal.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { useCallback } from 'react';
-import { useRecoilCallback, useSetRecoilState } from 'recoil';
-
-import { RecordBoardDeprecatedScopeInternalContext } from '@/object-record/record-board-deprecated/scopes/scope-internal-context/RecordBoardDeprecatedScopeInternalContext';
-import { onFieldsChangeScopedState } from '@/object-record/record-board-deprecated/states/onFieldsChangeScopedState';
-import { recordBoardCardFieldsScopedState } from '@/object-record/record-board-deprecated/states/recordBoardDeprecatedCardFieldsScopedState';
-import { savedRecordBoardDeprecatedCardFieldsScopedState } from '@/object-record/record-board-deprecated/states/savedRecordBoardDeprecatedCardFieldsScopedState';
-import { BoardFieldDefinition } from '@/object-record/record-board-deprecated/types/BoardFieldDefinition';
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
-import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
-
-type useRecordBoardDeprecatedCardFieldsInternalProps = {
-  recordBoardScopeId?: string;
-};
-
-export const useRecordBoardDeprecatedCardFieldsInternal = (
-  props?: useRecordBoardDeprecatedCardFieldsInternalProps,
-) => {
-  const scopeId = useAvailableScopeIdOrThrow(
-    RecordBoardDeprecatedScopeInternalContext,
-    props?.recordBoardScopeId,
-  );
-
-  const setBoardCardFields = useSetRecoilState(
-    recordBoardCardFieldsScopedState({ scopeId }),
-  );
-
-  const setSavedBoardCardFields = useSetRecoilState(
-    savedRecordBoardDeprecatedCardFieldsScopedState({ scopeId }),
-  );
-
-  const handleFieldVisibilityChange = useRecoilCallback(
-    ({ snapshot }) =>
-      async (
-        field: Omit<ColumnDefinition<FieldMetadata>, 'size' | 'position'>,
-      ) => {
-        const existingFields = await snapshot
-          .getLoadable(recordBoardCardFieldsScopedState({ scopeId }))
-          .getValue();
-
-        const fieldIndex = existingFields.findIndex(
-          ({ fieldMetadataId }) => field.fieldMetadataId === fieldMetadataId,
-        );
-        const fields = [...existingFields];
-
-        if (fieldIndex === -1) {
-          fields.push({ ...field, position: existingFields.length });
-        } else {
-          fields[fieldIndex] = {
-            ...field,
-            isVisible: !field.isVisible,
-            position: existingFields.length,
-          };
-        }
-
-        setSavedBoardCardFields(fields);
-        setBoardCardFields(fields);
-
-        const onFieldsChange = snapshot
-          .getLoadable(onFieldsChangeScopedState({ scopeId }))
-          .getValue();
-
-        onFieldsChange?.(fields);
-      },
-    [scopeId, setBoardCardFields, setSavedBoardCardFields],
-  );
-
-  const handleFieldsChange = useRecoilCallback(
-    ({ snapshot }) =>
-      async (fields: BoardFieldDefinition<FieldMetadata>[]) => {
-        setSavedBoardCardFields(fields);
-        setBoardCardFields(fields);
-
-        const onFieldsChange = snapshot
-          .getLoadable(onFieldsChangeScopedState({ scopeId }))
-          .getValue();
-
-        await onFieldsChange?.(fields);
-      },
-    [scopeId, setBoardCardFields, setSavedBoardCardFields],
-  );
-
-  const handleFieldsReorder = useCallback(
-    async (fields: BoardFieldDefinition<FieldMetadata>[]) => {
-      const updatedFields = fields.map((column, index) => ({
-        ...column,
-        position: index,
-      }));
-
-      await handleFieldsChange(updatedFields);
-    },
-    [handleFieldsChange],
-  );
-
-  return { handleFieldVisibilityChange, handleFieldsReorder };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedColumnsInternal.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedColumnsInternal.ts
deleted file mode 100644
index 1c9e98c753d5..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedColumnsInternal.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { useRecoilState } from 'recoil';
-
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { PipelineStep } from '@/pipeline/types/PipelineStep';
-import { useMoveViewColumns } from '@/views/hooks/useMoveViewColumns';
-
-import { BoardColumnDefinition } from '../../types/BoardColumnDefinition';
-
-export const useBoardColumnsInternal = () => {
-  const { boardColumnsState } = useRecordBoardDeprecatedScopedStates();
-  const [boardColumns, setBoardColumns] = useRecoilState(boardColumnsState);
-
-  const { handleColumnMove } = useMoveViewColumns();
-
-  const { updateOneRecord: updateOnePipelineStep } =
-    useUpdateOneRecord<PipelineStep>({
-      objectNameSingular: CoreObjectNameSingular.PipelineStep,
-    });
-
-  const updatedPipelineSteps = (stages: BoardColumnDefinition[]) => {
-    if (!stages.length) return;
-
-    return Promise.all(
-      stages.map(
-        (stage) =>
-          updateOnePipelineStep?.({
-            idToUpdate: stage.id,
-            updateOneRecordInput: {
-              position: stage.position,
-            },
-          }),
-      ),
-    );
-  };
-
-  const persistBoardColumns = async () => {
-    await updatedPipelineSteps(boardColumns);
-  };
-
-  const handleMoveBoardColumn = (
-    direction: 'left' | 'right',
-    column: BoardColumnDefinition,
-  ) => {
-    const currentColumnArrayIndex = boardColumns.findIndex(
-      (tableColumn) => tableColumn.id === column.id,
-    );
-    const columns = handleColumnMove(
-      direction,
-      currentColumnArrayIndex,
-      boardColumns,
-    );
-    setBoardColumns(columns);
-  };
-
-  return { handleMoveBoardColumn, persistBoardColumns };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedContextMenuEntriesInternal.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedContextMenuEntriesInternal.ts
deleted file mode 100644
index 4e3d7730c185..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedContextMenuEntriesInternal.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { useCallback } from 'react';
-import { useSetRecoilState } from 'recoil';
-
-import { useDeleteSelectedRecordBoardDeprecatedCardsInternal } from '@/object-record/record-board-deprecated/hooks/internal/useDeleteSelectedRecordBoardDeprecatedCardsInternal';
-import { IconTrash } from '@/ui/display/icon';
-import { contextMenuEntriesState } from '@/ui/navigation/context-menu/states/contextMenuEntriesState';
-
-export const useRecordBoardDeprecatedContextMenuEntriesInternal = () => {
-  const setContextMenuEntriesRecoil = useSetRecoilState(
-    contextMenuEntriesState,
-  );
-
-  const deleteSelectedBoardCards =
-    useDeleteSelectedRecordBoardDeprecatedCardsInternal();
-
-  const setContextMenuEntries = useCallback(() => {
-    setContextMenuEntriesRecoil([
-      {
-        label: 'Delete',
-        Icon: IconTrash,
-        accent: 'danger',
-        onClick: deleteSelectedBoardCards,
-      },
-    ]);
-  }, [deleteSelectedBoardCards, setContextMenuEntriesRecoil]);
-
-  return {
-    setContextMenuEntries,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates.ts
deleted file mode 100644
index 0a5256a28219..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { RecordBoardDeprecatedScopeInternalContext } from '@/object-record/record-board-deprecated/scopes/scope-internal-context/RecordBoardDeprecatedScopeInternalContext';
-import { getRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/utils/getRecordBoardDeprecatedScopedStates';
-import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
-
-type useRecordBoardDeprecatedScopedStatesProps = {
-  recordBoardScopeId?: string;
-};
-
-export const useRecordBoardDeprecatedScopedStates = (
-  args?: useRecordBoardDeprecatedScopedStatesProps,
-) => {
-  const { recordBoardScopeId } = args ?? {};
-
-  const scopeId = useAvailableScopeIdOrThrow(
-    RecordBoardDeprecatedScopeInternalContext,
-    recordBoardScopeId,
-  );
-
-  const {
-    activeCardIdsState,
-    availableBoardCardFieldsState,
-    boardColumnsState,
-    isBoardLoadedState,
-    isCompactViewEnabledState,
-    savedBoardColumnsState,
-    boardFiltersState,
-    boardSortsState,
-    onFieldsChangeState,
-    boardCardFieldsByKeySelector,
-    hiddenBoardCardFieldsSelector,
-    selectedCardIdsSelector,
-    visibleBoardCardFieldsSelector,
-    savedCompaniesState,
-    savedOpportunitiesState,
-    savedPipelineStepsState,
-  } = getRecordBoardDeprecatedScopedStates({
-    recordBoardScopeId: scopeId,
-  });
-
-  return {
-    scopeId,
-    activeCardIdsState,
-    availableBoardCardFieldsState,
-    boardColumnsState,
-    isBoardLoadedState,
-    isCompactViewEnabledState,
-    savedBoardColumnsState,
-    boardFiltersState,
-    boardSortsState,
-    onFieldsChangeState,
-    boardCardFieldsByKeySelector,
-    hiddenBoardCardFieldsSelector,
-    selectedCardIdsSelector,
-    visibleBoardCardFieldsSelector,
-    savedCompaniesState,
-    savedOpportunitiesState,
-    savedPipelineStepsState,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRemoveRecordBoardDeprecatedCardIdsInternal.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRemoveRecordBoardDeprecatedCardIdsInternal.ts
deleted file mode 100644
index ce9a71e24a77..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useRemoveRecordBoardDeprecatedCardIdsInternal.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Atlassian dnd does not support StrictMode from RN 18, so we use a fork @hello-pangea/dnd https://github.com/atlassian/react-beautiful-dnd/issues/2350
-import { useRecoilCallback } from 'recoil';
-
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-
-import { recordBoardCardIdsByColumnIdFamilyState } from '../../states/recordBoardCardIdsByColumnIdFamilyState';
-
-export const useRemoveRecordBoardDeprecatedCardIdsInternal = () => {
-  const { boardColumnsState } = useRecordBoardDeprecatedScopedStates();
-
-  return useRecoilCallback(
-    ({ snapshot, set }) =>
-      (cardIdToRemove: string[]) => {
-        const boardColumns = snapshot
-          .getLoadable(boardColumnsState)
-          .valueOrThrow();
-
-        boardColumns.forEach((boardColumn) => {
-          const columnCardIds = snapshot
-            .getLoadable(
-              recordBoardCardIdsByColumnIdFamilyState(boardColumn.id),
-            )
-            .valueOrThrow();
-          set(
-            recordBoardCardIdsByColumnIdFamilyState(boardColumn.id),
-            columnCardIds.filter((cardId) => !cardIdToRemove.includes(cardId)),
-          );
-        });
-      },
-    [boardColumnsState],
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useSetRecordBoardDeprecatedCardSelectedInternal.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useSetRecordBoardDeprecatedCardSelectedInternal.ts
deleted file mode 100644
index 93cee6d284c0..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useSetRecordBoardDeprecatedCardSelectedInternal.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { useRecoilCallback } from 'recoil';
-
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { RecordBoardDeprecatedScopeInternalContext } from '@/object-record/record-board-deprecated/scopes/scope-internal-context/RecordBoardDeprecatedScopeInternalContext';
-import { actionBarOpenState } from '@/ui/navigation/action-bar/states/actionBarIsOpenState';
-import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
-
-import { isRecordBoardDeprecatedCardSelectedFamilyState } from '../../states/isRecordBoardDeprecatedCardSelectedFamilyState';
-
-export const useSetRecordBoardDeprecatedCardSelectedInternal = (props: any) => {
-  const scopeId = useAvailableScopeIdOrThrow(
-    RecordBoardDeprecatedScopeInternalContext,
-    props?.recordBoardScopeId,
-  );
-  const { activeCardIdsState } = useRecordBoardDeprecatedScopedStates({
-    recordBoardScopeId: scopeId,
-  });
-
-  const setCardSelected = useRecoilCallback(
-    ({ set, snapshot }) =>
-      (cardId: string, selected: boolean) => {
-        const activeCardIds = snapshot.getLoadable(activeCardIdsState).contents;
-
-        set(isRecordBoardDeprecatedCardSelectedFamilyState(cardId), selected);
-        set(actionBarOpenState, selected || activeCardIds.length > 0);
-
-        if (selected) {
-          set(activeCardIdsState, [...activeCardIds, cardId]);
-        } else {
-          set(
-            activeCardIdsState,
-            activeCardIds.filter((id: string) => id !== cardId),
-          );
-        }
-      },
-    [activeCardIdsState],
-  );
-
-  const unselectAllActiveCards = useRecoilCallback(
-    ({ set, snapshot }) =>
-      () => {
-        const activeCardIds = snapshot.getLoadable(activeCardIdsState).contents;
-
-        activeCardIds.forEach((cardId: string) => {
-          set(isRecordBoardDeprecatedCardSelectedFamilyState(cardId), false);
-        });
-
-        set(activeCardIdsState, []);
-        set(actionBarOpenState, false);
-      },
-    [activeCardIdsState],
-  );
-
-  return {
-    setCardSelected,
-    unselectAllActiveCards,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useUpdateCompanyBoardColumnsInternal.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useUpdateCompanyBoardColumnsInternal.ts
deleted file mode 100644
index 162bb412371a..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/internal/useUpdateCompanyBoardColumnsInternal.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import { useRecoilCallback } from 'recoil';
-
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { recordBoardCardIdsByColumnIdFamilyState } from '@/object-record/record-board-deprecated/states/recordBoardCardIdsByColumnIdFamilyState';
-import { BoardColumnDefinition } from '@/object-record/record-board-deprecated/types/BoardColumnDefinition';
-import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
-import { currentPipelineStepsState } from '@/pipeline/states/currentPipelineStepsState';
-import { Opportunity } from '@/pipeline/types/Opportunity';
-import { PipelineStep } from '@/pipeline/types/PipelineStep';
-import { themeColorSchema } from '@/ui/theme/utils/themeColorSchema';
-import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
-import { logError } from '~/utils/logError';
-
-import { companyProgressesFamilyState } from '../../../../companies/states/companyProgressesFamilyState';
-import {
-  CompanyForBoard,
-  CompanyProgressDict,
-} from '../../../../companies/types/CompanyProgress';
-
-export const useUpdateCompanyBoardColumnsInternal = () => {
-  const { boardColumnsState, savedBoardColumnsState } =
-    useRecordBoardDeprecatedScopedStates();
-
-  return useRecoilCallback(
-    ({ set, snapshot }) =>
-      (
-        pipelineSteps: PipelineStep[],
-        opportunities: Opportunity[],
-        companies: CompanyForBoard[],
-      ) => {
-        const indexCompanyByIdReducer = (
-          acc: { [key: string]: CompanyForBoard },
-          company: CompanyForBoard,
-        ) => ({
-          ...acc,
-          [company.id]: company,
-        });
-
-        const companiesDict =
-          companies.reduce(
-            indexCompanyByIdReducer,
-            {} as { [key: string]: CompanyForBoard },
-          ) ?? {};
-
-        const indexOpportunityByIdReducer = (
-          acc: CompanyProgressDict,
-          opportunity: Opportunity,
-        ) => {
-          const company =
-            opportunity.companyId && companiesDict[opportunity.companyId];
-
-          if (!company) return acc;
-
-          return {
-            ...acc,
-            [opportunity.id]: {
-              opportunity,
-              company,
-            },
-          };
-        };
-
-        const companyBoardIndex = opportunities.reduce(
-          indexOpportunityByIdReducer,
-          {} as CompanyProgressDict,
-        );
-
-        for (const [id, companyProgress] of Object.entries(companyBoardIndex)) {
-          const currentCompanyProgress = snapshot
-            .getLoadable(companyProgressesFamilyState(id))
-            .valueOrThrow();
-
-          if (!isDeeplyEqual(currentCompanyProgress, companyProgress)) {
-            set(companyProgressesFamilyState(id), companyProgress);
-            set(recordStoreFamilyState(id), companyProgress.opportunity);
-          }
-        }
-
-        const currentPipelineSteps = snapshot
-          .getLoadable(currentPipelineStepsState)
-          .valueOrThrow();
-
-        const currentBoardColumns = snapshot
-          .getLoadable(boardColumnsState)
-          .valueOrThrow();
-
-        if (!isDeeplyEqual(pipelineSteps, currentPipelineSteps)) {
-          set(currentPipelineStepsState, pipelineSteps);
-        }
-
-        const orderedPipelineSteps = [...pipelineSteps].sort((a, b) => {
-          if (!a.position || !b.position) return 0;
-          return a.position - b.position;
-        });
-
-        const newBoardColumns: BoardColumnDefinition[] =
-          orderedPipelineSteps?.map((pipelineStep) => {
-            const colorValidationResult = themeColorSchema.safeParse(
-              pipelineStep.color,
-            );
-
-            if (!colorValidationResult.success) {
-              logError(
-                `Color ${pipelineStep.color} is not recognized in useUpdateCompanyBoard.`,
-              );
-            }
-
-            return {
-              id: pipelineStep.id,
-              title: pipelineStep.name,
-              colorCode: colorValidationResult.success
-                ? colorValidationResult.data
-                : undefined,
-              position: pipelineStep.position ?? 0,
-            };
-          });
-        if (
-          currentBoardColumns.length === 0 &&
-          !isDeeplyEqual(newBoardColumns, currentBoardColumns)
-        ) {
-          set(boardColumnsState, newBoardColumns);
-          set(savedBoardColumnsState, newBoardColumns);
-        }
-        for (const boardColumn of newBoardColumns) {
-          const boardCardIds = opportunities
-            .filter(
-              (opportunityToFilter) =>
-                opportunityToFilter.pipelineStepId === boardColumn.id,
-            )
-            .map((opportunity) => opportunity.id);
-
-          const currentBoardCardIds = snapshot
-            .getLoadable(
-              recordBoardCardIdsByColumnIdFamilyState(boardColumn.id),
-            )
-            .valueOrThrow();
-
-          if (!isDeeplyEqual(currentBoardCardIds, boardCardIds)) {
-            set(
-              recordBoardCardIdsByColumnIdFamilyState(boardColumn.id),
-              boardCardIds,
-            );
-          }
-        }
-      },
-    [boardColumnsState, savedBoardColumnsState],
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/useRecordBoardDeprecated.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/useRecordBoardDeprecated.ts
deleted file mode 100644
index 4a4e05b00d74..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/hooks/useRecordBoardDeprecated.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useSetRecoilState } from 'recoil';
-
-import { useCreateOpportunity } from '@/object-record/record-board-deprecated/hooks/internal/useCreateOpportunity';
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import { RecordBoardDeprecatedScopeInternalContext } from '@/object-record/record-board-deprecated/scopes/scope-internal-context/RecordBoardDeprecatedScopeInternalContext';
-import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
-
-type useRecordBoardDeprecatedProps = {
-  recordBoardScopeId?: string;
-};
-
-export const useRecordBoardDeprecated = (
-  props?: useRecordBoardDeprecatedProps,
-) => {
-  const scopeId = useAvailableScopeIdOrThrow(
-    RecordBoardDeprecatedScopeInternalContext,
-    props?.recordBoardScopeId,
-  );
-
-  const { isBoardLoadedState, boardColumnsState, onFieldsChangeState } =
-    useRecordBoardDeprecatedScopedStates({
-      recordBoardScopeId: scopeId,
-    });
-  const setIsBoardLoaded = useSetRecoilState(isBoardLoadedState);
-
-  const setBoardColumns = useSetRecoilState(boardColumnsState);
-
-  const createOpportunity = useCreateOpportunity();
-
-  const setOnFieldsChange = useSetRecoilState(onFieldsChangeState);
-
-  return {
-    scopeId,
-    setIsBoardLoaded,
-    setBoardColumns,
-    createOpportunity,
-    setOnFieldsChange,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/options/components/RecordBoardDeprecatedOptionsDropdown.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/options/components/RecordBoardDeprecatedOptionsDropdown.tsx
deleted file mode 100644
index 1a3e6f1f204d..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/options/components/RecordBoardDeprecatedOptionsDropdown.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { BOARD_OPTIONS_DROPDOWN_ID } from '@/object-record/record-board-deprecated/constants/BoardOptionsDropdownId';
-import { useViewBar } from '@/views/hooks/useViewBar';
-
-import { Dropdown } from '../../../../ui/layout/dropdown/components/Dropdown';
-import { BoardOptionsHotkeyScope } from '../../types/BoardOptionsHotkeyScope';
-
-import { RecordBoardDeprecatedOptionsDropdownButton } from './RecordBoardDeprecatedOptionsDropdownButton';
-import {
-  RecordBoardDeprecatedOptionsDropdownContent,
-  RecordBoardDeprecatedOptionsDropdownContentProps,
-} from './RecordBoardDeprecatedOptionsDropdownContent';
-
-type RecordBoardDeprecatedOptionsDropdownProps = Pick<
-  RecordBoardDeprecatedOptionsDropdownContentProps,
-  'onStageAdd' | 'recordBoardId'
->;
-
-export const RecordBoardDeprecatedOptionsDropdown = ({
-  onStageAdd,
-  recordBoardId,
-}: RecordBoardDeprecatedOptionsDropdownProps) => {
-  const { setViewEditMode } = useViewBar();
-
-  return (
-    <Dropdown
-      dropdownId={BOARD_OPTIONS_DROPDOWN_ID}
-      clickableComponent={<RecordBoardDeprecatedOptionsDropdownButton />}
-      dropdownComponents={
-        <RecordBoardDeprecatedOptionsDropdownContent
-          onStageAdd={onStageAdd}
-          recordBoardId={recordBoardId}
-        />
-      }
-      dropdownHotkeyScope={{ scope: BoardOptionsHotkeyScope.Dropdown }}
-      onClickOutside={() => setViewEditMode('none')}
-      dropdownMenuWidth={170}
-    />
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/options/components/RecordBoardDeprecatedOptionsDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/options/components/RecordBoardDeprecatedOptionsDropdownButton.tsx
deleted file mode 100644
index 254519c508cc..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/options/components/RecordBoardDeprecatedOptionsDropdownButton.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { BOARD_OPTIONS_DROPDOWN_ID } from '@/object-record/record-board-deprecated/constants/BoardOptionsDropdownId';
-import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';
-import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
-
-export const RecordBoardDeprecatedOptionsDropdownButton = () => {
-  const { isDropdownOpen, toggleDropdown } = useDropdown(
-    BOARD_OPTIONS_DROPDOWN_ID,
-  );
-
-  const handleClick = () => {
-    toggleDropdown();
-  };
-
-  return (
-    <StyledHeaderDropdownButton
-      isUnfolded={isDropdownOpen}
-      onClick={handleClick}
-    >
-      Options
-    </StyledHeaderDropdownButton>
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/options/components/RecordBoardDeprecatedOptionsDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/options/components/RecordBoardDeprecatedOptionsDropdownContent.tsx
deleted file mode 100644
index 2290f75b4de0..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/options/components/RecordBoardDeprecatedOptionsDropdownContent.tsx
+++ /dev/null
@@ -1,240 +0,0 @@
-import { useCallback, useRef, useState } from 'react';
-import { OnDragEndResponder } from '@hello-pangea/dnd';
-import { useRecoilState, useRecoilValue } from 'recoil';
-import { Key } from 'ts-key-enum';
-import { v4 } from 'uuid';
-
-import { BOARD_OPTIONS_DROPDOWN_ID } from '@/object-record/record-board-deprecated/constants/BoardOptionsDropdownId';
-import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
-import {
-  IconBaselineDensitySmall,
-  IconChevronLeft,
-  IconLayoutKanban,
-  IconPlus,
-  IconTag,
-} from '@/ui/display/icon';
-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
-import { DropdownMenuInput } from '@/ui/layout/dropdown/components/DropdownMenuInput';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
-import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
-import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
-import { MenuItemNavigate } from '@/ui/navigation/menu-item/components/MenuItemNavigate';
-import { MenuItemToggle } from '@/ui/navigation/menu-item/components/MenuItemToggle';
-import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
-import { ViewFieldsVisibilityDropdownSection } from '@/views/components/ViewFieldsVisibilityDropdownSection';
-import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
-import { useViewBar } from '@/views/hooks/useViewBar';
-import { moveArrayItem } from '~/utils/array/moveArrayItem';
-
-import { useRecordBoardDeprecatedCardFieldsInternal } from '../../hooks/internal/useRecordBoardDeprecatedCardFieldsInternal';
-import { BoardColumnDefinition } from '../../types/BoardColumnDefinition';
-import { BoardOptionsHotkeyScope } from '../../types/BoardOptionsHotkeyScope';
-
-export type RecordBoardDeprecatedOptionsDropdownContentProps = {
-  onStageAdd?: (boardColumn: BoardColumnDefinition) => void;
-  recordBoardId: string;
-};
-
-type BoardOptionsMenu = 'fields' | 'stage-creation' | 'stages';
-
-export const RecordBoardDeprecatedOptionsDropdownContent = ({
-  onStageAdd,
-  recordBoardId,
-}: RecordBoardDeprecatedOptionsDropdownContentProps) => {
-  const { setViewEditMode, handleViewNameSubmit } = useViewBar();
-  const { viewEditModeState, currentViewSelector } = useViewScopedStates();
-
-  const viewEditMode = useRecoilValue(viewEditModeState);
-  const currentView = useRecoilValue(currentViewSelector);
-
-  const stageInputRef = useRef<HTMLInputElement>(null);
-  const viewEditInputRef = useRef<HTMLInputElement>(null);
-
-  const [currentMenu, setCurrentMenu] = useState<
-    BoardOptionsMenu | undefined
-  >();
-
-  const {
-    boardColumnsState,
-    isCompactViewEnabledState,
-    hiddenBoardCardFieldsSelector,
-    visibleBoardCardFieldsSelector,
-  } = useRecordBoardDeprecatedScopedStates({
-    recordBoardScopeId: recordBoardId,
-  });
-
-  const [boardColumns, setBoardColumns] = useRecoilState(boardColumnsState);
-  const [isCompactViewEnabled, setIsCompactViewEnabled] = useRecoilState(
-    isCompactViewEnabledState,
-  );
-
-  const hiddenBoardCardFields = useRecoilValue(hiddenBoardCardFieldsSelector);
-  const hasHiddenFields = hiddenBoardCardFields.length > 0;
-
-  const visibleBoardCardFields = useRecoilValue(visibleBoardCardFieldsSelector);
-  const hasVisibleFields = visibleBoardCardFields.length > 0;
-
-  const handleStageSubmit = () => {
-    if (currentMenu !== 'stage-creation' || !stageInputRef?.current?.value)
-      return;
-
-    const columnToCreate: BoardColumnDefinition = {
-      id: v4(),
-      colorCode: 'gray',
-      position: boardColumns.length,
-      title: stageInputRef.current.value,
-    };
-
-    setBoardColumns((previousBoardColumns) => [
-      ...previousBoardColumns,
-      columnToCreate,
-    ]);
-    onStageAdd?.(columnToCreate);
-  };
-
-  const resetMenu = () => setCurrentMenu(undefined);
-
-  const handleMenuNavigate = (menu: BoardOptionsMenu) => {
-    handleViewNameSubmit();
-    setCurrentMenu(menu);
-  };
-
-  const { handleFieldVisibilityChange, handleFieldsReorder } =
-    useRecordBoardDeprecatedCardFieldsInternal({
-      recordBoardScopeId: recordBoardId,
-    });
-
-  const { closeDropdown } = useDropdown(BOARD_OPTIONS_DROPDOWN_ID);
-
-  const handleReorderField: OnDragEndResponder = useCallback(
-    (result) => {
-      if (!result.destination) {
-        return;
-      }
-
-      const reorderedFields = moveArrayItem(visibleBoardCardFields, {
-        fromIndex: result.source.index - 1,
-        toIndex: result.destination.index - 1,
-      });
-
-      handleFieldsReorder(reorderedFields);
-    },
-    [handleFieldsReorder, visibleBoardCardFields],
-  );
-
-  useScopedHotkeys(
-    [Key.Escape],
-    () => {
-      setViewEditMode('none');
-      closeDropdown();
-    },
-    BoardOptionsHotkeyScope.Dropdown,
-  );
-
-  useScopedHotkeys(
-    Key.Enter,
-    () => {
-      const name = viewEditInputRef.current?.value;
-      resetMenu();
-      setViewEditMode('none');
-      handleStageSubmit();
-      handleViewNameSubmit(name);
-      closeDropdown();
-    },
-    BoardOptionsHotkeyScope.Dropdown,
-  );
-
-  return (
-    <>
-      {!currentMenu && (
-        <>
-          <DropdownMenuInput
-            ref={viewEditInputRef}
-            autoFocus={viewEditMode !== 'none'}
-            placeholder={
-              viewEditMode === 'create'
-                ? 'New view'
-                : viewEditMode === 'edit'
-                  ? 'View name'
-                  : ''
-            }
-            defaultValue={viewEditMode === 'create' ? '' : currentView?.name}
-          />
-          <DropdownMenuSeparator />
-          <DropdownMenuItemsContainer>
-            <MenuItemNavigate
-              onClick={() => handleMenuNavigate('fields')}
-              LeftIcon={IconTag}
-              text="Fields"
-            />
-            <MenuItemNavigate
-              onClick={() => handleMenuNavigate('stages')}
-              LeftIcon={IconLayoutKanban}
-              text="Stages"
-            />
-          </DropdownMenuItemsContainer>
-          <DropdownMenuSeparator />
-          <DropdownMenuItemsContainer>
-            <MenuItemToggle
-              LeftIcon={IconBaselineDensitySmall}
-              onToggleChange={setIsCompactViewEnabled}
-              toggled={isCompactViewEnabled}
-              text="Compact view"
-              toggleSize="small"
-            />
-          </DropdownMenuItemsContainer>
-        </>
-      )}
-      {currentMenu === 'stages' && (
-        <>
-          <DropdownMenuHeader StartIcon={IconChevronLeft} onClick={resetMenu}>
-            Stages
-          </DropdownMenuHeader>
-          <DropdownMenuSeparator />
-          <DropdownMenuItemsContainer>
-            <MenuItem
-              onClick={() => setCurrentMenu('stage-creation')}
-              LeftIcon={IconPlus}
-              text="Add stage"
-            />
-          </DropdownMenuItemsContainer>
-        </>
-      )}
-      {currentMenu === 'stage-creation' && (
-        <DropdownMenuSearchInput
-          autoFocus
-          placeholder="New stage"
-          ref={stageInputRef}
-        />
-      )}
-      {currentMenu === 'fields' && (
-        <>
-          <DropdownMenuHeader StartIcon={IconChevronLeft} onClick={resetMenu}>
-            Fields
-          </DropdownMenuHeader>
-          <DropdownMenuSeparator />
-          {hasVisibleFields && (
-            <ViewFieldsVisibilityDropdownSection
-              title="Visible"
-              fields={visibleBoardCardFields}
-              isDraggable
-              onDragEnd={handleReorderField}
-              onVisibilityChange={handleFieldVisibilityChange}
-            />
-          )}
-          {hasVisibleFields && hasHiddenFields && <DropdownMenuSeparator />}
-          {hasHiddenFields && (
-            <ViewFieldsVisibilityDropdownSection
-              title="Hidden"
-              fields={hiddenBoardCardFields}
-              isDraggable={false}
-              onVisibilityChange={handleFieldVisibilityChange}
-            />
-          )}
-        </>
-      )}
-    </>
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/scopes/RecordBoardDeprecatedScope.tsx b/packages/twenty-front/src/modules/object-record/record-board-deprecated/scopes/RecordBoardDeprecatedScope.tsx
deleted file mode 100644
index d8e2f4a447e1..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/scopes/RecordBoardDeprecatedScope.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ReactNode } from 'react';
-
-import { RecordBoardDeprecatedScopeInternalContext } from '@/object-record/record-board-deprecated/scopes/scope-internal-context/RecordBoardDeprecatedScopeInternalContext';
-
-type RecordBoardDeprecatedScopeProps = {
-  children: ReactNode;
-  recordBoardScopeId: string;
-};
-
-export const RecordBoardDeprecatedScope = ({
-  children,
-  recordBoardScopeId,
-}: RecordBoardDeprecatedScopeProps) => {
-  return (
-    <RecordBoardDeprecatedScopeInternalContext.Provider
-      value={{
-        scopeId: recordBoardScopeId,
-      }}
-    >
-      {children}
-    </RecordBoardDeprecatedScopeInternalContext.Provider>
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/scopes/scope-internal-context/RecordBoardDeprecatedScopeInternalContext.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/scopes/scope-internal-context/RecordBoardDeprecatedScopeInternalContext.ts
deleted file mode 100644
index 11531f68e6ee..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/scopes/scope-internal-context/RecordBoardDeprecatedScopeInternalContext.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
-import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
-
-type RecordBoardDeprecatedScopeInternalContextProps = StateScopeMapKey;
-
-export const RecordBoardDeprecatedScopeInternalContext =
-  createScopeInternalContext<RecordBoardDeprecatedScopeInternalContextProps>();
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/activeRecordBoardDeprecatedCardIdsScopedState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/activeRecordBoardDeprecatedCardIdsScopedState.ts
deleted file mode 100644
index df9b9a158c4c..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/activeRecordBoardDeprecatedCardIdsScopedState.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const activeRecordBoardDeprecatedCardIdsScopedState =
-  createStateScopeMap<string[]>({
-    key: 'activeRecordBoardDeprecatedCardIdsScopedState',
-    defaultValue: [],
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/availableRecordBoardDeprecatedCardFieldsScopedState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/availableRecordBoardDeprecatedCardFieldsScopedState.ts
deleted file mode 100644
index 3c397a042d75..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/availableRecordBoardDeprecatedCardFieldsScopedState.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { BoardFieldDefinition } from '../types/BoardFieldDefinition';
-
-export const availableRecordBoardDeprecatedCardFieldsScopedState =
-  createStateScopeMap<BoardFieldDefinition<FieldMetadata>[]>({
-    key: 'availableRecordBoardDeprecatedCardFieldsScopedState',
-    defaultValue: [],
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/isCompactViewEnabledScopedState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/isCompactViewEnabledScopedState.ts
deleted file mode 100644
index 2e7a35df21de..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/isCompactViewEnabledScopedState.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const isCompactViewEnabledScopedState = createStateScopeMap<boolean>({
-  key: 'isCompactViewEnabledScopedState',
-  defaultValue: false,
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/isRecordBoardDeprecatedCardInCompactViewFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/isRecordBoardDeprecatedCardInCompactViewFamilyState.ts
deleted file mode 100644
index 09220ce05cb1..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/isRecordBoardDeprecatedCardInCompactViewFamilyState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { atomFamily } from 'recoil';
-
-export const isRecordBoardDeprecatedCardInCompactViewFamilyState = atomFamily<
-  boolean,
-  string
->({
-  key: 'isRecordBoardDeprecatedCardInCompactViewFamilyState',
-  default: true,
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/isRecordBoardDeprecatedCardSelectedFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/isRecordBoardDeprecatedCardSelectedFamilyState.ts
deleted file mode 100644
index 84fce509c945..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/isRecordBoardDeprecatedCardSelectedFamilyState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { atomFamily } from 'recoil';
-
-export const isRecordBoardDeprecatedCardSelectedFamilyState = atomFamily<
-  boolean,
-  string
->({
-  key: 'isRecordBoardDeprecatedCardSelectedFamilyState',
-  default: false,
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/isRecordBoardDeprecatedLoadedScopedState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/isRecordBoardDeprecatedLoadedScopedState.ts
deleted file mode 100644
index 4ac71da09d32..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/isRecordBoardDeprecatedLoadedScopedState.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const isRecordBoardDeprecatedLoadedScopedState =
-  createStateScopeMap<boolean>({
-    key: 'isRecordBoardDeprecatedLoadedScopedState',
-    defaultValue: false,
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/onFieldsChangeScopedState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/onFieldsChangeScopedState.ts
deleted file mode 100644
index d411b642a6ba..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/onFieldsChangeScopedState.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { BoardFieldDefinition } from '@/object-record/record-board-deprecated/types/BoardFieldDefinition';
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const onFieldsChangeScopedState = createStateScopeMap<
-  (fields: BoardFieldDefinition<FieldMetadata>[]) => void
->({
-  key: 'onFieldsChangeScopedState',
-  defaultValue: () => {},
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/recordBoardCardIdsByColumnIdFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/recordBoardCardIdsByColumnIdFamilyState.ts
deleted file mode 100644
index 0c462a3e6b17..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/recordBoardCardIdsByColumnIdFamilyState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { atomFamily } from 'recoil';
-
-export const recordBoardCardIdsByColumnIdFamilyState = atomFamily<
-  string[],
-  string
->({
-  key: 'recordBoardCardIdsByColumnIdFamilyState',
-  default: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/recordBoardColumnsScopedState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/recordBoardColumnsScopedState.ts
deleted file mode 100644
index 129330e98456..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/recordBoardColumnsScopedState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BoardColumnDefinition } from '@/object-record/record-board-deprecated/types/BoardColumnDefinition';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const recordBoardColumnsScopedState = createStateScopeMap<
-  BoardColumnDefinition[]
->({
-  key: 'recordBoardColumnsScopedState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/recordBoardDeprecatedCardFieldsScopedState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/recordBoardDeprecatedCardFieldsScopedState.ts
deleted file mode 100644
index 8bdefa0a20f7..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/recordBoardDeprecatedCardFieldsScopedState.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { BoardFieldDefinition } from '../types/BoardFieldDefinition';
-
-export const recordBoardCardFieldsScopedState = createStateScopeMap<
-  BoardFieldDefinition<FieldMetadata>[]
->({
-  key: 'recordBoardCardFieldsScopedState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/recordBoardDeprecatedFiltersScopedState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/recordBoardDeprecatedFiltersScopedState.ts
deleted file mode 100644
index a0d02927e5a3..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/recordBoardDeprecatedFiltersScopedState.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const recordBoardFiltersScopedState = createStateScopeMap<Filter[]>({
-  key: 'recordBoardFiltersScopedState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/recordBoardDeprecatedSortsScopedState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/recordBoardDeprecatedSortsScopedState.ts
deleted file mode 100644
index b19b5f4837b5..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/recordBoardDeprecatedSortsScopedState.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { Sort } from '../../object-sort-dropdown/types/Sort';
-
-export const recordBoardSortsScopedState = createStateScopeMap<Sort[]>({
-  key: 'recordBoardSortsScopedState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/savedOpportunitiesScopedState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/savedOpportunitiesScopedState.ts
deleted file mode 100644
index 57443838c594..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/savedOpportunitiesScopedState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Opportunity } from '@/pipeline/types/Opportunity';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const savedOpportunitiesScopedState = createStateScopeMap<Opportunity[]>(
-  {
-    key: 'savedOpportunitiesScopedState',
-    defaultValue: [],
-  },
-);
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/savedPipelineStepsScopedState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/savedPipelineStepsScopedState.ts
deleted file mode 100644
index 347ae076a233..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/savedPipelineStepsScopedState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { PipelineStep } from '@/pipeline/types/PipelineStep';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const savedPipelineStepsScopedState = createStateScopeMap<
-  PipelineStep[]
->({
-  key: 'savedPipelineStepsScopedState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/savedRecordBoardDeprecatedCardFieldsScopedState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/savedRecordBoardDeprecatedCardFieldsScopedState.ts
deleted file mode 100644
index 5d129d2b8887..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/savedRecordBoardDeprecatedCardFieldsScopedState.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { BoardFieldDefinition } from '../types/BoardFieldDefinition';
-
-export const savedRecordBoardDeprecatedCardFieldsScopedState =
-  createStateScopeMap<BoardFieldDefinition<FieldMetadata>[]>({
-    key: 'savedRecordBoardDeprecatedCardFieldsScopedState',
-    defaultValue: [],
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/savedRecordBoardDeprecatedColumnsScopedState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/savedRecordBoardDeprecatedColumnsScopedState.ts
deleted file mode 100644
index d0e5e70c51c0..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/savedRecordBoardDeprecatedColumnsScopedState.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { BoardColumnDefinition } from '../types/BoardColumnDefinition';
-
-export const savedRecordBoardDeprecatedColumnsScopedState = createStateScopeMap<
-  BoardColumnDefinition[]
->({
-  key: 'savedRecordBoardDeprecatedColumnsScopedState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/savedRecordsScopedState.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/savedRecordsScopedState.ts
deleted file mode 100644
index ac17469e4b98..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/savedRecordsScopedState.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Company } from '@/companies/types/Company';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const savedRecordsScopedState = createStateScopeMap<Company[]>({
-  key: 'savedRecordsScopedState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/selectors/hiddenRecordBoardDeprecatedCardFieldsScopedSelector.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/selectors/hiddenRecordBoardDeprecatedCardFieldsScopedSelector.ts
deleted file mode 100644
index d78a2c8347d6..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/selectors/hiddenRecordBoardDeprecatedCardFieldsScopedSelector.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { createSelectorReadOnlyScopeMap } from '@/ui/utilities/recoil-scope/utils/createSelectorReadOnlyScopeMap';
-
-import { availableRecordBoardDeprecatedCardFieldsScopedState } from '../availableRecordBoardDeprecatedCardFieldsScopedState';
-import { recordBoardCardFieldsScopedState } from '../recordBoardDeprecatedCardFieldsScopedState';
-
-export const hiddenRecordBoardDeprecatedCardFieldsScopedSelector =
-  createSelectorReadOnlyScopeMap({
-    key: 'hiddenRecordBoardDeprecatedCardFieldsScopedSelector',
-    get:
-      ({ scopeId }) =>
-      ({ get }) => {
-        const fields = get(recordBoardCardFieldsScopedState({ scopeId }));
-        const fieldKeys = fields.map(({ fieldMetadataId }) => fieldMetadataId);
-
-        const otherAvailableKeys = get(
-          availableRecordBoardDeprecatedCardFieldsScopedState({ scopeId }),
-        ).filter(({ fieldMetadataId }) => !fieldKeys.includes(fieldMetadataId));
-
-        return [
-          ...fields.filter((field) => !field.isVisible),
-          ...otherAvailableKeys,
-        ];
-      },
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/selectors/recordBoardDeprecatedCardFieldsByKeyScopedSelector.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/selectors/recordBoardDeprecatedCardFieldsByKeyScopedSelector.ts
deleted file mode 100644
index 63808d878732..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/selectors/recordBoardDeprecatedCardFieldsByKeyScopedSelector.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { selectorFamily } from 'recoil';
-
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-
-import { BoardFieldDefinition } from '../../types/BoardFieldDefinition';
-import { recordBoardCardFieldsScopedState } from '../recordBoardDeprecatedCardFieldsScopedState';
-
-export const recordBoardCardFieldsByKeyScopedSelector = selectorFamily({
-  key: 'recordBoardCardFieldsByKeyScopedSelector',
-  get:
-    (scopeId: string) =>
-    ({ get }) =>
-      get(recordBoardCardFieldsScopedState({ scopeId })).reduce<
-        Record<string, BoardFieldDefinition<FieldMetadata>>
-      >((result, field) => ({ ...result, [field.fieldMetadataId]: field }), {}),
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/selectors/recordBoardDeprecatedColumnTotalsFamilySelector.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/selectors/recordBoardDeprecatedColumnTotalsFamilySelector.ts
deleted file mode 100644
index a03d9b935ee2..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/selectors/recordBoardDeprecatedColumnTotalsFamilySelector.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { selectorFamily } from 'recoil';
-
-import { companyProgressesFamilyState } from '@/companies/states/companyProgressesFamilyState';
-import { amountFormat } from '~/utils/format/amountFormat';
-
-import { recordBoardCardIdsByColumnIdFamilyState } from '../recordBoardCardIdsByColumnIdFamilyState';
-
-// TODO: this state should be computed during the synchronization web-hook and put in a generic
-// boardColumnTotalsFamilyState indexed by columnId.
-export const recordBoardColumnTotalsFamilySelector = selectorFamily({
-  key: 'recordBoardColumnTotalsFamilySelector',
-  get:
-    (pipelineStepId: string) =>
-    ({ get }) => {
-      const cardIds = get(
-        recordBoardCardIdsByColumnIdFamilyState(pipelineStepId),
-      );
-
-      const opportunities = cardIds.map((opportunityId: string) =>
-        get(companyProgressesFamilyState(opportunityId)),
-      );
-
-      const pipelineStepTotal: number =
-        opportunities?.reduce(
-          (acc: number, curr: any) =>
-            acc + curr?.opportunity.amount.amountMicros / 1000000,
-          0,
-        ) || 0;
-
-      return amountFormat(pipelineStepTotal);
-    },
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/selectors/selectedRecordBoardDeprecatedCardIdsScopedSelector.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/selectors/selectedRecordBoardDeprecatedCardIdsScopedSelector.ts
deleted file mode 100644
index b4f65e584cdc..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/selectors/selectedRecordBoardDeprecatedCardIdsScopedSelector.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { createSelectorReadOnlyScopeMap } from '@/ui/utilities/recoil-scope/utils/createSelectorReadOnlyScopeMap';
-
-import { isRecordBoardDeprecatedCardSelectedFamilyState } from '../isRecordBoardDeprecatedCardSelectedFamilyState';
-import { recordBoardCardIdsByColumnIdFamilyState } from '../recordBoardCardIdsByColumnIdFamilyState';
-import { recordBoardColumnsScopedState } from '../recordBoardColumnsScopedState';
-
-export const selectedRecordBoardDeprecatedCardIdsScopedSelector =
-  createSelectorReadOnlyScopeMap<string[]>({
-    key: 'selectedRecordBoardDeprecatedCardIdsScopedSelector',
-    get:
-      ({ scopeId }) =>
-      ({ get }) => {
-        const boardColumns = get(recordBoardColumnsScopedState({ scopeId }));
-
-        const cardIds = boardColumns.flatMap((boardColumn) =>
-          get(recordBoardCardIdsByColumnIdFamilyState(boardColumn.id)),
-        );
-
-        const selectedCardIds = cardIds.filter(
-          (cardId) =>
-            get(isRecordBoardDeprecatedCardSelectedFamilyState(cardId)) ===
-            true,
-        );
-
-        return selectedCardIds;
-      },
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/selectors/visibleRecordBoardDeprecatedCardFieldsScopedSelector.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/selectors/visibleRecordBoardDeprecatedCardFieldsScopedSelector.ts
deleted file mode 100644
index de9e1cba1871..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/states/selectors/visibleRecordBoardDeprecatedCardFieldsScopedSelector.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { createSelectorReadOnlyScopeMap } from '@/ui/utilities/recoil-scope/utils/createSelectorReadOnlyScopeMap';
-
-import { recordBoardCardFieldsScopedState } from '../recordBoardDeprecatedCardFieldsScopedState';
-
-export const visibleRecordBoardDeprecatedCardFieldsScopedSelector =
-  createSelectorReadOnlyScopeMap({
-    key: 'visibleRecordBoardDeprecatedCardFieldsScopedSelector',
-    get:
-      ({ scopeId }) =>
-      ({ get }) =>
-        get(recordBoardCardFieldsScopedState({ scopeId }))
-          .filter((field) => field.isVisible)
-          .sort((a, b) => a.position - b.position),
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/BoardColumnDefinition.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/BoardColumnDefinition.ts
deleted file mode 100644
index b779ed4358b9..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/BoardColumnDefinition.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { ThemeColor } from '@/ui/theme/constants/MainColorNames';
-
-export type BoardColumnDefinition = {
-  id: string;
-  title: string;
-  position: number;
-  colorCode?: ThemeColor;
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/BoardColumnHotkeyScope.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/BoardColumnHotkeyScope.ts
deleted file mode 100644
index 25663b4e337d..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/BoardColumnHotkeyScope.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export enum BoardColumnHotkeyScope {
-  BoardColumn = 'board-column',
-}
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/BoardFieldDefinition.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/BoardFieldDefinition.ts
deleted file mode 100644
index fc4c1e25b141..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/BoardFieldDefinition.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition';
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-
-export type BoardFieldDefinition<T extends FieldMetadata> =
-  FieldDefinition<T> & {
-    position: number;
-    isVisible?: boolean;
-    viewFieldId?: string;
-  };
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/BoardOptions.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/BoardOptions.ts
deleted file mode 100644
index 73390947703e..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/BoardOptions.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { ComponentType } from 'react';
-
-export type BoardOptions = {
-  newCardComponent: React.ReactNode;
-  CardComponent: ComponentType;
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/BoardOptionsHotkeyScope.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/BoardOptionsHotkeyScope.ts
deleted file mode 100644
index f726bc66f5f3..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/BoardOptionsHotkeyScope.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export enum BoardOptionsHotkeyScope {
-  Dropdown = 'board-options-dropdown',
-}
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/ColumnHotkeyScope.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/ColumnHotkeyScope.ts
deleted file mode 100644
index 9e490fe403a9..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/types/ColumnHotkeyScope.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export enum ColumnHotkeyScope {
-  EditColumnName = 'EditColumnNameHotkeyScope',
-}
diff --git a/packages/twenty-front/src/modules/object-record/record-board-deprecated/utils/getRecordBoardDeprecatedScopedStates.ts b/packages/twenty-front/src/modules/object-record/record-board-deprecated/utils/getRecordBoardDeprecatedScopedStates.ts
deleted file mode 100644
index 087a7ff51e10..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board-deprecated/utils/getRecordBoardDeprecatedScopedStates.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { activeRecordBoardDeprecatedCardIdsScopedState } from '@/object-record/record-board-deprecated/states/activeRecordBoardDeprecatedCardIdsScopedState';
-import { availableRecordBoardDeprecatedCardFieldsScopedState } from '@/object-record/record-board-deprecated/states/availableRecordBoardDeprecatedCardFieldsScopedState';
-import { isCompactViewEnabledScopedState } from '@/object-record/record-board-deprecated/states/isCompactViewEnabledScopedState';
-import { isRecordBoardDeprecatedLoadedScopedState } from '@/object-record/record-board-deprecated/states/isRecordBoardDeprecatedLoadedScopedState';
-import { onFieldsChangeScopedState } from '@/object-record/record-board-deprecated/states/onFieldsChangeScopedState';
-import { recordBoardColumnsScopedState } from '@/object-record/record-board-deprecated/states/recordBoardColumnsScopedState';
-import { recordBoardFiltersScopedState } from '@/object-record/record-board-deprecated/states/recordBoardDeprecatedFiltersScopedState';
-import { recordBoardSortsScopedState } from '@/object-record/record-board-deprecated/states/recordBoardDeprecatedSortsScopedState';
-import { savedOpportunitiesScopedState } from '@/object-record/record-board-deprecated/states/savedOpportunitiesScopedState';
-import { savedPipelineStepsScopedState } from '@/object-record/record-board-deprecated/states/savedPipelineStepsScopedState';
-import { savedRecordBoardDeprecatedColumnsScopedState } from '@/object-record/record-board-deprecated/states/savedRecordBoardDeprecatedColumnsScopedState';
-import { savedRecordsScopedState } from '@/object-record/record-board-deprecated/states/savedRecordsScopedState';
-import { hiddenRecordBoardDeprecatedCardFieldsScopedSelector } from '@/object-record/record-board-deprecated/states/selectors/hiddenRecordBoardDeprecatedCardFieldsScopedSelector';
-import { recordBoardCardFieldsByKeyScopedSelector } from '@/object-record/record-board-deprecated/states/selectors/recordBoardDeprecatedCardFieldsByKeyScopedSelector';
-import { selectedRecordBoardDeprecatedCardIdsScopedSelector } from '@/object-record/record-board-deprecated/states/selectors/selectedRecordBoardDeprecatedCardIdsScopedSelector';
-import { visibleRecordBoardDeprecatedCardFieldsScopedSelector } from '@/object-record/record-board-deprecated/states/selectors/visibleRecordBoardDeprecatedCardFieldsScopedSelector';
-import { getScopedStateDeprecated } from '@/ui/utilities/recoil-scope/utils/getScopedStateDeprecated';
-
-export const getRecordBoardDeprecatedScopedStates = ({
-  recordBoardScopeId,
-}: {
-  recordBoardScopeId: string;
-}) => {
-  const activeCardIdsState = getScopedStateDeprecated(
-    activeRecordBoardDeprecatedCardIdsScopedState,
-    recordBoardScopeId,
-  );
-
-  const availableBoardCardFieldsState = getScopedStateDeprecated(
-    availableRecordBoardDeprecatedCardFieldsScopedState,
-    recordBoardScopeId,
-  );
-
-  const boardColumnsState = getScopedStateDeprecated(
-    recordBoardColumnsScopedState,
-    recordBoardScopeId,
-  );
-
-  const isBoardLoadedState = getScopedStateDeprecated(
-    isRecordBoardDeprecatedLoadedScopedState,
-    recordBoardScopeId,
-  );
-
-  const isCompactViewEnabledState = getScopedStateDeprecated(
-    isCompactViewEnabledScopedState,
-    recordBoardScopeId,
-  );
-
-  const savedBoardColumnsState = getScopedStateDeprecated(
-    savedRecordBoardDeprecatedColumnsScopedState,
-    recordBoardScopeId,
-  );
-
-  const boardFiltersState = getScopedStateDeprecated(
-    recordBoardFiltersScopedState,
-    recordBoardScopeId,
-  );
-
-  const boardSortsState = getScopedStateDeprecated(
-    recordBoardSortsScopedState,
-    recordBoardScopeId,
-  );
-
-  const savedCompaniesState = getScopedStateDeprecated(
-    savedRecordsScopedState,
-    recordBoardScopeId,
-  );
-
-  const savedOpportunitiesState = getScopedStateDeprecated(
-    savedOpportunitiesScopedState,
-    recordBoardScopeId,
-  );
-
-  const savedPipelineStepsState = getScopedStateDeprecated(
-    savedPipelineStepsScopedState,
-    recordBoardScopeId,
-  );
-
-  const onFieldsChangeState = getScopedStateDeprecated(
-    onFieldsChangeScopedState,
-    recordBoardScopeId,
-  );
-
-  // TODO: Family scoped selector
-  const boardCardFieldsByKeySelector =
-    recordBoardCardFieldsByKeyScopedSelector(recordBoardScopeId);
-
-  const hiddenBoardCardFieldsSelector =
-    hiddenRecordBoardDeprecatedCardFieldsScopedSelector({
-      scopeId: recordBoardScopeId,
-    });
-
-  const selectedCardIdsSelector =
-    selectedRecordBoardDeprecatedCardIdsScopedSelector({
-      scopeId: recordBoardScopeId,
-    });
-
-  const visibleBoardCardFieldsSelector =
-    visibleRecordBoardDeprecatedCardFieldsScopedSelector({
-      scopeId: recordBoardScopeId,
-    });
-
-  return {
-    activeCardIdsState,
-    availableBoardCardFieldsState,
-    boardColumnsState,
-    isBoardLoadedState,
-    isCompactViewEnabledState,
-    savedBoardColumnsState,
-    boardFiltersState,
-    boardSortsState,
-    onFieldsChangeState,
-    boardCardFieldsByKeySelector,
-    hiddenBoardCardFieldsSelector,
-    selectedCardIdsSelector,
-    visibleBoardCardFieldsSelector,
-    savedCompaniesState,
-    savedOpportunitiesState,
-    savedPipelineStepsState,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-board/action-bar/components/RecordBoardActionBar.tsx b/packages/twenty-front/src/modules/object-record/record-board/action-bar/components/RecordBoardActionBar.tsx
index d0d810222011..584cbeab3b5f 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/action-bar/components/RecordBoardActionBar.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/action-bar/components/RecordBoardActionBar.tsx
@@ -10,13 +10,13 @@ type RecordBoardActionBarProps = {
 export const RecordBoardActionBar = ({
   recordBoardId,
 }: RecordBoardActionBarProps) => {
-  const { getSelectedRecordIdsSelector } = useRecordBoardStates(recordBoardId);
+  const { selectedRecordIdsSelector } = useRecordBoardStates(recordBoardId);
 
-  const selectedRecordIds = useRecoilValue(getSelectedRecordIdsSelector());
+  const selectedRecordIds = useRecoilValue(selectedRecordIdsSelector());
 
   if (!selectedRecordIds.length) {
     return null;
   }
 
-  return <ActionBar />;
+  return <ActionBar selectedIds={selectedRecordIds} />;
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoard.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoard.tsx
index f8aa66909a56..b8840686e104 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoard.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoard.tsx
@@ -26,8 +26,6 @@ const StyledContainer = styled.div`
   display: flex;
   flex: 1;
   flex-direction: row;
-  margin-left: ${({ theme }) => theme.spacing(2)};
-  margin-right: ${({ theme }) => theme.spacing(2)};
 `;
 
 const StyledWrapper = styled.div`
@@ -50,12 +48,12 @@ export const RecordBoard = ({ recordBoardId }: RecordBoardProps) => {
   const boardRef = useRef<HTMLDivElement>(null);
 
   const {
-    getColumnIdsState,
+    columnIdsState,
     columnsFamilySelector,
     recordIdsByColumnIdFamilyState,
   } = useRecordBoardStates(recordBoardId);
 
-  const columnIds = useRecoilValue(getColumnIdsState());
+  const columnIds = useRecoilValue(columnIdsState);
 
   const { resetRecordSelection, setRecordAsSelected } =
     useRecordBoardSelection(recordBoardId);
diff --git a/packages/twenty-front/src/modules/object-record/record-board/context-menu/components/RecordBoardContextMenu.tsx b/packages/twenty-front/src/modules/object-record/record-board/context-menu/components/RecordBoardContextMenu.tsx
index b98245d90165..fed35a6506d3 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/context-menu/components/RecordBoardContextMenu.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/context-menu/components/RecordBoardContextMenu.tsx
@@ -10,9 +10,9 @@ type RecordBoardContextMenuProps = {
 export const RecordBoardContextMenu = ({
   recordBoardId,
 }: RecordBoardContextMenuProps) => {
-  const { getSelectedRecordIdsSelector } = useRecordBoardStates(recordBoardId);
+  const { selectedRecordIdsSelector } = useRecordBoardStates(recordBoardId);
 
-  const selectedRecordIds = useRecoilValue(getSelectedRecordIdsSelector());
+  const selectedRecordIds = useRecoilValue(selectedRecordIdsSelector());
 
   if (!selectedRecordIds.length) {
     return null;
diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/internal/useRecordBoardStates.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/internal/useRecordBoardStates.ts
index 291db2655e47..7758ca97fae1 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/hooks/internal/useRecordBoardStates.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/internal/useRecordBoardStates.ts
@@ -1,24 +1,25 @@
 import { RecordBoardScopeInternalContext } from '@/object-record/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext';
-import { isFirstRecordBoardColumnFamilyStateScopeMap } from '@/object-record/record-board/states/isFirstRecordBoardColumnFamilyStateScopeMap';
-import { isLastRecordBoardColumnFamilyStateScopeMap } from '@/object-record/record-board/states/isLastRecordBoardColumnFamilyStateScopeMap';
-import { isRecordBoardCardSelectedFamilyStateScopeMap } from '@/object-record/record-board/states/isRecordBoardCardSelectedFamilyStateScopeMap';
-import { isRecordBoardCompactModeActiveStateScopeMap } from '@/object-record/record-board/states/isRecordBoardCompactModeActiveStateScopeMap';
-import { isRecordBoardFetchingRecordsStateScopeMap } from '@/object-record/record-board/states/isRecordBoardFetchingRecordsStateScopeMap';
-import { onRecordBoardFetchMoreVisibilityChangeStateScopeMap } from '@/object-record/record-board/states/onRecordBoardFetchMoreVisibilityChangeStateScopeMap';
-import { recordBoardColumnIdsStateScopeMap } from '@/object-record/record-board/states/recordBoardColumnIdsStateScopeMap';
-import { recordBoardFieldDefinitionsStateScopeMap } from '@/object-record/record-board/states/recordBoardFieldDefinitionsStateScopeMap';
-import { recordBoardFiltersStateScopeMap } from '@/object-record/record-board/states/recordBoardFiltersStateScopeMap';
-import { recordBoardObjectSingularNameStateScopeMap } from '@/object-record/record-board/states/recordBoardObjectSingularNameStateScopeMap';
-import { recordBoardRecordIdsByColumnIdFamilyStateScopeMap } from '@/object-record/record-board/states/recordBoardRecordIdsByColumnIdFamilyStateScopeMap';
-import { recordBoardSortsStateScopeMap } from '@/object-record/record-board/states/recordBoardSortsStateScopeMap';
-import { recordBoardColumnsFamilySelectorScopeMap } from '@/object-record/record-board/states/selectors/recordBoardColumnsFamilySelectorScopeMap';
-import { recordBoardSelectedRecordIdsSelectorScopeMap } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsSelectorScopeMap';
-import { recordBoardVisibleFieldDefinitionsScopedSelector } from '@/object-record/record-board/states/selectors/recordBoardVisibleFieldDefinitionsScopedSelector';
+import { isFirstRecordBoardColumnComponentFamilyState } from '@/object-record/record-board/states/isFirstRecordBoardColumnComponentFamilyState';
+import { isLastRecordBoardColumnComponentFamilyState } from '@/object-record/record-board/states/isLastRecordBoardColumnComponentFamilyState';
+import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState';
+import { isRecordBoardCompactModeActiveComponentState } from '@/object-record/record-board/states/isRecordBoardCompactModeActiveComponentState';
+import { isRecordBoardFetchingRecordsComponentState } from '@/object-record/record-board/states/isRecordBoardFetchingRecordsComponentState';
+import { onRecordBoardFetchMoreVisibilityChangeComponentState } from '@/object-record/record-board/states/onRecordBoardFetchMoreVisibilityChangeComponentState';
+import { recordBoardColumnIdsComponentState } from '@/object-record/record-board/states/recordBoardColumnIdsComponentState';
+import { recordBoardFieldDefinitionsComponentState } from '@/object-record/record-board/states/recordBoardFieldDefinitionsComponentState';
+import { recordBoardFiltersComponentState } from '@/object-record/record-board/states/recordBoardFiltersComponentState';
+import { recordBoardKanbanFieldMetadataNameComponentState } from '@/object-record/record-board/states/recordBoardKanbanFieldMetadataNameComponentState';
+import { recordBoardObjectSingularNameComponentState } from '@/object-record/record-board/states/recordBoardObjectSingularNameComponentState';
+import { recordBoardRecordIdsByColumnIdComponentFamilyState } from '@/object-record/record-board/states/recordBoardRecordIdsByColumnIdComponentFamilyState';
+import { recordBoardSortsComponentState } from '@/object-record/record-board/states/recordBoardSortsComponentState';
+import { recordBoardColumnsComponentFamilySelector } from '@/object-record/record-board/states/selectors/recordBoardColumnsComponentFamilySelector';
+import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector';
+import { recordBoardVisibleFieldDefinitionsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardVisibleFieldDefinitionsComponentSelector';
 import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
-import { getFamilyState } from '@/ui/utilities/recoil-scope/utils/getFamilyState';
 import { getScopeIdOrUndefinedFromComponentId } from '@/ui/utilities/recoil-scope/utils/getScopeIdOrUndefinedFromComponentId';
-import { getSelectorReadOnly } from '@/ui/utilities/recoil-scope/utils/getSelectorReadOnly';
-import { getState } from '@/ui/utilities/recoil-scope/utils/getState';
+import { extractComponentFamilyState } from '@/ui/utilities/state/component-state/utils/extractComponentFamilyState';
+import { extractComponentReadOnlySelector } from '@/ui/utilities/state/component-state/utils/extractComponentReadOnlySelector';
+import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
 
 export const useRecordBoardStates = (recordBoardId?: string) => {
   const scopeId = useAvailableScopeIdOrThrow(
@@ -28,59 +29,69 @@ export const useRecordBoardStates = (recordBoardId?: string) => {
 
   return {
     scopeId,
-    getObjectSingularNameState: getState(
-      recordBoardObjectSingularNameStateScopeMap,
+    objectSingularNameState: extractComponentState(
+      recordBoardObjectSingularNameComponentState,
       scopeId,
     ),
-    getIsFetchingRecordState: getState(
-      isRecordBoardFetchingRecordsStateScopeMap,
+    kanbanFieldMetadataNameState: extractComponentState(
+      recordBoardKanbanFieldMetadataNameComponentState,
       scopeId,
     ),
-    getColumnIdsState: getState(recordBoardColumnIdsStateScopeMap, scopeId),
-    isFirstColumnFamilyState: getFamilyState(
-      isFirstRecordBoardColumnFamilyStateScopeMap,
+    isFetchingRecordState: extractComponentState(
+      isRecordBoardFetchingRecordsComponentState,
       scopeId,
     ),
-    isLastColumnFamilyState: getFamilyState(
-      isLastRecordBoardColumnFamilyStateScopeMap,
+    columnIdsState: extractComponentState(
+      recordBoardColumnIdsComponentState,
       scopeId,
     ),
-    columnsFamilySelector: getFamilyState(
-      recordBoardColumnsFamilySelectorScopeMap,
+    isFirstColumnFamilyState: extractComponentFamilyState(
+      isFirstRecordBoardColumnComponentFamilyState,
+      scopeId,
+    ),
+    isLastColumnFamilyState: extractComponentFamilyState(
+      isLastRecordBoardColumnComponentFamilyState,
+      scopeId,
+    ),
+    columnsFamilySelector: extractComponentFamilyState(
+      recordBoardColumnsComponentFamilySelector,
       scopeId,
     ),
 
-    getFiltersState: getState(recordBoardFiltersStateScopeMap, scopeId),
-    getSortsState: getState(recordBoardSortsStateScopeMap, scopeId),
-    getFieldDefinitionsState: getState(
-      recordBoardFieldDefinitionsStateScopeMap,
+    filtersState: extractComponentState(
+      recordBoardFiltersComponentState,
+      scopeId,
+    ),
+    sortsState: extractComponentState(recordBoardSortsComponentState, scopeId),
+    fieldDefinitionsState: extractComponentState(
+      recordBoardFieldDefinitionsComponentState,
       scopeId,
     ),
-    getVisibleFieldDefinitionsState: getSelectorReadOnly(
-      recordBoardVisibleFieldDefinitionsScopedSelector,
+    visibleFieldDefinitionsState: extractComponentReadOnlySelector(
+      recordBoardVisibleFieldDefinitionsComponentSelector,
       scopeId,
     ),
 
-    recordIdsByColumnIdFamilyState: getFamilyState(
-      recordBoardRecordIdsByColumnIdFamilyStateScopeMap,
+    recordIdsByColumnIdFamilyState: extractComponentFamilyState(
+      recordBoardRecordIdsByColumnIdComponentFamilyState,
       scopeId,
     ),
-    isRecordBoardCardSelectedFamilyState: getFamilyState(
-      isRecordBoardCardSelectedFamilyStateScopeMap,
+    isRecordBoardCardSelectedFamilyState: extractComponentFamilyState(
+      isRecordBoardCardSelectedComponentFamilyState,
       scopeId,
     ),
-    getSelectedRecordIdsSelector: getSelectorReadOnly(
-      recordBoardSelectedRecordIdsSelectorScopeMap,
+    selectedRecordIdsSelector: extractComponentReadOnlySelector(
+      recordBoardSelectedRecordIdsComponentSelector,
       scopeId,
     ),
 
-    getIsCompactModeActiveState: getState(
-      isRecordBoardCompactModeActiveStateScopeMap,
+    isCompactModeActiveState: extractComponentState(
+      isRecordBoardCompactModeActiveComponentState,
       scopeId,
     ),
 
-    getOnFetchMoreVisibilityChangeState: getState(
-      onRecordBoardFetchMoreVisibilityChangeStateScopeMap,
+    onFetchMoreVisibilityChangeState: extractComponentState(
+      onRecordBoardFetchMoreVisibilityChangeComponentState,
       scopeId,
     ),
   };
diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/internal/useSetRecordBoardColumns.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/internal/useSetRecordBoardColumns.ts
index 34ca406203a9..d330a476d64f 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/hooks/internal/useSetRecordBoardColumns.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/internal/useSetRecordBoardColumns.ts
@@ -5,14 +5,14 @@ import { RecordBoardColumnDefinition } from '@/object-record/record-board/types/
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
 
 export const useSetRecordBoardColumns = (recordBoardId?: string) => {
-  const { scopeId, getColumnIdsState, columnsFamilySelector } =
+  const { scopeId, columnIdsState, columnsFamilySelector } =
     useRecordBoardStates(recordBoardId);
 
   const setColumns = useRecoilCallback(
     ({ set, snapshot }) =>
       (columns: RecordBoardColumnDefinition[]) => {
         const currentColumnsIds = snapshot
-          .getLoadable(getColumnIdsState())
+          .getLoadable(columnIdsState)
           .getValue();
 
         const columnIds = columns.map(({ id }) => id);
@@ -22,7 +22,7 @@ export const useSetRecordBoardColumns = (recordBoardId?: string) => {
         }
 
         set(
-          getColumnIdsState(),
+          columnIdsState,
           columns.map((column) => column.id),
         );
 
@@ -38,7 +38,7 @@ export const useSetRecordBoardColumns = (recordBoardId?: string) => {
           set(columnsFamilySelector(column.id), column);
         });
       },
-    [columnsFamilySelector, getColumnIdsState],
+    [columnsFamilySelector, columnIdsState],
   );
 
   return {
diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/internal/useSetRecordBoardRecordIds.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/internal/useSetRecordBoardRecordIds.ts
index db2811af0f35..8ead970305d8 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/hooks/internal/useSetRecordBoardRecordIds.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/internal/useSetRecordBoardRecordIds.ts
@@ -9,13 +9,14 @@ export const useSetRecordBoardRecordIds = (recordBoardId?: string) => {
     scopeId,
     recordIdsByColumnIdFamilyState,
     columnsFamilySelector,
-    getColumnIdsState,
+    columnIdsState,
+    kanbanFieldMetadataNameState,
   } = useRecordBoardStates(recordBoardId);
 
   const setRecordIds = useRecoilCallback(
     ({ set, snapshot }) =>
       (records: ObjectRecord[]) => {
-        const columnIds = snapshot.getLoadable(getColumnIdsState()).getValue();
+        const columnIds = snapshot.getLoadable(columnIdsState).getValue();
 
         columnIds.forEach((columnId) => {
           const column = snapshot
@@ -26,8 +27,19 @@ export const useSetRecordBoardRecordIds = (recordBoardId?: string) => {
             .getLoadable(recordIdsByColumnIdFamilyState(columnId))
             .getValue();
 
+          const kanbanFieldMetadataName = snapshot
+            .getLoadable(kanbanFieldMetadataNameState)
+            .getValue();
+
+          if (!kanbanFieldMetadataName) {
+            return;
+          }
+
           const columnRecordIds = records
-            .filter((record) => record.stage === column?.value)
+            .filter(
+              (record) => record[kanbanFieldMetadataName] === column?.value,
+            )
+            .sort(sortRecordsByPosition)
             .map((record) => record.id);
 
           if (!isDeeplyEqual(existingColumnRecordIds, columnRecordIds)) {
@@ -35,7 +47,12 @@ export const useSetRecordBoardRecordIds = (recordBoardId?: string) => {
           }
         });
       },
-    [columnsFamilySelector, getColumnIdsState, recordIdsByColumnIdFamilyState],
+    [
+      columnIdsState,
+      columnsFamilySelector,
+      recordIdsByColumnIdFamilyState,
+      kanbanFieldMetadataNameState,
+    ],
   );
 
   return {
@@ -43,3 +60,21 @@ export const useSetRecordBoardRecordIds = (recordBoardId?: string) => {
     setRecordIds,
   };
 };
+
+const sortRecordsByPosition = (
+  record1: ObjectRecord,
+  record2: ObjectRecord,
+) => {
+  if (
+    typeof record1.position == 'number' &&
+    typeof record2.position == 'number'
+  ) {
+    return record1.position - record2.position;
+  } else if (record1.position === 'first' || record2.position === 'last') {
+    return -1;
+  } else if (record2.position === 'first' || record1.position === 'last') {
+    return 1;
+  } else {
+    return 0;
+  }
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoard.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoard.ts
index 59429b254652..25a358e7ac91 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoard.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoard.ts
@@ -7,17 +7,21 @@ import { useSetRecordBoardRecordIds } from '@/object-record/record-board/hooks/i
 export const useRecordBoard = (recordBoardId?: string) => {
   const {
     scopeId,
-    getFieldDefinitionsState,
-    getObjectSingularNameState,
-    getSelectedRecordIdsSelector,
-    getIsCompactModeActiveState,
-    getOnFetchMoreVisibilityChangeState,
+    fieldDefinitionsState,
+    objectSingularNameState,
+    selectedRecordIdsSelector,
+    isCompactModeActiveState,
+    onFetchMoreVisibilityChangeState,
+    kanbanFieldMetadataNameState,
   } = useRecordBoardStates(recordBoardId);
 
   const { setColumns } = useSetRecordBoardColumns(recordBoardId);
   const { setRecordIds } = useSetRecordBoardRecordIds(recordBoardId);
-  const setFieldDefinitions = useSetRecoilState(getFieldDefinitionsState());
-  const setObjectSingularName = useSetRecoilState(getObjectSingularNameState());
+  const setFieldDefinitions = useSetRecoilState(fieldDefinitionsState);
+  const setObjectSingularName = useSetRecoilState(objectSingularNameState);
+  const setKanbanFieldMetadataName = useSetRecoilState(
+    kanbanFieldMetadataNameState,
+  );
 
   return {
     scopeId,
@@ -25,8 +29,9 @@ export const useRecordBoard = (recordBoardId?: string) => {
     setRecordIds,
     setFieldDefinitions,
     setObjectSingularName,
-    getSelectedRecordIdsSelector,
-    getIsCompactModeActiveState,
-    getOnFetchMoreVisibilityChangeState,
+    setKanbanFieldMetadataName,
+    selectedRecordIdsSelector,
+    isCompactModeActiveState,
+    onFetchMoreVisibilityChangeState,
   };
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts
index ae89223c79ee..a2024d4ba683 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts
@@ -3,21 +3,21 @@ import { useRecoilCallback } from 'recoil';
 import { useRecordBoardStates } from '@/object-record/record-board/hooks/internal/useRecordBoardStates';
 
 export const useRecordBoardSelection = (recordBoardId?: string) => {
-  const { getSelectedRecordIdsSelector, isRecordBoardCardSelectedFamilyState } =
+  const { selectedRecordIdsSelector, isRecordBoardCardSelectedFamilyState } =
     useRecordBoardStates(recordBoardId);
 
   const resetRecordSelection = useRecoilCallback(
     ({ snapshot, set }) =>
       () => {
         const recordIds = snapshot
-          .getLoadable(getSelectedRecordIdsSelector())
+          .getLoadable(selectedRecordIdsSelector())
           .getValue();
 
         for (const recordId of recordIds) {
           set(isRecordBoardCardSelectedFamilyState(recordId), false);
         }
       },
-    [getSelectedRecordIdsSelector, isRecordBoardCardSelectedFamilyState],
+    [selectedRecordIdsSelector, isRecordBoardCardSelectedFamilyState],
   );
 
   const setRecordAsSelected = useRecoilCallback(
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
index 15f2424e97cc..0c753862a180 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
@@ -2,6 +2,7 @@ import { ReactNode, useContext, useState } from 'react';
 import { useInView } from 'react-intersection-observer';
 import styled from '@emotion/styled';
 import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
+import { IconEye } from 'twenty-ui';
 
 import { RecordChip } from '@/object-record/components/RecordChip';
 import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
@@ -15,7 +16,6 @@ import {
 import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
 import { InlineCellHotkeyScope } from '@/object-record/record-inline-cell/types/InlineCellHotkeyScope';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
-import { IconEye } from '@/ui/display/icon/index';
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { Checkbox, CheckboxVariant } from '@/ui/input/components/Checkbox';
 import { contextMenuIsOpenState } from '@/ui/navigation/context-menu/states/contextMenuIsOpenState';
@@ -133,12 +133,12 @@ export const RecordBoardCard = () => {
   const { updateOneRecord, objectMetadataItem } =
     useContext(RecordBoardContext);
   const {
-    getIsCompactModeActiveState,
+    isCompactModeActiveState,
     isRecordBoardCardSelectedFamilyState,
-    getVisibleFieldDefinitionsState,
+    visibleFieldDefinitionsState,
   } = useRecordBoardStates();
 
-  const isCompactModeActive = useRecoilValue(getIsCompactModeActiveState());
+  const isCompactModeActive = useRecoilValue(isCompactModeActiveState);
 
   const [isCardInCompactMode, setIsCardInCompactMode] = useState(true);
 
@@ -146,8 +146,8 @@ export const RecordBoardCard = () => {
     isRecordBoardCardSelectedFamilyState(recordId),
   );
 
-  const visibleBoardCardFieldDefinitions = useRecoilValue(
-    getVisibleFieldDefinitionsState(),
+  const visibleFieldDefinitions = useRecoilValue(
+    visibleFieldDefinitionsState(),
   );
 
   const record = useRecoilValue(recordStoreFamilyState(recordId));
@@ -247,7 +247,7 @@ export const RecordBoardCard = () => {
             isOpen={!isCardInCompactMode || !isCompactModeActive}
             initial={false}
           >
-            {visibleBoardCardFieldDefinitions.map((fieldDefinition) => (
+            {visibleFieldDefinitions.map((fieldDefinition) => (
               <PreventSelectOnClickContainer
                 key={fieldDefinition.fieldMetadataId}
               >
@@ -264,6 +264,7 @@ export const RecordBoardCard = () => {
                       iconName: fieldDefinition.iconName,
                       type: fieldDefinition.type,
                       metadata: fieldDefinition.metadata,
+                      defaultValue: fieldDefinition.defaultValue,
                     },
                     useUpdateRecord: useUpdateOneRecordHook,
                     hotkeyScope: InlineCellHotkeyScope.InlineCell,
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnDropdownMenu.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnDropdownMenu.tsx
index 0b2750fd9b2c..e08feba7a50d 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnDropdownMenu.tsx
@@ -1,10 +1,10 @@
 import { useCallback, useContext, useRef } from 'react';
 import styled from '@emotion/styled';
-import { MenuItem } from 'tsup.ui.index';
 
 import { RecordBoardColumnContext } from '@/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext';
 import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
 import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
 
 const StyledMenuContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnFetchMoreLoader.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnFetchMoreLoader.tsx
index 072120d68063..56127562c05b 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnFetchMoreLoader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnFetchMoreLoader.tsx
@@ -16,12 +16,12 @@ const StyledText = styled.div`
 `;
 
 export const RecordBoardColumnFetchMoreLoader = () => {
-  const { getIsFetchingRecordState, getOnFetchMoreVisibilityChangeState } =
+  const { isFetchingRecordState, onFetchMoreVisibilityChangeState } =
     useRecordBoardStates();
-  const isFetchingRecords = useRecoilValue(getIsFetchingRecordState());
+  const isFetchingRecord = useRecoilValue(isFetchingRecordState);
 
   const onFetchMoreVisibilityChange = useRecoilValue(
-    getOnFetchMoreVisibilityChangeState(),
+    onFetchMoreVisibilityChangeState,
   );
 
   const { ref } = useInView({
@@ -30,7 +30,7 @@ export const RecordBoardColumnFetchMoreLoader = () => {
 
   return (
     <div ref={ref}>
-      {isFetchingRecords && <StyledText>Loading more...</StyledText>}
+      {isFetchingRecord && <StyledText>Loading more...</StyledText>}
     </div>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
index d1e36a3ecc69..25d6f7c1b5c3 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
@@ -1,10 +1,10 @@
 import React, { useContext, useState } from 'react';
 import styled from '@emotion/styled';
+import { IconDotsVertical } from 'twenty-ui';
 
 import { RecordBoardColumnDropdownMenu } from '@/object-record/record-board/record-board-column/components/RecordBoardColumnDropdownMenu';
 import { RecordBoardColumnContext } from '@/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext';
-import { BoardColumnHotkeyScope } from '@/object-record/record-board-deprecated/types/BoardColumnHotkeyScope';
-import { IconDotsVertical } from '@/ui/display/icon';
+import { RecordBoardColumnHotkeyScope } from '@/object-record/record-board/types/BoardColumnHotkeyScope';
 import { Tag } from '@/ui/display/tag/components/Tag';
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
@@ -57,9 +57,12 @@ export const RecordBoardColumnHeader = () => {
 
   const handleBoardColumnMenuOpen = () => {
     setIsBoardColumnMenuOpen(true);
-    setHotkeyScopeAndMemorizePreviousScope(BoardColumnHotkeyScope.BoardColumn, {
-      goto: false,
-    });
+    setHotkeyScopeAndMemorizePreviousScope(
+      RecordBoardColumnHotkeyScope.BoardColumn,
+      {
+        goto: false,
+      },
+    );
   };
 
   const handleBoardColumnMenuClose = () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewButton.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewButton.tsx
index deac52c76d3e..62ce7d5f5a9b 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewButton.tsx
@@ -1,10 +1,10 @@
 import { useContext } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconPlus } from 'twenty-ui';
 
 import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
 import { RecordBoardColumnContext } from '@/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext';
-import { IconPlus } from '@/ui/display/icon/index';
 
 const StyledButton = styled.button`
   align-items: center;
@@ -32,6 +32,7 @@ export const RecordBoardColumnNewButton = () => {
   const onNewClick = () => {
     createOneRecord({
       [selectFieldMetadataItem.name]: columnDefinition.value,
+      position: 'last',
     });
   };
 
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewOpportunityButton.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewOpportunityButton.tsx
index 9cac6da4ff73..398990c5c7c6 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewOpportunityButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewOpportunityButton.tsx
@@ -1,6 +1,7 @@
 import { useCallback, useContext, useState } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconPlus } from 'twenty-ui';
 
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
@@ -8,7 +9,6 @@ import { RecordBoardColumnContext } from '@/object-record/record-board/record-bo
 import { SingleEntitySelect } from '@/object-record/relation-picker/components/SingleEntitySelect';
 import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
 import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
-import { IconPlus } from '@/ui/display/icon';
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
 
 const StyledButton = styled.button`
@@ -52,6 +52,7 @@ export const RecordBoardColumnNewOpportunityButton = () => {
     createOneRecord({
       name: company.name,
       companyId: company.id,
+      position: 'last',
       [selectFieldMetadataItem.name]: columnDefinition.value,
     });
   };
diff --git a/packages/twenty-front/src/modules/object-record/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext.ts b/packages/twenty-front/src/modules/object-record/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext.ts
index 03da78cce764..22aeae0edc3b 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext.ts
@@ -1,10 +1,10 @@
 import { RecordBoardColumnDefinition } from '@/object-record/record-board/types/RecordBoardColumnDefinition';
 import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
 import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
-type RecordBoardScopeInternalContextProps = StateScopeMapKey & {
+type RecordBoardScopeInternalContextProps = ComponentStateKey & {
   onFieldsChange: (fields: FieldDefinition<FieldMetadata>[]) => void;
   onColumnsChange: (column: RecordBoardColumnDefinition[]) => void;
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isFirstRecordBoardColumnComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isFirstRecordBoardColumnComponentFamilyState.ts
new file mode 100644
index 000000000000..bef4219700d4
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/isFirstRecordBoardColumnComponentFamilyState.ts
@@ -0,0 +1,7 @@
+import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState';
+
+export const isFirstRecordBoardColumnComponentFamilyState =
+  createComponentFamilyState<boolean, string>({
+    key: 'isFirstRecordBoardColumnComponentFamilyState',
+    defaultValue: false,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isFirstRecordBoardColumnFamilyStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isFirstRecordBoardColumnFamilyStateScopeMap.ts
deleted file mode 100644
index 989f3277b8c0..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/isFirstRecordBoardColumnFamilyStateScopeMap.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-export const isFirstRecordBoardColumnFamilyStateScopeMap =
-  createFamilyStateScopeMap<boolean, string>({
-    key: 'isFirstRecordBoardColumnFamilyStateScopeMap',
-    defaultValue: false,
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isLastRecordBoardColumnComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isLastRecordBoardColumnComponentFamilyState.ts
new file mode 100644
index 000000000000..9174fba1cac2
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/isLastRecordBoardColumnComponentFamilyState.ts
@@ -0,0 +1,7 @@
+import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState';
+
+export const isLastRecordBoardColumnComponentFamilyState =
+  createComponentFamilyState<boolean, string>({
+    key: 'isLastRecordBoardColumnComponentFamilyState',
+    defaultValue: false,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isLastRecordBoardColumnFamilyStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isLastRecordBoardColumnFamilyStateScopeMap.ts
deleted file mode 100644
index b29e9ecaeb4d..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/isLastRecordBoardColumnFamilyStateScopeMap.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-export const isLastRecordBoardColumnFamilyStateScopeMap =
-  createFamilyStateScopeMap<boolean, string>({
-    key: 'isLastRecordBoardColumnFamilyStateScopeMap',
-    defaultValue: false,
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState.ts
new file mode 100644
index 000000000000..8cb7c99f4959
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState.ts
@@ -0,0 +1,7 @@
+import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState';
+
+export const isRecordBoardCardSelectedComponentFamilyState =
+  createComponentFamilyState<boolean, string>({
+    key: 'isRecordBoardCardSelectedComponentFamilyState',
+    defaultValue: false,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardSelectedFamilyStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardSelectedFamilyStateScopeMap.ts
deleted file mode 100644
index 825e46ed3ca3..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardSelectedFamilyStateScopeMap.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-export const isRecordBoardCardSelectedFamilyStateScopeMap =
-  createFamilyStateScopeMap<boolean, string>({
-    key: 'isRecordBoardCardSelectedFamilyStateScopeMap',
-    defaultValue: false,
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCompactModeActiveComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCompactModeActiveComponentState.ts
new file mode 100644
index 000000000000..68741ee81a90
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCompactModeActiveComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const isRecordBoardCompactModeActiveComponentState =
+  createComponentState<boolean>({
+    key: 'isRecordBoardCompactModeActiveComponentState',
+    defaultValue: false,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCompactModeActiveStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCompactModeActiveStateScopeMap.ts
deleted file mode 100644
index 0ad51b9a9844..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCompactModeActiveStateScopeMap.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const isRecordBoardCompactModeActiveStateScopeMap =
-  createStateScopeMap<boolean>({
-    key: 'isRecordBoardCompactModeActiveStateScopeMap',
-    defaultValue: false,
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardFetchingRecordsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardFetchingRecordsComponentState.ts
new file mode 100644
index 000000000000..c76a8777e328
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardFetchingRecordsComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const isRecordBoardFetchingRecordsComponentState =
+  createComponentState<boolean>({
+    key: 'isRecordBoardFetchingRecordsComponentState',
+    defaultValue: false,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardFetchingRecordsStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardFetchingRecordsStateScopeMap.ts
deleted file mode 100644
index 83c35a4be906..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardFetchingRecordsStateScopeMap.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const isRecordBoardFetchingRecordsStateScopeMap =
-  createStateScopeMap<boolean>({
-    key: 'isRecordBoardFetchingRecordsStateScopeMap',
-    defaultValue: false,
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/onRecordBoardFetchMoreVisibilityChangeComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/onRecordBoardFetchMoreVisibilityChangeComponentState.ts
new file mode 100644
index 000000000000..c977c8851b41
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/onRecordBoardFetchMoreVisibilityChangeComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const onRecordBoardFetchMoreVisibilityChangeComponentState =
+  createComponentState<(visbility: boolean) => void>({
+    key: 'onRecordBoardFetchMoreVisibilityChangeComponentState',
+    defaultValue: () => {},
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/onRecordBoardFetchMoreVisibilityChangeStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-board/states/onRecordBoardFetchMoreVisibilityChangeStateScopeMap.ts
deleted file mode 100644
index fb5da620aa7d..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/onRecordBoardFetchMoreVisibilityChangeStateScopeMap.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const onRecordBoardFetchMoreVisibilityChangeStateScopeMap =
-  createStateScopeMap<(visbility: boolean) => void>({
-    key: 'onRecordBoardFetchMoreVisibilityChangeStateScopeMap',
-    defaultValue: () => {},
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardColumnIdsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardColumnIdsComponentState.ts
new file mode 100644
index 000000000000..3ae094376c22
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardColumnIdsComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const recordBoardColumnIdsComponentState = createComponentState<
+  string[]
+>({
+  key: 'recordBoardColumnIdsComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardColumnIdsStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardColumnIdsStateScopeMap.ts
deleted file mode 100644
index 82118caf3485..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardColumnIdsStateScopeMap.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const recordBoardColumnIdsStateScopeMap = createStateScopeMap<string[]>({
-  key: 'recordBoardColumnIdsStateScopeMap',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardColumnsComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardColumnsComponentFamilyState.ts
new file mode 100644
index 000000000000..c2b6cc1cfe5d
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardColumnsComponentFamilyState.ts
@@ -0,0 +1,8 @@
+import { RecordBoardColumnDefinition } from '@/object-record/record-board/types/RecordBoardColumnDefinition';
+import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState';
+
+export const recordBoardColumnsComponentFamilyState =
+  createComponentFamilyState<RecordBoardColumnDefinition | undefined, string>({
+    key: 'recordBoardColumnsComponentFamilyState',
+    defaultValue: undefined,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardColumnsFamilyStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardColumnsFamilyStateScopeMap.ts
deleted file mode 100644
index aca09ce52f72..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardColumnsFamilyStateScopeMap.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { RecordBoardColumnDefinition } from '@/object-record/record-board/types/RecordBoardColumnDefinition';
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-export const recordBoardColumnsFamilyStateScopeMap = createFamilyStateScopeMap<
-  RecordBoardColumnDefinition | undefined,
-  string
->({
-  key: 'recordBoardColumnsFamilyStateScopeMap',
-  defaultValue: undefined,
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFieldDefinitionsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFieldDefinitionsComponentState.ts
new file mode 100644
index 000000000000..e8fb862be662
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFieldDefinitionsComponentState.ts
@@ -0,0 +1,10 @@
+import { RecordBoardFieldDefinition } from '@/object-record/record-board/types/RecordBoardFieldDefinition';
+import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const recordBoardFieldDefinitionsComponentState = createComponentState<
+  RecordBoardFieldDefinition<FieldMetadata>[]
+>({
+  key: 'recordBoardFieldDefinitionsComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFieldDefinitionsStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFieldDefinitionsStateScopeMap.ts
deleted file mode 100644
index 4248350bcebd..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFieldDefinitionsStateScopeMap.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { RecordBoardFieldDefinition } from '@/object-record/record-board/types/RecordBoardFieldDefinition';
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const recordBoardFieldDefinitionsStateScopeMap = createStateScopeMap<
-  RecordBoardFieldDefinition<FieldMetadata>[]
->({
-  key: 'recordBoardFieldDefinitionsStateScopeMap',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFiltersComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFiltersComponentState.ts
new file mode 100644
index 000000000000..7d493b349e5b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFiltersComponentState.ts
@@ -0,0 +1,7 @@
+import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const recordBoardFiltersComponentState = createComponentState<Filter[]>({
+  key: 'recordBoardFiltersComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFiltersStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFiltersStateScopeMap.ts
deleted file mode 100644
index 71c8528ceb7f..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFiltersStateScopeMap.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const recordBoardFiltersStateScopeMap = createStateScopeMap<Filter[]>({
-  key: 'recordBoardFiltersStateScopeMap',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardKanbanFieldMetadataNameComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardKanbanFieldMetadataNameComponentState.ts
new file mode 100644
index 000000000000..26490c9298b3
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardKanbanFieldMetadataNameComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const recordBoardKanbanFieldMetadataNameComponentState =
+  createComponentState<string | undefined>({
+    key: 'recordBoardKanbanFieldMetadataNameComponentState',
+    defaultValue: undefined,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardObjectSingularNameComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardObjectSingularNameComponentState.ts
new file mode 100644
index 000000000000..b3efddfd7655
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardObjectSingularNameComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const recordBoardObjectSingularNameComponentState = createComponentState<
+  string | undefined
+>({
+  key: 'recordBoardObjectSingularNameComponentState',
+  defaultValue: undefined,
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardObjectSingularNameStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardObjectSingularNameStateScopeMap.ts
deleted file mode 100644
index fd35c826a242..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardObjectSingularNameStateScopeMap.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const recordBoardObjectSingularNameStateScopeMap = createStateScopeMap<
-  string | undefined
->({
-  key: 'recordBoardObjectSingularNameStateScopeMap',
-  defaultValue: undefined,
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardRecordIdsByColumnIdComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardRecordIdsByColumnIdComponentFamilyState.ts
new file mode 100644
index 000000000000..9cb2f0df334a
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardRecordIdsByColumnIdComponentFamilyState.ts
@@ -0,0 +1,7 @@
+import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState';
+
+export const recordBoardRecordIdsByColumnIdComponentFamilyState =
+  createComponentFamilyState<string[], string>({
+    key: 'recordBoardRecordIdsByColumnIdComponentFamilyState',
+    defaultValue: [],
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardRecordIdsByColumnIdFamilyStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardRecordIdsByColumnIdFamilyStateScopeMap.ts
deleted file mode 100644
index 8a413e0b5de3..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardRecordIdsByColumnIdFamilyStateScopeMap.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-export const recordBoardRecordIdsByColumnIdFamilyStateScopeMap =
-  createFamilyStateScopeMap<string[], string>({
-    key: 'recordBoardRecordIdsByColumnIdFamilyStateScopeMap',
-    defaultValue: [],
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardSortsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardSortsComponentState.ts
new file mode 100644
index 000000000000..d2aa0923f335
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardSortsComponentState.ts
@@ -0,0 +1,7 @@
+import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const recordBoardSortsComponentState = createComponentState<Sort[]>({
+  key: 'recordBoardSortsComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardSortsStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardSortsStateScopeMap.ts
deleted file mode 100644
index b49376153a49..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardSortsStateScopeMap.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const recordBoardSortsStateScopeMap = createStateScopeMap<Sort[]>({
-  key: 'recordBoardSortsStateScopeMap',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardColumnsComponentFamilySelector.ts b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardColumnsComponentFamilySelector.ts
new file mode 100644
index 000000000000..22dd7aa8df66
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardColumnsComponentFamilySelector.ts
@@ -0,0 +1,118 @@
+import { isUndefined } from '@sniptt/guards';
+
+import { isFirstRecordBoardColumnComponentFamilyState } from '@/object-record/record-board/states/isFirstRecordBoardColumnComponentFamilyState';
+import { isLastRecordBoardColumnComponentFamilyState } from '@/object-record/record-board/states/isLastRecordBoardColumnComponentFamilyState';
+import { recordBoardColumnIdsComponentState } from '@/object-record/record-board/states/recordBoardColumnIdsComponentState';
+import { recordBoardColumnsComponentFamilyState } from '@/object-record/record-board/states/recordBoardColumnsComponentFamilyState';
+import { RecordBoardColumnDefinition } from '@/object-record/record-board/types/RecordBoardColumnDefinition';
+import { guardRecoilDefaultValue } from '@/ui/utilities/recoil-scope/utils/guardRecoilDefaultValue';
+import { createComponentFamilySelector } from '@/ui/utilities/state/component-state/utils/createComponentFamilySelector';
+import { isDefined } from '~/utils/isDefined';
+
+export const recordBoardColumnsComponentFamilySelector =
+  createComponentFamilySelector<
+    RecordBoardColumnDefinition | undefined,
+    string
+  >({
+    key: 'recordBoardColumnsComponentFamilySelector',
+    get:
+      ({
+        scopeId,
+        familyKey: columnId,
+      }: {
+        scopeId: string;
+        familyKey: string;
+      }) =>
+      ({ get }) => {
+        return get(
+          recordBoardColumnsComponentFamilyState({
+            scopeId,
+            familyKey: columnId,
+          }),
+        );
+      },
+    set:
+      ({
+        scopeId,
+        familyKey: columnId,
+      }: {
+        scopeId: string;
+        familyKey: string;
+      }) =>
+      ({ set, get }, newColumn) => {
+        set(
+          recordBoardColumnsComponentFamilyState({
+            scopeId,
+            familyKey: columnId,
+          }),
+          newColumn,
+        );
+
+        if (guardRecoilDefaultValue(newColumn)) return;
+
+        const columnIds = get(recordBoardColumnIdsComponentState({ scopeId }));
+
+        const columns = columnIds
+          .map((columnId) => {
+            return get(
+              recordBoardColumnsComponentFamilyState({
+                scopeId,
+                familyKey: columnId,
+              }),
+            );
+          })
+          .filter(isDefined);
+
+        const lastColumn = [...columns].sort(
+          (a, b) => b.position - a.position,
+        )[0];
+
+        const firstColumn = [...columns].sort(
+          (a, b) => a.position - b.position,
+        )[0];
+
+        if (!newColumn) {
+          return;
+        }
+
+        if (!lastColumn || newColumn.position > lastColumn.position) {
+          set(
+            isLastRecordBoardColumnComponentFamilyState({
+              scopeId,
+              familyKey: columnId,
+            }),
+            true,
+          );
+
+          if (!isUndefined(lastColumn)) {
+            set(
+              isLastRecordBoardColumnComponentFamilyState({
+                scopeId,
+                familyKey: lastColumn.id,
+              }),
+              false,
+            );
+          }
+        }
+
+        if (!firstColumn || newColumn.position < firstColumn.position) {
+          set(
+            isFirstRecordBoardColumnComponentFamilyState({
+              scopeId,
+              familyKey: columnId,
+            }),
+            true,
+          );
+
+          if (!isUndefined(firstColumn)) {
+            set(
+              isFirstRecordBoardColumnComponentFamilyState({
+                scopeId,
+                familyKey: firstColumn.id,
+              }),
+              false,
+            );
+          }
+        }
+      },
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardColumnsFamilySelectorScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardColumnsFamilySelectorScopeMap.ts
deleted file mode 100644
index c2ab6ed95be7..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardColumnsFamilySelectorScopeMap.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import { isFirstRecordBoardColumnFamilyStateScopeMap } from '@/object-record/record-board/states/isFirstRecordBoardColumnFamilyStateScopeMap';
-import { isLastRecordBoardColumnFamilyStateScopeMap } from '@/object-record/record-board/states/isLastRecordBoardColumnFamilyStateScopeMap';
-import { recordBoardColumnIdsStateScopeMap } from '@/object-record/record-board/states/recordBoardColumnIdsStateScopeMap';
-import { recordBoardColumnsFamilyStateScopeMap } from '@/object-record/record-board/states/recordBoardColumnsFamilyStateScopeMap';
-import { RecordBoardColumnDefinition } from '@/object-record/record-board/types/RecordBoardColumnDefinition';
-import { createFamilySelectorScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilySelectorScopeMap';
-import { guardRecoilDefaultValue } from '@/ui/utilities/recoil-scope/utils/guardRecoilDefaultValue';
-import { isNonNullable } from '~/utils/isNonNullable';
-
-export const recordBoardColumnsFamilySelectorScopeMap =
-  createFamilySelectorScopeMap<RecordBoardColumnDefinition | undefined, string>(
-    {
-      key: 'recordBoardColumnsFamilySelectorScopeMap',
-      get:
-        ({
-          scopeId,
-          familyKey: columnId,
-        }: {
-          scopeId: string;
-          familyKey: string;
-        }) =>
-        ({ get }) => {
-          return get(
-            recordBoardColumnsFamilyStateScopeMap({
-              scopeId,
-              familyKey: columnId,
-            }),
-          );
-        },
-      set:
-        ({
-          scopeId,
-          familyKey: columnId,
-        }: {
-          scopeId: string;
-          familyKey: string;
-        }) =>
-        ({ set, get }, newColumn) => {
-          set(
-            recordBoardColumnsFamilyStateScopeMap({
-              scopeId,
-              familyKey: columnId,
-            }),
-            newColumn,
-          );
-
-          if (guardRecoilDefaultValue(newColumn)) return;
-
-          const columnIds = get(recordBoardColumnIdsStateScopeMap({ scopeId }));
-
-          const columns = columnIds
-            .map((columnId) => {
-              return get(
-                recordBoardColumnsFamilyStateScopeMap({
-                  scopeId,
-                  familyKey: columnId,
-                }),
-              );
-            })
-            .filter(isNonNullable);
-
-          const lastColumn = [...columns].sort(
-            (a, b) => b.position - a.position,
-          )[0];
-
-          const firstColumn = [...columns].sort(
-            (a, b) => a.position - b.position,
-          )[0];
-
-          if (!newColumn) {
-            return;
-          }
-
-          if (!lastColumn || newColumn.position > lastColumn.position) {
-            set(
-              isLastRecordBoardColumnFamilyStateScopeMap({
-                scopeId,
-                familyKey: columnId,
-              }),
-              true,
-            );
-
-            if (lastColumn) {
-              set(
-                isLastRecordBoardColumnFamilyStateScopeMap({
-                  scopeId,
-                  familyKey: lastColumn.id,
-                }),
-                false,
-              );
-            }
-          }
-
-          if (!firstColumn || newColumn.position < firstColumn.position) {
-            set(
-              isFirstRecordBoardColumnFamilyStateScopeMap({
-                scopeId,
-                familyKey: columnId,
-              }),
-              true,
-            );
-
-            if (firstColumn) {
-              set(
-                isFirstRecordBoardColumnFamilyStateScopeMap({
-                  scopeId,
-                  familyKey: firstColumn.id,
-                }),
-                false,
-              );
-            }
-          }
-        },
-    },
-  );
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector.ts
new file mode 100644
index 000000000000..ce2b1e4cac4d
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector.ts
@@ -0,0 +1,35 @@
+import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState';
+import { recordBoardColumnIdsComponentState } from '@/object-record/record-board/states/recordBoardColumnIdsComponentState';
+import { recordBoardRecordIdsByColumnIdComponentFamilyState } from '@/object-record/record-board/states/recordBoardRecordIdsByColumnIdComponentFamilyState';
+import { createComponentReadOnlySelector } from '@/ui/utilities/state/component-state/utils/createComponentReadOnlySelector';
+
+export const recordBoardSelectedRecordIdsComponentSelector =
+  createComponentReadOnlySelector<string[]>({
+    key: 'recordBoardSelectedRecordIdsSelector',
+    get:
+      ({ scopeId }) =>
+      ({ get }) => {
+        const columnIds = get(recordBoardColumnIdsComponentState({ scopeId }));
+
+        const recordIdsByColumn = columnIds.map((columnId) =>
+          get(
+            recordBoardRecordIdsByColumnIdComponentFamilyState({
+              scopeId,
+              familyKey: columnId,
+            }),
+          ),
+        );
+
+        const recordIds = recordIdsByColumn.flat();
+
+        return recordIds.filter(
+          (recordId) =>
+            get(
+              isRecordBoardCardSelectedComponentFamilyState({
+                scopeId,
+                familyKey: recordId,
+              }),
+            ) === true,
+        );
+      },
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsSelectorScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsSelectorScopeMap.ts
deleted file mode 100644
index 437fcfa56365..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsSelectorScopeMap.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { isRecordBoardCardSelectedFamilyStateScopeMap } from '@/object-record/record-board/states/isRecordBoardCardSelectedFamilyStateScopeMap';
-import { recordBoardColumnIdsStateScopeMap } from '@/object-record/record-board/states/recordBoardColumnIdsStateScopeMap';
-import { recordBoardRecordIdsByColumnIdFamilyStateScopeMap } from '@/object-record/record-board/states/recordBoardRecordIdsByColumnIdFamilyStateScopeMap';
-import { createSelectorReadOnlyScopeMap } from '@/ui/utilities/recoil-scope/utils/createSelectorReadOnlyScopeMap';
-
-export const recordBoardSelectedRecordIdsSelectorScopeMap =
-  createSelectorReadOnlyScopeMap<string[]>({
-    key: 'recordBoardSelectedRecordIdsSelectorScopeMap',
-    get:
-      ({ scopeId }) =>
-      ({ get }) => {
-        const columnIds = get(recordBoardColumnIdsStateScopeMap({ scopeId }));
-
-        const recordIdsByColumn = columnIds.map((columnId) =>
-          get(
-            recordBoardRecordIdsByColumnIdFamilyStateScopeMap({
-              scopeId,
-              familyKey: columnId,
-            }),
-          ),
-        );
-
-        const recordIds = recordIdsByColumn.flat();
-
-        return recordIds.filter(
-          (recordId) =>
-            get(
-              isRecordBoardCardSelectedFamilyStateScopeMap({
-                scopeId,
-                familyKey: recordId,
-              }),
-            ) === true,
-        );
-      },
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardVisibleFieldDefinitionsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardVisibleFieldDefinitionsComponentSelector.ts
new file mode 100644
index 000000000000..4b2732eb36d8
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardVisibleFieldDefinitionsComponentSelector.ts
@@ -0,0 +1,13 @@
+import { recordBoardFieldDefinitionsComponentState } from '@/object-record/record-board/states/recordBoardFieldDefinitionsComponentState';
+import { createComponentReadOnlySelector } from '@/ui/utilities/state/component-state/utils/createComponentReadOnlySelector';
+
+export const recordBoardVisibleFieldDefinitionsComponentSelector =
+  createComponentReadOnlySelector({
+    key: 'recordBoardVisibleFieldDefinitionsComponentSelector',
+    get:
+      ({ scopeId }) =>
+      ({ get }) =>
+        get(recordBoardFieldDefinitionsComponentState({ scopeId }))
+          .filter((field) => field.isVisible)
+          .sort((a, b) => a.position - b.position),
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardVisibleFieldDefinitionsScopedSelector.ts b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardVisibleFieldDefinitionsScopedSelector.ts
deleted file mode 100644
index edae8d879c59..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardVisibleFieldDefinitionsScopedSelector.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { recordBoardFieldDefinitionsStateScopeMap } from '@/object-record/record-board/states/recordBoardFieldDefinitionsStateScopeMap';
-import { createSelectorReadOnlyScopeMap } from '@/ui/utilities/recoil-scope/utils/createSelectorReadOnlyScopeMap';
-
-export const recordBoardVisibleFieldDefinitionsScopedSelector =
-  createSelectorReadOnlyScopeMap({
-    key: 'recordBoardVisibleFieldDefinitionsScopedSelector',
-    get:
-      ({ scopeId }) =>
-      ({ get }) =>
-        get(recordBoardFieldDefinitionsStateScopeMap({ scopeId }))
-          .filter((field) => field.isVisible)
-          .sort((a, b) => a.position - b.position),
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-board/types/BoardColumnHotkeyScope.ts b/packages/twenty-front/src/modules/object-record/record-board/types/BoardColumnHotkeyScope.ts
new file mode 100644
index 000000000000..c62d939355fe
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/types/BoardColumnHotkeyScope.ts
@@ -0,0 +1,3 @@
+export enum RecordBoardColumnHotkeyScope {
+  BoardColumn = 'board-column',
+}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/__mocks__/fieldDefinitions.ts b/packages/twenty-front/src/modules/object-record/record-field/__mocks__/fieldDefinitions.ts
index 8b842656a63e..4a85b26f246f 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/__mocks__/fieldDefinitions.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/__mocks__/fieldDefinitions.ts
@@ -7,6 +7,7 @@ import {
   FieldSelectMetadata,
   FieldTextMetadata,
 } from '@/object-record/record-field/types/FieldMetadata';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 import {
   mockedCompaniesMetadata,
   mockedCustomMetadata,
@@ -34,7 +35,7 @@ export const textfieldDefinition: FieldDefinition<FieldTextMetadata> = {
   fieldMetadataId,
   label: 'User Name',
   iconName: 'User',
-  type: 'TEXT',
+  type: FieldMetadataType.Text,
   metadata: { placeHolder: 'John Doe', fieldName: 'userName' },
 };
 
@@ -52,7 +53,7 @@ export const selectFieldDefinition: FieldDefinition<FieldSelectMetadata> = {
   fieldMetadataId,
   label: 'Account Owner',
   iconName: 'iconName',
-  type: 'SELECT',
+  type: FieldMetadataType.Select,
   metadata: {
     fieldName: 'accountOwner',
     options: [{ label: 'Elon Musk', color: 'blue', value: 'userId' }],
@@ -63,7 +64,7 @@ export const fullNameFieldDefinition: FieldDefinition<FieldFullNameMetadata> = {
   fieldMetadataId,
   label: 'Display Name',
   iconName: 'profile',
-  type: 'FULL_NAME',
+  type: FieldMetadataType.FullName,
   metadata: {
     fieldName: 'displayName',
     placeHolder: 'Mr Miagi',
@@ -74,7 +75,7 @@ export const linkFieldDefinition: FieldDefinition<FieldLinkMetadata> = {
   fieldMetadataId,
   label: 'LinkedIn URL',
   iconName: 'url',
-  type: 'LINK',
+  type: FieldMetadataType.Link,
   metadata: {
     fieldName: 'linkedInURL',
     placeHolder: 'https://linkedin.com/user',
@@ -93,7 +94,7 @@ export const ratingfieldDefinition: FieldDefinition<FieldRatingMetadata> = {
   fieldMetadataId,
   label: 'Rating',
   iconName: 'iconName',
-  type: 'RATING',
+  type: FieldMetadataType.Rating,
   metadata: {
     fieldName: 'rating',
   },
diff --git a/packages/twenty-front/src/modules/object-record/record-field/components/FieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/components/FieldDisplay.tsx
index 93efc40017cf..68999b4fc169 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/components/FieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/components/FieldDisplay.tsx
@@ -1,25 +1,33 @@
 import { useContext } from 'react';
 
 import { FieldContext } from '../contexts/FieldContext';
+import { AddressFieldDisplay } from '../meta-types/display/components/AddressFieldDisplay';
 import { ChipFieldDisplay } from '../meta-types/display/components/ChipFieldDisplay';
 import { CurrencyFieldDisplay } from '../meta-types/display/components/CurrencyFieldDisplay';
 import { DateFieldDisplay } from '../meta-types/display/components/DateFieldDisplay';
+import { DateTimeFieldDisplay } from '../meta-types/display/components/DateTimeFieldDisplay';
 import { EmailFieldDisplay } from '../meta-types/display/components/EmailFieldDisplay';
 import { FullNameFieldDisplay } from '../meta-types/display/components/FullNameFieldDisplay';
+import { JsonFieldDisplay } from '../meta-types/display/components/JsonFieldDisplay';
 import { LinkFieldDisplay } from '../meta-types/display/components/LinkFieldDisplay';
+import { MultiSelectFieldDisplay } from '../meta-types/display/components/MultiSelectFieldDisplay.tsx';
 import { NumberFieldDisplay } from '../meta-types/display/components/NumberFieldDisplay';
 import { PhoneFieldDisplay } from '../meta-types/display/components/PhoneFieldDisplay';
 import { RelationFieldDisplay } from '../meta-types/display/components/RelationFieldDisplay';
 import { SelectFieldDisplay } from '../meta-types/display/components/SelectFieldDisplay';
 import { TextFieldDisplay } from '../meta-types/display/components/TextFieldDisplay';
 import { UuidFieldDisplay } from '../meta-types/display/components/UuidFieldDisplay';
+import { isFieldAddress } from '../types/guards/isFieldAddress';
 import { isFieldCurrency } from '../types/guards/isFieldCurrency';
+import { isFieldDate } from '../types/guards/isFieldDate';
 import { isFieldDateTime } from '../types/guards/isFieldDateTime';
 import { isFieldEmail } from '../types/guards/isFieldEmail';
 import { isFieldFullName } from '../types/guards/isFieldFullName';
 import { isFieldLink } from '../types/guards/isFieldLink';
+import { isFieldMultiSelect } from '../types/guards/isFieldMultiSelect.ts';
 import { isFieldNumber } from '../types/guards/isFieldNumber';
 import { isFieldPhone } from '../types/guards/isFieldPhone';
+import { isFieldRawJson } from '../types/guards/isFieldRawJson';
 import { isFieldRelation } from '../types/guards/isFieldRelation';
 import { isFieldSelect } from '../types/guards/isFieldSelect';
 import { isFieldText } from '../types/guards/isFieldText';
@@ -28,13 +36,18 @@ import { isFieldUuid } from '../types/guards/isFieldUuid';
 export const FieldDisplay = () => {
   const { fieldDefinition, isLabelIdentifier } = useContext(FieldContext);
 
-  return isLabelIdentifier &&
+  const isChipDisplay =
+    isLabelIdentifier &&
     (isFieldText(fieldDefinition) ||
       isFieldFullName(fieldDefinition) ||
-      isFieldNumber(fieldDefinition)) ? (
+      isFieldNumber(fieldDefinition));
+
+  return isChipDisplay ? (
     <ChipFieldDisplay />
   ) : isFieldRelation(fieldDefinition) ? (
     <RelationFieldDisplay />
+  ) : isFieldPhone(fieldDefinition) ? (
+    <PhoneFieldDisplay />
   ) : isFieldText(fieldDefinition) ? (
     <TextFieldDisplay />
   ) : isFieldUuid(fieldDefinition) ? (
@@ -42,6 +55,8 @@ export const FieldDisplay = () => {
   ) : isFieldEmail(fieldDefinition) ? (
     <EmailFieldDisplay />
   ) : isFieldDateTime(fieldDefinition) ? (
+    <DateTimeFieldDisplay />
+  ) : isFieldDate(fieldDefinition) ? (
     <DateFieldDisplay />
   ) : isFieldNumber(fieldDefinition) ? (
     <NumberFieldDisplay />
@@ -51,9 +66,13 @@ export const FieldDisplay = () => {
     <CurrencyFieldDisplay />
   ) : isFieldFullName(fieldDefinition) ? (
     <FullNameFieldDisplay />
-  ) : isFieldPhone(fieldDefinition) ? (
-    <PhoneFieldDisplay />
   ) : isFieldSelect(fieldDefinition) ? (
     <SelectFieldDisplay />
+  ) : isFieldMultiSelect(fieldDefinition) ? (
+    <MultiSelectFieldDisplay />
+  ) : isFieldAddress(fieldDefinition) ? (
+    <AddressFieldDisplay />
+  ) : isFieldRawJson(fieldDefinition) ? (
+    <JsonFieldDisplay />
   ) : null;
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-field/components/FieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/components/FieldInput.tsx
index 40c59eacd49a..d2a28e6a776e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/components/FieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/components/FieldInput.tsx
@@ -1,16 +1,23 @@
 import { useContext } from 'react';
 
+import { AddressFieldInput } from '@/object-record/record-field/meta-types/input/components/AddressFieldInput';
+import { DateFieldInput } from '@/object-record/record-field/meta-types/input/components/DateFieldInput';
 import { FullNameFieldInput } from '@/object-record/record-field/meta-types/input/components/FullNameFieldInput';
+import { MultiSelectFieldInput } from '@/object-record/record-field/meta-types/input/components/MultiSelectFieldInput.tsx';
+import { RawJsonFieldInput } from '@/object-record/record-field/meta-types/input/components/RawJsonFieldInput';
 import { SelectFieldInput } from '@/object-record/record-field/meta-types/input/components/SelectFieldInput';
 import { RecordFieldInputScope } from '@/object-record/record-field/scopes/RecordFieldInputScope';
+import { isFieldDate } from '@/object-record/record-field/types/guards/isFieldDate';
 import { isFieldFullName } from '@/object-record/record-field/types/guards/isFieldFullName';
+import { isFieldMultiSelect } from '@/object-record/record-field/types/guards/isFieldMultiSelect.ts';
+import { isFieldRawJson } from '@/object-record/record-field/types/guards/isFieldRawJson';
 import { isFieldSelect } from '@/object-record/record-field/types/guards/isFieldSelect';
 import { getScopeIdFromComponentId } from '@/ui/utilities/recoil-scope/utils/getScopeIdFromComponentId';
 
 import { FieldContext } from '../contexts/FieldContext';
 import { BooleanFieldInput } from '../meta-types/input/components/BooleanFieldInput';
 import { CurrencyFieldInput } from '../meta-types/input/components/CurrencyFieldInput';
-import { DateFieldInput } from '../meta-types/input/components/DateFieldInput';
+import { DateTimeFieldInput } from '../meta-types/input/components/DateTimeFieldInput';
 import { EmailFieldInput } from '../meta-types/input/components/EmailFieldInput';
 import { LinkFieldInput } from '../meta-types/input/components/LinkFieldInput';
 import { NumberFieldInput } from '../meta-types/input/components/NumberFieldInput';
@@ -19,6 +26,7 @@ import { RatingFieldInput } from '../meta-types/input/components/RatingFieldInpu
 import { RelationFieldInput } from '../meta-types/input/components/RelationFieldInput';
 import { TextFieldInput } from '../meta-types/input/components/TextFieldInput';
 import { FieldInputEvent } from '../types/FieldInputEvent';
+import { isFieldAddress } from '../types/guards/isFieldAddress';
 import { isFieldBoolean } from '../types/guards/isFieldBoolean';
 import { isFieldCurrency } from '../types/guards/isFieldCurrency';
 import { isFieldDateTime } from '../types/guards/isFieldDateTime';
@@ -39,6 +47,7 @@ type FieldInputProps = {
   onEscape?: FieldInputEvent;
   onTab?: FieldInputEvent;
   onShiftTab?: FieldInputEvent;
+  isReadOnly?: boolean;
 };
 
 export const FieldInput = ({
@@ -50,6 +59,7 @@ export const FieldInput = ({
   onShiftTab,
   onTab,
   onClickOutside,
+  isReadOnly,
 }: FieldInputProps) => {
   const { fieldDefinition } = useContext(FieldContext);
 
@@ -92,6 +102,12 @@ export const FieldInput = ({
           onShiftTab={onShiftTab}
         />
       ) : isFieldDateTime(fieldDefinition) ? (
+        <DateTimeFieldInput
+          onEnter={onEnter}
+          onEscape={onEscape}
+          onClickOutside={onClickOutside}
+        />
+      ) : isFieldDate(fieldDefinition) ? (
         <DateFieldInput
           onEnter={onEnter}
           onEscape={onEscape}
@@ -122,11 +138,29 @@ export const FieldInput = ({
           onShiftTab={onShiftTab}
         />
       ) : isFieldBoolean(fieldDefinition) ? (
-        <BooleanFieldInput onSubmit={onSubmit} />
+        <BooleanFieldInput onSubmit={onSubmit} readonly={isReadOnly} />
       ) : isFieldRating(fieldDefinition) ? (
         <RatingFieldInput onSubmit={onSubmit} />
       ) : isFieldSelect(fieldDefinition) ? (
-        <SelectFieldInput onSubmit={onSubmit} />
+        <SelectFieldInput onSubmit={onSubmit} onCancel={onCancel} />
+      ) : isFieldMultiSelect(fieldDefinition) ? (
+        <MultiSelectFieldInput onCancel={onCancel} />
+      ) : isFieldAddress(fieldDefinition) ? (
+        <AddressFieldInput
+          onEnter={onEnter}
+          onEscape={onEscape}
+          onClickOutside={onClickOutside}
+          onTab={onTab}
+          onShiftTab={onShiftTab}
+        />
+      ) : isFieldRawJson(fieldDefinition) ? (
+        <RawJsonFieldInput
+          onEnter={onEnter}
+          onEscape={onEscape}
+          onClickOutside={onClickOutside}
+          onTab={onTab}
+          onShiftTab={onShiftTab}
+        />
       ) : (
         <></>
       )}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/hooks/__tests__/useGetButtonIcon.test.tsx b/packages/twenty-front/src/modules/object-record/record-field/hooks/__tests__/useGetButtonIcon.test.tsx
index 6e8266aee336..877c7897ee02 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/hooks/__tests__/useGetButtonIcon.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/hooks/__tests__/useGetButtonIcon.test.tsx
@@ -1,6 +1,7 @@
 import { ReactNode } from 'react';
 import { renderHook } from '@testing-library/react';
 import { RecoilRoot } from 'recoil';
+import { IconPencil } from 'twenty-ui';
 
 import {
   phoneFieldDefinition,
@@ -10,7 +11,6 @@ import { FieldContext } from '@/object-record/record-field/contexts/FieldContext
 import { useGetButtonIcon } from '@/object-record/record-field/hooks/useGetButtonIcon';
 import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { IconPencil } from '@/ui/display/icon';
 
 const entityId = 'entityId';
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/hooks/__tests__/usePersistField.test.tsx b/packages/twenty-front/src/modules/object-record/record-field/hooks/__tests__/usePersistField.test.tsx
index 84da3f62d381..ff14e362df67 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/hooks/__tests__/usePersistField.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/hooks/__tests__/usePersistField.test.tsx
@@ -20,14 +20,31 @@ import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinit
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
 
-jest.mock('@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery', () => ({
-  useMapFieldMetadataToGraphQLQuery: () => () => '\n',
-}));
-
 const query = gql`
-  mutation UpdateOnePerson($idToUpdate: ID!, $input: PersonUpdateInput!) {
+  mutation UpdateOnePerson($idToUpdate: UUID!, $input: PersonUpdateInput!) {
     updatePerson(id: $idToUpdate, data: $input) {
+      __typename
+      xLink {
+        label
+        url
+      }
       id
+      createdAt
+      city
+      email
+      jobTitle
+      name {
+        firstName
+        lastName
+      }
+      phone
+      linkedinLink {
+        label
+        url
+      }
+      updatedAt
+      avatarUrl
+      companyId
     }
   }
 `;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/hooks/__tests__/useToggleEditOnlyInput.test.tsx b/packages/twenty-front/src/modules/object-record/record-field/hooks/__tests__/useToggleEditOnlyInput.test.tsx
index f07739124d55..0d17aaa11eaa 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/hooks/__tests__/useToggleEditOnlyInput.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/hooks/__tests__/useToggleEditOnlyInput.test.tsx
@@ -14,10 +14,6 @@ import {
 } from '@/object-record/record-field/contexts/FieldContext';
 import { useToggleEditOnlyInput } from '@/object-record/record-field/hooks/useToggleEditOnlyInput';
 
-jest.mock('@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery', () => ({
-  useMapFieldMetadataToGraphQLQuery: () => () => '\n',
-}));
-
 const entityId = 'entityId';
 
 const mocks: MockedResponse[] = [
@@ -25,11 +21,32 @@ const mocks: MockedResponse[] = [
     request: {
       query: gql`
         mutation UpdateOneCompany(
-          $idToUpdate: ID!
+          $idToUpdate: UUID!
           $input: CompanyUpdateInput!
         ) {
           updateCompany(id: $idToUpdate, data: $input) {
+            __typename
+            xLink {
+              label
+              url
+            }
+            linkedinLink {
+              label
+              url
+            }
+            domainName
+            annualRecurringRevenue {
+              amountMicros
+              currencyCode
+            }
+            createdAt
+            address
+            updatedAt
+            name
+            accountOwnerId
+            employees
             id
+            idealCustomerProfile
           }
         }
       `,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/hooks/internal/useRecordFieldInputStates.ts b/packages/twenty-front/src/modules/object-record/record-field/hooks/internal/useRecordFieldInputStates.ts
index 8efcb745d7ab..924e838b71af 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/hooks/internal/useRecordFieldInputStates.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/hooks/internal/useRecordFieldInputStates.ts
@@ -1,9 +1,9 @@
 import { RecordFieldInputScopeInternalContext } from '@/object-record/record-field/scopes/scope-internal-context/RecordFieldInputScopeInternalContext';
-import { recordFieldInputDraftValueSelectorScopeMap } from '@/object-record/record-field/states/selectors/recordFieldInputDraftValueSelectorScopeMap';
+import { recordFieldInputDraftValueComponentSelector } from '@/object-record/record-field/states/selectors/recordFieldInputDraftValueComponentSelector';
 import { FieldInputDraftValue } from '@/object-record/record-field/types/FieldInputDraftValue';
 import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
 import { getScopeIdOrUndefinedFromComponentId } from '@/ui/utilities/recoil-scope/utils/getScopeIdOrUndefinedFromComponentId';
-import { getSelector } from '@/ui/utilities/recoil-scope/utils/getSelector';
+import { extractComponentSelector } from '@/ui/utilities/state/component-state/utils/extractComponentSelector';
 
 export const useRecordFieldInputStates = <FieldValue>(
   recordFieldInputId?: string,
@@ -15,8 +15,8 @@ export const useRecordFieldInputStates = <FieldValue>(
 
   return {
     scopeId,
-    getDraftValueSelector: getSelector<
+    getDraftValueSelector: extractComponentSelector<
       FieldInputDraftValue<FieldValue> | undefined
-    >(recordFieldInputDraftValueSelectorScopeMap, scopeId),
+    >(recordFieldInputDraftValueComponentSelector, scopeId),
   };
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-field/hooks/useClearField.ts b/packages/twenty-front/src/modules/object-record/record-field/hooks/useClearField.ts
new file mode 100644
index 000000000000..548e212f98c7
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/hooks/useClearField.ts
@@ -0,0 +1,62 @@
+import { useContext } from 'react';
+import { useRecoilCallback } from 'recoil';
+
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { generateEmptyFieldValue } from '@/object-record/utils/generateEmptyFieldValue';
+
+import { FieldContext } from '../contexts/FieldContext';
+
+export const useClearField = () => {
+  const {
+    entityId,
+    fieldDefinition,
+    useUpdateRecord = () => [],
+  } = useContext(FieldContext);
+
+  const [updateRecord] = useUpdateRecord();
+
+  const clearField = useRecoilCallback(
+    ({ snapshot, set }) =>
+      () => {
+        const objectMetadataItems = snapshot
+          .getLoadable(objectMetadataItemsState)
+          .getValue();
+
+        const foundObjectMetadataItem = objectMetadataItems.find(
+          (item) =>
+            item.nameSingular ===
+            fieldDefinition.metadata.objectMetadataNameSingular,
+        );
+
+        const foundFieldMetadataItem = foundObjectMetadataItem?.fields.find(
+          (field) => field.name === fieldDefinition.metadata.fieldName,
+        );
+
+        if (!foundObjectMetadataItem || !foundFieldMetadataItem) {
+          throw new Error('Field metadata item cannot be found');
+        }
+
+        const fieldName = fieldDefinition.metadata.fieldName;
+
+        const emptyFieldValue = generateEmptyFieldValue(foundFieldMetadataItem);
+
+        set(
+          recordStoreFamilySelector({ recordId: entityId, fieldName }),
+          emptyFieldValue,
+        );
+
+        updateRecord?.({
+          variables: {
+            where: { id: entityId },
+            updateOneRecordInput: {
+              [fieldName]: emptyFieldValue,
+            },
+          },
+        });
+      },
+    [entityId, fieldDefinition, updateRecord],
+  );
+
+  return clearField;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/hooks/useGetButtonIcon.ts b/packages/twenty-front/src/modules/object-record/record-field/hooks/useGetButtonIcon.ts
index 18ca7ecb3969..4dde37b2e163 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/hooks/useGetButtonIcon.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/hooks/useGetButtonIcon.ts
@@ -1,8 +1,9 @@
 import { useContext } from 'react';
+import { IconPencil } from 'twenty-ui';
 
 import { isFieldRelation } from '@/object-record/record-field/types/guards/isFieldRelation';
-import { IconPencil } from '@/ui/display/icon';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 import { FieldContext } from '../contexts/FieldContext';
 import { isFieldEmail } from '../types/guards/isFieldEmail';
@@ -12,7 +13,7 @@ import { isFieldPhone } from '../types/guards/isFieldPhone';
 export const useGetButtonIcon = (): IconComponent | undefined => {
   const { fieldDefinition } = useContext(FieldContext);
 
-  if (!fieldDefinition) return undefined;
+  if (isUndefinedOrNull(fieldDefinition)) return undefined;
 
   if (
     isFieldLink(fieldDefinition) ||
diff --git a/packages/twenty-front/src/modules/object-record/record-field/hooks/useIsFieldClearable.ts b/packages/twenty-front/src/modules/object-record/record-field/hooks/useIsFieldClearable.ts
new file mode 100644
index 000000000000..0afd8aa91acb
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/hooks/useIsFieldClearable.ts
@@ -0,0 +1,21 @@
+import { useContext } from 'react';
+
+import { isFieldDateTime } from '@/object-record/record-field/types/guards/isFieldDateTime';
+
+import { FieldContext } from '../contexts/FieldContext';
+
+// TODO: have a better clearable settings in metadata ?
+// We might want to define what's clearable in the metadata
+// Instead of passing it in the context
+// See: https://github.com/twentyhq/twenty/issues/4403
+export const useIsFieldClearable = (): boolean => {
+  const { clearable, isLabelIdentifier, fieldDefinition } =
+    useContext(FieldContext);
+
+  const isDateField = isFieldDateTime(fieldDefinition);
+
+  const fieldCanBeCleared =
+    !isLabelIdentifier && !isDateField && clearable !== false;
+
+  return fieldCanBeCleared;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/hooks/useIsFieldInputOnly.ts b/packages/twenty-front/src/modules/object-record/record-field/hooks/useIsFieldInputOnly.ts
index d1566823ce98..750ea8b0b463 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/hooks/useIsFieldInputOnly.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/hooks/useIsFieldInputOnly.ts
@@ -7,9 +7,5 @@ import { isFieldRating } from '../types/guards/isFieldRating';
 export const useIsFieldInputOnly = () => {
   const { fieldDefinition } = useContext(FieldContext);
 
-  if (isFieldBoolean(fieldDefinition) || isFieldRating(fieldDefinition)) {
-    return true;
-  }
-
-  return false;
+  return isFieldBoolean(fieldDefinition) || isFieldRating(fieldDefinition);
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-field/hooks/usePersistField.ts b/packages/twenty-front/src/modules/object-record/record-field/hooks/usePersistField.ts
index aea51e8a629d..2e18b77f067d 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/hooks/usePersistField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/hooks/usePersistField.ts
@@ -1,8 +1,16 @@
 import { useContext } from 'react';
 import { useRecoilCallback } from 'recoil';
 
+import { isFieldAddress } from '@/object-record/record-field/types/guards/isFieldAddress';
+import { isFieldAddressValue } from '@/object-record/record-field/types/guards/isFieldAddressValue';
+import { isFieldDate } from '@/object-record/record-field/types/guards/isFieldDate';
+import { isFieldDateValue } from '@/object-record/record-field/types/guards/isFieldDateValue';
 import { isFieldFullName } from '@/object-record/record-field/types/guards/isFieldFullName';
 import { isFieldFullNameValue } from '@/object-record/record-field/types/guards/isFieldFullNameValue';
+import { isFieldMultiSelect } from '@/object-record/record-field/types/guards/isFieldMultiSelect.ts';
+import { isFieldMultiSelectValue } from '@/object-record/record-field/types/guards/isFieldMultiSelectValue.ts';
+import { isFieldRawJson } from '@/object-record/record-field/types/guards/isFieldRawJson';
+import { isFieldRawJsonValue } from '@/object-record/record-field/types/guards/isFieldRawJsonValue';
 import { isFieldSelect } from '@/object-record/record-field/types/guards/isFieldSelect';
 import { isFieldSelectValue } from '@/object-record/record-field/types/guards/isFieldSelectValue';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
@@ -55,6 +63,9 @@ export const usePersistField = () => {
           isFieldDateTime(fieldDefinition) &&
           isFieldDateTimeValue(valueToPersist);
 
+        const fieldIsDate =
+          isFieldDate(fieldDefinition) && isFieldDateValue(valueToPersist);
+
         const fieldIsLink =
           isFieldLink(fieldDefinition) && isFieldLinkValue(valueToPersist);
 
@@ -82,7 +93,19 @@ export const usePersistField = () => {
         const fieldIsSelect =
           isFieldSelect(fieldDefinition) && isFieldSelectValue(valueToPersist);
 
-        if (
+        const fieldIsMultiSelect =
+          isFieldMultiSelect(fieldDefinition) &&
+          isFieldMultiSelectValue(valueToPersist);
+
+        const fieldIsAddress =
+          isFieldAddress(fieldDefinition) &&
+          isFieldAddressValue(valueToPersist);
+
+        const fieldIsRawJson =
+          isFieldRawJson(fieldDefinition) &&
+          isFieldRawJsonValue(valueToPersist);
+
+        const isValuePersistable =
           fieldIsRelation ||
           fieldIsText ||
           fieldIsBoolean ||
@@ -90,18 +113,36 @@ export const usePersistField = () => {
           fieldIsProbability ||
           fieldIsNumber ||
           fieldIsDateTime ||
+          fieldIsDate ||
           fieldIsPhone ||
           fieldIsLink ||
           fieldIsCurrency ||
           fieldIsFullName ||
-          fieldIsSelect
-        ) {
+          fieldIsSelect ||
+          fieldIsMultiSelect ||
+          fieldIsAddress ||
+          fieldIsRawJson;
+
+        if (isValuePersistable === true) {
           const fieldName = fieldDefinition.metadata.fieldName;
           set(
             recordStoreFamilySelector({ recordId: entityId, fieldName }),
             valueToPersist,
           );
 
+          if (fieldIsRelation) {
+            updateRecord?.({
+              variables: {
+                where: { id: entityId },
+                updateOneRecordInput: {
+                  [fieldName]: valueToPersist,
+                  [`${fieldName}Id`]: valueToPersist?.id ?? null,
+                },
+              },
+            });
+            return;
+          }
+
           updateRecord?.({
             variables: {
               where: { id: entityId },
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/AddressFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/AddressFieldDisplay.tsx
new file mode 100644
index 000000000000..59805290042e
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/AddressFieldDisplay.tsx
@@ -0,0 +1,17 @@
+import { useAddressField } from '@/object-record/record-field/meta-types/hooks/useAddressField';
+import { TextDisplay } from '@/ui/field/display/components/TextDisplay';
+
+export const AddressFieldDisplay = () => {
+  const { fieldValue } = useAddressField();
+
+  const content = [
+    fieldValue?.addressStreet1,
+    fieldValue?.addressStreet2,
+    fieldValue?.addressCity,
+    fieldValue?.addressCountry,
+  ]
+    .filter(Boolean)
+    .join(', ');
+
+  return <TextDisplay text={content} />;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/CurrencyFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/CurrencyFieldDisplay.tsx
index 75e4030e51bf..5a17caefc71b 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/CurrencyFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/CurrencyFieldDisplay.tsx
@@ -5,11 +5,5 @@ import { useCurrencyField } from '../../hooks/useCurrencyField';
 export const CurrencyFieldDisplay = () => {
   const { fieldValue } = useCurrencyField();
 
-  return (
-    <CurrencyDisplay
-      amount={
-        fieldValue?.amountMicros ? fieldValue.amountMicros / 1000000 : null
-      }
-    />
-  );
+  return <CurrencyDisplay currencyValue={fieldValue} />;
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/DateFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/DateFieldDisplay.tsx
index 975ac30a0f4e..8b6cd134f515 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/DateFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/DateFieldDisplay.tsx
@@ -1,9 +1,9 @@
 import { DateDisplay } from '@/ui/field/display/components/DateDisplay';
 
-import { useDateTimeField } from '../../hooks/useDateTimeField';
+import { useDateField } from '../../hooks/useDateField';
 
 export const DateFieldDisplay = () => {
-  const { fieldValue } = useDateTimeField();
+  const { fieldValue } = useDateField();
 
   return <DateDisplay value={fieldValue} />;
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/DateTimeFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/DateTimeFieldDisplay.tsx
new file mode 100644
index 000000000000..cffbd0473c5b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/DateTimeFieldDisplay.tsx
@@ -0,0 +1,9 @@
+import { DateDisplay } from '@/ui/field/display/components/DateDisplay';
+
+import { useDateTimeField } from '../../hooks/useDateTimeField';
+
+export const DateTimeFieldDisplay = () => {
+  const { fieldValue } = useDateTimeField();
+
+  return <DateDisplay value={fieldValue} />;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/JsonFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/JsonFieldDisplay.tsx
new file mode 100644
index 000000000000..5a0f553cde44
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/JsonFieldDisplay.tsx
@@ -0,0 +1,13 @@
+import { useJsonField } from '@/object-record/record-field/meta-types/hooks/useJsonField';
+import { JsonDisplay } from '@/ui/field/display/components/JsonDisplay';
+
+export const JsonFieldDisplay = () => {
+  const { fieldValue, maxWidth } = useJsonField();
+
+  return (
+    <JsonDisplay
+      text={fieldValue ? JSON.stringify(JSON.parse(fieldValue), null, 2) : ''}
+      maxWidth={maxWidth}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/MultiSelectFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/MultiSelectFieldDisplay.tsx
new file mode 100644
index 000000000000..7f885da43376
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/MultiSelectFieldDisplay.tsx
@@ -0,0 +1,32 @@
+import styled from '@emotion/styled';
+
+import { useMultiSelectField } from '@/object-record/record-field/meta-types/hooks/useMultiSelectField.ts';
+import { Tag } from '@/ui/display/tag/components/Tag';
+
+const StyledTagContainer = styled.div`
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+`;
+export const MultiSelectFieldDisplay = () => {
+  const { fieldValues, fieldDefinition } = useMultiSelectField();
+
+  const selectedOptions = fieldValues
+    ? fieldDefinition.metadata.options.filter((option) =>
+        fieldValues.includes(option.value),
+      )
+    : [];
+
+  return selectedOptions ? (
+    <StyledTagContainer>
+      {selectedOptions.map((selectedOption, index) => (
+        <Tag
+          key={index}
+          color={selectedOption.color}
+          text={selectedOption.label}
+        />
+      ))}
+    </StyledTagContainer>
+  ) : (
+    <></>
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/ChipFieldDisplay.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/ChipFieldDisplay.stories.tsx
index 7b963b45c9a7..f1eaf2aa5203 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/ChipFieldDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/ChipFieldDisplay.stories.tsx
@@ -5,6 +5,7 @@ import { useSetRecoilState } from 'recoil';
 import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
 import { ChipFieldDisplay } from '@/object-record/record-field/meta-types/display/components/ChipFieldDisplay';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { FieldMetadataType } from '~/generated/graphql';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
 
@@ -37,7 +38,7 @@ const meta: Meta = {
           fieldDefinition: {
             fieldMetadataId: 'full name',
             label: 'Henry Cavill',
-            type: 'FULL_NAME',
+            type: FieldMetadataType.FullName,
             iconName: 'IconCalendarEvent',
             metadata: {
               fieldName: 'full name',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx
deleted file mode 100644
index 3e2ae7bfeff3..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import { useEffect } from 'react';
-import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-
-import { FieldContext } from '../../../../contexts/FieldContext';
-import { useDateTimeField } from '../../../hooks/useDateTimeField';
-import { DateFieldDisplay } from '../DateFieldDisplay';
-
-const formattedDate = new Date('2023-04-01');
-
-const DateFieldValueSetterEffect = ({ value }: { value: string }) => {
-  const { setFieldValue } = useDateTimeField();
-
-  useEffect(() => {
-    setFieldValue(value);
-  }, [setFieldValue, value]);
-
-  return null;
-};
-
-const meta: Meta = {
-  title: 'UI/Data/Field/Display/DateFieldDisplay',
-  decorators: [
-    (Story, { args }) => (
-      <FieldContext.Provider
-        value={{
-          entityId: '',
-          isLabelIdentifier: false,
-          fieldDefinition: {
-            fieldMetadataId: 'date',
-            label: 'Date',
-            type: 'DATE_TIME',
-            iconName: 'IconCalendarEvent',
-            metadata: {
-              fieldName: 'Date',
-            },
-          },
-          hotkeyScope: 'hotkey-scope',
-        }}
-      >
-        <DateFieldValueSetterEffect value={args.value} />
-        <Story />
-      </FieldContext.Provider>
-    ),
-    ComponentDecorator,
-  ],
-  component: DateFieldDisplay,
-  argTypes: { value: { control: 'date' } },
-  args: {
-    value: formattedDate,
-  },
-};
-
-export default meta;
-
-type Story = StoryObj<typeof DateFieldDisplay>;
-
-export const Default: Story = {};
-
-export const Elipsis: Story = {
-  parameters: {
-    container: { width: 50 },
-  },
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/DateTimeFieldDisplay.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/DateTimeFieldDisplay.stories.tsx
new file mode 100644
index 000000000000..b34ecbaf49f0
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/DateTimeFieldDisplay.stories.tsx
@@ -0,0 +1,67 @@
+import { useEffect } from 'react';
+import { Meta, StoryObj } from '@storybook/react';
+
+import { FieldMetadataType } from '~/generated/graphql';
+import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+
+import { FieldContext } from '../../../../contexts/FieldContext';
+import { useDateTimeField } from '../../../hooks/useDateTimeField';
+import { DateTimeFieldDisplay } from '../DateTimeFieldDisplay';
+
+const formattedDate = new Date('2023-04-01');
+
+const DateFieldValueSetterEffect = ({ value }: { value: string }) => {
+  const { setFieldValue } = useDateTimeField();
+
+  useEffect(() => {
+    setFieldValue(value);
+  }, [setFieldValue, value]);
+
+  return null;
+};
+
+const meta: Meta = {
+  title: 'UI/Data/Field/Display/DateFieldDisplay',
+  decorators: [
+    (Story, { args }) => (
+      <FieldContext.Provider
+        value={{
+          entityId: '',
+          isLabelIdentifier: false,
+          fieldDefinition: {
+            fieldMetadataId: 'date',
+            label: 'Date',
+            type: FieldMetadataType.DateTime,
+            iconName: 'IconCalendarEvent',
+            metadata: {
+              fieldName: 'Date',
+              objectMetadataNameSingular: 'person',
+            },
+          },
+          hotkeyScope: 'hotkey-scope',
+        }}
+      >
+        <DateFieldValueSetterEffect value={args.value} />
+        <Story />
+      </FieldContext.Provider>
+    ),
+    ComponentDecorator,
+  ],
+  component: DateTimeFieldDisplay,
+  argTypes: { value: { control: 'date' } },
+  args: {
+    value: formattedDate,
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof DateTimeFieldDisplay>;
+
+export const Default: Story = {};
+
+export const Elipsis: Story = {
+  parameters: {
+    container: { width: 50 },
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx
index 902eefa4b32f..d296465e68dc 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx
@@ -3,6 +3,7 @@ import { Meta, StoryObj } from '@storybook/react';
 
 import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
 import { useEmailField } from '@/object-record/record-field/meta-types/hooks/useEmailField';
+import { FieldMetadataType } from '~/generated/graphql';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
 
@@ -30,11 +31,12 @@ const meta: Meta = {
           fieldDefinition: {
             fieldMetadataId: 'email',
             label: 'Email',
-            type: 'EMAIL',
+            type: FieldMetadataType.Email,
             iconName: 'IconLink',
             metadata: {
               fieldName: 'Email',
               placeHolder: 'Email',
+              objectMetadataNameSingular: 'person',
             },
           },
           hotkeyScope: 'hotkey-scope',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx
index a7f0304a97ce..db7fe3c575f8 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx
@@ -1,6 +1,7 @@
 import { useEffect } from 'react';
 import { Meta, StoryObj } from '@storybook/react';
 
+import { FieldMetadataType } from '~/generated/graphql';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 
 import { FieldContext } from '../../../../contexts/FieldContext';
@@ -28,12 +29,13 @@ const meta: Meta = {
           fieldDefinition: {
             fieldMetadataId: 'number',
             label: 'Number',
-            type: 'NUMBER',
+            type: FieldMetadataType.Number,
             iconName: 'Icon123',
             metadata: {
               fieldName: 'Number',
               placeHolder: 'Number',
               isPositive: true,
+              objectMetadataNameSingular: 'person',
             },
           },
           hotkeyScope: 'hotkey-scope',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx
index 1425b23afd02..9e9c85f8d340 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx
@@ -3,6 +3,7 @@ import { Meta, StoryObj } from '@storybook/react';
 
 import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
 import { usePhoneField } from '@/object-record/record-field/meta-types/hooks/usePhoneField';
+import { FieldMetadataType } from '~/generated/graphql';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
 
@@ -30,7 +31,7 @@ const meta: Meta = {
           fieldDefinition: {
             fieldMetadataId: 'phone',
             label: 'Phone',
-            type: 'TEXT',
+            type: FieldMetadataType.Text,
             iconName: 'IconPhone',
             metadata: {
               fieldName: 'phone',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx
index 76328ea7316e..328a6533c297 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx
@@ -1,6 +1,7 @@
 import { useEffect } from 'react';
 import { Meta, StoryObj } from '@storybook/react';
 
+import { FieldMetadataType } from '~/generated/graphql';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 
 import { FieldContext } from '../../../../contexts/FieldContext';
@@ -28,11 +29,12 @@ const meta: Meta = {
           fieldDefinition: {
             fieldMetadataId: 'text',
             label: 'Text',
-            type: 'TEXT',
+            type: FieldMetadataType.Text,
             iconName: 'IconLink',
             metadata: {
               fieldName: 'Text',
               placeHolder: 'Text',
+              objectMetadataNameSingular: 'person',
             },
           },
           hotkeyScope: 'hotkey-scope',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useAddressField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useAddressField.ts
new file mode 100644
index 000000000000..152d6c2ef4d1
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useAddressField.ts
@@ -0,0 +1,57 @@
+import { useContext } from 'react';
+import { useRecoilState, useRecoilValue } from 'recoil';
+
+import { useRecordFieldInput } from '@/object-record/record-field/hooks/useRecordFieldInput';
+import { isFieldAddressValue } from '@/object-record/record-field/types/guards/isFieldAddressValue';
+import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+import { FieldContext } from '../../contexts/FieldContext';
+import { usePersistField } from '../../hooks/usePersistField';
+import { FieldAddressValue } from '../../types/FieldMetadata';
+import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
+import { isFieldAddress } from '../../types/guards/isFieldAddress';
+
+export const useAddressField = () => {
+  const { entityId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
+
+  assertFieldMetadata(
+    FieldMetadataType.Address,
+    isFieldAddress,
+    fieldDefinition,
+  );
+
+  const fieldName = fieldDefinition.metadata.fieldName;
+
+  const [fieldValue, setFieldValue] = useRecoilState<FieldAddressValue>(
+    recordStoreFamilySelector({
+      recordId: entityId,
+      fieldName: fieldName,
+    }),
+  );
+
+  const persistField = usePersistField();
+
+  const persistAddressField = (newValue: FieldAddressValue) => {
+    if (!isFieldAddressValue(newValue)) {
+      return;
+    }
+
+    persistField(newValue);
+  };
+
+  const { setDraftValue, getDraftValueSelector } =
+    useRecordFieldInput<FieldAddressValue>(`${entityId}-${fieldName}`);
+
+  const draftValue = useRecoilValue(getDraftValueSelector());
+
+  return {
+    fieldDefinition,
+    fieldValue,
+    setFieldValue,
+    draftValue,
+    setDraftValue,
+    hotkeyScope,
+    persistAddressField,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useBooleanField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useBooleanField.ts
index 984ff9f929b8..97284c649861 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useBooleanField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useBooleanField.ts
@@ -2,6 +2,7 @@ import { useContext } from 'react';
 import { useRecoilState } from 'recoil';
 
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { FieldContext } from '../../contexts/FieldContext';
 import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
@@ -10,7 +11,11 @@ import { isFieldBoolean } from '../../types/guards/isFieldBoolean';
 export const useBooleanField = () => {
   const { entityId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata('BOOLEAN', isFieldBoolean, fieldDefinition);
+  assertFieldMetadata(
+    FieldMetadataType.Boolean,
+    isFieldBoolean,
+    fieldDefinition,
+  );
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useCurrencyField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useCurrencyField.ts
index 998904de6144..c92ba97cdcb4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useCurrencyField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useCurrencyField.ts
@@ -3,6 +3,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
 
 import { useRecordFieldInput } from '@/object-record/record-field/hooks/useRecordFieldInput';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { canBeCastAsIntegerOrNull } from '~/utils/cast-as-integer-or-null';
 import { convertCurrencyToCurrencyMicros } from '~/utils/convert-currency-amount';
 
@@ -16,7 +17,11 @@ import { isFieldCurrencyValue } from '../../types/guards/isFieldCurrencyValue';
 export const useCurrencyField = () => {
   const { entityId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata('CURRENCY', isFieldCurrency, fieldDefinition);
+  assertFieldMetadata(
+    FieldMetadataType.Currency,
+    isFieldCurrency,
+    fieldDefinition,
+  );
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
@@ -59,6 +64,8 @@ export const useCurrencyField = () => {
 
   const draftValue = useRecoilValue(getDraftValueSelector());
 
+  const defaultValue = fieldDefinition.defaultValue;
+
   return {
     fieldDefinition,
     fieldValue,
@@ -67,5 +74,6 @@ export const useCurrencyField = () => {
     setFieldValue,
     hotkeyScope,
     persistCurrencyField,
+    defaultValue,
   };
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useDateField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useDateField.ts
new file mode 100644
index 000000000000..5505df67e091
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useDateField.ts
@@ -0,0 +1,40 @@
+import { useContext } from 'react';
+import { useRecoilState } from 'recoil';
+
+import { useRecordFieldInput } from '@/object-record/record-field/hooks/useRecordFieldInput';
+import { FieldDateValue } from '@/object-record/record-field/types/FieldMetadata';
+import { isFieldDate } from '@/object-record/record-field/types/guards/isFieldDate';
+import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+import { FieldContext } from '../../contexts/FieldContext';
+import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
+
+export const useDateField = () => {
+  const { entityId, fieldDefinition, hotkeyScope, clearable } =
+    useContext(FieldContext);
+
+  assertFieldMetadata(FieldMetadataType.Date, isFieldDate, fieldDefinition);
+
+  const fieldName = fieldDefinition.metadata.fieldName;
+
+  const [fieldValue, setFieldValue] = useRecoilState<string>(
+    recordStoreFamilySelector({
+      recordId: entityId,
+      fieldName: fieldName,
+    }),
+  );
+
+  const { setDraftValue } = useRecordFieldInput<FieldDateValue>(
+    `${entityId}-${fieldName}`,
+  );
+
+  return {
+    fieldDefinition,
+    fieldValue,
+    setDraftValue,
+    setFieldValue,
+    hotkeyScope,
+    clearable,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useDateTimeField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useDateTimeField.ts
index ebc85c116d9b..3043784fc325 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useDateTimeField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useDateTimeField.ts
@@ -4,6 +4,7 @@ import { useRecoilState } from 'recoil';
 import { useRecordFieldInput } from '@/object-record/record-field/hooks/useRecordFieldInput';
 import { FieldDateTimeValue } from '@/object-record/record-field/types/FieldMetadata';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { FieldContext } from '../../contexts/FieldContext';
 import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
@@ -13,7 +14,11 @@ export const useDateTimeField = () => {
   const { entityId, fieldDefinition, hotkeyScope, clearable } =
     useContext(FieldContext);
 
-  assertFieldMetadata('DATE_TIME', isFieldDateTime, fieldDefinition);
+  assertFieldMetadata(
+    FieldMetadataType.DateTime,
+    isFieldDateTime,
+    fieldDefinition,
+  );
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useEmailField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useEmailField.ts
index 4b0b6dd2c615..ba9ad1f8f66c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useEmailField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useEmailField.ts
@@ -4,6 +4,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
 import { useRecordFieldInput } from '@/object-record/record-field/hooks/useRecordFieldInput';
 import { FieldEmailValue } from '@/object-record/record-field/types/FieldMetadata';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { FieldContext } from '../../contexts/FieldContext';
 import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
@@ -12,7 +13,7 @@ import { isFieldEmail } from '../../types/guards/isFieldEmail';
 export const useEmailField = () => {
   const { entityId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata('EMAIL', isFieldEmail, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.Email, isFieldEmail, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useFullNameField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useFullNameField.ts
index 77a0c0b394fc..553fdde86cca 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useFullNameField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useFullNameField.ts
@@ -3,6 +3,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
 
 import { useRecordFieldInput } from '@/object-record/record-field/hooks/useRecordFieldInput';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { FieldContext } from '../../contexts/FieldContext';
 import { usePersistField } from '../../hooks/usePersistField';
@@ -14,7 +15,11 @@ import { isFieldFullNameValue } from '../../types/guards/isFieldFullNameValue';
 export const useFullNameField = () => {
   const { entityId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata('FULL_NAME', isFieldFullName, fieldDefinition);
+  assertFieldMetadata(
+    FieldMetadataType.FullName,
+    isFieldFullName,
+    fieldDefinition,
+  );
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useJsonField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useJsonField.ts
new file mode 100644
index 000000000000..0219eb17398b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useJsonField.ts
@@ -0,0 +1,48 @@
+import { useContext } from 'react';
+import { useRecoilState, useRecoilValue } from 'recoil';
+
+import { useRecordFieldInput } from '@/object-record/record-field/hooks/useRecordFieldInput';
+import { FieldJsonValue } from '@/object-record/record-field/types/FieldMetadata';
+import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+import { FieldContext } from '../../contexts/FieldContext';
+import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
+import { isFieldRawJson } from '../../types/guards/isFieldRawJson';
+import { isFieldTextValue } from '../../types/guards/isFieldTextValue';
+
+export const useJsonField = () => {
+  const { entityId, fieldDefinition, hotkeyScope, maxWidth } =
+    useContext(FieldContext);
+
+  assertFieldMetadata(
+    FieldMetadataType.RawJson,
+    isFieldRawJson,
+    fieldDefinition,
+  );
+
+  const fieldName = fieldDefinition.metadata.fieldName;
+
+  const [fieldValue, setFieldValue] = useRecoilState<FieldJsonValue>(
+    recordStoreFamilySelector({
+      recordId: entityId,
+      fieldName: fieldName,
+    }),
+  );
+  const fieldTextValue = isFieldTextValue(fieldValue) ? fieldValue : '';
+
+  const { setDraftValue, getDraftValueSelector } =
+    useRecordFieldInput<FieldJsonValue>(`${entityId}-${fieldName}`);
+
+  const draftValue = useRecoilValue(getDraftValueSelector());
+
+  return {
+    draftValue,
+    setDraftValue,
+    maxWidth,
+    fieldDefinition,
+    fieldValue: fieldTextValue,
+    setFieldValue,
+    hotkeyScope,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useLinkField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useLinkField.ts
index 0af2a0d105f5..7a422f72bd14 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useLinkField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useLinkField.ts
@@ -3,6 +3,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
 
 import { useRecordFieldInput } from '@/object-record/record-field/hooks/useRecordFieldInput';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { FieldContext } from '../../contexts/FieldContext';
 import { usePersistField } from '../../hooks/usePersistField';
@@ -14,7 +15,7 @@ import { isFieldLinkValue } from '../../types/guards/isFieldLinkValue';
 export const useLinkField = () => {
   const { entityId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata('LINK', isFieldLink, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.Link, isFieldLink, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useMultiSelectField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useMultiSelectField.ts
new file mode 100644
index 000000000000..5a4a2eacd4f4
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useMultiSelectField.ts
@@ -0,0 +1,50 @@
+import { useContext } from 'react';
+import { useRecoilState, useRecoilValue } from 'recoil';
+
+import { FieldContext } from '@/object-record/record-field/contexts/FieldContext.ts';
+import { usePersistField } from '@/object-record/record-field/hooks/usePersistField.ts';
+import { useRecordFieldInput } from '@/object-record/record-field/hooks/useRecordFieldInput.ts';
+import { FieldMultiSelectValue } from '@/object-record/record-field/types/FieldMetadata.ts';
+import { assertFieldMetadata } from '@/object-record/record-field/types/guards/assertFieldMetadata.ts';
+import { isFieldMultiSelect } from '@/object-record/record-field/types/guards/isFieldMultiSelect.ts';
+import { isFieldMultiSelectValue } from '@/object-record/record-field/types/guards/isFieldMultiSelectValue.ts';
+import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector.ts';
+import { FieldMetadataType } from '~/generated/graphql.tsx';
+
+export const useMultiSelectField = () => {
+  const { entityId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
+
+  assertFieldMetadata(
+    FieldMetadataType.MultiSelect,
+    isFieldMultiSelect,
+    fieldDefinition,
+  );
+
+  const { fieldName } = fieldDefinition.metadata;
+
+  const [fieldValues, setFieldValue] = useRecoilState<FieldMultiSelectValue>(
+    recordStoreFamilySelector({
+      recordId: entityId,
+      fieldName: fieldName,
+    }),
+  );
+
+  const fieldMultiSelectValues = isFieldMultiSelectValue(fieldValues)
+    ? fieldValues
+    : null;
+  const persistField = usePersistField();
+
+  const { setDraftValue, getDraftValueSelector } =
+    useRecordFieldInput<FieldMultiSelectValue>(`${entityId}-${fieldName}`);
+  const draftValue = useRecoilValue(getDraftValueSelector());
+
+  return {
+    fieldDefinition,
+    persistField,
+    fieldValues: fieldMultiSelectValues,
+    draftValue,
+    setDraftValue,
+    setFieldValue,
+    hotkeyScope,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberField.ts
index 1ddaf7385f15..9ae483bde854 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberField.ts
@@ -4,6 +4,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
 import { useRecordFieldInput } from '@/object-record/record-field/hooks/useRecordFieldInput';
 import { FieldNumberValue } from '@/object-record/record-field/types/FieldMetadata';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 import {
   canBeCastAsIntegerOrNull,
   castAsIntegerOrNull,
@@ -17,7 +18,7 @@ import { isFieldNumber } from '../../types/guards/isFieldNumber';
 export const useNumberField = () => {
   const { entityId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata('NUMBER', isFieldNumber, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.Number, isFieldNumber, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/usePhoneField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/usePhoneField.ts
index 5e343d1f8d60..3f8891214d57 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/usePhoneField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/usePhoneField.ts
@@ -5,6 +5,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
 import { useRecordFieldInput } from '@/object-record/record-field/hooks/useRecordFieldInput';
 import { FieldPhoneValue } from '@/object-record/record-field/types/FieldMetadata';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { FieldContext } from '../../contexts/FieldContext';
 import { usePersistField } from '../../hooks/usePersistField';
@@ -14,7 +15,7 @@ import { isFieldPhone } from '../../types/guards/isFieldPhone';
 export const usePhoneField = () => {
   const { entityId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata('TEXT', isFieldPhone, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.Text, isFieldPhone, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationField.ts
index bd8355b80dc5..f61b22df666d 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationField.ts
@@ -5,6 +5,7 @@ import { useGetButtonIcon } from '@/object-record/record-field/hooks/useGetButto
 import { useRecordFieldInput } from '@/object-record/record-field/hooks/useRecordFieldInput';
 import { FieldRelationValue } from '@/object-record/record-field/types/FieldMetadata';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { FieldContext } from '../../contexts/FieldContext';
 import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
@@ -14,7 +15,12 @@ import { isFieldRelation } from '../../types/guards/isFieldRelation';
 export const useRelationField = () => {
   const { entityId, fieldDefinition, maxWidth } = useContext(FieldContext);
   const button = useGetButtonIcon();
-  assertFieldMetadata('RELATION', isFieldRelation, fieldDefinition);
+
+  assertFieldMetadata(
+    FieldMetadataType.Relation,
+    isFieldRelation,
+    fieldDefinition,
+  );
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useTextField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useTextField.ts
index c3222dda7176..6d3f36aacd52 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useTextField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useTextField.ts
@@ -4,6 +4,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
 import { useRecordFieldInput } from '@/object-record/record-field/hooks/useRecordFieldInput';
 import { FieldTextValue } from '@/object-record/record-field/types/FieldMetadata';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { FieldContext } from '../../contexts/FieldContext';
 import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
@@ -14,7 +15,7 @@ export const useTextField = () => {
   const { entityId, fieldDefinition, hotkeyScope, maxWidth } =
     useContext(FieldContext);
 
-  assertFieldMetadata('TEXT', isFieldText, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.Text, isFieldText, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useUuidField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useUuidField.ts
index 8e258ff098db..8a3224c50f65 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useUuidField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useUuidField.ts
@@ -4,6 +4,7 @@ import { useRecoilState } from 'recoil';
 import { FieldUUidValue } from '@/object-record/record-field/types/FieldMetadata';
 import { isFieldUuid } from '@/object-record/record-field/types/guards/isFieldUuid';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { FieldContext } from '../../contexts/FieldContext';
 import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
@@ -12,7 +13,7 @@ import { isFieldTextValue } from '../../types/guards/isFieldTextValue';
 export const useUuidField = () => {
   const { entityId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata('UUID', isFieldUuid, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.Uuid, isFieldUuid, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/AddressFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/AddressFieldInput.tsx
new file mode 100644
index 000000000000..952a5e35665f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/AddressFieldInput.tsx
@@ -0,0 +1,85 @@
+import { useAddressField } from '@/object-record/record-field/meta-types/hooks/useAddressField';
+import { FieldAddressDraftValue } from '@/object-record/record-field/types/FieldInputDraftValue';
+import { AddressInput } from '@/ui/field/input/components/AddressInput';
+import { FieldInputOverlay } from '@/ui/field/input/components/FieldInputOverlay';
+
+import { usePersistField } from '../../../hooks/usePersistField';
+
+import { FieldInputEvent } from './DateFieldInput';
+
+export type AddressFieldInputProps = {
+  onClickOutside?: FieldInputEvent;
+  onEnter?: FieldInputEvent;
+  onEscape?: FieldInputEvent;
+  onTab?: FieldInputEvent;
+  onShiftTab?: FieldInputEvent;
+};
+
+export const AddressFieldInput = ({
+  onEnter,
+  onEscape,
+  onClickOutside,
+  onTab,
+  onShiftTab,
+}: AddressFieldInputProps) => {
+  const { hotkeyScope, draftValue, setDraftValue } = useAddressField();
+
+  const persistField = usePersistField();
+
+  const convertToAddress = (
+    newAddress: FieldAddressDraftValue | undefined,
+  ): FieldAddressDraftValue => {
+    return {
+      addressStreet1: newAddress?.addressStreet1 ?? '',
+      addressStreet2: newAddress?.addressStreet2 ?? null,
+      addressCity: newAddress?.addressCity ?? null,
+      addressState: newAddress?.addressState ?? null,
+      addressCountry: newAddress?.addressCountry ?? null,
+      addressPostcode: newAddress?.addressPostcode ?? null,
+      addressLat: newAddress?.addressLat ?? null,
+      addressLng: newAddress?.addressLng ?? null,
+    };
+  };
+
+  const handleEnter = (newAddress: FieldAddressDraftValue) => {
+    onEnter?.(() => persistField(convertToAddress(newAddress)));
+  };
+
+  const handleTab = (newAddress: FieldAddressDraftValue) => {
+    onTab?.(() => persistField(convertToAddress(newAddress)));
+  };
+
+  const handleShiftTab = (newAddress: FieldAddressDraftValue) => {
+    onShiftTab?.(() => persistField(convertToAddress(newAddress)));
+  };
+
+  const handleEscape = (newAddress: FieldAddressDraftValue) => {
+    onEscape?.(() => persistField(convertToAddress(newAddress)));
+  };
+
+  const handleClickOutside = (
+    event: MouseEvent | TouchEvent,
+    newAddress: FieldAddressDraftValue,
+  ) => {
+    onClickOutside?.(() => persistField(convertToAddress(newAddress)));
+  };
+
+  const handleChange = (newAddress: FieldAddressDraftValue) => {
+    setDraftValue(convertToAddress(newAddress));
+  };
+
+  return (
+    <FieldInputOverlay>
+      <AddressInput
+        value={convertToAddress(draftValue)}
+        onClickOutside={handleClickOutside}
+        onEnter={handleEnter}
+        onEscape={handleEscape}
+        hotkeyScope={hotkeyScope}
+        onChange={handleChange}
+        onTab={handleTab}
+        onShiftTab={handleShiftTab}
+      />
+    </FieldInputOverlay>
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/BooleanFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/BooleanFieldInput.tsx
index f6cffa3b80d6..b2b5cb97d553 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/BooleanFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/BooleanFieldInput.tsx
@@ -3,7 +3,7 @@ import { BooleanInput } from '@/ui/field/input/components/BooleanInput';
 import { usePersistField } from '../../../hooks/usePersistField';
 import { useBooleanField } from '../../hooks/useBooleanField';
 
-import { FieldInputEvent } from './DateFieldInput';
+import { FieldInputEvent } from './DateTimeFieldInput';
 
 export type BooleanFieldInputProps = {
   onSubmit?: FieldInputEvent;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/CurrencyFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/CurrencyFieldInput.tsx
index 5ab4617eddb8..08ebc0601596 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/CurrencyFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/CurrencyFieldInput.tsx
@@ -1,10 +1,11 @@
 import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
-import { TextInput } from '@/ui/field/input/components/TextInput';
+import { FieldCurrencyValue } from '@/object-record/record-field/types/FieldMetadata';
+import { CurrencyInput } from '@/ui/field/input/components/CurrencyInput';
 
 import { FieldInputOverlay } from '../../../../../ui/field/input/components/FieldInputOverlay';
 import { useCurrencyField } from '../../hooks/useCurrencyField';
 
-import { FieldInputEvent } from './DateFieldInput';
+import { FieldInputEvent } from './DateTimeFieldInput';
 
 export type CurrencyFieldInputProps = {
   onClickOutside?: FieldInputEvent;
@@ -21,14 +22,27 @@ export const CurrencyFieldInput = ({
   onTab,
   onShiftTab,
 }: CurrencyFieldInputProps) => {
-  const { hotkeyScope, draftValue, persistCurrencyField, setDraftValue } =
-    useCurrencyField();
+  const {
+    hotkeyScope,
+    draftValue,
+    persistCurrencyField,
+    setDraftValue,
+    defaultValue,
+  } = useCurrencyField();
+
+  const currencyCode =
+    draftValue?.currencyCode ??
+    ((defaultValue as FieldCurrencyValue).currencyCode.replace(
+      /'/g,
+      '',
+    ) as CurrencyCode) ??
+    CurrencyCode.USD;
 
   const handleEnter = (newValue: string) => {
     onEnter?.(() => {
       persistCurrencyField({
         amountText: newValue,
-        currencyCode: draftValue?.currencyCode ?? CurrencyCode.USD,
+        currencyCode,
       });
     });
   };
@@ -37,7 +51,7 @@ export const CurrencyFieldInput = ({
     onEscape?.(() => {
       persistCurrencyField({
         amountText: newValue,
-        currencyCode: draftValue?.currencyCode ?? CurrencyCode.USD,
+        currencyCode,
       });
     });
   };
@@ -49,7 +63,7 @@ export const CurrencyFieldInput = ({
     onClickOutside?.(() => {
       persistCurrencyField({
         amountText: newValue,
-        currencyCode: draftValue?.currencyCode ?? CurrencyCode.USD,
+        currencyCode,
       });
     });
   };
@@ -58,7 +72,7 @@ export const CurrencyFieldInput = ({
     onTab?.(() => {
       persistCurrencyField({
         amountText: newValue,
-        currencyCode: draftValue?.currencyCode ?? CurrencyCode.USD,
+        currencyCode,
       });
     });
   };
@@ -67,7 +81,7 @@ export const CurrencyFieldInput = ({
     onShiftTab?.(() =>
       persistCurrencyField({
         amountText: newValue,
-        currencyCode: draftValue?.currencyCode ?? CurrencyCode.USD,
+        currencyCode,
       }),
     );
   };
@@ -75,14 +89,22 @@ export const CurrencyFieldInput = ({
   const handleChange = (newValue: string) => {
     setDraftValue({
       amount: newValue,
-      currencyCode: draftValue?.currencyCode ?? CurrencyCode.USD,
+      currencyCode,
+    });
+  };
+
+  const handleSelect = (newValue: string) => {
+    setDraftValue({
+      amount: draftValue?.amount ?? '',
+      currencyCode: newValue as CurrencyCode,
     });
   };
 
   return (
     <FieldInputOverlay>
-      <TextInput
+      <CurrencyInput
         value={draftValue?.amount?.toString() ?? ''}
+        currencyCode={currencyCode}
         autoFocus
         placeholder="Currency"
         onClickOutside={handleClickOutside}
@@ -90,8 +112,9 @@ export const CurrencyFieldInput = ({
         onEscape={handleEscape}
         onShiftTab={handleShiftTab}
         onTab={handleTab}
-        hotkeyScope={hotkeyScope}
         onChange={handleChange}
+        onSelect={handleSelect}
+        hotkeyScope={hotkeyScope}
       />
     </FieldInputOverlay>
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/DateFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/DateFieldInput.tsx
index c1165f9737c3..631d25624c13 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/DateFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/DateFieldInput.tsx
@@ -1,8 +1,8 @@
+import { useDateField } from '@/object-record/record-field/meta-types/hooks/useDateField';
 import { DateInput } from '@/ui/field/input/components/DateInput';
 import { Nullable } from '~/types/Nullable';
 
 import { usePersistField } from '../../../hooks/usePersistField';
-import { useDateTimeField } from '../../hooks/useDateTimeField';
 
 export type FieldInputEvent = (persist: () => void) => void;
 
@@ -17,8 +17,7 @@ export const DateFieldInput = ({
   onEscape,
   onClickOutside,
 }: DateFieldInputProps) => {
-  const { fieldValue, hotkeyScope, clearable, setDraftValue } =
-    useDateTimeField();
+  const { fieldValue, hotkeyScope, setDraftValue } = useDateField();
 
   const persistField = usePersistField();
 
@@ -60,7 +59,7 @@ export const DateFieldInput = ({
       onEnter={handleEnter}
       onEscape={handleEscape}
       value={dateValue}
-      clearable={clearable}
+      clearable
       onChange={handleChange}
     />
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/DateTimeFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/DateTimeFieldInput.tsx
new file mode 100644
index 000000000000..d3b5f46ce0e9
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/DateTimeFieldInput.tsx
@@ -0,0 +1,68 @@
+import { DateInput } from '@/ui/field/input/components/DateInput';
+import { Nullable } from '~/types/Nullable';
+
+import { usePersistField } from '../../../hooks/usePersistField';
+import { useDateTimeField } from '../../hooks/useDateTimeField';
+
+export type FieldInputEvent = (persist: () => void) => void;
+
+export type DateTimeFieldInputProps = {
+  onClickOutside?: FieldInputEvent;
+  onEnter?: FieldInputEvent;
+  onEscape?: FieldInputEvent;
+};
+
+export const DateTimeFieldInput = ({
+  onEnter,
+  onEscape,
+  onClickOutside,
+}: DateTimeFieldInputProps) => {
+  const { fieldValue, hotkeyScope, clearable, setDraftValue } =
+    useDateTimeField();
+
+  const persistField = usePersistField();
+
+  const persistDate = (newDate: Nullable<Date>) => {
+    if (!newDate) {
+      persistField(null);
+    } else {
+      const newDateISO = newDate?.toISOString();
+
+      persistField(newDateISO);
+    }
+  };
+
+  const handleEnter = (newDate: Nullable<Date>) => {
+    onEnter?.(() => persistDate(newDate));
+  };
+
+  const handleEscape = (newDate: Nullable<Date>) => {
+    onEscape?.(() => persistDate(newDate));
+  };
+
+  const handleClickOutside = (
+    _event: MouseEvent | TouchEvent,
+    newDate: Nullable<Date>,
+  ) => {
+    onClickOutside?.(() => persistDate(newDate));
+  };
+
+  const handleChange = (newDate: Nullable<Date>) => {
+    setDraftValue(newDate?.toDateString() ?? '');
+  };
+
+  const dateValue = fieldValue ? new Date(fieldValue) : null;
+
+  return (
+    <DateInput
+      hotkeyScope={hotkeyScope}
+      onClickOutside={handleClickOutside}
+      onEnter={handleEnter}
+      onEscape={handleEscape}
+      value={dateValue}
+      clearable={clearable}
+      onChange={handleChange}
+      isDateTimeInput
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/EmailFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/EmailFieldInput.tsx
index 4d6bb38623a1..29ed4b2f15c6 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/EmailFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/EmailFieldInput.tsx
@@ -4,7 +4,7 @@ import { FieldInputOverlay } from '../../../../../ui/field/input/components/Fiel
 import { usePersistField } from '../../../hooks/usePersistField';
 import { useEmailField } from '../../hooks/useEmailField';
 
-import { FieldInputEvent } from './DateFieldInput';
+import { FieldInputEvent } from './DateTimeFieldInput';
 
 export type EmailFieldInputProps = {
   onClickOutside?: FieldInputEvent;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/FullNameFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/FullNameFieldInput.tsx
index 77fa108e15ed..5b6e06a64ff7 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/FullNameFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/FullNameFieldInput.tsx
@@ -5,7 +5,7 @@ import { FieldInputOverlay } from '@/ui/field/input/components/FieldInputOverlay
 
 import { usePersistField } from '../../../hooks/usePersistField';
 
-import { FieldInputEvent } from './DateFieldInput';
+import { FieldInputEvent } from './DateTimeFieldInput';
 
 const FIRST_NAME_PLACEHOLDER_WITH_SPECIAL_CHARACTER_TO_AVOID_PASSWORD_MANAGERS =
   'F‌‌irst name';
@@ -66,6 +66,10 @@ export const FullNameFieldInput = ({
     setDraftValue(convertToFullName(newDoubleText));
   };
 
+  const handlePaste = (newDoubleText: FieldDoubleText) => {
+    setDraftValue(convertToFullName(newDoubleText));
+  };
+
   return (
     <FieldInputOverlay>
       <DoubleTextInput
@@ -82,6 +86,7 @@ export const FullNameFieldInput = ({
         onEscape={handleEscape}
         onShiftTab={handleShiftTab}
         onTab={handleTab}
+        onPaste={handlePaste}
         hotkeyScope={hotkeyScope}
         onChange={handleChange}
       />
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/LinkFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/LinkFieldInput.tsx
index 255dfb0864a5..5bf5571f1b56 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/LinkFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/LinkFieldInput.tsx
@@ -3,7 +3,7 @@ import { TextInput } from '@/ui/field/input/components/TextInput';
 import { FieldInputOverlay } from '../../../../../ui/field/input/components/FieldInputOverlay';
 import { useLinkField } from '../../hooks/useLinkField';
 
-import { FieldInputEvent } from './DateFieldInput';
+import { FieldInputEvent } from './DateTimeFieldInput';
 
 export type LinkFieldInputProps = {
   onClickOutside?: FieldInputEvent;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiSelectFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiSelectFieldInput.tsx
new file mode 100644
index 000000000000..864384918d99
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiSelectFieldInput.tsx
@@ -0,0 +1,93 @@
+import { useRef, useState } from 'react';
+import styled from '@emotion/styled';
+
+import { useMultiSelectField } from '@/object-record/record-field/meta-types/hooks/useMultiSelectField.ts';
+import { FieldInputEvent } from '@/object-record/record-field/types/FieldInputEvent';
+import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
+import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { MenuItemMultiSelectTag } from '@/ui/navigation/menu-item/components/MenuItemMultiSelectTag.tsx';
+import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
+import { isDefined } from '~/utils/isDefined';
+
+const StyledRelationPickerContainer = styled.div`
+  left: -1px;
+  position: absolute;
+  top: -1px;
+`;
+
+export type MultiSelectFieldInputProps = {
+  onSubmit?: FieldInputEvent;
+  onCancel?: () => void;
+};
+
+export const MultiSelectFieldInput = ({
+  onCancel,
+}: MultiSelectFieldInputProps) => {
+  const { persistField, fieldDefinition, fieldValues } = useMultiSelectField();
+  const [searchFilter, setSearchFilter] = useState('');
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  const selectedOptions = fieldDefinition.metadata.options.filter(
+    (option) => fieldValues?.includes(option.value),
+  );
+
+  const optionsInDropDown = fieldDefinition.metadata.options;
+
+  const formatNewSelectedOptions = (value: string) => {
+    const selectedOptionsValues = selectedOptions.map(
+      (selectedOption) => selectedOption.value,
+    );
+    if (!selectedOptionsValues.includes(value)) {
+      return [value, ...selectedOptionsValues];
+    } else {
+      return selectedOptionsValues.filter(
+        (selectedOptionsValue) => selectedOptionsValue !== value,
+      );
+    }
+  };
+
+  useListenClickOutside({
+    refs: [containerRef],
+    callback: (event) => {
+      event.stopImmediatePropagation();
+
+      const weAreNotInAnHTMLInput = !(
+        event.target instanceof HTMLInputElement &&
+        event.target.tagName === 'INPUT'
+      );
+      if (weAreNotInAnHTMLInput && isDefined(onCancel)) {
+        onCancel();
+      }
+    },
+  });
+
+  return (
+    <StyledRelationPickerContainer ref={containerRef}>
+      <DropdownMenu data-select-disable>
+        <DropdownMenuSearchInput
+          value={searchFilter}
+          onChange={(event) => setSearchFilter(event.currentTarget.value)}
+          autoFocus
+        />
+        <DropdownMenuSeparator />
+        <DropdownMenuItemsContainer hasMaxHeight>
+          {optionsInDropDown.map((option) => {
+            return (
+              <MenuItemMultiSelectTag
+                key={option.value}
+                selected={fieldValues?.includes(option.value) || false}
+                text={option.label}
+                color={option.color}
+                onClick={() =>
+                  persistField(formatNewSelectedOptions(option.value))
+                }
+              />
+            );
+          })}
+        </DropdownMenuItemsContainer>
+      </DropdownMenu>
+    </StyledRelationPickerContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/PhoneFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/PhoneFieldInput.tsx
index 3e6e7f8943e2..179455da6a0e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/PhoneFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/PhoneFieldInput.tsx
@@ -3,7 +3,7 @@ import { PhoneInput } from '@/ui/field/input/components/PhoneInput';
 import { FieldInputOverlay } from '../../../../../ui/field/input/components/FieldInputOverlay';
 import { usePhoneField } from '../../hooks/usePhoneField';
 
-import { FieldInputEvent } from './DateFieldInput';
+import { FieldInputEvent } from './DateTimeFieldInput';
 
 export type PhoneFieldInputProps = {
   onClickOutside?: FieldInputEvent;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RatingFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RatingFieldInput.tsx
index 447be4f06318..873708669e70 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RatingFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RatingFieldInput.tsx
@@ -4,7 +4,7 @@ import { RatingInput } from '@/ui/field/input/components/RatingInput';
 import { usePersistField } from '../../../hooks/usePersistField';
 import { useRatingField } from '../../hooks/useRatingField';
 
-import { FieldInputEvent } from './DateFieldInput';
+import { FieldInputEvent } from './DateTimeFieldInput';
 
 export type RatingFieldInputProps = {
   onSubmit?: FieldInputEvent;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RawJsonFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RawJsonFieldInput.tsx
new file mode 100644
index 000000000000..34a06e814144
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RawJsonFieldInput.tsx
@@ -0,0 +1,83 @@
+import { isValidJSON } from '@/object-record/record-field/utils/isFieldValueJson';
+import { FieldTextAreaOverlay } from '@/ui/field/input/components/FieldTextAreaOverlay';
+import { TextAreaInput } from '@/ui/field/input/components/TextAreaInput';
+
+import { usePersistField } from '../../../hooks/usePersistField';
+import { useJsonField } from '../../hooks/useJsonField';
+
+import { FieldInputEvent } from './DateFieldInput';
+
+export type RawJsonFieldInputProps = {
+  onClickOutside?: FieldInputEvent;
+  onEnter?: FieldInputEvent;
+  onEscape?: FieldInputEvent;
+  onTab?: FieldInputEvent;
+  onShiftTab?: FieldInputEvent;
+};
+
+export const RawJsonFieldInput = ({
+  onEnter,
+  onEscape,
+  onClickOutside,
+  onTab,
+  onShiftTab,
+}: RawJsonFieldInputProps) => {
+  const { fieldDefinition, draftValue, hotkeyScope, setDraftValue } =
+    useJsonField();
+
+  const persistField = usePersistField();
+
+  const handlePersistField = (newText: string) => {
+    if (!newText || isValidJSON(newText)) persistField(newText || null);
+  };
+
+  const handleEnter = (newText: string) => {
+    onEnter?.(() => handlePersistField(newText));
+  };
+
+  const handleEscape = (newText: string) => {
+    onEscape?.(() => handlePersistField(newText));
+  };
+
+  const handleClickOutside = (
+    _event: MouseEvent | TouchEvent,
+    newText: string,
+  ) => {
+    onClickOutside?.(() => handlePersistField(newText));
+  };
+
+  const handleTab = (newText: string) => {
+    onTab?.(() => handlePersistField(newText));
+  };
+
+  const handleShiftTab = (newText: string) => {
+    onShiftTab?.(() => handlePersistField(newText));
+  };
+
+  const handleChange = (newText: string) => {
+    setDraftValue(newText);
+  };
+
+  const value =
+    draftValue && isValidJSON(draftValue)
+      ? JSON.stringify(JSON.parse(draftValue), null, 2)
+      : draftValue ?? '';
+
+  return (
+    <FieldTextAreaOverlay>
+      <TextAreaInput
+        placeholder={fieldDefinition.metadata.placeHolder}
+        autoFocus
+        value={value}
+        onClickOutside={handleClickOutside}
+        onEnter={handleEnter}
+        onEscape={handleEscape}
+        onShiftTab={handleShiftTab}
+        onTab={handleTab}
+        hotkeyScope={hotkeyScope}
+        onChange={handleChange}
+        maxRows={25}
+      />
+    </FieldTextAreaOverlay>
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RelationFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RelationFieldInput.tsx
index 17d3e036571a..ec80fd26c1df 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RelationFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RelationFieldInput.tsx
@@ -6,7 +6,7 @@ import { EntityForSelect } from '@/object-record/relation-picker/types/EntityFor
 import { usePersistField } from '../../../hooks/usePersistField';
 import { useRelationField } from '../../hooks/useRelationField';
 
-import { FieldInputEvent } from './DateFieldInput';
+import { FieldInputEvent } from './DateTimeFieldInput';
 
 const StyledRelationPickerContainer = styled.div`
   left: -1px;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/SelectFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/SelectFieldInput.tsx
index 4c730f4290b8..e0b433eef715 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/SelectFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/SelectFieldInput.tsx
@@ -1,10 +1,15 @@
+import { useRef, useState } from 'react';
 import styled from '@emotion/styled';
-import { MenuItem } from 'tsup.ui.index';
 
 import { useSelectField } from '@/object-record/record-field/meta-types/hooks/useSelectField';
 import { FieldInputEvent } from '@/object-record/record-field/types/FieldInputEvent';
 import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
+import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { MenuItemSelectTag } from '@/ui/navigation/menu-item/components/MenuItemSelectTag';
+import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
+import { isDefined } from '~/utils/isDefined';
 
 const StyledRelationPickerContainer = styled.div`
   left: -1px;
@@ -14,19 +19,63 @@ const StyledRelationPickerContainer = styled.div`
 
 export type SelectFieldInputProps = {
   onSubmit?: FieldInputEvent;
+  onCancel?: () => void;
 };
 
-export const SelectFieldInput = ({ onSubmit }: SelectFieldInputProps) => {
-  const { persistField, fieldDefinition } = useSelectField();
+export const SelectFieldInput = ({
+  onSubmit,
+  onCancel,
+}: SelectFieldInputProps) => {
+  const { persistField, fieldDefinition, fieldValue } = useSelectField();
+  const [searchFilter, setSearchFilter] = useState('');
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  const selectedOption = fieldDefinition.metadata.options.find(
+    (option) => option.value === fieldValue,
+  );
+  const optionsToSelect =
+    fieldDefinition.metadata.options.filter((option) => {
+      return (
+        option.value !== fieldValue &&
+        option.label.toLowerCase().includes(searchFilter.toLowerCase())
+      );
+    }) || [];
+  const optionsInDropDown = selectedOption
+    ? [selectedOption, ...optionsToSelect]
+    : optionsToSelect;
+
+  useListenClickOutside({
+    refs: [containerRef],
+    callback: (event) => {
+      event.stopImmediatePropagation();
+
+      const weAreNotInAnHTMLInput = !(
+        event.target instanceof HTMLInputElement &&
+        event.target.tagName === 'INPUT'
+      );
+      if (weAreNotInAnHTMLInput && isDefined(onCancel)) {
+        onCancel();
+      }
+    },
+  });
 
   return (
-    <StyledRelationPickerContainer>
+    <StyledRelationPickerContainer ref={containerRef}>
       <DropdownMenu data-select-disable>
-        <DropdownMenuItemsContainer>
-          {fieldDefinition.metadata.options.map((option) => {
+        <DropdownMenuSearchInput
+          value={searchFilter}
+          onChange={(event) => setSearchFilter(event.currentTarget.value)}
+          autoFocus
+        />
+        <DropdownMenuSeparator />
+        <DropdownMenuItemsContainer hasMaxHeight>
+          {optionsInDropDown.map((option) => {
             return (
-              <MenuItem
+              <MenuItemSelectTag
+                key={option.value}
+                selected={option.value === fieldValue}
                 text={option.label}
+                color={option.color}
                 onClick={() => onSubmit?.(() => persistField(option.value))}
               />
             );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/TextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/TextFieldInput.tsx
index 1a9eee83ea98..087dc37f48de 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/TextFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/TextFieldInput.tsx
@@ -4,7 +4,7 @@ import { TextAreaInput } from '@/ui/field/input/components/TextAreaInput';
 import { usePersistField } from '../../../hooks/usePersistField';
 import { useTextField } from '../../hooks/useTextField';
 
-import { FieldInputEvent } from './DateFieldInput';
+import { FieldInputEvent } from './DateTimeFieldInput';
 
 export type TextFieldInputProps = {
   onClickOutside?: FieldInputEvent;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/AddressFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/AddressFieldInput.stories.tsx
new file mode 100644
index 000000000000..7241793cb310
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/AddressFieldInput.stories.tsx
@@ -0,0 +1,138 @@
+import { useEffect } from 'react';
+import { Decorator, Meta, StoryObj } from '@storybook/react';
+import { expect, fn, userEvent, waitFor } from '@storybook/test';
+
+import { useAddressField } from '@/object-record/record-field/meta-types/hooks/useAddressField';
+import { FieldAddressDraftValue } from '@/object-record/record-field/types/FieldInputDraftValue';
+import {
+  AddressInput,
+  AddressInputProps,
+} from '@/ui/field/input/components/AddressInput';
+import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+import { FieldContextProvider } from '../../../__stories__/FieldContextProvider';
+
+const AddressValueSetterEffect = ({
+  value,
+}: {
+  value: FieldAddressDraftValue;
+}) => {
+  const { setFieldValue } = useAddressField();
+
+  useEffect(() => {
+    setFieldValue(value);
+  }, [setFieldValue, value]);
+
+  return <></>;
+};
+
+type AddressInputWithContextProps = AddressInputProps & {
+  value: string;
+  entityId?: string;
+};
+
+const AddressInputWithContext = ({
+  entityId,
+  value,
+  onEnter,
+  onEscape,
+  onClickOutside,
+  onTab,
+  onShiftTab,
+}: AddressInputWithContextProps) => {
+  const setHotKeyScope = useSetHotkeyScope();
+
+  useEffect(() => {
+    setHotKeyScope('hotkey-scope');
+  }, [setHotKeyScope]);
+
+  return (
+    <div>
+      <FieldContextProvider
+        fieldDefinition={{
+          fieldMetadataId: 'text',
+          label: 'Address',
+          type: FieldMetadataType.Address,
+          iconName: 'IconTag',
+          metadata: {
+            fieldName: 'Address',
+            placeHolder: 'Enter text',
+            objectMetadataNameSingular: 'person',
+          },
+        }}
+        entityId={entityId}
+      >
+        <AddressValueSetterEffect value={value} />
+        <AddressInput
+          onEnter={onEnter}
+          onEscape={onEscape}
+          onClickOutside={onClickOutside}
+          value={value}
+          hotkeyScope="hotkey-scope"
+          onTab={onTab}
+          onShiftTab={onShiftTab}
+        />
+      </FieldContextProvider>
+      <div data-testid="data-field-input-click-outside-div" />
+    </div>
+  );
+};
+
+const enterJestFn = fn();
+const escapeJestfn = fn();
+const clickOutsideJestFn = fn();
+const tabJestFn = fn();
+const shiftTabJestFn = fn();
+
+const clearMocksDecorator: Decorator = (Story, context) => {
+  if (context.parameters.clearMocks === true) {
+    enterJestFn.mockClear();
+    escapeJestfn.mockClear();
+    clickOutsideJestFn.mockClear();
+    tabJestFn.mockClear();
+    shiftTabJestFn.mockClear();
+  }
+  return <Story />;
+};
+
+const meta: Meta = {
+  title: 'UI/Data/Field/Input/AddressFieldInput',
+  component: AddressInputWithContext,
+  args: {
+    value: 'text',
+    onEnter: enterJestFn,
+    onEscape: escapeJestfn,
+    onClickOutside: clickOutsideJestFn,
+    onTab: tabJestFn,
+    onShiftTab: shiftTabJestFn,
+  },
+  argTypes: {
+    onEnter: { control: false },
+    onEscape: { control: false },
+    onClickOutside: { control: false },
+    onTab: { control: false },
+    onShiftTab: { control: false },
+  },
+  decorators: [clearMocksDecorator],
+  parameters: {
+    clearMocks: true,
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof AddressInputWithContext>;
+
+export const Default: Story = {};
+
+export const Enter: Story = {
+  play: async () => {
+    expect(enterJestFn).toHaveBeenCalledTimes(0);
+
+    await waitFor(() => {
+      userEvent.keyboard('{enter}');
+      expect(enterJestFn).toHaveBeenCalledTimes(1);
+    });
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
index 7e556614b5f8..934d7b3e4e49 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
@@ -4,6 +4,7 @@ import { expect, fn, userEvent, within } from '@storybook/test';
 import { useSetRecoilState } from 'recoil';
 
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { FieldMetadataType } from '~/generated/graphql';
 
 import { FieldContextProvider } from '../../../__stories__/FieldContextProvider';
 import {
@@ -43,9 +44,10 @@ const BooleanFieldInputWithContext = ({
         fieldMetadataId: 'boolean',
         label: 'Boolean',
         iconName: 'Icon123',
-        type: 'BOOLEAN',
+        type: FieldMetadataType.Boolean,
         metadata: {
           fieldName: 'Boolean',
+          objectMetadataNameSingular: 'person',
         },
       }}
       entityId={entityId}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx
deleted file mode 100644
index cfefb9efeb8d..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-import { useEffect } from 'react';
-import { Meta, StoryObj } from '@storybook/react';
-import { expect, fn, userEvent, within } from '@storybook/test';
-
-import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
-
-import { FieldContextProvider } from '../../../__stories__/FieldContextProvider';
-import { useDateTimeField } from '../../../hooks/useDateTimeField';
-import { DateFieldInput, DateFieldInputProps } from '../DateFieldInput';
-
-const formattedDate = new Date(2022, 1, 1);
-
-const DateFieldValueSetterEffect = ({ value }: { value: Date }) => {
-  const { setFieldValue } = useDateTimeField();
-
-  useEffect(() => {
-    setFieldValue(value.toISOString());
-  }, [setFieldValue, value]);
-
-  return <></>;
-};
-
-type DateFieldInputWithContextProps = DateFieldInputProps & {
-  value: Date;
-  entityId?: string;
-};
-
-const DateFieldInputWithContext = ({
-  value,
-  entityId,
-  onEscape,
-  onEnter,
-  onClickOutside,
-}: DateFieldInputWithContextProps) => {
-  const setHotkeyScope = useSetHotkeyScope();
-
-  useEffect(() => {
-    setHotkeyScope('hotkey-scope');
-  }, [setHotkeyScope]);
-
-  return (
-    <div>
-      <FieldContextProvider
-        fieldDefinition={{
-          fieldMetadataId: 'date',
-          label: 'Date',
-          type: 'DATE_TIME',
-          iconName: 'IconCalendarEvent',
-          metadata: {
-            fieldName: 'Date',
-          },
-        }}
-        entityId={entityId}
-      >
-        <DateFieldValueSetterEffect value={value} />
-        <DateFieldInput
-          onEscape={onEscape}
-          onEnter={onEnter}
-          onClickOutside={onClickOutside}
-        />
-      </FieldContextProvider>
-      <div data-testid="data-field-input-click-outside-div"></div>
-    </div>
-  );
-};
-
-const escapeJestFn = fn();
-const enterJestFn = fn();
-const clickOutsideJestFn = fn();
-
-const meta: Meta = {
-  title: 'UI/Data/Field/Input/DateFieldInput',
-  component: DateFieldInputWithContext,
-  args: {
-    value: formattedDate,
-    onEscape: escapeJestFn,
-    onEnter: enterJestFn,
-    onClickOutside: clickOutsideJestFn,
-  },
-  argTypes: {
-    onEscape: {
-      control: false,
-    },
-    onEnter: {
-      control: false,
-    },
-    onClickOutside: {
-      control: false,
-    },
-  },
-};
-
-export default meta;
-
-type Story = StoryObj<typeof DateFieldInputWithContext>;
-
-export const Default: Story = {
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-    const div = await canvas.findByText('Feb 1, 2022');
-
-    await expect(div.innerText).toContain('Feb 1, 2022');
-  },
-};
-
-export const ClickOutside: Story = {
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-
-    await expect(clickOutsideJestFn).toHaveBeenCalledTimes(0);
-
-    const emptyDiv = canvas.getByTestId('data-field-input-click-outside-div');
-    await userEvent.click(emptyDiv);
-
-    await expect(clickOutsideJestFn).toHaveBeenCalledTimes(1);
-  },
-};
-
-export const Escape: Story = {
-  play: async () => {
-    await expect(escapeJestFn).toHaveBeenCalledTimes(0);
-
-    await userEvent.keyboard('{esc}');
-
-    await expect(escapeJestFn).toHaveBeenCalledTimes(1);
-  },
-};
-
-export const Enter: Story = {
-  play: async () => {
-    await expect(enterJestFn).toHaveBeenCalledTimes(0);
-
-    await userEvent.keyboard('{enter}');
-
-    await expect(enterJestFn).toHaveBeenCalledTimes(1);
-  },
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/DateTimeFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/DateTimeFieldInput.stories.tsx
new file mode 100644
index 000000000000..28bd5948fb68
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/DateTimeFieldInput.stories.tsx
@@ -0,0 +1,142 @@
+import { useEffect } from 'react';
+import { Meta, StoryObj } from '@storybook/react';
+import { expect, fn, userEvent, within } from '@storybook/test';
+
+import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { FieldMetadataType } from '~/generated/graphql';
+
+import { FieldContextProvider } from '../../../__stories__/FieldContextProvider';
+import { useDateTimeField } from '../../../hooks/useDateTimeField';
+import {
+  DateTimeFieldInput,
+  DateTimeFieldInputProps,
+} from '../DateTimeFieldInput';
+
+const formattedDate = new Date(2022, 1, 1);
+
+const DateFieldValueSetterEffect = ({ value }: { value: Date }) => {
+  const { setFieldValue } = useDateTimeField();
+
+  useEffect(() => {
+    setFieldValue(value.toISOString());
+  }, [setFieldValue, value]);
+
+  return <></>;
+};
+
+type DateFieldInputWithContextProps = DateTimeFieldInputProps & {
+  value: Date;
+  entityId?: string;
+};
+
+const DateFieldInputWithContext = ({
+  value,
+  entityId,
+  onEscape,
+  onEnter,
+  onClickOutside,
+}: DateFieldInputWithContextProps) => {
+  const setHotkeyScope = useSetHotkeyScope();
+
+  useEffect(() => {
+    setHotkeyScope('hotkey-scope');
+  }, [setHotkeyScope]);
+
+  return (
+    <div>
+      <FieldContextProvider
+        fieldDefinition={{
+          fieldMetadataId: 'date',
+          label: 'Date',
+          type: FieldMetadataType.DateTime,
+          iconName: 'IconCalendarEvent',
+          metadata: {
+            fieldName: 'Date',
+            objectMetadataNameSingular: 'person',
+          },
+        }}
+        entityId={entityId}
+      >
+        <DateFieldValueSetterEffect value={value} />
+        <DateTimeFieldInput
+          onEscape={onEscape}
+          onEnter={onEnter}
+          onClickOutside={onClickOutside}
+        />
+      </FieldContextProvider>
+      <div data-testid="data-field-input-click-outside-div"></div>
+    </div>
+  );
+};
+
+const escapeJestFn = fn();
+const enterJestFn = fn();
+const clickOutsideJestFn = fn();
+
+const meta: Meta = {
+  title: 'UI/Data/Field/Input/DateFieldInput',
+  component: DateFieldInputWithContext,
+  args: {
+    value: formattedDate,
+    onEscape: escapeJestFn,
+    onEnter: enterJestFn,
+    onClickOutside: clickOutsideJestFn,
+  },
+  argTypes: {
+    onEscape: {
+      control: false,
+    },
+    onEnter: {
+      control: false,
+    },
+    onClickOutside: {
+      control: false,
+    },
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof DateFieldInputWithContext>;
+
+export const Default: Story = {
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    const div = await canvas.findByText('Feb 1, 2022');
+
+    await expect(div.innerText).toContain('Feb 1, 2022');
+  },
+};
+
+export const ClickOutside: Story = {
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    await expect(clickOutsideJestFn).toHaveBeenCalledTimes(0);
+
+    const emptyDiv = canvas.getByTestId('data-field-input-click-outside-div');
+    await userEvent.click(emptyDiv);
+
+    await expect(clickOutsideJestFn).toHaveBeenCalledTimes(1);
+  },
+};
+
+export const Escape: Story = {
+  play: async () => {
+    await expect(escapeJestFn).toHaveBeenCalledTimes(0);
+
+    await userEvent.keyboard('{esc}');
+
+    await expect(escapeJestFn).toHaveBeenCalledTimes(1);
+  },
+};
+
+export const Enter: Story = {
+  play: async () => {
+    await expect(enterJestFn).toHaveBeenCalledTimes(0);
+
+    await userEvent.keyboard('{enter}');
+
+    await expect(enterJestFn).toHaveBeenCalledTimes(1);
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx
index 712e2c46be73..b96085ee8dd5 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx
@@ -3,6 +3,7 @@ import { Decorator, Meta, StoryObj } from '@storybook/react';
 import { expect, fn, userEvent, waitFor, within } from '@storybook/test';
 
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { FieldMetadataType } from '~/generated/graphql';
 
 import { FieldContextProvider } from '../../../__stories__/FieldContextProvider';
 import { useEmailField } from '../../../hooks/useEmailField';
@@ -44,11 +45,12 @@ const EmailFieldInputWithContext = ({
         fieldDefinition={{
           fieldMetadataId: 'email',
           label: 'Email',
-          type: 'EMAIL',
+          type: FieldMetadataType.Email,
           iconName: 'IconLink',
           metadata: {
             fieldName: 'email',
             placeHolder: 'username@email.com',
+            objectMetadataNameSingular: 'person',
           },
         }}
         entityId={entityId}
@@ -74,7 +76,7 @@ const tabJestFn = fn();
 const shiftTabJestFn = fn();
 
 const clearMocksDecorator: Decorator = (Story, context) => {
-  if (context.parameters.clearMocks) {
+  if (context.parameters.clearMocks === true) {
     enterJestFn.mockClear();
     escapeJestfn.mockClear();
     clickOutsideJestFn.mockClear();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
index ace77e5915de..832797657de1 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
@@ -3,6 +3,7 @@ import { Decorator, Meta, StoryObj } from '@storybook/react';
 import { expect, fn, userEvent, waitFor, within } from '@storybook/test';
 
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { FieldMetadataType } from '~/generated/graphql';
 
 import { FieldContextProvider } from '../../../__stories__/FieldContextProvider';
 import { useNumberField } from '../../../hooks/useNumberField';
@@ -45,10 +46,11 @@ const NumberFieldInputWithContext = ({
           fieldMetadataId: 'number',
           label: 'Number',
           iconName: 'Icon123',
-          type: 'NUMBER',
+          type: FieldMetadataType.Number,
           metadata: {
             fieldName: 'number',
             placeHolder: 'Enter number',
+            objectMetadataNameSingular: 'person',
           },
         }}
         entityId={entityId}
@@ -74,7 +76,7 @@ const tabJestFn = fn();
 const shiftTabJestFn = fn();
 
 const clearMocksDecorator: Decorator = (Story, context) => {
-  if (context.parameters.clearMocks) {
+  if (context.parameters.clearMocks === true) {
     enterJestFn.mockClear();
     escapeJestfn.mockClear();
     clickOutsideJestFn.mockClear();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx
index 5245859abe2e..c38b58a2d687 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx
@@ -3,6 +3,7 @@ import { Decorator, Meta, StoryObj } from '@storybook/react';
 import { expect, fn, userEvent, waitFor, within } from '@storybook/test';
 
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { FieldMetadataType } from '~/generated/graphql';
 
 import { FieldContextProvider } from '../../../__stories__/FieldContextProvider';
 import { usePhoneField } from '../../../hooks/usePhoneField';
@@ -44,7 +45,7 @@ const PhoneFieldInputWithContext = ({
         fieldDefinition={{
           fieldMetadataId: 'phone',
           label: 'Phone',
-          type: 'TEXT',
+          type: FieldMetadataType.Text,
           iconName: 'IconPhone',
           metadata: {
             fieldName: 'phone',
@@ -75,7 +76,7 @@ const tabJestFn = fn();
 const shiftTabJestFn = fn();
 
 const clearMocksDecorator: Decorator = (Story, context) => {
-  if (context.parameters.clearMocks) {
+  if (context.parameters.clearMocks === true) {
     enterJestFn.mockClear();
     escapeJestfn.mockClear();
     clickOutsideJestFn.mockClear();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx
index 7d148460d394..2f6217150c31 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx
@@ -4,6 +4,7 @@ import { expect, fn, userEvent, waitFor, within } from '@storybook/test';
 
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { isDefined } from '~/utils/isDefined';
 
 import { FieldRatingValue } from '../../../../types/FieldMetadata';
 import { FieldContextProvider } from '../../../__stories__/FieldContextProvider';
@@ -49,6 +50,7 @@ const RatingFieldInputWithContext = ({
         iconName: 'Icon123',
         metadata: {
           fieldName: 'Rating',
+          objectMetadataNameSingular: 'person',
         },
       }}
       entityId={entityId}
@@ -62,7 +64,7 @@ const RatingFieldInputWithContext = ({
 const submitJestFn = fn();
 
 const clearMocksDecorator: Decorator = (Story, context) => {
-  if (context.parameters.clearMocks) {
+  if (context.parameters.clearMocks === true) {
     submitJestFn.mockClear();
   }
   return <Story />;
@@ -100,7 +102,7 @@ export const Submit: Story = {
     const firstStar = input.firstElementChild;
 
     await waitFor(() => {
-      if (firstStar) {
+      if (isDefined(firstStar)) {
         userEvent.click(firstStar);
         expect(submitJestFn).toHaveBeenCalledTimes(1);
       }
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx
index 769074690278..a6fca0e4d1fc 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx
@@ -14,6 +14,7 @@ import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMembe
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { FieldMetadataType } from '~/generated/graphql';
 import { ComponentWithRecoilScopeDecorator } from '~/testing/decorators/ComponentWithRecoilScopeDecorator';
 import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
@@ -65,13 +66,14 @@ const RelationFieldInputWithContext = ({
         fieldDefinition={{
           fieldMetadataId: 'relation',
           label: 'Relation',
-          type: 'RELATION',
+          type: FieldMetadataType.Relation,
           iconName: 'IconLink',
           metadata: {
             fieldName: 'Relation',
             relationObjectMetadataNamePlural: 'workspaceMembers',
             relationObjectMetadataNameSingular:
               CoreObjectNameSingular.WorkspaceMember,
+            objectMetadataNameSingular: 'person',
           },
         }}
         entityId={entityId}
@@ -88,7 +90,7 @@ const submitJestFn = fn();
 const cancelJestFn = fn();
 
 const clearMocksDecorator: Decorator = (Story, context) => {
-  if (context.parameters.clearMocks) {
+  if (context.parameters.clearMocks === true) {
     submitJestFn.mockClear();
     cancelJestFn.mockClear();
   }
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
index c89955dea65c..09d400028b6e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
@@ -3,6 +3,7 @@ import { Decorator, Meta, StoryObj } from '@storybook/react';
 import { expect, fn, userEvent, waitFor, within } from '@storybook/test';
 
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { FieldMetadataType } from '~/generated/graphql';
 
 import { FieldContextProvider } from '../../../__stories__/FieldContextProvider';
 import { useTextField } from '../../../hooks/useTextField';
@@ -44,11 +45,12 @@ const TextFieldInputWithContext = ({
         fieldDefinition={{
           fieldMetadataId: 'text',
           label: 'Text',
-          type: 'TEXT',
+          type: FieldMetadataType.Text,
           iconName: 'IconTag',
           metadata: {
             fieldName: 'Text',
             placeHolder: 'Enter text',
+            objectMetadataNameSingular: 'person',
           },
         }}
         entityId={entityId}
@@ -74,7 +76,7 @@ const tabJestFn = fn();
 const shiftTabJestFn = fn();
 
 const clearMocksDecorator: Decorator = (Story, context) => {
-  if (context.parameters.clearMocks) {
+  if (context.parameters.clearMocks === true) {
     enterJestFn.mockClear();
     escapeJestfn.mockClear();
     clickOutsideJestFn.mockClear();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/hooks/useRegisterInputEvents.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/hooks/useRegisterInputEvents.ts
index 80343923ac42..c4aa0b308519 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/hooks/useRegisterInputEvents.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/hooks/useRegisterInputEvents.ts
@@ -2,7 +2,7 @@ import { Key } from 'ts-key-enum';
 
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const useRegisterInputEvents = <T>({
   inputRef,
@@ -30,7 +30,7 @@ export const useRegisterInputEvents = <T>({
 
       onClickOutside?.(event, inputValue);
     },
-    enabled: isNonNullable(onClickOutside),
+    enabled: isDefined(onClickOutside),
   });
 
   useScopedHotkeys(
diff --git a/packages/twenty-front/src/modules/object-record/record-field/scopes/scope-internal-context/RecordFieldInputScopeInternalContext.ts b/packages/twenty-front/src/modules/object-record/record-field/scopes/scope-internal-context/RecordFieldInputScopeInternalContext.ts
index 240470e528ef..eebf6c22d583 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/scopes/scope-internal-context/RecordFieldInputScopeInternalContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/scopes/scope-internal-context/RecordFieldInputScopeInternalContext.ts
@@ -1,7 +1,7 @@
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
 import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
-type RecordFieldInputScopeInternalContextProps = StateScopeMapKey;
+type RecordFieldInputScopeInternalContextProps = ComponentStateKey;
 
 export const RecordFieldInputScopeInternalContext =
   createScopeInternalContext<RecordFieldInputScopeInternalContextProps>();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputDraftValueComponentState.ts b/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputDraftValueComponentState.ts
new file mode 100644
index 000000000000..ccc67af80746
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputDraftValueComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const recordFieldInputDraftValueComponentState =
+  createComponentState<any>({
+    key: 'recordFieldInputDraftValueComponentState',
+    defaultValue: undefined,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputDraftValueStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputDraftValueStateScopeMap.ts
deleted file mode 100644
index 1d0720c43099..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputDraftValueStateScopeMap.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const recordFieldInputDraftValueStateScopeMap = createStateScopeMap<any>(
-  {
-    key: 'recordFieldInputDraftValueStateScopeMap',
-    defaultValue: undefined,
-  },
-);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/states/selectors/recordFieldInputDraftValueComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-field/states/selectors/recordFieldInputDraftValueComponentSelector.ts
new file mode 100644
index 000000000000..e96dd4075610
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/states/selectors/recordFieldInputDraftValueComponentSelector.ts
@@ -0,0 +1,16 @@
+import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/states/recordFieldInputDraftValueComponentState';
+import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector';
+
+export const recordFieldInputDraftValueComponentSelector =
+  createComponentSelector<any>({
+    key: 'recordFieldInputDraftValueComponentSelector',
+    get:
+      <T>({ scopeId }: { scopeId: string }) =>
+      ({ get }) =>
+        get(recordFieldInputDraftValueComponentState({ scopeId })) as T,
+    set:
+      <T>({ scopeId }: { scopeId: string }) =>
+      ({ set }, newValue: T) => {
+        set(recordFieldInputDraftValueComponentState({ scopeId }), newValue);
+      },
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-field/states/selectors/recordFieldInputDraftValueSelectorScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-field/states/selectors/recordFieldInputDraftValueSelectorScopeMap.ts
deleted file mode 100644
index e785ec31374a..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-field/states/selectors/recordFieldInputDraftValueSelectorScopeMap.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { recordFieldInputDraftValueStateScopeMap } from '@/object-record/record-field/states/recordFieldInputDraftValueStateScopeMap';
-import { createSelectorScopeMap } from '@/ui/utilities/recoil-scope/utils/createSelectorScopeMap';
-
-export const recordFieldInputDraftValueSelectorScopeMap =
-  createSelectorScopeMap<any>({
-    key: 'recordFieldInputDraftValueSelectorScopeMap',
-    get:
-      <T>({ scopeId }: { scopeId: string }) =>
-      ({ get }) =>
-        get(recordFieldInputDraftValueStateScopeMap({ scopeId })) as T,
-    set:
-      <T>({ scopeId }: { scopeId: string }) =>
-      ({ set }, newValue: T) => {
-        set(recordFieldInputDraftValueStateScopeMap({ scopeId }), newValue);
-      },
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/FieldDefinition.ts b/packages/twenty-front/src/modules/object-record/record-field/types/FieldDefinition.ts
index a6611458e265..9316293d82c4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/FieldDefinition.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/FieldDefinition.ts
@@ -1,5 +1,6 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
 import { FieldMetadata } from './FieldMetadata';
-import { FieldType } from './FieldType';
 
 export type FieldDefinitionRelationType =
   | 'FROM_MANY_OBJECTS'
@@ -7,6 +8,11 @@ export type FieldDefinitionRelationType =
   | 'TO_MANY_OBJECTS'
   | 'TO_ONE_OBJECT';
 
+export type RelationDirections = {
+  from: FieldDefinitionRelationType;
+  to: FieldDefinitionRelationType;
+};
+
 export type FieldDefinition<T extends FieldMetadata> = {
   fieldMetadataId: string;
   label: string;
@@ -14,7 +20,8 @@ export type FieldDefinition<T extends FieldMetadata> = {
   disableTooltip?: boolean;
   labelWidth?: number;
   iconName: string;
-  type: FieldType;
+  type: FieldMetadataType;
   metadata: T;
   infoTooltipContent?: string;
+  defaultValue: any;
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/FieldInputDraftValue.ts b/packages/twenty-front/src/modules/object-record/record-field/types/FieldInputDraftValue.ts
index 6aea22052e45..103bb49dbd36 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/FieldInputDraftValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/FieldInputDraftValue.ts
@@ -1,11 +1,13 @@
 import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
 import {
+  FieldAddressValue,
   FieldBooleanValue,
   FieldCurrencyValue,
   FieldDateTimeValue,
   FieldEmailValue,
   FieldFullNameValue,
   FieldLinkValue,
+  FieldMultiSelectValue,
   FieldNumberValue,
   FieldPhoneValue,
   FieldRatingValue,
@@ -21,6 +23,7 @@ export type FieldDateTimeDraftValue = string;
 export type FieldPhoneDraftValue = string;
 export type FieldEmailDraftValue = string;
 export type FieldSelectDraftValue = string;
+export type FieldMultiSelectDraftValue = string[];
 export type FieldRelationDraftValue = string;
 export type FieldLinkDraftValue = { url: string; label: string };
 export type FieldCurrencyDraftValue = {
@@ -28,6 +31,16 @@ export type FieldCurrencyDraftValue = {
   amount: string;
 };
 export type FieldFullNameDraftValue = { firstName: string; lastName: string };
+export type FieldAddressDraftValue = {
+  addressStreet1: string;
+  addressStreet2: string | null;
+  addressCity: string | null;
+  addressState: string | null;
+  addressPostcode: string | null;
+  addressCountry: string | null;
+  addressLat: number | null;
+  addressLng: number | null;
+};
 
 export type FieldInputDraftValue<FieldValue> = FieldValue extends FieldTextValue
   ? FieldTextDraftValue
@@ -53,6 +66,10 @@ export type FieldInputDraftValue<FieldValue> = FieldValue extends FieldTextValue
                       ? FieldRatingValue
                       : FieldValue extends FieldSelectValue
                         ? FieldSelectDraftValue
-                        : FieldValue extends FieldRelationValue
-                          ? FieldRelationDraftValue
-                          : never;
+                        : FieldValue extends FieldMultiSelectValue
+                          ? FieldMultiSelectDraftValue
+                          : FieldValue extends FieldRelationValue
+                            ? FieldRelationDraftValue
+                            : FieldValue extends FieldAddressValue
+                              ? FieldAddressDraftValue
+                              : never;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/FieldMetadata.ts b/packages/twenty-front/src/modules/object-record/record-field/types/FieldMetadata.ts
index 74f8bbe88461..a4ad442cad35 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/FieldMetadata.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/FieldMetadata.ts
@@ -26,6 +26,12 @@ export type FieldDateTimeMetadata = {
   fieldName: string;
 };
 
+export type FieldDateMetadata = {
+  objectMetadataNameSingular?: string;
+  placeHolder: string;
+  fieldName: string;
+};
+
 export type FieldNumberMetadata = {
   objectMetadataNameSingular?: string;
   fieldName: string;
@@ -69,6 +75,18 @@ export type FieldRatingMetadata = {
   fieldName: string;
 };
 
+export type FieldAddressMetadata = {
+  objectMetadataNameSingular?: string;
+  placeHolder: string;
+  fieldName: string;
+};
+
+export type FieldRawJsonMetadata = {
+  objectMetadataNameSingular?: string;
+  fieldName: string;
+  placeHolder: string;
+};
+
 export type FieldDefinitionRelationType =
   | 'FROM_MANY_OBJECTS'
   | 'FROM_ONE_OBJECT'
@@ -91,10 +109,17 @@ export type FieldSelectMetadata = {
   options: { label: string; color: ThemeColor; value: string }[];
 };
 
+export type FieldMultiSelectMetadata = {
+  objectMetadataNameSingular?: string;
+  fieldName: string;
+  options: { label: string; color: ThemeColor; value: string }[];
+};
+
 export type FieldMetadata =
   | FieldBooleanMetadata
   | FieldCurrencyMetadata
   | FieldDateTimeMetadata
+  | FieldDateMetadata
   | FieldEmailMetadata
   | FieldFullNameMetadata
   | FieldLinkMetadata
@@ -103,12 +128,15 @@ export type FieldMetadata =
   | FieldRatingMetadata
   | FieldRelationMetadata
   | FieldSelectMetadata
+  | FieldMultiSelectMetadata
   | FieldTextMetadata
-  | FieldUuidMetadata;
+  | FieldUuidMetadata
+  | FieldAddressMetadata;
 
 export type FieldTextValue = string;
 export type FieldUUidValue = string;
 export type FieldDateTimeValue = string | null;
+export type FieldDateValue = string | null;
 export type FieldNumberValue = number | null;
 export type FieldBooleanValue = boolean;
 
@@ -120,7 +148,19 @@ export type FieldCurrencyValue = {
   amountMicros: number | null;
 };
 export type FieldFullNameValue = { firstName: string; lastName: string };
+export type FieldAddressValue = {
+  addressStreet1: string;
+  addressStreet2: string | null;
+  addressCity: string | null;
+  addressState: string | null;
+  addressPostcode: string | null;
+  addressCountry: string | null;
+  addressLat: number | null;
+  addressLng: number | null;
+};
 export type FieldRatingValue = (typeof RATING_VALUES)[number];
 export type FieldSelectValue = string | null;
+export type FieldMultiSelectValue = string[] | null;
 
 export type FieldRelationValue = EntityForSelect | null;
+export type FieldJsonValue = string;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/FieldType.ts b/packages/twenty-front/src/modules/object-record/record-field/types/FieldType.ts
deleted file mode 100644
index 1c734a526ace..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-field/types/FieldType.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export type FieldType =
-  | 'BOOLEAN'
-  | 'CHIP'
-  | 'CURRENCY'
-  | 'DATE_TIME'
-  | 'DOUBLE_TEXT_CHIP'
-  | 'DOUBLE_TEXT'
-  | 'EMAIL'
-  | 'FULL_NAME'
-  | 'LINK'
-  | 'NUMBER'
-  | 'PHONE'
-  | 'RATING'
-  | 'RELATION'
-  | 'SELECT'
-  | 'TEXT'
-  | 'URL'
-  | 'UUID';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/assertFieldMetadata.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/assertFieldMetadata.ts
index 86f1922cbeea..614a9d838d8e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/assertFieldMetadata.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/assertFieldMetadata.ts
@@ -1,24 +1,29 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
 import { FieldDefinition } from '../FieldDefinition';
 import {
+  FieldAddressMetadata,
   FieldBooleanMetadata,
   FieldCurrencyMetadata,
+  FieldDateMetadata,
   FieldDateTimeMetadata,
   FieldEmailMetadata,
   FieldFullNameMetadata,
   FieldLinkMetadata,
   FieldMetadata,
+  FieldMultiSelectMetadata,
   FieldNumberMetadata,
   FieldPhoneMetadata,
   FieldRatingMetadata,
+  FieldRawJsonMetadata,
   FieldRelationMetadata,
   FieldSelectMetadata,
   FieldTextMetadata,
   FieldUuidMetadata,
 } from '../FieldMetadata';
-import { FieldType } from '../FieldType';
 
 type AssertFieldMetadataFunction = <
-  E extends FieldType,
+  E extends FieldMetadataType,
   T extends E extends 'BOOLEAN'
     ? FieldBooleanMetadata
     : E extends 'CURRENCY'
@@ -27,27 +32,35 @@ type AssertFieldMetadataFunction = <
         ? FieldFullNameMetadata
         : E extends 'DATE_TIME'
           ? FieldDateTimeMetadata
-          : E extends 'EMAIL'
-            ? FieldEmailMetadata
-            : E extends 'SELECT'
-              ? FieldSelectMetadata
-              : E extends 'RATING'
-                ? FieldRatingMetadata
-                : E extends 'LINK'
-                  ? FieldLinkMetadata
-                  : E extends 'NUMBER'
-                    ? FieldNumberMetadata
-                    : E extends 'PHONE'
-                      ? FieldPhoneMetadata
-                      : E extends 'PROBABILITY'
-                        ? FieldRatingMetadata
-                        : E extends 'RELATION'
-                          ? FieldRelationMetadata
-                          : E extends 'TEXT'
-                            ? FieldTextMetadata
-                            : E extends 'UUID'
-                              ? FieldUuidMetadata
-                              : never,
+          : E extends 'DATE'
+            ? FieldDateMetadata
+            : E extends 'EMAIL'
+              ? FieldEmailMetadata
+              : E extends 'SELECT'
+                ? FieldSelectMetadata
+                : E extends 'MULTI_SELECT'
+                  ? FieldMultiSelectMetadata
+                  : E extends 'RATING'
+                    ? FieldRatingMetadata
+                    : E extends 'LINK'
+                      ? FieldLinkMetadata
+                      : E extends 'NUMBER'
+                        ? FieldNumberMetadata
+                        : E extends 'PHONE'
+                          ? FieldPhoneMetadata
+                          : E extends 'PROBABILITY'
+                            ? FieldRatingMetadata
+                            : E extends 'RELATION'
+                              ? FieldRelationMetadata
+                              : E extends 'TEXT'
+                                ? FieldTextMetadata
+                                : E extends 'UUID'
+                                  ? FieldUuidMetadata
+                                  : E extends 'ADDRESS'
+                                    ? FieldAddressMetadata
+                                    : E extends 'RAW_JSON'
+                                      ? FieldRawJsonMetadata
+                                      : never,
 >(
   fieldType: E,
   fieldTypeGuard: (
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldAddress.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldAddress.ts
new file mode 100644
index 000000000000..c552808118ef
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldAddress.ts
@@ -0,0 +1,9 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql.ts';
+
+import { FieldDefinition } from '../FieldDefinition';
+import { FieldAddressMetadata, FieldMetadata } from '../FieldMetadata';
+
+export const isFieldAddress = (
+  field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
+): field is FieldDefinition<FieldAddressMetadata> =>
+  field.type === FieldMetadataType.Address;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldAddressValue.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldAddressValue.ts
new file mode 100644
index 000000000000..8bc33766e803
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldAddressValue.ts
@@ -0,0 +1,19 @@
+import { z } from 'zod';
+
+import { FieldAddressValue } from '../FieldMetadata';
+
+const addressSchema = z.object({
+  addressStreet1: z.string(),
+  addressStreet2: z.string().nullable(),
+  addressCity: z.string().nullable(),
+  addressState: z.string().nullable(),
+  addressPostcode: z.string().nullable(),
+  addressCountry: z.string().nullable(),
+  addressLat: z.number().nullable(),
+  addressLng: z.number().nullable(),
+});
+
+export const isFieldAddressValue = (
+  fieldValue: unknown,
+): fieldValue is FieldAddressValue =>
+  addressSchema.safeParse(fieldValue).success;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldBoolean.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldBoolean.ts
index d0c2a09d7fcb..69add94d5629 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldBoolean.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldBoolean.ts
@@ -1,6 +1,9 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql.ts';
+
 import { FieldDefinition } from '../FieldDefinition';
 import { FieldBooleanMetadata, FieldMetadata } from '../FieldMetadata';
 
 export const isFieldBoolean = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
-): field is FieldDefinition<FieldBooleanMetadata> => field.type === 'BOOLEAN';
+): field is FieldDefinition<FieldBooleanMetadata> =>
+  field.type === FieldMetadataType.Boolean;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldCurrency.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldCurrency.ts
index 1cba9a16996d..b6738c0bb689 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldCurrency.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldCurrency.ts
@@ -1,6 +1,9 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql.ts';
+
 import { FieldDefinition } from '../FieldDefinition';
 import { FieldCurrencyMetadata, FieldMetadata } from '../FieldMetadata';
 
 export const isFieldCurrency = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
-): field is FieldDefinition<FieldCurrencyMetadata> => field.type === 'CURRENCY';
+): field is FieldDefinition<FieldCurrencyMetadata> =>
+  field.type === FieldMetadataType.Currency;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDate.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDate.ts
new file mode 100644
index 000000000000..513d41256b21
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDate.ts
@@ -0,0 +1,6 @@
+import { FieldDefinition } from '../FieldDefinition';
+import { FieldDateMetadata, FieldMetadata } from '../FieldMetadata';
+
+export const isFieldDate = (
+  field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
+): field is FieldDefinition<FieldDateMetadata> => field.type === 'DATE';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDateTime.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDateTime.ts
index f98fa6846aa7..15c2a01c5347 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDateTime.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDateTime.ts
@@ -1,7 +1,9 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql.ts';
+
 import { FieldDefinition } from '../FieldDefinition';
 import { FieldDateTimeMetadata, FieldMetadata } from '../FieldMetadata';
 
 export const isFieldDateTime = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldDateTimeMetadata> =>
-  field.type === 'DATE_TIME';
+  field.type === FieldMetadataType.DateTime;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDateValue.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDateValue.ts
new file mode 100644
index 000000000000..e0fba3239f7a
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDateValue.ts
@@ -0,0 +1,10 @@
+import { isNull, isString } from '@sniptt/guards';
+
+import { FieldDateValue } from '@/object-record/record-field/types/FieldMetadata';
+
+// TODO: add zod
+export const isFieldDateValue = (
+  fieldValue: unknown,
+): fieldValue is FieldDateValue =>
+  (isString(fieldValue) && !isNaN(Date.parse(fieldValue))) ||
+  isNull(fieldValue);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldEmail.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldEmail.ts
index bd5f5e4c12e9..265301773c4f 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldEmail.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldEmail.ts
@@ -1,6 +1,9 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql.ts';
+
 import { FieldDefinition } from '../FieldDefinition';
 import { FieldEmailMetadata, FieldMetadata } from '../FieldMetadata';
 
 export const isFieldEmail = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
-): field is FieldDefinition<FieldEmailMetadata> => field.type === 'EMAIL';
+): field is FieldDefinition<FieldEmailMetadata> =>
+  field.type === FieldMetadataType.Email;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldFullName.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldFullName.ts
index be25711176ed..a6261d6428d6 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldFullName.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldFullName.ts
@@ -1,7 +1,9 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql.ts';
+
 import { FieldDefinition } from '../FieldDefinition';
 import { FieldFullNameMetadata, FieldMetadata } from '../FieldMetadata';
 
 export const isFieldFullName = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldFullNameMetadata> =>
-  field.type === 'FULL_NAME';
+  field.type === FieldMetadataType.FullName;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldLink.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldLink.ts
index 0c957c004236..526881a8a356 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldLink.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldLink.ts
@@ -1,6 +1,9 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql.ts';
+
 import { FieldDefinition } from '../FieldDefinition';
 import { FieldLinkMetadata, FieldMetadata } from '../FieldMetadata';
 
 export const isFieldLink = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
-): field is FieldDefinition<FieldLinkMetadata> => field.type === 'LINK';
+): field is FieldDefinition<FieldLinkMetadata> =>
+  field.type === FieldMetadataType.Link;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldMultiSelect.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldMultiSelect.ts
new file mode 100644
index 000000000000..e799738e6894
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldMultiSelect.ts
@@ -0,0 +1,11 @@
+import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition.ts';
+import {
+  FieldMetadata,
+  FieldMultiSelectMetadata,
+} from '@/object-record/record-field/types/FieldMetadata.ts';
+import { FieldMetadataType } from '~/generated-metadata/graphql.ts';
+
+export const isFieldMultiSelect = (
+  field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
+): field is FieldDefinition<FieldMultiSelectMetadata> =>
+  field.type === FieldMetadataType.MultiSelect;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldMultiSelectValue.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldMultiSelectValue.ts
new file mode 100644
index 000000000000..01d2b47ff8ef
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldMultiSelectValue.ts
@@ -0,0 +1,9 @@
+import { FieldMultiSelectValue } from '@/object-record/record-field/types/FieldMetadata.ts';
+import { multiSelectFieldValueSchema } from '@/object-record/record-field/validation-schemas/multiSelectFieldValueSchema.ts';
+
+export const isFieldMultiSelectValue = (
+  fieldValue: unknown,
+  options?: string[],
+): fieldValue is FieldMultiSelectValue => {
+  return multiSelectFieldValueSchema(options).safeParse(fieldValue).success;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldNumber.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldNumber.ts
index b4b5c7b8d109..6b863170ad92 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldNumber.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldNumber.ts
@@ -1,6 +1,9 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql.ts';
+
 import { FieldDefinition } from '../FieldDefinition';
 import { FieldMetadata, FieldNumberMetadata } from '../FieldMetadata';
 
 export const isFieldNumber = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
-): field is FieldDefinition<FieldNumberMetadata> => field.type === 'NUMBER';
+): field is FieldDefinition<FieldNumberMetadata> =>
+  field.type === FieldMetadataType.Number;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldPhone.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldPhone.ts
index 9e84a5c42662..a417d1fb0d34 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldPhone.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldPhone.ts
@@ -1,3 +1,5 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql.ts';
+
 import { FieldDefinition } from '../FieldDefinition';
 import { FieldMetadata, FieldPhoneMetadata } from '../FieldMetadata';
 
@@ -6,4 +8,4 @@ export const isFieldPhone = (
 ): field is FieldDefinition<FieldPhoneMetadata> =>
   field.metadata.objectMetadataNameSingular === 'person' &&
   field.metadata.fieldName === 'phone' &&
-  field.type === 'TEXT';
+  field.type === FieldMetadataType.Text;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRawJson.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRawJson.ts
new file mode 100644
index 000000000000..1cdc93665cea
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRawJson.ts
@@ -0,0 +1,9 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql.ts';
+
+import { FieldDefinition } from '../FieldDefinition';
+import { FieldMetadata, FieldRawJsonMetadata } from '../FieldMetadata';
+
+export const isFieldRawJson = (
+  field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
+): field is FieldDefinition<FieldRawJsonMetadata> =>
+  field.type === FieldMetadataType.RawJson;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRawJsonValue.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRawJsonValue.ts
new file mode 100644
index 000000000000..8c7657d8dc4b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRawJsonValue.ts
@@ -0,0 +1,8 @@
+import { isNull, isString } from '@sniptt/guards';
+
+import { FieldJsonValue } from '../FieldMetadata';
+
+// TODO: add zod
+export const isFieldRawJsonValue = (
+  fieldValue: unknown,
+): fieldValue is FieldJsonValue => isString(fieldValue) || isNull(fieldValue);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelation.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelation.ts
index 2927569c3514..b64046647cff 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelation.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelation.ts
@@ -1,6 +1,9 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql.ts';
+
 import { FieldDefinition } from '../FieldDefinition';
 import { FieldMetadata, FieldRelationMetadata } from '../FieldMetadata';
 
 export const isFieldRelation = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
-): field is FieldDefinition<FieldRelationMetadata> => field.type === 'RELATION';
+): field is FieldDefinition<FieldRelationMetadata> =>
+  field.type === FieldMetadataType.Relation;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldSelectValue.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldSelectValue.ts
index 55dbaa4a605c..0c95b795b2ac 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldSelectValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldSelectValue.ts
@@ -1,7 +1,8 @@
-import { isString } from '@sniptt/guards';
-
 import { FieldSelectValue } from '@/object-record/record-field/types/FieldMetadata';
+import { selectFieldValueSchema } from '@/object-record/record-field/validation-schemas/selectFieldValueSchema';
 
 export const isFieldSelectValue = (
   fieldValue: unknown,
-): fieldValue is FieldSelectValue => isString(fieldValue);
+  options?: string[],
+): fieldValue is FieldSelectValue =>
+  selectFieldValueSchema(options).safeParse(fieldValue).success;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldText.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldText.ts
index 7c1b5eee1250..197c46046742 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldText.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldText.ts
@@ -1,6 +1,9 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql.ts';
+
 import { FieldDefinition } from '../FieldDefinition';
 import { FieldMetadata, FieldTextMetadata } from '../FieldMetadata';
 
 export const isFieldText = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
-): field is FieldDefinition<FieldTextMetadata> => field.type === 'TEXT';
+): field is FieldDefinition<FieldTextMetadata> =>
+  field.type === FieldMetadataType.Text;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldUuid.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldUuid.ts
index 84f83e2b1f82..a8bf679c555e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldUuid.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldUuid.ts
@@ -1,6 +1,9 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql.ts';
+
 import { FieldDefinition } from '../FieldDefinition';
 import { FieldMetadata, FieldUuidMetadata } from '../FieldMetadata';
 
 export const isFieldUuid = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
-): field is FieldDefinition<FieldUuidMetadata> => field.type === 'UUID';
+): field is FieldDefinition<FieldUuidMetadata> =>
+  field.type === FieldMetadataType.Uuid;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/utils/computeDraftValueFromFieldValue.ts b/packages/twenty-front/src/modules/object-record/record-field/utils/computeDraftValueFromFieldValue.ts
index ee11e822cbfa..72c024f7afe9 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/utils/computeDraftValueFromFieldValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/utils/computeDraftValueFromFieldValue.ts
@@ -1,4 +1,3 @@
-import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
 import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition';
 import { FieldInputDraftValue } from '@/object-record/record-field/types/FieldInputDraftValue';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
@@ -31,7 +30,7 @@ export const computeDraftValueFromFieldValue = <FieldValue>({
 
     return {
       amount: fieldValue?.amountMicros ? fieldValue.amountMicros / 1000000 : '',
-      currenyCode: CurrencyCode.USD,
+      currencyCode: fieldValue?.currencyCode ?? '',
     } as unknown as FieldInputDraftValue<FieldValue>;
   }
   if (isFieldRelation(fieldDefinition)) {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueEmpty.ts b/packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueEmpty.ts
index d4f8877f555f..ded220c98888 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueEmpty.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueEmpty.ts
@@ -1,52 +1,68 @@
 import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
+import { isFieldAddress } from '@/object-record/record-field/types/guards/isFieldAddress';
+import { isFieldAddressValue } from '@/object-record/record-field/types/guards/isFieldAddressValue';
 import { isFieldBoolean } from '@/object-record/record-field/types/guards/isFieldBoolean';
 import { isFieldCurrency } from '@/object-record/record-field/types/guards/isFieldCurrency';
 import { isFieldCurrencyValue } from '@/object-record/record-field/types/guards/isFieldCurrencyValue';
+import { isFieldDate } from '@/object-record/record-field/types/guards/isFieldDate';
 import { isFieldDateTime } from '@/object-record/record-field/types/guards/isFieldDateTime';
 import { isFieldEmail } from '@/object-record/record-field/types/guards/isFieldEmail';
 import { isFieldFullName } from '@/object-record/record-field/types/guards/isFieldFullName';
 import { isFieldFullNameValue } from '@/object-record/record-field/types/guards/isFieldFullNameValue';
 import { isFieldLink } from '@/object-record/record-field/types/guards/isFieldLink';
 import { isFieldLinkValue } from '@/object-record/record-field/types/guards/isFieldLinkValue';
+import { isFieldMultiSelect } from '@/object-record/record-field/types/guards/isFieldMultiSelect.ts';
+import { isFieldMultiSelectValue } from '@/object-record/record-field/types/guards/isFieldMultiSelectValue.ts';
 import { isFieldNumber } from '@/object-record/record-field/types/guards/isFieldNumber';
 import { isFieldRating } from '@/object-record/record-field/types/guards/isFieldRating';
+import { isFieldRawJson } from '@/object-record/record-field/types/guards/isFieldRawJson';
 import { isFieldRelation } from '@/object-record/record-field/types/guards/isFieldRelation';
-import { isFieldRelationValue } from '@/object-record/record-field/types/guards/isFieldRelationValue';
 import { isFieldSelect } from '@/object-record/record-field/types/guards/isFieldSelect';
 import { isFieldSelectValue } from '@/object-record/record-field/types/guards/isFieldSelectValue';
 import { isFieldText } from '@/object-record/record-field/types/guards/isFieldText';
 import { isFieldUuid } from '@/object-record/record-field/types/guards/isFieldUuid';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
-const isValueEmpty = (value: unknown) => !isNonNullable(value) || value === '';
+const isValueEmpty = (value: unknown) => !isDefined(value) || value === '';
 
 export const isFieldValueEmpty = ({
   fieldDefinition,
   fieldValue,
+  selectOptionValues,
 }: {
   fieldDefinition: Pick<FieldDefinition<FieldMetadata>, 'type'>;
   fieldValue: unknown;
+  selectOptionValues?: string[];
 }) => {
   if (
     isFieldUuid(fieldDefinition) ||
     isFieldText(fieldDefinition) ||
     isFieldDateTime(fieldDefinition) ||
+    isFieldDate(fieldDefinition) ||
     isFieldNumber(fieldDefinition) ||
     isFieldRating(fieldDefinition) ||
     isFieldEmail(fieldDefinition) ||
-    isFieldBoolean(fieldDefinition)
+    isFieldBoolean(fieldDefinition) ||
+    isFieldRelation(fieldDefinition) ||
+    isFieldRawJson(fieldDefinition)
     //|| isFieldPhone(fieldDefinition)
   ) {
     return isValueEmpty(fieldValue);
   }
 
-  if (isFieldRelation(fieldDefinition)) {
-    return isFieldRelationValue(fieldValue) && isValueEmpty(fieldValue);
+  if (isFieldSelect(fieldDefinition)) {
+    return (
+      !isFieldSelectValue(fieldValue, selectOptionValues) ||
+      !isDefined(fieldValue)
+    );
   }
 
-  if (isFieldSelect(fieldDefinition)) {
-    return isFieldSelectValue(fieldValue) && !isNonNullable(fieldValue);
+  if (isFieldMultiSelect(fieldDefinition)) {
+    return (
+      !isFieldMultiSelectValue(fieldValue, selectOptionValues) ||
+      !isDefined(fieldValue)
+    );
   }
 
   if (isFieldCurrency(fieldDefinition)) {
@@ -67,7 +83,19 @@ export const isFieldValueEmpty = ({
     return !isFieldLinkValue(fieldValue) || isValueEmpty(fieldValue?.url);
   }
 
+  if (isFieldAddress(fieldDefinition)) {
+    return (
+      !isFieldAddressValue(fieldValue) ||
+      (isValueEmpty(fieldValue?.addressStreet1) &&
+        isValueEmpty(fieldValue?.addressStreet2) &&
+        isValueEmpty(fieldValue?.addressCity) &&
+        isValueEmpty(fieldValue?.addressState) &&
+        isValueEmpty(fieldValue?.addressPostcode) &&
+        isValueEmpty(fieldValue?.addressCountry))
+    );
+  }
+
   throw new Error(
-    `Entity field type not supported in isEntityFieldEditModeEmptyFamilySelector : ${fieldDefinition.type}}`,
+    `Entity field type not supported in isFieldValueEmpty : ${fieldDefinition.type}}`,
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueJson.ts b/packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueJson.ts
new file mode 100644
index 000000000000..6e577e7794d5
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueJson.ts
@@ -0,0 +1,12 @@
+import { isString } from '@sniptt/guards';
+
+export const isValidJSON = (str: string) => {
+  try {
+    if (isString(JSON.parse(str))) {
+      throw new Error(`Strings are not supported as JSON: ${str}`);
+    }
+    return true;
+  } catch (error) {
+    return false;
+  }
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/validation-schemas/multiSelectFieldValueSchema.ts b/packages/twenty-front/src/modules/object-record/record-field/validation-schemas/multiSelectFieldValueSchema.ts
new file mode 100644
index 000000000000..c4da1fc75ce6
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/validation-schemas/multiSelectFieldValueSchema.ts
@@ -0,0 +1,10 @@
+import { z } from 'zod';
+
+import { FieldMultiSelectValue } from '@/object-record/record-field/types/FieldMetadata';
+
+export const multiSelectFieldValueSchema = (
+  options?: string[],
+): z.ZodType<FieldMultiSelectValue> =>
+  options?.length
+    ? z.array(z.enum(options as [string, ...string[]])).nullable()
+    : z.array(z.string()).nullable();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/validation-schemas/selectFieldValueSchema.ts b/packages/twenty-front/src/modules/object-record/record-field/validation-schemas/selectFieldValueSchema.ts
new file mode 100644
index 000000000000..ca79234e8d89
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/validation-schemas/selectFieldValueSchema.ts
@@ -0,0 +1,10 @@
+import { z } from 'zod';
+
+import { FieldSelectValue } from '@/object-record/record-field/types/FieldMetadata';
+
+export const selectFieldValueSchema = (
+  options?: string[],
+): z.ZodType<FieldSelectValue> =>
+  options?.length
+    ? z.enum(options as [string, ...string[]]).nullable()
+    : z.string().nullable();
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/types/ObjectRecordQueryFilter.ts b/packages/twenty-front/src/modules/object-record/record-filter/types/ObjectRecordQueryFilter.ts
index e86ac4da627c..768221f5f8a8 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/types/ObjectRecordQueryFilter.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/types/ObjectRecordQueryFilter.ts
@@ -71,6 +71,15 @@ export type FullNameFilter = {
   lastName?: StringFilter;
 };
 
+export type AddressFilter = {
+  addressStreet1?: StringFilter;
+  addressStreet2?: StringFilter;
+  addressCity?: StringFilter;
+  addressState?: StringFilter;
+  addressCountry?: StringFilter;
+  addressPostcode?: StringFilter;
+};
+
 export type LeafFilter =
   | UUIDFilter
   | StringFilter
@@ -80,6 +89,7 @@ export type LeafFilter =
   | URLFilter
   | FullNameFilter
   | BooleanFilter
+  | AddressFilter
   | undefined;
 
 export type AndObjectRecordFilter = {
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts
index 9a2ff1ff84c2..53a803ef266d 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts
@@ -2,6 +2,7 @@ import { isObject } from '@sniptt/guards';
 
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import {
+  AddressFilter,
   AndObjectRecordFilter,
   BooleanFilter,
   CurrencyFilter,
@@ -22,8 +23,8 @@ import { isMatchingFloatFilter } from '@/object-record/record-filter/utils/isMat
 import { isMatchingStringFilter } from '@/object-record/record-filter/utils/isMatchingStringFilter';
 import { isMatchingUUIDFilter } from '@/object-record/record-filter/utils/isMatchingUUIDFilter';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { isDefined } from '~/utils/isDefined';
 import { isEmptyObject } from '~/utils/isEmptyObject';
-import { isNonNullable } from '~/utils/isNonNullable';
 
 const isAndFilter = (
   filter: ObjectRecordQueryFilter,
@@ -102,7 +103,7 @@ export const isRecordMatchingFilter = ({
   if (isNotFilter(filter)) {
     const filterValue = filter.not;
 
-    if (!isNonNullable(filterValue)) {
+    if (!isDefined(filterValue)) {
       throw new Error('Unexpected value for "not" filter : ' + filterValue);
     }
 
@@ -117,7 +118,7 @@ export const isRecordMatchingFilter = ({
   }
 
   return Object.entries(filter).every(([filterKey, filterValue]) => {
-    if (!isNonNullable(filterValue)) {
+    if (!isDefined(filterValue)) {
       throw new Error(
         'Unexpected value for filter key "' + filterKey + '" : ' + filterValue,
       );
@@ -129,7 +130,7 @@ export const isRecordMatchingFilter = ({
       (field) => field.name === filterKey,
     );
 
-    if (!isNonNullable(objectMetadataField)) {
+    if (!isDefined(objectMetadataField)) {
       throw new Error(
         'Field metadata item "' +
           filterKey +
@@ -141,6 +142,8 @@ export const isRecordMatchingFilter = ({
     switch (objectMetadataField.type) {
       case FieldMetadataType.Email:
       case FieldMetadataType.Phone:
+      case FieldMetadataType.Select:
+      case FieldMetadataType.MultiSelect:
       case FieldMetadataType.Text: {
         return isMatchingStringFilter({
           stringFilter: filterValue as StringFilter,
@@ -179,6 +182,30 @@ export const isRecordMatchingFilter = ({
             }))
         );
       }
+      case FieldMetadataType.Address: {
+        const addressFilter = filterValue as AddressFilter;
+
+        const keys = [
+          'addressStreet1',
+          'addressStreet2',
+          'addressCity',
+          'addressState',
+          'addressCountry',
+          'addressPostcode',
+        ] as const;
+
+        return keys.some((key) => {
+          const value = addressFilter[key];
+          if (value === undefined) {
+            return false;
+          }
+
+          return isMatchingStringFilter({
+            stringFilter: value,
+            value: record[filterKey][key],
+          });
+        });
+      }
       case FieldMetadataType.DateTime: {
         return isMatchingDateFilter({
           dateFilter: filterValue as DateFilter,
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/turnObjectDropdownFilterIntoQueryFilter.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/turnObjectDropdownFilterIntoQueryFilter.ts
index 352166c0a96b..c6974c4356b1 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/utils/turnObjectDropdownFilterIntoQueryFilter.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/turnObjectDropdownFilterIntoQueryFilter.ts
@@ -1,4 +1,7 @@
+import { isNonEmptyString } from '@sniptt/guards';
+
 import {
+  AddressFilter,
   CurrencyFilter,
   DateFilter,
   FloatFilter,
@@ -11,7 +14,7 @@ import {
 import { makeAndFilterVariables } from '@/object-record/utils/makeAndFilterVariables';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { Field } from '~/generated/graphql';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 import { Filter } from '../../object-filter-dropdown/types/Filter';
 
@@ -33,13 +36,11 @@ export const turnObjectDropdownFilterIntoQueryFilter = (
     );
 
     if (!correspondingField) {
-      throw new Error(
-        `Could not find field ${rawUIFilter.fieldMetadataId} in metadata object`,
-      );
+      continue;
     }
 
-    if (!isNonNullable(rawUIFilter.value) || rawUIFilter.value === '') {
-      return undefined;
+    if (!isDefined(rawUIFilter.value) || rawUIFilter.value === '') {
+      continue;
     }
 
     switch (rawUIFilter.definition.type) {
@@ -134,7 +135,7 @@ export const turnObjectDropdownFilterIntoQueryFilter = (
               });
               break;
             case ViewFilterOperand.IsNot:
-              if (parsedRecordIds.length) {
+              if (parsedRecordIds.length > 0) {
                 objectRecordFilters.push({
                   not: {
                     [correspondingField.name + 'Id']: {
@@ -254,6 +255,116 @@ export const turnObjectDropdownFilterIntoQueryFilter = (
             );
         }
         break;
+      case 'ADDRESS':
+        switch (rawUIFilter.operand) {
+          case ViewFilterOperand.Contains:
+            objectRecordFilters.push({
+              or: [
+                {
+                  [correspondingField.name]: {
+                    addressStreet1: {
+                      ilike: `%${rawUIFilter.value}%`,
+                    },
+                  } as AddressFilter,
+                },
+                {
+                  [correspondingField.name]: {
+                    addressStreet2: {
+                      ilike: `%${rawUIFilter.value}%`,
+                    },
+                  } as AddressFilter,
+                },
+                {
+                  [correspondingField.name]: {
+                    addressCity: {
+                      ilike: `%${rawUIFilter.value}%`,
+                    },
+                  } as AddressFilter,
+                },
+              ],
+            });
+            break;
+          case ViewFilterOperand.DoesNotContain:
+            objectRecordFilters.push({
+              and: [
+                {
+                  not: {
+                    [correspondingField.name]: {
+                      addressStreet1: {
+                        ilike: `%${rawUIFilter.value}%`,
+                      },
+                    } as AddressFilter,
+                  },
+                },
+                {
+                  not: {
+                    [correspondingField.name]: {
+                      addressStreet2: {
+                        ilike: `%${rawUIFilter.value}%`,
+                      },
+                    } as AddressFilter,
+                  },
+                },
+                {
+                  not: {
+                    [correspondingField.name]: {
+                      addressCity: {
+                        ilike: `%${rawUIFilter.value}%`,
+                      },
+                    } as AddressFilter,
+                  },
+                },
+              ],
+            });
+            break;
+          default:
+            throw new Error(
+              `Unknown operand ${rawUIFilter.operand} for ${rawUIFilter.definition.type} filter`,
+            );
+        }
+        break;
+      case 'SELECT': {
+        const stringifiedSelectValues = rawUIFilter.value;
+        let parsedOptionValues: string[] = [];
+
+        if (!isNonEmptyString(stringifiedSelectValues)) {
+          break;
+        }
+
+        try {
+          parsedOptionValues = JSON.parse(stringifiedSelectValues);
+        } catch (e) {
+          throw new Error(
+            `Cannot parse filter value for SELECT filter : "${stringifiedSelectValues}"`,
+          );
+        }
+
+        if (parsedOptionValues.length > 0) {
+          switch (rawUIFilter.operand) {
+            case ViewFilterOperand.Is:
+              objectRecordFilters.push({
+                [correspondingField.name]: {
+                  in: parsedOptionValues,
+                } as UUIDFilter,
+              });
+              break;
+            case ViewFilterOperand.IsNot:
+              objectRecordFilters.push({
+                not: {
+                  [correspondingField.name]: {
+                    in: parsedOptionValues,
+                  } as UUIDFilter,
+                },
+              });
+              break;
+            default:
+              throw new Error(
+                `Unknown operand ${rawUIFilter.operand} for ${rawUIFilter.definition.type} filter`,
+              );
+          }
+        }
+        break;
+      }
       default:
         throw new Error('Unknown filter type');
     }
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardContainer.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardContainer.tsx
index 2fd30265fc38..bd412f91020e 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardContainer.tsx
@@ -1,4 +1,6 @@
-import { useObjectMetadataItemOnly } from '@/object-metadata/hooks/useObjectMetadataItemOnly';
+import { useRecoilValue } from 'recoil';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
@@ -6,7 +8,7 @@ import { RecordBoardActionBar } from '@/object-record/record-board/action-bar/co
 import { RecordBoard } from '@/object-record/record-board/components/RecordBoard';
 import { RecordBoardContextMenu } from '@/object-record/record-board/context-menu/components/RecordBoardContextMenu';
 import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
-import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { recordIndexKanbanFieldMetadataIdState } from '@/object-record/record-index/states/recordIndexKanbanFieldMetadataIdState';
 
 type RecordIndexBoardContainerProps = {
   recordBoardId: string;
@@ -19,12 +21,16 @@ export const RecordIndexBoardContainer = ({
   recordBoardId,
   objectNameSingular,
 }: RecordIndexBoardContainerProps) => {
-  const { objectMetadataItem } = useObjectMetadataItemOnly({
+  const { objectMetadataItem } = useObjectMetadataItem({
     objectNameSingular,
   });
 
+  const recordIndexKanbanFieldMetadataId = useRecoilValue(
+    recordIndexKanbanFieldMetadataIdState,
+  );
+
   const selectFieldMetadataItem = objectMetadataItem.fields.find(
-    (field) => field.type === FieldMetadataType.Select,
+    (field) => field.id === recordIndexKanbanFieldMetadataId,
   );
 
   const { deleteOneRecord } = useDeleteOneRecord({ objectNameSingular });
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardContainerEffect.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardContainerEffect.tsx
index 44f0ab12af37..4a755169d0e6 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardContainerEffect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardContainerEffect.tsx
@@ -2,13 +2,16 @@ import { useCallback, useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useRecoilValue, useSetRecoilState } from 'recoil';
 
-import { useObjectMetadataItemOnly } from '@/object-metadata/hooks/useObjectMetadataItemOnly';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useRecordActionBar } from '@/object-record/record-action-bar/hooks/useRecordActionBar';
 import { useRecordBoard } from '@/object-record/record-board/hooks/useRecordBoard';
 import { useRecordBoardSelection } from '@/object-record/record-board/hooks/useRecordBoardSelection';
 import { useLoadRecordIndexBoard } from '@/object-record/record-index/hooks/useLoadRecordIndexBoard';
 import { recordIndexFieldDefinitionsState } from '@/object-record/record-index/states/recordIndexFieldDefinitionsState';
+import { recordIndexKanbanFieldMetadataIdState } from '@/object-record/record-index/states/recordIndexKanbanFieldMetadataIdState';
 import { computeRecordBoardColumnDefinitionsFromObjectMetadata } from '@/object-record/utils/computeRecordBoardColumnDefinitionsFromObjectMetadata';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { isDefined } from '~/utils/isDefined';
 
 type RecordIndexBoardContainerEffectProps = {
   objectNameSingular: string;
@@ -21,16 +24,17 @@ export const RecordIndexBoardContainerEffect = ({
   recordBoardId,
   viewBarId,
 }: RecordIndexBoardContainerEffectProps) => {
-  const { objectMetadataItem } = useObjectMetadataItemOnly({
+  const { objectMetadataItem } = useObjectMetadataItem({
     objectNameSingular,
   });
 
   const {
     setColumns,
     setObjectSingularName,
-    getSelectedRecordIdsSelector,
+    selectedRecordIdsSelector,
     setFieldDefinitions,
-    getOnFetchMoreVisibilityChangeState,
+    onFetchMoreVisibilityChangeState,
+    setKanbanFieldMetadataName,
   } = useRecordBoard(recordBoardId);
 
   const { fetchMoreRecords, loading } = useLoadRecordIndexBoard({
@@ -40,7 +44,11 @@ export const RecordIndexBoardContainerEffect = ({
   });
 
   const setOnFetchMoreVisibilityChange = useSetRecoilState(
-    getOnFetchMoreVisibilityChangeState(),
+    onFetchMoreVisibilityChangeState,
+  );
+
+  const recordIndexKanbanFieldMetadataId = useRecoilValue(
+    recordIndexKanbanFieldMetadataIdState,
   );
 
   useEffect(() => {
@@ -67,6 +75,7 @@ export const RecordIndexBoardContainerEffect = ({
     setColumns(
       computeRecordBoardColumnDefinitionsFromObjectMetadata(
         objectMetadataItem,
+        recordIndexKanbanFieldMetadataId ?? '',
         navigateToSelectSettings,
       ),
     );
@@ -74,6 +83,7 @@ export const RecordIndexBoardContainerEffect = ({
     navigateToSelectSettings,
     objectMetadataItem,
     objectNameSingular,
+    recordIndexKanbanFieldMetadataId,
     setColumns,
   ]);
 
@@ -85,7 +95,25 @@ export const RecordIndexBoardContainerEffect = ({
     setFieldDefinitions(recordIndexFieldDefinitions);
   }, [objectMetadataItem, setFieldDefinitions, recordIndexFieldDefinitions]);
 
-  const selectedRecordIds = useRecoilValue(getSelectedRecordIdsSelector());
+  useEffect(() => {
+    if (isDefined(recordIndexKanbanFieldMetadataId)) {
+      const kanbanFieldMetadataName = objectMetadataItem?.fields.find(
+        (field) =>
+          field.type === FieldMetadataType.Select &&
+          field.id === recordIndexKanbanFieldMetadataId,
+      )?.name;
+
+      if (isDefined(kanbanFieldMetadataName)) {
+        setKanbanFieldMetadataName(kanbanFieldMetadataName);
+      }
+    }
+  }, [
+    objectMetadataItem,
+    recordIndexKanbanFieldMetadataId,
+    setKanbanFieldMetadataName,
+  ]);
+
+  const selectedRecordIds = useRecoilValue(selectedRecordIdsSelector());
 
   const { setActionBarEntries, setContextMenuEntries } = useRecordActionBar({
     objectMetadataItem,
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainer.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainer.tsx
index 81679b9c64f2..3fceb3f2cce3 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainer.tsx
@@ -10,10 +10,10 @@ import { RecordIndexTableContainer } from '@/object-record/record-index/componen
 import { RecordIndexTableContainerEffect } from '@/object-record/record-index/components/RecordIndexTableContainerEffect';
 import { RecordIndexViewBarEffect } from '@/object-record/record-index/components/RecordIndexViewBarEffect';
 import { RecordIndexOptionsDropdown } from '@/object-record/record-index/options/components/RecordIndexOptionsDropdown';
-import { RECORD_INDEX_OPTIONS_DROPDOWN_ID } from '@/object-record/record-index/options/constants/RecordIndexOptionsDropdownId';
 import { recordIndexFieldDefinitionsState } from '@/object-record/record-index/states/recordIndexFieldDefinitionsState';
 import { recordIndexFiltersState } from '@/object-record/record-index/states/recordIndexFiltersState';
 import { recordIndexIsCompactModeActiveState } from '@/object-record/record-index/states/recordIndexIsCompactModeActiveState';
+import { recordIndexKanbanFieldMetadataIdState } from '@/object-record/record-index/states/recordIndexKanbanFieldMetadataIdState';
 import { recordIndexSortsState } from '@/object-record/record-index/states/recordIndexSortsState';
 import { recordIndexViewTypeState } from '@/object-record/record-index/states/recordIndexViewTypeState';
 import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
@@ -57,7 +57,7 @@ export const RecordIndexContainer = ({
     objectNameSingular,
   });
 
-  const { columnDefinitions } =
+  const { columnDefinitions, filterDefinitions, sortDefinitions } =
     useColumnDefinitionsFromFieldMetadata(objectMetadataItem);
 
   const setRecordIndexFilters = useSetRecoilState(recordIndexFiltersState);
@@ -65,6 +65,9 @@ export const RecordIndexContainer = ({
   const setRecordIndexIsCompactModeActive = useSetRecoilState(
     recordIndexIsCompactModeActiveState,
   );
+  const setRecordIndexViewKanbanFieldMetadataIdState = useSetRecoilState(
+    recordIndexKanbanFieldMetadataIdState,
+  );
 
   const { setTableFilters, setTableSorts, setTableColumns } = useRecordTable({
     recordTableId: recordIndexId,
@@ -112,21 +115,27 @@ export const RecordIndexContainer = ({
               viewType={recordIndexViewType ?? ViewType.Table}
             />
           }
-          optionsDropdownScopeId={RECORD_INDEX_OPTIONS_DROPDOWN_ID}
-          onViewFieldsChange={onViewFieldsChange}
-          onViewFiltersChange={(viewFilters) => {
-            setTableFilters(mapViewFiltersToFilters(viewFilters));
-            setRecordIndexFilters(mapViewFiltersToFilters(viewFilters));
-          }}
-          onViewSortsChange={(viewSorts) => {
-            setTableSorts(mapViewSortsToSorts(viewSorts));
-            setRecordIndexSorts(mapViewSortsToSorts(viewSorts));
-          }}
-          onViewTypeChange={(viewType: ViewType) => {
-            setRecordIndexViewType(viewType);
-          }}
-          onViewCompactModeChange={(isCompactModeActive: boolean) => {
-            setRecordIndexIsCompactModeActive(isCompactModeActive);
+          onCurrentViewChange={(view) => {
+            if (!view) {
+              return;
+            }
+
+            onViewFieldsChange(view.viewFields);
+            setTableFilters(
+              mapViewFiltersToFilters(view.viewFilters, filterDefinitions),
+            );
+            setRecordIndexFilters(
+              mapViewFiltersToFilters(view.viewFilters, filterDefinitions),
+            );
+            setTableSorts(mapViewSortsToSorts(view.viewSorts, sortDefinitions));
+            setRecordIndexSorts(
+              mapViewSortsToSorts(view.viewSorts, sortDefinitions),
+            );
+            setRecordIndexViewType(view.type);
+            setRecordIndexViewKanbanFieldMetadataIdState(
+              view.kanbanFieldMetadataId,
+            );
+            setRecordIndexIsCompactModeActive(view.isCompact);
           }}
         />
         <RecordIndexViewBarEffect
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainerEffect.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainerEffect.tsx
index 69d2a50ed195..6677d042665d 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainerEffect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainerEffect.tsx
@@ -4,8 +4,10 @@ import { useRecoilValue } from 'recoil';
 import { useColumnDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useRecordActionBar } from '@/object-record/record-action-bar/hooks/useRecordActionBar';
+import { useHandleToggleColumnFilter } from '@/object-record/record-index/hooks/useHandleToggleColumnFilter';
+import { useHandleToggleColumnSort } from '@/object-record/record-index/hooks/useHandleToggleColumnSort';
 import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
-import { useViewBar } from '@/views/hooks/useViewBar';
+import { useSetRecordCountInCurrentView } from '@/views/hooks/useSetRecordCountInCurrentView';
 
 type RecordIndexTableContainerEffectProps = {
   objectNameSingular: string;
@@ -22,7 +24,9 @@ export const RecordIndexTableContainerEffect = ({
     setAvailableTableColumns,
     setOnEntityCountChange,
     resetTableRowSelection,
-    getSelectedRowIdsSelector,
+    selectedRowIdsSelector,
+    setOnToggleColumnFilter,
+    setOnToggleColumnSort,
   } = useRecordTable({
     recordTableId,
   });
@@ -34,15 +38,14 @@ export const RecordIndexTableContainerEffect = ({
   const { columnDefinitions } =
     useColumnDefinitionsFromFieldMetadata(objectMetadataItem);
 
-  const { setEntityCountInCurrentView } = useViewBar({
-    viewBarId,
-  });
+  const { setRecordCountInCurrentView } =
+    useSetRecordCountInCurrentView(viewBarId);
 
   useEffect(() => {
     setAvailableTableColumns(columnDefinitions);
   }, [columnDefinitions, setAvailableTableColumns]);
 
-  const selectedRowIds = useRecoilValue(getSelectedRowIdsSelector());
+  const selectedRowIds = useRecoilValue(selectedRowIdsSelector());
 
   const { setActionBarEntries, setContextMenuEntries } = useRecordActionBar({
     objectMetadataItem,
@@ -50,6 +53,30 @@ export const RecordIndexTableContainerEffect = ({
     callback: resetTableRowSelection,
   });
 
+  const handleToggleColumnFilter = useHandleToggleColumnFilter({
+    objectNameSingular,
+    viewBarId,
+  });
+
+  const handleToggleColumnSort = useHandleToggleColumnSort({
+    objectNameSingular,
+    viewBarId,
+  });
+
+  useEffect(() => {
+    setOnToggleColumnFilter(
+      () => (fieldMetadataId: string) =>
+        handleToggleColumnFilter(fieldMetadataId),
+    );
+  }, [setOnToggleColumnFilter, handleToggleColumnFilter]);
+
+  useEffect(() => {
+    setOnToggleColumnSort(
+      () => (fieldMetadataId: string) =>
+        handleToggleColumnSort(fieldMetadataId),
+    );
+  }, [setOnToggleColumnSort, handleToggleColumnSort]);
+
   useEffect(() => {
     setActionBarEntries?.();
     setContextMenuEntries?.();
@@ -57,9 +84,9 @@ export const RecordIndexTableContainerEffect = ({
 
   useEffect(() => {
     setOnEntityCountChange(
-      () => (entityCount: number) => setEntityCountInCurrentView(entityCount),
+      () => (entityCount: number) => setRecordCountInCurrentView(entityCount),
     );
-  }, [setEntityCountInCurrentView, setOnEntityCountChange]);
+  }, [setRecordCountInCurrentView, setOnEntityCountChange]);
 
   return <></>;
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexViewBarEffect.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexViewBarEffect.tsx
index 31a4447b2683..44ae8879625f 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexViewBarEffect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexViewBarEffect.tsx
@@ -3,7 +3,8 @@ import { useEffect } from 'react';
 import { useColumnDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
-import { useViewBar } from '@/views/hooks/useViewBar';
+import { useInitViewBar } from '@/views/hooks/useInitViewBar';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 type RecordIndexViewBarEffectProps = {
   objectNamePlural: string;
@@ -30,10 +31,10 @@ export const RecordIndexViewBarEffect = ({
     setAvailableSortDefinitions,
     setAvailableFilterDefinitions,
     setAvailableFieldDefinitions,
-  } = useViewBar({ viewBarId });
+  } = useInitViewBar(viewBarId);
 
   useEffect(() => {
-    if (!objectMetadataItem) {
+    if (isUndefinedOrNull(objectMetadataItem)) {
       return;
     }
     setViewObjectMetadataId?.(objectMetadataItem.id);
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleColumnFilter.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleColumnFilter.ts
new file mode 100644
index 000000000000..774e604178af
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleColumnFilter.ts
@@ -0,0 +1,71 @@
+import { useCallback } from 'react';
+
+import { useColumnDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { getFilterTypeFromFieldType } from '@/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions';
+import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { getOperandsForFilterType } from '@/object-record/object-filter-dropdown/utils/getOperandsForFilterType';
+import { useDropdownV2 } from '@/ui/layout/dropdown/hooks/useDropdownV2';
+import { useCombinedViewFilters } from '@/views/hooks/useCombinedViewFilters';
+import { isDefined } from '~/utils/isDefined';
+
+type UseHandleToggleColumnFilterProps = {
+  objectNameSingular: string;
+  viewBarId: string;
+};
+
+export const useHandleToggleColumnFilter = ({
+  viewBarId,
+  objectNameSingular,
+}: UseHandleToggleColumnFilterProps) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { columnDefinitions } =
+    useColumnDefinitionsFromFieldMetadata(objectMetadataItem);
+
+  const { upsertCombinedViewFilter } = useCombinedViewFilters(viewBarId);
+  const { openDropdown } = useDropdownV2();
+
+  const handleToggleColumnFilter = useCallback(
+    (fieldMetadataId: string) => {
+      const correspondingColumnDefinition = columnDefinitions.find(
+        (columnDefinition) =>
+          columnDefinition.fieldMetadataId === fieldMetadataId,
+      );
+
+      if (!isDefined(correspondingColumnDefinition)) return;
+
+      const filterType = getFilterTypeFromFieldType(
+        correspondingColumnDefinition?.type,
+      );
+
+      const availableOperandsForFilter = getOperandsForFilterType(filterType);
+
+      const defaultOperand = availableOperandsForFilter[0];
+
+      const newFilter: Filter = {
+        fieldMetadataId,
+        operand: defaultOperand,
+        displayValue: '',
+        definition: {
+          label: correspondingColumnDefinition.label,
+          iconName: correspondingColumnDefinition.iconName,
+          fieldMetadataId,
+          type: filterType,
+        },
+        value: '',
+      };
+
+      upsertCombinedViewFilter(newFilter);
+
+      openDropdown(fieldMetadataId, {
+        scope: fieldMetadataId,
+      });
+    },
+    [columnDefinitions, upsertCombinedViewFilter, openDropdown],
+  );
+
+  return handleToggleColumnFilter;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleColumnSort.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleColumnSort.ts
new file mode 100644
index 000000000000..a5253a49e82a
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleColumnSort.ts
@@ -0,0 +1,52 @@
+import { useCallback } from 'react';
+
+import { useColumnDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
+import { useCombinedViewSorts } from '@/views/hooks/useCombinedViewSorts';
+import { isDefined } from '~/utils/isDefined';
+
+type UseHandleToggleColumnSortProps = {
+  objectNameSingular: string;
+  viewBarId: string;
+};
+
+export const useHandleToggleColumnSort = ({
+  viewBarId,
+  objectNameSingular,
+}: UseHandleToggleColumnSortProps) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { columnDefinitions } =
+    useColumnDefinitionsFromFieldMetadata(objectMetadataItem);
+
+  const { upsertCombinedViewSort } = useCombinedViewSorts(viewBarId);
+
+  const handleToggleColumnSort = useCallback(
+    (fieldMetadataId: string) => {
+      const correspondingColumnDefinition = columnDefinitions.find(
+        (columnDefinition) =>
+          columnDefinition.fieldMetadataId === fieldMetadataId,
+      );
+
+      if (!isDefined(correspondingColumnDefinition)) return;
+
+      const newSort: Sort = {
+        fieldMetadataId,
+        definition: {
+          fieldMetadataId,
+          label: correspondingColumnDefinition.label,
+          iconName: correspondingColumnDefinition.iconName,
+        },
+        direction: 'asc',
+      };
+
+      upsertCombinedViewSort(newSort);
+    },
+    [columnDefinitions, upsertCombinedViewSort],
+  );
+
+  return handleToggleColumnSort;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoard.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoard.ts
index 622be1ecdfce..3e10a603374c 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoard.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoard.ts
@@ -6,12 +6,13 @@ import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { turnSortsIntoOrderBy } from '@/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy';
 import { useRecordBoard } from '@/object-record/record-board/hooks/useRecordBoard';
 import { turnObjectDropdownFilterIntoQueryFilter } from '@/object-record/record-filter/utils/turnObjectDropdownFilterIntoQueryFilter';
+import { useRecordBoardQueryFields } from '@/object-record/record-index/hooks/useRecordBoardQueryFields';
 import { recordIndexFieldDefinitionsState } from '@/object-record/record-index/states/recordIndexFieldDefinitionsState';
 import { recordIndexFiltersState } from '@/object-record/record-index/states/recordIndexFiltersState';
 import { recordIndexIsCompactModeActiveState } from '@/object-record/record-index/states/recordIndexIsCompactModeActiveState';
 import { recordIndexSortsState } from '@/object-record/record-index/states/recordIndexSortsState';
 import { useSetRecordInStore } from '@/object-record/record-store/hooks/useSetRecordInStore';
-import { useViewBar } from '@/views/hooks/useViewBar';
+import { useSetRecordCountInCurrentView } from '@/views/hooks/useSetRecordCountInCurrentView';
 
 type UseLoadRecordIndexBoardProps = {
   objectNameSingular: string;
@@ -30,7 +31,7 @@ export const useLoadRecordIndexBoard = ({
   const {
     setRecordIds: setRecordIdsInBoard,
     setFieldDefinitions,
-    getIsCompactModeActiveState,
+    isCompactModeActiveState,
   } = useRecordBoard(recordBoardId);
   const { setRecords: setRecordsInStore } = useSetRecordInStore();
 
@@ -47,15 +48,19 @@ export const useLoadRecordIndexBoard = ({
     recordIndexFilters,
     objectMetadataItem?.fields ?? [],
   );
-  const orderBy = turnSortsIntoOrderBy(
-    recordIndexSorts,
-    objectMetadataItem?.fields ?? [],
-  );
+  const orderBy = !objectMetadataItem.isRemote
+    ? turnSortsIntoOrderBy(recordIndexSorts, objectMetadataItem?.fields ?? [])
+    : undefined;
 
   const recordIndexIsCompactModeActive = useRecoilValue(
     recordIndexIsCompactModeActiveState,
   );
 
+  const queryFields = useRecordBoardQueryFields({
+    objectMetadataItem,
+    recordBoardId,
+  });
+
   const {
     records,
     totalCount,
@@ -66,15 +71,13 @@ export const useLoadRecordIndexBoard = ({
     objectNameSingular,
     filter: requestFilters,
     orderBy,
+    queryFields,
   });
 
-  const { setEntityCountInCurrentView } = useViewBar({
-    viewBarId,
-  });
+  const { setRecordCountInCurrentView } =
+    useSetRecordCountInCurrentView(viewBarId);
 
-  const setIsCompactModeActive = useSetRecoilState(
-    getIsCompactModeActiveState(),
-  );
+  const setIsCompactModeActive = useSetRecoilState(isCompactModeActiveState);
 
   useEffect(() => {
     setRecordIdsInBoard(records);
@@ -85,8 +88,8 @@ export const useLoadRecordIndexBoard = ({
   }, [records, setRecordsInStore]);
 
   useEffect(() => {
-    setEntityCountInCurrentView(totalCount);
-  }, [totalCount, setEntityCountInCurrentView]);
+    setRecordCountInCurrentView(totalCount);
+  }, [totalCount, setRecordCountInCurrentView]);
 
   useEffect(() => {
     setIsCompactModeActive(recordIndexIsCompactModeActive);
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexTable.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexTable.ts
index 48d9f64ef8f5..5fd83e30672b 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexTable.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexTable.ts
@@ -2,29 +2,37 @@ import { useRecoilValue, useSetRecoilState } from 'recoil';
 
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState.ts';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { turnSortsIntoOrderBy } from '@/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy';
 import { turnObjectDropdownFilterIntoQueryFilter } from '@/object-record/record-filter/utils/turnObjectDropdownFilterIntoQueryFilter';
+import { useRecordTableQueryFields } from '@/object-record/record-index/hooks/useRecordTableQueryFields';
 import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
 import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
 import { SIGN_IN_BACKGROUND_MOCK_COMPANIES } from '@/sign-in-background-mock/constants/SignInBackgroundMockCompanies';
 
-import { useFindManyRecords } from '../../hooks/useFindManyRecords';
-
-export const useFindManyParams = (objectNameSingular: string) => {
+export const useFindManyParams = (
+  objectNameSingular: string,
+  recordTableId?: string,
+) => {
   const { objectMetadataItem } = useObjectMetadataItem({
     objectNameSingular,
   });
 
-  const { getTableFiltersState, getTableSortsState } = useRecordTableStates();
+  const { tableFiltersState, tableSortsState } =
+    useRecordTableStates(recordTableId);
 
-  const tableFilters = useRecoilValue(getTableFiltersState());
-  const tableSorts = useRecoilValue(getTableSortsState());
+  const tableFilters = useRecoilValue(tableFiltersState);
+  const tableSorts = useRecoilValue(tableSortsState);
 
   const filter = turnObjectDropdownFilterIntoQueryFilter(
     tableFilters,
     objectMetadataItem?.fields ?? [],
   );
 
+  if (objectMetadataItem?.isRemote) {
+    return { objectNameSingular, filter };
+  }
+
   const orderBy = turnSortsIntoOrderBy(
     tableSorts,
     objectMetadataItem?.fields ?? [],
@@ -36,11 +44,13 @@ export const useFindManyParams = (objectNameSingular: string) => {
 export const useLoadRecordIndexTable = (objectNameSingular: string) => {
   const { setRecordTableData, setIsRecordTableInitialLoading } =
     useRecordTable();
-  const { getTableLastRowVisibleState } = useRecordTableStates();
-  const setLastRowVisible = useSetRecoilState(getTableLastRowVisibleState());
+  const { tableLastRowVisibleState } = useRecordTableStates();
+  const setLastRowVisible = useSetRecoilState(tableLastRowVisibleState);
   const currentWorkspace = useRecoilValue(currentWorkspaceState);
   const params = useFindManyParams(objectNameSingular);
 
+  const queryFields = useRecordTableQueryFields();
+
   const {
     records,
     loading,
@@ -49,6 +59,7 @@ export const useLoadRecordIndexTable = (objectNameSingular: string) => {
     queryStateIdentifier,
   } = useFindManyRecords({
     ...params,
+    queryFields,
     onCompleted: () => {
       setLastRowVisible(false);
       setIsRecordTableInitialLoading(false);
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordBoardQueryFields.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordBoardQueryFields.ts
new file mode 100644
index 000000000000..7d1294ab601a
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordBoardQueryFields.ts
@@ -0,0 +1,52 @@
+import { useRecoilValue } from 'recoil';
+
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { getObjectMetadataIdentifierFields } from '@/object-metadata/utils/getObjectMetadataIdentifierFields';
+import { useRecordBoardStates } from '@/object-record/record-board/hooks/internal/useRecordBoardStates';
+import { isDefined } from '~/utils/isDefined';
+
+export const useRecordBoardQueryFields = ({
+  objectMetadataItem,
+  recordBoardId,
+}: {
+  recordBoardId: string;
+  objectMetadataItem: ObjectMetadataItem;
+}) => {
+  const { kanbanFieldMetadataNameState, visibleFieldDefinitionsState } =
+    useRecordBoardStates(recordBoardId);
+
+  const { imageIdentifierFieldMetadataItem, labelIdentifierFieldMetadataItem } =
+    getObjectMetadataIdentifierFields({ objectMetadataItem });
+
+  const kanbanFieldMetadataName = useRecoilValue(kanbanFieldMetadataNameState);
+  const visibleFieldDefinitions = useRecoilValue(
+    visibleFieldDefinitionsState(),
+  );
+
+  const identifierQueryFields: Record<string, boolean> = {};
+
+  if (isDefined(labelIdentifierFieldMetadataItem)) {
+    identifierQueryFields[labelIdentifierFieldMetadataItem.name] = true;
+  }
+
+  if (isDefined(imageIdentifierFieldMetadataItem)) {
+    identifierQueryFields[imageIdentifierFieldMetadataItem.name] = true;
+  }
+
+  const queryFields: Record<string, any> = {
+    id: true,
+    ...Object.fromEntries(
+      visibleFieldDefinitions.map((visibleFieldDefinition) => [
+        visibleFieldDefinition.metadata.fieldName,
+        true,
+      ]),
+    ),
+    ...identifierQueryFields,
+  };
+
+  if (isDefined(kanbanFieldMetadataName)) {
+    queryFields[kanbanFieldMetadataName] = true;
+  }
+
+  return queryFields;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordTableQueryFields.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordTableQueryFields.ts
new file mode 100644
index 000000000000..4b035140781f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordTableQueryFields.ts
@@ -0,0 +1,18 @@
+import { useRecoilValue } from 'recoil';
+
+import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
+
+export const useRecordTableQueryFields = () => {
+  const { visibleTableColumnsSelector } = useRecordTableStates();
+
+  const visibleTableColumns = useRecoilValue(visibleTableColumnsSelector());
+
+  const queryFields: Record<string, any> = {
+    id: true,
+    ...Object.fromEntries(
+      visibleTableColumns.map((column) => [column.metadata.fieldName, true]),
+    ),
+  };
+
+  return queryFields;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdown.tsx b/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdown.tsx
index d79427c0fef9..4b1d32086319 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdown.tsx
@@ -1,11 +1,8 @@
 import { RecordIndexOptionsDropdownButton } from '@/object-record/record-index/options/components/RecordIndexOptionsDropdownButton';
 import { RecordIndexOptionsDropdownContent } from '@/object-record/record-index/options/components/RecordIndexOptionsDropdownContent';
 import { RECORD_INDEX_OPTIONS_DROPDOWN_ID } from '@/object-record/record-index/options/constants/RecordIndexOptionsDropdownId';
-import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
-import { RecordTableScope } from '@/object-record/record-table/scopes/RecordTableScope';
 import { TableOptionsHotkeyScope } from '@/object-record/record-table/types/TableOptionsHotkeyScope';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { useViewBar } from '@/views/hooks/useViewBar';
 import { ViewType } from '@/views/types/ViewType';
 
 type RecordIndexOptionsDropdownProps = {
@@ -19,28 +16,19 @@ export const RecordIndexOptionsDropdown = ({
   objectNameSingular,
   viewType,
 }: RecordIndexOptionsDropdownProps) => {
-  const { setViewEditMode } = useViewBar();
-  const { scopeId } = useRecordTableStates(recordIndexId);
-
   return (
-    <RecordTableScope
-      recordTableScopeId={scopeId}
-      onColumnsChange={() => false}
-    >
-      <Dropdown
-        dropdownId={RECORD_INDEX_OPTIONS_DROPDOWN_ID}
-        clickableComponent={<RecordIndexOptionsDropdownButton />}
-        dropdownHotkeyScope={{ scope: TableOptionsHotkeyScope.Dropdown }}
-        dropdownOffset={{ y: 8 }}
-        dropdownComponents={
-          <RecordIndexOptionsDropdownContent
-            viewType={viewType}
-            objectNameSingular={objectNameSingular}
-            recordIndexId={recordIndexId}
-          />
-        }
-        onClickOutside={() => setViewEditMode('none')}
-      />
-    </RecordTableScope>
+    <Dropdown
+      dropdownId={RECORD_INDEX_OPTIONS_DROPDOWN_ID}
+      clickableComponent={<RecordIndexOptionsDropdownButton />}
+      dropdownHotkeyScope={{ scope: TableOptionsHotkeyScope.Dropdown }}
+      dropdownOffset={{ y: 8 }}
+      dropdownComponents={
+        <RecordIndexOptionsDropdownContent
+          viewType={viewType}
+          objectNameSingular={objectNameSingular}
+          recordIndexId={recordIndexId}
+        />
+      }
+    />
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx
index d341b88b4636..dffa9d58e8e6 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx
@@ -1,21 +1,20 @@
-import { useRef, useState } from 'react';
-import { useRecoilValue } from 'recoil';
+import { useState } from 'react';
 import { Key } from 'ts-key-enum';
-
-import { RECORD_INDEX_OPTIONS_DROPDOWN_ID } from '@/object-record/record-index/options/constants/RecordIndexOptionsDropdownId';
-import { useRecordIndexOptionsForBoard } from '@/object-record/record-index/options/hooks/useRecordIndexOptionsForBoard';
-import { useRecordIndexOptionsForTable } from '@/object-record/record-index/options/hooks/useRecordIndexOptionsForTable';
-import { TableOptionsHotkeyScope } from '@/object-record/record-table/types/TableOptionsHotkeyScope';
-import { useSpreadsheetRecordImport } from '@/object-record/spreadsheet-import/useSpreadsheetRecordImport';
 import {
   IconBaselineDensitySmall,
   IconChevronLeft,
   IconFileExport,
   IconFileImport,
   IconTag,
-} from '@/ui/display/icon';
+} from 'twenty-ui';
+
+import { RECORD_INDEX_OPTIONS_DROPDOWN_ID } from '@/object-record/record-index/options/constants/RecordIndexOptionsDropdownId';
+import { useExportTableData } from '@/object-record/record-index/options/hooks/useExportTableData.ts';
+import { useRecordIndexOptionsForBoard } from '@/object-record/record-index/options/hooks/useRecordIndexOptionsForBoard';
+import { useRecordIndexOptionsForTable } from '@/object-record/record-index/options/hooks/useRecordIndexOptionsForTable';
+import { TableOptionsHotkeyScope } from '@/object-record/record-table/types/TableOptionsHotkeyScope';
+import { useSpreadsheetRecordImport } from '@/object-record/spreadsheet-import/useSpreadsheetRecordImport';
 import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
-import { DropdownMenuInput } from '@/ui/layout/dropdown/components/DropdownMenuInput';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
@@ -23,12 +22,9 @@ import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
 import { MenuItemToggle } from '@/ui/navigation/menu-item/components/MenuItemToggle';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { ViewFieldsVisibilityDropdownSection } from '@/views/components/ViewFieldsVisibilityDropdownSection';
-import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
-import { useViewBar } from '@/views/hooks/useViewBar';
+import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
 import { ViewType } from '@/views/types/ViewType';
 
-import { useExportTableData } from '../hooks/useExportTableData';
-
 type RecordIndexOptionsMenu = 'fields';
 
 type RecordIndexOptionsDropdownContentProps = {
@@ -42,13 +38,8 @@ export const RecordIndexOptionsDropdownContent = ({
   recordIndexId,
   objectNameSingular,
 }: RecordIndexOptionsDropdownContentProps) => {
-  const { setViewEditMode, handleViewNameSubmit } = useViewBar({
-    viewBarId: recordIndexId,
-  });
-  const { viewEditModeState, currentViewSelector } = useViewScopedStates();
+  const { currentViewWithCombinedFiltersAndSorts } = useGetCurrentView();
 
-  const viewEditMode = useRecoilValue(viewEditModeState);
-  const currentView = useRecoilValue(currentViewSelector);
   const { closeDropdown } = useDropdown(RECORD_INDEX_OPTIONS_DROPDOWN_ID);
 
   const [currentMenu, setCurrentMenu] = useState<
@@ -57,8 +48,6 @@ export const RecordIndexOptionsDropdownContent = ({
 
   const resetMenu = () => setCurrentMenu(undefined);
 
-  const viewEditInputRef = useRef<HTMLInputElement>(null);
-
   const handleSelectMenu = (option: RecordIndexOptionsMenu) => {
     setCurrentMenu(option);
   };
@@ -71,18 +60,6 @@ export const RecordIndexOptionsDropdownContent = ({
     TableOptionsHotkeyScope.Dropdown,
   );
 
-  useScopedHotkeys(
-    Key.Enter,
-    () => {
-      const name = viewEditInputRef.current?.value;
-      handleViewNameSubmit(name);
-      resetMenu();
-      setViewEditMode('none');
-      closeDropdown();
-    },
-    TableOptionsHotkeyScope.Dropdown,
-  );
-
   const {
     handleColumnVisibilityChange,
     handleReorderColumns,
@@ -132,38 +109,23 @@ export const RecordIndexOptionsDropdownContent = ({
   return (
     <>
       {!currentMenu && (
-        <>
-          <DropdownMenuInput
-            ref={viewEditInputRef}
-            autoFocus={viewEditMode !== 'none'}
-            placeholder={
-              viewEditMode === 'create'
-                ? 'New view'
-                : viewEditMode === 'edit'
-                  ? 'View name'
-                  : ''
-            }
-            defaultValue={viewEditMode === 'create' ? '' : currentView?.name}
+        <DropdownMenuItemsContainer>
+          <MenuItem
+            onClick={() => handleSelectMenu('fields')}
+            LeftIcon={IconTag}
+            text="Fields"
           />
-          <DropdownMenuSeparator />
-          <DropdownMenuItemsContainer>
-            <MenuItem
-              onClick={() => handleSelectMenu('fields')}
-              LeftIcon={IconTag}
-              text="Fields"
-            />
-            <MenuItem
-              onClick={() => openRecordSpreadsheetImport()}
-              LeftIcon={IconFileImport}
-              text="Import"
-            />
-            <MenuItem
-              onClick={download}
-              LeftIcon={IconFileExport}
-              text={progress === undefined ? `Export` : `Export (${progress}%)`}
-            />
-          </DropdownMenuItemsContainer>
-        </>
+          <MenuItem
+            onClick={() => openRecordSpreadsheetImport()}
+            LeftIcon={IconFileImport}
+            text="Import"
+          />
+          <MenuItem
+            onClick={download}
+            LeftIcon={IconFileExport}
+            text={progress === undefined ? `Export` : `Export (${progress}%)`}
+          />
+        </DropdownMenuItemsContainer>
       )}
       {currentMenu === 'fields' && (
         <>
@@ -200,7 +162,7 @@ export const RecordIndexOptionsDropdownContent = ({
               onToggleChange={() =>
                 setAndPersistIsCompactModeActive(
                   !isCompactModeActive,
-                  currentView,
+                  currentViewWithCombinedFiltersAndSorts,
                 )
               }
               toggled={isCompactModeActive}
diff --git a/packages/twenty-front/src/modules/object-record/record-index/options/hooks/useExportTableData.ts b/packages/twenty-front/src/modules/object-record/record-index/options/hooks/useExportTableData.ts
index 6d91fe33b566..7dbe87226a01 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/options/hooks/useExportTableData.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/options/hooks/useExportTableData.ts
@@ -6,6 +6,7 @@ import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
+import { isDefined } from '~/utils/isDefined';
 
 import { useFindManyParams } from '../../hooks/useLoadRecordIndexTable';
 
@@ -52,7 +53,7 @@ export const generateCsv: GenerateExport = ({
       return hasSubFields;
     });
 
-    if (fieldsWithSubFields) {
+    if (isDefined(fieldsWithSubFields)) {
       const nestedFieldsWithoutTypename = Object.keys(
         (fieldsWithSubFields as any)[column.field],
       )
@@ -107,15 +108,41 @@ export const useExportTableData = ({
   const [pageCount, setPageCount] = useState(0);
   const [progress, setProgress] = useState<number | undefined>(undefined);
   const [hasNextPage, setHasNextPage] = useState(true);
-  const { getVisibleTableColumnsSelector } =
+
+  const { visibleTableColumnsSelector, selectedRowIdsSelector } =
     useRecordTableStates(recordIndexId);
-  const columns = useRecoilValue(getVisibleTableColumnsSelector());
-  const params = useFindManyParams(objectNameSingular);
+
+  const columns = useRecoilValue(visibleTableColumnsSelector());
+  const selectedRowIds = useRecoilValue(selectedRowIdsSelector());
+
+  const hasSelectedRows = selectedRowIds.length > 0;
+
+  const findManyRecordsParams = useFindManyParams(
+    objectNameSingular,
+    recordIndexId,
+  );
+
+  const selectedFindManyParams = {
+    ...findManyRecordsParams,
+    filter: {
+      ...findManyRecordsParams.filter,
+      id: {
+        in: selectedRowIds,
+      },
+    },
+  };
+
+  const usedFindManyParams = hasSelectedRows
+    ? selectedFindManyParams
+    : findManyRecordsParams;
+
+  // Todo: this needs to be done on click on the Export not button, not to be reactive. Use Lazy query for example
   const { totalCount, records, fetchMoreRecords } = useFindManyRecords({
-    ...params,
+    ...usedFindManyParams,
+    depth: 0,
     limit: pageSize,
-    onCompleted: (_data, { hasNextPage }) => {
-      setHasNextPage(hasNextPage ?? false);
+    onCompleted: (_data, options) => {
+      setHasNextPage(options?.pageInfo?.hasNextPage ?? false);
     },
   });
 
diff --git a/packages/twenty-front/src/modules/object-record/record-index/options/hooks/useRecordIndexOptionsForBoard.ts b/packages/twenty-front/src/modules/object-record/record-index/options/hooks/useRecordIndexOptionsForBoard.ts
index 0b53cbd7fc6b..9e1c2b28b6ed 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/options/hooks/useRecordIndexOptionsForBoard.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/options/hooks/useRecordIndexOptionsForBoard.ts
@@ -2,16 +2,16 @@ import { useCallback, useMemo } from 'react';
 import { OnDragEndResponder } from '@hello-pangea/dnd';
 import { useRecoilState } from 'recoil';
 
-import { mapBoardFieldDefinitionsToViewFields } from '@/companies/utils/mapBoardFieldDefinitionsToViewFields';
 import { useColumnDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata';
-import { useObjectMetadataItemOnly } from '@/object-metadata/hooks/useObjectMetadataItemOnly';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useRecordBoard } from '@/object-record/record-board/hooks/useRecordBoard';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { recordIndexFieldDefinitionsState } from '@/object-record/record-index/states/recordIndexFieldDefinitionsState';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
-import { useViewFields } from '@/views/hooks/internal/useViewFields';
-import { useViews } from '@/views/hooks/internal/useViews';
+import { useHandleViews } from '@/views/hooks/useHandleViews';
+import { useSaveCurrentViewFields } from '@/views/hooks/useSaveCurrentViewFields';
 import { GraphQLView } from '@/views/types/GraphQLView';
+import { mapBoardFieldDefinitionsToViewFields } from '@/views/utils/mapBoardFieldDefinitionsToViewFields';
 import { mapArrayToObject } from '~/utils/array/mapArrayToObject';
 import { moveArrayItem } from '~/utils/array/moveArrayItem';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
@@ -30,15 +30,15 @@ export const useRecordIndexOptionsForBoard = ({
   const [recordIndexFieldDefinitions, setRecordIndexFieldDefinitions] =
     useRecoilState(recordIndexFieldDefinitionsState);
 
-  const { persistViewFields } = useViewFields(viewBarId);
-  const { updateView } = useViews(viewBarId);
-  const { getIsCompactModeActiveState } = useRecordBoard(recordBoardId);
+  const { saveViewFields } = useSaveCurrentViewFields(viewBarId);
+  const { updateCurrentView } = useHandleViews(viewBarId);
+  const { isCompactModeActiveState } = useRecordBoard(recordBoardId);
 
   const [isCompactModeActive, setIsCompactModeActive] = useRecoilState(
-    getIsCompactModeActiveState(),
+    isCompactModeActiveState,
   );
 
-  const { objectMetadataItem } = useObjectMetadataItemOnly({
+  const { objectMetadataItem } = useObjectMetadataItem({
     objectNameSingular,
   });
 
@@ -105,20 +105,14 @@ export const useRecordIndexOptionsForBoard = ({
       if (isDeeplyEqual(visibleBoardFields, reorderedVisibleBoardFields))
         return;
 
-      const updatedFields = [
-        ...reorderedVisibleBoardFields,
-        ...hiddenBoardFields,
-      ].map((field, index) => ({ ...field, position: index }));
+      const updatedFields = [...reorderedVisibleBoardFields].map(
+        (field, index) => ({ ...field, position: index }),
+      );
 
       setRecordIndexFieldDefinitions(updatedFields);
-      persistViewFields(mapBoardFieldDefinitionsToViewFields(updatedFields));
+      saveViewFields(mapBoardFieldDefinitionsToViewFields(updatedFields));
     },
-    [
-      hiddenBoardFields,
-      persistViewFields,
-      setRecordIndexFieldDefinitions,
-      visibleBoardFields,
-    ],
+    [saveViewFields, setRecordIndexFieldDefinitions, visibleBoardFields],
   );
 
   // Todo : this seems over complex and should at least be extracted to an util with unit test.
@@ -153,7 +147,7 @@ export const useRecordIndexOptionsForBoard = ({
           ...recordIndexFieldDefinitions,
           {
             ...correspondingFieldDefinition,
-            position: lastVisibleBoardField.position + 1,
+            position: (lastVisibleBoardField?.position || 0) + 1,
             isVisible: true,
           },
         ];
@@ -172,14 +166,14 @@ export const useRecordIndexOptionsForBoard = ({
 
       setRecordIndexFieldDefinitions(updatedFieldsDefinitions);
 
-      persistViewFields(
+      saveViewFields(
         mapBoardFieldDefinitionsToViewFields(updatedFieldsDefinitions),
       );
     },
     [
       recordIndexFieldDefinitionsByKey,
       setRecordIndexFieldDefinitions,
-      persistViewFields,
+      saveViewFields,
       availableColumnDefinitions,
       visibleBoardFields,
       recordIndexFieldDefinitions,
@@ -190,12 +184,11 @@ export const useRecordIndexOptionsForBoard = ({
     (isCompactModeActive: boolean, view: GraphQLView | undefined) => {
       if (!view) return;
       setIsCompactModeActive(isCompactModeActive);
-      updateView({
-        ...view,
+      updateCurrentView({
         isCompact: isCompactModeActive,
       });
     },
-    [setIsCompactModeActive, updateView],
+    [setIsCompactModeActive, updateCurrentView],
   );
 
   return {
diff --git a/packages/twenty-front/src/modules/object-record/record-index/options/hooks/useRecordIndexOptionsForTable.ts b/packages/twenty-front/src/modules/object-record/record-index/options/hooks/useRecordIndexOptionsForTable.ts
index 011c6f87d42d..e72bc7534306 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/options/hooks/useRecordIndexOptionsForTable.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/options/hooks/useRecordIndexOptionsForTable.ts
@@ -7,11 +7,11 @@ import { useTableColumns } from '@/object-record/record-table/hooks/useTableColu
 import { moveArrayItem } from '~/utils/array/moveArrayItem';
 
 export const useRecordIndexOptionsForTable = (recordTableId: string) => {
-  const { getHiddenTableColumnsSelector, getVisibleTableColumnsSelector } =
+  const { hiddenTableColumnsSelector, visibleTableColumnsSelector } =
     useRecordTableStates(recordTableId);
 
-  const hiddenTableColumns = useRecoilValue(getHiddenTableColumnsSelector());
-  const visibleTableColumns = useRecoilValue(getVisibleTableColumnsSelector());
+  const hiddenTableColumns = useRecoilValue(hiddenTableColumnsSelector());
+  const visibleTableColumns = useRecoilValue(visibleTableColumnsSelector());
 
   const { handleColumnVisibilityChange, handleColumnReorder } = useTableColumns(
     { recordTableId: recordTableId },
diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexFieldDefinitionsState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexFieldDefinitionsState.ts
index 9fccbe7ab14e..1b260d3c9c20 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexFieldDefinitionsState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexFieldDefinitionsState.ts
@@ -1,11 +1,11 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
 
-export const recordIndexFieldDefinitionsState = atom<
+export const recordIndexFieldDefinitionsState = createState<
   ColumnDefinition<FieldMetadata>[]
 >({
   key: 'recordIndexFieldDefinitionsState',
-  default: [],
+  defaultValue: [],
 });
diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexFiltersState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexFiltersState.ts
index 83349211e6bd..fc3462109230 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexFiltersState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexFiltersState.ts
@@ -1,8 +1,8 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
 
-export const recordIndexFiltersState = atom<Filter[]>({
+export const recordIndexFiltersState = createState<Filter[]>({
   key: 'recordIndexFiltersState',
-  default: [],
+  defaultValue: [],
 });
diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexIsCompactModeActiveState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexIsCompactModeActiveState.ts
index e0fba8940479..cd1d83fbb89f 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexIsCompactModeActiveState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexIsCompactModeActiveState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const recordIndexIsCompactModeActiveState = atom<boolean>({
+export const recordIndexIsCompactModeActiveState = createState<boolean>({
   key: 'recordIndexIsCompactModeActiveState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexKanbanFieldMetadataIdState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexKanbanFieldMetadataIdState.ts
new file mode 100644
index 000000000000..f1527934d48c
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexKanbanFieldMetadataIdState.ts
@@ -0,0 +1,8 @@
+import { createState } from 'twenty-ui';
+
+export const recordIndexKanbanFieldMetadataIdState = createState<string | null>(
+  {
+    key: 'recordIndexKanbanFieldMetadataIdState',
+    defaultValue: null,
+  },
+);
diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexSortsState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexSortsState.ts
index fe98a2f6181f..57088c8e5670 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexSortsState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexSortsState.ts
@@ -1,8 +1,8 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
 
-export const recordIndexSortsState = atom<Sort[]>({
+export const recordIndexSortsState = createState<Sort[]>({
   key: 'recordIndexSortsState',
-  default: [],
+  defaultValue: [],
 });
diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexViewTypeState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexViewTypeState.ts
index 28dcdef038af..49b032c860d1 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexViewTypeState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexViewTypeState.ts
@@ -1,8 +1,8 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { ViewType } from '@/views/types/ViewType';
 
-export const recordIndexViewTypeState = atom<ViewType | undefined>({
+export const recordIndexViewTypeState = createState<ViewType | undefined>({
   key: 'recordIndexViewTypeState',
-  default: undefined,
+  defaultValue: undefined,
 });
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx
index fd677eecdcab..cddd82ddb07d 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx
@@ -15,7 +15,11 @@ import { useInlineCell } from '../hooks/useInlineCell';
 
 import { RecordInlineCellContainer } from './RecordInlineCellContainer';
 
-export const RecordInlineCell = () => {
+type RecordInlineCellProps = {
+  readonly?: boolean;
+};
+
+export const RecordInlineCell = ({ readonly }: RecordInlineCellProps) => {
   const { fieldDefinition, entityId } = useContext(FieldContext);
 
   const buttonIcon = useGetButtonIcon();
@@ -63,6 +67,7 @@ export const RecordInlineCell = () => {
 
   return (
     <RecordInlineCellContainer
+      readonly={readonly}
       buttonIcon={buttonIcon}
       customEditHotkeyScope={
         isFieldRelation(fieldDefinition)
@@ -87,6 +92,7 @@ export const RecordInlineCell = () => {
           onTab={handleTab}
           onShiftTab={handleShiftTab}
           onClickOutside={handleClickOutside}
+          isReadOnly={readonly}
         />
       }
       displayModeContent={<FieldDisplay />}
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
index 51580250267f..64b349301c3c 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
@@ -1,6 +1,6 @@
 import { useContext, useState } from 'react';
 import { Tooltip } from 'react-tooltip';
-import { useTheme } from '@emotion/react';
+import { css, useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { motion } from 'framer-motion';
 
@@ -52,11 +52,16 @@ const StyledEditButtonContainer = styled(motion.div)`
   display: flex;
 `;
 
-const StyledClickableContainer = styled.div`
-  cursor: pointer;
+const StyledClickableContainer = styled.div<{ readonly?: boolean }>`
   display: flex;
   gap: ${({ theme }) => theme.spacing(1)};
   width: 100%;
+
+  ${({ readonly }) =>
+    !readonly &&
+    css`
+      cursor: pointer;
+    `};
 `;
 
 const StyledInlineCellBaseContainer = styled.div`
@@ -83,6 +88,7 @@ const StyledTooltip = styled(Tooltip)`
 `;
 
 type RecordInlineCellContainerProps = {
+  readonly?: boolean;
   IconLabel?: IconComponent;
   label?: string;
   labelWidth?: number;
@@ -98,6 +104,7 @@ type RecordInlineCellContainerProps = {
 };
 
 export const RecordInlineCellContainer = ({
+  readonly,
   IconLabel,
   label,
   labelWidth,
@@ -115,17 +122,21 @@ export const RecordInlineCellContainer = ({
   const [isHovered, setIsHovered] = useState(false);
 
   const handleContainerMouseEnter = () => {
-    setIsHovered(true);
+    if (!readonly) {
+      setIsHovered(true);
+    }
   };
 
   const handleContainerMouseLeave = () => {
-    setIsHovered(false);
+    if (!readonly) {
+      setIsHovered(false);
+    }
   };
 
   const { isInlineCellInEditMode, openInlineCell } = useInlineCell();
 
   const handleDisplayModeClick = () => {
-    if (!editModeContentOnly) {
+    if (!readonly && !editModeContentOnly) {
       openInlineCell(customEditHotkeyScope);
     }
   };
@@ -167,10 +178,10 @@ export const RecordInlineCellContainer = ({
         </StyledLabelAndIconContainer>
       )}
       <StyledValueContainer>
-        {isInlineCellInEditMode ? (
+        {!readonly && isInlineCellInEditMode ? (
           <RecordInlineCellEditMode>{editModeContent}</RecordInlineCellEditMode>
         ) : editModeContentOnly ? (
-          <StyledClickableContainer>
+          <StyledClickableContainer readonly={readonly}>
             <RecordInlineCellDisplayMode
               disableHoverEffect={disableHoverEffect}
               isDisplayModeContentEmpty={isDisplayModeContentEmpty}
@@ -182,7 +193,10 @@ export const RecordInlineCellContainer = ({
             </RecordInlineCellDisplayMode>
           </StyledClickableContainer>
         ) : (
-          <StyledClickableContainer onClick={handleDisplayModeClick}>
+          <StyledClickableContainer
+            readonly={readonly}
+            onClick={handleDisplayModeClick}
+          >
             <RecordInlineCellDisplayMode
               disableHoverEffect={disableHoverEffect}
               isDisplayModeContentEmpty={isDisplayModeContentEmpty}
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellDisplayMode.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellDisplayMode.tsx
index fe1aef9c27df..0b8770973598 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellDisplayMode.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellDisplayMode.tsx
@@ -20,7 +20,7 @@ const StyledRecordInlineCellNormalModeOuterContainer = styled.div<
   padding: ${({ theme }) => theme.spacing(1)};
 
   ${(props) => {
-    if (props.isHovered) {
+    if (props.isHovered === true) {
       return css`
         background-color: ${!props.disableHoverEffect
           ? props.theme.background.transparent.light
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/hooks/useInlineCell.ts b/packages/twenty-front/src/modules/object-record/record-inline-cell/hooks/useInlineCell.ts
index 8f834fdbaadc..7ff151b03d1d 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/hooks/useInlineCell.ts
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/hooks/useInlineCell.ts
@@ -5,6 +5,7 @@ import { FieldContext } from '@/object-record/record-field/contexts/FieldContext
 import { useRecordFieldInput } from '@/object-record/record-field/hooks/useRecordFieldInput';
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
+import { isDefined } from '~/utils/isDefined';
 
 import { isInlineCellInEditModeScopedState } from '../states/isInlineCellInEditModeScopedState';
 import { InlineCellHotkeyScope } from '../types/InlineCellHotkeyScope';
@@ -39,7 +40,7 @@ export const useInlineCell = () => {
     setIsInlineCellInEditMode(true);
     initFieldInputDraftValue();
 
-    if (customEditHotkeyScopeForField) {
+    if (isDefined(customEditHotkeyScopeForField)) {
       setHotkeyScopeAndMemorizePreviousScope(
         customEditHotkeyScopeForField.scope,
         customEditHotkeyScopeForField.customScopes,
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts b/packages/twenty-front/src/modules/object-record/record-inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts
index 37abc8db1565..96db47ff940d 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts
@@ -1,11 +1,10 @@
-import { atomFamily } from 'recoil';
-
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
 
-export const customEditHotkeyScopeForFieldScopedState = atomFamily<
+export const customEditHotkeyScopeForFieldScopedState = createFamilyState<
   HotkeyScope | null,
   string
 >({
   key: 'customEditHotkeyScopeForFieldScopedState',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/states/isInlineCellInEditModeScopedState.ts b/packages/twenty-front/src/modules/object-record/record-inline-cell/states/isInlineCellInEditModeScopedState.ts
index bdc57ccb36a9..9142d9400e02 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/states/isInlineCellInEditModeScopedState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/states/isInlineCellInEditModeScopedState.ts
@@ -1,6 +1,9 @@
-import { atomFamily } from 'recoil';
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
 
-export const isInlineCellInEditModeScopedState = atomFamily<boolean, string>({
+export const isInlineCellInEditModeScopedState = createFamilyState<
+  boolean,
+  string
+>({
   key: 'isInlineCellInEditModeScopedState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/states/parentHotkeyScopeForFieldScopedState.ts b/packages/twenty-front/src/modules/object-record/record-inline-cell/states/parentHotkeyScopeForFieldScopedState.ts
index 0314469079d7..4562c09cfa9a 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/states/parentHotkeyScopeForFieldScopedState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/states/parentHotkeyScopeForFieldScopedState.ts
@@ -1,11 +1,10 @@
-import { atomFamily } from 'recoil';
-
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
 
-export const parentHotkeyScopeForFieldScopedState = atomFamily<
+export const parentHotkeyScopeForFieldScopedState = createFamilyState<
   HotkeyScope | null,
   string
 >({
   key: 'parentHotkeyScopeForFieldScopedState',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainer.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainer.tsx
index 98f4e4f13b35..39c8f6c103f0 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainer.tsx
@@ -1,9 +1,9 @@
+import groupBy from 'lodash.groupby';
 import { useRecoilState, useRecoilValue } from 'recoil';
 
+import { useLabelIdentifierFieldMetadataItem } from '@/object-metadata/hooks/useLabelIdentifierFieldMetadataItem';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
-import { isObjectMetadataAvailableForRelation } from '@/object-metadata/utils/isObjectMetadataAvailableForRelation';
-import { parseFieldType } from '@/object-metadata/utils/parseFieldType';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
 import {
   FieldContext,
@@ -18,7 +18,7 @@ import { RecordDetailRelationSection } from '@/object-record/record-show/record-
 import { recordLoadingFamilyState } from '@/object-record/record-store/states/recordLoadingFamilyState';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import { recordStoreIdentifierFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreIdentifierSelector';
-import { isFieldMetadataItemAvailable } from '@/object-record/utils/isFieldMetadataItemAvailable';
+import { isFieldCellSupported } from '@/object-record/utils/isFieldCellSupported';
 import { ShowPageContainer } from '@/ui/layout/page/ShowPageContainer';
 import { ShowPageLeftContainer } from '@/ui/layout/show-page/components/ShowPageLeftContainer';
 import { ShowPageRightContainer } from '@/ui/layout/show-page/components/ShowPageRightContainer';
@@ -30,7 +30,8 @@ import {
   FileFolder,
   useUploadImageMutation,
 } from '~/generated/graphql';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 type RecordShowContainerProps = {
   objectNameSingular: string;
@@ -41,8 +42,12 @@ export const RecordShowContainer = ({
   objectNameSingular,
   objectRecordId,
 }: RecordShowContainerProps) => {
-  const { objectMetadataItem, labelIdentifierFieldMetadata } =
-    useObjectMetadataItem({
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { labelIdentifierFieldMetadataItem } =
+    useLabelIdentifierFieldMetadataItem({
       objectNameSingular,
     });
 
@@ -89,13 +94,7 @@ export const RecordShowContainer = ({
 
     const avatarUrl = result?.data?.uploadImage;
 
-    if (!avatarUrl) {
-      return;
-    }
-    if (!updateOneRecord) {
-      return;
-    }
-    if (!recordFromStore) {
+    if (!avatarUrl || isUndefinedOrNull(updateOneRecord) || !recordFromStore) {
       return;
     }
 
@@ -110,28 +109,26 @@ export const RecordShowContainer = ({
   const availableFieldMetadataItems = objectMetadataItem.fields
     .filter(
       (fieldMetadataItem) =>
-        isFieldMetadataItemAvailable(fieldMetadataItem) &&
-        fieldMetadataItem.id !== labelIdentifierFieldMetadata?.id,
+        isFieldCellSupported(fieldMetadataItem) &&
+        fieldMetadataItem.id !== labelIdentifierFieldMetadataItem?.id,
     )
     .sort((fieldMetadataItemA, fieldMetadataItemB) =>
       fieldMetadataItemA.name.localeCompare(fieldMetadataItemB.name),
     );
 
-  const inlineFieldMetadataItems = availableFieldMetadataItems.filter(
+  const { inlineFieldMetadataItems, relationFieldMetadataItems } = groupBy(
+    availableFieldMetadataItems,
     (fieldMetadataItem) =>
-      fieldMetadataItem.type !== FieldMetadataType.Relation,
-  );
-
-  const relationFieldMetadataItems = availableFieldMetadataItems.filter(
-    (fieldMetadataItem) =>
-      fieldMetadataItem.type === FieldMetadataType.Relation,
+      fieldMetadataItem.type === FieldMetadataType.Relation
+        ? 'relationFieldMetadataItems'
+        : 'inlineFieldMetadataItems',
   );
 
   return (
     <RecoilScope CustomRecoilScopeContext={ShowPageRecoilScopeContext}>
       <ShowPageContainer>
         <ShowPageLeftContainer>
-          {!recordLoading && isNonNullable(recordFromStore) && (
+          {!recordLoading && isDefined(recordFromStore) && (
             <>
               <ShowPageSummaryCard
                 id={objectRecordId}
@@ -143,19 +140,23 @@ export const RecordShowContainer = ({
                     value={{
                       entityId: objectRecordId,
                       recoilScopeId:
-                        objectRecordId + labelIdentifierFieldMetadata?.id,
+                        objectRecordId + labelIdentifierFieldMetadataItem?.id,
                       isLabelIdentifier: false,
                       fieldDefinition: {
-                        type: parseFieldType(
-                          labelIdentifierFieldMetadata?.type ||
-                            FieldMetadataType.Text,
-                        ),
+                        type:
+                          labelIdentifierFieldMetadataItem?.type ||
+                          FieldMetadataType.Text,
                         iconName: '',
-                        fieldMetadataId: labelIdentifierFieldMetadata?.id ?? '',
-                        label: labelIdentifierFieldMetadata?.label || '',
+                        fieldMetadataId:
+                          labelIdentifierFieldMetadataItem?.id ?? '',
+                        label: labelIdentifierFieldMetadataItem?.label || '',
                         metadata: {
-                          fieldName: labelIdentifierFieldMetadata?.name || '',
+                          fieldName:
+                            labelIdentifierFieldMetadataItem?.name || '',
+                          objectMetadataNameSingular: objectNameSingular,
                         },
+                        defaultValue:
+                          labelIdentifierFieldMetadataItem?.defaultValue,
                       },
                       useUpdateRecord: useUpdateOneObjectRecordMutation,
                       hotkeyScope: InlineCellHotkeyScope.InlineCell,
@@ -198,40 +199,25 @@ export const RecordShowContainer = ({
                 objectRecordId={objectRecordId}
                 objectNameSingular={objectNameSingular}
               />
-              {relationFieldMetadataItems
-                .filter((item) => {
-                  const relationObjectMetadataItem = item.toRelationMetadata
-                    ? item.toRelationMetadata.fromObjectMetadata
-                    : item.fromRelationMetadata?.toObjectMetadata;
-
-                  if (!relationObjectMetadataItem) {
-                    return false;
-                  }
-
-                  return isObjectMetadataAvailableForRelation(
-                    relationObjectMetadataItem,
-                  );
-                })
-                .map((fieldMetadataItem, index) => (
-                  <FieldContext.Provider
-                    key={objectRecordId + fieldMetadataItem.id}
-                    value={{
-                      entityId: objectRecordId,
-                      recoilScopeId: objectRecordId + fieldMetadataItem.id,
-                      isLabelIdentifier: false,
-                      fieldDefinition:
-                        formatFieldMetadataItemAsColumnDefinition({
-                          field: fieldMetadataItem,
-                          position: index,
-                          objectMetadataItem,
-                        }),
-                      useUpdateRecord: useUpdateOneObjectRecordMutation,
-                      hotkeyScope: InlineCellHotkeyScope.InlineCell,
-                    }}
-                  >
-                    <RecordDetailRelationSection />
-                  </FieldContext.Provider>
-                ))}
+              {relationFieldMetadataItems?.map((fieldMetadataItem, index) => (
+                <FieldContext.Provider
+                  key={objectRecordId + fieldMetadataItem.id}
+                  value={{
+                    entityId: objectRecordId,
+                    recoilScopeId: objectRecordId + fieldMetadataItem.id,
+                    isLabelIdentifier: false,
+                    fieldDefinition: formatFieldMetadataItemAsColumnDefinition({
+                      field: fieldMetadataItem,
+                      position: index,
+                      objectMetadataItem,
+                    }),
+                    useUpdateRecord: useUpdateOneObjectRecordMutation,
+                    hotkeyScope: InlineCellHotkeyScope.InlineCell,
+                  }}
+                >
+                  <RecordDetailRelationSection />
+                </FieldContext.Provider>
+              ))}
             </>
           )}
         </ShowPageLeftContainer>
diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainerEffect.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainerEffect.tsx
index b3f660e402b1..0f6246887600 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainerEffect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainerEffect.tsx
@@ -1,12 +1,11 @@
 import { useEffect } from 'react';
 import { useRecoilState, useSetRecoilState } from 'recoil';
 
-import { useActivityConnectionUtils } from '@/activities/hooks/useActivityConnectionUtils';
 import { Activity } from '@/activities/types/Activity';
 import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
 import { recordLoadingFamilyState } from '@/object-record/record-store/states/recordLoadingFamilyState';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const RecordShowContainer = ({
   objectRecordId,
@@ -15,7 +14,7 @@ export const RecordShowContainer = ({
   objectRecordId: string;
   objectNameSingular: string;
 }) => {
-  const { record, loading } = useFindOneRecord({
+  const { record: activity, loading } = useFindOneRecord<Activity>({
     objectRecordId,
     objectNameSingular,
     depth: 3,
@@ -35,14 +34,9 @@ export const RecordShowContainer = ({
     }
   }, [loading, recordLoading, setRecordLoading]);
 
-  const { makeActivityWithoutConnection } = useActivityConnectionUtils();
-
   useEffect(() => {
-    if (!loading && isNonNullable(record)) {
-      const { activity: activityWithoutConnection } =
-        makeActivityWithoutConnection(record as any);
-
-      setRecordStore(activityWithoutConnection as Activity);
+    if (!loading && isDefined(activity)) {
+      setRecordStore(activity);
     }
-  }, [loading, record, setRecordStore, makeActivityWithoutConnection]);
+  }, [loading, setRecordStore, activity]);
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRecordsList.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRecordsList.tsx
index d18c51bec95a..0317df93006b 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRecordsList.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRecordsList.tsx
@@ -2,7 +2,6 @@ import styled from '@emotion/styled';
 
 const StyledRecordsList = styled.div`
   color: ${({ theme }) => theme.font.color.secondary};
-  overflow: hidden;
 `;
 
 export { StyledRecordsList as RecordDetailRecordsList };
diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsList.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsList.tsx
index 0c2df8ae8d3f..c8ce45c0b9ad 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsList.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsList.tsx
@@ -1,3 +1,5 @@
+import { useState } from 'react';
+
 import { RecordDetailRecordsList } from '@/object-record/record-show/record-detail-section/components/RecordDetailRecordsList';
 import { RecordDetailRelationRecordsListItem } from '@/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsListItem';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
@@ -8,13 +10,22 @@ type RecordDetailRelationRecordsListProps = {
 
 export const RecordDetailRelationRecordsList = ({
   relationRecords,
-}: RecordDetailRelationRecordsListProps) => (
-  <RecordDetailRecordsList>
-    {relationRecords.slice(0, 5).map((relationRecord) => (
-      <RecordDetailRelationRecordsListItem
-        key={relationRecord.id}
-        relationRecord={relationRecord}
-      />
-    ))}
-  </RecordDetailRecordsList>
-);
+}: RecordDetailRelationRecordsListProps) => {
+  const [expandedItem, setExpandedItem] = useState('');
+
+  const handleItemClick = (recordId: string) =>
+    setExpandedItem(recordId === expandedItem ? '' : recordId);
+
+  return (
+    <RecordDetailRecordsList>
+      {relationRecords.slice(0, 5).map((relationRecord) => (
+        <RecordDetailRelationRecordsListItem
+          key={relationRecord.id}
+          isExpanded={expandedItem === relationRecord.id}
+          onClick={handleItemClick}
+          relationRecord={relationRecord}
+        />
+      ))}
+    </RecordDetailRecordsList>
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsListItem.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsListItem.tsx
index dd801414b682..fd46315aeaa5 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsListItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsListItem.tsx
@@ -1,23 +1,43 @@
-import { useContext } from 'react';
+import { useCallback, useContext } from 'react';
 import { css } from '@emotion/react';
 import styled from '@emotion/styled';
-import { LightIconButton, MenuItem } from 'tsup.ui.index';
+import { motion } from 'framer-motion';
+import {
+  IconChevronDown,
+  IconDotsVertical,
+  IconTrash,
+  IconUnlink,
+} from 'twenty-ui';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
 import { RecordChip } from '@/object-record/components/RecordChip';
 import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord.ts';
+import { useLazyFindOneRecord } from '@/object-record/hooks/useLazyFindOneRecord';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
+import {
+  FieldContext,
+  RecordUpdateHook,
+  RecordUpdateHookParams,
+} from '@/object-record/record-field/contexts/FieldContext';
 import { usePersistField } from '@/object-record/record-field/hooks/usePersistField';
 import { FieldRelationMetadata } from '@/object-record/record-field/types/FieldMetadata';
+import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
+import { PropertyBox } from '@/object-record/record-inline-cell/property-box/components/PropertyBox';
+import { InlineCellHotkeyScope } from '@/object-record/record-inline-cell/types/InlineCellHotkeyScope';
 import { RecordDetailRecordsListItem } from '@/object-record/record-show/record-detail-section/components/RecordDetailRecordsListItem';
+import { useSetRecordInStore } from '@/object-record/record-store/hooks/useSetRecordInStore';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { IconDotsVertical, IconTrash, IconUnlink } from '@/ui/display/icon';
+import { isFieldCellSupported } from '@/object-record/utils/isFieldCellSupported';
+import { IconComponent } from '@/ui/display/icon/types/IconComponent';
+import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
+import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
+import { AnimatedEaseInOut } from '@/ui/utilities/animation/components/AnimatedEaseInOut';
 
 const StyledListItem = styled(RecordDetailRecordsListItem)<{
   isDropdownOpen?: boolean;
@@ -40,11 +60,26 @@ const StyledListItem = styled(RecordDetailRecordsListItem)<{
   }
 `;
 
+const StyledClickableZone = styled.div`
+  align-items: center;
+  cursor: pointer;
+  display: flex;
+  flex: 1 0 auto;
+  height: 100%;
+  justify-content: flex-end;
+`;
+
+const MotionIconChevronDown = motion(IconChevronDown);
+
 type RecordDetailRelationRecordsListItemProps = {
+  isExpanded: boolean;
+  onClick: (relationRecordId: string) => void;
   relationRecord: ObjectRecord;
 };
 
 export const RecordDetailRelationRecordsListItem = ({
+  isExpanded,
+  onClick,
   relationRecord,
 }: RecordDetailRelationRecordsListItemProps) => {
   const { fieldDefinition } = useContext(FieldContext);
@@ -53,7 +88,6 @@ export const RecordDetailRelationRecordsListItem = ({
     relationFieldMetadataId,
     relationObjectMetadataNameSingular,
     relationType,
-    objectMetadataNameSingular,
   } = fieldDefinition.metadata as FieldRelationMetadata;
 
   const isToOneObject = relationType === 'TO_ONE_OBJECT';
@@ -61,15 +95,36 @@ export const RecordDetailRelationRecordsListItem = ({
     useObjectMetadataItem({
       objectNameSingular: relationObjectMetadataNameSingular,
     });
+
   const persistField = usePersistField();
+
+  const {
+    called: hasFetchedRelationRecord,
+    findOneRecord: findOneRelationRecord,
+  } = useLazyFindOneRecord({
+    objectNameSingular: relationObjectMetadataNameSingular,
+  });
   const { updateOneRecord: updateOneRelationRecord } = useUpdateOneRecord({
     objectNameSingular: relationObjectMetadataNameSingular,
   });
-
   const { deleteOneRecord: deleteOneRelationRecord } = useDeleteOneRecord({
     objectNameSingular: relationObjectMetadataNameSingular,
   });
 
+  const isAccountOwnerRelation =
+    relationObjectMetadataNameSingular ===
+    CoreObjectNameSingular.WorkspaceMember;
+
+  const availableRelationFieldMetadataItems = relationObjectMetadataItem.fields
+    .filter(
+      (fieldMetadataItem) =>
+        isFieldCellSupported(fieldMetadataItem) &&
+        fieldMetadataItem.id !==
+          relationObjectMetadataItem.labelIdentifierFieldMetadataId &&
+        fieldMetadataItem.id !== relationFieldMetadataId,
+    )
+    .sort();
+
   const dropdownScopeId = `record-field-card-menu-${relationRecord.id}`;
 
   const { closeDropdown, isDropdownOpen } = useDropdown(dropdownScopeId);
@@ -101,25 +156,58 @@ export const RecordDetailRelationRecordsListItem = ({
     await deleteOneRelationRecord(relationRecord.id);
   };
 
-  const isOpportunityCompanyRelation =
-    (objectMetadataNameSingular === CoreObjectNameSingular.Opportunity &&
-      relationObjectMetadataNameSingular === CoreObjectNameSingular.Company) ||
-    (objectMetadataNameSingular === CoreObjectNameSingular.Company &&
-      relationObjectMetadataNameSingular ===
-        CoreObjectNameSingular.Opportunity);
+  const useUpdateOneObjectRecordMutation: RecordUpdateHook = () => {
+    const updateEntity = ({ variables }: RecordUpdateHookParams) => {
+      updateOneRelationRecord?.({
+        idToUpdate: variables.where.id as string,
+        updateOneRecordInput: variables.updateOneRecordInput,
+      });
+    };
 
-  const isAccountOwnerRelation =
-    relationObjectMetadataNameSingular ===
-    CoreObjectNameSingular.WorkspaceMember;
+    return [updateEntity, { loading: false }];
+  };
 
-  return (
-    <StyledListItem isDropdownOpen={isDropdownOpen}>
-      <RecordChip
-        record={relationRecord}
-        objectNameSingular={relationObjectMetadataItem.nameSingular}
+  const { setRecords } = useSetRecordInStore();
+
+  const handleClick = () => onClick(relationRecord.id);
+
+  const AnimatedIconChevronDown = useCallback<IconComponent>(
+    (props) => (
+      <MotionIconChevronDown
+        className={props.className}
+        color={props.color}
+        size={props.size}
+        stroke={props.stroke}
+        initial={{ rotate: isExpanded ? 0 : -180 }}
+        animate={{ rotate: isExpanded ? -180 : 0 }}
       />
-      {/* TODO: temporary to prevent removing a company from an opportunity */}
-      {!isOpportunityCompanyRelation && (
+    ),
+    [isExpanded],
+  );
+
+  return (
+    <>
+      <StyledListItem isDropdownOpen={isDropdownOpen}>
+        <RecordChip
+          record={relationRecord}
+          objectNameSingular={relationObjectMetadataItem.nameSingular}
+        />
+        <StyledClickableZone
+          onClick={handleClick}
+          onMouseOver={() =>
+            !hasFetchedRelationRecord &&
+            findOneRelationRecord({
+              objectRecordId: relationRecord.id,
+              onCompleted: (record) => setRecords([record]),
+            })
+          }
+        >
+          <LightIconButton
+            className="displayOnHover"
+            Icon={AnimatedIconChevronDown}
+            accent="tertiary"
+          />
+        </StyledClickableZone>
         <DropdownScope dropdownScopeId={dropdownScopeId}>
           <Dropdown
             dropdownId={dropdownScopeId}
@@ -148,12 +236,38 @@ export const RecordDetailRelationRecordsListItem = ({
                 )}
               </DropdownMenuItemsContainer>
             }
-            dropdownHotkeyScope={{
-              scope: dropdownScopeId,
-            }}
+            dropdownHotkeyScope={{ scope: dropdownScopeId }}
           />
         </DropdownScope>
-      )}
-    </StyledListItem>
+      </StyledListItem>
+      <AnimatedEaseInOut isOpen={isExpanded}>
+        <PropertyBox>
+          {availableRelationFieldMetadataItems.map(
+            (fieldMetadataItem, index) => (
+              <FieldContext.Provider
+                key={fieldMetadataItem.id}
+                value={{
+                  entityId: relationRecord.id,
+                  maxWidth: 200,
+                  recoilScopeId: `${relationRecord.id}-${fieldMetadataItem.id}`,
+                  isLabelIdentifier: false,
+                  fieldDefinition: formatFieldMetadataItemAsColumnDefinition({
+                    field: fieldMetadataItem,
+                    position: index,
+                    objectMetadataItem: relationObjectMetadataItem,
+                    showLabel: true,
+                    labelWidth: 90,
+                  }),
+                  useUpdateRecord: useUpdateOneObjectRecordMutation,
+                  hotkeyScope: InlineCellHotkeyScope.InlineCell,
+                }}
+              >
+                <RecordInlineCell />
+              </FieldContext.Provider>
+            ),
+          )}
+        </PropertyBox>
+      </AnimatedEaseInOut>
+    </>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx
index c3c2133377dd..7a3252e7d82d 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx
@@ -2,6 +2,7 @@ import { useCallback, useContext } from 'react';
 import styled from '@emotion/styled';
 import qs from 'qs';
 import { useRecoilValue } from 'recoil';
+import { IconForbid, IconPencil, IconPlus } from 'twenty-ui';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
@@ -19,12 +20,11 @@ import { useRelationPicker } from '@/object-record/relation-picker/hooks/useRela
 import { RelationPickerScope } from '@/object-record/relation-picker/scopes/RelationPickerScope';
 import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { IconForbid, IconPencil, IconPlus } from '@/ui/display/icon';
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
-import { FilterQueryParams } from '@/views/hooks/internal/useFiltersFromQueryParams';
+import { FilterQueryParams } from '@/views/hooks/internal/useViewFromQueryParams';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 
 const StyledAddDropdown = styled(Dropdown)`
@@ -51,16 +51,17 @@ export const RecordDetailRelationSection = () => {
   );
 
   const fieldValue = useRecoilValue<
-    ({ id: string } & Record<string, any>) | null
+    ({ id: string } & Record<string, any>) | ObjectRecord[] | null
   >(recordStoreFamilySelector({ recordId: entityId, fieldName }));
 
+  // TODO: use new relation type
   const isToOneObject = relationType === 'TO_ONE_OBJECT';
   const isFromManyObjects = relationType === 'FROM_MANY_OBJECTS';
 
   const relationRecords: ObjectRecord[] =
     fieldValue && isToOneObject
-      ? [fieldValue]
-      : fieldValue?.edges.map(({ node }: { node: ObjectRecord }) => node) ?? [];
+      ? [fieldValue as ObjectRecord]
+      : (fieldValue as ObjectRecord[]) ?? [];
   const relationRecordIds = relationRecords.map(({ id }) => id);
 
   const dropdownId = `record-field-card-relation-picker-${fieldDefinition.label}`;
diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailSection.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailSection.tsx
index 8a9218ae9a41..9d1e29b10e52 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailSection.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailSection.tsx
@@ -5,6 +5,7 @@ import { Section } from '@/ui/layout/section/components/Section';
 const StyledRecordDetailSection = styled(Section)`
   border-top: 1px solid ${({ theme }) => theme.border.color.light};
   padding: ${({ theme }) => theme.spacing(3)};
+  padding-right: ${({ theme }) => theme.spacing(2)};
   width: auto;
 `;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailSectionHeader.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailSectionHeader.tsx
index f01d11777c97..b9087184b92a 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailSectionHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailSectionHeader.tsx
@@ -53,7 +53,7 @@ export const RecordDetailSectionHeader = ({
         <StyledTitleLabel>{title}</StyledTitleLabel>
         {link && <StyledLink to={link.to}>{link.label}</StyledLink>}
       </StyledTitle>
-      {hideRightAdornmentOnMouseLeave && !isHovered! ? null : rightAdornment}
+      {hideRightAdornmentOnMouseLeave && !isHovered ? null : rightAdornment}
     </StyledHeader>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-store/hooks/useSetRecordInStore.ts b/packages/twenty-front/src/modules/object-record/record-store/hooks/useSetRecordInStore.ts
index fb3f09a1c9c3..832d7ff11af3 100644
--- a/packages/twenty-front/src/modules/object-record/record-store/hooks/useSetRecordInStore.ts
+++ b/packages/twenty-front/src/modules/object-record/record-store/hooks/useSetRecordInStore.ts
@@ -10,7 +10,7 @@ export const useSetRecordInStore = () => {
         records.forEach((record) => {
           const currentRecord = snapshot
             .getLoadable(recordStoreFamilyState(record.id))
-            .valueOrThrow();
+            .getValue();
 
           if (JSON.stringify(currentRecord) !== JSON.stringify(record)) {
             set(recordStoreFamilyState(record.id), record);
diff --git a/packages/twenty-front/src/modules/object-record/record-store/states/recordLoadingFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-store/states/recordLoadingFamilyState.ts
index 68a97545e46f..cbfd3ebb0211 100644
--- a/packages/twenty-front/src/modules/object-record/record-store/states/recordLoadingFamilyState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-store/states/recordLoadingFamilyState.ts
@@ -1,6 +1,6 @@
-import { atomFamily } from 'recoil';
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
 
-export const recordLoadingFamilyState = atomFamily<boolean, string>({
+export const recordLoadingFamilyState = createFamilyState<boolean, string>({
   key: 'recordLoadingFamilyState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/object-record/record-store/states/recordStoreFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-store/states/recordStoreFamilyState.ts
index a0e71f0bb09d..9c7877004c7a 100644
--- a/packages/twenty-front/src/modules/object-record/record-store/states/recordStoreFamilyState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-store/states/recordStoreFamilyState.ts
@@ -1,8 +1,10 @@
-import { atomFamily } from 'recoil';
-
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
 
-export const recordStoreFamilyState = atomFamily<ObjectRecord | null, string>({
+export const recordStoreFamilyState = createFamilyState<
+  ObjectRecord | null,
+  string
+>({
   key: 'recordStoreFamilyState',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/action-bar/components/RecordTableActionBar.tsx b/packages/twenty-front/src/modules/object-record/record-table/action-bar/components/RecordTableActionBar.tsx
index 86b5e3534b2c..f7241a5e2a48 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/action-bar/components/RecordTableActionBar.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/action-bar/components/RecordTableActionBar.tsx
@@ -8,13 +8,13 @@ export const RecordTableActionBar = ({
 }: {
   recordTableId: string;
 }) => {
-  const { getSelectedRowIdsSelector } = useRecordTableStates(recordTableId);
+  const { selectedRowIdsSelector } = useRecordTableStates(recordTableId);
 
-  const selectedRowIds = useRecoilValue(getSelectedRowIdsSelector());
+  const selectedRowIds = useRecoilValue(selectedRowIdsSelector());
 
   if (!selectedRowIds.length) {
     return null;
   }
 
-  return <ActionBar />;
+  return <ActionBar selectedIds={selectedRowIds} />;
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/CheckboxCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/CheckboxCell.tsx
index 74af8f6ab5a9..2aff77e1b162 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/CheckboxCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/CheckboxCell.tsx
@@ -16,6 +16,7 @@ const StyledContainer = styled.div`
   height: 32px;
 
   justify-content: center;
+  background-color: ${({ theme }) => theme.background.primary};
 `;
 
 export const CheckboxCell = () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/ColumnHead.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/ColumnHead.tsx
index f9678b4111ee..5f3207bfa27e 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/ColumnHead.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/ColumnHead.tsx
@@ -1,8 +1,11 @@
-import { useTheme } from '@emotion/react';
+import { css, useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { useRecoilValue } from 'recoil';
 
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { useIcons } from '@/ui/display/icon/hooks/useIcons';
+import { MOBILE_VIEWPORT } from '@/ui/theme/constants/MobileViewport';
+import { scrollLeftState } from '@/ui/utilities/scroll/states/scrollLeftState';
 
 import { ColumnDefinition } from '../types/ColumnDefinition';
 
@@ -10,7 +13,7 @@ type ColumnHeadProps = {
   column: ColumnDefinition<FieldMetadata>;
 };
 
-const StyledTitle = styled.div`
+const StyledTitle = styled.div<{ hideTitle?: boolean }>`
   align-items: center;
   display: flex;
   flex-direction: row;
@@ -19,6 +22,14 @@ const StyledTitle = styled.div`
   height: ${({ theme }) => theme.spacing(8)};
   padding-left: ${({ theme }) => theme.spacing(2)};
   padding-right: ${({ theme }) => theme.spacing(2)};
+
+  ${({ hideTitle }) =>
+    hideTitle &&
+    css`
+      @media (max-width: ${MOBILE_VIEWPORT}px) {
+        display: none;
+      }
+    `}
 `;
 
 const StyledIcon = styled.div`
@@ -42,8 +53,10 @@ export const ColumnHead = ({ column }: ColumnHeadProps) => {
   const { getIcon } = useIcons();
   const Icon = getIcon(column.iconName);
 
+  const scrollLeft = useRecoilValue(scrollLeftState);
+
   return (
-    <StyledTitle>
+    <StyledTitle hideTitle={!!column.isLabelIdentifier && scrollLeft > 0}>
       <StyledIcon>
         <Icon size={theme.icon.size.md} />
       </StyledIcon>
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx
index 07638f0fa49c..aeeae2897ffe 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx
@@ -1,17 +1,23 @@
-import { useRef } from 'react';
+import { css } from '@emotion/react';
 import styled from '@emotion/styled';
+import { useRecoilValue } from 'recoil';
 
-import { useObjectMetadataItemOnly } from '@/object-metadata/hooks/useObjectMetadataItemOnly';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { RecordTableBody } from '@/object-record/record-table/components/RecordTableBody';
 import { RecordTableBodyEffect } from '@/object-record/record-table/components/RecordTableBodyEffect';
-import { RecordTableFirstColumnScrollEffect } from '@/object-record/record-table/components/RecordTableFirstColumnScrollObserver';
 import { RecordTableHeader } from '@/object-record/record-table/components/RecordTableHeader';
 import { RecordTableContext } from '@/object-record/record-table/contexts/RecordTableContext';
 import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
 import { RecordTableScope } from '@/object-record/record-table/scopes/RecordTableScope';
+import { MOBILE_VIEWPORT } from '@/ui/theme/constants/MobileViewport';
 import { RGBA } from '@/ui/theme/constants/Rgba';
+import { scrollLeftState } from '@/ui/utilities/scroll/states/scrollLeftState';
+import { scrollTopState } from '@/ui/utilities/scroll/states/scrollTopState';
 
-const StyledTable = styled.table`
+const StyledTable = styled.table<{
+  freezeFirstColumns?: boolean;
+  freezeHeaders?: boolean;
+}>`
   border-radius: ${({ theme }) => theme.border.radius.sm};
   border-spacing: 0;
   margin-right: ${({ theme }) => theme.table.horizontalCellMargin};
@@ -63,33 +69,53 @@ const StyledTable = styled.table`
     border-right: none;
   }
 
-  thead th:nth-of-type(1),
   tbody td:nth-of-type(1) {
     left: 0;
   }
-  thead th:nth-of-type(2),
-  tbody td:nth-of-type(2) {
-    left: calc(${({ theme }) => theme.table.checkboxColumnWidth} - 2px);
+
+  // Label identifier column
+  thead th:nth-of-type(1),
+  thead th:nth-of-type(2) {
+    left: 0;
+    top: 0;
+    z-index: 6;
   }
 
-  tbody td:nth-of-type(2)::after,
-  thead th:nth-of-type(2)::after {
-    content: '';
-    height: calc(100% + 1px);
-    position: absolute;
+  thead th:nth-of-type(n + 3) {
     top: 0;
-    width: 4px;
-    right: -4px;
+    z-index: 5;
+    position: sticky;
   }
 
-  &.freeze-first-columns-shadow thead th:nth-of-type(2)::after,
-  &.freeze-first-columns-shadow tbody td:nth-of-type(2)::after {
-    box-shadow: ${({ theme }) =>
-      `4px 0px 4px -4px ${
-        theme.name === 'dark'
-          ? RGBA(theme.grayScale.gray50, 0.8)
-          : RGBA(theme.grayScale.gray100, 0.25)
-      } inset`};
+  thead th:nth-of-type(2),
+  tbody td:nth-of-type(2) {
+    left: calc(${({ theme }) => theme.table.checkboxColumnWidth} - 2px);
+
+    ${({ freezeFirstColumns }) =>
+      freezeFirstColumns &&
+      css`
+        @media (max-width: ${MOBILE_VIEWPORT}px) {
+          width: 35px;
+          max-width: 35px;
+        }
+      `}
+
+    &::after {
+      content: '';
+      height: calc(100% + 1px);
+      position: absolute;
+      width: 4px;
+      right: -4px;
+      top: 0;
+
+      ${({ freezeFirstColumns, theme }) =>
+        freezeFirstColumns &&
+        css`
+          box-shadow: 4px 0px 4px -4px ${theme.name === 'dark'
+              ? RGBA(theme.grayScale.gray50, 0.8)
+              : RGBA(theme.grayScale.gray100, 0.25)} inset;
+        `}
+    }
   }
 
   thead th:nth-of-type(3),
@@ -111,10 +137,11 @@ export const RecordTable = ({
   onColumnsChange,
   createRecord,
 }: RecordTableProps) => {
-  const recordTableRef = useRef<HTMLTableElement>(null);
   const { scopeId } = useRecordTableStates(recordTableId);
+  const scrollLeft = useRecoilValue(scrollLeftState);
+  const scrollTop = useRecoilValue(scrollTopState);
 
-  const { objectMetadataItem } = useObjectMetadataItemOnly({
+  const { objectMetadataItem } = useObjectMetadataItem({
     objectNameSingular,
   });
 
@@ -127,11 +154,13 @@ export const RecordTable = ({
         <RecordTableContext.Provider
           value={{
             objectMetadataItem,
-            recordTableRef,
           }}
         >
-          <RecordTableFirstColumnScrollEffect />
-          <StyledTable ref={recordTableRef} className="entity-table-cell">
+          <StyledTable
+            freezeFirstColumns={scrollLeft > 0}
+            freezeHeaders={scrollTop > 0}
+            className="entity-table-cell"
+          >
             <RecordTableHeader createRecord={createRecord} />
             <RecordTableBodyEffect objectNameSingular={objectNameSingular} />
             <RecordTableBody objectNameSingular={objectNameSingular} />
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBody.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBody.tsx
index 4ba288f2282f..3947067f4806 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBody.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBody.tsx
@@ -1,6 +1,7 @@
 import { useRecoilValue } from 'recoil';
 
 import { RecordTableBodyFetchMoreLoader } from '@/object-record/record-table/components/RecordTableBodyFetchMoreLoader';
+import { RecordTablePendingRow } from '@/object-record/record-table/components/RecordTablePendingRow';
 import { RecordTableRow } from '@/object-record/record-table/components/RecordTableRow';
 import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
 
@@ -11,13 +12,14 @@ type RecordTableBodyProps = {
 export const RecordTableBody = ({
   objectNameSingular,
 }: RecordTableBodyProps) => {
-  const { getTableRowIdsState } = useRecordTableStates();
+  const { tableRowIdsState } = useRecordTableStates();
 
-  const tableRowIds = useRecoilValue(getTableRowIdsState());
+  const tableRowIds = useRecoilValue(tableRowIdsState);
 
   return (
     <>
       <tbody>
+        <RecordTablePendingRow />
         {tableRowIds.map((recordId, rowIndex) => (
           <RecordTableRow
             key={recordId}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBodyEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBodyEffect.tsx
index 6b215db7ed7b..bb70caea388b 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBodyEffect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBodyEffect.tsx
@@ -21,10 +21,10 @@ export const RecordTableBodyEffect = ({
     loading,
   } = useLoadRecordIndexTable(objectNameSingular);
 
-  const { getTableLastRowVisibleState } = useRecordTableStates();
+  const { tableLastRowVisibleState } = useRecordTableStates();
 
   const [tableLastRowVisible, setTableLastRowVisible] = useRecoilState(
-    getTableLastRowVisibleState(),
+    tableLastRowVisibleState,
   );
 
   const isFetchingMoreObjects = useRecoilValue(
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableCellContainer.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableCellContainer.tsx
index 85e8de1d122a..407a58a1378e 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableCellContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableCellContainer.tsx
@@ -1,6 +1,4 @@
 import { useContext } from 'react';
-import styled from '@emotion/styled';
-import { useSetRecoilState } from 'recoil';
 
 import { isLabelIdentifierField } from '@/object-metadata/utils/isLabelIdentifierField';
 import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
@@ -10,42 +8,18 @@ import { RecordTableCellContext } from '@/object-record/record-table/contexts/Re
 import { RecordTableContext } from '@/object-record/record-table/contexts/RecordTableContext';
 import { RecordTableRowContext } from '@/object-record/record-table/contexts/RecordTableRowContext';
 import { RecordTableCell } from '@/object-record/record-table/record-table-cell/components/RecordTableCell';
-import { useSetCurrentRowSelected } from '@/object-record/record-table/record-table-row/hooks/useSetCurrentRowSelected';
 import { TableHotkeyScope } from '@/object-record/record-table/types/TableHotkeyScope';
 import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
-import { contextMenuIsOpenState } from '@/ui/navigation/context-menu/states/contextMenuIsOpenState';
-import { contextMenuPositionState } from '@/ui/navigation/context-menu/states/contextMenuPositionState';
-
-const StyledContainer = styled.td<{ isSelected: boolean }>`
-  background: ${({ isSelected, theme }) =>
-    isSelected ? theme.accent.quaternary : theme.background.primary};
-`;
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 export const RecordTableCellContainer = () => {
-  const setContextMenuPosition = useSetRecoilState(contextMenuPositionState);
-  const setContextMenuOpenState = useSetRecoilState(contextMenuIsOpenState);
-
-  const { setCurrentRowSelected } = useSetCurrentRowSelected();
-
-  const handleContextMenu = (event: React.MouseEvent) => {
-    event.preventDefault();
-    setCurrentRowSelected(true);
-    setContextMenuPosition({
-      x: event.clientX,
-      y: event.clientY,
-    });
-    setContextMenuOpenState(true);
-  };
-
   const { objectMetadataItem } = useContext(RecordTableContext);
   const { columnDefinition } = useContext(RecordTableCellContext);
-  const { recordId, pathToShowPage, isSelected } = useContext(
-    RecordTableRowContext,
-  );
+  const { recordId, pathToShowPage } = useContext(RecordTableRowContext);
 
   const updateRecord = useContext(RecordUpdateContext);
 
-  if (!columnDefinition) {
+  if (isUndefinedOrNull(columnDefinition)) {
     return null;
   }
 
@@ -54,29 +28,24 @@ export const RecordTableCellContainer = () => {
     : TableHotkeyScope.CellEditMode;
 
   return (
-    <StyledContainer
-      isSelected={isSelected}
-      onContextMenu={(event) => handleContextMenu(event)}
+    <FieldContext.Provider
+      value={{
+        recoilScopeId: recordId + columnDefinition.label,
+        entityId: recordId,
+        fieldDefinition: columnDefinition,
+        useUpdateRecord: () => [updateRecord, {}],
+        hotkeyScope: customHotkeyScope,
+        basePathToShowPage: pathToShowPage,
+        isLabelIdentifier: isLabelIdentifierField({
+          fieldMetadataItem: {
+            id: columnDefinition.fieldMetadataId,
+            name: columnDefinition.metadata.fieldName,
+          },
+          objectMetadataItem,
+        }),
+      }}
     >
-      <FieldContext.Provider
-        value={{
-          recoilScopeId: recordId + columnDefinition.label,
-          entityId: recordId,
-          fieldDefinition: columnDefinition,
-          useUpdateRecord: () => [updateRecord, {}],
-          hotkeyScope: customHotkeyScope,
-          basePathToShowPage: pathToShowPage,
-          isLabelIdentifier: isLabelIdentifierField({
-            fieldMetadataItem: {
-              id: columnDefinition.fieldMetadataId,
-              name: columnDefinition.metadata.fieldName,
-            },
-            objectMetadataItem,
-          }),
-        }}
-      >
-        <RecordTableCell customHotkeyScope={{ scope: customHotkeyScope }} />
-      </FieldContext.Provider>
-    </StyledContainer>
+      <RecordTableCell customHotkeyScope={{ scope: customHotkeyScope }} />
+    </FieldContext.Provider>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableColumnDropdownMenu.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableColumnDropdownMenu.tsx
index 911bb3d87ff7..96a257041fe1 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableColumnDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableColumnDropdownMenu.tsx
@@ -1,9 +1,16 @@
 import { useRecoilValue } from 'recoil';
+import {
+  IconArrowLeft,
+  IconArrowRight,
+  IconEyeOff,
+  IconFilter,
+  IconSortDescending,
+} from 'twenty-ui';
 
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
-import { IconArrowLeft, IconArrowRight, IconEyeOff } from '@/ui/display/icon';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
 
@@ -17,9 +24,13 @@ export type RecordTableColumnDropdownMenuProps = {
 export const RecordTableColumnDropdownMenu = ({
   column,
 }: RecordTableColumnDropdownMenuProps) => {
-  const { getVisibleTableColumnsSelector } = useRecordTableStates();
+  const {
+    visibleTableColumnsSelector,
+    onToggleColumnFilterState,
+    onToggleColumnSortState,
+  } = useRecordTableStates();
 
-  const visibleTableColumns = useRecoilValue(getVisibleTableColumnsSelector());
+  const visibleTableColumns = useRecoilValue(visibleTableColumnsSelector());
 
   const secondVisibleColumn = visibleTableColumns[1];
   const canMoveLeft =
@@ -55,8 +66,42 @@ export const RecordTableColumnDropdownMenu = ({
     handleColumnVisibilityChange(column);
   };
 
+  const onToggleColumnFilter = useRecoilValue(onToggleColumnFilterState);
+  const onToggleColumnSort = useRecoilValue(onToggleColumnSortState);
+
+  const handleSortClick = () => {
+    closeDropdown();
+
+    onToggleColumnSort?.(column.fieldMetadataId);
+  };
+
+  const handleFilterClick = () => {
+    closeDropdown();
+
+    onToggleColumnFilter?.(column.fieldMetadataId);
+  };
+
+  const isSortable = column.isSortable === true;
+  const isFilterable = column.isFilterable === true;
+  const showSeparator = isFilterable || isSortable;
+
   return (
     <DropdownMenuItemsContainer>
+      {isFilterable && (
+        <MenuItem
+          LeftIcon={IconFilter}
+          onClick={handleFilterClick}
+          text="Filter"
+        />
+      )}
+      {isSortable && (
+        <MenuItem
+          LeftIcon={IconSortDescending}
+          onClick={handleSortClick}
+          text="Sort"
+        />
+      )}
+      {showSeparator && <DropdownMenuSeparator />}
       {canMoveLeft && (
         <MenuItem
           LeftIcon={IconArrowLeft}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableFirstColumnScrollObserver.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableFirstColumnScrollObserver.tsx
deleted file mode 100644
index bd6a0294603d..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableFirstColumnScrollObserver.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { useContext, useEffect } from 'react';
-import { useRecoilValue } from 'recoil';
-
-import { RecordTableContext } from '@/object-record/record-table/contexts/RecordTableContext';
-import { scrollLeftState } from '@/ui/utilities/scroll/states/scrollLeftState';
-
-export const RecordTableFirstColumnScrollEffect = () => {
-  const { recordTableRef } = useContext(RecordTableContext);
-
-  const scrollLeft = useRecoilValue(scrollLeftState);
-
-  useEffect(() => {
-    recordTableRef.current?.classList.toggle(
-      'freeze-first-columns-shadow',
-      scrollLeft > 0,
-    );
-  }, [scrollLeft, recordTableRef]);
-
-  return <></>;
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableHeader.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableHeader.tsx
index 6cde82074ca4..edc262e725be 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableHeader.tsx
@@ -1,10 +1,10 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
+import { IconPlus } from 'twenty-ui';
 
 import { RecordTableHeaderCell } from '@/object-record/record-table/components/RecordTableHeaderCell';
 import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
-import { IconPlus } from '@/ui/display/icon';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { useScrollWrapperScopedRef } from '@/ui/utilities/scroll/hooks/useScrollWrapperScopedRef';
 
@@ -28,8 +28,7 @@ const StyledPlusIconHeaderCell = styled.th<{ isTableWiderThanScreen: boolean }>`
   min-width: 32px;
   ${({ isTableWiderThanScreen, theme }) =>
     isTableWiderThanScreen &&
-    `position: relative;
-    right: 0;
+    `
     width: 32px;
     border-right: none !important;
     background-color: ${theme.background.primary};
@@ -56,16 +55,15 @@ export const RecordTableHeader = ({
 }: {
   createRecord: () => void;
 }) => {
-  const { getHiddenTableColumnsSelector, getVisibleTableColumnsSelector } =
-    useRecordTableStates();
+  const { visibleTableColumnsSelector } = useRecordTableStates();
 
   const scrollWrapper = useScrollWrapperScopedRef();
   const isTableWiderThanScreen =
     (scrollWrapper.current?.clientWidth ?? 0) <
     (scrollWrapper.current?.scrollWidth ?? 0);
 
-  const visibleTableColumns = useRecoilValue(getVisibleTableColumnsSelector());
-  const hiddenTableColumns = useRecoilValue(getHiddenTableColumnsSelector());
+  const visibleTableColumns = useRecoilValue(visibleTableColumnsSelector());
+  const hiddenTableColumns = useRecoilValue(visibleTableColumnsSelector());
 
   const theme = useTheme();
 
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableHeaderCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableHeaderCell.tsx
index a238792bd5c4..698939c85b8c 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableHeaderCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableHeaderCell.tsx
@@ -1,16 +1,18 @@
 import { useCallback, useMemo, useState } from 'react';
 import styled from '@emotion/styled';
 import { useRecoilCallback, useRecoilState, useRecoilValue } from 'recoil';
+import { IconPlus } from 'twenty-ui';
 
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { ColumnHead } from '@/object-record/record-table/components/ColumnHead';
 import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
 import { useTableColumns } from '@/object-record/record-table/hooks/useTableColumns';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
-import { IconPlus } from '@/ui/display/icon';
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { useTrackPointer } from '@/ui/utilities/pointer-event/hooks/useTrackPointer';
 import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
+import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
+import { scrollLeftState } from '@/ui/utilities/scroll/states/scrollLeftState';
 import { mapArrayToObject } from '~/utils/array/mapArrayToObject';
 
 import { ColumnHeadWithDropdown } from './ColumnHeadWithDropdown';
@@ -35,7 +37,7 @@ const StyledColumnHeaderCell = styled.th<{
     `;
   }};
   ${({ isResizing, theme }) => {
-    if (isResizing) {
+    if (isResizing === true) {
       return `&:after {
         background-color: ${theme.color.blue};
         bottom: 0;
@@ -70,9 +72,7 @@ const StyledColumnHeadContainer = styled.div`
 `;
 
 const StyledHeaderIcon = styled.div`
-  margin-bottom: ${({ theme }) => theme.spacing(1)};
-  margin-right: ${({ theme }) => theme.spacing(1)};
-  margin-top: ${({ theme }) => theme.spacing(1)};
+  margin: ${({ theme }) => theme.spacing(1, 1, 1, 1.5)};
 `;
 
 export const RecordTableHeaderCell = ({
@@ -82,14 +82,13 @@ export const RecordTableHeaderCell = ({
   column: ColumnDefinition<FieldMetadata>;
   createRecord: () => void;
 }) => {
-  const { getResizeFieldOffsetState, getTableColumnsState } =
-    useRecordTableStates();
+  const { resizeFieldOffsetState, tableColumnsState } = useRecordTableStates();
 
   const [resizeFieldOffset, setResizeFieldOffset] = useRecoilState(
-    getResizeFieldOffsetState(),
+    resizeFieldOffsetState,
   );
 
-  const tableColumns = useRecoilValue(getTableColumnsState());
+  const tableColumns = useRecoilValue(tableColumnsState);
   const tableColumnsByKey = useMemo(
     () =>
       mapArrayToObject(tableColumns, ({ fieldMetadataId }) => fieldMetadataId),
@@ -124,7 +123,7 @@ export const RecordTableHeaderCell = ({
 
         const resizeFieldOffset = getSnapshotValue(
           snapshot,
-          getResizeFieldOffsetState(),
+          resizeFieldOffsetState,
         );
 
         const nextWidth = Math.round(
@@ -134,7 +133,7 @@ export const RecordTableHeaderCell = ({
           ),
         );
 
-        set(getResizeFieldOffsetState(), 0);
+        set(resizeFieldOffsetState, 0);
         setInitialPointerPositionX(null);
         setResizedFieldKey(null);
 
@@ -150,7 +149,7 @@ export const RecordTableHeaderCell = ({
       },
     [
       resizedFieldKey,
-      getResizeFieldOffsetState,
+      resizeFieldOffsetState,
       tableColumnsByKey,
       tableColumns,
       handleColumnsChange,
@@ -164,6 +163,12 @@ export const RecordTableHeaderCell = ({
     onMouseUp: handleResizeHandlerEnd,
   });
 
+  const isMobile = useIsMobile();
+  const scrollLeft = useRecoilValue(scrollLeftState);
+
+  const disableColumnResize =
+    column.isLabelIdentifier && isMobile && scrollLeft > 0;
+
   return (
     <StyledColumnHeaderCell
       key={column.fieldMetadataId}
@@ -174,17 +179,16 @@ export const RecordTableHeaderCell = ({
           24,
         COLUMN_MIN_WIDTH,
       )}
+      onMouseEnter={() => setIconVisibility(true)}
+      onMouseLeave={() => setIconVisibility(false)}
     >
-      <StyledColumnHeadContainer
-        onMouseEnter={() => setIconVisibility(true)}
-        onMouseLeave={() => setIconVisibility(false)}
-      >
+      <StyledColumnHeadContainer>
         {column.isLabelIdentifier ? (
           <ColumnHead column={column} />
         ) : (
           <ColumnHeadWithDropdown column={column} />
         )}
-        {iconVisibility && !!column.isLabelIdentifier && (
+        {(useIsMobile() || iconVisibility) && !!column.isLabelIdentifier && (
           <StyledHeaderIcon>
             <LightIconButton
               Icon={IconPlus}
@@ -195,13 +199,15 @@ export const RecordTableHeaderCell = ({
           </StyledHeaderIcon>
         )}
       </StyledColumnHeadContainer>
-      <StyledResizeHandler
-        className="cursor-col-resize"
-        role="separator"
-        onPointerDown={() => {
-          setResizedFieldKey(column.fieldMetadataId);
-        }}
-      />
+      {!disableColumnResize && (
+        <StyledResizeHandler
+          className="cursor-col-resize"
+          role="separator"
+          onPointerDown={() => {
+            setResizedFieldKey(column.fieldMetadataId);
+          }}
+        />
+      )}
     </StyledColumnHeaderCell>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableHeaderPlusButtonContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableHeaderPlusButtonContent.tsx
index b08140cea4a5..136a888ccb87 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableHeaderPlusButtonContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableHeaderPlusButtonContent.tsx
@@ -2,12 +2,12 @@ import { useCallback } from 'react';
 import { Link } from 'react-router-dom';
 import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
+import { IconSettings } from 'twenty-ui';
 
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
 import { useTableColumns } from '@/object-record/record-table/hooks/useTableColumns';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
-import { IconSettings } from '@/ui/display/icon';
 import { useIcons } from '@/ui/display/icon/hooks/useIcons';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -17,9 +17,9 @@ import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
 export const RecordTableHeaderPlusButtonContent = () => {
   const { closeDropdown } = useDropdown();
 
-  const { getHiddenTableColumnsSelector } = useRecordTableStates();
+  const { hiddenTableColumnsSelector } = useRecordTableStates();
 
-  const hiddenTableColumns = useRecoilValue(getHiddenTableColumnsSelector());
+  const hiddenTableColumns = useRecoilValue(hiddenTableColumnsSelector());
 
   const { getIcon } = useIcons();
   const { handleColumnVisibilityChange } = useTableColumns();
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTablePendingRow.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTablePendingRow.tsx
new file mode 100644
index 000000000000..2c05409d326e
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTablePendingRow.tsx
@@ -0,0 +1,19 @@
+import { useRecoilValue } from 'recoil';
+
+import { RecordTableRow } from '@/object-record/record-table/components/RecordTableRow';
+import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
+
+export const RecordTablePendingRow = () => {
+  const { pendingRecordIdState } = useRecordTableStates();
+  const pendingRecordId = useRecoilValue(pendingRecordIdState);
+
+  if (!pendingRecordId) return;
+
+  return (
+    <RecordTableRow
+      key={pendingRecordId}
+      recordId={pendingRecordId}
+      rowIndex={-1}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRow.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRow.tsx
index b6af608f61c3..7b9dfc25b532 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRow.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRow.tsx
@@ -23,12 +23,12 @@ const StyledTd = styled.td`
 `;
 
 export const RecordTableRow = ({ recordId, rowIndex }: RecordTableRowProps) => {
-  const { getVisibleTableColumnsSelector, isRowSelectedFamilyState } =
+  const { visibleTableColumnsSelector, isRowSelectedFamilyState } =
     useRecordTableStates();
   const currentRowSelected = useRecoilValue(isRowSelectedFamilyState(recordId));
   const { objectMetadataItem } = useContext(RecordTableContext);
 
-  const visibleTableColumns = useRecoilValue(getVisibleTableColumnsSelector());
+  const visibleTableColumns = useRecoilValue(visibleTableColumnsSelector());
 
   const scrollWrapperRef = useContext(ScrollWrapperContext);
 
@@ -43,8 +43,11 @@ export const RecordTableRow = ({ recordId, rowIndex }: RecordTableRowProps) => {
         recordId,
         rowIndex,
         pathToShowPage:
-          getBasePathToShowPage({ objectMetadataItem }) + recordId,
+          getBasePathToShowPage({
+            objectNameSingular: objectMetadataItem.nameSingular,
+          }) + recordId,
         isSelected: currentRowSelected,
+        isReadOnly: objectMetadataItem.isRemote ?? false,
       }}
     >
       <tr
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWithWrappers.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWithWrappers.tsx
index 428111a00202..225df8bf5e66 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWithWrappers.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWithWrappers.tsx
@@ -1,13 +1,15 @@
 import { useRef } from 'react';
 import styled from '@emotion/styled';
 import { useRecoilCallback, useRecoilValue } from 'recoil';
+import { IconPlus } from 'twenty-ui';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
+import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { RecordTable } from '@/object-record/record-table/components/RecordTable';
 import { EntityDeleteContext } from '@/object-record/record-table/contexts/EntityDeleteHookContext';
 import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
-import { IconPlus } from '@/ui/display/icon';
+import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
 import { Button } from '@/ui/input/button/components/Button';
 import AnimatedPlaceholder from '@/ui/layout/animated-placeholder/components/AnimatedPlaceholder';
 import {
@@ -18,7 +20,7 @@ import {
 } from '@/ui/layout/animated-placeholder/components/EmptyPlaceholderStyled';
 import { DragSelect } from '@/ui/utilities/drag-select/components/DragSelect';
 import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
-import { useViewFields } from '@/views/hooks/internal/useViewFields';
+import { useSaveCurrentViewFields } from '@/views/hooks/useSaveCurrentViewFields';
 import { mapColumnDefinitionsToViewFields } from '@/views/utils/mapColumnDefinitionToViewField';
 
 import { RecordUpdateContext } from '../contexts/EntityUpdateMutationHookContext';
@@ -31,6 +33,7 @@ const StyledTableWithHeader = styled.div`
   flex: 1;
   flex-direction: column;
   width: 100%;
+  height: 100%;
 `;
 
 const StyledTableContainer = styled.div`
@@ -57,16 +60,16 @@ export const RecordTableWithWrappers = ({
 }: RecordTableWithWrappersProps) => {
   const tableBodyRef = useRef<HTMLDivElement>(null);
 
-  const { getNumberOfTableRowsState, getIsRecordTableInitialLoadingState } =
+  const { numberOfTableRowsState, isRecordTableInitialLoadingState } =
     useRecordTableStates(recordTableId);
 
-  const numberOfTableRows = useRecoilValue(getNumberOfTableRowsState());
+  const numberOfTableRows = useRecoilValue(numberOfTableRowsState);
 
   const isRecordTableInitialLoading = useRecoilValue(
-    getIsRecordTableInitialLoadingState(),
+    isRecordTableInitialLoadingState,
   );
 
-  const { resetTableRowSelection, setRowSelectedState } = useRecordTable({
+  const { resetTableRowSelection, setRowSelected } = useRecordTable({
     recordTableId,
   });
 
@@ -76,11 +79,11 @@ export const RecordTableWithWrappers = ({
     },
   );
 
-  const { persistViewFields } = useViewFields(viewBarId);
+  const { saveViewFields } = useSaveCurrentViewFields(viewBarId);
 
   const { deleteOneRecord } = useDeleteOneRecord({ objectNameSingular });
 
-  const objectLabel = foundObjectMetadataItem?.nameSingular;
+  const objectLabel = foundObjectMetadataItem?.labelSingular;
 
   return (
     <EntityDeleteContext.Provider value={deleteOneRecord}>
@@ -92,17 +95,22 @@ export const RecordTableWithWrappers = ({
                 <RecordTable
                   recordTableId={recordTableId}
                   objectNameSingular={objectNameSingular}
-                  onColumnsChange={useRecoilCallback(() => (columns) => {
-                    persistViewFields(
-                      mapColumnDefinitionsToViewFields(columns),
-                    );
-                  })}
+                  onColumnsChange={useRecoilCallback(
+                    () => (columns) => {
+                      saveViewFields(
+                        mapColumnDefinitionsToViewFields(
+                          columns as ColumnDefinition<FieldMetadata>[],
+                        ),
+                      );
+                    },
+                    [saveViewFields],
+                  )}
                   createRecord={createRecord}
                 />
                 <DragSelect
                   dragSelectable={tableBodyRef}
                   onDragSelectionStart={resetTableRowSelection}
-                  onDragSelectionChange={setRowSelectedState}
+                  onDragSelectionChange={setRowSelected}
                 />
               </div>
               <RecordTableInternalEffect
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/SelectAllCheckbox.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/SelectAllCheckbox.tsx
index 7d65db3912fc..870b49a19d3d 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/SelectAllCheckbox.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/SelectAllCheckbox.tsx
@@ -13,21 +13,27 @@ const StyledContainer = styled.div`
   height: 32px;
 
   justify-content: center;
+  background-color: ${({ theme }) => theme.background.primary};
 `;
 
 export const SelectAllCheckbox = () => {
-  const { getAllRowsSelectedStatusSelector } = useRecordTableStates();
+  const { allRowsSelectedStatusSelector } = useRecordTableStates();
 
-  const allRowsSelectedStatus = useRecoilValue(
-    getAllRowsSelectedStatusSelector(),
-  );
-  const { selectAllRows } = useRecordTable();
+  const allRowsSelectedStatus = useRecoilValue(allRowsSelectedStatusSelector());
+  const { selectAllRows, resetTableRowSelection, setHasUserSelectedAllRows } =
+    useRecordTable();
 
   const checked = allRowsSelectedStatus === 'all';
   const indeterminate = allRowsSelectedStatus === 'some';
 
-  const onChange = () => {
-    selectAllRows();
+  const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    if (e.target.checked) {
+      setHasUserSelectedAllRows(true);
+      selectAllRows();
+    } else {
+      setHasUserSelectedAllRows(false);
+      resetTableRowSelection();
+    }
   };
 
   return (
diff --git a/packages/twenty-front/src/modules/object-record/record-table/context-menu/components/RecordTableContextMenu.tsx b/packages/twenty-front/src/modules/object-record/record-table/context-menu/components/RecordTableContextMenu.tsx
index 2ccbae769852..d9f712ef82e4 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/context-menu/components/RecordTableContextMenu.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/context-menu/components/RecordTableContextMenu.tsx
@@ -8,9 +8,9 @@ export const RecordTableContextMenu = ({
 }: {
   recordTableId: string;
 }) => {
-  const { getSelectedRowIdsSelector } = useRecordTableStates(recordTableId);
+  const { selectedRowIdsSelector } = useRecordTableStates(recordTableId);
 
-  const selectedRowIds = useRecoilValue(getSelectedRowIdsSelector());
+  const selectedRowIds = useRecoilValue(selectedRowIdsSelector());
 
   if (!selectedRowIds.length) {
     return null;
diff --git a/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableContext.ts b/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableContext.ts
index 87ad5adb8019..80e2ad9a3f88 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableContext.ts
@@ -4,7 +4,6 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 
 type RecordTableContextProps = {
   objectMetadataItem: ObjectMetadataItem;
-  recordTableRef: React.RefObject<HTMLDivElement>;
 };
 
 export const RecordTableContext = createContext<RecordTableContextProps>(
diff --git a/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableRowContext.ts b/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableRowContext.ts
index 25035b383332..b57932023fa0 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableRowContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableRowContext.ts
@@ -5,6 +5,7 @@ type RecordTableRowContextProps = {
   recordId: string;
   rowIndex: number;
   isSelected: boolean;
+  isReadOnly: boolean;
 };
 
 export const RecordTableRowContext = createContext<RecordTableRowContextProps>(
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts
index d8c21c844051..a9976aa05fac 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts
@@ -5,7 +5,7 @@ import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotV
 
 export const useCloseCurrentTableCellInEditMode = (recordTableId?: string) => {
   const {
-    getCurrentTableCellInEditModePositionState,
+    currentTableCellInEditModePositionState,
     isTableCellInEditModeFamilyState,
   } = useRecordTableStates(recordTableId);
 
@@ -14,7 +14,7 @@ export const useCloseCurrentTableCellInEditMode = (recordTableId?: string) => {
       return async () => {
         const currentTableCellInEditModePosition = getSnapshotValue(
           snapshot,
-          getCurrentTableCellInEditModePositionState(),
+          currentTableCellInEditModePositionState,
         );
 
         set(
@@ -23,9 +23,6 @@ export const useCloseCurrentTableCellInEditMode = (recordTableId?: string) => {
         );
       };
     },
-    [
-      getCurrentTableCellInEditModePositionState,
-      isTableCellInEditModeFamilyState,
-    ],
+    [currentTableCellInEditModePositionState, isTableCellInEditModeFamilyState],
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useDisableSoftFocus.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useDisableSoftFocus.ts
index fed4211c976e..2e1704dfa5c5 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useDisableSoftFocus.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useDisableSoftFocus.ts
@@ -5,8 +5,8 @@ import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotV
 
 export const useDisableSoftFocus = (recordTableId?: string) => {
   const {
-    getSoftFocusPositionState,
-    getIsSoftFocusActiveState,
+    softFocusPositionState,
+    isSoftFocusActiveState,
     isSoftFocusOnTableCellFamilyState,
   } = useRecordTableStates(recordTableId);
 
@@ -15,17 +15,17 @@ export const useDisableSoftFocus = (recordTableId?: string) => {
       return () => {
         const currentPosition = getSnapshotValue(
           snapshot,
-          getSoftFocusPositionState(),
+          softFocusPositionState,
         );
 
-        set(getIsSoftFocusActiveState(), false);
+        set(isSoftFocusActiveState, false);
 
         set(isSoftFocusOnTableCellFamilyState(currentPosition), false);
       };
     },
     [
-      getIsSoftFocusActiveState,
-      getSoftFocusPositionState,
+      isSoftFocusActiveState,
+      softFocusPositionState,
       isSoftFocusOnTableCellFamilyState,
     ],
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useGetIsSomeCellInEditMode.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useGetIsSomeCellInEditMode.ts
index 8a4b486258e2..ecc422eecd1e 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useGetIsSomeCellInEditMode.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useGetIsSomeCellInEditMode.ts
@@ -5,7 +5,7 @@ import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotV
 
 export const useGetIsSomeCellInEditModeState = (recordTableId?: string) => {
   const {
-    getCurrentTableCellInEditModePositionState,
+    currentTableCellInEditModePositionState,
     isTableCellInEditModeFamilyState,
   } = useRecordTableStates(recordTableId);
 
@@ -14,7 +14,7 @@ export const useGetIsSomeCellInEditModeState = (recordTableId?: string) => {
       () => {
         const currentTableCellInEditModePosition = getSnapshotValue(
           snapshot,
-          getCurrentTableCellInEditModePositionState(),
+          currentTableCellInEditModePositionState,
         );
 
         const isSomeCellInEditModeState = isTableCellInEditModeFamilyState(
@@ -23,9 +23,6 @@ export const useGetIsSomeCellInEditModeState = (recordTableId?: string) => {
 
         return isSomeCellInEditModeState;
       },
-    [
-      getCurrentTableCellInEditModePositionState,
-      isTableCellInEditModeFamilyState,
-    ],
+    [currentTableCellInEditModePositionState, isTableCellInEditModeFamilyState],
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useLeaveTableFocus.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useLeaveTableFocus.ts
index 5ce6a307f7f5..0ee3aa62d6a8 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useLeaveTableFocus.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useLeaveTableFocus.ts
@@ -14,19 +14,19 @@ export const useLeaveTableFocus = (recordTableId?: string) => {
   const closeCurrentCellInEditMode =
     useCloseCurrentTableCellInEditMode(recordTableId);
 
-  const { getIsSoftFocusActiveState } = useRecordTableStates(recordTableId);
+  const { isSoftFocusActiveState } = useRecordTableStates(recordTableId);
 
   return useRecoilCallback(
     ({ snapshot }) =>
       () => {
         const isSoftFocusActive = getSnapshotValue(
           snapshot,
-          getIsSoftFocusActiveState(),
+          isSoftFocusActiveState,
         );
 
         const currentHotkeyScope = snapshot
           .getLoadable(currentHotkeyScopeState)
-          .valueOrThrow();
+          .getValue();
 
         if (!isSoftFocusActive) {
           return;
@@ -39,6 +39,6 @@ export const useLeaveTableFocus = (recordTableId?: string) => {
         closeCurrentCellInEditMode();
         disableSoftFocus();
       },
-    [closeCurrentCellInEditMode, disableSoftFocus, getIsSoftFocusActiveState],
+    [closeCurrentCellInEditMode, disableSoftFocus, isSoftFocusActiveState],
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useMoveEditModeToCellPosition.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useMoveEditModeToCellPosition.ts
index 5bb32c4abe99..02e04a259d31 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useMoveEditModeToCellPosition.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useMoveEditModeToCellPosition.ts
@@ -8,7 +8,7 @@ import { TableCellPosition } from '../../types/TableCellPosition';
 export const useMoveEditModeToTableCellPosition = (recordTableId?: string) => {
   const {
     isTableCellInEditModeFamilyState,
-    getCurrentTableCellInEditModePositionState,
+    currentTableCellInEditModePositionState,
   } = useRecordTableStates(recordTableId);
 
   return useRecoilCallback(
@@ -16,7 +16,7 @@ export const useMoveEditModeToTableCellPosition = (recordTableId?: string) => {
       return (newPosition: TableCellPosition) => {
         const currentTableCellInEditModePosition = getSnapshotValue(
           snapshot,
-          getCurrentTableCellInEditModePositionState(),
+          currentTableCellInEditModePositionState,
         );
 
         set(
@@ -24,14 +24,11 @@ export const useMoveEditModeToTableCellPosition = (recordTableId?: string) => {
           false,
         );
 
-        set(getCurrentTableCellInEditModePositionState(), newPosition);
+        set(currentTableCellInEditModePositionState, newPosition);
 
         set(isTableCellInEditModeFamilyState(newPosition), true);
       };
     },
-    [
-      getCurrentTableCellInEditModePositionState,
-      isTableCellInEditModeFamilyState,
-    ],
+    [currentTableCellInEditModePositionState, isTableCellInEditModeFamilyState],
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useRecordTableStates.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useRecordTableStates.ts
index 7238fec44150..1e178da5bd7a 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useRecordTableStates.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useRecordTableStates.ts
@@ -1,31 +1,35 @@
-import { isRowSelectedFamilyStateScopeMap } from '@/object-record/record-table/record-table-row/states/isRowSelectedFamilyStateScopeMap';
+import { hasUserSelectedAllRowsComponentState } from '@/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState';
+import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState';
 import { RecordTableScopeInternalContext } from '@/object-record/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext';
-import { availableTableColumnsStateScopeMap } from '@/object-record/record-table/states/availableTableColumnsStateScopeMap';
-import { currentTableCellInEditModePositionStateScopeMap } from '@/object-record/record-table/states/currentTableCellInEditModePositionStateScopeMap';
-import { isRecordTableInitialLoadingStateScopeMap } from '@/object-record/record-table/states/isRecordTableInitialLoadingStateScopeMap';
-import { isSoftFocusActiveStateScopeMap } from '@/object-record/record-table/states/isSoftFocusActiveStateScopeMap';
-import { isSoftFocusOnTableCellFamilyStateScopeMap } from '@/object-record/record-table/states/isSoftFocusOnTableCellFamilyStateScopeMap';
-import { isTableCellInEditModeFamilyStateScopeMap } from '@/object-record/record-table/states/isTableCellInEditModeFamilyStateScopeMap';
-import { numberOfTableRowsStateScopeMap } from '@/object-record/record-table/states/numberOfTableRowsStateScopeMap';
-import { onColumnsChangeStateScopeMap } from '@/object-record/record-table/states/onColumnsChangeStateScopeMap';
-import { onEntityCountChangeStateScopeMap } from '@/object-record/record-table/states/onEntityCountChangeStateScopeMap';
-import { resizeFieldOffsetStateScopeMap } from '@/object-record/record-table/states/resizeFieldOffsetStateScopeMap';
-import { allRowsSelectedStatusSelectorScopeMap } from '@/object-record/record-table/states/selectors/allRowsSelectedStatusSelectorScopeMap';
-import { hiddenTableColumnsSelectorScopeMap } from '@/object-record/record-table/states/selectors/hiddenTableColumnsSelectorScopeMap';
-import { numberOfTableColumnsSelectorScopeMap } from '@/object-record/record-table/states/selectors/numberOfTableColumnsSelectorScopeMap';
-import { selectedRowIdsSelectorScopeMap } from '@/object-record/record-table/states/selectors/selectedRowIdsSelectorScopeMap';
-import { visibleTableColumnsSelectorScopeMap } from '@/object-record/record-table/states/selectors/visibleTableColumnsSelectorScopeMap';
-import { softFocusPositionStateScopeMap } from '@/object-record/record-table/states/softFocusPositionStateScopeMap';
-import { tableColumnsStateScopeMap } from '@/object-record/record-table/states/tableColumnsStateScopeMap';
-import { tableFiltersStateScopeMap } from '@/object-record/record-table/states/tableFiltersStateScopeMap';
-import { tableLastRowVisibleStateScopeMap } from '@/object-record/record-table/states/tableLastRowVisibleStateScopeMap';
-import { tableRowIdsStateScopeMap } from '@/object-record/record-table/states/tableRowIdsStateScopeMap';
-import { tableSortsStateScopeMap } from '@/object-record/record-table/states/tableSortsStateScopeMap';
+import { availableTableColumnsComponentState } from '@/object-record/record-table/states/availableTableColumnsComponentState';
+import { currentTableCellInEditModePositionComponentState } from '@/object-record/record-table/states/currentTableCellInEditModePositionComponentState';
+import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState';
+import { isSoftFocusActiveComponentState } from '@/object-record/record-table/states/isSoftFocusActiveComponentState';
+import { isSoftFocusOnTableCellComponentFamilyState } from '@/object-record/record-table/states/isSoftFocusOnTableCellComponentFamilyState';
+import { isTableCellInEditModeComponentFamilyState } from '@/object-record/record-table/states/isTableCellInEditModeComponentFamilyState';
+import { numberOfTableRowsComponentState } from '@/object-record/record-table/states/numberOfTableRowsComponentState';
+import { onColumnsChangeComponentState } from '@/object-record/record-table/states/onColumnsChangeComponentState';
+import { onEntityCountChangeComponentState } from '@/object-record/record-table/states/onEntityCountChangeComponentState';
+import { onToggleColumnFilterComponentState } from '@/object-record/record-table/states/onToggleColumnFilterComponentState';
+import { onToggleColumnSortComponentState } from '@/object-record/record-table/states/onToggleColumnSortComponentState';
+import { recordTablePendingRecordIdComponentState } from '@/object-record/record-table/states/recordTablePendingRecordIdComponentState';
+import { resizeFieldOffsetComponentState } from '@/object-record/record-table/states/resizeFieldOffsetComponentState';
+import { allRowsSelectedStatusComponentSelector } from '@/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector';
+import { hiddenTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/hiddenTableColumnsComponentSelector';
+import { numberOfTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/numberOfTableColumnsComponentSelector';
+import { selectedRowIdsComponentSelector } from '@/object-record/record-table/states/selectors/selectedRowIdsComponentSelector';
+import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector';
+import { softFocusPositionComponentState } from '@/object-record/record-table/states/softFocusPositionComponentState';
+import { tableColumnsComponentState } from '@/object-record/record-table/states/tableColumnsComponentState';
+import { tableFiltersComponentState } from '@/object-record/record-table/states/tableFiltersComponentState';
+import { tableLastRowVisibleComponentState } from '@/object-record/record-table/states/tableLastRowVisibleComponentState';
+import { tableRowIdsComponentState } from '@/object-record/record-table/states/tableRowIdsComponentState';
+import { tableSortsComponentState } from '@/object-record/record-table/states/tableSortsComponentState';
 import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
-import { getFamilyState } from '@/ui/utilities/recoil-scope/utils/getFamilyState';
 import { getScopeIdOrUndefinedFromComponentId } from '@/ui/utilities/recoil-scope/utils/getScopeIdOrUndefinedFromComponentId';
-import { getSelectorReadOnly } from '@/ui/utilities/recoil-scope/utils/getSelectorReadOnly';
-import { getState } from '@/ui/utilities/recoil-scope/utils/getState';
+import { extractComponentFamilyState } from '@/ui/utilities/state/component-state/utils/extractComponentFamilyState';
+import { extractComponentReadOnlySelector } from '@/ui/utilities/state/component-state/utils/extractComponentReadOnlySelector';
+import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
 
 export const useRecordTableStates = (recordTableId?: string) => {
   const scopeId = useAvailableScopeIdOrThrow(
@@ -35,78 +39,102 @@ export const useRecordTableStates = (recordTableId?: string) => {
 
   return {
     scopeId,
-    getAvailableTableColumnsState: getState(
-      availableTableColumnsStateScopeMap,
+    availableTableColumnsState: extractComponentState(
+      availableTableColumnsComponentState,
       scopeId,
     ),
-    getTableFiltersState: getState(tableFiltersStateScopeMap, scopeId),
-    getTableSortsState: getState(tableSortsStateScopeMap, scopeId),
-    getTableColumnsState: getState(tableColumnsStateScopeMap, scopeId),
-
-    getOnColumnsChangeState: getState(onColumnsChangeStateScopeMap, scopeId),
-    getOnEntityCountChangeState: getState(
-      onEntityCountChangeStateScopeMap,
+    tableFiltersState: extractComponentState(
+      tableFiltersComponentState,
+      scopeId,
+    ),
+    tableSortsState: extractComponentState(tableSortsComponentState, scopeId),
+    tableColumnsState: extractComponentState(
+      tableColumnsComponentState,
+      scopeId,
+    ),
+    onToggleColumnFilterState: extractComponentState(
+      onToggleColumnFilterComponentState,
+      scopeId,
+    ),
+    onToggleColumnSortState: extractComponentState(
+      onToggleColumnSortComponentState,
+      scopeId,
+    ),
+    onColumnsChangeState: extractComponentState(
+      onColumnsChangeComponentState,
+      scopeId,
+    ),
+    onEntityCountChangeState: extractComponentState(
+      onEntityCountChangeComponentState,
+      scopeId,
+    ),
+    tableLastRowVisibleState: extractComponentState(
+      tableLastRowVisibleComponentState,
+      scopeId,
+    ),
+    softFocusPositionState: extractComponentState(
+      softFocusPositionComponentState,
       scopeId,
     ),
-    getTableLastRowVisibleState: getState(
-      tableLastRowVisibleStateScopeMap,
+    numberOfTableRowsState: extractComponentState(
+      numberOfTableRowsComponentState,
       scopeId,
     ),
-    getSoftFocusPositionState: getState(
-      softFocusPositionStateScopeMap,
+    currentTableCellInEditModePositionState: extractComponentState(
+      currentTableCellInEditModePositionComponentState,
       scopeId,
     ),
-    getNumberOfTableRowsState: getState(
-      numberOfTableRowsStateScopeMap,
+    isTableCellInEditModeFamilyState: extractComponentFamilyState(
+      isTableCellInEditModeComponentFamilyState,
       scopeId,
     ),
-    getCurrentTableCellInEditModePositionState: getState(
-      currentTableCellInEditModePositionStateScopeMap,
+    isSoftFocusActiveState: extractComponentState(
+      isSoftFocusActiveComponentState,
       scopeId,
     ),
-    isTableCellInEditModeFamilyState: getFamilyState(
-      isTableCellInEditModeFamilyStateScopeMap,
+    tableRowIdsState: extractComponentState(tableRowIdsComponentState, scopeId),
+    isRecordTableInitialLoadingState: extractComponentState(
+      isRecordTableInitialLoadingComponentState,
       scopeId,
     ),
-    getIsSoftFocusActiveState: getState(
-      isSoftFocusActiveStateScopeMap,
+    resizeFieldOffsetState: extractComponentState(
+      resizeFieldOffsetComponentState,
       scopeId,
     ),
-    getTableRowIdsState: getState(tableRowIdsStateScopeMap, scopeId),
-    getIsRecordTableInitialLoadingState: getState(
-      isRecordTableInitialLoadingStateScopeMap,
+    isSoftFocusOnTableCellFamilyState: extractComponentFamilyState(
+      isSoftFocusOnTableCellComponentFamilyState,
       scopeId,
     ),
-    getResizeFieldOffsetState: getState(
-      resizeFieldOffsetStateScopeMap,
+    isRowSelectedFamilyState: extractComponentFamilyState(
+      isRowSelectedComponentFamilyState,
       scopeId,
     ),
-    isSoftFocusOnTableCellFamilyState: getFamilyState(
-      isSoftFocusOnTableCellFamilyStateScopeMap,
+    hasUserSelectedAllRowState: extractComponentState(
+      hasUserSelectedAllRowsComponentState,
       scopeId,
     ),
-    isRowSelectedFamilyState: getFamilyState(
-      isRowSelectedFamilyStateScopeMap,
+    allRowsSelectedStatusSelector: extractComponentReadOnlySelector(
+      allRowsSelectedStatusComponentSelector,
       scopeId,
     ),
-    getAllRowsSelectedStatusSelector: getSelectorReadOnly(
-      allRowsSelectedStatusSelectorScopeMap,
+    hiddenTableColumnsSelector: extractComponentReadOnlySelector(
+      hiddenTableColumnsComponentSelector,
       scopeId,
     ),
-    getHiddenTableColumnsSelector: getSelectorReadOnly(
-      hiddenTableColumnsSelectorScopeMap,
+    numberOfTableColumnsSelector: extractComponentReadOnlySelector(
+      numberOfTableColumnsComponentSelector,
       scopeId,
     ),
-    getNumberOfTableColumnsSelector: getSelectorReadOnly(
-      numberOfTableColumnsSelectorScopeMap,
+    selectedRowIdsSelector: extractComponentReadOnlySelector(
+      selectedRowIdsComponentSelector,
       scopeId,
     ),
-    getSelectedRowIdsSelector: getSelectorReadOnly(
-      selectedRowIdsSelectorScopeMap,
+    visibleTableColumnsSelector: extractComponentReadOnlySelector(
+      visibleTableColumnsComponentSelector,
       scopeId,
     ),
-    getVisibleTableColumnsSelector: getSelectorReadOnly(
-      visibleTableColumnsSelectorScopeMap,
+    pendingRecordIdState: extractComponentState(
+      recordTablePendingRecordIdComponentState,
       scopeId,
     ),
   };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts
index c722d40bb509..7e86f581909c 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts
@@ -4,18 +4,18 @@ import { useRecordTableStates } from '@/object-record/record-table/hooks/interna
 import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
 
 export const useResetTableRowSelection = (recordTableId?: string) => {
-  const { getTableRowIdsState, isRowSelectedFamilyState } =
+  const { tableRowIdsState, isRowSelectedFamilyState } =
     useRecordTableStates(recordTableId);
 
   return useRecoilCallback(
     ({ snapshot, set }) =>
       () => {
-        const tableRowIds = getSnapshotValue(snapshot, getTableRowIdsState());
+        const tableRowIds = getSnapshotValue(snapshot, tableRowIdsState);
 
         for (const rowId of tableRowIds) {
           set(isRowSelectedFamilyState(rowId), false);
         }
       },
-    [getTableRowIdsState, isRowSelectedFamilyState],
+    [tableRowIdsState, isRowSelectedFamilyState],
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSelectAllRows.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSelectAllRows.ts
index 1a7e563c15d2..c76683e6ae87 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSelectAllRows.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSelectAllRows.ts
@@ -5,8 +5,8 @@ import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotV
 
 export const useSelectAllRows = (recordTableId?: string) => {
   const {
-    getAllRowsSelectedStatusSelector,
-    getTableRowIdsState,
+    allRowsSelectedStatusSelector,
+    tableRowIdsState,
     isRowSelectedFamilyState,
   } = useRecordTableStates(recordTableId);
 
@@ -15,10 +15,10 @@ export const useSelectAllRows = (recordTableId?: string) => {
       () => {
         const allRowsSelectedStatus = getSnapshotValue(
           snapshot,
-          getAllRowsSelectedStatusSelector(),
+          allRowsSelectedStatusSelector(),
         );
 
-        const tableRowIds = getSnapshotValue(snapshot, getTableRowIdsState());
+        const tableRowIds = getSnapshotValue(snapshot, tableRowIdsState);
 
         if (
           allRowsSelectedStatus === 'none' ||
@@ -33,11 +33,7 @@ export const useSelectAllRows = (recordTableId?: string) => {
           }
         }
       },
-    [
-      getAllRowsSelectedStatusSelector,
-      getTableRowIdsState,
-      isRowSelectedFamilyState,
-    ],
+    [allRowsSelectedStatusSelector, tableRowIdsState, isRowSelectedFamilyState],
   );
 
   return {
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetAllRowSelectedState.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetAllRowSelectedState.ts
new file mode 100644
index 000000000000..4544c4b71f95
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetAllRowSelectedState.ts
@@ -0,0 +1,16 @@
+import { useRecoilCallback } from 'recoil';
+
+import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
+
+export const useSetHasUserSelectedAllRows = (recordTableId?: string) => {
+  const { hasUserSelectedAllRowState: hasUserSelectedAllRowFamilyState } =
+    useRecordTableStates(recordTableId);
+
+  return useRecoilCallback(
+    ({ set }) =>
+      (selected: boolean) => {
+        set(hasUserSelectedAllRowFamilyState, selected);
+      },
+    [hasUserSelectedAllRowFamilyState],
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts
index f6fc8e1df828..781d348b45eb 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts
@@ -14,8 +14,12 @@ export const useSetRecordTableData = ({
   recordTableId,
   onEntityCountChange,
 }: useSetRecordTableDataProps) => {
-  const { getTableRowIdsState, getNumberOfTableRowsState } =
-    useRecordTableStates(recordTableId);
+  const {
+    tableRowIdsState,
+    numberOfTableRowsState,
+    isRowSelectedFamilyState,
+    hasUserSelectedAllRowState,
+  } = useRecordTableStates(recordTableId);
 
   return useRecoilCallback(
     ({ set, snapshot }) =>
@@ -24,23 +28,40 @@ export const useSetRecordTableData = ({
           // TODO: refactor with scoped state later
           const currentEntity = snapshot
             .getLoadable(recordStoreFamilyState(entity.id))
-            .valueOrThrow();
+            .getValue();
 
           if (JSON.stringify(currentEntity) !== JSON.stringify(entity)) {
             set(recordStoreFamilyState(entity.id), entity);
           }
         }
-        const currentRowIds = getSnapshotValue(snapshot, getTableRowIdsState());
+        const currentRowIds = getSnapshotValue(snapshot, tableRowIdsState);
+
+        const hasUserSelectedAllRows = getSnapshotValue(
+          snapshot,
+          hasUserSelectedAllRowState,
+        );
 
         const entityIds = newEntityArray.map((entity) => entity.id);
 
         if (!isDeeplyEqual(currentRowIds, entityIds)) {
-          set(getTableRowIdsState(), entityIds);
+          set(tableRowIdsState, entityIds);
+        }
+
+        if (hasUserSelectedAllRows) {
+          for (const rowId of entityIds) {
+            set(isRowSelectedFamilyState(rowId), true);
+          }
         }
 
-        set(getNumberOfTableRowsState(), totalCount);
+        set(numberOfTableRowsState, totalCount);
         onEntityCountChange(totalCount);
       },
-    [getNumberOfTableRowsState, getTableRowIdsState, onEntityCountChange],
+    [
+      numberOfTableRowsState,
+      tableRowIdsState,
+      onEntityCountChange,
+      isRowSelectedFamilyState,
+      hasUserSelectedAllRowState,
+    ],
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRowSelectedState.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRowSelectedState.ts
index 2cce04a60013..923121c843a0 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRowSelectedState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRowSelectedState.ts
@@ -5,7 +5,11 @@ import { useRecordTableStates } from '@/object-record/record-table/hooks/interna
 export const useSetRowSelectedState = (recordTableId?: string) => {
   const { isRowSelectedFamilyState } = useRecordTableStates(recordTableId);
 
-  return useRecoilCallback(({ set }) => (rowId: string, selected: boolean) => {
-    set(isRowSelectedFamilyState(rowId), selected);
-  });
+  return useRecoilCallback(
+    ({ set }) =>
+      (rowId: string, selected: boolean) => {
+        set(isRowSelectedFamilyState(rowId), selected);
+      },
+    [isRowSelectedFamilyState],
+  );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetSoftFocusPosition.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetSoftFocusPosition.ts
index 5c0408c625e3..edf8f7a904e0 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetSoftFocusPosition.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetSoftFocusPosition.ts
@@ -7,8 +7,8 @@ import { TableCellPosition } from '../../types/TableCellPosition';
 
 export const useSetSoftFocusPosition = (recordTableId?: string) => {
   const {
-    getSoftFocusPositionState,
-    getIsSoftFocusActiveState,
+    softFocusPositionState,
+    isSoftFocusActiveState,
     isSoftFocusOnTableCellFamilyState,
   } = useRecordTableStates(recordTableId);
 
@@ -17,21 +17,21 @@ export const useSetSoftFocusPosition = (recordTableId?: string) => {
       return (newPosition: TableCellPosition) => {
         const currentPosition = getSnapshotValue(
           snapshot,
-          getSoftFocusPositionState(),
+          softFocusPositionState,
         );
 
-        set(getIsSoftFocusActiveState(), true);
+        set(isSoftFocusActiveState, true);
 
         set(isSoftFocusOnTableCellFamilyState(currentPosition), false);
 
-        set(getSoftFocusPositionState(), newPosition);
+        set(softFocusPositionState, newPosition);
 
         set(isSoftFocusOnTableCellFamilyState(newPosition), true);
       };
     },
     [
-      getSoftFocusPositionState,
-      getIsSoftFocusActiveState,
+      softFocusPositionState,
+      isSoftFocusActiveState,
       isSoftFocusOnTableCellFamilyState,
     ],
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTable.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTable.ts
index 2941893c6b43..4ff7c65527f4 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTable.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTable.ts
@@ -4,6 +4,7 @@ import { Key } from 'ts-key-enum';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { useGetIsSomeCellInEditModeState } from '@/object-record/record-table/hooks/internal/useGetIsSomeCellInEditMode';
 import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
+import { useSetHasUserSelectedAllRows } from '@/object-record/record-table/hooks/internal/useSetAllRowSelectedState';
 import { useRecordTableMoveFocus } from '@/object-record/record-table/hooks/useRecordTableMoveFocus';
 import { isSoftFocusUsingMouseState } from '@/object-record/record-table/states/isSoftFocusUsingMouseState';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
@@ -32,51 +33,55 @@ export const useRecordTable = (props?: useRecordTableProps) => {
 
   const {
     scopeId,
-    getAvailableTableColumnsState,
-    getTableFiltersState,
-    getTableSortsState,
-    getTableColumnsState,
-    getOnEntityCountChangeState,
-    getOnColumnsChangeState,
-    getIsRecordTableInitialLoadingState,
-    getTableLastRowVisibleState,
-    getSelectedRowIdsSelector,
+    availableTableColumnsState,
+    tableFiltersState,
+    tableSortsState,
+    tableColumnsState,
+    onEntityCountChangeState,
+    onColumnsChangeState,
+    isRecordTableInitialLoadingState,
+    tableLastRowVisibleState,
+    selectedRowIdsSelector,
+    onToggleColumnFilterState,
+    onToggleColumnSortState,
+    pendingRecordIdState,
   } = useRecordTableStates(recordTableId);
 
   const setAvailableTableColumns = useRecoilCallback(
     ({ snapshot, set }) =>
       (columns: ColumnDefinition<FieldMetadata>[]) => {
-        const availableTableColumnsState = getSnapshotValue(
+        const availableTableColumns = getSnapshotValue(
           snapshot,
-          getAvailableTableColumnsState(),
+          availableTableColumnsState,
         );
 
-        if (isDeeplyEqual(availableTableColumnsState, columns)) {
+        if (isDeeplyEqual(availableTableColumns, columns)) {
           return;
         }
-        set(getAvailableTableColumnsState(), columns);
+        set(availableTableColumnsState, columns);
       },
-    [getAvailableTableColumnsState],
+    [availableTableColumnsState],
   );
 
-  const setOnEntityCountChange = useSetRecoilState(
-    getOnEntityCountChangeState(),
-  );
+  const setOnEntityCountChange = useSetRecoilState(onEntityCountChangeState);
+
+  const setTableFilters = useSetRecoilState(tableFiltersState);
 
-  const setTableFilters = useSetRecoilState(getTableFiltersState());
+  const setTableSorts = useSetRecoilState(tableSortsState);
 
-  const setTableSorts = useSetRecoilState(getTableSortsState());
+  const setTableColumns = useSetRecoilState(tableColumnsState);
 
-  const setTableColumns = useSetRecoilState(getTableColumnsState());
+  const setOnColumnsChange = useSetRecoilState(onColumnsChangeState);
 
-  const setOnColumnsChange = useSetRecoilState(getOnColumnsChangeState());
+  const setOnToggleColumnFilter = useSetRecoilState(onToggleColumnFilterState);
+  const setOnToggleColumnSort = useSetRecoilState(onToggleColumnSortState);
 
   const setIsRecordTableInitialLoading = useSetRecoilState(
-    getIsRecordTableInitialLoadingState(),
+    isRecordTableInitialLoadingState,
   );
 
   const setRecordTableLastRowVisible = useSetRecoilState(
-    getTableLastRowVisibleState(),
+    tableLastRowVisibleState,
   );
 
   const onColumnsChange = useRecoilCallback(
@@ -84,12 +89,12 @@ export const useRecordTable = (props?: useRecordTableProps) => {
       (columns: ColumnDefinition<FieldMetadata>[]) => {
         const onColumnsChange = getSnapshotValue(
           snapshot,
-          getOnColumnsChangeState(),
+          onColumnsChangeState,
         );
 
         onColumnsChange?.(columns);
       },
-    [getOnColumnsChangeState],
+    [onColumnsChangeState],
   );
 
   const onEntityCountChange = useRecoilCallback(
@@ -97,12 +102,12 @@ export const useRecordTable = (props?: useRecordTableProps) => {
       (count: number) => {
         const onEntityCountChange = getSnapshotValue(
           snapshot,
-          getOnEntityCountChangeState(),
+          onEntityCountChangeState,
         );
 
         onEntityCountChange?.(count);
       },
-    [getOnEntityCountChangeState],
+    [onEntityCountChangeState],
   );
 
   const setRecordTableData = useSetRecordTableData({
@@ -112,11 +117,13 @@ export const useRecordTable = (props?: useRecordTableProps) => {
 
   const leaveTableFocus = useLeaveTableFocus(recordTableId);
 
-  const setRowSelectedState = useSetRowSelectedState(recordTableId);
+  const setRowSelected = useSetRowSelectedState(recordTableId);
+
+  const setHasUserSelectedAllRows = useSetHasUserSelectedAllRows(recordTableId);
 
   const resetTableRowSelection = useResetTableRowSelection(recordTableId);
 
-  const upsertRecordTableItem = useUpsertRecordFromState();
+  const upsertRecordTableItem = useUpsertRecordFromState;
 
   const setSoftFocusPosition = useSetSoftFocusPosition(recordTableId);
 
@@ -188,6 +195,8 @@ export const useRecordTable = (props?: useRecordTableProps) => {
   const isSomeCellInEditModeState =
     useGetIsSomeCellInEditModeState(recordTableId);
 
+  const setPendingRecordId = useSetRecoilState(pendingRecordIdState);
+
   return {
     scopeId,
     onColumnsChange,
@@ -198,7 +207,7 @@ export const useRecordTable = (props?: useRecordTableProps) => {
     setRecordTableData,
     setTableColumns,
     leaveTableFocus,
-    setRowSelectedState,
+    setRowSelected,
     resetTableRowSelection,
     upsertRecordTableItem,
     moveDown,
@@ -212,6 +221,10 @@ export const useRecordTable = (props?: useRecordTableProps) => {
     setRecordTableLastRowVisible,
     setSoftFocusPosition,
     isSomeCellInEditModeState,
-    getSelectedRowIdsSelector,
+    selectedRowIdsSelector,
+    setHasUserSelectedAllRows,
+    setOnToggleColumnFilter,
+    setOnToggleColumnSort,
+    setPendingRecordId,
   };
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTableMoveFocus.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTableMoveFocus.ts
index 7c5de53e7045..2291659af820 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTableMoveFocus.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTableMoveFocus.ts
@@ -8,10 +8,10 @@ import { useSetSoftFocusPosition } from './internal/useSetSoftFocusPosition';
 export const useRecordTableMoveFocus = (recordTableId?: string) => {
   const {
     scopeId,
-    getSoftFocusPositionState,
-    getNumberOfTableRowsState,
-    getNumberOfTableColumnsSelector,
-    getSelectedRowIdsSelector,
+    softFocusPositionState,
+    numberOfTableRowsState,
+    numberOfTableColumnsSelector,
+    selectedRowIdsSelector,
   } = useRecordTableStates(recordTableId);
 
   const setSoftFocusPosition = useSetSoftFocusPosition(recordTableId);
@@ -21,7 +21,7 @@ export const useRecordTableMoveFocus = (recordTableId?: string) => {
       () => {
         const softFocusPosition = getSnapshotValue(
           snapshot,
-          getSoftFocusPositionState(),
+          softFocusPositionState,
         );
 
         let newRowNumber = softFocusPosition.row - 1;
@@ -35,7 +35,7 @@ export const useRecordTableMoveFocus = (recordTableId?: string) => {
           row: newRowNumber,
         });
       },
-    [getSoftFocusPositionState, setSoftFocusPosition],
+    [softFocusPositionState, setSoftFocusPosition],
   );
 
   const moveDown = useRecoilCallback(
@@ -43,12 +43,12 @@ export const useRecordTableMoveFocus = (recordTableId?: string) => {
       () => {
         const softFocusPosition = getSnapshotValue(
           snapshot,
-          getSoftFocusPositionState(),
+          softFocusPositionState,
         );
 
         const numberOfTableRows = getSnapshotValue(
           snapshot,
-          getNumberOfTableRowsState(),
+          numberOfTableRowsState,
         );
 
         let newRowNumber = softFocusPosition.row + 1;
@@ -62,11 +62,7 @@ export const useRecordTableMoveFocus = (recordTableId?: string) => {
           row: newRowNumber,
         });
       },
-    [
-      getNumberOfTableRowsState,
-      setSoftFocusPosition,
-      getSoftFocusPositionState,
-    ],
+    [numberOfTableRowsState, setSoftFocusPosition, softFocusPositionState],
   );
 
   const moveRight = useRecoilCallback(
@@ -74,17 +70,17 @@ export const useRecordTableMoveFocus = (recordTableId?: string) => {
       () => {
         const softFocusPosition = getSnapshotValue(
           snapshot,
-          getSoftFocusPositionState(),
+          softFocusPositionState,
         );
 
         const numberOfTableColumns = getSnapshotValue(
           snapshot,
-          getNumberOfTableColumnsSelector(),
+          numberOfTableColumnsSelector(),
         );
 
         const numberOfTableRows = getSnapshotValue(
           snapshot,
-          getNumberOfTableRowsState(),
+          numberOfTableRowsState,
         );
         const currentColumnNumber = softFocusPosition.column;
         const currentRowNumber = softFocusPosition.row;
@@ -117,9 +113,9 @@ export const useRecordTableMoveFocus = (recordTableId?: string) => {
         }
       },
     [
-      getSoftFocusPositionState,
-      getNumberOfTableColumnsSelector,
-      getNumberOfTableRowsState,
+      softFocusPositionState,
+      numberOfTableColumnsSelector,
+      numberOfTableRowsState,
       setSoftFocusPosition,
     ],
   );
@@ -129,12 +125,12 @@ export const useRecordTableMoveFocus = (recordTableId?: string) => {
       () => {
         const softFocusPosition = getSnapshotValue(
           snapshot,
-          getSoftFocusPositionState(),
+          softFocusPositionState,
         );
 
         const numberOfTableColumns = getSnapshotValue(
           snapshot,
-          getNumberOfTableColumnsSelector(),
+          numberOfTableColumnsSelector(),
         );
 
         const currentColumnNumber = softFocusPosition.column;
@@ -165,8 +161,8 @@ export const useRecordTableMoveFocus = (recordTableId?: string) => {
         }
       },
     [
-      getNumberOfTableColumnsSelector,
-      getSoftFocusPositionState,
+      numberOfTableColumnsSelector,
+      softFocusPositionState,
       setSoftFocusPosition,
     ],
   );
@@ -178,6 +174,6 @@ export const useRecordTableMoveFocus = (recordTableId?: string) => {
     moveRight,
     moveUp,
     setSoftFocusPosition,
-    getSelectedRowIdsSelector,
+    selectedRowIdsSelector,
   };
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/useTableColumns.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/useTableColumns.ts
index 1cc9fa344416..534db9462588 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/useTableColumns.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/useTableColumns.ts
@@ -18,15 +18,15 @@ export const useTableColumns = (props?: useRecordTableProps) => {
   });
 
   const {
-    getAvailableTableColumnsState,
-    getTableColumnsState,
-    getVisibleTableColumnsSelector,
+    availableTableColumnsState,
+    tableColumnsState,
+    visibleTableColumnsSelector,
   } = useRecordTableStates(props?.recordTableId);
 
-  const availableTableColumns = useRecoilValue(getAvailableTableColumnsState());
+  const availableTableColumns = useRecoilValue(availableTableColumnsState);
 
-  const tableColumns = useRecoilValue(getTableColumnsState());
-  const visibleTableColumns = useRecoilValue(getVisibleTableColumnsSelector());
+  const tableColumns = useRecoilValue(tableColumnsState);
+  const visibleTableColumns = useRecoilValue(visibleTableColumnsSelector());
 
   const { handleColumnMove } = useMoveViewColumns();
 
@@ -47,6 +47,11 @@ export const useTableColumns = (props?: useRecordTableProps) => {
         (tableColumns) =>
           tableColumns.fieldMetadataId === viewField.fieldMetadataId,
       );
+      const lastTableColumnPosition = [...tableColumns]
+        .sort((a, b) => b.position - a.position)
+        .map((column) => column.position);
+
+      const lastPosition = lastTableColumnPosition[0] ?? 0;
 
       if (isNewColumn) {
         const newColumn = availableTableColumns.find(
@@ -57,7 +62,7 @@ export const useTableColumns = (props?: useRecordTableProps) => {
 
         const nextColumns = [
           ...tableColumns,
-          { ...newColumn, isVisible: true },
+          { ...newColumn, isVisible: true, position: lastPosition + 1 },
         ];
 
         await handleColumnsChange(nextColumns);
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCell.tsx
index 1c997b125eeb..945fd2e24d96 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCell.tsx
@@ -4,9 +4,11 @@ import { FieldDisplay } from '@/object-record/record-field/components/FieldDispl
 import { FieldInput } from '@/object-record/record-field/components/FieldInput';
 import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
 import { FieldInputEvent } from '@/object-record/record-field/types/FieldInputEvent';
+import { RecordTableRowContext } from '@/object-record/record-table/contexts/RecordTableRowContext';
 import { useRecordTableMoveFocus } from '@/object-record/record-table/hooks/useRecordTableMoveFocus';
 import { RecordTableCellContainer } from '@/object-record/record-table/record-table-cell/components/RecordTableCellContainer';
 import { useCloseRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useCloseRecordTableCell';
+import { useUpsertRecord } from '@/object-record/record-table/record-table-cell/hooks/useUpsertRecord';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
 
 export const RecordTableCell = ({
@@ -15,19 +17,22 @@ export const RecordTableCell = ({
   customHotkeyScope: HotkeyScope;
 }) => {
   const { closeTableCell } = useCloseRecordTableCell();
-  const { entityId, fieldDefinition } = useContext(FieldContext);
+  const { upsertRecord } = useUpsertRecord();
 
   const { moveLeft, moveRight, moveDown } = useRecordTableMoveFocus();
 
+  const { entityId, fieldDefinition } = useContext(FieldContext);
+  const { isReadOnly } = useContext(RecordTableRowContext);
+
   const handleEnter: FieldInputEvent = (persistField) => {
-    persistField();
+    upsertRecord(persistField);
 
     closeTableCell();
     moveDown();
   };
 
   const handleSubmit: FieldInputEvent = (persistField) => {
-    persistField();
+    upsertRecord(persistField);
 
     closeTableCell();
   };
@@ -37,26 +42,26 @@ export const RecordTableCell = ({
   };
 
   const handleClickOutside: FieldInputEvent = (persistField) => {
-    persistField();
+    upsertRecord(persistField);
 
     closeTableCell();
   };
 
   const handleEscape: FieldInputEvent = (persistField) => {
-    persistField();
+    upsertRecord(persistField);
 
     closeTableCell();
   };
 
   const handleTab: FieldInputEvent = (persistField) => {
-    persistField();
+    upsertRecord(persistField);
 
     closeTableCell();
     moveRight();
   };
 
   const handleShiftTab: FieldInputEvent = (persistField) => {
-    persistField();
+    upsertRecord(persistField);
 
     closeTableCell();
     moveLeft();
@@ -75,6 +80,7 @@ export const RecordTableCell = ({
           onShiftTab={handleShiftTab}
           onSubmit={handleSubmit}
           onTab={handleTab}
+          isReadOnly={isReadOnly}
         />
       }
       nonEditModeContent={<FieldDisplay />}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellContainer.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellContainer.tsx
index 344988c941af..6b7f06bab804 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellContainer.tsx
@@ -1,16 +1,21 @@
 import { ReactElement, useContext, useState } from 'react';
 import styled from '@emotion/styled';
-import { useRecoilValue, useSetRecoilState } from 'recoil';
+import { useRecoilCallback, useSetRecoilState } from 'recoil';
+import { IconArrowUpRight } from 'twenty-ui';
 
 import { useGetButtonIcon } from '@/object-record/record-field/hooks/useGetButtonIcon';
 import { useIsFieldEmpty } from '@/object-record/record-field/hooks/useIsFieldEmpty';
 import { useIsFieldInputOnly } from '@/object-record/record-field/hooks/useIsFieldInputOnly';
 import { RecordTableCellContext } from '@/object-record/record-table/contexts/RecordTableCellContext';
+import { RecordTableRowContext } from '@/object-record/record-table/contexts/RecordTableRowContext';
 import { useGetIsSomeCellInEditModeState } from '@/object-record/record-table/hooks/internal/useGetIsSomeCellInEditMode';
 import { useOpenRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell';
+import { useSetCurrentRowSelected } from '@/object-record/record-table/record-table-row/hooks/useSetCurrentRowSelected';
 import { isSoftFocusUsingMouseState } from '@/object-record/record-table/states/isSoftFocusUsingMouseState';
-import { IconArrowUpRight } from '@/ui/display/icon';
+import { contextMenuIsOpenState } from '@/ui/navigation/context-menu/states/contextMenuIsOpenState';
+import { contextMenuPositionState } from '@/ui/navigation/context-menu/states/contextMenuPositionState';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
+import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
 
 import { CellHotkeyScopeContext } from '../../contexts/CellHotkeyScopeContext';
 import { TableHotkeyScope } from '../../types/TableHotkeyScope';
@@ -24,6 +29,12 @@ import { RecordTableCellDisplayMode } from './RecordTableCellDisplayMode';
 import { RecordTableCellEditMode } from './RecordTableCellEditMode';
 import { RecordTableCellSoftFocusMode } from './RecordTableCellSoftFocusMode';
 
+const StyledTd = styled.td<{ isSelected: boolean; isInEditMode: boolean }>`
+  background: ${({ isSelected, theme }) =>
+    isSelected ? theme.accent.quaternary : theme.background.primary};
+  z-index: ${({ isInEditMode }) => (isInEditMode ? '4 !important' : '3')};
+`;
+
 const StyledCellBaseContainer = styled.div`
   align-items: center;
   box-sizing: border-box;
@@ -61,7 +72,6 @@ export const RecordTableCellContainer = ({
 
   const { isCurrentTableCellInEditMode } = useCurrentTableCellEditMode();
   const isSomeCellInEditModeState = useGetIsSomeCellInEditModeState();
-  const isSomeCellInEditMode = useRecoilValue(isSomeCellInEditModeState());
 
   const setIsSoftFocusUsingMouseState = useSetRecoilState(
     isSoftFocusUsingMouseState,
@@ -80,14 +90,44 @@ export const RecordTableCellContainer = ({
     openTableCell();
   };
 
-  const handleContainerMouseEnter = () => {
-    if (!isHovered && !isSomeCellInEditMode) {
-      setIsHovered(true);
-      moveSoftFocusToCurrentCellOnHover();
-      setIsSoftFocusUsingMouseState(true);
-    }
+  const { isSelected, isReadOnly } = useContext(RecordTableRowContext);
+
+  const setContextMenuPosition = useSetRecoilState(contextMenuPositionState);
+  const setContextMenuOpenState = useSetRecoilState(contextMenuIsOpenState);
+
+  const { setCurrentRowSelected } = useSetCurrentRowSelected();
+
+  const handleContextMenu = (event: React.MouseEvent) => {
+    event.preventDefault();
+    setCurrentRowSelected(true);
+    setContextMenuPosition({
+      x: event.clientX,
+      y: event.clientY,
+    });
+    setContextMenuOpenState(true);
   };
 
+  const handleContainerMouseEnter = useRecoilCallback(
+    ({ snapshot }) =>
+      () => {
+        const isSomeCellInEditMode = getSnapshotValue(
+          snapshot,
+          isSomeCellInEditModeState(),
+        );
+        if (!isHovered && !isSomeCellInEditMode) {
+          setIsHovered(true);
+          moveSoftFocusToCurrentCellOnHover();
+          setIsSoftFocusUsingMouseState(true);
+        }
+      },
+    [
+      isHovered,
+      isSomeCellInEditModeState,
+      moveSoftFocusToCurrentCellOnHover,
+      setIsSoftFocusUsingMouseState,
+    ],
+  );
+
   const handleContainerMouseLeave = () => {
     setIsHovered(false);
   };
@@ -106,49 +146,56 @@ export const RecordTableCellContainer = ({
     hasSoftFocus &&
     !isCurrentTableCellInEditMode &&
     !editModeContentOnly &&
-    (!isFirstColumn || !isEmpty);
+    (!isFirstColumn || !isEmpty) &&
+    !isReadOnly;
 
   return (
-    <CellHotkeyScopeContext.Provider
-      value={editHotkeyScope ?? DEFAULT_CELL_SCOPE}
+    <StyledTd
+      isSelected={isSelected}
+      onContextMenu={(event) => handleContextMenu(event)}
+      isInEditMode={isCurrentTableCellInEditMode}
     >
-      <StyledCellBaseContainer
-        onMouseEnter={handleContainerMouseEnter}
-        onMouseLeave={handleContainerMouseLeave}
+      <CellHotkeyScopeContext.Provider
+        value={editHotkeyScope ?? DEFAULT_CELL_SCOPE}
       >
-        {isCurrentTableCellInEditMode ? (
-          <RecordTableCellEditMode
-            editModeHorizontalAlign={editModeHorizontalAlign}
-            editModeVerticalPosition={editModeVerticalPosition}
-          >
-            {editModeContent}
-          </RecordTableCellEditMode>
-        ) : hasSoftFocus ? (
-          <>
-            {showButton && (
-              <RecordTableCellButton
-                onClick={handleButtonClick}
-                Icon={buttonIcon}
-              />
-            )}
-            <RecordTableCellSoftFocusMode>
-              {editModeContentOnly ? editModeContent : nonEditModeContent}
-            </RecordTableCellSoftFocusMode>
-          </>
-        ) : (
-          <>
-            {showButton && (
-              <RecordTableCellButton
-                onClick={handleButtonClick}
-                Icon={buttonIcon}
-              />
-            )}
-            <RecordTableCellDisplayMode>
-              {editModeContentOnly ? editModeContent : nonEditModeContent}
-            </RecordTableCellDisplayMode>
-          </>
-        )}
-      </StyledCellBaseContainer>
-    </CellHotkeyScopeContext.Provider>
+        <StyledCellBaseContainer
+          onMouseEnter={handleContainerMouseEnter}
+          onMouseLeave={handleContainerMouseLeave}
+        >
+          {isCurrentTableCellInEditMode ? (
+            <RecordTableCellEditMode
+              editModeHorizontalAlign={editModeHorizontalAlign}
+              editModeVerticalPosition={editModeVerticalPosition}
+            >
+              {editModeContent}
+            </RecordTableCellEditMode>
+          ) : hasSoftFocus ? (
+            <>
+              {showButton && (
+                <RecordTableCellButton
+                  onClick={handleButtonClick}
+                  Icon={buttonIcon}
+                />
+              )}
+              <RecordTableCellSoftFocusMode>
+                {editModeContentOnly ? editModeContent : nonEditModeContent}
+              </RecordTableCellSoftFocusMode>
+            </>
+          ) : (
+            <>
+              {showButton && (
+                <RecordTableCellButton
+                  onClick={handleButtonClick}
+                  Icon={buttonIcon}
+                />
+              )}
+              <RecordTableCellDisplayMode>
+                {editModeContentOnly ? editModeContent : nonEditModeContent}
+              </RecordTableCellDisplayMode>
+            </>
+          )}
+        </StyledCellBaseContainer>
+      </CellHotkeyScopeContext.Provider>
+    </StyledTd>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellSoftFocusMode.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellSoftFocusMode.tsx
index 7c6947aa5cf1..7f10d98ba72a 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellSoftFocusMode.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellSoftFocusMode.tsx
@@ -2,6 +2,8 @@ import { PropsWithChildren, useEffect, useRef } from 'react';
 import { useRecoilValue } from 'recoil';
 import { Key } from 'ts-key-enum';
 
+import { useClearField } from '@/object-record/record-field/hooks/useClearField';
+import { useIsFieldClearable } from '@/object-record/record-field/hooks/useIsFieldClearable';
 import { useIsFieldInputOnly } from '@/object-record/record-field/hooks/useIsFieldInputOnly';
 import { useToggleEditOnlyInput } from '@/object-record/record-field/hooks/useToggleEditOnlyInput';
 import { useOpenRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell';
@@ -21,10 +23,14 @@ export const RecordTableCellSoftFocusMode = ({
   const { openTableCell } = useOpenRecordTableCell();
 
   const isFieldInputOnly = useIsFieldInputOnly();
+
+  const isFieldClearable = useIsFieldClearable();
+
   const toggleEditOnlyInput = useToggleEditOnlyInput();
   const scrollRef = useRef<HTMLDivElement>(null);
 
   const isSoftFocusUsingMouse = useRecoilValue(isSoftFocusUsingMouseState);
+  const clearField = useClearField();
 
   useEffect(() => {
     if (!isSoftFocusUsingMouse) {
@@ -35,12 +41,12 @@ export const RecordTableCellSoftFocusMode = ({
   useScopedHotkeys(
     [Key.Backspace, Key.Delete],
     () => {
-      if (!isFieldInputOnly) {
-        openTableCell();
+      if (!isFieldInputOnly && isFieldClearable) {
+        clearField();
       }
     },
     TableHotkeyScope.TableSoftFocus,
-    [openTableCell],
+    [clearField, isFieldClearable, isFieldInputOnly],
     {
       enabled: !isFieldInputOnly,
     },
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__mocks__/cell.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__mocks__/cell.ts
index af1402fbabb4..1f8ddd25b16b 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__mocks__/cell.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__mocks__/cell.ts
@@ -1,5 +1,6 @@
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 export const recordTableRow = {
   rowIndex: 2,
@@ -19,7 +20,7 @@ export const recordTableCell: {
     fieldMetadataId: 'fieldMetadataId',
     label: 'label',
     iconName: 'iconName',
-    type: 'TEXT',
+    type: FieldMetadataType.Text,
     metadata: {
       placeHolder: 'placeHolder',
       fieldName: 'fieldName',
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__tests__/useCloseRecordTableCell.test.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__tests__/useCloseRecordTableCell.test.tsx
index c608e921e635..7e6dfb6f501c 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__tests__/useCloseRecordTableCell.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__tests__/useCloseRecordTableCell.test.tsx
@@ -55,11 +55,11 @@ describe('useCloseRecordTableCell', () => {
     const { result } = renderHook(
       () => {
         const {
-          getCurrentTableCellInEditModePositionState,
+          currentTableCellInEditModePositionState,
           isTableCellInEditModeFamilyState,
         } = useRecordTableStates();
         const currentTableCellInEditModePosition = useRecoilValue(
-          getCurrentTableCellInEditModePositionState(),
+          currentTableCellInEditModePositionState,
         );
         const isTableCellInEditMode = useRecoilValue(
           isTableCellInEditModeFamilyState(currentTableCellInEditModePosition),
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__tests__/useMoveSoftFocusToCurrentCellOnHover.test.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__tests__/useMoveSoftFocusToCurrentCellOnHover.test.tsx
index f8337c3ba891..b7946416501a 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__tests__/useMoveSoftFocusToCurrentCellOnHover.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__tests__/useMoveSoftFocusToCurrentCellOnHover.test.tsx
@@ -13,19 +13,19 @@ import { TableCellPosition } from '@/object-record/record-table/types/TableCellP
 import { TableHotkeyScope } from '@/object-record/record-table/types/TableHotkeyScope';
 
 const mockSoftFocusPositionState = {
-  key: 'softFocusPositionStateScopeMap__{"scopeId":"scopeId"}',
+  key: 'softFocusPositionComponentState__{"scopeId":"scopeId"}',
 };
 const mockSoftFocusActiveState = {
-  key: 'isSoftFocusActiveStateScopeMap__{"scopeId":"scopeId"}',
+  key: 'isSoftFocusActiveComponentState__{"scopeId":"scopeId"}',
 };
 const mockIsSoftFocusOnTableCellFamilyState = {
-  key: 'isSoftFocusOnTableCellFamilyStateScopeMap__{"familyKey":{"column":1,"row":0},"scopeId":"scopeId"}',
+  key: 'isSoftFocusOnTableCellFamilyComponentState__{"familyKey":{"column":1,"row":0},"scopeId":"scopeId"}',
 };
 const mockCurrentTableCellInEditModePositionState = {
-  key: 'currentTableCellInEditModePositionStateScopeMap__{"scopeId":"scopeId"}',
+  key: 'currentTableCellInEditModePositionComponentState__{"scopeId":"scopeId"}',
 };
 const mockIsTableCellInEditModeFamilyState = {
-  key: 'isTableCellInEditModeFamilyStateScopeMap__{"familyKey":{"column":1,"row":0},"scopeId":"scopeId"}',
+  key: 'isTableCellInEditModeFamilyComponentState__{"familyKey":{"column":1,"row":0},"scopeId":"scopeId"}',
 };
 const mockCurrentHotKeyScopeState = {
   key: 'currentHotkeyScopeState',
@@ -65,11 +65,11 @@ jest.mock(
   '@/object-record/record-table/hooks/internal/useRecordTableStates',
   () => ({
     useRecordTableStates: () => ({
-      getSoftFocusPositionState: () => mockSoftFocusPositionState,
-      getIsSoftFocusActiveState: () => mockSoftFocusActiveState,
+      softFocusPositionState: mockSoftFocusPositionState,
+      isSoftFocusActiveState: mockSoftFocusActiveState,
       isSoftFocusOnTableCellFamilyState: () =>
         mockIsSoftFocusOnTableCellFamilyState,
-      getCurrentTableCellInEditModePositionState: () =>
+      currentTableCellInEditModePositionState:
         mockCurrentTableCellInEditModePositionState,
       isTableCellInEditModeFamilyState: () =>
         mockIsTableCellInEditModeFamilyState,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__tests__/useSelectedTableCellEditMode.test.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__tests__/useSelectedTableCellEditMode.test.tsx
index 9cbf45efe272..1e7ec2088d27 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__tests__/useSelectedTableCellEditMode.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__tests__/useSelectedTableCellEditMode.test.tsx
@@ -48,19 +48,14 @@ describe('useSelectedTableCellEditMode', () => {
 
     expect(mockCallbackInterface.set).toHaveBeenCalledWith(
       {
-        key: 'isTableCellInEditModeFamilyStateScopeMap__{"familyKey":{"column":0,"row":0},"scopeId":"yourScopeId-scope"}',
+        key: 'isTableCellInEditModeComponentFamilyState__{"familyKey":{"column":0,"row":0},"scopeId":"yourScopeId-scope"}',
       },
       false,
     );
+
     expect(mockCallbackInterface.set).toHaveBeenCalledWith(
       {
-        key: 'currentTableCellInEditModePositionStateScopeMap__{"scopeId":"yourScopeId-scope"}',
-      },
-      { column: 5, row: 1 },
-    );
-    expect(mockCallbackInterface.set).toHaveBeenCalledWith(
-      {
-        key: 'isTableCellInEditModeFamilyStateScopeMap__{"familyKey":{"column":5,"row":1},"scopeId":"yourScopeId-scope"}',
+        key: 'isTableCellInEditModeComponentFamilyState__{"familyKey":{"column":5,"row":1},"scopeId":"yourScopeId-scope"}',
       },
       true,
     );
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__tests__/useUpsertRecord.test.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__tests__/useUpsertRecord.test.tsx
new file mode 100644
index 000000000000..291c7407df60
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__tests__/useUpsertRecord.test.tsx
@@ -0,0 +1,152 @@
+import { ReactNode } from 'react';
+import { act, renderHook } from '@testing-library/react';
+import { RecoilRoot } from 'recoil';
+import { createState } from 'twenty-ui';
+
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
+import { textfieldDefinition } from '@/object-record/record-field/__mocks__/fieldDefinitions';
+import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
+import { useUpsertRecord } from '@/object-record/record-table/record-table-cell/hooks/useUpsertRecord';
+import { TableHotkeyScope } from '@/object-record/record-table/types/TableHotkeyScope';
+
+const pendingRecordId = 'a7286b9a-c039-4a89-9567-2dfa7953cda9';
+const draftValue = 'updated Name';
+
+jest.mock('@/object-record/hooks/useCreateOneRecord', () => ({
+  __esModule: true,
+  useCreateOneRecord: jest.fn(),
+}));
+
+const draftValueState = createState<string | null>({
+  key: 'draftValueState',
+  defaultValue: null,
+});
+jest.mock(
+  '@/object-record/record-field/hooks/internal/useRecordFieldInputStates',
+  () => ({
+    __esModule: true,
+    useRecordFieldInputStates: jest.fn(() => ({
+      getDraftValueSelector: () => draftValueState,
+    })),
+  }),
+);
+
+const pendingRecordIdState = createState<string | null>({
+  key: 'pendingRecordIdState',
+  defaultValue: null,
+});
+jest.mock(
+  '@/object-record/record-table/hooks/internal/useRecordTableStates',
+  () => ({
+    __esModule: true,
+    useRecordTableStates: jest.fn(() => ({
+      pendingRecordIdState: pendingRecordIdState,
+    })),
+  }),
+);
+
+const createOneRecordMock = jest.fn();
+const updateOneRecordMock = jest.fn();
+(useCreateOneRecord as jest.Mock).mockReturnValue({
+  createOneRecord: createOneRecordMock,
+});
+
+const Wrapper = ({
+  children,
+  pendingRecordIdMockedValue,
+  draftValueMockedValue,
+}: {
+  children: ReactNode;
+  pendingRecordIdMockedValue: string | null;
+  draftValueMockedValue: string | null;
+}) => (
+  <RecoilRoot
+    initializeState={(snapshot) => {
+      snapshot.set(pendingRecordIdState, pendingRecordIdMockedValue);
+      snapshot.set(draftValueState, draftValueMockedValue);
+    }}
+  >
+    <FieldContext.Provider
+      value={{
+        entityId: 'entityId',
+        fieldDefinition: {
+          ...textfieldDefinition,
+          metadata: {
+            ...textfieldDefinition.metadata,
+            objectMetadataNameSingular: CoreObjectNameSingular.Person,
+          },
+        },
+        hotkeyScope: TableHotkeyScope.Table,
+        isLabelIdentifier: false,
+      }}
+    >
+      {children}
+    </FieldContext.Provider>
+  </RecoilRoot>
+);
+
+describe('useUpsertRecord', () => {
+  beforeEach(async () => {
+    createOneRecordMock.mockClear();
+    updateOneRecordMock.mockClear();
+  });
+
+  it('calls update record if there is no pending record', async () => {
+    const { result } = renderHook(() => useUpsertRecord(), {
+      wrapper: ({ children }) =>
+        Wrapper({
+          pendingRecordIdMockedValue: null,
+          draftValueMockedValue: null,
+          children,
+        }),
+    });
+
+    await act(async () => {
+      await result.current.upsertRecord(updateOneRecordMock);
+    });
+
+    expect(createOneRecordMock).not.toHaveBeenCalled();
+    expect(updateOneRecordMock).toHaveBeenCalled();
+  });
+
+  it('calls update record if pending record is empty', async () => {
+    const { result } = renderHook(() => useUpsertRecord(), {
+      wrapper: ({ children }) =>
+        Wrapper({
+          pendingRecordIdMockedValue: null,
+          draftValueMockedValue: draftValue,
+          children,
+        }),
+    });
+
+    await act(async () => {
+      await result.current.upsertRecord(updateOneRecordMock);
+    });
+
+    expect(createOneRecordMock).not.toHaveBeenCalled();
+    expect(updateOneRecordMock).toHaveBeenCalled();
+  });
+
+  it('calls create record if pending record is not empty', async () => {
+    const { result } = renderHook(() => useUpsertRecord(), {
+      wrapper: ({ children }) =>
+        Wrapper({
+          pendingRecordIdMockedValue: pendingRecordId,
+          draftValueMockedValue: draftValue,
+          children,
+        }),
+    });
+
+    await act(async () => {
+      await result.current.upsertRecord(updateOneRecordMock);
+    });
+
+    expect(createOneRecordMock).toHaveBeenCalledWith({
+      id: pendingRecordId,
+      name: draftValue,
+      position: 'first',
+    });
+    expect(updateOneRecordMock).not.toHaveBeenCalled();
+  });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useCloseRecordTableCell.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useCloseRecordTableCell.ts
index 9ba618747f1a..02936662619e 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useCloseRecordTableCell.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useCloseRecordTableCell.ts
@@ -1,3 +1,6 @@
+import { useResetRecoilState } from 'recoil';
+
+import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
 import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
 
@@ -7,13 +10,17 @@ import { TableHotkeyScope } from '../../types/TableHotkeyScope';
 export const useCloseRecordTableCell = () => {
   const setHotkeyScope = useSetHotkeyScope();
   const { setDragSelectionStartEnabled } = useDragSelect();
+  const { pendingRecordIdState } = useRecordTableStates();
 
   const closeCurrentTableCellInEditMode = useCloseCurrentTableCellInEditMode();
+  const resetRecordTablePendingRecordId =
+    useResetRecoilState(pendingRecordIdState);
 
   const closeTableCell = async () => {
     setDragSelectionStartEnabled(true);
     closeCurrentTableCellInEditMode();
     setHotkeyScope(TableHotkeyScope.TableSoftFocus);
+    resetRecordTablePendingRecordId();
   };
 
   return {
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useMoveSoftFocusToCurrentCellOnHover.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useMoveSoftFocusToCurrentCellOnHover.ts
index 4bb8b9f8747b..3d53b8d9b0c9 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useMoveSoftFocusToCurrentCellOnHover.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useMoveSoftFocusToCurrentCellOnHover.ts
@@ -12,7 +12,7 @@ export const useMoveSoftFocusToCurrentCellOnHover = () => {
   const setSoftFocusOnCurrentTableCell = useSetSoftFocusOnCurrentTableCell();
 
   const {
-    getCurrentTableCellInEditModePositionState,
+    currentTableCellInEditModePositionState,
     isTableCellInEditModeFamilyState,
   } = useRecordTableStates();
 
@@ -21,7 +21,7 @@ export const useMoveSoftFocusToCurrentCellOnHover = () => {
       () => {
         const currentTableCellInEditModePosition = getSnapshotValue(
           snapshot,
-          getCurrentTableCellInEditModePositionState(),
+          currentTableCellInEditModePositionState,
         );
 
         const isSomeCellInEditMode = snapshot
@@ -49,7 +49,7 @@ export const useMoveSoftFocusToCurrentCellOnHover = () => {
         }
       },
     [
-      getCurrentTableCellInEditModePositionState,
+      currentTableCellInEditModePositionState,
       isTableCellInEditModeFamilyState,
       setSoftFocusOnCurrentTableCell,
     ],
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell.ts
index a880366cad89..12c2ecc6edb9 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell.ts
@@ -11,6 +11,7 @@ import { useLeaveTableFocus } from '@/object-record/record-table/hooks/internal/
 import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
+import { isDefined } from '~/utils/isDefined';
 
 import { CellHotkeyScopeContext } from '../../contexts/CellHotkeyScopeContext';
 import { TableHotkeyScope } from '../../types/TableHotkeyScope';
@@ -22,7 +23,7 @@ export const DEFAULT_CELL_SCOPE: HotkeyScope = {
 };
 
 export const useOpenRecordTableCell = () => {
-  const { pathToShowPage } = useContext(RecordTableRowContext);
+  const { pathToShowPage, isReadOnly } = useContext(RecordTableRowContext);
 
   const { setCurrentTableCellInEditMode } = useCurrentTableCellEditMode();
   const setHotkeyScope = useSetHotkeyScope();
@@ -45,6 +46,10 @@ export const useOpenRecordTableCell = () => {
 
   const openTableCell = useRecoilCallback(
     () => (options?: { initialValue?: string }) => {
+      if (isReadOnly) {
+        return;
+      }
+
       if (isFirstColumnCell && !isEmpty) {
         leaveTableFocus();
         navigate(pathToShowPage);
@@ -56,7 +61,7 @@ export const useOpenRecordTableCell = () => {
 
       initFieldInputDraftValue(options?.initialValue);
 
-      if (customCellHotkeyScope) {
+      if (isDefined(customCellHotkeyScope)) {
         setHotkeyScope(
           customCellHotkeyScope.scope,
           customCellHotkeyScope.customScopes,
@@ -69,15 +74,16 @@ export const useOpenRecordTableCell = () => {
       }
     },
     [
+      isReadOnly,
       isFirstColumnCell,
       isEmpty,
-      leaveTableFocus,
-      navigate,
-      pathToShowPage,
       setDragSelectionStartEnabled,
       setCurrentTableCellInEditMode,
       initFieldInputDraftValue,
       customCellHotkeyScope,
+      leaveTableFocus,
+      navigate,
+      pathToShowPage,
       setHotkeyScope,
     ],
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useSetSoftFocus.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useSetSoftFocus.ts
index 9c2ef5f73a14..9b630f4e2f36 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useSetSoftFocus.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useSetSoftFocus.ts
@@ -10,7 +10,7 @@ import { TableHotkeyScope } from '../../types/TableHotkeyScope';
 export const useSetSoftFocus = () => {
   const setSoftFocusPosition = useSetSoftFocusPosition();
 
-  const { getIsSoftFocusActiveState } = useRecordTableStates();
+  const { isSoftFocusActiveState } = useRecordTableStates();
 
   const setHotkeyScope = useSetHotkeyScope();
 
@@ -19,10 +19,10 @@ export const useSetSoftFocus = () => {
       (newPosition: TableCellPosition) => {
         setSoftFocusPosition(newPosition);
 
-        set(getIsSoftFocusActiveState(), true);
+        set(isSoftFocusActiveState, true);
 
         setHotkeyScope(TableHotkeyScope.TableSoftFocus);
       },
-    [setSoftFocusPosition, getIsSoftFocusActiveState, setHotkeyScope],
+    [setSoftFocusPosition, isSoftFocusActiveState, setHotkeyScope],
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useUpsertRecord.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useUpsertRecord.ts
new file mode 100644
index 000000000000..230e4a5d321a
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useUpsertRecord.ts
@@ -0,0 +1,41 @@
+import { useContext } from 'react';
+import { useRecoilValue } from 'recoil';
+
+import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
+import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
+import { useRecordFieldInputStates } from '@/object-record/record-field/hooks/internal/useRecordFieldInputStates';
+import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
+import { isDefined } from '~/utils/isDefined';
+
+export const useUpsertRecord = () => {
+  const { entityId, fieldDefinition } = useContext(FieldContext);
+
+  const { pendingRecordIdState } = useRecordTableStates();
+
+  const pendingRecordId = useRecoilValue(pendingRecordIdState);
+  const fieldName = fieldDefinition.metadata.fieldName;
+  const { getDraftValueSelector } = useRecordFieldInputStates(
+    `${entityId}-${fieldName}`,
+  );
+  const draftValue = useRecoilValue(getDraftValueSelector());
+
+  const objectNameSingular =
+    fieldDefinition.metadata.objectMetadataNameSingular ?? '';
+  const { createOneRecord } = useCreateOneRecord({
+    objectNameSingular,
+  });
+
+  const upsertRecord = (persistField: () => void) => {
+    if (isDefined(pendingRecordId) && isDefined(draftValue)) {
+      createOneRecord({
+        id: pendingRecordId,
+        name: draftValue,
+        position: 'first',
+      });
+    } else if (!pendingRecordId) {
+      persistField();
+    }
+  };
+
+  return { upsertRecord };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState.ts
new file mode 100644
index 000000000000..2d19afefa08b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const hasUserSelectedAllRowsComponentState =
+  createComponentState<boolean>({
+    key: 'hasUserSelectedAllRowsFamilyState',
+    defaultValue: false,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState.ts
new file mode 100644
index 000000000000..803921f1e27a
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState.ts
@@ -0,0 +1,9 @@
+import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState';
+
+export const isRowSelectedComponentFamilyState = createComponentFamilyState<
+  boolean,
+  string
+>({
+  key: 'isRowSelectedComponentFamilyState',
+  defaultValue: false,
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowSelectedFamilyStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowSelectedFamilyStateScopeMap.ts
deleted file mode 100644
index ebb2af412132..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowSelectedFamilyStateScopeMap.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-export const isRowSelectedFamilyStateScopeMap = createFamilyStateScopeMap<
-  boolean,
-  string
->({
-  key: 'isRowSelectedFamilyStateScopeMap',
-  defaultValue: false,
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext.ts b/packages/twenty-front/src/modules/object-record/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext.ts
index e25882196037..a4dcca144245 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext.ts
@@ -1,10 +1,10 @@
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
 import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
 import { ColumnDefinition } from '../../types/ColumnDefinition';
 
-type RecordTableScopeInternalContextProps = StateScopeMapKey & {
+type RecordTableScopeInternalContextProps = ComponentStateKey & {
   onColumnsChange: (columns: ColumnDefinition<FieldMetadata>[]) => void;
 };
 
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/availableTableColumnsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/availableTableColumnsComponentState.ts
new file mode 100644
index 000000000000..d7fcfa0721ff
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/availableTableColumnsComponentState.ts
@@ -0,0 +1,11 @@
+import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+import { ColumnDefinition } from '../types/ColumnDefinition';
+
+export const availableTableColumnsComponentState = createComponentState<
+  ColumnDefinition<FieldMetadata>[]
+>({
+  key: 'availableTableColumnsComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/availableTableColumnsStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/availableTableColumnsStateScopeMap.ts
deleted file mode 100644
index f60d3afb1f6b..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/availableTableColumnsStateScopeMap.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { ColumnDefinition } from '../types/ColumnDefinition';
-
-export const availableTableColumnsStateScopeMap = createStateScopeMap<
-  ColumnDefinition<FieldMetadata>[]
->({
-  key: 'availableTableColumnsStateScopeMap',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/currentTableCellInEditModePositionComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/currentTableCellInEditModePositionComponentState.ts
new file mode 100644
index 000000000000..88616eb1b404
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/currentTableCellInEditModePositionComponentState.ts
@@ -0,0 +1,12 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+import { TableCellPosition } from '../types/TableCellPosition';
+
+export const currentTableCellInEditModePositionComponentState =
+  createComponentState<TableCellPosition>({
+    key: 'currentTableCellInEditModePositionComponentState',
+    defaultValue: {
+      row: 0,
+      column: 1,
+    },
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/currentTableCellInEditModePositionStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/currentTableCellInEditModePositionStateScopeMap.ts
deleted file mode 100644
index 873790029848..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/currentTableCellInEditModePositionStateScopeMap.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { TableCellPosition } from '../types/TableCellPosition';
-
-export const currentTableCellInEditModePositionStateScopeMap =
-  createStateScopeMap<TableCellPosition>({
-    key: 'currentTableCellInEditModePositionStateScopeMap',
-    defaultValue: {
-      row: 0,
-      column: 1,
-    },
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableInitialLoadingComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableInitialLoadingComponentState.ts
new file mode 100644
index 000000000000..01d7f280d96b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableInitialLoadingComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const isRecordTableInitialLoadingComponentState =
+  createComponentState<boolean>({
+    key: 'isRecordTableInitialLoadingComponentState',
+    defaultValue: true,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableInitialLoadingStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableInitialLoadingStateScopeMap.ts
deleted file mode 100644
index 6b320ced8a1f..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableInitialLoadingStateScopeMap.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const isRecordTableInitialLoadingStateScopeMap =
-  createStateScopeMap<boolean>({
-    key: 'isRecordTableInitialLoadingStateScopeMap',
-    defaultValue: true,
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusActiveComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusActiveComponentState.ts
new file mode 100644
index 000000000000..a9b726ddf4ba
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusActiveComponentState.ts
@@ -0,0 +1,6 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const isSoftFocusActiveComponentState = createComponentState<boolean>({
+  key: 'isSoftFocusActiveComponentState',
+  defaultValue: false,
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusActiveStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusActiveStateScopeMap.ts
deleted file mode 100644
index 917733d87828..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusActiveStateScopeMap.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const isSoftFocusActiveStateScopeMap = createStateScopeMap<boolean>({
-  key: 'isSoftFocusActiveStateScopeMap',
-  defaultValue: false,
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusOnTableCellComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusOnTableCellComponentFamilyState.ts
new file mode 100644
index 000000000000..dd9023404bd2
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusOnTableCellComponentFamilyState.ts
@@ -0,0 +1,9 @@
+import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState';
+
+import { TableCellPosition } from '../types/TableCellPosition';
+
+export const isSoftFocusOnTableCellComponentFamilyState =
+  createComponentFamilyState<boolean, TableCellPosition>({
+    key: 'isSoftFocusOnTableCellComponentFamilyState',
+    defaultValue: false,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusOnTableCellFamilyStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusOnTableCellFamilyStateScopeMap.ts
deleted file mode 100644
index f9c48a851ffc..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusOnTableCellFamilyStateScopeMap.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-import { TableCellPosition } from '../types/TableCellPosition';
-
-export const isSoftFocusOnTableCellFamilyStateScopeMap =
-  createFamilyStateScopeMap<boolean, TableCellPosition>({
-    key: 'isSoftFocusOnTableCellFamilyStateScopeMap',
-    defaultValue: false,
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusUsingMouseState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusUsingMouseState.ts
index 7895269f933c..d25f46faa3b6 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusUsingMouseState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/isSoftFocusUsingMouseState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const isSoftFocusUsingMouseState = atom({
+export const isSoftFocusUsingMouseState = createState<boolean>({
   key: 'isSoftFocusUsingMouseState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isTableCellInEditModeComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isTableCellInEditModeComponentFamilyState.ts
new file mode 100644
index 000000000000..e049c0349719
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/isTableCellInEditModeComponentFamilyState.ts
@@ -0,0 +1,9 @@
+import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState';
+
+import { TableCellPosition } from '../types/TableCellPosition';
+
+export const isTableCellInEditModeComponentFamilyState =
+  createComponentFamilyState<boolean, TableCellPosition>({
+    key: 'isTableCellInEditModeComponentFamilyState',
+    defaultValue: false,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isTableCellInEditModeFamilyStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isTableCellInEditModeFamilyStateScopeMap.ts
deleted file mode 100644
index ff9ba4bd7130..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/isTableCellInEditModeFamilyStateScopeMap.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-import { TableCellPosition } from '../types/TableCellPosition';
-
-export const isTableCellInEditModeFamilyStateScopeMap =
-  createFamilyStateScopeMap<boolean, TableCellPosition>({
-    key: 'isTableCellInEditModeFamilyStateScopeMap',
-    defaultValue: false,
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/numberOfTableRowsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/numberOfTableRowsComponentState.ts
new file mode 100644
index 000000000000..2e6340e6d58d
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/numberOfTableRowsComponentState.ts
@@ -0,0 +1,6 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const numberOfTableRowsComponentState = createComponentState<number>({
+  key: 'numberOfTableRowsComponentState',
+  defaultValue: 0,
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/numberOfTableRowsStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/numberOfTableRowsStateScopeMap.ts
deleted file mode 100644
index f67a8a40c434..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/numberOfTableRowsStateScopeMap.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const numberOfTableRowsStateScopeMap = createStateScopeMap<number>({
-  key: 'numberOfTableRowsStateScopeMap',
-  defaultValue: 0,
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/onColumnsChangeComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/onColumnsChangeComponentState.ts
new file mode 100644
index 000000000000..b157eb071d50
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/onColumnsChangeComponentState.ts
@@ -0,0 +1,10 @@
+import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
+import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const onColumnsChangeComponentState = createComponentState<
+  ((columns: ColumnDefinition<FieldMetadata>[]) => void) | undefined
+>({
+  key: 'onColumnsChangeComponentState',
+  defaultValue: undefined,
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/onColumnsChangeStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/onColumnsChangeStateScopeMap.ts
deleted file mode 100644
index 9253e244357e..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/onColumnsChangeStateScopeMap.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const onColumnsChangeStateScopeMap = createStateScopeMap<
-  ((columns: ColumnDefinition<FieldMetadata>[]) => void) | undefined
->({
-  key: 'onColumnsChangeStateScopeMap',
-  defaultValue: undefined,
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/onEntityCountChangeComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/onEntityCountChangeComponentState.ts
new file mode 100644
index 000000000000..65356e5dc7e8
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/onEntityCountChangeComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const onEntityCountChangeComponentState = createComponentState<
+  ((entityCount: number) => void) | undefined
+>({
+  key: 'onEntityCountChangeComponentState',
+  defaultValue: undefined,
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/onEntityCountChangeStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/onEntityCountChangeStateScopeMap.ts
deleted file mode 100644
index 6aefeedb7b2f..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/onEntityCountChangeStateScopeMap.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const onEntityCountChangeStateScopeMap = createStateScopeMap<
-  ((entityCount: number) => void) | undefined
->({
-  key: 'onEntityCountChangeStateScopeMap',
-  defaultValue: undefined,
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/onToggleColumnFilterComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/onToggleColumnFilterComponentState.ts
new file mode 100644
index 000000000000..75a602331c73
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/onToggleColumnFilterComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const onToggleColumnFilterComponentState = createComponentState<
+  ((fieldMetadataId: string) => void) | undefined
+>({
+  key: 'onToggleColumnFilterComponentState',
+  defaultValue: undefined,
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/onToggleColumnSortComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/onToggleColumnSortComponentState.ts
new file mode 100644
index 000000000000..73f0a924a94a
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/onToggleColumnSortComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const onToggleColumnSortComponentState = createComponentState<
+  ((fieldMetadataId: string) => void) | undefined
+>({
+  key: 'onToggleColumnSortComponentState',
+  defaultValue: undefined,
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/recordTablePendingRecordIdComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/recordTablePendingRecordIdComponentState.ts
new file mode 100644
index 000000000000..4e594933f8d5
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/recordTablePendingRecordIdComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const recordTablePendingRecordIdComponentState = createComponentState<
+  string | null
+>({
+  key: 'recordTablePendingRecordIdState',
+  defaultValue: null,
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/resizeFieldOffsetComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/resizeFieldOffsetComponentState.ts
new file mode 100644
index 000000000000..9e2700f4596e
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/resizeFieldOffsetComponentState.ts
@@ -0,0 +1,6 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const resizeFieldOffsetComponentState = createComponentState<number>({
+  key: 'resizeFieldOffsetComponentState',
+  defaultValue: 0,
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/resizeFieldOffsetStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/resizeFieldOffsetStateScopeMap.ts
deleted file mode 100644
index 21ca29d2d422..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/resizeFieldOffsetStateScopeMap.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const resizeFieldOffsetStateScopeMap = createStateScopeMap<number>({
-  key: 'resizeFieldOffsetStateScopeMap',
-  defaultValue: 0,
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector.ts
new file mode 100644
index 000000000000..c0a42ea81015
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector.ts
@@ -0,0 +1,30 @@
+import { numberOfTableRowsComponentState } from '@/object-record/record-table/states/numberOfTableRowsComponentState';
+import { selectedRowIdsComponentSelector } from '@/object-record/record-table/states/selectors/selectedRowIdsComponentSelector';
+import { createComponentReadOnlySelector } from '@/ui/utilities/state/component-state/utils/createComponentReadOnlySelector';
+
+import { AllRowsSelectedStatus } from '../../types/AllRowSelectedStatus';
+
+export const allRowsSelectedStatusComponentSelector =
+  createComponentReadOnlySelector<AllRowsSelectedStatus>({
+    key: 'allRowsSelectedStatusComponentSelector',
+    get:
+      ({ scopeId }) =>
+      ({ get }) => {
+        const numberOfRows = get(numberOfTableRowsComponentState({ scopeId }));
+
+        const selectedRowIds = get(
+          selectedRowIdsComponentSelector({ scopeId }),
+        );
+
+        const numberOfSelectedRows = selectedRowIds.length;
+
+        const allRowsSelectedStatus =
+          numberOfSelectedRows === 0
+            ? 'none'
+            : numberOfRows === numberOfSelectedRows
+              ? 'all'
+              : 'some';
+
+        return allRowsSelectedStatus;
+      },
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusSelectorScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusSelectorScopeMap.ts
deleted file mode 100644
index ee0a66e804c9..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusSelectorScopeMap.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { createSelectorReadOnlyScopeMap } from '@/ui/utilities/recoil-scope/utils/createSelectorReadOnlyScopeMap';
-
-import { AllRowsSelectedStatus } from '../../types/AllRowSelectedStatus';
-import { numberOfTableRowsStateScopeMap } from '../numberOfTableRowsStateScopeMap';
-
-import { selectedRowIdsSelectorScopeMap } from './selectedRowIdsSelectorScopeMap';
-
-export const allRowsSelectedStatusSelectorScopeMap =
-  createSelectorReadOnlyScopeMap<AllRowsSelectedStatus>({
-    key: 'allRowsSelectedStatusSelectorScopeMap',
-    get:
-      ({ scopeId }) =>
-      ({ get }) => {
-        const numberOfRows = get(numberOfTableRowsStateScopeMap({ scopeId }));
-
-        const selectedRowIds = get(selectedRowIdsSelectorScopeMap({ scopeId }));
-
-        const numberOfSelectedRows = selectedRowIds.length;
-
-        const allRowsSelectedStatus =
-          numberOfSelectedRows === 0
-            ? 'none'
-            : numberOfRows === numberOfSelectedRows
-              ? 'all'
-              : 'some';
-
-        return allRowsSelectedStatus;
-      },
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/hiddenTableColumnsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/hiddenTableColumnsComponentSelector.ts
new file mode 100644
index 000000000000..c6692670d42a
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/hiddenTableColumnsComponentSelector.ts
@@ -0,0 +1,38 @@
+import { availableTableColumnsComponentState } from '@/object-record/record-table/states/availableTableColumnsComponentState';
+import { tableColumnsComponentState } from '@/object-record/record-table/states/tableColumnsComponentState';
+import { createComponentReadOnlySelector } from '@/ui/utilities/state/component-state/utils/createComponentReadOnlySelector';
+import { mapArrayToObject } from '~/utils/array/mapArrayToObject';
+
+export const hiddenTableColumnsComponentSelector =
+  createComponentReadOnlySelector({
+    key: 'hiddenTableColumnsComponentSelector',
+    get:
+      ({ scopeId }) =>
+      ({ get }) => {
+        const tableColumns = get(tableColumnsComponentState({ scopeId }));
+        const availableColumns = get(
+          availableTableColumnsComponentState({ scopeId }),
+        );
+        const tableColumnsByKey = mapArrayToObject(
+          tableColumns,
+          ({ fieldMetadataId }) => fieldMetadataId,
+        );
+
+        const hiddenColumns = availableColumns
+          .filter(
+            ({ fieldMetadataId }) =>
+              !tableColumnsByKey[fieldMetadataId]?.isVisible,
+          )
+          .map((availableColumn) => {
+            const { fieldMetadataId } = availableColumn;
+            const existingTableColumn = tableColumnsByKey[fieldMetadataId];
+
+            return {
+              ...(existingTableColumn || availableColumn),
+              isVisible: false,
+            };
+          });
+
+        return hiddenColumns;
+      },
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/hiddenTableColumnsSelectorScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/hiddenTableColumnsSelectorScopeMap.ts
deleted file mode 100644
index 1fcd14587ede..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/hiddenTableColumnsSelectorScopeMap.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { availableTableColumnsStateScopeMap } from '@/object-record/record-table/states/availableTableColumnsStateScopeMap';
-import { tableColumnsStateScopeMap } from '@/object-record/record-table/states/tableColumnsStateScopeMap';
-import { createSelectorReadOnlyScopeMap } from '@/ui/utilities/recoil-scope/utils/createSelectorReadOnlyScopeMap';
-import { mapArrayToObject } from '~/utils/array/mapArrayToObject';
-
-export const hiddenTableColumnsSelectorScopeMap =
-  createSelectorReadOnlyScopeMap({
-    key: 'hiddenTableColumnsSelectorScopeMap',
-    get:
-      ({ scopeId }) =>
-      ({ get }) => {
-        const tableColumns = get(tableColumnsStateScopeMap({ scopeId }));
-        const availableColumns = get(
-          availableTableColumnsStateScopeMap({ scopeId }),
-        );
-        const tableColumnsByKey = mapArrayToObject(
-          tableColumns,
-          ({ fieldMetadataId }) => fieldMetadataId,
-        );
-
-        const hiddenColumns = availableColumns
-          .filter(
-            ({ fieldMetadataId }) =>
-              !tableColumnsByKey[fieldMetadataId]?.isVisible,
-          )
-          .map((availableColumn) => {
-            const { fieldMetadataId } = availableColumn;
-            const existingTableColumn = tableColumnsByKey[fieldMetadataId];
-
-            return {
-              ...(existingTableColumn || availableColumn),
-              isVisible: false,
-            };
-          });
-
-        return hiddenColumns;
-      },
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/numberOfTableColumnsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/numberOfTableColumnsComponentSelector.ts
new file mode 100644
index 000000000000..83754490c117
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/numberOfTableColumnsComponentSelector.ts
@@ -0,0 +1,11 @@
+import { tableColumnsComponentState } from '@/object-record/record-table/states/tableColumnsComponentState';
+import { createComponentReadOnlySelector } from '@/ui/utilities/state/component-state/utils/createComponentReadOnlySelector';
+
+export const numberOfTableColumnsComponentSelector =
+  createComponentReadOnlySelector({
+    key: 'numberOfTableColumnsComponentSelector',
+    get:
+      ({ scopeId }) =>
+      ({ get }) =>
+        get(tableColumnsComponentState({ scopeId })).length,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/numberOfTableColumnsSelectorScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/numberOfTableColumnsSelectorScopeMap.ts
deleted file mode 100644
index a4afd9ccbff7..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/numberOfTableColumnsSelectorScopeMap.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { createSelectorReadOnlyScopeMap } from '@/ui/utilities/recoil-scope/utils/createSelectorReadOnlyScopeMap';
-
-import { tableColumnsStateScopeMap } from '../tableColumnsStateScopeMap';
-
-export const numberOfTableColumnsSelectorScopeMap =
-  createSelectorReadOnlyScopeMap({
-    key: 'numberOfTableColumnsSelectorScopeMap',
-    get:
-      ({ scopeId }) =>
-      ({ get }) =>
-        get(tableColumnsStateScopeMap({ scopeId })).length,
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/selectedRowIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/selectedRowIdsComponentSelector.ts
new file mode 100644
index 000000000000..3a3a020c89b4
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/selectedRowIdsComponentSelector.ts
@@ -0,0 +1,24 @@
+import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState';
+import { tableRowIdsComponentState } from '@/object-record/record-table/states/tableRowIdsComponentState';
+import { createComponentReadOnlySelector } from '@/ui/utilities/state/component-state/utils/createComponentReadOnlySelector';
+
+export const selectedRowIdsComponentSelector = createComponentReadOnlySelector<
+  string[]
+>({
+  key: 'selectedRowIdsComponentSelector',
+  get:
+    ({ scopeId }) =>
+    ({ get }) => {
+      const rowIds = get(tableRowIdsComponentState({ scopeId }));
+
+      return rowIds.filter(
+        (rowId) =>
+          get(
+            isRowSelectedComponentFamilyState({
+              scopeId,
+              familyKey: rowId,
+            }),
+          ) === true,
+      );
+    },
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/selectedRowIdsSelectorScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/selectedRowIdsSelectorScopeMap.ts
deleted file mode 100644
index b395c54d3dc4..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/selectedRowIdsSelectorScopeMap.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { createSelectorReadOnlyScopeMap } from '@/ui/utilities/recoil-scope/utils/createSelectorReadOnlyScopeMap';
-
-import { isRowSelectedFamilyStateScopeMap } from '../../record-table-row/states/isRowSelectedFamilyStateScopeMap';
-import { tableRowIdsStateScopeMap } from '../tableRowIdsStateScopeMap';
-
-export const selectedRowIdsSelectorScopeMap = createSelectorReadOnlyScopeMap<
-  string[]
->({
-  key: 'selectedRowIdsSelectorScopeMap',
-  get:
-    ({ scopeId }) =>
-    ({ get }) => {
-      const rowIds = get(tableRowIdsStateScopeMap({ scopeId }));
-
-      return rowIds.filter(
-        (rowId) =>
-          get(
-            isRowSelectedFamilyStateScopeMap({
-              scopeId,
-              familyKey: rowId,
-            }),
-          ) === true,
-      );
-    },
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector.ts
new file mode 100644
index 000000000000..fc58195cad52
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector.ts
@@ -0,0 +1,15 @@
+import { tableColumnsComponentState } from '@/object-record/record-table/states/tableColumnsComponentState';
+import { createComponentReadOnlySelector } from '@/ui/utilities/state/component-state/utils/createComponentReadOnlySelector';
+
+export const visibleTableColumnsComponentSelector =
+  createComponentReadOnlySelector({
+    key: 'visibleTableColumnsComponentSelector',
+    get:
+      ({ scopeId }) =>
+      ({ get }) => {
+        const columns = get(tableColumnsComponentState({ scopeId }));
+        return columns
+          .filter((column) => column.isVisible)
+          .sort((columnA, columnB) => columnA.position - columnB.position);
+      },
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/visibleTableColumnsSelectorScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/visibleTableColumnsSelectorScopeMap.ts
deleted file mode 100644
index 01a818edb610..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/visibleTableColumnsSelectorScopeMap.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { tableColumnsStateScopeMap } from '@/object-record/record-table/states/tableColumnsStateScopeMap';
-import { createSelectorReadOnlyScopeMap } from '@/ui/utilities/recoil-scope/utils/createSelectorReadOnlyScopeMap';
-
-export const visibleTableColumnsSelectorScopeMap =
-  createSelectorReadOnlyScopeMap({
-    key: 'visibleTableColumnsSelectorScopeMap',
-    get:
-      ({ scopeId }) =>
-      ({ get }) => {
-        const columns = get(tableColumnsStateScopeMap({ scopeId }));
-        return columns
-          .filter((column) => column.isVisible)
-          .sort((columnA, columnB) => columnA.position - columnB.position);
-      },
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/softFocusPositionComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/softFocusPositionComponentState.ts
new file mode 100644
index 000000000000..212b581cc7a0
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/softFocusPositionComponentState.ts
@@ -0,0 +1,12 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+import { TableCellPosition } from '../types/TableCellPosition';
+
+export const softFocusPositionComponentState =
+  createComponentState<TableCellPosition>({
+    key: 'softFocusPositionComponentState',
+    defaultValue: {
+      row: 0,
+      column: 1,
+    },
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/softFocusPositionStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/softFocusPositionStateScopeMap.ts
deleted file mode 100644
index 5a4b87fb96a4..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/softFocusPositionStateScopeMap.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { TableCellPosition } from '../types/TableCellPosition';
-
-export const softFocusPositionStateScopeMap =
-  createStateScopeMap<TableCellPosition>({
-    key: 'softFocusPositionStateScopeMap',
-    defaultValue: {
-      row: 0,
-      column: 1,
-    },
-  });
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/tableColumnsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/tableColumnsComponentState.ts
new file mode 100644
index 000000000000..8c89c297259f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/tableColumnsComponentState.ts
@@ -0,0 +1,11 @@
+import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+import { ColumnDefinition } from '../types/ColumnDefinition';
+
+export const tableColumnsComponentState = createComponentState<
+  ColumnDefinition<FieldMetadata>[]
+>({
+  key: 'tableColumnsComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/tableColumnsStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/tableColumnsStateScopeMap.ts
deleted file mode 100644
index d04192bb62e3..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/tableColumnsStateScopeMap.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { ColumnDefinition } from '../types/ColumnDefinition';
-
-export const tableColumnsStateScopeMap = createStateScopeMap<
-  ColumnDefinition<FieldMetadata>[]
->({
-  key: 'tableColumnsStateScopeMap',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/tableFiltersComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/tableFiltersComponentState.ts
new file mode 100644
index 000000000000..d19698d0f90a
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/tableFiltersComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+import { Filter } from '../../object-filter-dropdown/types/Filter';
+
+export const tableFiltersComponentState = createComponentState<Filter[]>({
+  key: 'tableFiltersComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/tableFiltersStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/tableFiltersStateScopeMap.ts
deleted file mode 100644
index 87c37e6f9a8b..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/tableFiltersStateScopeMap.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { Filter } from '../../object-filter-dropdown/types/Filter';
-
-export const tableFiltersStateScopeMap = createStateScopeMap<Filter[]>({
-  key: 'tableFiltersStateScopeMap',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/tableLastRowVisibleComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/tableLastRowVisibleComponentState.ts
new file mode 100644
index 000000000000..371cd72d6a05
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/tableLastRowVisibleComponentState.ts
@@ -0,0 +1,6 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const tableLastRowVisibleComponentState = createComponentState<boolean>({
+  key: 'tableLastRowVisibleComponentState',
+  defaultValue: false,
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/tableLastRowVisibleStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/tableLastRowVisibleStateScopeMap.ts
deleted file mode 100644
index 8648e7bbefd5..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/tableLastRowVisibleStateScopeMap.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const tableLastRowVisibleStateScopeMap = createStateScopeMap<boolean>({
-  key: 'tableLastRowVisibleStateScopeMap',
-  defaultValue: false,
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/tableRowIdsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/tableRowIdsComponentState.ts
new file mode 100644
index 000000000000..5350c7f448da
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/tableRowIdsComponentState.ts
@@ -0,0 +1,6 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const tableRowIdsComponentState = createComponentState<string[]>({
+  key: 'tableRowIdsComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/tableRowIdsStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/tableRowIdsStateScopeMap.ts
deleted file mode 100644
index a9027a4edc3b..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/tableRowIdsStateScopeMap.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const tableRowIdsStateScopeMap = createStateScopeMap<string[]>({
-  key: 'tableRowIdsStateScopeMap',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/tableSortsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/tableSortsComponentState.ts
new file mode 100644
index 000000000000..e36730a2819b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/tableSortsComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+import { Sort } from '../../object-sort-dropdown/types/Sort';
+
+export const tableSortsComponentState = createComponentState<Sort[]>({
+  key: 'tableSortsComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/tableSortsStateScopeMap.ts b/packages/twenty-front/src/modules/object-record/record-table/states/tableSortsStateScopeMap.ts
deleted file mode 100644
index 2e1900a2b7d4..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/states/tableSortsStateScopeMap.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { Sort } from '../../object-sort-dropdown/types/Sort';
-
-export const tableSortsStateScopeMap = createStateScopeMap<Sort[]>({
-  key: 'tableSortsStateScopeMap',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-table/types/ColumnDefinition.ts b/packages/twenty-front/src/modules/object-record/record-table/types/ColumnDefinition.ts
index d65d838e495d..c14b745ef541 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/types/ColumnDefinition.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/types/ColumnDefinition.ts
@@ -7,4 +7,6 @@ export type ColumnDefinition<T extends FieldMetadata> = FieldDefinition<T> & {
   isLabelIdentifier?: boolean;
   isVisible?: boolean;
   viewFieldId?: string;
+  isFilterable?: boolean;
+  isSortable?: boolean;
 };
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/components/MultipleObjectRecordSelect.tsx b/packages/twenty-front/src/modules/object-record/relation-picker/components/MultipleObjectRecordSelect.tsx
index 05aaf85f56ae..44932a8ea774 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/components/MultipleObjectRecordSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/components/MultipleObjectRecordSelect.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import styled from '@emotion/styled';
 import { isNonEmptyString } from '@sniptt/guards';
-import debounce from 'lodash.debounce';
+import { useDebouncedCallback } from 'use-debounce';
 
 import { MultipleObjectRecordOnClickOutsideEffect } from '@/object-record/relation-picker/components/MultipleObjectRecordOnClickOutsideEffect';
 import { MultipleObjectRecordSelectItem } from '@/object-record/relation-picker/components/MultipleObjectRecordSelectItem';
@@ -19,6 +19,7 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM
 import { SelectableItem } from '@/ui/layout/selectable-list/components/SelectableItem';
 import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
 import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
+import { isDefined } from '~/utils/isDefined';
 
 export const StyledSelectableItem = styled(SelectableItem)`
   height: 100%;
@@ -82,7 +83,7 @@ export const MultipleObjectRecordSelect = ({
     }
   }, [selectedObjectRecordsForSelect, loading]);
 
-  const debouncedSetSearchFilter = debounce(setSearchFilter, 100, {
+  const debouncedSetSearchFilter = useDebouncedCallback(setSearchFilter, 100, {
     leading: true,
   });
 
@@ -152,7 +153,7 @@ export const MultipleObjectRecordSelect = ({
                     (entity) => entity.record.id === recordId,
                   );
 
-                  if (correspondingRecordForSelect) {
+                  if (isDefined(correspondingRecordForSelect)) {
                     handleSelectChange(
                       correspondingRecordForSelect,
                       !recordIsSelected,
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/components/RelationPicker.tsx b/packages/twenty-front/src/modules/object-record/relation-picker/components/RelationPicker.tsx
index 2585125ade6d..d5e4ef29c464 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/components/RelationPicker.tsx
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/components/RelationPicker.tsx
@@ -1,11 +1,11 @@
 import { useEffect } from 'react';
+import { IconForbid } from 'twenty-ui';
 
 import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition';
 import { FieldRelationMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { SingleEntitySelect } from '@/object-record/relation-picker/components/SingleEntitySelect';
 import { useRelationPicker } from '@/object-record/relation-picker/hooks/useRelationPicker';
 import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
-import { IconForbid } from '@/ui/display/icon';
 
 export type RelationPickerProps = {
   recordId?: string;
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleEntitySelect.tsx b/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleEntitySelect.tsx
index e0b8d30d9613..368636fb470f 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleEntitySelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleEntitySelect.tsx
@@ -6,6 +6,7 @@ import {
 } from '@/object-record/relation-picker/components/SingleEntitySelectMenuItemsWithSearch';
 import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
 import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
+import { isDefined } from '~/utils/isDefined';
 
 export type SingleEntitySelectProps = {
   disableBackgroundBlur?: boolean;
@@ -37,7 +38,7 @@ export const SingleEntitySelect = ({
         event.target instanceof HTMLInputElement &&
         event.target.tagName === 'INPUT'
       );
-      if (weAreNotInAnHTMLInput && onCancel) {
+      if (weAreNotInAnHTMLInput && isDefined(onCancel)) {
         onCancel();
       }
     },
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleEntitySelectMenuItems.tsx b/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleEntitySelectMenuItems.tsx
index 8273f15f81bf..a71fa24a9622 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleEntitySelectMenuItems.tsx
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleEntitySelectMenuItems.tsx
@@ -1,9 +1,9 @@
 import { useRef } from 'react';
 import { isNonEmptyString } from '@sniptt/guards';
 import { Key } from 'ts-key-enum';
+import { IconPlus } from 'twenty-ui';
 
 import { SelectableMenuItemSelect } from '@/object-record/relation-picker/components/SelectableMenuItemSelect';
-import { IconPlus } from '@/ui/display/icon';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 import { CreateNewButton } from '@/ui/input/relation-picker/components/CreateNewButton';
 import { DropdownMenuSkeletonItem } from '@/ui/input/relation-picker/components/skeletons/DropdownMenuSkeletonItem';
@@ -13,7 +13,7 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectabl
 import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
 import { MenuItemSelect } from '@/ui/navigation/menu-item/components/MenuItemSelect';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 import { EntityForSelect } from '../types/EntityForSelect';
 import { RelationPickerHotkeyScope } from '../types/RelationPickerHotkeyScope';
@@ -55,7 +55,7 @@ export const SingleEntitySelectMenuItems = ({
 
   const entitiesInDropdown = [selectedEntity, ...entitiesToSelect].filter(
     (entity): entity is EntityForSelect =>
-      isNonNullable(entity) && isNonEmptyString(entity.name),
+      isDefined(entity) && isNonEmptyString(entity.name),
   );
 
   useScopedHotkeys(
@@ -76,7 +76,7 @@ export const SingleEntitySelectMenuItems = ({
         selectableItemIdArray={selectableItemIds}
         hotkeyScope={RelationPickerHotkeyScope.RelationPicker}
         onEnter={(itemId) => {
-          if (showCreateButton) {
+          if (showCreateButton === true) {
             onCreate?.();
           } else {
             const entity = entitiesInDropdown.findIndex(
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleEntitySelectMenuItemsWithSearch.tsx b/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleEntitySelectMenuItemsWithSearch.tsx
index d2b814237ca9..c24c35aee8b1 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleEntitySelectMenuItemsWithSearch.tsx
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleEntitySelectMenuItemsWithSearch.tsx
@@ -6,7 +6,7 @@ import {
 import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery';
 import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 import { useEntitySelectSearch } from '../hooks/useEntitySelectSearch';
 
@@ -42,7 +42,7 @@ export const SingleEntitySelectMenuItemsWithSearch = ({
       relationPickerScopeId,
     });
 
-  const showCreateButton = isNonNullable(onCreate) && searchFilter !== '';
+  const showCreateButton = isDefined(onCreate) && searchFilter !== '';
 
   const entities = useFilteredSearchEntityQuery({
     filters: [
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx b/packages/twenty-front/src/modules/object-record/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx
index 968c23418aa0..07a32ade6d37 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx
@@ -1,8 +1,8 @@
 import { Meta, StoryObj } from '@storybook/react';
 import { expect, userEvent, within } from '@storybook/test';
+import { IconUserCircle } from 'twenty-ui';
 
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { IconUserCircle } from '@/ui/display/icon';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { ComponentWithRecoilScopeDecorator } from '~/testing/decorators/ComponentWithRecoilScopeDecorator';
 import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/__tests__/useMultiObjectSearch.test.tsx b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/__tests__/useMultiObjectSearch.test.tsx
index a117719c04bc..fa85d8629076 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/__tests__/useMultiObjectSearch.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/__tests__/useMultiObjectSearch.test.tsx
@@ -6,13 +6,14 @@ import { RecoilRoot, useSetRecoilState } from 'recoil';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { useMultiObjectSearch } from '@/object-record/relation-picker/hooks/useMultiObjectSearch';
+import { FieldMetadataType } from '~/generated/graphql';
 
 const query = gql`
   query FindManyRecordsMultipleMetadataItems(
     $filterNameSingular: NameSingularFilterInput
     $orderByNameSingular: NameSingularOrderByInput
     $lastCursorNameSingular: String
-    $limitNameSingular: Float = 5
+    $limitNameSingular: Float
   ) {
     namePlural(
       filter: $filterNameSingular
@@ -22,6 +23,7 @@ const query = gql`
     ) {
       edges {
         node {
+          __typename
           id
         }
         cursor
@@ -31,12 +33,13 @@ const query = gql`
         startCursor
         endCursor
       }
+      totalCount
     }
   }
 `;
 const response = {
   namePlural: {
-    edges: [{ node: { id: 'nodeId' }, cursor: 'cursor' }],
+    edges: [{ node: { __typename: 'Custom', id: 'nodeId' }, cursor: 'cursor' }],
     pageInfo: { startCursor: '', hasNextPage: '', endCursor: '' },
   },
 };
@@ -120,7 +123,17 @@ describe('useMultiObjectSearch', () => {
         namePlural: 'namePlural',
         nameSingular: 'nameSingular',
         updatedAt: 'updatedAt',
-        fields: [],
+        fields: [
+          {
+            id: 'f6a0a73a-5ee6-442e-b764-39b682471240',
+            name: 'id',
+            label: 'id',
+            type: FieldMetadataType.Uuid,
+            createdAt: '2024-01-01T00:00:00.000Z',
+            updatedAt: '2024-01-01T00:00:00.000Z',
+            isActive: true,
+          },
+        ],
       },
     ];
     act(() => {
@@ -144,9 +157,19 @@ describe('useMultiObjectSearch', () => {
           namePlural: 'namePlural',
           nameSingular: 'nameSingular',
           updatedAt: 'updatedAt',
-          fields: [],
+          fields: [
+            {
+              id: 'f6a0a73a-5ee6-442e-b764-39b682471240',
+              name: 'id',
+              label: 'id',
+              isActive: true,
+              type: FieldMetadataType.Uuid,
+              createdAt: '2024-01-01T00:00:00.000Z',
+              updatedAt: '2024-01-01T00:00:00.000Z',
+            },
+          ],
         },
-        record: { id: 'nodeId' },
+        record: { id: 'nodeId', __typename: 'Custom' },
         recordIdentifier: {
           id: 'nodeId',
           name: '',
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useEntitySelectSearch.ts b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useEntitySelectSearch.ts
index d81cd060d556..be2e6e561034 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useEntitySelectSearch.ts
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useEntitySelectSearch.ts
@@ -1,4 +1,4 @@
-import debounce from 'lodash.debounce';
+import { useDebouncedCallback } from 'use-debounce';
 
 import { useRelationPicker } from '@/object-record/relation-picker/hooks/useRelationPicker';
 
@@ -14,7 +14,7 @@ export const useEntitySelectSearch = ({
     setRelationPickerSearchFilter,
   } = useRelationPicker({ relationPickerScopeId });
 
-  const debouncedSetSearchFilter = debounce(
+  const debouncedSetSearchFilter = useDebouncedCallback(
     setRelationPickerSearchFilter,
     100,
     {
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useLimitPerMetadataItem.ts b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useLimitPerMetadataItem.ts
index 29602a6a4113..95be7ef2b64a 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useLimitPerMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useLimitPerMetadataItem.ts
@@ -1,6 +1,6 @@
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { DEFAULT_SEARCH_REQUEST_LIMIT } from '@/object-record/constants/DefaultSearchRequestLimit';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 import { capitalize } from '~/utils/string/capitalize';
 
 export const useLimitPerMetadataItem = ({
@@ -15,7 +15,7 @@ export const useLimitPerMetadataItem = ({
       .map(({ nameSingular }) => {
         return [`limit${capitalize(nameSingular)}`, limit];
       })
-      .filter(isNonNullable),
+      .filter(isDefined),
   );
 
   return {
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectRecordsQueryResultFormattedAsObjectRecordForSelectArray.ts b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectRecordsQueryResultFormattedAsObjectRecordForSelectArray.ts
index 6091f2b85844..eedf253275c8 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectRecordsQueryResultFormattedAsObjectRecordForSelectArray.ts
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectRecordsQueryResultFormattedAsObjectRecordForSelectArray.ts
@@ -5,7 +5,7 @@ import { objectMetadataItemsByNamePluralMapSelector } from '@/object-metadata/st
 import { getObjectRecordIdentifier } from '@/object-metadata/utils/getObjectRecordIdentifier';
 import { ObjectRecordForSelect } from '@/object-record/relation-picker/hooks/useMultiObjectSearch';
 import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export type MultiObjectRecordQueryResult = {
   [namePlural: string]: ObjectRecordConnection;
@@ -30,7 +30,7 @@ export const useMultiObjectRecordsQueryResultFormattedAsObjectRecordForSelectArr
           const objectMetadataItem =
             objectMetadataItemsByNamePluralMap.get(namePlural);
 
-          if (!isNonNullable(objectMetadataItem)) return [];
+          if (!isDefined(objectMetadataItem)) return [];
 
           return objectRecordConnection.edges.map(({ node }) => ({
             objectMetadataItem,
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectSearchMatchesSearchFilterAndSelectedItemsQuery.ts b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectSearchMatchesSearchFilterAndSelectedItemsQuery.ts
index 635f2e7546d1..a8cd2b5094b9 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectSearchMatchesSearchFilterAndSelectedItemsQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectSearchMatchesSearchFilterAndSelectedItemsQuery.ts
@@ -2,9 +2,9 @@ import { useQuery } from '@apollo/client';
 import { isNonEmptyArray } from '@sniptt/guards';
 import { useRecoilValue } from 'recoil';
 
-import { EMPTY_QUERY } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { useGenerateFindManyRecordsForMultipleMetadataItemsQuery } from '@/object-record/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery';
+import { EMPTY_QUERY } from '@/object-record/constants/EmptyQuery';
+import { useGenerateFindManyRecordsForMultipleMetadataItemsQuery } from '@/object-record/multiple-objects/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery';
 import { useLimitPerMetadataItem } from '@/object-record/relation-picker/hooks/useLimitPerMetadataItem';
 import {
   MultiObjectRecordQueryResult,
@@ -13,7 +13,7 @@ import {
 import { SelectedObjectRecordId } from '@/object-record/relation-picker/hooks/useMultiObjectSearch';
 import { useOrderByFieldPerMetadataItem } from '@/object-record/relation-picker/hooks/useOrderByFieldPerMetadataItem';
 import { useSearchFilterPerMetadataItem } from '@/object-record/relation-picker/hooks/useSearchFilterPerMetadataItem';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 import { capitalize } from '~/utils/string/capitalize';
 
 export const useMultiObjectSearchMatchesSearchFilterAndSelectedItemsQuery = ({
@@ -71,7 +71,7 @@ export const useMultiObjectSearchMatchesSearchFilterAndSelectedItemsQuery = ({
             },
           ];
         })
-        .filter(isNonNullable),
+        .filter(isDefined),
     );
 
   const { orderByFieldPerMetadataItem } = useOrderByFieldPerMetadataItem({
@@ -85,7 +85,8 @@ export const useMultiObjectSearchMatchesSearchFilterAndSelectedItemsQuery = ({
 
   const multiSelectQueryForSelectedIds =
     useGenerateFindManyRecordsForMultipleMetadataItemsQuery({
-      objectMetadataItems: objectMetadataItemsUsedInSelectedIdsQuery,
+      targetObjectMetadataItems: objectMetadataItemsUsedInSelectedIdsQuery,
+      depth: 0,
     });
 
   const {
@@ -99,7 +100,7 @@ export const useMultiObjectSearchMatchesSearchFilterAndSelectedItemsQuery = ({
         ...orderByFieldPerMetadataItem,
         ...limitPerMetadataItem,
       },
-      skip: !isNonNullable(multiSelectQueryForSelectedIds),
+      skip: !isDefined(multiSelectQueryForSelectedIds),
     },
   );
 
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectSearchMatchesSearchFilterAndToSelectQuery.ts b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectSearchMatchesSearchFilterAndToSelectQuery.ts
index 538b6191984b..8719c81fdf3d 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectSearchMatchesSearchFilterAndToSelectQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectSearchMatchesSearchFilterAndToSelectQuery.ts
@@ -1,10 +1,10 @@
 import { useQuery } from '@apollo/client';
 import { useRecoilValue } from 'recoil';
 
-import { EMPTY_QUERY } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useGenerateFindManyRecordsForMultipleMetadataItemsQuery } from '@/object-record/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery';
+import { EMPTY_QUERY } from '@/object-record/constants/EmptyQuery';
+import { useGenerateFindManyRecordsForMultipleMetadataItemsQuery } from '@/object-record/multiple-objects/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery';
 import { useLimitPerMetadataItem } from '@/object-record/relation-picker/hooks/useLimitPerMetadataItem';
 import {
   MultiObjectRecordQueryResult,
@@ -14,7 +14,7 @@ import { SelectedObjectRecordId } from '@/object-record/relation-picker/hooks/us
 import { useOrderByFieldPerMetadataItem } from '@/object-record/relation-picker/hooks/useOrderByFieldPerMetadataItem';
 import { useSearchFilterPerMetadataItem } from '@/object-record/relation-picker/hooks/useSearchFilterPerMetadataItem';
 import { makeAndFilterVariables } from '@/object-record/utils/makeAndFilterVariables';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 import { capitalize } from '~/utils/string/capitalize';
 
 export const useMultiObjectSearchMatchesSearchFilterAndToSelectQuery = ({
@@ -72,7 +72,7 @@ export const useMultiObjectSearchMatchesSearchFilterAndToSelectQuery = ({
             makeAndFilterVariables(searchFilters),
           ];
         })
-        .filter(isNonNullable),
+        .filter(isDefined),
     );
 
   const { orderByFieldPerMetadataItem } = useOrderByFieldPerMetadataItem({
@@ -86,7 +86,8 @@ export const useMultiObjectSearchMatchesSearchFilterAndToSelectQuery = ({
 
   const multiSelectQuery =
     useGenerateFindManyRecordsForMultipleMetadataItemsQuery({
-      objectMetadataItems: nonSystemObjectMetadataItems,
+      targetObjectMetadataItems: nonSystemObjectMetadataItems,
+      depth: 0,
     });
 
   const {
@@ -98,7 +99,7 @@ export const useMultiObjectSearchMatchesSearchFilterAndToSelectQuery = ({
       ...orderByFieldPerMetadataItem,
       ...limitPerMetadataItem,
     },
-    skip: !isNonNullable(multiSelectQuery),
+    skip: !isDefined(multiSelectQuery),
   });
 
   const {
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectSearchSelectedItemsQuery.ts b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectSearchSelectedItemsQuery.ts
index 2c18f7d3bae2..155b584c3a60 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectSearchSelectedItemsQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectSearchSelectedItemsQuery.ts
@@ -1,10 +1,9 @@
-import { useQuery } from '@apollo/client';
-import { gql } from '@apollo/client';
+import { gql, useQuery } from '@apollo/client';
 import { isNonEmptyArray } from '@sniptt/guards';
 import { useRecoilValue } from 'recoil';
 
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { useGenerateFindManyRecordsForMultipleMetadataItemsQuery } from '@/object-record/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery';
+import { useGenerateFindManyRecordsForMultipleMetadataItemsQuery } from '@/object-record/multiple-objects/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery';
 import { useLimitPerMetadataItem } from '@/object-record/relation-picker/hooks/useLimitPerMetadataItem';
 import {
   MultiObjectRecordQueryResult,
@@ -12,7 +11,7 @@ import {
 } from '@/object-record/relation-picker/hooks/useMultiObjectRecordsQueryResultFormattedAsObjectRecordForSelectArray';
 import { SelectedObjectRecordId } from '@/object-record/relation-picker/hooks/useMultiObjectSearch';
 import { useOrderByFieldPerMetadataItem } from '@/object-record/relation-picker/hooks/useOrderByFieldPerMetadataItem';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 import { capitalize } from '~/utils/string/capitalize';
 
 export const EMPTY_QUERY = gql`
@@ -56,7 +55,7 @@ export const useMultiObjectSearchSelectedItemsQuery = ({
           },
         ];
       })
-      .filter(isNonNullable),
+      .filter(isDefined),
   );
 
   const { orderByFieldPerMetadataItem } = useOrderByFieldPerMetadataItem({
@@ -69,7 +68,7 @@ export const useMultiObjectSearchSelectedItemsQuery = ({
 
   const multiSelectQueryForSelectedIds =
     useGenerateFindManyRecordsForMultipleMetadataItemsQuery({
-      objectMetadataItems: objectMetadataItemsUsedInSelectedIdsQuery,
+      targetObjectMetadataItems: objectMetadataItemsUsedInSelectedIdsQuery,
     });
 
   const {
@@ -83,7 +82,7 @@ export const useMultiObjectSearchSelectedItemsQuery = ({
         ...orderByFieldPerMetadataItem,
         ...limitPerMetadataItem,
       },
-      skip: !isNonNullable(multiSelectQueryForSelectedIds),
+      skip: !isDefined(multiSelectQueryForSelectedIds),
     },
   );
 
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useOrderByFieldPerMetadataItem.ts b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useOrderByFieldPerMetadataItem.ts
index c04f650cd52e..07f60b012fce 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useOrderByFieldPerMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useOrderByFieldPerMetadataItem.ts
@@ -1,6 +1,6 @@
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { getObjectOrderByField } from '@/object-metadata/utils/getObjectOrderByField';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { getOrderByFieldForObjectMetadataItem } from '@/object-metadata/utils/getObjectOrderByField';
+import { isDefined } from '~/utils/isDefined';
 import { capitalize } from '~/utils/string/capitalize';
 
 export const useOrderByFieldPerMetadataItem = ({
@@ -11,7 +11,8 @@ export const useOrderByFieldPerMetadataItem = ({
   const orderByFieldPerMetadataItem = Object.fromEntries(
     objectMetadataItems
       .map((objectMetadataItem) => {
-        const orderByField = getObjectOrderByField(objectMetadataItem);
+        const orderByField =
+          getOrderByFieldForObjectMetadataItem(objectMetadataItem);
 
         return [
           `orderBy${capitalize(objectMetadataItem.nameSingular)}`,
@@ -20,7 +21,7 @@ export const useOrderByFieldPerMetadataItem = ({
           },
         ];
       })
-      .filter(isNonNullable),
+      .filter(isDefined),
   );
 
   return {
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useSearchFilterPerMetadataItem.ts b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useSearchFilterPerMetadataItem.ts
index 0242a920258f..6a342b92d284 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useSearchFilterPerMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useSearchFilterPerMetadataItem.ts
@@ -1,9 +1,11 @@
+import { isNonEmptyString } from '@sniptt/guards';
+
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/getLabelIdentifierFieldMetadataItem';
 import { ObjectRecordQueryFilter } from '@/object-record/record-filter/types/ObjectRecordQueryFilter';
 import { makeOrFilterVariables } from '@/object-record/utils/makeOrFilterVariables';
 import { FieldMetadataType } from '~/generated/graphql';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const useSearchFilterPerMetadataItem = ({
   objectMetadataItems,
@@ -23,10 +25,10 @@ export const useSearchFilterPerMetadataItem = ({
 
           let searchFilter: ObjectRecordQueryFilter = {};
 
-          if (labelIdentifierFieldMetadataItem) {
+          if (isDefined(labelIdentifierFieldMetadataItem)) {
             switch (labelIdentifierFieldMetadataItem.type) {
               case FieldMetadataType.FullName: {
-                if (searchFilterValue) {
+                if (isNonEmptyString(searchFilterValue)) {
                   const fullNameFilter = makeOrFilterVariables([
                     {
                       [labelIdentifierFieldMetadataItem.name]: {
@@ -44,14 +46,14 @@ export const useSearchFilterPerMetadataItem = ({
                     },
                   ]);
 
-                  if (fullNameFilter) {
+                  if (isDefined(fullNameFilter)) {
                     searchFilter = fullNameFilter;
                   }
                 }
                 break;
               }
               default: {
-                if (searchFilterValue) {
+                if (isNonEmptyString(searchFilterValue)) {
                   searchFilter = {
                     [labelIdentifierFieldMetadataItem.name]: {
                       ilike: `%${searchFilterValue}%`,
@@ -64,7 +66,7 @@ export const useSearchFilterPerMetadataItem = ({
 
           return [objectMetadataItem.nameSingular, searchFilter] as const;
         })
-        .filter(isNonNullable),
+        .filter(isDefined),
     );
 
   return {
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/scopes/scope-internal-context/RelationPickerScopeInternalContext.ts b/packages/twenty-front/src/modules/object-record/relation-picker/scopes/scope-internal-context/RelationPickerScopeInternalContext.ts
index 8e49b1267aa3..3dbbfc7eff08 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/scopes/scope-internal-context/RelationPickerScopeInternalContext.ts
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/scopes/scope-internal-context/RelationPickerScopeInternalContext.ts
@@ -1,7 +1,7 @@
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
 import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
-type RelationPickerScopeInternalContextProps = StateScopeMapKey;
+type RelationPickerScopeInternalContextProps = ComponentStateKey;
 
 export const RelationPickerScopeInternalContext =
   createScopeInternalContext<RelationPickerScopeInternalContextProps>();
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/states/relationPickerPreselectedIdScopedState.ts b/packages/twenty-front/src/modules/object-record/relation-picker/states/relationPickerPreselectedIdScopedState.ts
index 2266afc5b338..c0c2ba232dd7 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/states/relationPickerPreselectedIdScopedState.ts
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/states/relationPickerPreselectedIdScopedState.ts
@@ -1,6 +1,6 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
 
-export const relationPickerPreselectedIdScopedState = createStateScopeMap<
+export const relationPickerPreselectedIdScopedState = createComponentState<
   string | undefined
 >({
   key: 'relationPickerPreselectedIdScopedState',
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/states/relationPickerSearchFilterScopedState.ts b/packages/twenty-front/src/modules/object-record/relation-picker/states/relationPickerSearchFilterScopedState.ts
index 5184ff81074a..60841557533b 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/states/relationPickerSearchFilterScopedState.ts
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/states/relationPickerSearchFilterScopedState.ts
@@ -1,7 +1,7 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
 
 export const relationPickerSearchFilterScopedState =
-  createStateScopeMap<string>({
+  createComponentState<string>({
     key: 'relationPickerSearchFilterScopedState',
     defaultValue: '',
   });
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/states/searchQueryScopedState.ts b/packages/twenty-front/src/modules/object-record/relation-picker/states/searchQueryScopedState.ts
index 5f94b225a2da..70a072e0f798 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/states/searchQueryScopedState.ts
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/states/searchQueryScopedState.ts
@@ -1,7 +1,7 @@
 import { SearchQuery } from '@/object-record/relation-picker/types/SearchQuery';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
 
-export const searchQueryScopedState = createStateScopeMap<SearchQuery | null>({
+export const searchQueryScopedState = createComponentState<SearchQuery | null>({
   key: 'searchQueryScopedState',
   defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/object-record/select/hooks/useRecordsForSelect.ts b/packages/twenty-front/src/modules/object-record/select/hooks/useRecordsForSelect.ts
index ed72f8409a71..e12d3cec060b 100644
--- a/packages/twenty-front/src/modules/object-record/select/hooks/useRecordsForSelect.ts
+++ b/packages/twenty-front/src/modules/object-record/select/hooks/useRecordsForSelect.ts
@@ -1,6 +1,7 @@
 import { isNonEmptyString } from '@sniptt/guards';
 
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useGetObjectOrderByField } from '@/object-metadata/hooks/useGetObjectOrderByField';
+import { useMapToObjectRecordIdentifier } from '@/object-metadata/hooks/useMapToObjectRecordIdentifier';
 import { OrderBy } from '@/object-metadata/types/OrderBy';
 import { DEFAULT_SEARCH_REQUEST_LIMIT } from '@/object-record/constants/DefaultSearchRequestLimit';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
@@ -24,10 +25,9 @@ export const useRecordsForSelect = ({
   excludeEntityIds?: string[];
   objectNameSingular: string;
 }) => {
-  const { mapToObjectRecordIdentifier, getObjectOrderByField } =
-    useObjectMetadataItem({
-      objectNameSingular,
-    });
+  const { mapToObjectRecordIdentifier } = useMapToObjectRecordIdentifier({
+    objectNameSingular,
+  });
 
   const filters = [
     {
@@ -36,6 +36,10 @@ export const useRecordsForSelect = ({
     },
   ];
 
+  const { getObjectOrderByField } = useGetObjectOrderByField({
+    objectNameSingular,
+  });
+
   const orderByField = getObjectOrderByField(sortOrder);
   const selectedIdsFilter = { id: { in: selectedIds } };
 
@@ -56,7 +60,7 @@ export const useRecordsForSelect = ({
       fieldNames.map((fieldName) => {
         const [parentFieldName, subFieldName] = fieldName.split('.');
 
-        if (subFieldName) {
+        if (isNonEmptyString(subFieldName)) {
           // Composite field
           return {
             [parentFieldName]: {
diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/__tests__/useSpreadsheetRecordImport.test.tsx b/packages/twenty-front/src/modules/object-record/spreadsheet-import/__tests__/useSpreadsheetRecordImport.test.tsx
index a26df2b1c81a..a925b36c8c74 100644
--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/__tests__/useSpreadsheetRecordImport.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/__tests__/useSpreadsheetRecordImport.test.tsx
@@ -16,17 +16,34 @@ jest.mock('uuid', () => ({
   v4: jest.fn(() => companyId),
 }));
 
-jest.mock('@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery', () => ({
-  useMapFieldMetadataToGraphQLQuery: () => () => '\n',
-}));
-
 const companyMocks = [
   {
     request: {
       query: gql`
         mutation CreateCompanies($data: [CompanyCreateInput!]!) {
           createCompanies(data: $data) {
+            __typename
+            xLink {
+              label
+              url
+            }
+            linkedinLink {
+              label
+              url
+            }
+            domainName
+            annualRecurringRevenue {
+              amountMicros
+              currencyCode
+            }
+            createdAt
+            address
+            updatedAt
+            name
+            accountOwnerId
+            employees
             id
+            idealCustomerProfile
           }
         }
       `,
diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/useSpreadsheetRecordImport.ts b/packages/twenty-front/src/modules/object-record/spreadsheet-import/useSpreadsheetRecordImport.ts
index e2cc05e27c50..56453adf17ad 100644
--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/useSpreadsheetRecordImport.ts
+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/useSpreadsheetRecordImport.ts
@@ -1,3 +1,5 @@
+import { isNonEmptyString } from '@sniptt/guards';
+
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useCreateManyRecords } from '@/object-record/hooks/useCreateManyRecords';
 import { getSpreadSheetValidation } from '@/object-record/spreadsheet-import/util/getSpreadSheetValidation';
@@ -7,6 +9,7 @@ import { useIcons } from '@/ui/display/icon/hooks/useIcons';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { isDefined } from '~/utils/isDefined';
 
 const firstName = 'Firstname';
 const lastName = 'Lastname';
@@ -16,7 +19,9 @@ export const useSpreadsheetRecordImport = (objectNameSingular: string) => {
   const { enqueueSnackBar } = useSnackBar();
   const { getIcon } = useIcons();
 
-  const { objectMetadataItem } = useObjectMetadataItem({ objectNameSingular });
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
   const fields = objectMetadataItem.fields
     .filter(
       (x) =>
@@ -128,14 +133,19 @@ export const useSpreadsheetRecordImport = (objectNameSingular: string) => {
                 }
                 break;
               case FieldMetadataType.Relation:
-                if (value) {
+                if (
+                  isDefined(value) &&
+                  (isNonEmptyString(value) || value !== false)
+                ) {
                   fieldMapping[field.name + 'Id'] = value;
                 }
                 break;
               case FieldMetadataType.FullName:
                 if (
-                  record[`${firstName} (${field.name})`] ||
-                  record[`${lastName} (${field.name})`]
+                  isDefined(
+                    record[`${firstName} (${field.name})`] ||
+                      record[`${lastName} (${field.name})`],
+                  )
                 ) {
                   fieldMapping[field.name] = {
                     firstName: record[`${firstName} (${field.name})`] || '',
diff --git a/packages/twenty-front/src/modules/object-record/states/cursorFamilyState.ts b/packages/twenty-front/src/modules/object-record/states/cursorFamilyState.ts
index e9c44191e4b0..44fb5742cb57 100644
--- a/packages/twenty-front/src/modules/object-record/states/cursorFamilyState.ts
+++ b/packages/twenty-front/src/modules/object-record/states/cursorFamilyState.ts
@@ -1,6 +1,6 @@
-import { atomFamily } from 'recoil';
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
 
-export const cursorFamilyState = atomFamily<string, string | undefined>({
+export const cursorFamilyState = createFamilyState<string, string | undefined>({
   key: 'cursorFamilyState',
-  default: '',
+  defaultValue: '',
 });
diff --git a/packages/twenty-front/src/modules/object-record/states/hasNextPageFamilyState.ts b/packages/twenty-front/src/modules/object-record/states/hasNextPageFamilyState.ts
index 20260b92788c..2a5f9e89478a 100644
--- a/packages/twenty-front/src/modules/object-record/states/hasNextPageFamilyState.ts
+++ b/packages/twenty-front/src/modules/object-record/states/hasNextPageFamilyState.ts
@@ -1,6 +1,9 @@
-import { atomFamily } from 'recoil';
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
 
-export const hasNextPageFamilyState = atomFamily<boolean, string | undefined>({
+export const hasNextPageFamilyState = createFamilyState<
+  boolean,
+  string | undefined
+>({
   key: 'hasNextPageFamilyState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/object-record/states/isFetchingMoreRecordsFamilyState.ts b/packages/twenty-front/src/modules/object-record/states/isFetchingMoreRecordsFamilyState.ts
index 4137f67a710b..e254f92318c1 100644
--- a/packages/twenty-front/src/modules/object-record/states/isFetchingMoreRecordsFamilyState.ts
+++ b/packages/twenty-front/src/modules/object-record/states/isFetchingMoreRecordsFamilyState.ts
@@ -1,9 +1,9 @@
-import { atomFamily } from 'recoil';
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
 
-export const isFetchingMoreRecordsFamilyState = atomFamily<
+export const isFetchingMoreRecordsFamilyState = createFamilyState<
   boolean,
   string | undefined
 >({
   key: 'isFetchingMoreRecordsFamilyState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/object-record/types/ObjectRecordConnection.ts b/packages/twenty-front/src/modules/object-record/types/ObjectRecordConnection.ts
index 52bb2160211d..ba79640f1fbb 100644
--- a/packages/twenty-front/src/modules/object-record/types/ObjectRecordConnection.ts
+++ b/packages/twenty-front/src/modules/object-record/types/ObjectRecordConnection.ts
@@ -10,6 +10,7 @@ export type ObjectRecordConnection<T extends ObjectRecord = ObjectRecord> = {
     hasPreviousPage?: boolean;
     startCursor?: Nullable<string>;
     endCursor?: Nullable<string>;
+    totalCount?: number;
   };
-  totalCount: number;
+  totalCount?: number;
 };
diff --git a/packages/twenty-front/src/modules/object-record/utils/computeRecordBoardColumnDefinitionsFromObjectMetadata.ts b/packages/twenty-front/src/modules/object-record/utils/computeRecordBoardColumnDefinitionsFromObjectMetadata.ts
index 5af6540aecbb..4df6d4afd655 100644
--- a/packages/twenty-front/src/modules/object-record/utils/computeRecordBoardColumnDefinitionsFromObjectMetadata.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/computeRecordBoardColumnDefinitionsFromObjectMetadata.ts
@@ -1,14 +1,18 @@
+import { IconPencil } from 'twenty-ui';
+
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { RecordBoardColumnDefinition } from '@/object-record/record-board/types/RecordBoardColumnDefinition';
-import { IconPencil } from '@/ui/display/icon';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 export const computeRecordBoardColumnDefinitionsFromObjectMetadata = (
   objectMetadataItem: ObjectMetadataItem,
+  kanbanFieldMetadataId: string,
   navigateToSelectSettings: () => void,
 ): RecordBoardColumnDefinition[] => {
   const selectFieldMetadataItem = objectMetadataItem.fields.find(
-    (field) => field.type === FieldMetadataType.Select,
+    (field) =>
+      field.id === kanbanFieldMetadataId &&
+      field.type === FieldMetadataType.Select,
   );
 
   if (!selectFieldMetadataItem) {
diff --git a/packages/twenty-front/src/modules/object-record/utils/filterAvailableTableColumns.ts b/packages/twenty-front/src/modules/object-record/utils/filterAvailableTableColumns.ts
index 176ccbad2867..bb7cc3578b3d 100644
--- a/packages/twenty-front/src/modules/object-record/utils/filterAvailableTableColumns.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/filterAvailableTableColumns.ts
@@ -16,12 +16,5 @@ export const filterAvailableTableColumns = (
     return false;
   }
 
-  if (
-    isFieldRelation(columnDefinition) &&
-    columnDefinition.metadata?.fieldName === 'pipelineStep'
-  ) {
-    return false;
-  }
-
   return true;
 };
diff --git a/packages/twenty-front/src/modules/object-record/utils/generateDeleteOneRecordMutation.ts b/packages/twenty-front/src/modules/object-record/utils/generateDeleteOneRecordMutation.ts
deleted file mode 100644
index ad0a2840bf40..000000000000
--- a/packages/twenty-front/src/modules/object-record/utils/generateDeleteOneRecordMutation.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { gql } from '@apollo/client';
-
-import { EMPTY_MUTATION } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const getDeleteOneRecordMutationResponseField = (
-  objectNameSingular: string,
-) => `delete${capitalize(objectNameSingular)}`;
-
-export const generateDeleteOneRecordMutation = ({
-  objectMetadataItem,
-}: {
-  objectMetadataItem: ObjectMetadataItem;
-}) => {
-  if (!objectMetadataItem) {
-    return EMPTY_MUTATION;
-  }
-
-  const capitalizedObjectName = capitalize(objectMetadataItem.nameSingular);
-
-  const mutationResponseField = getDeleteOneRecordMutationResponseField(
-    objectMetadataItem.nameSingular,
-  );
-
-  return gql`
-    mutation DeleteOne${capitalizedObjectName}($idToDelete: ID!)  {
-      ${mutationResponseField}(id: $idToDelete) {
-        id
-      }
-    }
-  `;
-};
diff --git a/packages/twenty-front/src/modules/object-record/utils/generateEmptyFieldValue.ts b/packages/twenty-front/src/modules/object-record/utils/generateEmptyFieldValue.ts
index 1275379afd0d..95c05b0d0ac4 100644
--- a/packages/twenty-front/src/modules/object-record/utils/generateEmptyFieldValue.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/generateEmptyFieldValue.ts
@@ -2,7 +2,6 @@ import { isNonEmptyString } from '@sniptt/guards';
 
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { FieldMetadataType } from '~/generated/graphql';
-import { capitalize } from '~/utils/string/capitalize';
 
 export const generateEmptyFieldValue = (
   fieldMetadataItem: FieldMetadataItem,
@@ -17,21 +16,35 @@ export const generateEmptyFieldValue = (
       return {
         label: '',
         url: '',
-        __typename: 'Link',
       };
     }
     case FieldMetadataType.FullName: {
       return {
         firstName: '',
         lastName: '',
-        __typename: 'FullName',
+      };
+    }
+    case FieldMetadataType.Address: {
+      return {
+        addressStreet1: '',
+        addressStreet2: '',
+        addressCity: '',
+        addressState: '',
+        addressCountry: '',
+        addressPostcode: '',
+        addressLat: null,
+        addressLng: null,
       };
     }
     case FieldMetadataType.DateTime: {
       return null;
     }
+    case FieldMetadataType.Date: {
+      return null;
+    }
     case FieldMetadataType.Number:
     case FieldMetadataType.Rating:
+    case FieldMetadataType.Position:
     case FieldMetadataType.Numeric: {
       return null;
     }
@@ -51,25 +64,22 @@ export const generateEmptyFieldValue = (
         return null;
       }
 
-      return {
-        __typename: `${capitalize(
-          fieldMetadataItem.fromRelationMetadata.toObjectMetadata.nameSingular,
-        )}Connection`,
-        edges: [],
-      };
+      return [];
     }
     case FieldMetadataType.Currency: {
       return {
         amountMicros: null,
         currencyCode: null,
-        __typename: 'Currency',
       };
     }
     case FieldMetadataType.Select: {
       return null;
     }
     case FieldMetadataType.MultiSelect: {
-      throw new Error('Not implemented yet');
+      return null;
+    }
+    case FieldMetadataType.RawJson: {
+      return null;
     }
     default: {
       throw new Error('Unhandled FieldMetadataType');
diff --git a/packages/twenty-front/src/modules/object-record/utils/generateFindManyRecordsQuery.ts b/packages/twenty-front/src/modules/object-record/utils/generateFindManyRecordsQuery.ts
new file mode 100644
index 000000000000..7a4f4507078b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/utils/generateFindManyRecordsQuery.ts
@@ -0,0 +1,49 @@
+import gql from 'graphql-tag';
+
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { QueryFields } from '@/object-record/query-keys/types/QueryFields';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const generateFindManyRecordsQuery = ({
+  objectMetadataItem,
+  objectMetadataItems,
+  depth,
+  queryFields,
+  computeReferences,
+}: {
+  objectMetadataItem: ObjectMetadataItem;
+  objectMetadataItems: ObjectMetadataItem[];
+  queryFields?: QueryFields;
+  depth?: number;
+  computeReferences?: boolean;
+}) => gql`
+query FindMany${capitalize(
+  objectMetadataItem.namePlural,
+)}($filter: ${capitalize(
+  objectMetadataItem.nameSingular,
+)}FilterInput, $orderBy: ${capitalize(
+  objectMetadataItem.nameSingular,
+)}OrderByInput, $lastCursor: String, $limit: Float) {
+  ${
+    objectMetadataItem.namePlural
+  }(filter: $filter, orderBy: $orderBy, first: $limit, after: $lastCursor){
+    edges {
+      node ${mapObjectMetadataToGraphQLQuery({
+        objectMetadataItems,
+        objectMetadataItem,
+        depth,
+        queryFields,
+        computeReferences,
+      })}
+      cursor
+    }
+    pageInfo {
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    totalCount
+  }
+}
+`;
diff --git a/packages/twenty-front/src/modules/object-record/utils/getChildRelationArray.ts b/packages/twenty-front/src/modules/object-record/utils/getChildRelationArray.ts
index 74705662c884..f7a93507c687 100644
--- a/packages/twenty-front/src/modules/object-record/utils/getChildRelationArray.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/getChildRelationArray.ts
@@ -1,15 +1,12 @@
 import { ObjectRecordEdge } from '@/object-record/types/ObjectRecordEdge';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const getChildRelationArray = ({
   childRelation,
 }: {
   childRelation: any;
 }) => {
-  if (
-    isNonNullable(childRelation.edges) &&
-    Array.isArray(childRelation.edges)
-  ) {
+  if (isDefined(childRelation.edges) && Array.isArray(childRelation.edges)) {
     return childRelation.edges.map((edge: ObjectRecordEdge) => edge.node);
   } else {
     return childRelation;
diff --git a/packages/twenty-front/src/modules/object-record/utils/getCreateManyRecordsMutationResponseField.ts b/packages/twenty-front/src/modules/object-record/utils/getCreateManyRecordsMutationResponseField.ts
new file mode 100644
index 000000000000..7bd7f58a690d
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/utils/getCreateManyRecordsMutationResponseField.ts
@@ -0,0 +1,5 @@
+import { capitalize } from '~/utils/string/capitalize';
+
+export const getCreateManyRecordsMutationResponseField = (
+  objectNamePlural: string,
+) => `create${capitalize(objectNamePlural)}`;
diff --git a/packages/twenty-front/src/modules/object-record/utils/getCreateOneRecordMutationResponseField.ts b/packages/twenty-front/src/modules/object-record/utils/getCreateOneRecordMutationResponseField.ts
new file mode 100644
index 000000000000..9c46ccdfbb3c
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/utils/getCreateOneRecordMutationResponseField.ts
@@ -0,0 +1,5 @@
+import { capitalize } from '~/utils/string/capitalize';
+
+export const getCreateOneRecordMutationResponseField = (
+  objectNameSingular: string,
+) => `create${capitalize(objectNameSingular)}`;
diff --git a/packages/twenty-front/src/modules/object-record/utils/getDeleteManyRecordsMutationResponseField.ts b/packages/twenty-front/src/modules/object-record/utils/getDeleteManyRecordsMutationResponseField.ts
new file mode 100644
index 000000000000..e95201af7bd7
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/utils/getDeleteManyRecordsMutationResponseField.ts
@@ -0,0 +1,5 @@
+import { capitalize } from '~/utils/string/capitalize';
+
+export const getDeleteManyRecordsMutationResponseField = (
+  objectNamePlural: string,
+) => `delete${capitalize(objectNamePlural)}`;
diff --git a/packages/twenty-front/src/modules/object-record/utils/getDeleteOneRecordMutationResponseField.ts b/packages/twenty-front/src/modules/object-record/utils/getDeleteOneRecordMutationResponseField.ts
new file mode 100644
index 000000000000..fef546c878a3
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/utils/getDeleteOneRecordMutationResponseField.ts
@@ -0,0 +1,5 @@
+import { capitalize } from '~/utils/string/capitalize';
+
+export const getDeleteOneRecordMutationResponseField = (
+  objectNameSingular: string,
+) => `delete${capitalize(objectNameSingular)}`;
diff --git a/packages/twenty-front/src/modules/object-record/utils/getFindDuplicateRecordsQueryResponseField.ts b/packages/twenty-front/src/modules/object-record/utils/getFindDuplicateRecordsQueryResponseField.ts
new file mode 100644
index 000000000000..a3df4ecd3b05
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/utils/getFindDuplicateRecordsQueryResponseField.ts
@@ -0,0 +1,3 @@
+export const getFindDuplicateRecordsQueryResponseField = (
+  objectNameSingular: string,
+) => `${objectNameSingular}Duplicates`;
diff --git a/packages/twenty-front/src/modules/object-record/utils/getUpdateOneRecordMutationResponseField.ts b/packages/twenty-front/src/modules/object-record/utils/getUpdateOneRecordMutationResponseField.ts
new file mode 100644
index 000000000000..29b16ad24436
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/utils/getUpdateOneRecordMutationResponseField.ts
@@ -0,0 +1,5 @@
+import { capitalize } from '~/utils/string/capitalize';
+
+export const getUpdateOneRecordMutationResponseField = (
+  objectNameSingular: string,
+) => `update${capitalize(objectNameSingular)}`;
diff --git a/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts b/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts
new file mode 100644
index 000000000000..c06278e9ad19
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts
@@ -0,0 +1,37 @@
+import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { isObjectMetadataAvailableForRelation } from '@/object-metadata/utils/isObjectMetadataAvailableForRelation';
+import {
+  FieldMetadataType,
+  RelationMetadataType,
+} from '~/generated-metadata/graphql';
+
+export const isFieldCellSupported = (fieldMetadataItem: FieldMetadataItem) => {
+  if (
+    [FieldMetadataType.Uuid, FieldMetadataType.Position].includes(
+      fieldMetadataItem.type,
+    )
+  ) {
+    return false;
+  }
+
+  if (fieldMetadataItem.type === FieldMetadataType.Relation) {
+    const relationMetadata =
+      fieldMetadataItem.fromRelationMetadata ??
+      fieldMetadataItem.toRelationMetadata;
+    const relationObjectMetadataItem =
+      fieldMetadataItem.fromRelationMetadata?.toObjectMetadata ??
+      fieldMetadataItem.toRelationMetadata?.fromObjectMetadata;
+
+    if (
+      !relationMetadata ||
+      // TODO: Many to many relations are not supported yet.
+      relationMetadata.relationType === RelationMetadataType.ManyToMany ||
+      !relationObjectMetadataItem ||
+      !isObjectMetadataAvailableForRelation(relationObjectMetadataItem)
+    ) {
+      return false;
+    }
+  }
+
+  return !fieldMetadataItem.isSystem && !!fieldMetadataItem.isActive;
+};
diff --git a/packages/twenty-front/src/modules/object-record/utils/isFieldMetadataItemAvailable.ts b/packages/twenty-front/src/modules/object-record/utils/isFieldMetadataItemAvailable.ts
deleted file mode 100644
index dc992cc06de2..000000000000
--- a/packages/twenty-front/src/modules/object-record/utils/isFieldMetadataItemAvailable.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { RelationMetadataType } from '~/generated-metadata/graphql';
-
-export const isFieldMetadataItemAvailable = (
-  fieldMetadataItem: FieldMetadataItem,
-) =>
-  fieldMetadataItem.type !== 'UUID' &&
-  // TODO: Many to many relations are not supported yet.
-  !(
-    fieldMetadataItem.type === 'RELATION' &&
-    (
-      fieldMetadataItem.fromRelationMetadata ??
-      fieldMetadataItem.toRelationMetadata
-    )?.relationType === RelationMetadataType.ManyToMany
-  ) &&
-  !fieldMetadataItem.isSystem &&
-  !!fieldMetadataItem.isActive;
diff --git a/packages/twenty-front/src/modules/object-record/utils/makeAndFilterVariables.ts b/packages/twenty-front/src/modules/object-record/utils/makeAndFilterVariables.ts
index 1b97474befcc..2f5e36d9374f 100644
--- a/packages/twenty-front/src/modules/object-record/utils/makeAndFilterVariables.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/makeAndFilterVariables.ts
@@ -1,10 +1,10 @@
 import { ObjectRecordQueryFilter } from '@/object-record/record-filter/types/ObjectRecordQueryFilter';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const makeAndFilterVariables = (
   filters: (ObjectRecordQueryFilter | undefined)[],
 ): ObjectRecordQueryFilter | undefined => {
-  const definedFilters = filters.filter(isNonNullable);
+  const definedFilters = filters.filter(isDefined);
 
   if (!definedFilters.length) return undefined;
 
diff --git a/packages/twenty-front/src/modules/object-record/utils/makeOrFilterVariables.ts b/packages/twenty-front/src/modules/object-record/utils/makeOrFilterVariables.ts
index 2441ffee1f3f..01cceb25c9d0 100644
--- a/packages/twenty-front/src/modules/object-record/utils/makeOrFilterVariables.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/makeOrFilterVariables.ts
@@ -1,10 +1,10 @@
 import { ObjectRecordQueryFilter } from '@/object-record/record-filter/types/ObjectRecordQueryFilter';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const makeOrFilterVariables = (
   filters: (ObjectRecordQueryFilter | undefined)[],
 ): ObjectRecordQueryFilter | undefined => {
-  const definedFilters = filters.filter(isNonNullable);
+  const definedFilters = filters.filter(isDefined);
 
   if (!definedFilters.length) return undefined;
 
diff --git a/packages/twenty-front/src/modules/object-record/utils/mapPaginatedRecordsToRecords.ts b/packages/twenty-front/src/modules/object-record/utils/mapPaginatedRecordsToRecords.ts
deleted file mode 100644
index 48cb0dd91318..000000000000
--- a/packages/twenty-front/src/modules/object-record/utils/mapPaginatedRecordsToRecords.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-export const mapPaginatedRecordsToRecords = <
-  RecordType extends { id: string } & Record<string, any>,
-  RecordTypeQuery extends {
-    [objectNamePlural: string]: {
-      edges: RecordEdge[];
-    };
-  },
-  RecordEdge extends {
-    node: RecordType;
-  },
->({
-  pagedRecords,
-  objectNamePlural,
-}: {
-  pagedRecords: RecordTypeQuery | undefined;
-  objectNamePlural: string;
-}) => {
-  const formattedRecords: RecordType[] =
-    pagedRecords?.[objectNamePlural]?.edges?.map((recordEdge: RecordEdge) => ({
-      ...recordEdge.node,
-    })) ?? [];
-
-  return formattedRecords;
-};
diff --git a/packages/twenty-front/src/modules/object-record/utils/prefillRecord.ts b/packages/twenty-front/src/modules/object-record/utils/prefillRecord.ts
new file mode 100644
index 000000000000..4fd45e2fa8d7
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/utils/prefillRecord.ts
@@ -0,0 +1,35 @@
+import { isUndefined } from '@sniptt/guards';
+
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { generateEmptyFieldValue } from '@/object-record/utils/generateEmptyFieldValue';
+import { isDefined } from '~/utils/isDefined';
+
+export const prefillRecord = <T extends ObjectRecord>({
+  objectMetadataItem,
+  input,
+  depth = 1,
+}: {
+  objectMetadataItem: ObjectMetadataItem;
+  input: Record<string, unknown>;
+  depth?: number;
+}) => {
+  return Object.fromEntries(
+    objectMetadataItem.fields
+      .filter(
+        (fieldMetadataItem) =>
+          depth > 0 || fieldMetadataItem.type !== 'RELATION',
+      )
+      .map((fieldMetadataItem) => {
+        const inputValue = input[fieldMetadataItem.name];
+
+        return [
+          fieldMetadataItem.name,
+          isUndefined(inputValue)
+            ? generateEmptyFieldValue(fieldMetadataItem)
+            : inputValue,
+        ];
+      })
+      .filter(isDefined),
+  ) as T;
+};
diff --git a/packages/twenty-front/src/modules/object-record/utils/sanitizeRecordInput.ts b/packages/twenty-front/src/modules/object-record/utils/sanitizeRecordInput.ts
index f8e572d976f9..9239f9f16905 100644
--- a/packages/twenty-front/src/modules/object-record/utils/sanitizeRecordInput.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/sanitizeRecordInput.ts
@@ -3,16 +3,17 @@ import { isString } from '@sniptt/guards';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { isFieldRelationValue } from '@/object-record/record-field/types/guards/isFieldRelationValue';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { sanitizeLink } from '@/object-record/utils/sanitizeLinkRecordInput';
 import { FieldMetadataType } from '~/generated/graphql';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const sanitizeRecordInput = ({
   objectMetadataItem,
   recordInput,
 }: {
   objectMetadataItem: ObjectMetadataItem;
-  recordInput: Record<string, unknown>;
+  recordInput: Partial<ObjectRecord>;
 }) => {
   const filteredResultRecord = Object.fromEntries(
     Object.entries(recordInput)
@@ -23,6 +24,10 @@ export const sanitizeRecordInput = ({
 
         if (!fieldMetadataItem) return undefined;
 
+        if (!fieldMetadataItem.isNullable && fieldValue == null) {
+          return undefined;
+        }
+
         if (
           fieldMetadataItem.type === FieldMetadataType.Relation &&
           isFieldRelationValue(fieldValue)
@@ -39,7 +44,7 @@ export const sanitizeRecordInput = ({
 
         return [fieldName, fieldValue];
       })
-      .filter(isNonNullable),
+      .filter(isDefined),
   );
   if (
     objectMetadataItem.nameSingular !== CoreObjectNameSingular.Company ||
diff --git a/packages/twenty-front/src/modules/object-record/utils/sortObjectRecordByDateField.ts b/packages/twenty-front/src/modules/object-record/utils/sortObjectRecordByDateField.ts
index bd9c1a66e0dd..10b0b3269476 100644
--- a/packages/twenty-front/src/modules/object-record/utils/sortObjectRecordByDateField.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/sortObjectRecordByDateField.ts
@@ -2,7 +2,7 @@ import { DateTime } from 'luxon';
 
 import { OrderBy } from '@/object-metadata/types/OrderBy';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 const SORT_BEFORE = -1;
 const SORT_AFTER = 1;
@@ -14,11 +14,11 @@ export const sortObjectRecordByDateField =
     const aDate = a[dateField];
     const bDate = b[dateField];
 
-    if (!isNonNullable(aDate) && !isNonNullable(bDate)) {
+    if (!isDefined(aDate) && !isDefined(bDate)) {
       return SORT_EQUAL;
     }
 
-    if (!isNonNullable(aDate)) {
+    if (!isDefined(aDate)) {
       if (sortDirection === 'AscNullsFirst') {
         return SORT_BEFORE;
       } else if (sortDirection === 'DescNullsFirst') {
@@ -32,7 +32,7 @@ export const sortObjectRecordByDateField =
       throw new Error(`Invalid sortDirection: ${sortDirection}`);
     }
 
-    if (!isNonNullable(bDate)) {
+    if (!isDefined(bDate)) {
       if (sortDirection === 'AscNullsFirst') {
         return SORT_AFTER;
       } else if (sortDirection === 'DescNullsFirst') {
diff --git a/packages/twenty-front/src/modules/pipeline/components/PipelineAddButton.tsx b/packages/twenty-front/src/modules/pipeline/components/PipelineAddButton.tsx
deleted file mode 100644
index 867474795804..000000000000
--- a/packages/twenty-front/src/modules/pipeline/components/PipelineAddButton.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { OpportunityPicker } from '@/companies/components/OpportunityPicker';
-import { useCreateOpportunity } from '@/object-record/record-board-deprecated/hooks/internal/useCreateOpportunity';
-import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
-import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
-import { PageHotkeyScope } from '@/types/PageHotkeyScope';
-import { IconPlus } from '@/ui/display/icon/index';
-import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
-import { IconButton } from '@/ui/input/button/components/IconButton';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
-import { logError } from '~/utils/logError';
-
-export const PipelineAddButton = () => {
-  const { enqueueSnackBar } = useSnackBar();
-
-  const { closeDropdown, toggleDropdown } = useDropdown(
-    'add-pipeline-progress',
-  );
-
-  const createOpportunity = useCreateOpportunity();
-
-  const handleCompanySelected = (
-    selectedCompany: EntityForSelect | null,
-    selectedPipelineStepId: string | null,
-  ) => {
-    if (!selectedCompany?.id) {
-      enqueueSnackBar(
-        'There was a problem with the company selection, please retry.',
-        { variant: 'error' },
-      );
-
-      logError('There was a problem with the company selection, please retry.');
-      return;
-    }
-
-    if (!selectedPipelineStepId) {
-      enqueueSnackBar(
-        'There was a problem with the pipeline stage selection, please retry.',
-        { variant: 'error' },
-      );
-
-      logError('There was a problem with the pipeline step selection.');
-      return;
-    }
-    closeDropdown();
-    createOpportunity(selectedCompany.id, selectedPipelineStepId);
-  };
-
-  return (
-    <Dropdown
-      dropdownId="add-pipeline-progress"
-      clickableComponent={
-        <IconButton
-          Icon={IconPlus}
-          size="medium"
-          dataTestId="add-company-progress-button"
-          accent="default"
-          variant="secondary"
-          onClick={toggleDropdown}
-        />
-      }
-      dropdownComponents={
-        <OpportunityPicker
-          companyId={null}
-          onSubmit={handleCompanySelected}
-          onCancel={closeDropdown}
-        />
-      }
-      hotkey={{
-        key: 'c',
-        scope: PageHotkeyScope.OpportunitiesPage,
-      }}
-      dropdownHotkeyScope={{
-        scope: RelationPickerHotkeyScope.RelationPicker,
-      }}
-    />
-  );
-};
diff --git a/packages/twenty-front/src/modules/pipeline/hooks/__mocks__/usePipelineSteps.ts b/packages/twenty-front/src/modules/pipeline/hooks/__mocks__/usePipelineSteps.ts
deleted file mode 100644
index 2d7c5a4341f1..000000000000
--- a/packages/twenty-front/src/modules/pipeline/hooks/__mocks__/usePipelineSteps.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const query = gql`
-  mutation CreateOnePipelineStep($input: PipelineStepCreateInput!) {
-    createPipelineStep(data: $input) {
-      id
-      name
-      id
-      createdAt
-      opportunities {
-        edges {
-          node {
-            __typename
-            id
-          }
-        }
-      }
-      position
-      color
-      updatedAt
-    }
-  }
-`;
-
-export const deleteQuery = gql`
-  mutation DeleteOnePipelineStep($idToDelete: ID!) {
-    deletePipelineStep(id: $idToDelete) {
-      id
-    }
-  }
-`;
-
-export const mockId = '8f3b2121-f194-4ba4-9fbf-2d5a37126806';
-export const currentPipelineId = 'f088c8c9-05d2-4276-b065-b863cc7d0b33';
-
-const data = {
-  color: 'yellow',
-  id: mockId,
-  position: 1,
-  name: 'Column Title',
-};
-
-export const variables = {
-  input: data,
-};
-
-export const deleteVariables = { idToDelete: 'columnId' };
-
-export const responseData = {
-  ...data,
-  createdAt: '',
-  opportunities: {
-    edges: [],
-  },
-  updatedAt: '',
-};
-
-export const deleteResponseData = {
-  id: 'columnId',
-};
diff --git a/packages/twenty-front/src/modules/pipeline/hooks/__tests__/usePipelineSteps.test.tsx b/packages/twenty-front/src/modules/pipeline/hooks/__tests__/usePipelineSteps.test.tsx
deleted file mode 100644
index b8c7c044e8f1..000000000000
--- a/packages/twenty-front/src/modules/pipeline/hooks/__tests__/usePipelineSteps.test.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import { ReactNode } from 'react';
-import { act } from 'react-dom/test-utils';
-import { MockedProvider } from '@apollo/client/testing';
-import { renderHook } from '@testing-library/react';
-import { RecoilRoot, useSetRecoilState } from 'recoil';
-
-import { BoardColumnDefinition } from '@/object-record/record-board-deprecated/types/BoardColumnDefinition';
-import { currentPipelineState } from '@/pipeline/states/currentPipelineState';
-
-import {
-  currentPipelineId,
-  deleteQuery,
-  deleteResponseData,
-  deleteVariables,
-  mockId,
-  query,
-  responseData,
-  variables,
-} from '../__mocks__/usePipelineSteps';
-import { usePipelineSteps } from '../usePipelineSteps';
-
-const mocks = [
-  {
-    request: {
-      query,
-      variables,
-    },
-    result: jest.fn(() => ({
-      data: {
-        createPipelineStep: responseData,
-      },
-    })),
-  },
-  {
-    request: {
-      query: deleteQuery,
-      variables: deleteVariables,
-    },
-    result: jest.fn(() => ({
-      data: {
-        deletePipelineStep: deleteResponseData,
-      },
-    })),
-  },
-];
-
-const Wrapper = ({ children }: { children: ReactNode }) => (
-  <RecoilRoot>
-    <MockedProvider mocks={mocks} addTypename={false}>
-      {children}
-    </MockedProvider>
-  </RecoilRoot>
-);
-
-jest.mock('uuid', () => ({
-  v4: jest.fn(() => mockId),
-}));
-
-describe('usePipelineSteps', () => {
-  it('should handlePipelineStepAdd successfully', async () => {
-    const { result } = renderHook(
-      () => {
-        const setCurrentPipeline = useSetRecoilState(currentPipelineState);
-        setCurrentPipeline({ id: currentPipelineId });
-        return usePipelineSteps();
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    const boardColumn: BoardColumnDefinition = {
-      id: mockId,
-      title: 'Column Title',
-      colorCode: 'yellow',
-      position: 1,
-    };
-
-    await act(async () => {
-      const res = await result.current.handlePipelineStepAdd(boardColumn);
-      expect(res).toEqual(responseData);
-    });
-  });
-
-  it('should handlePipelineStepDelete successfully', async () => {
-    const { result } = renderHook(
-      () => {
-        const setCurrentPipeline = useSetRecoilState(currentPipelineState);
-        setCurrentPipeline({ id: currentPipelineId });
-        return usePipelineSteps();
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    const boardColumnId = 'columnId';
-
-    await act(async () => {
-      const res = await result.current.handlePipelineStepDelete(boardColumnId);
-      expect(res).toEqual(deleteResponseData);
-    });
-  });
-});
diff --git a/packages/twenty-front/src/modules/pipeline/hooks/usePipelineSteps.ts b/packages/twenty-front/src/modules/pipeline/hooks/usePipelineSteps.ts
deleted file mode 100644
index f68335f693b5..000000000000
--- a/packages/twenty-front/src/modules/pipeline/hooks/usePipelineSteps.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { useRecoilCallback } from 'recoil';
-
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
-import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
-import { BoardColumnDefinition } from '@/object-record/record-board-deprecated/types/BoardColumnDefinition';
-import { currentPipelineState } from '@/pipeline/states/currentPipelineState';
-import { PipelineStep } from '@/pipeline/types/PipelineStep';
-
-export const usePipelineSteps = () => {
-  const { createOneRecord: createOnePipelineStep } =
-    useCreateOneRecord<PipelineStep>({
-      objectNameSingular: CoreObjectNameSingular.PipelineStep,
-    });
-
-  const { deleteOneRecord: deleteOnePipelineStep } = useDeleteOneRecord({
-    objectNameSingular: CoreObjectNameSingular.PipelineStep,
-  });
-
-  const handlePipelineStepAdd = useRecoilCallback(
-    ({ snapshot }) =>
-      async (boardColumn: BoardColumnDefinition) => {
-        const currentPipeline = await snapshot.getPromise(currentPipelineState);
-        if (!currentPipeline?.id) return;
-
-        return createOnePipelineStep?.({
-          color: boardColumn.colorCode ?? 'gray',
-          id: boardColumn.id,
-          position: boardColumn.position,
-          name: boardColumn.title,
-        });
-      },
-    [createOnePipelineStep],
-  );
-
-  const handlePipelineStepDelete = useRecoilCallback(
-    ({ snapshot }) =>
-      async (boardColumnId: string) => {
-        const currentPipeline = await snapshot.getPromise(currentPipelineState);
-        if (!currentPipeline?.id) return;
-
-        return deleteOnePipelineStep?.(boardColumnId);
-      },
-    [deleteOnePipelineStep],
-  );
-
-  return { handlePipelineStepAdd, handlePipelineStepDelete };
-};
diff --git a/packages/twenty-front/src/modules/pipeline/states/currentPipelineState.ts b/packages/twenty-front/src/modules/pipeline/states/currentPipelineState.ts
deleted file mode 100644
index 2de1a5e5fba3..000000000000
--- a/packages/twenty-front/src/modules/pipeline/states/currentPipelineState.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { atom } from 'recoil';
-import { undefined } from 'zod';
-
-export const currentPipelineState = atom<any | undefined>({
-  key: 'currentPipelineState',
-  default: undefined,
-});
diff --git a/packages/twenty-front/src/modules/pipeline/states/currentPipelineStepsState.ts b/packages/twenty-front/src/modules/pipeline/states/currentPipelineStepsState.ts
deleted file mode 100644
index fce0bc74598c..000000000000
--- a/packages/twenty-front/src/modules/pipeline/states/currentPipelineStepsState.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { atom } from 'recoil';
-
-import { PipelineStep } from '@/pipeline/types/PipelineStep';
-
-export const currentPipelineStepsState = atom<PipelineStep[]>({
-  key: 'currentPipelineStepsState',
-  default: [],
-});
diff --git a/packages/twenty-front/src/modules/pipeline/types/Opportunity.ts b/packages/twenty-front/src/modules/pipeline/types/Opportunity.ts
deleted file mode 100644
index 3525841f89b3..000000000000
--- a/packages/twenty-front/src/modules/pipeline/types/Opportunity.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Person } from '@/people/types/Person';
-import { PipelineStep } from '@/pipeline/types/PipelineStep';
-
-export type Opportunity = {
-  [key: string]: any;
-  id: string;
-  amount: {
-    amountMicros: number;
-    currencyCode: string;
-  };
-  closeDate: Date;
-  probability: number;
-  pipelineStepId: string;
-  pipelineStep: PipelineStep;
-  pointOfContactId: string;
-  pointOfContact: Pick<Person, 'id' | 'name' | 'avatarUrl'>;
-};
diff --git a/packages/twenty-front/src/modules/pipeline/types/PipelineStep.ts b/packages/twenty-front/src/modules/pipeline/types/PipelineStep.ts
deleted file mode 100644
index 76773be081d1..000000000000
--- a/packages/twenty-front/src/modules/pipeline/types/PipelineStep.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export type PipelineStep = {
-  id: string;
-  name: string;
-  color: string;
-  position: number;
-  createdAt: string;
-  updatedAt: string;
-};
diff --git a/packages/twenty-front/src/modules/prefetch/components/PrefetchDataProvider.tsx b/packages/twenty-front/src/modules/prefetch/components/PrefetchDataProvider.tsx
new file mode 100644
index 000000000000..837d2498e576
--- /dev/null
+++ b/packages/twenty-front/src/modules/prefetch/components/PrefetchDataProvider.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+
+import { PrefetchRunQueriesEffect } from '@/prefetch/components/PrefetchRunQueriesEffect';
+
+export const PrefetchDataProvider = ({ children }: React.PropsWithChildren) => {
+  return (
+    <>
+      <PrefetchRunQueriesEffect />
+      {children}
+    </>
+  );
+};
diff --git a/packages/twenty-front/src/modules/prefetch/components/PrefetchRunQueriesEffect.tsx b/packages/twenty-front/src/modules/prefetch/components/PrefetchRunQueriesEffect.tsx
new file mode 100644
index 000000000000..e1ed69d59707
--- /dev/null
+++ b/packages/twenty-front/src/modules/prefetch/components/PrefetchRunQueriesEffect.tsx
@@ -0,0 +1,46 @@
+import { useEffect } from 'react';
+import { useRecoilValue } from 'recoil';
+
+import { currentUserState } from '@/auth/states/currentUserState';
+import { Favorite } from '@/favorites/types/Favorite';
+import { useFindManyRecordsForMultipleMetadataItems } from '@/object-record/multiple-objects/hooks/useFindManyRecordsForMultipleMetadataItems';
+import { usePrefetchRunQuery } from '@/prefetch/hooks/internal/usePrefetchRunQuery';
+import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
+import { View } from '@/views/types/View';
+import { isDefined } from '~/utils/isDefined';
+
+export const PrefetchRunQueriesEffect = () => {
+  const currentUser = useRecoilValue(currentUserState);
+
+  const {
+    objectMetadataItem: objectMetadataItemView,
+    upsertRecordsInCache: upsertViewsInCache,
+  } = usePrefetchRunQuery<View>({
+    prefetchKey: PrefetchKey.AllViews,
+  });
+
+  const {
+    objectMetadataItem: objectMetadataItemFavorite,
+    upsertRecordsInCache: upsertFavoritesInCache,
+  } = usePrefetchRunQuery<Favorite>({
+    prefetchKey: PrefetchKey.AllFavorites,
+  });
+
+  const { result } = useFindManyRecordsForMultipleMetadataItems({
+    objectMetadataItems: [objectMetadataItemView, objectMetadataItemFavorite],
+    skip: !currentUser,
+    depth: 1,
+  });
+
+  useEffect(() => {
+    if (isDefined(result.views)) {
+      upsertViewsInCache(result.views as View[]);
+    }
+
+    if (isDefined(result.favorites)) {
+      upsertFavoritesInCache(result.favorites as Favorite[]);
+    }
+  }, [result, upsertViewsInCache, upsertFavoritesInCache]);
+
+  return <></>;
+};
diff --git a/packages/twenty-front/src/modules/prefetch/constants/PrefetchConfig.ts b/packages/twenty-front/src/modules/prefetch/constants/PrefetchConfig.ts
new file mode 100644
index 000000000000..a79631158314
--- /dev/null
+++ b/packages/twenty-front/src/modules/prefetch/constants/PrefetchConfig.ts
@@ -0,0 +1,9 @@
+import { QueryKey } from '@/object-record/query-keys/types/QueryKey';
+import { ALL_FAVORITES_QUERY_KEY } from '@/prefetch/query-keys/AllFavoritesQueryKey';
+import { ALL_VIEWS_QUERY_KEY } from '@/prefetch/query-keys/AllViewsQueryKey';
+import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
+
+export const PREFETCH_CONFIG: Record<PrefetchKey, QueryKey> = {
+  ALL_VIEWS: ALL_VIEWS_QUERY_KEY,
+  ALL_FAVORITES: ALL_FAVORITES_QUERY_KEY,
+};
diff --git a/packages/twenty-front/src/modules/prefetch/hooks/internal/usePrefetchRunQuery.ts b/packages/twenty-front/src/modules/prefetch/hooks/internal/usePrefetchRunQuery.ts
new file mode 100644
index 000000000000..b010e65db750
--- /dev/null
+++ b/packages/twenty-front/src/modules/prefetch/hooks/internal/usePrefetchRunQuery.ts
@@ -0,0 +1,44 @@
+import { useSetRecoilState } from 'recoil';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useUpsertFindManyRecordsQueryInCache } from '@/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { PREFETCH_CONFIG } from '@/prefetch/constants/PrefetchConfig';
+import { prefetchIsLoadedFamilyState } from '@/prefetch/states/prefetchIsLoadedFamilyState';
+import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
+
+export type UsePrefetchRunQuery = {
+  prefetchKey: PrefetchKey;
+};
+
+export const usePrefetchRunQuery = <T extends ObjectRecord>({
+  prefetchKey,
+}: UsePrefetchRunQuery) => {
+  const setPrefetchDataIsLoadedLoaded = useSetRecoilState(
+    prefetchIsLoadedFamilyState(prefetchKey),
+  );
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular: PREFETCH_CONFIG[prefetchKey].objectNameSingular,
+  });
+
+  const { upsertFindManyRecordsQueryInCache } =
+    useUpsertFindManyRecordsQueryInCache({
+      objectMetadataItem: objectMetadataItem,
+    });
+
+  const upsertRecordsInCache = (records: T[]) => {
+    upsertFindManyRecordsQueryInCache({
+      queryVariables: PREFETCH_CONFIG[prefetchKey].variables,
+      depth: PREFETCH_CONFIG[prefetchKey].depth,
+      objectRecordsToOverwrite: records,
+      computeReferences: false,
+    });
+    setPrefetchDataIsLoadedLoaded(true);
+  };
+
+  return {
+    objectMetadataItem,
+    setPrefetchDataIsLoadedLoaded,
+    upsertRecordsInCache,
+  };
+};
diff --git a/packages/twenty-front/src/modules/prefetch/hooks/usePrefetchedData.ts b/packages/twenty-front/src/modules/prefetch/hooks/usePrefetchedData.ts
new file mode 100644
index 000000000000..3072733c85f2
--- /dev/null
+++ b/packages/twenty-front/src/modules/prefetch/hooks/usePrefetchedData.ts
@@ -0,0 +1,26 @@
+import { useRecoilValue } from 'recoil';
+
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { PREFETCH_CONFIG } from '@/prefetch/constants/PrefetchConfig';
+import { prefetchIsLoadedFamilyState } from '@/prefetch/states/prefetchIsLoadedFamilyState';
+import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
+
+export const usePrefetchedData = <T extends ObjectRecord>(
+  prefetchKey: PrefetchKey,
+) => {
+  const isDataPrefetched = useRecoilValue(
+    prefetchIsLoadedFamilyState(prefetchKey),
+  );
+  const prefetchQueryKey = PREFETCH_CONFIG[prefetchKey];
+
+  const { records } = useFindManyRecords<T>({
+    skip: !isDataPrefetched,
+    ...prefetchQueryKey,
+  });
+
+  return {
+    isDataPrefetched,
+    records,
+  };
+};
diff --git a/packages/twenty-front/src/modules/prefetch/query-keys/AllFavoritesQueryKey.ts b/packages/twenty-front/src/modules/prefetch/query-keys/AllFavoritesQueryKey.ts
new file mode 100644
index 000000000000..a5e442715881
--- /dev/null
+++ b/packages/twenty-front/src/modules/prefetch/query-keys/AllFavoritesQueryKey.ts
@@ -0,0 +1,8 @@
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { QueryKey } from '@/object-record/query-keys/types/QueryKey';
+
+export const ALL_FAVORITES_QUERY_KEY: QueryKey = {
+  objectNameSingular: CoreObjectNameSingular.Favorite,
+  variables: {},
+  depth: 1,
+};
diff --git a/packages/twenty-front/src/modules/prefetch/query-keys/AllViewsQueryKey.ts b/packages/twenty-front/src/modules/prefetch/query-keys/AllViewsQueryKey.ts
new file mode 100644
index 000000000000..df1c78163048
--- /dev/null
+++ b/packages/twenty-front/src/modules/prefetch/query-keys/AllViewsQueryKey.ts
@@ -0,0 +1,8 @@
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { QueryKey } from '@/object-record/query-keys/types/QueryKey';
+
+export const ALL_VIEWS_QUERY_KEY: QueryKey = {
+  objectNameSingular: CoreObjectNameSingular.View,
+  variables: {},
+  depth: 1,
+};
diff --git a/packages/twenty-front/src/modules/prefetch/states/prefetchIsLoadedFamilyState.ts b/packages/twenty-front/src/modules/prefetch/states/prefetchIsLoadedFamilyState.ts
new file mode 100644
index 000000000000..38069ee05801
--- /dev/null
+++ b/packages/twenty-front/src/modules/prefetch/states/prefetchIsLoadedFamilyState.ts
@@ -0,0 +1,10 @@
+import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
+
+export const prefetchIsLoadedFamilyState = createFamilyState<
+  boolean,
+  PrefetchKey
+>({
+  key: 'prefetchIsLoadedFamilyState',
+  defaultValue: false,
+});
diff --git a/packages/twenty-front/src/modules/prefetch/types/PrefetchKey.ts b/packages/twenty-front/src/modules/prefetch/types/PrefetchKey.ts
new file mode 100644
index 000000000000..f7ebf434e916
--- /dev/null
+++ b/packages/twenty-front/src/modules/prefetch/types/PrefetchKey.ts
@@ -0,0 +1,4 @@
+export enum PrefetchKey {
+  AllViews = 'ALL_VIEWS',
+  AllFavorites = 'ALL_FAVORITES',
+}
diff --git a/packages/twenty-front/src/modules/search/hooks/__mocks__/useFilteredSearchEntityQuery.ts b/packages/twenty-front/src/modules/search/hooks/__mocks__/useFilteredSearchEntityQuery.ts
index 39201e66a8fc..cb1daf98147c 100644
--- a/packages/twenty-front/src/modules/search/hooks/__mocks__/useFilteredSearchEntityQuery.ts
+++ b/packages/twenty-front/src/modules/search/hooks/__mocks__/useFilteredSearchEntityQuery.ts
@@ -24,7 +24,7 @@ export const query = gql`
                 pointOfContactId
                 updatedAt
                 companyId
-                pipelineStepId
+                stage
                 probability
                 closeDate
                 amount {
@@ -49,7 +49,7 @@ export const query = gql`
                 pointOfContactId
                 updatedAt
                 companyId
-                pipelineStepId
+                stage
                 probability
                 closeDate
                 amount {
diff --git a/packages/twenty-front/src/modules/search/hooks/useFilteredSearchEntityQuery.ts b/packages/twenty-front/src/modules/search/hooks/useFilteredSearchEntityQuery.ts
index 316c092cb13a..d7beaefce4fb 100644
--- a/packages/twenty-front/src/modules/search/hooks/useFilteredSearchEntityQuery.ts
+++ b/packages/twenty-front/src/modules/search/hooks/useFilteredSearchEntityQuery.ts
@@ -1,6 +1,6 @@
 import { isNonEmptyString } from '@sniptt/guards';
 
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useMapToObjectRecordIdentifier } from '@/object-metadata/hooks/useMapToObjectRecordIdentifier';
 import { OrderBy } from '@/object-metadata/types/OrderBy';
 import { DEFAULT_SEARCH_REQUEST_LIMIT } from '@/object-record/constants/DefaultSearchRequestLimit';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
@@ -9,7 +9,7 @@ import { EntityForSelect } from '@/object-record/relation-picker/types/EntityFor
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { makeAndFilterVariables } from '@/object-record/utils/makeAndFilterVariables';
 import { makeOrFilterVariables } from '@/object-record/utils/makeOrFilterVariables';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 type SearchFilter = { fieldNames: string[]; filter: string | number };
 
@@ -33,9 +33,10 @@ export const useFilteredSearchEntityQuery = ({
   excludeEntityIds?: string[];
   objectNameSingular: string;
 }): EntitiesForMultipleEntitySelect<EntityForSelect> => {
-  const { mapToObjectRecordIdentifier } = useObjectMetadataItem({
+  const { mapToObjectRecordIdentifier } = useMapToObjectRecordIdentifier({
     objectNameSingular,
   });
+
   const mappingFunction = (record: ObjectRecord) => ({
     ...mapToObjectRecordIdentifier(record),
     record,
@@ -59,7 +60,7 @@ export const useFilteredSearchEntityQuery = ({
       fieldNames.map((fieldName) => {
         const [parentFieldName, subFieldName] = fieldName.split('.');
 
-        if (subFieldName) {
+        if (isNonEmptyString(subFieldName)) {
           // Composite field
           return {
             [parentFieldName]: {
@@ -102,15 +103,11 @@ export const useFilteredSearchEntityQuery = ({
     });
 
   return {
-    selectedEntities: selectedRecords
-      .map(mappingFunction)
-      .filter(isNonNullable),
+    selectedEntities: selectedRecords.map(mappingFunction).filter(isDefined),
     filteredSelectedEntities: filteredSelectedRecords
       .map(mappingFunction)
-      .filter(isNonNullable),
-    entitiesToSelect: recordsToSelect
-      .map(mappingFunction)
-      .filter(isNonNullable),
+      .filter(isDefined),
+    entitiesToSelect: recordsToSelect.map(mappingFunction).filter(isDefined),
     loading:
       recordsToSelectLoading ||
       filteredSelectedRecordsLoading ||
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountLoader.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountLoader.tsx
similarity index 100%
rename from packages/twenty-front/src/pages/settings/accounts/SettingsAccountLoader.tsx
rename to packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountLoader.tsx
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarAccountsListCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarAccountsListCard.tsx
deleted file mode 100644
index 5425976316ec..000000000000
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarAccountsListCard.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { useNavigate } from 'react-router-dom';
-import styled from '@emotion/styled';
-import { useRecoilValue } from 'recoil';
-
-import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
-import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { SettingsAccountsListCard } from '@/settings/accounts/components/SettingsAccountsListCard';
-import { SettingsAccountsSynchronizationStatus } from '@/settings/accounts/components/SettingsAccountsSynchronizationStatus';
-import { IconChevronRight } from '@/ui/display/icon';
-import { IconGoogleCalendar } from '@/ui/display/icon/components/IconGoogleCalendar';
-import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
-import { mockedConnectedAccounts } from '~/testing/mock-data/accounts';
-
-const StyledRowRightContainer = styled.div`
-  align-items: center;
-  display: flex;
-  gap: ${({ theme }) => theme.spacing(1)};
-`;
-
-export const SettingsAccountsCalendarAccountsListCard = () => {
-  const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
-  const navigate = useNavigate();
-
-  const { records: _accounts, loading } = useFindManyRecords<ConnectedAccount>({
-    objectNameSingular: CoreObjectNameSingular.ConnectedAccount,
-    filter: {
-      accountOwnerId: {
-        eq: currentWorkspaceMember?.id,
-      },
-    },
-  });
-
-  return (
-    <SettingsAccountsListCard
-      accounts={mockedConnectedAccounts}
-      isLoading={loading}
-      onRowClick={(account) =>
-        navigate(`/settings/accounts/calendars/${account.id}`)
-      }
-      RowIcon={IconGoogleCalendar}
-      RowRightComponent={({ account: _account }) => (
-        <StyledRowRightContainer>
-          <SettingsAccountsSynchronizationStatus synced />
-          <LightIconButton Icon={IconChevronRight} accent="tertiary" />
-        </StyledRowRightContainer>
-      )}
-    />
-  );
-};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelsListCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelsListCard.tsx
new file mode 100644
index 000000000000..3222dc89ba44
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelsListCard.tsx
@@ -0,0 +1,91 @@
+import { useNavigate } from 'react-router-dom';
+import styled from '@emotion/styled';
+import { useRecoilValue } from 'recoil';
+import { IconChevronRight } from 'twenty-ui';
+
+import { CalendarChannel } from '@/accounts/types/CalendarChannel';
+import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+import { SettingsAccountsListEmptyStateCard } from '@/settings/accounts/components/SettingsAccountsListEmptyStateCard';
+import {
+  SettingsAccountsSynchronizationStatus,
+  SettingsAccountsSynchronizationStatusProps,
+} from '@/settings/accounts/components/SettingsAccountsSynchronizationStatus';
+import { SettingsListCard } from '@/settings/components/SettingsListCard';
+import { IconGoogleCalendar } from '@/ui/display/icon/components/IconGoogleCalendar';
+import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
+
+const StyledRowRightContainer = styled.div`
+  align-items: center;
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+`;
+
+export const SettingsAccountsCalendarChannelsListCard = () => {
+  const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
+  const navigate = useNavigate();
+
+  const { records: accounts, loading: accountsLoading } =
+    useFindManyRecords<ConnectedAccount>({
+      objectNameSingular: CoreObjectNameSingular.ConnectedAccount,
+      filter: {
+        accountOwnerId: {
+          eq: currentWorkspaceMember?.id,
+        },
+      },
+    });
+
+  const { records: calendarChannels, loading: calendarChannelsLoading } =
+    useFindManyRecords<
+      CalendarChannel & {
+        connectedAccount: ConnectedAccount;
+      }
+    >({
+      objectNameSingular: CoreObjectNameSingular.CalendarChannel,
+      skip: !accounts.length,
+      filter: {
+        connectedAccountId: {
+          in: accounts.map((account) => account.id),
+        },
+      },
+    });
+
+  if (!calendarChannels.length) {
+    return <SettingsAccountsListEmptyStateCard />;
+  }
+
+  const calendarChannelsWithSyncStatus: (CalendarChannel & {
+    connectedAccount: ConnectedAccount;
+  } & SettingsAccountsSynchronizationStatusProps)[] = calendarChannels.map(
+    (calendarChannel) => ({
+      ...calendarChannel,
+      syncStatus: calendarChannel.connectedAccount?.authFailedAt
+        ? 'failed'
+        : calendarChannel.isSyncEnabled
+          ? 'synced'
+          : 'notSynced',
+    }),
+  );
+
+  return (
+    <SettingsListCard
+      items={calendarChannelsWithSyncStatus}
+      getItemLabel={(calendarChannel) => calendarChannel.handle}
+      isLoading={accountsLoading || calendarChannelsLoading}
+      onRowClick={(calendarChannel) =>
+        navigate(`/settings/accounts/calendars/${calendarChannel.id}`)
+      }
+      RowIcon={IconGoogleCalendar}
+      RowRightComponent={({ item: calendarChannel }) => (
+        <StyledRowRightContainer>
+          <SettingsAccountsSynchronizationStatus
+            syncStatus={calendarChannel.syncStatus}
+          />
+          <LightIconButton Icon={IconChevronRight} accent="tertiary" />
+        </StyledRowRightContainer>
+      )}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarDateFormatSelect.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarDateFormatSelect.tsx
new file mode 100644
index 000000000000..278af533e3ab
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarDateFormatSelect.tsx
@@ -0,0 +1,34 @@
+import { formatInTimeZone } from 'date-fns-tz';
+
+import { DateFormat } from '@/settings/accounts/constants/DateFormat';
+import { Select } from '@/ui/input/components/Select';
+
+type SettingsAccountsCalendarDateFormatSelectProps = {
+  value: DateFormat;
+  onChange: (nextValue: DateFormat) => void;
+  timeZone: string;
+};
+
+export const SettingsAccountsCalendarDateFormatSelect = ({
+  onChange,
+  timeZone,
+  value,
+}: SettingsAccountsCalendarDateFormatSelectProps) => (
+  <Select
+    dropdownId="settings-accounts-calendar-date-format"
+    label="Date format"
+    fullWidth
+    value={value}
+    options={[
+      {
+        label: formatInTimeZone(Date.now(), timeZone, DateFormat.US),
+        value: DateFormat.US,
+      },
+      {
+        label: formatInTimeZone(Date.now(), timeZone, DateFormat.UK),
+        value: DateFormat.UK,
+      },
+    ]}
+    onChange={onChange}
+  />
+);
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarDisplaySettings.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarDisplaySettings.tsx
index 880cf68c0490..4f01ed496407 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarDisplaySettings.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarDisplaySettings.tsx
@@ -1,10 +1,12 @@
 import { useState } from 'react';
 import styled from '@emotion/styled';
-import { formatInTimeZone } from 'date-fns-tz';
 
+import { SettingsAccountsCalendarDateFormatSelect } from '@/settings/accounts/components/SettingsAccountsCalendarDateFormatSelect';
+import { SettingsAccountsCalendarTimeFormatSelect } from '@/settings/accounts/components/SettingsAccountsCalendarTimeFormatSelect';
 import { SettingsAccountsCalendarTimeZoneSelect } from '@/settings/accounts/components/SettingsAccountsCalendarTimeZoneSelect';
+import { DateFormat } from '@/settings/accounts/constants/DateFormat';
+import { TimeFormat } from '@/settings/accounts/constants/TimeFormat';
 import { detectTimeZone } from '@/settings/accounts/utils/detectTimeZone';
-import { Select } from '@/ui/input/components/Select';
 
 const StyledContainer = styled.div`
   display: flex;
@@ -16,8 +18,11 @@ export const SettingsAccountsCalendarDisplaySettings = () => {
   // TODO: use the user's saved time zone. If undefined, default it with the user's detected time zone.
   const [timeZone, setTimeZone] = useState(detectTimeZone());
 
+  // TODO: use the user's saved date format.
+  const [dateFormat, setDateFormat] = useState(DateFormat.US);
+
   // TODO: use the user's saved time format.
-  const [timeFormat, setTimeFormat] = useState<12 | 24>(24);
+  const [timeFormat, setTimeFormat] = useState(TimeFormat['24h']);
 
   return (
     <StyledContainer>
@@ -25,22 +30,15 @@ export const SettingsAccountsCalendarDisplaySettings = () => {
         value={timeZone}
         onChange={setTimeZone}
       />
-      <Select
-        dropdownId="settings-accounts-calendar-time-format"
-        label="Format"
-        fullWidth
+      <SettingsAccountsCalendarDateFormatSelect
+        value={dateFormat}
+        onChange={setDateFormat}
+        timeZone={timeZone}
+      />
+      <SettingsAccountsCalendarTimeFormatSelect
         value={timeFormat}
-        options={[
-          {
-            label: `24h (${formatInTimeZone(Date.now(), timeZone, 'HH:mm')})`,
-            value: 24,
-          },
-          {
-            label: `12h (${formatInTimeZone(Date.now(), timeZone, 'h:mm aa')})`,
-            value: 12,
-          },
-        ]}
         onChange={setTimeFormat}
+        timeZone={timeZone}
       />
     </StyledContainer>
   );
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarTimeFormatSelect.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarTimeFormatSelect.tsx
new file mode 100644
index 000000000000..cab95257dd15
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarTimeFormatSelect.tsx
@@ -0,0 +1,42 @@
+import { formatInTimeZone } from 'date-fns-tz';
+
+import { TimeFormat } from '@/settings/accounts/constants/TimeFormat';
+import { Select } from '@/ui/input/components/Select';
+
+type SettingsAccountsCalendarTimeFormatSelectProps = {
+  value: TimeFormat;
+  onChange: (nextValue: TimeFormat) => void;
+  timeZone: string;
+};
+
+export const SettingsAccountsCalendarTimeFormatSelect = ({
+  onChange,
+  timeZone,
+  value,
+}: SettingsAccountsCalendarTimeFormatSelectProps) => (
+  <Select
+    dropdownId="settings-accounts-calendar-time-format"
+    label="Time format"
+    fullWidth
+    value={value}
+    options={[
+      {
+        label: `24h (${formatInTimeZone(
+          Date.now(),
+          timeZone,
+          TimeFormat['24h'],
+        )})`,
+        value: TimeFormat['24h'],
+      },
+      {
+        label: `12h (${formatInTimeZone(
+          Date.now(),
+          timeZone,
+          TimeFormat['12h'],
+        )})`,
+        value: TimeFormat['12h'],
+      },
+    ]}
+    onChange={onChange}
+  />
+);
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarVisibilitySettingsCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarVisibilitySettingsCard.tsx
index 412d21fc4e2b..1ae15b9b1087 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarVisibilitySettingsCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarVisibilitySettingsCard.tsx
@@ -1,16 +1,12 @@
 import styled from '@emotion/styled';
 
+import { CalendarChannelVisibility } from '@/accounts/types/CalendarChannel';
 import { SettingsAccountsRadioSettingsCard } from '@/settings/accounts/components/SettingsAccountsRadioSettingsCard';
 import { SettingsAccountsVisibilitySettingCardMedia } from '@/settings/accounts/components/SettingsAccountsVisibilitySettingCardMedia';
 
-export enum EventSettingsVisibilityValue {
-  Everything = 'share_everything',
-  Metadata = 'metadata',
-}
-
 type SettingsAccountsEventVisibilitySettingsCardProps = {
-  onChange: (nextValue: EventSettingsVisibilityValue) => void;
-  value?: EventSettingsVisibilityValue;
+  onChange: (nextValue: CalendarChannelVisibility) => void;
+  value?: CalendarChannelVisibility;
 };
 
 const StyledCardMedia = styled(SettingsAccountsVisibilitySettingCardMedia)`
@@ -21,20 +17,20 @@ const eventSettingsVisibilityOptions = [
   {
     title: 'Everything',
     description: 'The whole event details will be shared with your team.',
-    value: EventSettingsVisibilityValue.Everything,
+    value: CalendarChannelVisibility.Everything,
     cardMedia: <StyledCardMedia subject="active" body="active" />,
   },
   {
     title: 'Metadata',
     description: 'Only date & participants will be shared with your team.',
-    value: EventSettingsVisibilityValue.Metadata,
+    value: CalendarChannelVisibility.Metadata,
     cardMedia: <StyledCardMedia subject="active" body="inactive" />,
   },
 ];
 
 export const SettingsAccountsEventVisibilitySettingsCard = ({
   onChange,
-  value = EventSettingsVisibilityValue.Everything,
+  value = CalendarChannelVisibility.Everything,
 }: SettingsAccountsEventVisibilitySettingsCardProps) => (
   <SettingsAccountsRadioSettingsCard
     options={eventSettingsVisibilityOptions}
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsColorSettingCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsColorSettingCard.tsx
deleted file mode 100644
index 0e6e3f2c486c..000000000000
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsColorSettingCard.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import styled from '@emotion/styled';
-
-import { ColorPickerButton } from '@/ui/input/button/components/ColorPickerButton';
-import { Card } from '@/ui/layout/card/components/Card';
-import { CardContent } from '@/ui/layout/card/components/CardContent';
-import {
-  MAIN_COLOR_NAMES,
-  ThemeColor,
-} from '@/ui/theme/constants/MainColorNames';
-
-type SettingsAccountsColorSettingCardProps = {
-  onChange: (nextValue: ThemeColor) => void;
-  value: ThemeColor;
-};
-
-const StyledCardContent = styled(CardContent)`
-  display: flex;
-  padding: ${({ theme }) => theme.spacing(2, 4)};
-  justify-content: space-between;
-`;
-
-export const SettingsAccountsColorSettingCard = ({
-  onChange,
-  value,
-}: SettingsAccountsColorSettingCardProps) => (
-  <Card>
-    <StyledCardContent>
-      {MAIN_COLOR_NAMES.map((colorName) => (
-        <ColorPickerButton
-          colorName={colorName}
-          isSelected={value === colorName}
-          onClick={() => onChange(colorName)}
-        />
-      ))}
-    </StyledCardContent>
-  </Card>
-);
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx
new file mode 100644
index 000000000000..1f215f81f723
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx
@@ -0,0 +1,54 @@
+import { useNavigate } from 'react-router-dom';
+import styled from '@emotion/styled';
+
+import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
+import { SettingsAccountsListEmptyStateCard } from '@/settings/accounts/components/SettingsAccountsListEmptyStateCard';
+import { SettingsAccountsRowDropdownMenu } from '@/settings/accounts/components/SettingsAccountsRowDropdownMenu';
+import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
+import { SettingsPath } from '@/types/SettingsPath';
+import { IconGoogle } from '@/ui/display/icon/components/IconGoogle';
+import { Status } from '@/ui/display/status/components/Status';
+
+import { SettingsListCard } from '../../components/SettingsListCard';
+
+const StyledRowRightContainer = styled.div`
+  align-items: center;
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+`;
+
+export const SettingsAccountsConnectedAccountsListCard = ({
+  accounts,
+  loading,
+}: {
+  accounts: ConnectedAccount[];
+  loading?: boolean;
+}) => {
+  const navigate = useNavigate();
+
+  if (!accounts.length) {
+    return <SettingsAccountsListEmptyStateCard />;
+  }
+
+  return (
+    <SettingsListCard
+      items={accounts}
+      getItemLabel={(account) => account.handle}
+      isLoading={loading}
+      RowIcon={IconGoogle}
+      RowRightComponent={({ item: account }) => (
+        <StyledRowRightContainer>
+          {account.authFailedAt && (
+            <Status color="red" text="Sync failed" weight="medium" />
+          )}
+          <SettingsAccountsRowDropdownMenu account={account} />
+        </StyledRowRightContainer>
+      )}
+      hasFooter
+      footerButtonLabel="Add account"
+      onFooterButtonClick={() =>
+        navigate(getSettingsPagePath(SettingsPath.NewAccount))
+      }
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsSection.tsx
deleted file mode 100644
index 10ca86b3c3fc..000000000000
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsSection.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
-import { SettingsAccountsRowDropdownMenu } from '@/settings/accounts/components/SettingsAccountsRowDropdownMenu';
-import { H2Title } from '@/ui/display/typography/components/H2Title';
-import { Section } from '@/ui/layout/section/components/Section';
-
-import { SettingsAccountsListCard } from './SettingsAccountsListCard';
-
-export const SettingsAccountsConnectedAccountsSection = ({
-  accounts,
-  loading,
-}: {
-  accounts: ConnectedAccount[];
-  loading?: boolean;
-}) => (
-  <Section>
-    <H2Title
-      title="Connected accounts"
-      description="Manage your internet accounts."
-    />
-    <SettingsAccountsListCard
-      accounts={accounts}
-      isLoading={loading}
-      RowRightComponent={SettingsAccountsRowDropdownMenu}
-      hasFooter
-    />
-  </Section>
-);
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEmailsAccountsListCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEmailsAccountsListCard.tsx
deleted file mode 100644
index 2fc6154f1e42..000000000000
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEmailsAccountsListCard.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { useNavigate } from 'react-router-dom';
-import styled from '@emotion/styled';
-import { useRecoilValue } from 'recoil';
-import { LightIconButton } from 'tsup.ui.index';
-
-import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
-import { MessageChannel } from '@/accounts/types/MessageChannel';
-import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { SettingsAccountsListCard } from '@/settings/accounts/components/SettingsAccountsListCard';
-import { SettingsAccountsSynchronizationStatus } from '@/settings/accounts/components/SettingsAccountsSynchronizationStatus';
-import { IconChevronRight } from '@/ui/display/icon';
-import { IconGmail } from '@/ui/display/icon/components/IconGmail';
-
-const StyledRowRightContainer = styled.div`
-  align-items: center;
-  display: flex;
-  gap: ${({ theme }) => theme.spacing(1)};
-`;
-
-export const SettingsAccountsEmailsAccountsListCard = () => {
-  const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
-  const navigate = useNavigate();
-
-  const { records: accounts, loading: accountsLoading } =
-    useFindManyRecords<ConnectedAccount>({
-      objectNameSingular: CoreObjectNameSingular.ConnectedAccount,
-      filter: {
-        accountOwnerId: {
-          eq: currentWorkspaceMember?.id,
-        },
-      },
-    });
-
-  const { records: messageChannels, loading: messageChannelsLoading } =
-    useFindManyRecords<MessageChannel>({
-      objectNameSingular: CoreObjectNameSingular.MessageChannel,
-      filter: {
-        connectedAccountId: {
-          in: accounts.map((account) => account.id),
-        },
-      },
-    });
-
-  const messageChannelsWithSyncedEmails = messageChannels.map(
-    (messageChannel) => ({
-      ...messageChannel,
-      isSynced: true,
-    }),
-  );
-
-  return (
-    <SettingsAccountsListCard
-      accounts={messageChannelsWithSyncedEmails}
-      isLoading={accountsLoading || messageChannelsLoading}
-      onRowClick={(messageChannel) =>
-        navigate(`/settings/accounts/emails/${messageChannel.id}`)
-      }
-      RowIcon={IconGmail}
-      RowRightComponent={({ account: messageChannel }) => (
-        <StyledRowRightContainer>
-          <SettingsAccountsSynchronizationStatus
-            synced={messageChannel.isSynced}
-          />
-          <LightIconButton Icon={IconChevronRight} accent="tertiary" />
-        </StyledRowRightContainer>
-      )}
-    />
-  );
-};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEmailsBlocklistTableRow.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEmailsBlocklistTableRow.tsx
index 763c78304f4c..303d5261c8c0 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEmailsBlocklistTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEmailsBlocklistTableRow.tsx
@@ -1,5 +1,6 @@
+import { IconX } from 'twenty-ui';
+
 import { BlocklistItem } from '@/accounts/types/BlocklistItem';
-import { IconX } from '@/ui/display/icon';
 import { IconButton } from '@/ui/input/button/components/IconButton';
 import { TableCell } from '@/ui/layout/table/components/TableCell';
 import { TableRow } from '@/ui/layout/table/components/TableRow';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListCard.tsx
deleted file mode 100644
index 53d84310ddb0..000000000000
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListCard.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import { ComponentType } from 'react';
-import { useNavigate } from 'react-router-dom';
-import { useTheme } from '@emotion/react';
-import styled from '@emotion/styled';
-
-import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
-import { SettingsAccountsListEmptyStateCard } from '@/settings/accounts/components/SettingsAccountsListEmptyStateCard';
-import { SettingsAccountsListSkeletonCard } from '@/settings/accounts/components/SettingsAccountsListSkeletonCard';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
-import { SettingsPath } from '@/types/SettingsPath';
-import { IconAt, IconPlus } from '@/ui/display/icon';
-import { IconGoogle } from '@/ui/display/icon/components/IconGoogle';
-import { IconComponent } from '@/ui/display/icon/types/IconComponent';
-import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
-import { Card } from '@/ui/layout/card/components/Card';
-import { CardFooter } from '@/ui/layout/card/components/CardFooter';
-
-import { SettingsAccountRow } from './SettingsAccountsRow';
-
-const StyledFooter = styled(CardFooter)`
-  align-items: center;
-  color: ${({ theme }) => theme.font.color.tertiary};
-  display: flex;
-  gap: ${({ theme }) => theme.spacing(2)};
-  height: ${({ theme }) => theme.spacing(6)};
-  padding: ${({ theme }) => theme.spacing(2)};
-  padding-left: ${({ theme }) => theme.spacing(4)};
-`;
-
-const StyledIconButton = styled(LightIconButton)`
-  margin-left: auto;
-`;
-
-type SettingsAccountsListCardProps<
-  Account extends Pick<ConnectedAccount, 'handle' | 'id'>,
-> = {
-  accounts: Account[];
-  hasFooter?: boolean;
-  isLoading?: boolean;
-  onRowClick?: (account: Account) => void;
-  RowIcon?: IconComponent;
-  RowRightComponent: ComponentType<{ account: Account }>;
-};
-
-export const SettingsAccountsListCard = <
-  Account extends Pick<ConnectedAccount, 'handle' | 'id'> = ConnectedAccount,
->({
-  accounts,
-  hasFooter,
-  isLoading,
-  onRowClick,
-  RowIcon = IconGoogle,
-  RowRightComponent,
-}: SettingsAccountsListCardProps<Account>) => {
-  const theme = useTheme();
-  const navigate = useNavigate();
-
-  if (isLoading) return <SettingsAccountsListSkeletonCard />;
-
-  if (!accounts.length) return <SettingsAccountsListEmptyStateCard />;
-
-  return (
-    <Card>
-      {accounts.map((account, index) => (
-        <SettingsAccountRow
-          key={account.id}
-          LeftIcon={RowIcon}
-          account={account}
-          rightComponent={<RowRightComponent account={account} />}
-          divider={index < accounts.length - 1}
-          onClick={() => onRowClick?.(account)}
-        />
-      ))}
-      {hasFooter && (
-        <StyledFooter>
-          <IconAt size={theme.icon.size.sm} />
-          Add account
-          <StyledIconButton
-            Icon={IconPlus}
-            accent="tertiary"
-            onClick={() =>
-              navigate(getSettingsPagePath(SettingsPath.NewAccount))
-            }
-          />
-        </StyledFooter>
-      )}
-    </Card>
-  );
-};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx
index c8d807681439..ffdc1deaf4e1 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx
@@ -1,13 +1,11 @@
-import { useCallback } from 'react';
 import styled from '@emotion/styled';
 
+import { useTriggerGoogleApisOAuth } from '@/settings/accounts/hooks/useTriggerGoogleApisOAuth';
 import { IconGoogle } from '@/ui/display/icon/components/IconGoogle';
 import { Button } from '@/ui/input/button/components/Button';
 import { Card } from '@/ui/layout/card/components/Card';
 import { CardContent } from '@/ui/layout/card/components/CardContent';
 import { CardHeader } from '@/ui/layout/card/components/CardHeader';
-import { REACT_APP_SERVER_AUTH_URL } from '~/config';
-import { useGenerateTransientTokenMutation } from '~/generated/graphql';
 
 const StyledHeader = styled(CardHeader)`
   align-items: center;
@@ -27,18 +25,7 @@ type SettingsAccountsListEmptyStateCardProps = {
 export const SettingsAccountsListEmptyStateCard = ({
   label,
 }: SettingsAccountsListEmptyStateCardProps) => {
-  const [generateTransientToken] = useGenerateTransientTokenMutation();
-
-  const handleGmailLogin = useCallback(async () => {
-    const authServerUrl = REACT_APP_SERVER_AUTH_URL;
-
-    const transientToken = await generateTransientToken();
-
-    const token =
-      transientToken.data?.generateTransientToken.transientToken.token;
-
-    window.location.href = `${authServerUrl}/google-gmail?transientToken=${token}`;
-  }, [generateTransientToken]);
+  const { triggerGoogleApisOAuth } = useTriggerGoogleApisOAuth();
 
   return (
     <Card>
@@ -48,7 +35,7 @@ export const SettingsAccountsListEmptyStateCard = ({
           Icon={IconGoogle}
           title="Connect with Google"
           variant="secondary"
-          onClick={handleGmailLogin}
+          onClick={triggerGoogleApisOAuth}
         />
       </StyledBody>
     </Card>
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListSkeletonCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListSkeletonCard.tsx
deleted file mode 100644
index 2044d629a416..000000000000
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListSkeletonCard.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import styled from '@emotion/styled';
-
-import { Card } from '@/ui/layout/card/components/Card';
-
-const StyledCard = styled(Card)`
-  background-color: ${({ theme }) => theme.background.secondary};
-  height: 40px;
-`;
-
-export { StyledCard as SettingsAccountsListSkeletonCard };
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelsListCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelsListCard.tsx
new file mode 100644
index 000000000000..3500d3035f48
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelsListCard.tsx
@@ -0,0 +1,88 @@
+import { useNavigate } from 'react-router-dom';
+import styled from '@emotion/styled';
+import { useRecoilValue } from 'recoil';
+import { IconChevronRight } from 'twenty-ui';
+
+import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
+import { MessageChannel } from '@/accounts/types/MessageChannel';
+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+import { SettingsAccountsListEmptyStateCard } from '@/settings/accounts/components/SettingsAccountsListEmptyStateCard';
+import {
+  SettingsAccountsSynchronizationStatus,
+  SettingsAccountsSynchronizationStatusProps,
+} from '@/settings/accounts/components/SettingsAccountsSynchronizationStatus';
+import { SettingsListCard } from '@/settings/components/SettingsListCard';
+import { IconGmail } from '@/ui/display/icon/components/IconGmail';
+import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
+
+const StyledRowRightContainer = styled.div`
+  align-items: center;
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+`;
+
+export const SettingsAccountsMessageChannelsListCard = () => {
+  const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
+  const navigate = useNavigate();
+
+  const { records: accounts, loading: accountsLoading } =
+    useFindManyRecords<ConnectedAccount>({
+      objectNameSingular: CoreObjectNameSingular.ConnectedAccount,
+      filter: {
+        accountOwnerId: {
+          eq: currentWorkspaceMember?.id,
+        },
+      },
+    });
+
+  const { records: messageChannels, loading: messageChannelsLoading } =
+    useFindManyRecords<
+      MessageChannel & {
+        connectedAccount: ConnectedAccount;
+      }
+    >({
+      objectNameSingular: CoreObjectNameSingular.MessageChannel,
+      filter: {
+        connectedAccountId: {
+          in: accounts.map((account) => account.id),
+        },
+      },
+    });
+
+  const messageChannelsWithSyncedEmails: (MessageChannel & {
+    connectedAccount: ConnectedAccount;
+  } & SettingsAccountsSynchronizationStatusProps)[] = messageChannels.map(
+    (messageChannel) => ({
+      ...messageChannel,
+      syncStatus: messageChannel.connectedAccount?.authFailedAt
+        ? 'failed'
+        : 'synced',
+    }),
+  );
+
+  if (!messageChannelsWithSyncedEmails.length) {
+    return <SettingsAccountsListEmptyStateCard />;
+  }
+
+  return (
+    <SettingsListCard
+      items={messageChannelsWithSyncedEmails}
+      getItemLabel={(messageChannel) => messageChannel.handle}
+      isLoading={accountsLoading || messageChannelsLoading}
+      onRowClick={(messageChannel) =>
+        navigate(`/settings/accounts/emails/${messageChannel.id}`)
+      }
+      RowIcon={IconGmail}
+      RowRightComponent={({ item: messageChannel }) => (
+        <StyledRowRightContainer>
+          <SettingsAccountsSynchronizationStatus
+            syncStatus={messageChannel.syncStatus}
+          />
+          <LightIconButton Icon={IconChevronRight} accent="tertiary" />
+        </StyledRowRightContainer>
+      )}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRow.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRow.tsx
deleted file mode 100644
index 2c2660ddd859..000000000000
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRow.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { ReactNode } from 'react';
-import { useTheme } from '@emotion/react';
-import styled from '@emotion/styled';
-
-import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
-import { IconComponent } from '@/ui/display/icon/types/IconComponent';
-import { CardContent } from '@/ui/layout/card/components/CardContent';
-
-const StyledRow = styled(CardContent)`
-  align-items: center;
-  cursor: ${({ onClick }) => (onClick ? 'pointer' : 'default')};
-  display: flex;
-  font-size: ${({ theme }) => theme.font.size.sm};
-  font-weight: ${({ theme }) => theme.font.weight.medium};
-  gap: ${({ theme }) => theme.spacing(2)};
-  padding: ${({ theme }) => theme.spacing(2)};
-  padding-left: ${({ theme }) => theme.spacing(4)};
-`;
-
-const StyledAccountHandle = styled.span`
-  flex: 1 0 auto;
-`;
-
-type SettingsAccountRowProps = {
-  account: Pick<ConnectedAccount, 'handle'>;
-  divider?: boolean;
-  LeftIcon: IconComponent;
-  onClick?: () => void;
-  rightComponent: ReactNode;
-};
-
-export const SettingsAccountRow = ({
-  account,
-  divider,
-  LeftIcon,
-  onClick,
-  rightComponent,
-}: SettingsAccountRowProps) => {
-  const theme = useTheme();
-
-  return (
-    <StyledRow onClick={onClick} divider={divider}>
-      <LeftIcon size={theme.icon.size.md} />
-      <StyledAccountHandle>{account.handle}</StyledAccountHandle>
-      {rightComponent}
-    </StyledRow>
-  );
-};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
index e112ccd94ac8..0e3812778490 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
@@ -1,9 +1,10 @@
 import { useNavigate } from 'react-router-dom';
+import { IconDotsVertical, IconMail, IconRefresh, IconTrash } from 'twenty-ui';
 
 import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
-import { IconDotsVertical, IconMail, IconTrash } from '@/ui/display/icon';
+import { useTriggerGoogleApisOAuth } from '@/settings/accounts/hooks/useTriggerGoogleApisOAuth';
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
@@ -12,7 +13,7 @@ import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
 
 type SettingsAccountsRowDropdownMenuProps = {
-  account: Pick<ConnectedAccount, 'id' | 'messageChannels'>;
+  account: ConnectedAccount;
   className?: string;
 };
 
@@ -29,6 +30,8 @@ export const SettingsAccountsRowDropdownMenu = ({
     objectNameSingular: CoreObjectNameSingular.ConnectedAccount,
   });
 
+  const { triggerGoogleApisOAuth } = useTriggerGoogleApisOAuth();
+
   return (
     <Dropdown
       dropdownId={dropdownId}
@@ -51,6 +54,16 @@ export const SettingsAccountsRowDropdownMenu = ({
                 closeDropdown();
               }}
             />
+            {account.authFailedAt && (
+              <MenuItem
+                LeftIcon={IconRefresh}
+                text="Reconnect"
+                onClick={() => {
+                  triggerGoogleApisOAuth();
+                  closeDropdown();
+                }}
+              />
+            )}
             <MenuItem
               accent="danger"
               LeftIcon={IconTrash}
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx
index 2f09bd5d6fdd..e1ec53f4ddbf 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx
@@ -1,10 +1,10 @@
 import { useNavigate } from 'react-router-dom';
 import styled from '@emotion/styled';
+import { IconCalendarEvent, IconMailCog } from 'twenty-ui';
 
 import { SettingsNavigationCard } from '@/settings/components/SettingsNavigationCard';
 import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
-import { IconCalendarEvent, IconMailCog } from '@/ui/display/icon';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { Section } from '@/ui/layout/section/components/Section';
 import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSynchronizationStatus.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSynchronizationStatus.tsx
index 4744007eeeac..8d07a6ad05f5 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSynchronizationStatus.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSynchronizationStatus.tsx
@@ -1,15 +1,27 @@
 import { Status } from '@/ui/display/status/components/Status';
 
-type SettingsAccountsSynchronizationStatusProps = {
-  synced: boolean;
+export type SettingsAccountsSynchronizationStatusProps = {
+  syncStatus: 'synced' | 'failed' | 'notSynced';
 };
 
 export const SettingsAccountsSynchronizationStatus = ({
-  synced,
+  syncStatus,
 }: SettingsAccountsSynchronizationStatusProps) => (
   <Status
-    color={synced ? 'green' : 'gray'}
-    text={synced ? 'Synced' : 'Not Synced'}
+    color={
+      syncStatus === 'synced'
+        ? 'green'
+        : syncStatus === 'failed'
+          ? 'red'
+          : 'gray'
+    }
+    text={
+      syncStatus === 'synced'
+        ? 'Synced'
+        : syncStatus === 'failed'
+          ? 'Sync failed'
+          : 'Not synced'
+    }
     weight="medium"
   />
 );
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistInput.stories.tsx b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistInput.stories.tsx
index 7a7a85aa39ea..b6bfdb97a296 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistInput.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistInput.stories.tsx
@@ -7,7 +7,7 @@ import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 const updateBlockedEmailListJestFn = fn();
 
 const ClearMocksDecorator: Decorator = (Story, context) => {
-  if (context.parameters.clearMocks) {
+  if (context.parameters.clearMocks === true) {
     updateBlockedEmailListJestFn.mockClear();
   }
   return <Story />;
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTable.stories.tsx b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTable.stories.tsx
index 1d3f718d365c..076d9e52938d 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTable.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTable.stories.tsx
@@ -9,7 +9,7 @@ import { formatToHumanReadableDate } from '~/utils';
 const handleBlockedEmailRemoveJestFn = fn();
 
 const ClearMocksDecorator: Decorator = (Story, context) => {
-  if (context.parameters.clearMocks) {
+  if (context.parameters.clearMocks === true) {
     handleBlockedEmailRemoveJestFn.mockClear();
   }
   return <Story />;
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTableRow.stories.tsx b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTableRow.stories.tsx
index 5b8d42b18f84..6742eb91227c 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTableRow.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistTableRow.stories.tsx
@@ -9,7 +9,7 @@ import { formatToHumanReadableDate } from '~/utils';
 const onRemoveJestFn = fn();
 
 const ClearMocksDecorator: Decorator = (Story, context) => {
-  if (context.parameters.clearMocks) {
+  if (context.parameters.clearMocks === true) {
     onRemoveJestFn.mockClear();
   }
   return <Story />;
diff --git a/packages/twenty-front/src/modules/settings/accounts/constants/DateFormat.ts b/packages/twenty-front/src/modules/settings/accounts/constants/DateFormat.ts
new file mode 100644
index 000000000000..985814c679e0
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/constants/DateFormat.ts
@@ -0,0 +1,4 @@
+export enum DateFormat {
+  US = 'MMM	d, yyyy',
+  UK = 'd MMM yyyy',
+}
diff --git a/packages/twenty-front/src/modules/settings/accounts/constants/TimeFormat.ts b/packages/twenty-front/src/modules/settings/accounts/constants/TimeFormat.ts
new file mode 100644
index 000000000000..e168d1fda1cd
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/constants/TimeFormat.ts
@@ -0,0 +1,4 @@
+export enum TimeFormat {
+  '24h' = 'HH:mm',
+  '12h' = 'h:mm aa',
+}
diff --git a/packages/twenty-front/src/modules/settings/accounts/hooks/useTriggerGoogleApisOAuth.ts b/packages/twenty-front/src/modules/settings/accounts/hooks/useTriggerGoogleApisOAuth.ts
new file mode 100644
index 000000000000..07b3cbc5b6f1
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/hooks/useTriggerGoogleApisOAuth.ts
@@ -0,0 +1,21 @@
+import { useCallback } from 'react';
+
+import { REACT_APP_SERVER_BASE_URL } from '~/config';
+import { useGenerateTransientTokenMutation } from '~/generated/graphql';
+
+export const useTriggerGoogleApisOAuth = () => {
+  const [generateTransientToken] = useGenerateTransientTokenMutation();
+
+  const triggerGoogleApisOAuth = useCallback(async () => {
+    const authServerUrl = REACT_APP_SERVER_BASE_URL;
+
+    const transientToken = await generateTransientToken();
+
+    const token =
+      transientToken.data?.generateTransientToken.transientToken.token;
+
+    window.location.href = `${authServerUrl}/auth/google-apis?transientToken=${token}`;
+  }, [generateTransientToken]);
+
+  return { triggerGoogleApisOAuth };
+};
diff --git a/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveButton.tsx b/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveButton.tsx
index 322187e25225..01913ba96ad0 100644
--- a/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveButton.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveButton.tsx
@@ -1,4 +1,5 @@
-import { IconDeviceFloppy } from '@/ui/display/icon';
+import { IconDeviceFloppy } from 'twenty-ui';
+
 import { Button } from '@/ui/input/button/components/Button';
 
 type SaveButtonProps = {
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsListCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsListCard.tsx
new file mode 100644
index 000000000000..b1b35854a386
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/components/SettingsListCard.tsx
@@ -0,0 +1,92 @@
+import { ComponentType } from 'react';
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import { IconPlus } from 'twenty-ui';
+
+import { SettingsListSkeletonCard } from '@/settings/components/SettingsListSkeletonCard';
+import { IconComponent } from '@/ui/display/icon/types/IconComponent';
+import { Card } from '@/ui/layout/card/components/Card';
+import { CardFooter } from '@/ui/layout/card/components/CardFooter';
+
+import { SettingsListItemCardContent } from './SettingsListItemCardContent';
+
+const StyledFooter = styled(CardFooter)`
+  align-items: center;
+  display: flex;
+  padding: ${({ theme }) => theme.spacing(1)};
+`;
+
+const StyledButton = styled.button`
+  align-items: center;
+  background: ${({ theme }) => theme.background.primary};
+  border: none;
+  border-radius: ${({ theme }) => theme.border.radius.sm};
+  color: ${({ theme }) => theme.font.color.secondary};
+  gap: ${({ theme }) => theme.spacing(2)};
+  padding: 0 ${({ theme }) => theme.spacing(1)};
+  padding-left: ${({ theme }) => theme.spacing(2)};
+  cursor: pointer;
+  display: flex;
+  flex: 1 0 0;
+  height: ${({ theme }) => theme.spacing(8)};
+  width: 100%;
+
+  &:hover {
+    background: ${({ theme }) => theme.background.transparent.light};
+  }
+`;
+
+type SettingsListCardProps<ListItem extends { id: string }> = {
+  items: ListItem[];
+  getItemLabel: (item: ListItem) => string;
+  hasFooter?: boolean;
+  isLoading?: boolean;
+  onRowClick?: (item: ListItem) => void;
+  RowIcon?: IconComponent;
+  RowRightComponent: ComponentType<{ item: ListItem }>;
+  footerButtonLabel?: string;
+  onFooterButtonClick?: () => void;
+};
+
+export const SettingsListCard = <
+  ListItem extends { id: string } = {
+    id: string;
+  },
+>({
+  items,
+  getItemLabel,
+  hasFooter,
+  isLoading,
+  onRowClick,
+  RowIcon,
+  RowRightComponent,
+  onFooterButtonClick,
+  footerButtonLabel,
+}: SettingsListCardProps<ListItem>) => {
+  const theme = useTheme();
+
+  if (isLoading === true) return <SettingsListSkeletonCard />;
+
+  return (
+    <Card>
+      {items.map((item, index) => (
+        <SettingsListItemCardContent
+          key={item.id}
+          LeftIcon={RowIcon}
+          label={getItemLabel(item)}
+          rightComponent={<RowRightComponent item={item} />}
+          divider={index < items.length - 1}
+          onClick={() => onRowClick?.(item)}
+        />
+      ))}
+      {hasFooter && (
+        <StyledFooter divider={!!items.length}>
+          <StyledButton onClick={onFooterButtonClick}>
+            <IconPlus size={theme.icon.size.md} />
+            {footerButtonLabel}
+          </StyledButton>
+        </StyledFooter>
+      )}
+    </Card>
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsListItemCardContent.tsx b/packages/twenty-front/src/modules/settings/components/SettingsListItemCardContent.tsx
new file mode 100644
index 000000000000..2daae18f5645
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/components/SettingsListItemCardContent.tsx
@@ -0,0 +1,48 @@
+import { ReactNode } from 'react';
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+
+import { IconComponent } from '@/ui/display/icon/types/IconComponent';
+import { CardContent } from '@/ui/layout/card/components/CardContent';
+
+const StyledRow = styled(CardContent)`
+  align-items: center;
+  cursor: ${({ onClick }) => (onClick ? 'pointer' : 'default')};
+  display: flex;
+  font-size: ${({ theme }) => theme.font.size.sm};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  gap: ${({ theme }) => theme.spacing(2)};
+  padding: ${({ theme }) => theme.spacing(2)};
+  padding-left: ${({ theme }) => theme.spacing(3)};
+  min-height: ${({ theme }) => theme.spacing(6)};
+`;
+
+const StyledLabel = styled.span`
+  flex: 1 0 auto;
+`;
+
+type SettingsListItemCardContentProps = {
+  label: string;
+  divider?: boolean;
+  LeftIcon?: IconComponent;
+  onClick?: () => void;
+  rightComponent: ReactNode;
+};
+
+export const SettingsListItemCardContent = ({
+  label,
+  divider,
+  LeftIcon,
+  onClick,
+  rightComponent,
+}: SettingsListItemCardContentProps) => {
+  const theme = useTheme();
+
+  return (
+    <StyledRow onClick={onClick} divider={divider}>
+      {!!LeftIcon && <LeftIcon size={theme.icon.size.md} />}
+      <StyledLabel>{label}</StyledLabel>
+      {rightComponent}
+    </StyledRow>
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsListSkeletonCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsListSkeletonCard.tsx
new file mode 100644
index 000000000000..1a4732fed453
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/components/SettingsListSkeletonCard.tsx
@@ -0,0 +1,10 @@
+import styled from '@emotion/styled';
+
+import { Card } from '@/ui/layout/card/components/Card';
+
+const StyledCard = styled(Card)`
+  background-color: ${({ theme }) => theme.background.secondary};
+  height: 40px;
+`;
+
+export { StyledCard as SettingsListSkeletonCard };
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsNavigationCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsNavigationCard.tsx
index f5ada9b65737..9ea5854fc642 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsNavigationCard.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsNavigationCard.tsx
@@ -1,10 +1,9 @@
 import { ReactNode } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconChevronRight, Pill } from 'twenty-ui';
 
-import { IconChevronRight } from '@/ui/display/icon';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
-import { Pill } from '@/ui/display/pill/components/Pill';
 import { Card } from '@/ui/layout/card/components/Card';
 import { CardContent } from '@/ui/layout/card/components/CardContent';
 
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx
index 90888ac86682..68629d078a26 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx
@@ -1,23 +1,26 @@
 import { useCallback } from 'react';
 import { useNavigate } from 'react-router-dom';
-
-import { useAuth } from '@/auth/hooks/useAuth';
-import { SettingsNavigationDrawerItem } from '@/settings/components/SettingsNavigationDrawerItem';
-import { AppPath } from '@/types/AppPath';
-import { SettingsPath } from '@/types/SettingsPath';
+import { useRecoilValue } from 'recoil';
 import {
   IconApps,
   IconAt,
   IconCalendarEvent,
   IconCode,
   IconColorSwatch,
+  IconCurrencyDollar,
   IconDoorEnter,
   IconHierarchy2,
   IconMail,
   IconSettings,
   IconUserCircle,
   IconUsers,
-} from '@/ui/display/icon';
+} from 'twenty-ui';
+
+import { useAuth } from '@/auth/hooks/useAuth';
+import { billingState } from '@/client-config/states/billingState.ts';
+import { SettingsNavigationDrawerItem } from '@/settings/components/SettingsNavigationDrawerItem';
+import { AppPath } from '@/types/AppPath';
+import { SettingsPath } from '@/types/SettingsPath';
 import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
 import { NavigationDrawerItemGroup } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItemGroup';
 import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection';
@@ -30,10 +33,11 @@ export const SettingsNavigationDrawerItems = () => {
 
   const handleLogout = useCallback(() => {
     signOut();
-    navigate(AppPath.SignIn);
+    navigate(AppPath.SignInUp);
   }, [signOut, navigate]);
 
   const isCalendarEnabled = useIsFeatureEnabled('IS_CALENDAR_ENABLED');
+  const billing = useRecoilValue(billingState);
 
   return (
     <>
@@ -86,6 +90,13 @@ export const SettingsNavigationDrawerItems = () => {
           path={SettingsPath.WorkspaceMembersPage}
           Icon={IconUsers}
         />
+        {billing?.isBillingEnabled && (
+          <SettingsNavigationDrawerItem
+            label="Billing"
+            path={SettingsPath.Billing}
+            Icon={IconCurrencyDollar}
+          />
+        )}
         <SettingsNavigationDrawerItem
           label="Data model"
           path={SettingsPath.Objects}
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsSummaryCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsSummaryCard.tsx
new file mode 100644
index 000000000000..6c7eeeed8da2
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/components/SettingsSummaryCard.tsx
@@ -0,0 +1,38 @@
+import { ReactNode } from 'react';
+import styled from '@emotion/styled';
+
+import { Card } from '@/ui/layout/card/components/Card';
+import { CardContent } from '@/ui/layout/card/components/CardContent';
+
+type SettingsSummaryCardProps = {
+  title: ReactNode;
+  rightComponent: ReactNode;
+};
+
+const StyledCardContent = styled(CardContent)`
+  align-items: center;
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(2)};
+  padding: ${({ theme }) => theme.spacing(2)};
+  min-height: ${({ theme }) => theme.spacing(6)};
+`;
+
+const StyledTitle = styled.div`
+  color: ${({ theme }) => theme.font.color.primary};
+  display: flex;
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  gap: ${({ theme }) => theme.spacing(2)};
+  margin-right: auto;
+`;
+
+export const SettingsSummaryCard = ({
+  title,
+  rightComponent,
+}: SettingsSummaryCardProps) => (
+  <Card>
+    <StyledCardContent>
+      <StyledTitle>{title}</StyledTitle>
+      {rightComponent}
+    </StyledCardContent>
+  </Card>
+);
diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelCardTitle.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelCardTitle.tsx
new file mode 100644
index 000000000000..9fbc11715a5f
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelCardTitle.tsx
@@ -0,0 +1,11 @@
+import styled from '@emotion/styled';
+
+const StyledTitle = styled.h3`
+  color: ${({ theme }) => theme.font.color.extraLight};
+  font-size: ${({ theme }) => theme.font.size.sm};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  margin: 0;
+  margin-bottom: ${({ theme }) => theme.spacing(4)};
+`;
+
+export { StyledTitle as SettingsDataModelCardTitle };
diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelDefaultValue.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelDefaultValue.tsx
new file mode 100644
index 000000000000..c088ac1e7e95
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelDefaultValue.tsx
@@ -0,0 +1,60 @@
+import styled from '@emotion/styled';
+import { IconCheck, IconX } from 'twenty-ui';
+
+import { Select } from '@/ui/input/components/Select';
+import { CardContent } from '@/ui/layout/card/components/CardContent';
+
+type SettingsDataModelDefaultValueFormProps = {
+  className?: string;
+  disabled?: boolean;
+  onChange?: (defaultValue: SettingsDataModelDefaultValue) => void;
+  value?: SettingsDataModelDefaultValue;
+};
+
+export type SettingsDataModelDefaultValue = any;
+
+const StyledContainer = styled(CardContent)`
+  padding-bottom: ${({ theme }) => theme.spacing(3.5)};
+`;
+
+const StyledLabel = styled.span`
+  color: ${({ theme }) => theme.font.color.light};
+  display: block;
+  font-size: ${({ theme }) => theme.font.size.xs};
+  font-weight: ${({ theme }) => theme.font.weight.semiBold};
+  margin-bottom: 6px;
+  margin-top: ${({ theme }) => theme.spacing(1)};
+`;
+
+export const SettingsDataModelDefaultValueForm = ({
+  className,
+  disabled,
+  onChange,
+  value,
+}: SettingsDataModelDefaultValueFormProps) => {
+  return (
+    <StyledContainer>
+      <StyledLabel>Default Value</StyledLabel>
+      <Select
+        className={className}
+        fullWidth
+        disabled={disabled}
+        dropdownId="object-field-default-value-select"
+        value={value}
+        onChange={(value) => onChange?.(value)}
+        options={[
+          {
+            value: true,
+            label: 'True',
+            Icon: IconCheck,
+          },
+          {
+            value: false,
+            label: 'False',
+            Icon: IconX,
+          },
+        ]}
+      />
+    </StyledContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldCurrencyForm.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldCurrencyForm.tsx
index f0afa115e9eb..725b9a51ed3d 100644
--- a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldCurrencyForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldCurrencyForm.tsx
@@ -23,7 +23,7 @@ export const SettingsObjectFieldCurrencyForm = ({
     <Select
       fullWidth
       disabled={disabled}
-      label="Unit"
+      label="Default Unit"
       dropdownId="currency-unit-select"
       value={values.currencyCode}
       options={Object.entries(SETTINGS_FIELD_CURRENCY_CODES).map(
diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldRelationForm.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldRelationForm.tsx
index 368a74abfbd4..76ecf2a83cb3 100644
--- a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldRelationForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldRelationForm.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled';
 
-import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { isObjectMetadataAvailableForRelation } from '@/object-metadata/utils/isObjectMetadataAvailableForRelation';
 import { validateMetadataLabel } from '@/object-metadata/utils/validateMetadataLabel';
 import { useIcons } from '@/ui/display/icon/hooks/useIcons';
@@ -42,7 +42,6 @@ const StyledInputsLabel = styled.span`
   font-size: ${({ theme }) => theme.font.size.xs};
   font-weight: ${({ theme }) => theme.font.weight.semiBold};
   margin-bottom: ${({ theme }) => theme.spacing(1)};
-  text-transform: uppercase;
 `;
 
 const StyledInputsContainer = styled.div`
@@ -59,7 +58,7 @@ export const SettingsObjectFieldRelationForm = ({
 }: SettingsObjectFieldRelationFormProps) => {
   const { getIcon } = useIcons();
   const { objectMetadataItems, findObjectMetadataItemById } =
-    useObjectMetadataItemForSettings();
+    useFilteredObjectMetadataItems();
 
   const selectedObjectMetadataItem =
     (values.objectMetadataId
diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldSelectForm.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldSelectForm.tsx
index a1ffbb5da2f7..f60deeeaae4d 100644
--- a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldSelectForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldSelectForm.tsx
@@ -1,8 +1,8 @@
 import styled from '@emotion/styled';
 import { DropResult } from '@hello-pangea/dnd';
+import { IconPlus } from 'twenty-ui';
 import { v4 } from 'uuid';
 
-import { IconPlus } from '@/ui/display/icon';
 import { LightButton } from '@/ui/input/button/components/LightButton';
 import { CardContent } from '@/ui/layout/card/components/CardContent';
 import { CardFooter } from '@/ui/layout/card/components/CardFooter';
@@ -24,6 +24,7 @@ export type SettingsObjectFieldSelectFormValues =
 type SettingsObjectFieldSelectFormProps = {
   onChange: (values: SettingsObjectFieldSelectFormValues) => void;
   values: SettingsObjectFieldSelectFormValues;
+  isMultiSelect?: boolean;
 };
 
 const StyledContainer = styled(CardContent)`
@@ -37,7 +38,6 @@ const StyledLabel = styled.span`
   font-weight: ${({ theme }) => theme.font.weight.semiBold};
   margin-bottom: 6px;
   margin-top: ${({ theme }) => theme.spacing(1)};
-  text-transform: uppercase;
 `;
 
 const StyledFooter = styled(CardFooter)`
@@ -61,6 +61,7 @@ const getNextColor = (currentColor: ThemeColor) => {
 export const SettingsObjectFieldSelectForm = ({
   onChange,
   values,
+  isMultiSelect = false,
 }: SettingsObjectFieldSelectFormProps) => {
   const handleDragEnd = (result: DropResult) => {
     if (!result.destination) return;
@@ -73,6 +74,38 @@ export const SettingsObjectFieldSelectForm = ({
     onChange(nextOptions);
   };
 
+  const handleDefaultValueChange = (
+    index: number,
+    option: SettingsObjectFieldSelectFormOption,
+    nextOption: SettingsObjectFieldSelectFormOption,
+    forceUniqueDefaultValue: boolean,
+  ) => {
+    const computeUniqueDefaultValue =
+      forceUniqueDefaultValue && option.isDefault !== nextOption.isDefault;
+
+    const nextOptions = computeUniqueDefaultValue
+      ? values.map((value) => ({
+          ...value,
+          isDefault: false,
+        }))
+      : [...values];
+
+    nextOptions.splice(index, 1, nextOption);
+    onChange(nextOptions);
+  };
+
+  const findNewLabel = () => {
+    let optionIndex = values.length + 1;
+    while (optionIndex < 100) {
+      const newLabel = `Option ${optionIndex}`;
+      if (!values.map((value) => value.label).includes(newLabel)) {
+        return newLabel;
+      }
+      optionIndex += 1;
+    }
+    return `Option 100`;
+  };
+
   return (
     <>
       <StyledContainer>
@@ -92,18 +125,12 @@ export const SettingsObjectFieldSelectForm = ({
                       key={option.value}
                       isDefault={option.isDefault}
                       onChange={(nextOption) => {
-                        const hasDefaultOptionChanged =
-                          !option.isDefault && nextOption.isDefault;
-                        const nextOptions = hasDefaultOptionChanged
-                          ? values.map((value) => ({
-                              ...value,
-                              isDefault: false,
-                            }))
-                          : [...values];
-
-                        nextOptions.splice(index, 1, nextOption);
-
-                        onChange(nextOptions);
+                        handleDefaultValueChange(
+                          index,
+                          option,
+                          nextOption,
+                          !isMultiSelect,
+                        );
                       }}
                       onRemove={
                         values.length > 1
@@ -132,7 +159,7 @@ export const SettingsObjectFieldSelectForm = ({
               ...values,
               {
                 color: getNextColor(values[values.length - 1].color),
-                label: `Option ${values.length + 1}`,
+                label: findNewLabel(),
                 value: v4(),
               },
             ])
diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldSelectFormOptionRow.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldSelectFormOptionRow.tsx
index 47069e6bcdd7..4a19f8727b07 100644
--- a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldSelectFormOptionRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldSelectFormOptionRow.tsx
@@ -1,16 +1,16 @@
 import { useMemo } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-import { v4 } from 'uuid';
-
-import { ColorSample } from '@/ui/display/color/components/ColorSample';
 import {
   IconCheck,
   IconDotsVertical,
   IconGripVertical,
   IconTrash,
   IconX,
-} from '@/ui/display/icon';
+} from 'twenty-ui';
+import { v4 } from 'uuid';
+
+import { ColorSample } from '@/ui/display/color/components/ColorSample';
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
@@ -49,7 +49,7 @@ const StyledOptionInput = styled(TextInput)`
   margin-right: ${({ theme }) => theme.spacing(2)};
 
   & input {
-    height: ${({ theme }) => theme.spacing(2)};
+    height: ${({ theme }) => theme.spacing(6)};
   }
 `;
 
diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFormSection.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFormSection.tsx
deleted file mode 100644
index 3b8f0ecb6708..000000000000
--- a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFormSection.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import styled from '@emotion/styled';
-
-import { validateMetadataLabel } from '@/object-metadata/utils/validateMetadataLabel';
-import { H2Title } from '@/ui/display/typography/components/H2Title';
-import { IconPicker } from '@/ui/input/components/IconPicker';
-import { TextArea } from '@/ui/input/components/TextArea';
-import { TextInput } from '@/ui/input/components/TextInput';
-import { Section } from '@/ui/layout/section/components/Section';
-
-type SettingsObjectFormSectionProps = {
-  disabled?: boolean;
-  icon?: string;
-  singularName?: string;
-  pluralName?: string;
-  description?: string;
-  onChange?: (
-    formValues: Partial<{
-      icon: string;
-      labelSingular: string;
-      labelPlural: string;
-      description: string;
-    }>,
-  ) => void;
-};
-
-const StyledInputsContainer = styled.div`
-  display: flex;
-  gap: ${({ theme }) => theme.spacing(2)};
-  margin-bottom: ${({ theme }) => theme.spacing(2)};
-  width: 100%;
-`;
-
-const StyledLabel = styled.span`
-  color: ${({ theme }) => theme.font.color.light};
-  font-size: ${({ theme }) => theme.font.size.xs};
-  font-weight: ${({ theme }) => theme.font.weight.semiBold};
-  margin-bottom: ${({ theme }) => theme.spacing(1)};
-  text-transform: uppercase;
-`;
-
-const StyledInputContainer = styled.div`
-  display: flex;
-  flex-direction: column;
-`;
-
-export const SettingsObjectFormSection = ({
-  disabled,
-  icon = 'IconListNumbers',
-  singularName = '',
-  pluralName = '',
-  description = '',
-  onChange,
-}: SettingsObjectFormSectionProps) => (
-  <Section>
-    <H2Title
-      title="About"
-      description="Name in both singular (e.g., 'Invoice') and plural (e.g., 'Invoices') forms."
-    />
-    <StyledInputsContainer>
-      <StyledInputContainer>
-        <StyledLabel>Icon</StyledLabel>
-        <IconPicker
-          disabled={disabled}
-          selectedIconKey={icon}
-          onChange={(icon) => {
-            onChange?.({ icon: icon.iconKey });
-          }}
-        />
-      </StyledInputContainer>
-      <TextInput
-        label="Singular"
-        placeholder="Listing"
-        value={singularName}
-        onChange={(value) => {
-          if (!value || validateMetadataLabel(value)) {
-            onChange?.({ labelSingular: value });
-          }
-        }}
-        disabled={disabled}
-        fullWidth
-      />
-      <TextInput
-        label="Plural"
-        placeholder="Listings"
-        value={pluralName}
-        onChange={(value) => {
-          if (!value || validateMetadataLabel(value)) {
-            onChange?.({ labelPlural: value });
-          }
-        }}
-        disabled={disabled}
-        fullWidth
-      />
-    </StyledInputsContainer>
-    <TextArea
-      placeholder="Write a description"
-      minRows={4}
-      value={description}
-      onChange={(value) => onChange?.({ description: value })}
-      disabled={disabled}
-    />
-  </Section>
-);
diff --git a/packages/twenty-front/src/modules/settings/data-model/components/__stories__/SettingsObjectFormSection.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/components/__stories__/SettingsObjectFormSection.stories.tsx
deleted file mode 100644
index 3f82ecff6731..000000000000
--- a/packages/twenty-front/src/modules/settings/data-model/components/__stories__/SettingsObjectFormSection.stories.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-
-import { SettingsObjectFormSection } from '../SettingsObjectFormSection';
-
-const meta: Meta<typeof SettingsObjectFormSection> = {
-  title: 'Modules/Settings/DataModel/SettingsObjectFormSection',
-  component: SettingsObjectFormSection,
-  decorators: [ComponentDecorator],
-};
-
-export default meta;
-type Story = StoryObj<typeof SettingsObjectFormSection>;
-
-export const Default: Story = {};
-
-export const WithDefaultValues: Story = {
-  args: {
-    singularName: 'Company',
-    pluralName: 'Companies',
-    description: 'Lorem ipsum',
-  },
-};
diff --git a/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts b/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts
index 8bfa66e03cd6..2dda881ab236 100644
--- a/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts
@@ -1,4 +1,5 @@
-import { IconLayersLinked, IconRelationOneToOne } from '@/ui/display/icon';
+import { IconLayersLinked, IconRelationOneToOne } from 'twenty-ui';
+
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 import { RelationMetadataType } from '~/generated-metadata/graphql';
 
diff --git a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldCurrencyCodes.ts b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldCurrencyCodes.ts
index f8ca7aa71840..89cf79ee46fc 100644
--- a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldCurrencyCodes.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldCurrencyCodes.ts
@@ -1,4 +1,3 @@
-import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
 import {
   IconCurrencyDollar,
   IconCurrencyEuro,
@@ -6,7 +5,9 @@ import {
   IconCurrencyPound,
   IconCurrencyYen,
   IconCurrencyYuan,
-} from '@/ui/display/icon';
+} from 'twenty-ui';
+
+import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 
 export const SETTINGS_FIELD_CURRENCY_CODES: Record<
diff --git a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldMetadataTypes.ts b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldMetadataTypes.ts
deleted file mode 100644
index 6b8f276d0aa6..000000000000
--- a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldMetadataTypes.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
-import { DEFAULT_DATE_VALUE } from '@/settings/data-model/constants/DefaultDateValue';
-import {
-  IconCalendarEvent,
-  IconCheck,
-  IconCoins,
-  IconKey,
-  IconLink,
-  IconMail,
-  IconNumbers,
-  IconPhone,
-  IconRelationManyToMany,
-  IconTag,
-  IconTextSize,
-  IconUser,
-} from '@/ui/display/icon';
-import { IconTwentyStar } from '@/ui/display/icon/components/IconTwentyStar';
-import { IconComponent } from '@/ui/display/icon/types/IconComponent';
-import { FieldMetadataType } from '~/generated-metadata/graphql';
-
-DEFAULT_DATE_VALUE.setFullYear(DEFAULT_DATE_VALUE.getFullYear() + 2);
-
-export const SETTINGS_FIELD_METADATA_TYPES: Partial<
-  Record<
-    FieldMetadataType,
-    { label: string; Icon: IconComponent; defaultValue?: unknown }
-  >
-> = {
-  [FieldMetadataType.Uuid]: {
-    label: 'Unique ID',
-    Icon: IconKey,
-    defaultValue: '00000000-0000-0000-0000-000000000000',
-  },
-  [FieldMetadataType.Text]: {
-    label: 'Text',
-    Icon: IconTextSize,
-    defaultValue:
-      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum magna enim, dapibus non enim in, lacinia faucibus nunc. Sed interdum ante sed felis facilisis, eget ultricies neque molestie. Mauris auctor, justo eu volutpat cursus, libero erat tempus nulla, non sodales lorem lacus a est.',
-  },
-  [FieldMetadataType.Numeric]: {
-    label: 'Numeric',
-    Icon: IconNumbers,
-    defaultValue: 2000,
-  },
-  [FieldMetadataType.Number]: {
-    label: 'Number',
-    Icon: IconNumbers,
-    defaultValue: 2000,
-  },
-  [FieldMetadataType.Link]: {
-    label: 'Link',
-    Icon: IconLink,
-    defaultValue: { url: 'www.twenty.com', label: '' },
-  },
-  [FieldMetadataType.Boolean]: {
-    label: 'True/False',
-    Icon: IconCheck,
-    defaultValue: true,
-  },
-  [FieldMetadataType.DateTime]: {
-    label: 'Date & Time',
-    Icon: IconCalendarEvent,
-    defaultValue: DEFAULT_DATE_VALUE.toISOString(),
-  },
-  [FieldMetadataType.Select]: {
-    label: 'Select',
-    Icon: IconTag,
-  },
-  [FieldMetadataType.MultiSelect]: {
-    label: 'MultiSelect',
-    Icon: IconTag,
-  },
-  [FieldMetadataType.Currency]: {
-    label: 'Currency',
-    Icon: IconCoins,
-    defaultValue: { amountMicros: 2000000000, currencyCode: CurrencyCode.USD },
-  },
-  [FieldMetadataType.Relation]: {
-    label: 'Relation',
-    Icon: IconRelationManyToMany,
-  },
-  [FieldMetadataType.Email]: { label: 'Email', Icon: IconMail },
-  [FieldMetadataType.Phone]: { label: 'Phone', Icon: IconPhone },
-  [FieldMetadataType.Probability]: {
-    label: 'Rating',
-    Icon: IconTwentyStar,
-    defaultValue: '3',
-  },
-  [FieldMetadataType.Rating]: {
-    label: 'Rating',
-    Icon: IconTwentyStar,
-    defaultValue: '3',
-  },
-  [FieldMetadataType.FullName]: {
-    label: 'Full Name',
-    Icon: IconUser,
-    defaultValue: { firstName: 'John', lastName: 'Doe' },
-  },
-};
diff --git a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldTypeConfigs.ts b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldTypeConfigs.ts
new file mode 100644
index 000000000000..1ee3a2755066
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldTypeConfigs.ts
@@ -0,0 +1,132 @@
+import {
+  IconCalendarEvent,
+  IconCheck,
+  IconCoins,
+  IconJson,
+  IconKey,
+  IconLink,
+  IconMail,
+  IconMap,
+  IconNumbers,
+  IconPhone,
+  IconRelationManyToMany,
+  IconTag,
+  IconTags,
+  IconTextSize,
+  IconUser,
+} from 'twenty-ui';
+
+import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
+import { DEFAULT_DATE_VALUE } from '@/settings/data-model/constants/DefaultDateValue';
+import { SettingsSupportedFieldType } from '@/settings/data-model/types/SettingsSupportedFieldType';
+import { IconTwentyStar } from '@/ui/display/icon/components/IconTwentyStar';
+import { IconComponent } from '@/ui/display/icon/types/IconComponent';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+DEFAULT_DATE_VALUE.setFullYear(DEFAULT_DATE_VALUE.getFullYear() + 2);
+
+export type SettingsFieldTypeConfig = {
+  label: string;
+  Icon: IconComponent;
+  defaultValue?: unknown;
+};
+
+export const SETTINGS_FIELD_TYPE_CONFIGS: Record<
+  SettingsSupportedFieldType,
+  SettingsFieldTypeConfig
+> = {
+  [FieldMetadataType.Uuid]: {
+    label: 'Unique ID',
+    Icon: IconKey,
+    defaultValue: '00000000-0000-0000-0000-000000000000',
+  },
+  [FieldMetadataType.Text]: {
+    label: 'Text',
+    Icon: IconTextSize,
+    defaultValue:
+      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum magna enim, dapibus non enim in, lacinia faucibus nunc. Sed interdum ante sed felis facilisis, eget ultricies neque molestie. Mauris auctor, justo eu volutpat cursus, libero erat tempus nulla, non sodales lorem lacus a est.',
+  },
+  [FieldMetadataType.Numeric]: {
+    label: 'Numeric',
+    Icon: IconNumbers,
+    defaultValue: 2000,
+  },
+  [FieldMetadataType.Number]: {
+    label: 'Number',
+    Icon: IconNumbers,
+    defaultValue: 2000,
+  },
+  [FieldMetadataType.Link]: {
+    label: 'Link',
+    Icon: IconLink,
+    defaultValue: { url: 'www.twenty.com', label: '' },
+  },
+  [FieldMetadataType.Boolean]: {
+    label: 'True/False',
+    Icon: IconCheck,
+    defaultValue: true,
+  },
+  [FieldMetadataType.DateTime]: {
+    label: 'Date & Time',
+    Icon: IconCalendarEvent,
+    defaultValue: DEFAULT_DATE_VALUE.toISOString(),
+  },
+  [FieldMetadataType.Date]: {
+    label: 'Date',
+    Icon: IconCalendarEvent,
+    defaultValue: DEFAULT_DATE_VALUE.toISOString(),
+  },
+  [FieldMetadataType.Select]: {
+    label: 'Select',
+    Icon: IconTag,
+  },
+  [FieldMetadataType.MultiSelect]: {
+    label: 'Multi-select',
+    Icon: IconTags,
+  },
+  [FieldMetadataType.Currency]: {
+    label: 'Currency',
+    Icon: IconCoins,
+    defaultValue: { amountMicros: 2000000000, currencyCode: CurrencyCode.USD },
+  },
+  [FieldMetadataType.Relation]: {
+    label: 'Relation',
+    Icon: IconRelationManyToMany,
+  },
+  [FieldMetadataType.Email]: { label: 'Email', Icon: IconMail },
+  [FieldMetadataType.Phone]: { label: 'Phone', Icon: IconPhone },
+  [FieldMetadataType.Probability]: {
+    label: 'Rating',
+    Icon: IconTwentyStar,
+    defaultValue: '3',
+  },
+  [FieldMetadataType.Rating]: {
+    label: 'Rating',
+    Icon: IconTwentyStar,
+    defaultValue: '3',
+  },
+  [FieldMetadataType.FullName]: {
+    label: 'Full Name',
+    Icon: IconUser,
+    defaultValue: { firstName: 'John', lastName: 'Doe' },
+  },
+  [FieldMetadataType.Address]: {
+    label: 'Address',
+    Icon: IconMap,
+    defaultValue: {
+      addressStreet1: '456 Oak Street',
+      addressStreet2: 'Unit 3B',
+      addressCity: 'Springfield',
+      addressState: 'California',
+      addressCountry: 'United States',
+      addressPostcode: '90210',
+      addressLat: 34.0522,
+      addressLng: -118.2437,
+    },
+  },
+  [FieldMetadataType.RawJson]: {
+    label: 'JSON',
+    Icon: IconJson,
+    defaultValue: `{ "key": "value" }`,
+  },
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx
index 72c9ac9cddd7..68c4b44f5a69 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx
@@ -1,7 +1,8 @@
 import styled from '@emotion/styled';
 
-import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { SettingsDataModelDefaultValueForm } from '@/settings/data-model/components/SettingsDataModelDefaultValue';
 import { SettingsDataModelPreviewFormCard } from '@/settings/data-model/components/SettingsDataModelPreviewFormCard';
 import {
   SettingsObjectFieldCurrencyForm,
@@ -26,6 +27,8 @@ export type SettingsDataModelFieldSettingsFormValues = {
   currency: SettingsObjectFieldCurrencyFormValues;
   relation: SettingsObjectFieldRelationFormValues;
   select: SettingsObjectFieldSelectFormValues;
+  multiSelect: SettingsObjectFieldSelectFormValues;
+  defaultValue: any;
 };
 
 type SettingsDataModelFieldSettingsFormCardProps = {
@@ -60,12 +63,16 @@ const previewableTypes = [
   FieldMetadataType.Boolean,
   FieldMetadataType.Currency,
   FieldMetadataType.DateTime,
+  FieldMetadataType.Date,
   FieldMetadataType.Select,
+  FieldMetadataType.MultiSelect,
   FieldMetadataType.Link,
   FieldMetadataType.Number,
   FieldMetadataType.Rating,
   FieldMetadataType.Relation,
   FieldMetadataType.Text,
+  FieldMetadataType.Address,
+  FieldMetadataType.RawJson,
 ];
 
 export const SettingsDataModelFieldSettingsFormCard = ({
@@ -76,7 +83,7 @@ export const SettingsDataModelFieldSettingsFormCard = ({
   relationFieldMetadataItem,
   values,
 }: SettingsDataModelFieldSettingsFormCardProps) => {
-  const { findObjectMetadataItemById } = useObjectMetadataItemForSettings();
+  const { findObjectMetadataItemById } = useFilteredObjectMetadataItems();
 
   if (!previewableTypes.includes(fieldMetadataItem.type)) return null;
 
@@ -94,7 +101,11 @@ export const SettingsDataModelFieldSettingsFormCard = ({
             shrink={fieldMetadataItem.type === FieldMetadataType.Relation}
             objectMetadataItem={objectMetadataItem}
             relationObjectMetadataItem={relationObjectMetadataItem}
-            selectOptions={values.select}
+            selectOptions={
+              fieldMetadataItem.type === FieldMetadataType.MultiSelect
+                ? values.multiSelect
+                : values.select
+            }
           />
           {fieldMetadataItem.type === FieldMetadataType.Relation &&
             !!relationObjectMetadataItem && (
@@ -151,6 +162,21 @@ export const SettingsDataModelFieldSettingsFormCard = ({
               onChange({ select: nextSelectValues })
             }
           />
+        ) : fieldMetadataItem.type === FieldMetadataType.MultiSelect ? (
+          <SettingsObjectFieldSelectForm
+            values={values.multiSelect}
+            onChange={(nextMultiSelectValues) =>
+              onChange({ multiSelect: nextMultiSelectValues })
+            }
+            isMultiSelect={true}
+          />
+        ) : fieldMetadataItem.type === FieldMetadataType.Boolean ? (
+          <SettingsDataModelDefaultValueForm
+            value={values.defaultValue}
+            onChange={(nextValueDefaultValue) =>
+              onChange({ defaultValue: nextValueDefaultValue })
+            }
+          />
         ) : undefined
       }
     />
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldTypeSelect.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldTypeSelect.tsx
index 6bb0a6488544..bcc3cbb6a3a4 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldTypeSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldTypeSelect.tsx
@@ -1,29 +1,45 @@
-import { SETTINGS_FIELD_METADATA_TYPES } from '@/settings/data-model/constants/SettingsFieldMetadataTypes';
+import omit from 'lodash.omit';
+
+import {
+  SETTINGS_FIELD_TYPE_CONFIGS,
+  SettingsFieldTypeConfig,
+} from '@/settings/data-model/constants/SettingsFieldTypeConfigs';
+import { SettingsSupportedFieldType } from '@/settings/data-model/types/SettingsSupportedFieldType';
 import { Select, SelectOption } from '@/ui/input/components/Select';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 type SettingsDataModelFieldTypeSelectProps = {
   className?: string;
   disabled?: boolean;
-  excludedFieldTypes?: FieldMetadataType[];
-  onChange?: ({ type }: { type: FieldMetadataType }) => void;
-  value?: FieldMetadataType;
+  excludedFieldTypes?: SettingsSupportedFieldType[];
+  onChange?: ({
+    type,
+    defaultValue,
+  }: {
+    type: SettingsSupportedFieldType;
+    defaultValue: any;
+  }) => void;
+  value?: SettingsSupportedFieldType;
 };
 
 export const SettingsDataModelFieldTypeSelect = ({
   className,
   disabled,
-  excludedFieldTypes,
+  excludedFieldTypes = [],
   onChange,
   value,
 }: SettingsDataModelFieldTypeSelectProps) => {
-  const fieldTypeOptions = Object.entries(SETTINGS_FIELD_METADATA_TYPES)
-    .filter(([key]) => !excludedFieldTypes?.includes(key as FieldMetadataType))
-    .map<SelectOption<FieldMetadataType>>(([key, dataTypeConfig]) => ({
-      Icon: dataTypeConfig.Icon,
-      label: dataTypeConfig.label,
-      value: key as FieldMetadataType,
-    }));
+  const fieldTypeConfigs = omit(
+    SETTINGS_FIELD_TYPE_CONFIGS,
+    excludedFieldTypes,
+  );
+  const fieldTypeOptions = Object.entries<SettingsFieldTypeConfig>(
+    fieldTypeConfigs,
+  ).map<SelectOption<SettingsSupportedFieldType>>(([key, dataTypeConfig]) => ({
+    Icon: dataTypeConfig.Icon,
+    label: dataTypeConfig.label,
+    value: key as SettingsSupportedFieldType,
+  }));
 
   return (
     <Select
@@ -32,7 +48,12 @@ export const SettingsDataModelFieldTypeSelect = ({
       disabled={disabled}
       dropdownId="object-field-type-select"
       value={value}
-      onChange={(value) => onChange?.({ type: value })}
+      onChange={(value) =>
+        onChange?.({
+          type: value,
+          defaultValue: value === FieldMetadataType.Boolean ? false : undefined,
+        })
+      }
       options={fieldTypeOptions}
     />
   );
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx
index c6e6e520ef3b..fe42e3313f33 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx
@@ -26,6 +26,8 @@ const defaultValues = {
   currency: fieldMetadataFormDefaultValues.currency,
   relation: fieldMetadataFormDefaultValues.relation,
   select: fieldMetadataFormDefaultValues.select,
+  multiSelect: fieldMetadataFormDefaultValues.multiSelect,
+  defaultValue: fieldMetadataFormDefaultValues.defaultValue,
 };
 
 const meta: Meta<typeof SettingsDataModelFieldSettingsFormCard> = {
@@ -110,6 +112,7 @@ export const WithSelectForm: Story = {
         },
         { color: 'green', label: '🌏 NGO', value: 'NGO' },
       ],
+      defaultValue: undefined,
     },
   },
 };
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/hooks/__tests__/useFieldMetadataForm.test.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/hooks/__tests__/useFieldMetadataForm.test.ts
index 058e2e4d7ae3..50a67cdbfe3f 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/hooks/__tests__/useFieldMetadataForm.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/hooks/__tests__/useFieldMetadataForm.test.ts
@@ -23,9 +23,13 @@ describe('useFieldMetadataForm', () => {
         objectMetadataId: '',
         field: { label: '' },
       },
+      defaultValue: null,
       select: [
         { color: 'green', label: 'Option 1', value: expect.any(String) },
       ],
+      multiSelect: [
+        { color: 'green', label: 'Option 1', value: expect.any(String) },
+      ],
     });
   });
 
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/hooks/useFieldMetadataForm.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/hooks/useFieldMetadataForm.ts
index 9353ae60167b..c462b88ba00c 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/hooks/useFieldMetadataForm.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/hooks/useFieldMetadataForm.ts
@@ -4,6 +4,7 @@ import { v4 } from 'uuid';
 import { z } from 'zod';
 
 import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
+import { SettingsSupportedFieldType } from '@/settings/data-model/types/SettingsSupportedFieldType';
 import { themeColorSchema } from '@/ui/theme/utils/themeColorSchema';
 import {
   FieldMetadataType,
@@ -17,7 +18,8 @@ type FormValues = {
   description?: string;
   icon: string;
   label: string;
-  type: FieldMetadataType;
+  defaultValue: any;
+  type: SettingsSupportedFieldType;
 } & SettingsDataModelFieldSettingsFormValues;
 
 export const fieldMetadataFormDefaultValues: FormValues = {
@@ -30,13 +32,21 @@ export const fieldMetadataFormDefaultValues: FormValues = {
     objectMetadataId: '',
     field: { label: '' },
   },
+  defaultValue: null,
   select: [{ color: 'green', label: 'Option 1', value: v4() }],
+  multiSelect: [{ color: 'green', label: 'Option 1', value: v4() }],
 };
-
 const fieldSchema = z.object({
   description: z.string().optional(),
   icon: z.string().startsWith('Icon'),
   label: z.string().min(1),
+  defaultValue: z.any(),
+  type: z.enum(
+    Object.values(FieldMetadataType) as [
+      FieldMetadataType,
+      ...FieldMetadataType[],
+    ],
+  ),
 });
 
 const currencySchema = fieldSchema.merge(
@@ -79,10 +89,27 @@ const selectSchema = fieldSchema.merge(
   }),
 );
 
+const multiSelectSchema = fieldSchema.merge(
+  z.object({
+    type: z.literal(FieldMetadataType.MultiSelect),
+    multiSelect: z
+      .array(
+        z.object({
+          color: themeColorSchema,
+          id: z.string().optional(),
+          isDefault: z.boolean().optional(),
+          label: z.string().min(1),
+        }),
+      )
+      .nonempty(),
+  }),
+);
+
 const {
   Currency: _Currency,
   Relation: _Relation,
   Select: _Select,
+  MultiSelect: _MultiSelect,
   ...otherFieldTypes
 } = FieldMetadataType;
 
@@ -91,6 +118,7 @@ type OtherFieldType = Exclude<
   | FieldMetadataType.Currency
   | FieldMetadataType.Relation
   | FieldMetadataType.Select
+  | FieldMetadataType.MultiSelect
 >;
 
 const otherFieldTypesSchema = fieldSchema.merge(
@@ -105,6 +133,7 @@ const schema = z.discriminatedUnion('type', [
   currencySchema,
   relationSchema,
   selectSchema,
+  multiSelectSchema,
   otherFieldTypesSchema,
 ]);
 
@@ -123,6 +152,10 @@ export const useFieldMetadataForm = () => {
   const [hasCurrencyFormChanged, setHasCurrencyFormChanged] = useState(false);
   const [hasRelationFormChanged, setHasRelationFormChanged] = useState(false);
   const [hasSelectFormChanged, setHasSelectFormChanged] = useState(false);
+  const [hasMultiSelectFormChanged, setHasMultiSelectFormChanged] =
+    useState(false);
+  const [hasDefaultValueChanged, setHasDefaultValueFormChanged] =
+    useState(false);
   const [validationResult, setValidationResult] = useState(
     schema.safeParse(formValues),
   );
@@ -168,12 +201,16 @@ export const useFieldMetadataForm = () => {
       currency: initialCurrencyFormValues,
       relation: initialRelationFormValues,
       select: initialSelectFormValues,
+      multiSelect: initialMultiSelectFormValues,
+      defaultValue: initialDefaultValue,
       ...initialFieldFormValues
     } = initialFormValues;
     const {
       currency: nextCurrencyFormValues,
       relation: nextRelationFormValues,
       select: nextSelectFormValues,
+      multiSelect: nextMultiSelectFormValues,
+      defaultValue: nextDefaultValue,
       ...nextFieldFormValues
     } = nextFormValues;
 
@@ -192,6 +229,14 @@ export const useFieldMetadataForm = () => {
       nextFieldFormValues.type === FieldMetadataType.Select &&
         !isDeeplyEqual(initialSelectFormValues, nextSelectFormValues),
     );
+    setHasMultiSelectFormChanged(
+      nextFieldFormValues.type === FieldMetadataType.MultiSelect &&
+        !isDeeplyEqual(initialMultiSelectFormValues, nextMultiSelectFormValues),
+    );
+    setHasDefaultValueFormChanged(
+      nextFieldFormValues.type === FieldMetadataType.Boolean &&
+        !isDeeplyEqual(initialDefaultValue, nextDefaultValue),
+    );
   };
 
   return {
@@ -202,9 +247,13 @@ export const useFieldMetadataForm = () => {
       hasFieldFormChanged ||
       hasCurrencyFormChanged ||
       hasRelationFormChanged ||
-      hasSelectFormChanged,
+      hasSelectFormChanged ||
+      hasMultiSelectFormChanged ||
+      hasDefaultValueChanged,
     hasRelationFormChanged,
     hasSelectFormChanged,
+    hasMultiSelectFormChanged,
+    hasDefaultValueChanged,
     initForm,
     isInitialized,
     isValid: validationResult.success,
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx
index 099ed694ef4f..2914dee78256 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx
@@ -3,7 +3,6 @@ import styled from '@emotion/styled';
 
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { parseFieldType } from '@/object-metadata/utils/parseFieldType';
 import { FieldDisplay } from '@/object-record/record-field/components/FieldDisplay';
 import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
 import { BooleanFieldInput } from '@/object-record/record-field/meta-types/input/components/BooleanFieldInput';
@@ -16,7 +15,10 @@ import { useIcons } from '@/ui/display/icon/hooks/useIcons';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 export type SettingsDataModelFieldPreviewProps = {
-  fieldMetadataItem: Pick<FieldMetadataItem, 'icon' | 'label' | 'type'> & {
+  fieldMetadataItem: Pick<
+    FieldMetadataItem,
+    'icon' | 'label' | 'type' | 'defaultValue'
+  > & {
     id?: string;
     name?: string;
   };
@@ -96,7 +98,7 @@ export const SettingsDataModelFieldPreview = ({
             entityId,
             isLabelIdentifier,
             fieldDefinition: {
-              type: parseFieldType(fieldMetadataItem.type),
+              type: fieldMetadataItem.type,
               iconName: 'FieldIcon',
               fieldMetadataId: fieldMetadataItem.id || '',
               label: fieldMetadataItem.label,
@@ -107,6 +109,7 @@ export const SettingsDataModelFieldPreview = ({
                   relationObjectMetadataItem?.nameSingular,
                 options: selectOptions,
               },
+              defaultValue: fieldMetadataItem.defaultValue,
             },
             hotkeyScope: 'field-preview',
           }}
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/useFieldPreview.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/useFieldPreview.ts
index e42bc0061a60..8f29de04e28e 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/useFieldPreview.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/useFieldPreview.ts
@@ -2,7 +2,6 @@ import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSi
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { isLabelIdentifierField } from '@/object-metadata/utils/isLabelIdentifierField';
-import { parseFieldType } from '@/object-metadata/utils/parseFieldType';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { isFieldValueEmpty } from '@/object-record/record-field/utils/isFieldValueEmpty';
 import { SettingsObjectFieldSelectFormValues } from '@/settings/data-model/components/SettingsObjectFieldSelectForm';
@@ -56,11 +55,13 @@ export const useFieldPreview = ({
         })
       : null;
 
+  const selectOptionValues = selectOptions?.map((option) => option.value);
   const isValueFromFirstRecord =
     firstRecord &&
     !isFieldValueEmpty({
-      fieldDefinition: { type: parseFieldType(fieldMetadataItem.type) },
+      fieldDefinition: { type: fieldMetadataItem.type },
       fieldValue: fieldPreviewValueFromFirstRecord,
+      selectOptionValues,
     });
 
   const { records: relationRecords } = useFindManyRecords({
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectAboutSection.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectAboutSection.tsx
deleted file mode 100644
index 8abe35a9045b..000000000000
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectAboutSection.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import { useTheme } from '@emotion/react';
-import styled from '@emotion/styled';
-
-import { SettingsDataModelIsCustomTag } from '@/settings/data-model/objects/SettingsDataModelIsCustomTag';
-import { IconArchive, IconDotsVertical, IconPencil } from '@/ui/display/icon';
-import { useIcons } from '@/ui/display/icon/hooks/useIcons';
-import { H2Title } from '@/ui/display/typography/components/H2Title';
-import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
-import { Card } from '@/ui/layout/card/components/Card';
-import { CardContent } from '@/ui/layout/card/components/CardContent';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
-import { Section } from '@/ui/layout/section/components/Section';
-import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
-
-type SettingsAboutSectionProps = {
-  iconKey?: string;
-  isCustom: boolean;
-  name: string;
-  onDisable: () => void;
-  onEdit: () => void;
-};
-
-const StyledCardContent = styled(CardContent)`
-  align-items: center;
-  display: flex;
-  gap: ${({ theme }) => theme.spacing(2)};
-  padding: ${({ theme }) => theme.spacing(2)};
-`;
-
-const StyledName = styled.div`
-  color: ${({ theme }) => theme.font.color.primary};
-  display: flex;
-  font-weight: ${({ theme }) => theme.font.weight.medium};
-  gap: ${({ theme }) => theme.spacing(2)};
-  margin-right: auto;
-`;
-
-const StyledIsCustomTag = styled(SettingsDataModelIsCustomTag)`
-  box-sizing: border-box;
-  height: ${({ theme }) => theme.spacing(6)};
-`;
-
-const dropdownId = 'settings-object-edit-about-menu-dropdown';
-
-export const SettingsAboutSection = ({
-  iconKey = '',
-  isCustom,
-  name,
-  onDisable,
-  onEdit,
-}: SettingsAboutSectionProps) => {
-  const theme = useTheme();
-  const { getIcon } = useIcons();
-  const Icon = getIcon(iconKey);
-
-  const { closeDropdown } = useDropdown(dropdownId);
-
-  const handleEdit = () => {
-    onEdit();
-    closeDropdown();
-  };
-
-  const handleDisable = () => {
-    onDisable();
-    closeDropdown();
-  };
-
-  return (
-    <Section>
-      <H2Title title="About" description="Manage your object" />
-      <Card>
-        <StyledCardContent>
-          <StyledName>
-            {!!Icon && <Icon size={theme.icon.size.md} />}
-            {name}
-          </StyledName>
-          <StyledIsCustomTag isCustom={isCustom} />
-          <Dropdown
-            dropdownId={dropdownId}
-            clickableComponent={
-              <LightIconButton Icon={IconDotsVertical} accent="tertiary" />
-            }
-            dropdownComponents={
-              <DropdownMenu width="160px">
-                <DropdownMenuItemsContainer>
-                  <MenuItem
-                    text="Edit"
-                    LeftIcon={IconPencil}
-                    onClick={handleEdit}
-                  />
-                  <MenuItem
-                    text="Disable"
-                    LeftIcon={IconArchive}
-                    onClick={handleDisable}
-                  />
-                </DropdownMenuItemsContainer>
-              </DropdownMenu>
-            }
-            dropdownHotkeyScope={{
-              scope: dropdownId,
-            }}
-          />
-        </StyledCardContent>
-      </Card>
-    </Section>
-  );
-};
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldActiveActionDropdown.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldActiveActionDropdown.tsx
index fa8c7d9554e7..eb233272fdd1 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldActiveActionDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldActiveActionDropdown.tsx
@@ -4,7 +4,8 @@ import {
   IconEye,
   IconPencil,
   IconTextSize,
-} from '@/ui/display/icon';
+} from 'twenty-ui';
+
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
@@ -14,7 +15,7 @@ import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
 
 type SettingsObjectFieldActiveActionDropdownProps = {
   isCustomField?: boolean;
-  onDisable?: () => void;
+  onDeactivate?: () => void;
   onEdit: () => void;
   onSetAsLabelIdentifier?: () => void;
   scopeKey: string;
@@ -22,7 +23,7 @@ type SettingsObjectFieldActiveActionDropdownProps = {
 
 export const SettingsObjectFieldActiveActionDropdown = ({
   isCustomField,
-  onDisable,
+  onDeactivate,
   onEdit,
   onSetAsLabelIdentifier,
   scopeKey,
@@ -36,8 +37,8 @@ export const SettingsObjectFieldActiveActionDropdown = ({
     closeDropdown();
   };
 
-  const handleDisable = () => {
-    onDisable?.();
+  const handleDeactivate = () => {
+    onDeactivate?.();
     closeDropdown();
   };
 
@@ -67,11 +68,11 @@ export const SettingsObjectFieldActiveActionDropdown = ({
                 onClick={handleSetAsLabelIdentifier}
               />
             )}
-            {!!onDisable && (
+            {!!onDeactivate && (
               <MenuItem
-                text="Disable"
+                text="Deactivate"
                 LeftIcon={IconArchive}
-                onClick={handleDisable}
+                onClick={handleDeactivate}
               />
             )}
           </DropdownMenuItemsContainer>
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDataType.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDataType.tsx
index eb99da0b025e..7b16f2a05ed8 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDataType.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDataType.tsx
@@ -1,7 +1,8 @@
 import { css, useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 
-import { SETTINGS_FIELD_METADATA_TYPES } from '@/settings/data-model/constants/SettingsFieldMetadataTypes';
+import { SettingsSupportedFieldType } from '@/settings/data-model/types/SettingsSupportedFieldType';
+import { getSettingsFieldTypeConfig } from '@/settings/data-model/utils/getSettingsFieldTypeConfig';
 import { IconTwentyStar } from '@/ui/display/icon/components/IconTwentyStar';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
@@ -10,10 +11,10 @@ type SettingsObjectFieldDataTypeProps = {
   onClick?: () => void;
   Icon?: IconComponent;
   label?: string;
-  value: FieldMetadataType;
+  value: SettingsSupportedFieldType;
 };
 
-const StyledDataType = styled.div<{ value: FieldMetadataType }>`
+const StyledDataType = styled.div<{ value: SettingsSupportedFieldType }>`
   align-items: center;
   border: 1px solid transparent;
   border-radius: ${({ theme }) => theme.border.radius.sm};
@@ -49,11 +50,16 @@ const StyledLabelContainer = styled.div`
 export const SettingsObjectFieldDataType = ({
   onClick,
   value,
-  Icon = SETTINGS_FIELD_METADATA_TYPES[value]?.Icon ?? IconTwentyStar,
-  label = SETTINGS_FIELD_METADATA_TYPES[value]?.label,
+  Icon: IconFromProps,
+  label: labelFromProps,
 }: SettingsObjectFieldDataTypeProps) => {
   const theme = useTheme();
 
+  const fieldTypeConfig = getSettingsFieldTypeConfig(value);
+  const Icon: IconComponent =
+    IconFromProps ?? fieldTypeConfig?.Icon ?? IconTwentyStar;
+  const label = labelFromProps ?? fieldTypeConfig?.label;
+
   const StyledIcon = styled(Icon)`
     flex: 1 0 auto;
   `;
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx
index 101d5aac2360..846f27fd5c72 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx
@@ -1,22 +1,28 @@
-import { IconArchiveOff, IconDotsVertical } from '@/ui/display/icon';
+import { IconArchiveOff, IconDotsVertical, IconTrash } from 'twenty-ui';
+
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-type SettingsObjectFieldDisabledActionDropdownProps = {
+type SettingsObjectFieldInactiveActionDropdownProps = {
   isCustomField?: boolean;
+  fieldType?: FieldMetadataType;
   onActivate: () => void;
   onErase: () => void;
   scopeKey: string;
 };
 
-export const SettingsObjectFieldDisabledActionDropdown = ({
+export const SettingsObjectFieldInactiveActionDropdown = ({
   onActivate,
   scopeKey,
-}: SettingsObjectFieldDisabledActionDropdownProps) => {
+  onErase,
+  isCustomField,
+  fieldType,
+}: SettingsObjectFieldInactiveActionDropdownProps) => {
   const dropdownId = `${scopeKey}-settings-field-disabled-action-dropdown`;
 
   const { closeDropdown } = useDropdown(dropdownId);
@@ -26,10 +32,15 @@ export const SettingsObjectFieldDisabledActionDropdown = ({
     closeDropdown();
   };
 
-  // const handleErase = () => {
-  //   onErase();
-  //   closeDropdown();
-  // };
+  const handleErase = () => {
+    onErase();
+    closeDropdown();
+  };
+
+  const isErasable =
+    isCustomField &&
+    fieldType !== FieldMetadataType.Relation &&
+    fieldType !== FieldMetadataType.Address;
 
   return (
     <Dropdown
@@ -45,14 +56,14 @@ export const SettingsObjectFieldDisabledActionDropdown = ({
               LeftIcon={IconArchiveOff}
               onClick={handleActivate}
             />
-            {/* {isCustomField && (
-                <MenuItem
-                  text="Erase"
-                  accent="danger"
-                  LeftIcon={IconTrash}
-                  onClick={handleErase}
-                />
-              )} */}
+            {isErasable && (
+              <MenuItem
+                text="Erase"
+                accent="danger"
+                LeftIcon={IconTrash}
+                onClick={handleErase}
+              />
+            )}
           </DropdownMenuItemsContainer>
         </DropdownMenu>
       }
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
index 2657fd47136c..49d5b96422e0 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
@@ -6,8 +6,8 @@ import styled from '@emotion/styled';
 import { useGetRelationMetadata } from '@/object-metadata/hooks/useGetRelationMetadata';
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { getObjectSlug } from '@/object-metadata/utils/getObjectSlug';
-import { SETTINGS_FIELD_METADATA_TYPES } from '@/settings/data-model/constants/SettingsFieldMetadataTypes';
 import { FieldIdentifierType } from '@/settings/data-model/types/FieldIdentifierType';
+import { isFieldTypeSupportedInSettings } from '@/settings/data-model/utils/isFieldTypeSupportedInSettings';
 import { useIcons } from '@/ui/display/icon/hooks/useIcons';
 import { TableCell } from '@/ui/layout/table/components/TableCell';
 import { TableRow } from '@/ui/layout/table/components/TableRow';
@@ -22,6 +22,7 @@ type SettingsObjectFieldItemTableRowProps = {
   fieldMetadataItem: FieldMetadataItem;
   identifierType?: Nullable<FieldIdentifierType>;
   variant?: 'field-type' | 'identifier';
+  isRemoteObjectField?: boolean;
 };
 
 export const StyledObjectFieldTableRow = styled(TableRow)`
@@ -43,16 +44,13 @@ export const SettingsObjectFieldItemTableRow = ({
   fieldMetadataItem,
   identifierType,
   variant = 'field-type',
+  isRemoteObjectField,
 }: SettingsObjectFieldItemTableRowProps) => {
   const theme = useTheme();
   const { getIcon } = useIcons();
   const Icon = getIcon(fieldMetadataItem.icon);
   const navigate = useNavigate();
 
-  // TODO: parse with zod and merge types with FieldType (create a subset of FieldType for example)
-  const fieldDataTypeIsSupported =
-    fieldMetadataItem.type in SETTINGS_FIELD_METADATA_TYPES;
-
   const getRelationMetadata = useGetRelationMetadata();
 
   const { relationObjectMetadataItem, relationType } =
@@ -61,7 +59,10 @@ export const SettingsObjectFieldItemTableRow = ({
       [fieldMetadataItem, getRelationMetadata],
     ) ?? {};
 
-  if (!fieldDataTypeIsSupported) return null;
+  const fieldType = fieldMetadataItem.type;
+  const isFieldTypeSupported = isFieldTypeSupportedInSettings(fieldType);
+
+  if (!isFieldTypeSupported) return null;
 
   const RelationIcon = relationType
     ? RELATION_TYPES[relationType].Icon
@@ -77,7 +78,11 @@ export const SettingsObjectFieldItemTableRow = ({
       </StyledNameTableCell>
       <TableCell>
         {variant === 'field-type' &&
-          (fieldMetadataItem.isCustom ? 'Custom' : 'Standard')}
+          (isRemoteObjectField
+            ? 'Remote'
+            : fieldMetadataItem.isCustom
+              ? 'Custom'
+              : 'Standard')}
         {variant === 'identifier' &&
           !!identifierType &&
           (identifierType === 'label' ? 'Record text' : 'Record image')}
@@ -97,7 +102,7 @@ export const SettingsObjectFieldItemTableRow = ({
                   )
               : undefined
           }
-          value={fieldMetadataItem.type}
+          value={fieldType}
         />
       </TableCell>
       <StyledIconTableCell>{ActionIcon}</StyledIconTableCell>
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRow.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRow.tsx
index 106f41abd05c..7a4ac6ab7640 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRow.tsx
@@ -4,7 +4,8 @@ import styled from '@emotion/styled';
 
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { SettingsDataModelIsCustomTag } from '@/settings/data-model/objects/SettingsDataModelIsCustomTag';
+import { SettingsDataModelObjectTypeTag } from '@/settings/data-model/objects/SettingsDataModelObjectTypeTag';
+import { getObjectTypeLabel } from '@/settings/data-model/utils/getObjectTypeLabel';
 import { useIcons } from '@/ui/display/icon/hooks/useIcons';
 import { TableCell } from '@/ui/layout/table/components/TableCell';
 import { TableRow } from '@/ui/layout/table/components/TableRow';
@@ -42,6 +43,7 @@ export const SettingsObjectItemTableRow = ({
   });
   const { getIcon } = useIcons();
   const Icon = getIcon(objectItem.icon);
+  const objectTypeLabel = getObjectTypeLabel(objectItem);
 
   return (
     <StyledObjectTableRow key={objectItem.namePlural} onClick={onClick}>
@@ -52,7 +54,7 @@ export const SettingsObjectItemTableRow = ({
         {objectItem.labelPlural}
       </StyledNameTableCell>
       <TableCell>
-        <SettingsDataModelIsCustomTag isCustom={objectItem.isCustom} />
+        <SettingsDataModelObjectTypeTag objectTypeLabel={objectTypeLabel} />
       </TableCell>
       <TableCell align="right">
         {objectItem.fields.filter((field) => !field.isSystem).length}
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectSummaryCard.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectSummaryCard.tsx
new file mode 100644
index 000000000000..4b3627f549d2
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectSummaryCard.tsx
@@ -0,0 +1,97 @@
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import { IconArchive, IconDotsVertical, IconPencil } from 'twenty-ui';
+
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { SettingsSummaryCard } from '@/settings/components/SettingsSummaryCard';
+import { SettingsDataModelObjectTypeTag } from '@/settings/data-model/objects/SettingsDataModelObjectTypeTag';
+import { getObjectTypeLabel } from '@/settings/data-model/utils/getObjectTypeLabel';
+import { useIcons } from '@/ui/display/icon/hooks/useIcons';
+import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
+
+type SettingsObjectSummaryCardProps = {
+  objectMetadataItem: ObjectMetadataItem;
+  iconKey?: string;
+  name: string;
+  onDeactivate: () => void;
+  onEdit: () => void;
+};
+
+const StyledObjectTypeTag = styled(SettingsDataModelObjectTypeTag)`
+  box-sizing: border-box;
+  height: ${({ theme }) => theme.spacing(6)};
+`;
+
+const dropdownId = 'settings-object-edit-about-menu-dropdown';
+
+export const SettingsObjectSummaryCard = ({
+  objectMetadataItem,
+  iconKey = '',
+  name,
+  onDeactivate,
+  onEdit,
+}: SettingsObjectSummaryCardProps) => {
+  const theme = useTheme();
+  const { getIcon } = useIcons();
+  const Icon = getIcon(iconKey);
+
+  const { closeDropdown } = useDropdown(dropdownId);
+
+  const handleEdit = () => {
+    onEdit();
+    closeDropdown();
+  };
+
+  const handleDeactivate = () => {
+    onDeactivate();
+    closeDropdown();
+  };
+
+  const objectTypeLabel = getObjectTypeLabel(objectMetadataItem);
+
+  return (
+    <SettingsSummaryCard
+      title={
+        <>
+          {!!Icon && <Icon size={theme.icon.size.md} />}
+          {name}
+        </>
+      }
+      rightComponent={
+        <>
+          <StyledObjectTypeTag objectTypeLabel={objectTypeLabel} />
+          <Dropdown
+            dropdownId={dropdownId}
+            clickableComponent={
+              <LightIconButton Icon={IconDotsVertical} accent="tertiary" />
+            }
+            dropdownComponents={
+              <DropdownMenu width="160px">
+                <DropdownMenuItemsContainer>
+                  <MenuItem
+                    text="Edit"
+                    LeftIcon={IconPencil}
+                    onClick={handleEdit}
+                  />
+                  <MenuItem
+                    text="Deactivate"
+                    LeftIcon={IconArchive}
+                    onClick={handleDeactivate}
+                  />
+                </DropdownMenuItemsContainer>
+              </DropdownMenu>
+            }
+            dropdownHotkeyScope={{
+              scope: dropdownId,
+            }}
+          />
+        </>
+      }
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/SettingsDataModelIsCustomTag.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/SettingsDataModelIsCustomTag.tsx
deleted file mode 100644
index 4e4394a6952a..000000000000
--- a/packages/twenty-front/src/modules/settings/data-model/objects/SettingsDataModelIsCustomTag.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Tag } from '@/ui/display/tag/components/Tag';
-
-type SettingsDataModelIsCustomTagProps = {
-  className?: string;
-  isCustom?: boolean;
-};
-
-export const SettingsDataModelIsCustomTag = ({
-  className,
-  isCustom,
-}: SettingsDataModelIsCustomTagProps) => (
-  <Tag
-    className={className}
-    color={isCustom ? 'orange' : 'blue'}
-    text={isCustom ? 'Custom' : 'Standard'}
-    weight="medium"
-  />
-);
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/SettingsDataModelObjectSummary.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/SettingsDataModelObjectSummary.tsx
index 5b7b44740835..0e7336384942 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/SettingsDataModelObjectSummary.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/SettingsDataModelObjectSummary.tsx
@@ -2,15 +2,13 @@ import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { SettingsDataModelIsCustomTag } from '@/settings/data-model/objects/SettingsDataModelIsCustomTag';
+import { SettingsDataModelObjectTypeTag } from '@/settings/data-model/objects/SettingsDataModelObjectTypeTag';
+import { getObjectTypeLabel } from '@/settings/data-model/utils/getObjectTypeLabel';
 import { useIcons } from '@/ui/display/icon/hooks/useIcons';
 
 export type SettingsDataModelObjectSummaryProps = {
   className?: string;
-  objectMetadataItem: Pick<
-    ObjectMetadataItem,
-    'icon' | 'isCustom' | 'labelPlural'
-  >;
+  objectMetadataItem: ObjectMetadataItem;
 };
 
 const StyledObjectSummary = styled.div`
@@ -35,6 +33,7 @@ export const SettingsDataModelObjectSummary = ({
 
   const { getIcon } = useIcons();
   const ObjectIcon = getIcon(objectMetadataItem.icon);
+  const objectTypeLabel = getObjectTypeLabel(objectMetadataItem);
 
   return (
     <StyledObjectSummary className={className}>
@@ -42,7 +41,7 @@ export const SettingsDataModelObjectSummary = ({
         <ObjectIcon size={theme.icon.size.sm} stroke={theme.icon.stroke.md} />
         {objectMetadataItem.labelPlural}
       </StyledObjectName>
-      <SettingsDataModelIsCustomTag isCustom={objectMetadataItem.isCustom} />
+      <SettingsDataModelObjectTypeTag objectTypeLabel={objectTypeLabel} />
     </StyledObjectSummary>
   );
 };
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/SettingsDataModelObjectTypeTag.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/SettingsDataModelObjectTypeTag.tsx
new file mode 100644
index 000000000000..e077383c45f5
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/SettingsDataModelObjectTypeTag.tsx
@@ -0,0 +1,21 @@
+import { ObjectTypeLabel } from '@/settings/data-model/utils/getObjectTypeLabel';
+import { Tag } from '@/ui/display/tag/components/Tag';
+
+type SettingsDataModelObjectTypeTagProps = {
+  objectTypeLabel: ObjectTypeLabel;
+  className?: string;
+};
+
+export const SettingsDataModelObjectTypeTag = ({
+  className,
+  objectTypeLabel,
+}: SettingsDataModelObjectTypeTagProps) => {
+  return (
+    <Tag
+      className={className}
+      color={objectTypeLabel.labelColor}
+      text={objectTypeLabel.labelText}
+      weight="medium"
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/SettingsObjectCoverImage.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/SettingsObjectCoverImage.tsx
index 0f7fa0b900c4..38f8fe0f7d7c 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/SettingsObjectCoverImage.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/SettingsObjectCoverImage.tsx
@@ -1,8 +1,8 @@
 import { useState } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconX } from 'twenty-ui';
 
-import { IconX } from '@/ui/display/icon';
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { Card } from '@/ui/layout/card/components/Card';
 import { AnimatedFadeOut } from '@/ui/utilities/animation/components/AnimatedFadeOut';
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/SettingsObjectDisabledMenuDropDown.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/SettingsObjectDisabledMenuDropDown.tsx
deleted file mode 100644
index 18bb9b5f23fb..000000000000
--- a/packages/twenty-front/src/modules/settings/data-model/objects/SettingsObjectDisabledMenuDropDown.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { IconArchiveOff, IconDotsVertical, IconTrash } from '@/ui/display/icon';
-import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
-import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
-
-type SettingsObjectDisabledMenuDropDownProps = {
-  isCustomObject: boolean;
-  onActivate: () => void;
-  onErase: () => void;
-  scopeKey: string;
-};
-
-export const SettingsObjectDisabledMenuDropDown = ({
-  onActivate,
-  scopeKey,
-  onErase,
-  isCustomObject,
-}: SettingsObjectDisabledMenuDropDownProps) => {
-  const dropdownId = `${scopeKey}-settings-object-disabled-menu-dropdown`;
-
-  const { closeDropdown } = useDropdown(dropdownId);
-
-  const handleActivate = () => {
-    onActivate();
-    closeDropdown();
-  };
-
-  const handleErase = () => {
-    onErase();
-    closeDropdown();
-  };
-
-  return (
-    <Dropdown
-      dropdownId={dropdownId}
-      clickableComponent={
-        <LightIconButton Icon={IconDotsVertical} accent="tertiary" />
-      }
-      dropdownComponents={
-        <DropdownMenu width="160px">
-          <DropdownMenuItemsContainer>
-            <MenuItem
-              text="Activate"
-              LeftIcon={IconArchiveOff}
-              onClick={handleActivate}
-            />
-            {isCustomObject && (
-              <MenuItem
-                text="Erase"
-                LeftIcon={IconTrash}
-                accent="danger"
-                onClick={handleErase}
-              />
-            )}
-          </DropdownMenuItemsContainer>
-        </DropdownMenu>
-      }
-      dropdownHotkeyScope={{
-        scope: dropdownId,
-      }}
-    />
-  );
-};
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/SettingsObjectInactiveMenuDropDown.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/SettingsObjectInactiveMenuDropDown.tsx
new file mode 100644
index 000000000000..107fafed7a7a
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/SettingsObjectInactiveMenuDropDown.tsx
@@ -0,0 +1,67 @@
+import { IconArchiveOff, IconDotsVertical, IconTrash } from 'twenty-ui';
+
+import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
+
+type SettingsObjectInactiveMenuDropDownProps = {
+  isCustomObject: boolean;
+  onActivate: () => void;
+  onErase: () => void;
+  scopeKey: string;
+};
+
+export const SettingsObjectInactiveMenuDropDown = ({
+  onActivate,
+  scopeKey,
+  onErase,
+  isCustomObject,
+}: SettingsObjectInactiveMenuDropDownProps) => {
+  const dropdownId = `${scopeKey}-settings-object-inactive-menu-dropdown`;
+
+  const { closeDropdown } = useDropdown(dropdownId);
+
+  const handleActivate = () => {
+    onActivate();
+    closeDropdown();
+  };
+
+  const handleErase = () => {
+    onErase();
+    closeDropdown();
+  };
+
+  return (
+    <Dropdown
+      dropdownId={dropdownId}
+      clickableComponent={
+        <LightIconButton Icon={IconDotsVertical} accent="tertiary" />
+      }
+      dropdownComponents={
+        <DropdownMenu width="160px">
+          <DropdownMenuItemsContainer>
+            <MenuItem
+              text="Activate"
+              LeftIcon={IconArchiveOff}
+              onClick={handleActivate}
+            />
+            {isCustomObject && (
+              <MenuItem
+                text="Erase"
+                LeftIcon={IconTrash}
+                accent="danger"
+                onClick={handleErase}
+              />
+            )}
+          </DropdownMenuItemsContainer>
+        </DropdownMenu>
+      }
+      dropdownHotkeyScope={{
+        scope: dropdownId,
+      }}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/__stories__/SettingsObjectDisabledMenuDropDown.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/__stories__/SettingsObjectDisabledMenuDropDown.stories.tsx
deleted file mode 100644
index 07f7a9494469..000000000000
--- a/packages/twenty-front/src/modules/settings/data-model/objects/__stories__/SettingsObjectDisabledMenuDropDown.stories.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { Decorator, Meta, StoryObj } from '@storybook/react';
-import { expect, fn, userEvent, within } from '@storybook/test';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-
-import { SettingsObjectDisabledMenuDropDown } from '../SettingsObjectDisabledMenuDropDown';
-
-const handleActivateMockFunction = fn();
-const handleEraseMockFunction = fn();
-
-const ClearMocksDecorator: Decorator = (Story, context) => {
-  if (context.parameters.clearMocks) {
-    handleActivateMockFunction.mockClear();
-    handleEraseMockFunction.mockClear();
-  }
-  return <Story />;
-};
-
-const meta: Meta<typeof SettingsObjectDisabledMenuDropDown> = {
-  title: 'Modules/Settings/DataModel/SettingsObjectDisabledMenuDropDown',
-  component: SettingsObjectDisabledMenuDropDown,
-  args: {
-    scopeKey: 'settings-object-disabled-menu-dropdown',
-    onActivate: handleActivateMockFunction,
-    onErase: handleEraseMockFunction,
-  },
-  decorators: [ComponentDecorator, ClearMocksDecorator],
-  parameters: {
-    clearMocks: true,
-  },
-};
-
-export default meta;
-type Story = StoryObj<typeof SettingsObjectDisabledMenuDropDown>;
-
-export const Default: Story = {};
-
-export const Open: Story = {
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-
-    const dropdownButton = await canvas.getByRole('button');
-
-    await userEvent.click(dropdownButton);
-  },
-};
-
-export const WithActivate: Story = {
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-
-    const dropdownButton = await canvas.getByRole('button');
-
-    await userEvent.click(dropdownButton);
-
-    await expect(handleActivateMockFunction).toHaveBeenCalledTimes(0);
-
-    const activateMenuItem = await canvas.getByText('Activate');
-
-    await userEvent.click(activateMenuItem);
-
-    await expect(handleActivateMockFunction).toHaveBeenCalledTimes(1);
-
-    await userEvent.click(dropdownButton);
-  },
-};
-
-export const WithErase: Story = {
-  args: { isCustomObject: true },
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-
-    const dropdownButton = await canvas.getByRole('button');
-
-    await userEvent.click(dropdownButton);
-
-    await expect(handleEraseMockFunction).toHaveBeenCalledTimes(0);
-
-    const eraseMenuItem = await canvas.getByText('Erase');
-
-    await userEvent.click(eraseMenuItem);
-
-    await expect(handleEraseMockFunction).toHaveBeenCalledTimes(1);
-
-    await userEvent.click(dropdownButton);
-  },
-};
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx
new file mode 100644
index 000000000000..0a5bfde6d3c6
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx
@@ -0,0 +1,87 @@
+import { Decorator, Meta, StoryObj } from '@storybook/react';
+import { expect, fn, userEvent, within } from '@storybook/test';
+
+import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+
+import { SettingsObjectInactiveMenuDropDown } from '../SettingsObjectInactiveMenuDropDown';
+
+const handleActivateMockFunction = fn();
+const handleEraseMockFunction = fn();
+
+const ClearMocksDecorator: Decorator = (Story, context) => {
+  if (context.parameters.clearMocks === true) {
+    handleActivateMockFunction.mockClear();
+    handleEraseMockFunction.mockClear();
+  }
+  return <Story />;
+};
+
+const meta: Meta<typeof SettingsObjectInactiveMenuDropDown> = {
+  title: 'Modules/Settings/DataModel/SettingsObjectInactiveMenuDropDown',
+  component: SettingsObjectInactiveMenuDropDown,
+  args: {
+    scopeKey: 'settings-object-inactive-menu-dropdown',
+    onActivate: handleActivateMockFunction,
+    onErase: handleEraseMockFunction,
+  },
+  decorators: [ComponentDecorator, ClearMocksDecorator],
+  parameters: {
+    clearMocks: true,
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof SettingsObjectInactiveMenuDropDown>;
+
+export const Default: Story = {};
+
+export const Open: Story = {
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const dropdownButton = await canvas.getByRole('button');
+
+    await userEvent.click(dropdownButton);
+  },
+};
+
+export const WithActivate: Story = {
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const dropdownButton = await canvas.getByRole('button');
+
+    await userEvent.click(dropdownButton);
+
+    await expect(handleActivateMockFunction).toHaveBeenCalledTimes(0);
+
+    const activateMenuItem = await canvas.getByText('Activate');
+
+    await userEvent.click(activateMenuItem);
+
+    await expect(handleActivateMockFunction).toHaveBeenCalledTimes(1);
+
+    await userEvent.click(dropdownButton);
+  },
+};
+
+export const WithErase: Story = {
+  args: { isCustomObject: true },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const dropdownButton = await canvas.getByRole('button');
+
+    await userEvent.click(dropdownButton);
+
+    await expect(handleEraseMockFunction).toHaveBeenCalledTimes(0);
+
+    const eraseMenuItem = await canvas.getByText('Erase');
+
+    await userEvent.click(eraseMenuItem);
+
+    await expect(handleEraseMockFunction).toHaveBeenCalledTimes(1);
+
+    await userEvent.click(dropdownButton);
+  },
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
new file mode 100644
index 000000000000..b7dfc9229ff7
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
@@ -0,0 +1,119 @@
+import { Controller, useFormContext } from 'react-hook-form';
+import styled from '@emotion/styled';
+import { z } from 'zod';
+
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { objectMetadataItemSchema } from '@/object-metadata/validation-schemas/objectMetadataItemSchema';
+import { IconPicker } from '@/ui/input/components/IconPicker';
+import { TextArea } from '@/ui/input/components/TextArea';
+import { TextInput } from '@/ui/input/components/TextInput';
+
+export const settingsDataModelObjectAboutFormSchema =
+  objectMetadataItemSchema.pick({
+    description: true,
+    icon: true,
+    labelPlural: true,
+    labelSingular: true,
+  });
+
+type SettingsDataModelObjectAboutFormValues = z.infer<
+  typeof settingsDataModelObjectAboutFormSchema
+>;
+
+type SettingsDataModelObjectAboutFormProps = {
+  disabled?: boolean;
+  objectMetadataItem?: ObjectMetadataItem;
+};
+
+const StyledInputsContainer = styled.div`
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(2)};
+  margin-bottom: ${({ theme }) => theme.spacing(2)};
+  width: 100%;
+`;
+
+const StyledLabel = styled.span`
+  color: ${({ theme }) => theme.font.color.light};
+  font-size: ${({ theme }) => theme.font.size.xs};
+  font-weight: ${({ theme }) => theme.font.weight.semiBold};
+  margin-bottom: ${({ theme }) => theme.spacing(1)};
+`;
+
+const StyledInputContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+`;
+
+export const SettingsDataModelObjectAboutForm = ({
+  disabled,
+  objectMetadataItem,
+}: SettingsDataModelObjectAboutFormProps) => {
+  const { control } = useFormContext<SettingsDataModelObjectAboutFormValues>();
+
+  return (
+    <>
+      <StyledInputsContainer>
+        <StyledInputContainer>
+          <StyledLabel>Icon</StyledLabel>
+          <Controller
+            name="icon"
+            control={control}
+            defaultValue={objectMetadataItem?.icon ?? 'IconListNumbers'}
+            render={({ field: { onChange, value } }) => (
+              <IconPicker
+                disabled={disabled}
+                selectedIconKey={value}
+                onChange={({ iconKey }) => onChange(iconKey)}
+              />
+            )}
+          />
+        </StyledInputContainer>
+        {[
+          {
+            label: 'Singular',
+            fieldName: 'labelSingular' as const,
+            placeholder: 'Listing',
+            defaultValue: objectMetadataItem?.labelSingular,
+          },
+          {
+            label: 'Plural',
+            fieldName: 'labelPlural' as const,
+            placeholder: 'Listings',
+            defaultValue: objectMetadataItem?.labelPlural,
+          },
+        ].map(({ defaultValue, fieldName, label, placeholder }) => (
+          <Controller
+            key={`object-${fieldName}-text-input`}
+            name={fieldName}
+            control={control}
+            defaultValue={defaultValue}
+            render={({ field: { onChange, value } }) => (
+              <TextInput
+                label={label}
+                placeholder={placeholder}
+                value={value}
+                onChange={onChange}
+                disabled={disabled}
+                fullWidth
+              />
+            )}
+          />
+        ))}
+      </StyledInputsContainer>
+      <Controller
+        name="description"
+        control={control}
+        defaultValue={objectMetadataItem?.description ?? null}
+        render={({ field: { onChange, value } }) => (
+          <TextArea
+            placeholder="Write a description"
+            minRows={4}
+            value={value ?? undefined}
+            onChange={(nextValue) => onChange(nextValue ?? null)}
+            disabled={disabled}
+          />
+        )}
+      />
+    </>
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm.tsx
new file mode 100644
index 000000000000..6677111db5da
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm.tsx
@@ -0,0 +1,101 @@
+import { useMemo } from 'react';
+import { Controller, useFormContext } from 'react-hook-form';
+import styled from '@emotion/styled';
+import { IconCircleOff } from 'twenty-ui';
+import { z } from 'zod';
+
+import { LABEL_IDENTIFIER_FIELD_METADATA_TYPES } from '@/object-metadata/constants/LabelIdentifierFieldMetadataTypes';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { getActiveFieldMetadataItems } from '@/object-metadata/utils/getActiveFieldMetadataItems';
+import { objectMetadataItemSchema } from '@/object-metadata/validation-schemas/objectMetadataItemSchema';
+import { useIcons } from '@/ui/display/icon/hooks/useIcons';
+import { Select, SelectOption } from '@/ui/input/components/Select';
+
+export const settingsDataModelObjectIdentifiersFormSchema =
+  objectMetadataItemSchema.pick({
+    labelIdentifierFieldMetadataId: true,
+    imageIdentifierFieldMetadataId: true,
+  });
+
+export type SettingsDataModelObjectIdentifiersFormValues = z.infer<
+  typeof settingsDataModelObjectIdentifiersFormSchema
+>;
+
+type SettingsDataModelObjectIdentifiersFormProps = {
+  objectMetadataItem: ObjectMetadataItem;
+};
+
+const StyledContainer = styled.div`
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(4)};
+`;
+
+export const SettingsDataModelObjectIdentifiersForm = ({
+  objectMetadataItem,
+}: SettingsDataModelObjectIdentifiersFormProps) => {
+  const { control } =
+    useFormContext<SettingsDataModelObjectIdentifiersFormValues>();
+  const { getIcon } = useIcons();
+
+  const labelIdentifierFieldOptions = useMemo(
+    () =>
+      getActiveFieldMetadataItems(objectMetadataItem)
+        .filter(
+          ({ id, type }) =>
+            LABEL_IDENTIFIER_FIELD_METADATA_TYPES.includes(type) ||
+            objectMetadataItem.labelIdentifierFieldMetadataId === id,
+        )
+        .map<SelectOption<string | null>>((fieldMetadataItem) => ({
+          Icon: getIcon(fieldMetadataItem.icon),
+          label: fieldMetadataItem.label,
+          value: fieldMetadataItem.id,
+        })),
+    [getIcon, objectMetadataItem],
+  );
+  const imageIdentifierFieldOptions: SelectOption<string | null>[] = [];
+
+  const emptyOption: SelectOption<string | null> = {
+    Icon: IconCircleOff,
+    label: 'None',
+    value: null,
+  };
+
+  return (
+    <StyledContainer>
+      {[
+        {
+          label: 'Record label',
+          fieldName: 'labelIdentifierFieldMetadataId' as const,
+          options: labelIdentifierFieldOptions,
+        },
+        {
+          label: 'Record image',
+          fieldName: 'imageIdentifierFieldMetadataId' as const,
+          options: imageIdentifierFieldOptions,
+        },
+      ].map(({ fieldName, label, options }) => (
+        <Controller
+          key={fieldName}
+          name={fieldName}
+          control={control}
+          defaultValue={objectMetadataItem[fieldName]}
+          render={({ field: { onBlur, onChange, value } }) => {
+            return (
+              <Select
+                label={label}
+                disabled={!objectMetadataItem.isCustom || !options.length}
+                fullWidth
+                dropdownId={`${fieldName}-select`}
+                emptyOption={emptyOption}
+                options={options}
+                value={value}
+                onChange={onChange}
+                onBlur={onBlur}
+              />
+            );
+          }}
+        />
+      ))}
+    </StyledContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx
index 31331818c06b..a662aeaae084 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx
@@ -1,9 +1,15 @@
+import { useMemo } from 'react';
+import { useFormContext } from 'react-hook-form';
 import styled from '@emotion/styled';
 
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/getLabelIdentifierFieldMetadataItem';
-import { SettingsDataModelPreviewFormCard } from '@/settings/data-model/components/SettingsDataModelPreviewFormCard';
+import { SettingsDataModelCardTitle } from '@/settings/data-model/components/SettingsDataModelCardTitle';
 import { SettingsDataModelFieldPreviewCard } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewCard';
+import {
+  SettingsDataModelObjectIdentifiersForm,
+  SettingsDataModelObjectIdentifiersFormValues,
+} from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm';
 import { SettingsDataModelObjectSummary } from '@/settings/data-model/objects/SettingsDataModelObjectSummary';
 import { Card } from '@/ui/layout/card/components/Card';
 import { CardContent } from '@/ui/layout/card/components/CardContent';
@@ -16,6 +22,10 @@ const StyledFieldPreviewCard = styled(SettingsDataModelFieldPreviewCard)`
   width: 100%;
 `;
 
+const StyledTopCardContent = styled(CardContent)`
+  background-color: ${({ theme }) => theme.background.transparent.lighter};
+`;
+
 const StyledObjectSummaryCard = styled(Card)`
   border-radius: ${({ theme }) => theme.border.radius.md};
   color: ${({ theme }) => theme.font.color.primary};
@@ -29,13 +39,27 @@ const StyledObjectSummaryCardContent = styled(CardContent)`
 export const SettingsDataModelObjectSettingsFormCard = ({
   objectMetadataItem,
 }: SettingsDataModelObjectSettingsFormCardProps) => {
-  const labelIdentifierFieldMetadataItem =
-    getLabelIdentifierFieldMetadataItem(objectMetadataItem);
+  const { watch: watchFormValue } =
+    useFormContext<SettingsDataModelObjectIdentifiersFormValues>();
+
+  const labelIdentifierFieldMetadataIdFormValue = watchFormValue(
+    'labelIdentifierFieldMetadataId',
+  );
+
+  const labelIdentifierFieldMetadataItem = useMemo(
+    () =>
+      getLabelIdentifierFieldMetadataItem({
+        fields: objectMetadataItem.fields,
+        labelIdentifierFieldMetadataId: labelIdentifierFieldMetadataIdFormValue,
+      }),
+    [labelIdentifierFieldMetadataIdFormValue, objectMetadataItem],
+  );
 
   return (
-    <SettingsDataModelPreviewFormCard
-      preview={
-        labelIdentifierFieldMetadataItem ? (
+    <Card fullWidth>
+      <StyledTopCardContent divider>
+        <SettingsDataModelCardTitle>Preview</SettingsDataModelCardTitle>
+        {labelIdentifierFieldMetadataItem ? (
           <StyledFieldPreviewCard
             objectMetadataItem={objectMetadataItem}
             fieldMetadataItem={labelIdentifierFieldMetadataItem}
@@ -49,8 +73,13 @@ export const SettingsDataModelObjectSettingsFormCard = ({
               />
             </StyledObjectSummaryCardContent>
           </StyledObjectSummaryCard>
-        )
-      }
-    />
+        )}
+      </StyledTopCardContent>
+      <CardContent>
+        <SettingsDataModelObjectIdentifiersForm
+          objectMetadataItem={objectMetadataItem}
+        />
+      </CardContent>
+    </Card>
   );
 };
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/__stories__/SettingsDataModelObjectAboutForm.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/__stories__/SettingsDataModelObjectAboutForm.stories.tsx
new file mode 100644
index 000000000000..ecd8ab659ccc
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/__stories__/SettingsDataModelObjectAboutForm.stories.tsx
@@ -0,0 +1,43 @@
+import styled from '@emotion/styled';
+import { Meta, StoryObj } from '@storybook/react';
+
+import { mockedCompanyObjectMetadataItem } from '@/object-record/record-field/__mocks__/fieldDefinitions';
+import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { FormProviderDecorator } from '~/testing/decorators/FormProviderDecorator';
+import { IconsProviderDecorator } from '~/testing/decorators/IconsProviderDecorator';
+
+import { SettingsDataModelObjectAboutForm } from '../SettingsDataModelObjectAboutForm';
+
+const StyledContainer = styled.div`
+  flex: 1;
+`;
+
+const meta: Meta<typeof SettingsDataModelObjectAboutForm> = {
+  title:
+    'Modules/Settings/DataModel/Objects/Forms/SettingsDataModelObjectAboutForm',
+  component: SettingsDataModelObjectAboutForm,
+  decorators: [
+    (Story) => (
+      <StyledContainer>
+        <Story />
+      </StyledContainer>
+    ),
+    FormProviderDecorator,
+    IconsProviderDecorator,
+    ComponentDecorator,
+  ],
+  parameters: {
+    container: { width: 520 },
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof SettingsDataModelObjectAboutForm>;
+
+export const Default: Story = {};
+
+export const WithDefaultValues: Story = {
+  args: {
+    objectMetadataItem: mockedCompanyObjectMetadataItem,
+  },
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/types/SettingsSupportedFieldType.ts b/packages/twenty-front/src/modules/settings/data-model/types/SettingsSupportedFieldType.ts
new file mode 100644
index 000000000000..0149601685e3
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/types/SettingsSupportedFieldType.ts
@@ -0,0 +1,6 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+export type SettingsSupportedFieldType = Exclude<
+  FieldMetadataType,
+  FieldMetadataType.Position
+>;
diff --git a/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/getFieldDefaultPreviewValue.test.ts b/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/getFieldDefaultPreviewValue.test.ts
index 18b9117d6afd..41579bfc94a3 100644
--- a/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/getFieldDefaultPreviewValue.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/getFieldDefaultPreviewValue.test.ts
@@ -37,7 +37,7 @@ describe('getFieldDefaultPreviewValue', () => {
       });
 
       // Then
-      expect(result).toEqual(selectOptions[1]);
+      expect(result).toEqual(selectOptions[1].value);
     });
 
     it('returns the first select option if no default option was found', () => {
@@ -46,7 +46,7 @@ describe('getFieldDefaultPreviewValue', () => {
       const fieldMetadataItem = mockedCompanyObjectMetadataItem.fields.find(
         ({ name }) => name === 'industry',
       )!;
-      const selectOptions = [
+      const selectOptions: SettingsObjectFieldSelectFormValues = [
         {
           color: 'purple' as const,
           label: '🏭 Industry',
@@ -67,7 +67,7 @@ describe('getFieldDefaultPreviewValue', () => {
       });
 
       // Then
-      expect(result).toEqual(selectOptions[0]);
+      expect(result).toEqual(selectOptions[0].value);
     });
   });
 
diff --git a/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/getFieldPreviewValueFromRecord.test.ts b/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/getFieldPreviewValueFromRecord.test.ts
index 3737f25102e8..12e6915292e9 100644
--- a/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/getFieldPreviewValueFromRecord.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/getFieldPreviewValueFromRecord.test.ts
@@ -42,7 +42,7 @@ describe('getFieldPreviewValueFromRecord', () => {
       });
 
       // Then
-      expect(result).toEqual(selectOptions[2]);
+      expect(result).toEqual(selectOptions[2].value);
     });
 
     it('returns undefined if the select option was not found', () => {
diff --git a/packages/twenty-front/src/modules/settings/data-model/utils/getFieldDefaultPreviewValue.ts b/packages/twenty-front/src/modules/settings/data-model/utils/getFieldDefaultPreviewValue.ts
index efb6483952c5..a9777ffda7ec 100644
--- a/packages/twenty-front/src/modules/settings/data-model/utils/getFieldDefaultPreviewValue.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/utils/getFieldDefaultPreviewValue.ts
@@ -3,8 +3,9 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/getLabelIdentifierFieldMetadataItem';
 import { isLabelIdentifierField } from '@/object-metadata/utils/isLabelIdentifierField';
 import { SettingsObjectFieldSelectFormValues } from '@/settings/data-model/components/SettingsObjectFieldSelectForm';
-import { SETTINGS_FIELD_METADATA_TYPES } from '@/settings/data-model/constants/SettingsFieldMetadataTypes';
+import { getSettingsFieldTypeConfig } from '@/settings/data-model/utils/getSettingsFieldTypeConfig';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { isDefined } from '~/utils/isDefined';
 
 export const getFieldDefaultPreviewValue = ({
   fieldMetadataItem,
@@ -20,27 +21,41 @@ export const getFieldDefaultPreviewValue = ({
   relationObjectMetadataItem?: ObjectMetadataItem;
   selectOptions?: SettingsObjectFieldSelectFormValues;
 }) => {
-  // Select field
-  if (fieldMetadataItem.type === FieldMetadataType.Select && selectOptions) {
-    return selectOptions.find(({ isDefault }) => isDefault) || selectOptions[0];
+  if (
+    fieldMetadataItem.type === FieldMetadataType.Select &&
+    isDefined(selectOptions)
+  ) {
+    const defaultSelectOption =
+      selectOptions.find(({ isDefault }) => isDefault) || selectOptions[0];
+    return defaultSelectOption.value;
+  }
+
+  if (
+    fieldMetadataItem.type === FieldMetadataType.MultiSelect &&
+    isDefined(selectOptions)
+  ) {
+    return selectOptions.map((selectOption) => selectOption.value);
   }
 
-  // Relation field
   if (
     fieldMetadataItem.type === FieldMetadataType.Relation &&
-    relationObjectMetadataItem
+    isDefined(relationObjectMetadataItem)
   ) {
     const relationLabelIdentifierFieldMetadataItem =
       getLabelIdentifierFieldMetadataItem(relationObjectMetadataItem);
 
     if (!relationLabelIdentifierFieldMetadataItem) return null;
 
+    const { type: relationLabelIdentifierFieldType } =
+      relationLabelIdentifierFieldMetadataItem;
+    const relationFieldTypeConfig = getSettingsFieldTypeConfig(
+      relationLabelIdentifierFieldType,
+    );
+
     const defaultRelationLabelIdentifierFieldValue =
-      relationLabelIdentifierFieldMetadataItem.type === FieldMetadataType.Text
+      relationLabelIdentifierFieldType === FieldMetadataType.Text
         ? relationObjectMetadataItem.labelSingular
-        : SETTINGS_FIELD_METADATA_TYPES[
-            relationLabelIdentifierFieldMetadataItem.type
-          ]?.defaultValue;
+        : relationFieldTypeConfig?.defaultValue;
 
     const defaultRelationRecord = {
       [relationLabelIdentifierFieldMetadataItem.name]:
@@ -61,8 +76,9 @@ export const getFieldDefaultPreviewValue = ({
       objectMetadataItem,
     });
 
-  // Other fields
+  const fieldTypeConfig = getSettingsFieldTypeConfig(fieldMetadataItem.type);
+
   return isLabelIdentifier && fieldMetadataItem.type === FieldMetadataType.Text
     ? objectMetadataItem.labelSingular
-    : SETTINGS_FIELD_METADATA_TYPES[fieldMetadataItem.type]?.defaultValue;
+    : fieldTypeConfig?.defaultValue;
 };
diff --git a/packages/twenty-front/src/modules/settings/data-model/utils/getFieldPreviewValueFromRecord.ts b/packages/twenty-front/src/modules/settings/data-model/utils/getFieldPreviewValueFromRecord.ts
index 79e0a952c90b..9e72b875520e 100644
--- a/packages/twenty-front/src/modules/settings/data-model/utils/getFieldPreviewValueFromRecord.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/utils/getFieldPreviewValueFromRecord.ts
@@ -18,7 +18,7 @@ export const getFieldPreviewValueFromRecord = ({
   if (fieldMetadataItem.type === FieldMetadataType.Select) {
     return selectOptions?.find(
       (selectOption) => selectOption.value === recordFieldValue,
-    );
+    )?.value;
   }
 
   // Relation fields (to many)
diff --git a/packages/twenty-front/src/modules/settings/data-model/utils/getObjectTypeLabel.ts b/packages/twenty-front/src/modules/settings/data-model/utils/getObjectTypeLabel.ts
new file mode 100644
index 000000000000..9f34d717fb5d
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/utils/getObjectTypeLabel.ts
@@ -0,0 +1,39 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+
+export type ObjectTypeLabel =
+  | StandardObjectTypeLabel
+  | CustomObjectTypeLabel
+  | RemoteObjectTypeLabel;
+
+type StandardObjectTypeLabel = {
+  labelText: 'Standard';
+  labelColor: 'blue';
+};
+
+type CustomObjectTypeLabel = {
+  labelText: 'Custom';
+  labelColor: 'orange';
+};
+
+type RemoteObjectTypeLabel = {
+  labelText: 'Remote';
+  labelColor: 'green';
+};
+
+export const getObjectTypeLabel = (
+  objectMetadataItem: ObjectMetadataItem,
+): ObjectTypeLabel =>
+  objectMetadataItem.isCustom
+    ? {
+        labelText: 'Custom',
+        labelColor: 'orange',
+      }
+    : objectMetadataItem.isRemote
+      ? {
+          labelText: 'Remote',
+          labelColor: 'green',
+        }
+      : {
+          labelText: 'Standard',
+          labelColor: 'blue',
+        };
diff --git a/packages/twenty-front/src/modules/settings/data-model/utils/getSettingsFieldTypeConfig.ts b/packages/twenty-front/src/modules/settings/data-model/utils/getSettingsFieldTypeConfig.ts
new file mode 100644
index 000000000000..9d643ee6ad49
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/utils/getSettingsFieldTypeConfig.ts
@@ -0,0 +1,8 @@
+import { SETTINGS_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsFieldTypeConfigs';
+import { isFieldTypeSupportedInSettings } from '@/settings/data-model/utils/isFieldTypeSupportedInSettings';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+export const getSettingsFieldTypeConfig = (fieldType: FieldMetadataType) =>
+  isFieldTypeSupportedInSettings(fieldType)
+    ? SETTINGS_FIELD_TYPE_CONFIGS[fieldType]
+    : undefined;
diff --git a/packages/twenty-front/src/modules/settings/data-model/utils/isFieldTypeSupportedInSettings.ts b/packages/twenty-front/src/modules/settings/data-model/utils/isFieldTypeSupportedInSettings.ts
new file mode 100644
index 000000000000..4d9a377b704a
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/utils/isFieldTypeSupportedInSettings.ts
@@ -0,0 +1,8 @@
+import { SETTINGS_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsFieldTypeConfigs';
+import { SettingsSupportedFieldType } from '@/settings/data-model/types/SettingsSupportedFieldType';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+export const isFieldTypeSupportedInSettings = (
+  fieldType: FieldMetadataType,
+): fieldType is SettingsSupportedFieldType =>
+  fieldType in SETTINGS_FIELD_TYPE_CONFIGS;
diff --git a/packages/twenty-front/src/modules/settings/data-model/validation-schemas/__tests__/settingsCreateObjectInputSchema.test.ts b/packages/twenty-front/src/modules/settings/data-model/validation-schemas/__tests__/settingsCreateObjectInputSchema.test.ts
new file mode 100644
index 000000000000..21b168a50bff
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/validation-schemas/__tests__/settingsCreateObjectInputSchema.test.ts
@@ -0,0 +1,47 @@
+import { SafeParseSuccess } from 'zod';
+
+import { CreateObjectInput } from '~/generated-metadata/graphql';
+
+import { settingsCreateObjectInputSchema } from '../settingsCreateObjectInputSchema';
+
+describe('settingsCreateObjectInputSchema', () => {
+  it('validates a valid input and adds name properties', () => {
+    // Given
+    const validInput = {
+      description: 'A valid description',
+      icon: 'IconPlus',
+      labelPlural: ' Labels     ',
+      labelSingular: 'Label ',
+    };
+
+    // When
+    const result = settingsCreateObjectInputSchema.safeParse(validInput);
+
+    // Then
+    expect(result.success).toBe(true);
+    expect((result as SafeParseSuccess<CreateObjectInput>).data).toEqual({
+      description: validInput.description,
+      icon: validInput.icon,
+      labelPlural: 'Labels',
+      labelSingular: 'Label',
+      namePlural: 'labels',
+      nameSingular: 'label',
+    });
+  });
+
+  it('fails for an invalid input', () => {
+    // Given
+    const invalidInput = {
+      description: 123,
+      icon: true,
+      labelPlural: [],
+      labelSingular: {},
+    };
+
+    // When
+    const result = settingsCreateObjectInputSchema.safeParse(invalidInput);
+
+    // Then
+    expect(result.success).toBe(false);
+  });
+});
diff --git a/packages/twenty-front/src/modules/settings/data-model/validation-schemas/__tests__/settingsUpdateObjectInputSchema.test.ts b/packages/twenty-front/src/modules/settings/data-model/validation-schemas/__tests__/settingsUpdateObjectInputSchema.test.ts
new file mode 100644
index 000000000000..0147790fed9f
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/validation-schemas/__tests__/settingsUpdateObjectInputSchema.test.ts
@@ -0,0 +1,50 @@
+import { SafeParseSuccess } from 'zod';
+
+import { UpdateObjectInput } from '~/generated-metadata/graphql';
+
+import { settingsUpdateObjectInputSchema } from '../settingsUpdateObjectInputSchema';
+
+describe('settingsUpdateObjectInputSchema', () => {
+  it('validates a valid input and adds name properties', () => {
+    // Given
+    const validInput = {
+      description: 'A valid description',
+      icon: 'IconName',
+      labelPlural: 'Labels Plural    ',
+      labelSingular: '   Label Singular',
+      labelIdentifierFieldMetadataId: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
+    };
+
+    // When
+    const result = settingsUpdateObjectInputSchema.safeParse(validInput);
+
+    // Then
+    expect(result.success).toBe(true);
+    expect((result as SafeParseSuccess<UpdateObjectInput>).data).toEqual({
+      description: validInput.description,
+      icon: validInput.icon,
+      labelIdentifierFieldMetadataId: validInput.labelIdentifierFieldMetadataId,
+      labelPlural: 'Labels Plural',
+      labelSingular: 'Label Singular',
+      namePlural: 'labelsPlural',
+      nameSingular: 'labelSingular',
+    });
+  });
+
+  it('fails for an invalid input', () => {
+    // Given
+    const invalidInput = {
+      description: 123,
+      icon: true,
+      labelPlural: [],
+      labelSingular: {},
+      labelIdentifierFieldMetadataId: 'invalid uuid',
+    };
+
+    // When
+    const result = settingsUpdateObjectInputSchema.safeParse(invalidInput);
+
+    // Then
+    expect(result.success).toBe(false);
+  });
+});
diff --git a/packages/twenty-front/src/modules/settings/data-model/validation-schemas/settingsCreateObjectInputSchema.ts b/packages/twenty-front/src/modules/settings/data-model/validation-schemas/settingsCreateObjectInputSchema.ts
new file mode 100644
index 000000000000..0188eda77e2c
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/validation-schemas/settingsCreateObjectInputSchema.ts
@@ -0,0 +1,17 @@
+import camelCase from 'lodash.camelcase';
+
+import { objectMetadataItemSchema } from '@/object-metadata/validation-schemas/objectMetadataItemSchema';
+import { CreateObjectInput } from '~/generated-metadata/graphql';
+
+export const settingsCreateObjectInputSchema = objectMetadataItemSchema
+  .pick({
+    description: true,
+    icon: true,
+    labelPlural: true,
+    labelSingular: true,
+  })
+  .transform<CreateObjectInput>((value) => ({
+    ...value,
+    nameSingular: camelCase(value.labelSingular),
+    namePlural: camelCase(value.labelPlural),
+  }));
diff --git a/packages/twenty-front/src/modules/settings/data-model/validation-schemas/settingsUpdateObjectInputSchema.ts b/packages/twenty-front/src/modules/settings/data-model/validation-schemas/settingsUpdateObjectInputSchema.ts
new file mode 100644
index 000000000000..36e8ee008c93
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/validation-schemas/settingsUpdateObjectInputSchema.ts
@@ -0,0 +1,23 @@
+import camelCase from 'lodash.camelcase';
+
+import { objectMetadataItemSchema } from '@/object-metadata/validation-schemas/objectMetadataItemSchema';
+import { UpdateObjectInput } from '~/generated-metadata/graphql';
+
+export const settingsUpdateObjectInputSchema = objectMetadataItemSchema
+  .pick({
+    description: true,
+    icon: true,
+    imageIdentifierFieldMetadataId: true,
+    isActive: true,
+    labelIdentifierFieldMetadataId: true,
+    labelPlural: true,
+    labelSingular: true,
+  })
+  .partial()
+  .transform<UpdateObjectInput>((value) => ({
+    ...value,
+    nameSingular: value.labelSingular
+      ? camelCase(value.labelSingular)
+      : undefined,
+    namePlural: value.labelPlural ? camelCase(value.labelPlural) : undefined,
+  }));
diff --git a/packages/twenty-front/src/modules/settings/developers/components/ApiKeyInput.tsx b/packages/twenty-front/src/modules/settings/developers/components/ApiKeyInput.tsx
index 3969992d7a05..5ae7e180af3d 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/ApiKeyInput.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/ApiKeyInput.tsx
@@ -1,7 +1,7 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconCopy } from 'twenty-ui';
 
-import { IconCopy } from '@/ui/display/icon';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { Button } from '@/ui/input/button/components/Button';
 import { TextInput } from '@/ui/input/components/TextInput';
diff --git a/packages/twenty-front/src/modules/settings/developers/components/SettingsApiKeysFieldItemTableRow.tsx b/packages/twenty-front/src/modules/settings/developers/components/SettingsApiKeysFieldItemTableRow.tsx
index f2292d94b5bf..502199e04e4d 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/SettingsApiKeysFieldItemTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/SettingsApiKeysFieldItemTableRow.tsx
@@ -1,8 +1,8 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconChevronRight } from 'twenty-ui';
 
 import { ApiFieldItem } from '@/settings/developers/types/api-key/ApiFieldItem';
-import { IconChevronRight } from '@/ui/display/icon';
 import { TableCell } from '@/ui/layout/table/components/TableCell';
 import { TableRow } from '@/ui/layout/table/components/TableRow';
 
diff --git a/packages/twenty-front/src/modules/settings/developers/components/SettingsApiKeysTable.tsx b/packages/twenty-front/src/modules/settings/developers/components/SettingsApiKeysTable.tsx
new file mode 100644
index 000000000000..9e8baaa8950a
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/developers/components/SettingsApiKeysTable.tsx
@@ -0,0 +1,53 @@
+import { useNavigate } from 'react-router-dom';
+import styled from '@emotion/styled';
+
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+import { SettingsApiKeysFieldItemTableRow } from '@/settings/developers/components/SettingsApiKeysFieldItemTableRow';
+import { ApiFieldItem } from '@/settings/developers/types/api-key/ApiFieldItem';
+import { ApiKey } from '@/settings/developers/types/api-key/ApiKey';
+import { formatExpirations } from '@/settings/developers/utils/format-expiration';
+import { Table } from '@/ui/layout/table/components/Table';
+import { TableBody } from '@/ui/layout/table/components/TableBody';
+import { TableHeader } from '@/ui/layout/table/components/TableHeader';
+import { TableRow } from '@/ui/layout/table/components/TableRow';
+
+const StyledTableBody = styled(TableBody)`
+  border-bottom: 1px solid ${({ theme }) => theme.border.color.light};
+`;
+
+const StyledTableRow = styled(TableRow)`
+  grid-template-columns: 312px 132px 68px;
+`;
+
+export const SettingsApiKeysTable = () => {
+  const navigate = useNavigate();
+
+  const { records: apiKeys } = useFindManyRecords<ApiKey>({
+    objectNameSingular: CoreObjectNameSingular.ApiKey,
+    filter: { revokedAt: { is: 'NULL' } },
+  });
+
+  return (
+    <Table>
+      <StyledTableRow>
+        <TableHeader>Name</TableHeader>
+        <TableHeader>Expiration</TableHeader>
+        <TableHeader></TableHeader>
+      </StyledTableRow>
+      {!!apiKeys.length && (
+        <StyledTableBody>
+          {formatExpirations(apiKeys).map((fieldItem) => (
+            <SettingsApiKeysFieldItemTableRow
+              key={fieldItem.id}
+              fieldItem={fieldItem as ApiFieldItem}
+              onClick={() => {
+                navigate(`/settings/developers/api-keys/${fieldItem.id}`);
+              }}
+            />
+          ))}
+        </StyledTableBody>
+      )}
+    </Table>
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookTableRow.tsx b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookTableRow.tsx
index fc391fd2775e..74a735267490 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookTableRow.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconChevronRight } from 'twenty-ui';
 
 import { WebhookFieldItem } from '@/settings/developers/types/webhook/WebhookFieldItem';
-import { IconChevronRight } from '@/ui/display/icon';
 import { TableCell } from '@/ui/layout/table/components/TableCell';
 import { TableRow } from '@/ui/layout/table/components/TableRow';
 
diff --git a/packages/twenty-front/src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx b/packages/twenty-front/src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx
new file mode 100644
index 000000000000..305266b8a6f2
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx
@@ -0,0 +1,18 @@
+import { IconBook2 } from 'twenty-ui';
+
+import { Button } from '@/ui/input/button/components/Button';
+
+export const SettingsReadDocumentationButton = () => {
+  return (
+    <Button
+      title="Read documentation"
+      variant="primary"
+      accent="default"
+      size="small"
+      Icon={IconBook2}
+      onClick={() => {
+        window.open('https://docs.twenty.com');
+      }}
+    ></Button>
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/developers/components/SettingsWebhooksTable.tsx b/packages/twenty-front/src/modules/settings/developers/components/SettingsWebhooksTable.tsx
new file mode 100644
index 000000000000..f20c81cb80d4
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/developers/components/SettingsWebhooksTable.tsx
@@ -0,0 +1,51 @@
+import { useNavigate } from 'react-router-dom';
+import styled from '@emotion/styled';
+
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+import { SettingsDevelopersWebhookTableRow } from '@/settings/developers/components/SettingsDevelopersWebhookTableRow';
+import { WebhookFieldItem } from '@/settings/developers/types/webhook/WebhookFieldItem';
+import { Table } from '@/ui/layout/table/components/Table';
+import { TableBody } from '@/ui/layout/table/components/TableBody';
+import { TableHeader } from '@/ui/layout/table/components/TableHeader';
+import { TableRow } from '@/ui/layout/table/components/TableRow';
+
+const StyledTableBody = styled(TableBody)`
+  border-bottom: 1px solid ${({ theme }) => theme.border.color.light};
+`;
+
+const StyledTableRow = styled(TableRow)`
+  grid-template-columns: 444px 68px;
+`;
+
+export const SettingsWebhooksTable = () => {
+  const navigate = useNavigate();
+
+  const { records: webhooks } = useFindManyRecords<WebhookFieldItem>({
+    objectNameSingular: CoreObjectNameSingular.Webhook,
+  });
+
+  return (
+    <Table>
+      <StyledTableRow>
+        <TableHeader>Url</TableHeader>
+        <TableHeader></TableHeader>
+      </StyledTableRow>
+      {!!webhooks.length && (
+        <StyledTableBody>
+          {webhooks.map((webhookFieldItem) => (
+            <SettingsDevelopersWebhookTableRow
+              key={webhookFieldItem.id}
+              fieldItem={webhookFieldItem}
+              onClick={() => {
+                navigate(
+                  `/settings/developers/webhooks/${webhookFieldItem.id}`,
+                );
+              }}
+            />
+          ))}
+        </StyledTableBody>
+      )}
+    </Table>
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/developers/hooks/useGeneratedApiKeys.ts b/packages/twenty-front/src/modules/settings/developers/hooks/useGeneratedApiKeys.ts
index 888337370a91..42dbbe0d46f1 100644
--- a/packages/twenty-front/src/modules/settings/developers/hooks/useGeneratedApiKeys.ts
+++ b/packages/twenty-front/src/modules/settings/developers/hooks/useGeneratedApiKeys.ts
@@ -8,5 +8,6 @@ export const useGeneratedApiKeys = () => {
       (apiKeyId: string, apiKey: string | null) => {
         set(generatedApiKeyFamilyState(apiKeyId), apiKey);
       },
+    [],
   );
 };
diff --git a/packages/twenty-front/src/modules/settings/developers/states/generatedApiKeyFamilyState.ts b/packages/twenty-front/src/modules/settings/developers/states/generatedApiKeyFamilyState.ts
index 329e1b6487bf..f12c24e7ddaf 100644
--- a/packages/twenty-front/src/modules/settings/developers/states/generatedApiKeyFamilyState.ts
+++ b/packages/twenty-front/src/modules/settings/developers/states/generatedApiKeyFamilyState.ts
@@ -1,9 +1,9 @@
-import { atomFamily } from 'recoil';
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
 
-export const generatedApiKeyFamilyState = atomFamily<
+export const generatedApiKeyFamilyState = createFamilyState<
   string | null | undefined,
   string
 >({
   key: 'generatedApiKeyFamilyState',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/settings/developers/utils/format-expiration.ts b/packages/twenty-front/src/modules/settings/developers/utils/format-expiration.ts
index a980448155c1..587f69163918 100644
--- a/packages/twenty-front/src/modules/settings/developers/utils/format-expiration.ts
+++ b/packages/twenty-front/src/modules/settings/developers/utils/format-expiration.ts
@@ -1,13 +1,15 @@
+import { isNonEmptyString } from '@sniptt/guards';
+
 import { ApiFieldItem } from '@/settings/developers/types/api-key/ApiFieldItem';
 import { ApiKey } from '@/settings/developers/types/api-key/ApiKey';
 import { beautifyDateDiff } from '~/utils/date-utils';
 
 export const formatExpiration = (
   expiresAt: string | null,
-  withExpiresMention: boolean = false,
-  short: boolean = true,
+  withExpiresMention = false,
+  short = true,
 ) => {
-  if (expiresAt) {
+  if (isNonEmptyString(expiresAt)) {
     const dateDiff = beautifyDateDiff(expiresAt, undefined, short);
     if (dateDiff.includes('-')) {
       return 'Expired';
diff --git a/packages/twenty-front/src/modules/settings/integrations/assets/preview-background.svg b/packages/twenty-front/src/modules/settings/integrations/assets/preview-background.svg
new file mode 100644
index 000000000000..b9fe4a3171e7
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/assets/preview-background.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" viewBox="0 0 512 144">
+  <rect width="539" height="143" x="-13.5" y=".5" fill="url(#a)" fill-opacity=".05" rx="7.5"/>
+  <rect width="539" height="143" x="-13.5" y=".5" fill="url(#b)" rx="7.5"/>
+  <rect width="539" height="143" x="-13.5" y=".5" stroke="#EBEBEB" rx="7.5"/>
+  <defs>
+    <radialGradient id="b" cx="0" cy="0" r="1" gradientTransform="matrix(270 0 0 487.572 256 72)" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FCFCFC" stop-opacity="0"/>
+      <stop offset="1" stop-color="#F8F8F8" stop-opacity=".9"/>
+    </radialGradient>
+    <pattern id="a" width=".044" height=".167" patternContentUnits="objectBoundingBox">
+      <use xlink:href="#c" transform="scale(.00035 .0013)"/>
+    </pattern>
+    <image xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAFaSURBVHgB7d2xDcAgDABBO/vvTETLCvfX0aKX5c47rvO8d0DfhFYAuALAFQCuAHAFgCsAXAHgCgBXALgCwBUArgBwBYArAFwB4AoAVwC4AsAVAK4AcAWAKwBcAeAKAFcAuALAFQCuAHAFgCsAXAHgCgBXALgCwBUArgBwBYArAFwB4AoAVwC4AsAVAK4AcAWAKwBcAeAKAFcAuALAFQCuAHAFgCsAXAHgCgBXALgCwBUArgBw92L2mbCaALgCwBUAbsf17j7kXzQBcAWAKwBcAeAKAFcAuALAFQCuAHAFgCsAXAHgCgBXALgCwBUArgBwBYArAFwB4AoAVwC4AsAVAK4AcAWAKwBcAeAKAFcAuALAFQCuAHAFgCsAXAHgCgBXALgCwBUArgBwBYArAFwB4AoAVwC4AsAVAK4AcAWAKwBcAeAKAFcAuALAFQCuAHAFgCsAXAHgCgD3A+UEA/3CEUcsAAAAAElFTkSuQmCC" id="c" width="128" height="128"/>
+  </defs>
+</svg>
\ No newline at end of file
diff --git a/packages/twenty-front/src/modules/settings/integrations/assets/sync.svg b/packages/twenty-front/src/modules/settings/integrations/assets/sync.svg
new file mode 100644
index 000000000000..b1d10480e071
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/assets/sync.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 126 23">
+  <path stroke="#000" stroke-dasharray="4.71 4.71" stroke-linecap="round" stroke-width="1.768" d="M125 11H1"/>
+  <g filter="url(#a)">
+    <circle cx="63" cy="11" r="10.667" fill="#fff" style="mix-blend-mode:normal"/>
+    <circle cx="63" cy="11" r="10.203" stroke="#000" stroke-width=".928"/>
+  </g>
+  <path fill="#000" d="M60.38 8.425a3.758 3.758 0 0 1 5.223-.022l-.955.935a.54.54 0 0 0-.12.597c.085.205.29.337.514.337h2.968a.55.55 0 0 0 .557-.547V6.811a.546.546 0 0 0-.343-.506.565.565 0 0 0-.608.119l-.964.947c-2.032-1.97-5.304-1.963-7.323.023a5.06 5.06 0 0 0-1.225 1.908.725.725 0 0 0 .453.929.746.746 0 0 0 .946-.444 3.6 3.6 0 0 1 .876-1.362Zm-2.944 3.85v2.915c0 .221.135.422.344.506a.565.565 0 0 0 .607-.118l.965-.948c2.031 1.97 5.303 1.963 7.323-.023a5.077 5.077 0 0 0 1.227-1.905.725.725 0 0 0-.453-.93.746.746 0 0 0-.946.445 3.598 3.598 0 0 1-.876 1.361 3.758 3.758 0 0 1-5.225.023l.953-.938a.54.54 0 0 0 .12-.597.556.556 0 0 0-.514-.337h-2.968a.55.55 0 0 0-.556.547Z"/>
+  <defs>
+    <filter id="a" width="22.261" height="22.261" x="51.406" y=".333" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+      <feOffset dx="-.93" dy=".928"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+      <feBlend in="SourceGraphic" result="shape"/>
+    </filter>
+  </defs>
+</svg>
\ No newline at end of file
diff --git a/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationComponent.tsx b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationComponent.tsx
new file mode 100644
index 000000000000..7ef589cc4e00
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationComponent.tsx
@@ -0,0 +1,111 @@
+import { useNavigate } from 'react-router-dom';
+import { css } from '@emotion/react';
+import styled from '@emotion/styled';
+import { IconArrowUpRight, IconBolt, IconPlus, Pill } from 'twenty-ui';
+
+import { SettingsIntegration } from '@/settings/integrations/types/SettingsIntegration';
+import { Status } from '@/ui/display/status/components/Status';
+import { Button } from '@/ui/input/button/components/Button';
+import { isDefined } from '~/utils/isDefined';
+
+interface SettingsIntegrationComponentProps {
+  integration: SettingsIntegration;
+}
+
+const StyledContainer = styled.div`
+  align-items: center;
+  background: ${({ theme }) => theme.background.secondary};
+  border: 1px solid ${({ theme }) => theme.border.color.medium};
+  border-radius: ${({ theme }) => theme.border.radius.md};
+  font-size: ${({ theme }) => theme.font.size.md};
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  padding: ${({ theme }) => theme.spacing(3)};
+
+  ${({ onClick }) =>
+    isDefined(onClick) &&
+    css`
+      cursor: pointer;
+    `}
+`;
+
+const StyledSection = styled.div`
+  align-items: center;
+  display: flex;
+  flex-direction: row;
+  gap: ${({ theme }) => theme.spacing(3)};
+`;
+
+const StyledIntegrationLogo = styled.div`
+  align-items: center;
+  display: flex;
+  flex-direction: row;
+  gap: ${({ theme }) => theme.spacing(2)};
+  color: ${({ theme }) => theme.border.color.strong};
+`;
+
+const StyledSoonPill = styled(Pill)`
+  padding: ${({ theme }) => theme.spacing(1)} ${({ theme }) => theme.spacing(2)};
+`;
+
+const StyledLogo = styled.img`
+  height: 24px;
+  width: 24px;
+`;
+
+export const SettingsIntegrationComponent = ({
+  integration,
+}: SettingsIntegrationComponentProps) => {
+  const navigate = useNavigate();
+
+  const navigateToIntegrationPage = () => navigate(integration.link);
+  const openExternalLink = () => window.open(integration.link);
+
+  return (
+    <StyledContainer
+      onClick={
+        integration.type === 'Active' ? navigateToIntegrationPage : undefined
+      }
+    >
+      <StyledSection>
+        <StyledIntegrationLogo>
+          <StyledLogo src={integration.from.image} alt={integration.from.key} />
+          {isDefined(integration.to) && (
+            <>
+              <div>→</div>
+              <StyledLogo src={integration.to.image} alt={integration.to.key} />
+            </>
+          )}
+        </StyledIntegrationLogo>
+        {integration.text}
+      </StyledSection>
+      {integration.type === 'Soon' ? (
+        <StyledSoonPill label="Soon" />
+      ) : integration.type === 'Active' ? (
+        <Status color="green" text="Active" />
+      ) : integration.type === 'Add' ? (
+        <Button
+          onClick={navigateToIntegrationPage}
+          Icon={IconPlus}
+          title="Add"
+          size="small"
+        />
+      ) : integration.type === 'Use' ? (
+        <Button
+          onClick={openExternalLink}
+          Icon={IconBolt}
+          title="Use"
+          size="small"
+        />
+      ) : (
+        <Button
+          onClick={openExternalLink}
+          Icon={IconArrowUpRight}
+          title={integration.linkText}
+          size="small"
+        />
+      )}
+    </StyledContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationDatabaseConnectionForm.tsx b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationDatabaseConnectionForm.tsx
new file mode 100644
index 000000000000..22f389e14a03
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationDatabaseConnectionForm.tsx
@@ -0,0 +1,63 @@
+import { Controller, useFormContext } from 'react-hook-form';
+import styled from '@emotion/styled';
+import { z } from 'zod';
+
+import { TextInput } from '@/ui/input/components/TextInput';
+
+export const settingsIntegrationPostgreSQLConnectionFormSchema = z.object({
+  dbname: z.string().min(1),
+  host: z.string().min(1),
+  port: z.preprocess((val) => parseInt(val as string), z.number().positive()),
+  username: z.string().min(1),
+  password: z.string().min(1),
+});
+
+type SettingsIntegrationPostgreSQLConnectionFormValues = z.infer<
+  typeof settingsIntegrationPostgreSQLConnectionFormSchema
+>;
+
+const StyledInputsContainer = styled.div`
+  display: grid;
+  gap: ${({ theme }) => theme.spacing(2, 4)};
+  grid-template-columns: 1fr 1fr;
+  grid-template-areas:
+    'input-1 input-1'
+    'input-2 input-3'
+    'input-4 input-5';
+
+  & :first-of-type {
+    grid-area: input-1;
+  }
+`;
+
+export const SettingsIntegrationPostgreSQLConnectionForm = () => {
+  const { control } =
+    useFormContext<SettingsIntegrationPostgreSQLConnectionFormValues>();
+
+  return (
+    <StyledInputsContainer>
+      {[
+        { name: 'dbname' as const, label: 'Database Name' },
+        { name: 'host' as const, label: 'Host' },
+        { name: 'port' as const, label: 'Port' },
+        { name: 'username' as const, label: 'Username' },
+        { name: 'password' as const, label: 'Password', type: 'password' },
+      ].map(({ name, label, type }) => (
+        <Controller
+          key={name}
+          name={name}
+          control={control}
+          render={({ field: { onChange, value } }) => (
+            <TextInput
+              label={label}
+              value={value}
+              onChange={onChange}
+              fullWidth
+              type={type}
+            />
+          )}
+        />
+      ))}
+    </StyledInputsContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationDatabaseConnectionSyncStatus.tsx b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationDatabaseConnectionSyncStatus.tsx
new file mode 100644
index 000000000000..a13aede906dd
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationDatabaseConnectionSyncStatus.tsx
@@ -0,0 +1,33 @@
+import { useGetDatabaseConnectionTables } from '@/databases/hooks/useGetDatabaseConnectionTables';
+import { Status } from '@/ui/display/status/components/Status';
+import { RemoteTableStatus } from '~/generated-metadata/graphql';
+
+type SettingsIntegrationDatabaseConnectionSyncStatusProps = {
+  connectionId: string;
+  skip?: boolean;
+};
+
+export const SettingsIntegrationDatabaseConnectionSyncStatus = ({
+  connectionId,
+  skip,
+}: SettingsIntegrationDatabaseConnectionSyncStatusProps) => {
+  const { tables } = useGetDatabaseConnectionTables({
+    connectionId,
+    skip,
+  });
+
+  const syncedTables = tables.filter(
+    (table) => table.status === RemoteTableStatus.Synced,
+  );
+
+  return (
+    <Status
+      color="green"
+      text={
+        syncedTables.length === 1
+          ? `1 tracked table`
+          : `${syncedTables.length} tracked tables`
+      }
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationDatabaseConnectionsListCard.tsx b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationDatabaseConnectionsListCard.tsx
new file mode 100644
index 000000000000..ecb425cd0997
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationDatabaseConnectionsListCard.tsx
@@ -0,0 +1,66 @@
+import { useNavigate } from 'react-router-dom';
+import styled from '@emotion/styled';
+import { IconChevronRight } from 'twenty-ui';
+
+import { SettingsListCard } from '@/settings/components/SettingsListCard';
+import { SettingsIntegrationDatabaseConnectionSyncStatus } from '@/settings/integrations/components/SettingsIntegrationDatabaseConnectionSyncStatus';
+import { SettingsIntegration } from '@/settings/integrations/types/SettingsIntegration';
+import { getConnectionDbName } from '@/settings/integrations/utils/getConnectionDbName';
+import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
+import { RemoteServer } from '~/generated-metadata/graphql';
+
+type SettingsIntegrationDatabaseConnectionsListCardProps = {
+  integration: SettingsIntegration;
+  connections: RemoteServer[];
+};
+
+const StyledDatabaseLogoContainer = styled.div`
+  align-items: center;
+  display: flex;
+  height: ${({ theme }) => theme.spacing(4)};
+  justify-content: center;
+  width: ${({ theme }) => theme.spacing(4)};
+`;
+
+const StyledDatabaseLogo = styled.img`
+  height: 100%;
+`;
+
+const StyledRowRightContainer = styled.div`
+  align-items: center;
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+`;
+
+export const SettingsIntegrationDatabaseConnectionsListCard = ({
+  integration,
+  connections,
+}: SettingsIntegrationDatabaseConnectionsListCardProps) => {
+  const navigate = useNavigate();
+
+  return (
+    <SettingsListCard
+      items={connections}
+      RowIcon={() => (
+        <StyledDatabaseLogoContainer>
+          <StyledDatabaseLogo alt="" src={integration.from.image} />
+        </StyledDatabaseLogoContainer>
+      )}
+      RowRightComponent={({ item: connection }) => (
+        <StyledRowRightContainer>
+          <SettingsIntegrationDatabaseConnectionSyncStatus
+            connectionId={connection.id}
+          />
+          <LightIconButton Icon={IconChevronRight} accent="tertiary" />
+        </StyledRowRightContainer>
+      )}
+      onRowClick={(connection) => navigate(`./${connection.id}`)}
+      getItemLabel={(connection) =>
+        getConnectionDbName({ integration, connection })
+      }
+      hasFooter
+      footerButtonLabel="Add connection"
+      onFooterButtonClick={() => navigate('./new')}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationDatabaseTablesListCard.tsx b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationDatabaseTablesListCard.tsx
new file mode 100644
index 000000000000..f6e5cefe6d91
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationDatabaseTablesListCard.tsx
@@ -0,0 +1,91 @@
+import { useCallback, useState } from 'react';
+import styled from '@emotion/styled';
+import { z } from 'zod';
+
+import { useSyncRemoteTable } from '@/databases/hooks/useSyncRemoteTable';
+import { useUnsyncRemoteTable } from '@/databases/hooks/useUnsyncRemoteTable';
+import { SettingsListCard } from '@/settings/components/SettingsListCard';
+import { SettingsIntegrationRemoteTableSyncStatusToggle } from '@/settings/integrations/components/SettingsIntegrationRemoteTableSyncStatusToggle';
+import { RemoteTable, RemoteTableStatus } from '~/generated-metadata/graphql';
+import { isDefined } from '~/utils/isDefined';
+
+export const settingsIntegrationsDatabaseTablesSchema = z.object({
+  syncedTablesByName: z.record(z.boolean()),
+});
+
+export type SettingsIntegrationsDatabaseTablesFormValues = z.infer<
+  typeof settingsIntegrationsDatabaseTablesSchema
+>;
+
+type SettingsIntegrationDatabaseTablesListCardProps = {
+  connectionId: string;
+  tables: RemoteTable[];
+};
+
+const StyledRowRightContainer = styled.div`
+  align-items: center;
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+`;
+
+export const SettingsIntegrationDatabaseTablesListCard = ({
+  connectionId,
+  tables,
+}: SettingsIntegrationDatabaseTablesListCardProps) => {
+  const { syncRemoteTable } = useSyncRemoteTable();
+  const { unsyncRemoteTable } = useUnsyncRemoteTable();
+
+  // We need to use a state because the table status update re-render the whole list of toggles
+  const [items] = useState(
+    tables.map((table) => ({
+      id: table.name,
+      ...table,
+    })),
+  );
+
+  const onSyncUpdate = useCallback(
+    async (isSynced: boolean, tableName: string) => {
+      const table = items.find((table) => table.name === tableName);
+
+      if (!isDefined(table)) return;
+
+      if (isSynced) {
+        await syncRemoteTable({
+          remoteServerId: connectionId,
+          name: tableName,
+          schema: table.schema,
+        });
+      } else {
+        await unsyncRemoteTable({
+          remoteServerId: connectionId,
+          name: tableName,
+          schema: table.schema,
+        });
+      }
+    },
+    [items, syncRemoteTable, connectionId, unsyncRemoteTable],
+  );
+
+  const rowRightComponent = useCallback(
+    ({
+      item,
+    }: {
+      item: { id: string; name: string; status: RemoteTableStatus };
+    }) => (
+      <StyledRowRightContainer>
+        <SettingsIntegrationRemoteTableSyncStatusToggle
+          table={item}
+          onSyncUpdate={onSyncUpdate}
+        />
+      </StyledRowRightContainer>
+    ),
+    [onSyncUpdate],
+  );
+  return (
+    <SettingsListCard
+      items={items}
+      RowRightComponent={rowRightComponent}
+      getItemLabel={(table) => table.id}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationGroup.tsx b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationGroup.tsx
new file mode 100644
index 000000000000..7dab165dfc52
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationGroup.tsx
@@ -0,0 +1,62 @@
+import styled from '@emotion/styled';
+
+import { SettingsIntegrationComponent } from '@/settings/integrations/components/SettingsIntegrationComponent';
+import { SettingsIntegrationCategory } from '@/settings/integrations/types/SettingsIntegrationCategory';
+import { H2Title } from '@/ui/display/typography/components/H2Title';
+import { Section } from '@/ui/layout/section/components/Section';
+
+interface SettingsIntegrationGroupProps {
+  integrationGroup: SettingsIntegrationCategory;
+}
+
+const StyledIntegrationGroupHeader = styled.div`
+  align-items: start;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+`;
+
+const StyledGroupLink = styled.div`
+  align-items: start;
+  display: flex;
+  flex-direction: row;
+  font-size: ${({ theme }) => theme.font.size.md};
+  gap: ${({ theme }) => theme.spacing(1)};
+  cursor: pointer;
+`;
+
+const StyledIntegrationsSection = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: ${({ theme }) => theme.spacing(4)};
+`;
+
+export const SettingsIntegrationGroup = ({
+  integrationGroup,
+}: SettingsIntegrationGroupProps) => (
+  <Section>
+    <StyledIntegrationGroupHeader>
+      <H2Title title={integrationGroup.title} />
+      {integrationGroup.hyperlink && (
+        <StyledGroupLink
+          onClick={() => window.open(integrationGroup.hyperlink ?? '')}
+        >
+          <div>{integrationGroup.hyperlinkText}</div>
+          <div>→</div>
+        </StyledGroupLink>
+      )}
+    </StyledIntegrationGroupHeader>
+    <StyledIntegrationsSection>
+      {integrationGroup.integrations.map((integration) => (
+        <SettingsIntegrationComponent
+          key={[
+            integrationGroup.key,
+            integration.from.key,
+            integration.to?.key,
+          ].join('-')}
+          integration={integration}
+        />
+      ))}
+    </StyledIntegrationsSection>
+  </Section>
+);
diff --git a/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationPreview.tsx b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationPreview.tsx
new file mode 100644
index 000000000000..4b66adedc0c8
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationPreview.tsx
@@ -0,0 +1,77 @@
+import styled from '@emotion/styled';
+
+import { Card } from '@/ui/layout/card/components/Card';
+import { CardContent } from '@/ui/layout/card/components/CardContent';
+
+import PreviewBackgroundImage from '../assets/preview-background.svg';
+import SyncImage from '../assets/sync.svg?react';
+
+type SettingsIntegrationPreviewProps = {
+  integrationLogoUrl: string;
+};
+
+const StyledCard = styled(Card)`
+  border: 0;
+`;
+
+const StyledCardContent = styled(CardContent)`
+  background-image: url(${PreviewBackgroundImage});
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  gap: ${({ theme }) => theme.spacing(1)};
+  height: ${({ theme }) => theme.spacing(28)};
+`;
+
+const StyledLogosContainer = styled.div`
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  gap: ${({ theme }) => theme.spacing(4)};
+`;
+
+const StyledIntegrationLogoContainer = styled.div`
+  align-items: center;
+  display: flex;
+  height: ${({ theme }) => theme.spacing(16)};
+  justify-content: center;
+  width: ${({ theme }) => theme.spacing(16)};
+`;
+
+const StyledIntegrationLogo = styled.img`
+  height: 100%;
+`;
+
+const StyledTwentyLogo = styled.img`
+  height: ${({ theme }) => theme.spacing(12)};
+  padding: ${({ theme }) => theme.spacing(2)};
+`;
+
+const StyledSyncImage = styled(SyncImage)`
+  width: ${({ theme }) => theme.spacing(31)};
+`;
+
+const StyledLabel = styled.div`
+  color: ${({ theme }) => theme.font.color.tertiary};
+  font-size: ${({ theme }) => theme.font.size.sm};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  line-height: ${({ theme }) => theme.spacing(6)};
+`;
+
+export const SettingsIntegrationPreview = ({
+  integrationLogoUrl,
+}: SettingsIntegrationPreviewProps) => (
+  <StyledCard>
+    <StyledCardContent>
+      <StyledLogosContainer>
+        <StyledIntegrationLogoContainer>
+          <StyledIntegrationLogo alt="" src={integrationLogoUrl} />
+        </StyledIntegrationLogoContainer>
+        <StyledSyncImage />
+        <StyledTwentyLogo alt="" src="/images/integrations/twenty-logo.svg" />
+      </StyledLogosContainer>
+      <StyledLabel>Import your tables as remote objects</StyledLabel>
+    </StyledCardContent>
+  </StyledCard>
+);
diff --git a/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationRemoteTableSyncStatusToggle.tsx b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationRemoteTableSyncStatusToggle.tsx
new file mode 100644
index 000000000000..3b4e403ced03
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationRemoteTableSyncStatusToggle.tsx
@@ -0,0 +1,29 @@
+import { useState } from 'react';
+
+import { Toggle } from '@/ui/input/components/Toggle';
+import { RemoteTableStatus } from '~/generated-metadata/graphql';
+
+export const SettingsIntegrationRemoteTableSyncStatusToggle = ({
+  table,
+  onSyncUpdate,
+}: {
+  table: { id: string; name: string; status: RemoteTableStatus };
+  onSyncUpdate: (value: boolean, tableName: string) => Promise<void>;
+}) => {
+  const [isToggleLoading, setIsToggleLoading] = useState(false);
+
+  const onChange = async (newValue: boolean) => {
+    if (isToggleLoading) return;
+    setIsToggleLoading(true);
+    await onSyncUpdate(newValue, table.name);
+    setIsToggleLoading(false);
+  };
+
+  return (
+    <Toggle
+      value={table.status === RemoteTableStatus.Synced}
+      disabled={isToggleLoading}
+      onChange={onChange}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/integrations/constants/MockRemoteDatabases.ts b/packages/twenty-front/src/modules/settings/integrations/constants/MockRemoteDatabases.ts
new file mode 100644
index 000000000000..d15c6cbd95bb
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/constants/MockRemoteDatabases.ts
@@ -0,0 +1,10 @@
+export const MOCK_REMOTE_DATABASES = [
+  {
+    name: 'airtable',
+    isActive: false,
+  },
+  {
+    name: 'postgresql',
+    isActive: true,
+  },
+];
diff --git a/packages/twenty-front/src/pages/settings/integrations/constants/SettingsIntegrationRequest.ts b/packages/twenty-front/src/modules/settings/integrations/constants/SettingsIntegrationRequest.ts
similarity index 82%
rename from packages/twenty-front/src/pages/settings/integrations/constants/SettingsIntegrationRequest.ts
rename to packages/twenty-front/src/modules/settings/integrations/constants/SettingsIntegrationRequest.ts
index 084959da0562..11efc0dc655c 100644
--- a/packages/twenty-front/src/pages/settings/integrations/constants/SettingsIntegrationRequest.ts
+++ b/packages/twenty-front/src/modules/settings/integrations/constants/SettingsIntegrationRequest.ts
@@ -1,4 +1,4 @@
-import { SettingsIntegrationCategory } from '~/pages/settings/integrations/types/SettingsIntegrationCategory';
+import { SettingsIntegrationCategory } from '@/settings/integrations/types/SettingsIntegrationCategory';
 
 export const SETTINGS_INTEGRATION_REQUEST_CATEGORY: SettingsIntegrationCategory =
   {
diff --git a/packages/twenty-front/src/pages/settings/integrations/constants/SettingsIntegrationWindmill.ts b/packages/twenty-front/src/modules/settings/integrations/constants/SettingsIntegrationWindmill.ts
similarity index 81%
rename from packages/twenty-front/src/pages/settings/integrations/constants/SettingsIntegrationWindmill.ts
rename to packages/twenty-front/src/modules/settings/integrations/constants/SettingsIntegrationWindmill.ts
index 45452a6b4c6f..2dc540a8747b 100644
--- a/packages/twenty-front/src/pages/settings/integrations/constants/SettingsIntegrationWindmill.ts
+++ b/packages/twenty-front/src/modules/settings/integrations/constants/SettingsIntegrationWindmill.ts
@@ -1,4 +1,4 @@
-import { SettingsIntegrationCategory } from '~/pages/settings/integrations/types/SettingsIntegrationCategory';
+import { SettingsIntegrationCategory } from '@/settings/integrations/types/SettingsIntegrationCategory';
 
 export const SETTINGS_INTEGRATION_WINDMILL_CATEGORY: SettingsIntegrationCategory =
   {
diff --git a/packages/twenty-front/src/pages/settings/integrations/constants/SettingsIntegrationZapier.ts b/packages/twenty-front/src/modules/settings/integrations/constants/SettingsIntegrationZapier.ts
similarity index 93%
rename from packages/twenty-front/src/pages/settings/integrations/constants/SettingsIntegrationZapier.ts
rename to packages/twenty-front/src/modules/settings/integrations/constants/SettingsIntegrationZapier.ts
index a331d819a20b..88fd03a49c10 100644
--- a/packages/twenty-front/src/pages/settings/integrations/constants/SettingsIntegrationZapier.ts
+++ b/packages/twenty-front/src/modules/settings/integrations/constants/SettingsIntegrationZapier.ts
@@ -1,4 +1,4 @@
-import { SettingsIntegrationCategory } from '~/pages/settings/integrations/types/SettingsIntegrationCategory';
+import { SettingsIntegrationCategory } from '@/settings/integrations/types/SettingsIntegrationCategory';
 
 export const SETTINGS_INTEGRATION_ZAPIER_CATEGORY: SettingsIntegrationCategory =
   {
diff --git a/packages/twenty-front/src/modules/settings/integrations/hooks/useSettingsIntegrationCategories.ts b/packages/twenty-front/src/modules/settings/integrations/hooks/useSettingsIntegrationCategories.ts
new file mode 100644
index 000000000000..6f90b54a556b
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/hooks/useSettingsIntegrationCategories.ts
@@ -0,0 +1,35 @@
+import { MOCK_REMOTE_DATABASES } from '@/settings/integrations/constants/MockRemoteDatabases';
+import { SETTINGS_INTEGRATION_REQUEST_CATEGORY } from '@/settings/integrations/constants/SettingsIntegrationRequest';
+import { SETTINGS_INTEGRATION_WINDMILL_CATEGORY } from '@/settings/integrations/constants/SettingsIntegrationWindmill';
+import { SETTINGS_INTEGRATION_ZAPIER_CATEGORY } from '@/settings/integrations/constants/SettingsIntegrationZapier';
+import { SettingsIntegrationCategory } from '@/settings/integrations/types/SettingsIntegrationCategory';
+import { getSettingsIntegrationAll } from '@/settings/integrations/utils/getSettingsIntegrationAll';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+
+export const useSettingsIntegrationCategories =
+  (): SettingsIntegrationCategory[] => {
+    const isAirtableIntegrationEnabled = useIsFeatureEnabled(
+      'IS_AIRTABLE_INTEGRATION_ENABLED',
+    );
+    const isAirtableIntegrationActive = !!MOCK_REMOTE_DATABASES.find(
+      ({ name }) => name === 'airtable',
+    )?.isActive;
+    const isPostgresqlIntegrationEnabled = useIsFeatureEnabled(
+      'IS_POSTGRESQL_INTEGRATION_ENABLED',
+    );
+    const isPostgresqlIntegrationActive = !!MOCK_REMOTE_DATABASES.find(
+      ({ name }) => name === 'postgresql',
+    )?.isActive;
+
+    return [
+      getSettingsIntegrationAll({
+        isAirtableIntegrationEnabled,
+        isAirtableIntegrationActive,
+        isPostgresqlIntegrationEnabled,
+        isPostgresqlIntegrationActive,
+      }),
+      SETTINGS_INTEGRATION_ZAPIER_CATEGORY,
+      SETTINGS_INTEGRATION_WINDMILL_CATEGORY,
+      SETTINGS_INTEGRATION_REQUEST_CATEGORY,
+    ];
+  };
diff --git a/packages/twenty-front/src/modules/settings/integrations/types/SettingsIntegration.ts b/packages/twenty-front/src/modules/settings/integrations/types/SettingsIntegration.ts
new file mode 100644
index 000000000000..0855a9b49d41
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/types/SettingsIntegration.ts
@@ -0,0 +1,15 @@
+export type SettingsIntegrationType =
+  | 'Active'
+  | 'Add'
+  | 'Goto'
+  | 'Soon'
+  | 'Use';
+
+export type SettingsIntegration = {
+  from: { key: string; image: string };
+  to?: { key: string; image: string } | null;
+  type: SettingsIntegrationType;
+  linkText?: string;
+  link: string;
+  text: string;
+};
diff --git a/packages/twenty-front/src/modules/settings/integrations/types/SettingsIntegrationCategory.ts b/packages/twenty-front/src/modules/settings/integrations/types/SettingsIntegrationCategory.ts
new file mode 100644
index 000000000000..c2369f89e524
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/types/SettingsIntegrationCategory.ts
@@ -0,0 +1,9 @@
+import { SettingsIntegration } from '@/settings/integrations/types/SettingsIntegration';
+
+export type SettingsIntegrationCategory = {
+  key: string;
+  title: string;
+  hyperlinkText?: string;
+  hyperlink?: string | null;
+  integrations: SettingsIntegration[];
+};
diff --git a/packages/twenty-front/src/modules/settings/integrations/utils/getConnectionDbName.ts b/packages/twenty-front/src/modules/settings/integrations/utils/getConnectionDbName.ts
new file mode 100644
index 000000000000..084632b32db2
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/utils/getConnectionDbName.ts
@@ -0,0 +1,15 @@
+import { SettingsIntegration } from '@/settings/integrations/types/SettingsIntegration';
+import { RemoteServer } from '~/generated-metadata/graphql';
+
+type GetConnectionDbNameParams = {
+  integration: SettingsIntegration;
+  connection: RemoteServer;
+};
+
+export const getConnectionDbName = ({
+  integration,
+  connection,
+}: GetConnectionDbNameParams) =>
+  integration.from.key === 'postgresql'
+    ? connection.foreignDataWrapperOptions?.dbname
+    : '';
diff --git a/packages/twenty-front/src/modules/settings/integrations/utils/getSettingsIntegrationAll.ts b/packages/twenty-front/src/modules/settings/integrations/utils/getSettingsIntegrationAll.ts
new file mode 100644
index 000000000000..c3e51f7c6f58
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/integrations/utils/getSettingsIntegrationAll.ts
@@ -0,0 +1,44 @@
+import { SettingsIntegrationCategory } from '@/settings/integrations/types/SettingsIntegrationCategory';
+
+export const getSettingsIntegrationAll = ({
+  isAirtableIntegrationEnabled,
+  isAirtableIntegrationActive,
+  isPostgresqlIntegrationEnabled,
+  isPostgresqlIntegrationActive,
+}: {
+  isAirtableIntegrationEnabled: boolean;
+  isAirtableIntegrationActive: boolean;
+  isPostgresqlIntegrationEnabled: boolean;
+  isPostgresqlIntegrationActive: boolean;
+}): SettingsIntegrationCategory => ({
+  key: 'all',
+  title: 'All',
+  integrations: [
+    {
+      from: {
+        key: 'airtable',
+        image: '/images/integrations/airtable-logo.png',
+      },
+      type: !isAirtableIntegrationEnabled
+        ? 'Soon'
+        : isAirtableIntegrationActive
+          ? 'Active'
+          : 'Add',
+      text: 'Airtable',
+      link: '/settings/integrations/airtable',
+    },
+    {
+      from: {
+        key: 'postgresql',
+        image: '/images/integrations/postgresql-logo.png',
+      },
+      type: !isPostgresqlIntegrationEnabled
+        ? 'Soon'
+        : isPostgresqlIntegrationActive
+          ? 'Active'
+          : 'Add',
+      text: 'PostgreSQL',
+      link: '/settings/integrations/postgresql',
+    },
+  ],
+});
diff --git a/packages/twenty-front/src/modules/settings/profile/components/ChangePassword.tsx b/packages/twenty-front/src/modules/settings/profile/components/ChangePassword.tsx
index 9548704d4c88..ee60971528c5 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/ChangePassword.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/ChangePassword.tsx
@@ -27,7 +27,7 @@ export const ChangePassword = () => {
           email: currentUser.email,
         },
       });
-      if (data?.emailPasswordResetLink?.success) {
+      if (data?.emailPasswordResetLink?.success === true) {
         enqueueSnackBar('Password reset link has been sent to the email', {
           variant: 'success',
         });
diff --git a/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx b/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
index d3e52ad09eca..c35072087b34 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
@@ -22,7 +22,7 @@ export const DeleteAccount = () => {
 
   const handleLogout = useCallback(() => {
     signOut();
-    navigate(AppPath.SignIn);
+    navigate(AppPath.SignInUp);
   }, [signOut, navigate]);
 
   const deleteAccount = async () => {
diff --git a/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx b/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
index 4264bd928299..798dab6694a2 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
@@ -24,7 +24,7 @@ export const DeleteWorkspace = () => {
 
   const handleLogout = useCallback(() => {
     signOut();
-    navigate(AppPath.SignIn);
+    navigate(AppPath.SignInUp);
   }, [signOut, navigate]);
 
   const deleteWorkspace = async () => {
diff --git a/packages/twenty-front/src/modules/settings/profile/components/NameFields.tsx b/packages/twenty-front/src/modules/settings/profile/components/NameFields.tsx
index 0486b51bb307..a279c75e3ee1 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/NameFields.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/NameFields.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import styled from '@emotion/styled';
-import debounce from 'lodash.debounce';
 import { useRecoilState, useRecoilValue } from 'recoil';
+import { useDebouncedCallback } from 'use-debounce';
 
 import { currentUserState } from '@/auth/states/currentUserState';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
@@ -46,13 +46,10 @@ export const NameFields = ({
   });
 
   // TODO: Enhance this with react-web-hook-form (https://www.react-hook-form.com)
-  const debouncedUpdate = debounce(async () => {
-    if (onFirstNameUpdate) {
-      onFirstNameUpdate(firstName);
-    }
-    if (onLastNameUpdate) {
-      onLastNameUpdate(lastName);
-    }
+  const debouncedUpdate = useDebouncedCallback(async () => {
+    onFirstNameUpdate?.(firstName);
+    onLastNameUpdate?.(lastName);
+
     try {
       if (!currentWorkspaceMember?.id) {
         throw new Error('User is not logged in');
diff --git a/packages/twenty-front/src/modules/settings/profile/components/ProfilePictureUploader.tsx b/packages/twenty-front/src/modules/settings/profile/components/ProfilePictureUploader.tsx
index 2ce5ecfc4da1..4a65b1ff3aa3 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/ProfilePictureUploader.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/ProfilePictureUploader.tsx
@@ -7,6 +7,8 @@ import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
 import { ImageInput } from '@/ui/input/components/ImageInput';
 import { getImageAbsoluteURIOrBase64 } from '@/users/utils/getProfilePictureAbsoluteURI';
 import { useUploadProfilePictureMutation } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 export const ProfilePictureUploader = () => {
   const [uploadPicture, { loading: isUploading }] =
@@ -25,7 +27,7 @@ export const ProfilePictureUploader = () => {
   });
 
   const handleUpload = async (file: File) => {
-    if (!file) {
+    if (isUndefinedOrNull(file)) {
       return;
     }
 
@@ -72,25 +74,29 @@ export const ProfilePictureUploader = () => {
   };
 
   const handleAbort = async () => {
-    if (uploadController) {
+    if (isDefined(uploadController)) {
       uploadController.abort();
       setUploadController(null);
     }
   };
 
   const handleRemove = async () => {
-    if (!currentWorkspaceMember?.id) {
-      throw new Error('User is not logged in');
-    }
+    try {
+      if (!currentWorkspaceMember?.id) {
+        throw new Error('User is not logged in');
+      }
 
-    await updateOneRecord({
-      idToUpdate: currentWorkspaceMember?.id,
-      updateOneRecordInput: {
-        avatarUrl: null,
-      },
-    });
+      await updateOneRecord({
+        idToUpdate: currentWorkspaceMember?.id,
+        updateOneRecordInput: {
+          avatarUrl: null,
+        },
+      });
 
-    setCurrentWorkspaceMember({ ...currentWorkspaceMember, avatarUrl: null });
+      setCurrentWorkspaceMember({ ...currentWorkspaceMember, avatarUrl: null });
+    } catch (error) {
+      setErrorMessage('An error occured while removing the picture.');
+    }
   };
 
   return (
diff --git a/packages/twenty-front/src/modules/settings/workspace/components/NameField.tsx b/packages/twenty-front/src/modules/settings/workspace/components/NameField.tsx
index d0f33e002b91..d2d01267bce2 100644
--- a/packages/twenty-front/src/modules/settings/workspace/components/NameField.tsx
+++ b/packages/twenty-front/src/modules/settings/workspace/components/NameField.tsx
@@ -1,11 +1,13 @@
 import { useCallback, useEffect, useState } from 'react';
 import styled from '@emotion/styled';
-import debounce from 'lodash.debounce';
 import { useRecoilValue } from 'recoil';
+import { useDebouncedCallback } from 'use-debounce';
 
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { useUpdateWorkspaceMutation } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 import { logError } from '~/utils/logError';
 
 const StyledComboInputContainer = styled.div`
@@ -36,8 +38,8 @@ export const NameField = ({
   // TODO: Enhance this with react-web-hook-form (https://www.react-hook-form.com)
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const debouncedUpdate = useCallback(
-    debounce(async (name: string) => {
-      if (onNameUpdate) {
+    useDebouncedCallback(async (name: string) => {
+      if (isDefined(onNameUpdate)) {
         onNameUpdate(displayName);
       }
       if (!autoSave || !name) {
@@ -52,7 +54,7 @@ export const NameField = ({
           },
         });
 
-        if (errors || !data?.updateWorkspace) {
+        if (isDefined(errors) || isUndefinedOrNull(data?.updateWorkspace)) {
           throw errors;
         }
       } catch (error) {
diff --git a/packages/twenty-front/src/modules/settings/workspace/components/WorkspaceLogoUploader.tsx b/packages/twenty-front/src/modules/settings/workspace/components/WorkspaceLogoUploader.tsx
index 34eb5a5fa1a0..009c32d54f5d 100644
--- a/packages/twenty-front/src/modules/settings/workspace/components/WorkspaceLogoUploader.tsx
+++ b/packages/twenty-front/src/modules/settings/workspace/components/WorkspaceLogoUploader.tsx
@@ -7,6 +7,7 @@ import {
   useUpdateWorkspaceMutation,
   useUploadWorkspaceLogoMutation,
 } from '~/generated/graphql';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 export const WorkspaceLogoUploader = () => {
   const [uploadLogo] = useUploadWorkspaceLogoMutation();
@@ -16,7 +17,7 @@ export const WorkspaceLogoUploader = () => {
   );
 
   const onUpload = async (file: File) => {
-    if (!file) {
+    if (isUndefinedOrNull(file)) {
       return;
     }
     if (!currentWorkspace?.id) {
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx
index 941647853c63..699b82af7bff 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled';
 
 import { RecordIndexOptionsDropdown } from '@/object-record/record-index/options/components/RecordIndexOptionsDropdown';
-import { RECORD_INDEX_OPTIONS_DROPDOWN_ID } from '@/object-record/record-index/options/constants/RecordIndexOptionsDropdownId';
 import { RecordTableWithWrappers } from '@/object-record/record-table/components/RecordTableWithWrappers';
 import { SignInBackgroundMockContainerEffect } from '@/sign-in-background-mock/components/SignInBackgroundMockContainerEffect';
 import { ViewBar } from '@/views/components/ViewBar';
@@ -24,6 +23,7 @@ export const SignInBackgroundMockContainer = () => {
     <StyledContainer>
       <ViewBar
         viewBarId={viewBarId}
+        onCurrentViewChange={async () => {}}
         optionsDropdownButton={
           <RecordIndexOptionsDropdown
             recordIndexId={recordIndexId}
@@ -31,7 +31,6 @@ export const SignInBackgroundMockContainer = () => {
             viewType={ViewType.Table}
           />
         }
-        optionsDropdownScopeId={RECORD_INDEX_OPTIONS_DROPDOWN_ID}
       />
       <SignInBackgroundMockContainerEffect
         objectNamePlural={objectNamePlural}
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainerEffect.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainerEffect.tsx
index 239e26b48f6b..f7fdf0218239 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainerEffect.tsx
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainerEffect.tsx
@@ -8,7 +8,8 @@ import { SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS } from '@/sign-in-background
 import { SIGN_IN_BACKGROUND_MOCK_FILTER_DEFINITIONS } from '@/sign-in-background-mock/constants/SignInBackgroundMockFilterDefinitions';
 import { SIGN_IN_BACKGROUND_MOCK_SORT_DEFINITIONS } from '@/sign-in-background-mock/constants/SignInBackgroundMockSortDefinitions';
 import { SIGN_IN_BACKGROUND_MOCK_VIEW_FIELDS } from '@/sign-in-background-mock/constants/SignInBackgroundMockViewFields';
-import { useViewBar } from '@/views/hooks/useViewBar';
+import { useInitViewBar } from '@/views/hooks/useInitViewBar';
+import { useSetRecordCountInCurrentView } from '@/views/hooks/useSetRecordCountInCurrentView';
 import { mapViewFieldsToColumnDefinitions } from '@/views/utils/mapViewFieldsToColumnDefinitions';
 
 type SignInBackgroundMockContainerEffectProps = {
@@ -44,8 +45,10 @@ export const SignInBackgroundMockContainerEffect = ({
     setAvailableFilterDefinitions,
     setAvailableFieldDefinitions,
     setViewObjectMetadataId,
-    setEntityCountInCurrentView,
-  } = useViewBar({ viewBarId: viewId });
+  } = useInitViewBar(viewId);
+
+  const { setRecordCountInCurrentView } =
+    useSetRecordCountInCurrentView(viewId);
 
   useEffect(() => {
     setViewObjectMetadataId?.(objectMetadataItem.id);
@@ -85,9 +88,9 @@ export const SignInBackgroundMockContainerEffect = ({
 
   useEffect(() => {
     setOnEntityCountChange(
-      () => (entityCount: number) => setEntityCountInCurrentView(entityCount),
+      () => (entityCount: number) => setRecordCountInCurrentView(entityCount),
     );
-  }, [setEntityCountInCurrentView, setOnEntityCountChange]);
+  }, [setRecordCountInCurrentView, setOnEntityCountChange]);
 
   return <></>;
 };
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockPage.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockPage.tsx
index fc2f81ecb142..1f0e3e540c05 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockPage.tsx
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockPage.tsx
@@ -1,9 +1,9 @@
 import styled from '@emotion/styled';
+import { IconBuildingSkyscraper } from 'twenty-ui';
 
 import { RecordTableActionBar } from '@/object-record/record-table/action-bar/components/RecordTableActionBar';
 import { RecordTableContextMenu } from '@/object-record/record-table/context-menu/components/RecordTableContextMenu';
 import { SignInBackgroundMockContainer } from '@/sign-in-background-mock/components/SignInBackgroundMockContainer';
-import { IconBuildingSkyscraper } from '@/ui/display/icon';
 import { PageAddButton } from '@/ui/layout/page/PageAddButton';
 import { PageBody } from '@/ui/layout/page/PageBody';
 import { PageContainer } from '@/ui/layout/page/PageContainer';
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockColumnDefinitions.ts b/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockColumnDefinitions.ts
index 990ed52b1a91..d6072c52b178 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockColumnDefinitions.ts
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockColumnDefinitions.ts
@@ -1,6 +1,7 @@
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
 import { filterAvailableTableColumns } from '@/object-record/utils/filterAvailableTableColumns';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
   [
@@ -9,7 +10,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: '20202020-5e4e-4007-a630-8a2617914889',
       label: 'Domain Name',
       size: 100,
-      type: 'TEXT',
+      type: FieldMetadataType.Text,
       metadata: {
         fieldName: 'domainName',
         placeHolder: 'Domain Name',
@@ -19,13 +20,14 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       },
       iconName: 'IconLink',
       isVisible: true,
+      defaultValue: '',
     },
     {
       position: 1,
       fieldMetadataId: '20202020-7fbd-41ad-b64d-25a15ff62f04',
       label: 'Employees',
       size: 100,
-      type: 'NUMBER',
+      type: FieldMetadataType.Number,
       metadata: {
         fieldName: 'employees',
         placeHolder: 'Employees',
@@ -35,13 +37,14 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       },
       iconName: 'IconUsers',
       isVisible: true,
+      defaultValue: 0,
     },
     {
       position: 2,
       fieldMetadataId: '20202020-6d30-4111-9f40-b4301906fd3c',
       label: 'Name',
       size: 100,
-      type: 'TEXT',
+      type: FieldMetadataType.Text,
       metadata: {
         fieldName: 'name',
         placeHolder: 'Name',
@@ -51,13 +54,14 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       },
       iconName: 'IconBuildingSkyscraper',
       isVisible: true,
+      defaultValue: '',
     },
     {
       position: 3,
       fieldMetadataId: '20202020-e7c8-4771-8cc4-ce0e8c36a3c0',
       label: 'Favorites',
       size: 100,
-      type: 'RELATION',
+      type: FieldMetadataType.Relation,
       metadata: {
         fieldName: 'favorites',
         placeHolder: 'Favorites',
@@ -68,13 +72,14 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       },
       iconName: 'IconHeart',
       isVisible: true,
+      defaultValue: [],
     },
     {
       position: 4,
       fieldMetadataId: '20202020-ad10-4117-a039-3f04b7a5f939',
       label: 'Address',
       size: 100,
-      type: 'TEXT',
+      type: FieldMetadataType.Text,
       metadata: {
         fieldName: 'address',
         placeHolder: 'Address',
@@ -84,13 +89,14 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       },
       iconName: 'IconMap',
       isVisible: true,
+      defaultValue: '',
     },
     {
       position: 5,
       fieldMetadataId: '20202020-0739-495d-8e70-c0807f6b2268',
       label: 'Account Owner',
       size: 100,
-      type: 'RELATION',
+      type: FieldMetadataType.Relation,
       metadata: {
         fieldName: 'accountOwner',
         placeHolder: 'Account Owner',
@@ -101,13 +107,14 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       },
       iconName: 'IconUserCircle',
       isVisible: true,
+      defaultValue: null,
     },
     {
       position: 6,
       fieldMetadataId: '20202020-68b4-4c8e-af19-738eba2a42a5',
       label: 'People',
       size: 100,
-      type: 'RELATION',
+      type: FieldMetadataType.Relation,
       metadata: {
         fieldName: 'people',
         placeHolder: 'People',
@@ -118,13 +125,14 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       },
       iconName: 'IconUsers',
       isVisible: true,
+      defaultValue: [],
     },
     {
       position: 7,
       fieldMetadataId: '20202020-61af-4ffd-b79b-baed6db8ad11',
       label: 'Attachments',
       size: 100,
-      type: 'RELATION',
+      type: FieldMetadataType.Relation,
       metadata: {
         fieldName: 'attachments',
         placeHolder: 'Attachments',
@@ -135,13 +143,14 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       },
       iconName: 'IconFileImport',
       isVisible: true,
+      defaultValue: [],
     },
     {
       position: 8,
       fieldMetadataId: '20202020-4dc2-47c9-bb15-6e6f19ba9e46',
       label: 'Creation date',
       size: 100,
-      type: 'DATE_TIME',
+      type: FieldMetadataType.DateTime,
       metadata: {
         fieldName: 'createdAt',
         placeHolder: 'Creation date',
@@ -151,13 +160,14 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       },
       iconName: 'IconCalendar',
       isVisible: true,
+      defaultValue: '',
     },
     {
       position: 9,
       fieldMetadataId: '20202020-9e9f-4235-98b2-c76f3e2d281e',
       label: 'ICP',
       size: 100,
-      type: 'BOOLEAN',
+      type: FieldMetadataType.Boolean,
       metadata: {
         fieldName: 'idealCustomerProfile',
         placeHolder: 'ICP',
@@ -167,13 +177,14 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       },
       iconName: 'IconTarget',
       isVisible: true,
+      defaultValue: false,
     },
     {
       position: 10,
       fieldMetadataId: '20202020-a61d-4b78-b998-3fd88b4f73a1',
       label: 'Linkedin',
       size: 100,
-      type: 'LINK',
+      type: FieldMetadataType.Link,
       metadata: {
         fieldName: 'linkedinLink',
         placeHolder: 'Linkedin',
@@ -183,13 +194,14 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       },
       iconName: 'IconBrandLinkedin',
       isVisible: true,
+      defaultValue: '',
     },
     {
       position: 11,
       fieldMetadataId: '20202020-e3fc-46ff-b552-3e757843f06e',
       label: 'Opportunities',
       size: 100,
-      type: 'RELATION',
+      type: FieldMetadataType.Relation,
       metadata: {
         fieldName: 'opportunities',
         placeHolder: 'Opportunities',
@@ -200,13 +212,14 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       },
       iconName: 'IconTargetArrow',
       isVisible: true,
+      defaultValue: [],
     },
     {
       position: 12,
       fieldMetadataId: '20202020-46e3-479a-b8f4-77137c74daa6',
       label: 'X',
       size: 100,
-      type: 'LINK',
+      type: FieldMetadataType.Link,
       metadata: {
         fieldName: 'xLink',
         placeHolder: 'X',
@@ -216,13 +229,14 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       },
       iconName: 'IconBrandX',
       isVisible: true,
+      defaultValue: '',
     },
     {
       position: 13,
       fieldMetadataId: '20202020-4a2e-4b41-8562-279963e8947e',
       label: 'Activities',
       size: 100,
-      type: 'RELATION',
+      type: FieldMetadataType.Relation,
       metadata: {
         fieldName: 'activityTargets',
         placeHolder: 'Activities',
@@ -233,13 +247,14 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       },
       iconName: 'IconCheckbox',
       isVisible: true,
+      defaultValue: [],
     },
     {
       position: 14,
       fieldMetadataId: '20202020-4a5a-466f-92d9-c3870d9502a9',
       label: 'ARR',
       size: 100,
-      type: 'CURRENCY',
+      type: FieldMetadataType.Currency,
       metadata: {
         fieldName: 'annualRecurringRevenue',
         placeHolder: 'ARR',
@@ -249,6 +264,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       },
       iconName: 'IconMoneybag',
       isVisible: true,
+      defaultValue: 0,
     },
   ] satisfies ColumnDefinition<FieldMetadata>[]
 ).filter(filterAvailableTableColumns);
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockCompanies.ts b/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockCompanies.ts
index 1dac5f635214..7c0e709187f4 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockCompanies.ts
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockCompanies.ts
@@ -401,8 +401,8 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
             __typename: 'Opportunity',
             id: '53f66647-0543-4cc2-9f96-95cc699960f2',
             probability: '0.5',
-            pipelineStepId: 'd8361722-03fb-4e65-bd4f-ec9e52e5ec0a',
             pointOfContactId: '93c72d2e-f517-42fd-80ae-14173b3b70ae',
+            stage: 'NEW',
             amount: {
               __typename: 'Currency',
               amountMicros: 2000000,
@@ -609,7 +609,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
             __typename: 'Opportunity',
             id: '81ab695d-2f89-406f-90ea-180f433b2445',
             probability: '0.5',
-            pipelineStepId: '30b14887-d592-427d-bd97-6e670158db02',
+            stage: 'NEW',
             pointOfContactId: '9b324a88-6784-4449-afdf-dc62cb8702f2',
             amount: {
               __typename: 'Currency',
@@ -629,7 +629,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
             __typename: 'Opportunity',
             id: '9b059852-35b1-4045-9cde-42f715148954',
             probability: '0.5',
-            pipelineStepId: '30b14887-d592-427d-bd97-6e670158db02',
+            stage: 'NEW',
             pointOfContactId: '98406e26-80f1-4dff-b570-a74942528de3',
             amount: {
               __typename: 'Currency',
@@ -1157,7 +1157,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
             __typename: 'Opportunity',
             id: '7c887ee3-be10-412b-a663-16bd3c2228e1',
             probability: '0.5',
-            pipelineStepId: '6edf4ead-006a-46e1-9c6d-228f1d0143c9',
+            stage: 'NEW',
             pointOfContactId: '86083141-1c0e-494c-a1b6-85b1c6fefaa5',
             amount: {
               __typename: 'Currency',
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx
index b0c69912ebe4..cd9fd48b87e2 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx
@@ -9,8 +9,8 @@ import {
   size,
   useFloating,
 } from '@floating-ui/react';
-import debounce from 'lodash.debounce';
 import { ReadonlyDeep } from 'type-fest';
+import { useDebouncedCallback } from 'use-debounce';
 
 import { SelectOption } from '@/spreadsheet-import/types';
 import { AppTooltip } from '@/ui/display/tooltip/AppTooltip';
@@ -72,9 +72,13 @@ export const MatchColumnSelect = ({
     [initialOptions],
   );
 
-  const debouncedHandleSearchFilter = debounce(handleSearchFilterChange, 100, {
-    leading: true,
-  });
+  const debouncedHandleSearchFilter = useDebouncedCallback(
+    handleSearchFilterChange,
+    100,
+    {
+      leading: true,
+    },
+  );
 
   const handleFilterChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     const value = event.currentTarget.value;
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/ModalCloseButton.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/ModalCloseButton.tsx
index e5883701019a..5c03dc535678 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/ModalCloseButton.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/ModalCloseButton.tsx
@@ -1,8 +1,8 @@
 import styled from '@emotion/styled';
+import { IconX } from 'twenty-ui';
 
 import { useSpreadsheetImportInitialStep } from '@/spreadsheet-import/hooks/useSpreadsheetImportInitialStep';
 import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal';
-import { IconX } from '@/ui/display/icon/index';
 import { useDialogManager } from '@/ui/feedback/dialog-manager/hooks/useDialogManager';
 import { IconButton } from '@/ui/input/button/components/IconButton';
 import { useStepBar } from '@/ui/navigation/step-bar/hooks/useStepBar';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/Providers.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/Providers.tsx
index 2a06b67fc290..1d64ac51ff37 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/Providers.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/Providers.tsx
@@ -1,6 +1,7 @@
 import { createContext } from 'react';
 
 import { SpreadsheetOptions } from '@/spreadsheet-import/types';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 export const RsiContext = createContext({} as any);
 
@@ -13,7 +14,7 @@ export const Providers = <T extends string>({
   children,
   values,
 }: ProvidersProps<T>) => {
-  if (!values.fields) {
+  if (isUndefinedOrNull(values.fields)) {
     throw new Error('Fields must be provided to spreadsheet-import');
   }
 
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/Table.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/Table.tsx
index cc3610d9c105..3ee211eb1a90 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/Table.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/Table.tsx
@@ -126,6 +126,8 @@ export const Table = <Data,>({
 }: TableProps<Data>) => {
   const { rtl } = useSpreadsheetImportInternal();
 
+  if (!rows?.length || !columns?.length) return null;
+
   return (
     <StyledDataGrid
       direction={rtl ? 'rtl' : 'ltr'}
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/states/spreadsheetImportState.ts b/packages/twenty-front/src/modules/spreadsheet-import/states/spreadsheetImportState.ts
index d1f0da412b7c..c3eaf5534f34 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/states/spreadsheetImportState.ts
+++ b/packages/twenty-front/src/modules/spreadsheet-import/states/spreadsheetImportState.ts
@@ -1,4 +1,4 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { SpreadsheetOptions } from '../types';
 
@@ -7,9 +7,9 @@ export type SpreadsheetImportState<T extends string> = {
   options: Omit<SpreadsheetOptions<T>, 'isOpen' | 'onClose'> | null;
 };
 
-export const spreadsheetImportState = atom<SpreadsheetImportState<any>>({
+export const spreadsheetImportState = createState<SpreadsheetImportState<any>>({
   key: 'spreadsheetImportState',
-  default: {
+  defaultValue: {
     isOpen: false,
     options: null,
   },
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx
index 6c58e7bc8713..eb65c9266ddb 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx
@@ -7,11 +7,11 @@ import {
   AccordionPanel,
 } from '@chakra-ui/accordion';
 import styled from '@emotion/styled';
+import { IconChevronDown, IconForbid } from 'twenty-ui';
 
 import { MatchColumnSelect } from '@/spreadsheet-import/components/MatchColumnSelect';
 import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal';
 import { Fields } from '@/spreadsheet-import/types';
-import { IconChevronDown, IconForbid } from '@/ui/display/icon';
 
 import { Column, Columns, ColumnType } from '../MatchColumnsStep';
 
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/UserTableColumn.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/UserTableColumn.tsx
index e93927fbfe3c..8e5eca9c5393 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/UserTableColumn.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/UserTableColumn.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled';
 
 import { RawData } from '@/spreadsheet-import/types';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 import { Column } from '../MatchColumnsStep';
 
@@ -39,7 +39,7 @@ export const UserTableColumn = <T extends string>({
   entries,
 }: UserTableColumnProps<T>) => {
   const { header } = column;
-  const entry = entries.find(isNonNullable);
+  const entry = entries.find(isDefined);
 
   return (
     <StyledContainer>
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadFlow.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadFlow.tsx
index e9bd1f8fd05d..7e6c07e92d9c 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadFlow.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadFlow.tsx
@@ -95,7 +95,7 @@ export const UploadFlow = ({ nextStep }: UploadFlowProps) => {
             const isSingleSheet = workbook.SheetNames.length === 1;
             if (isSingleSheet) {
               if (
-                maxRecords &&
+                maxRecords > 0 &&
                 exceedsMaxRecords(
                   workbook.Sheets[workbook.SheetNames[0]],
                   maxRecords,
@@ -147,7 +147,7 @@ export const UploadFlow = ({ nextStep }: UploadFlowProps) => {
           sheetNames={state.workbook.SheetNames}
           onContinue={async (sheetName) => {
             if (
-              maxRecords &&
+              maxRecords > 0 &&
               exceedsMaxRecords(state.workbook.Sheets[sheetName], maxRecords)
             ) {
               errorToast(
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx
index dc435f88e7b5..882893ff0e3b 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx
@@ -2,6 +2,7 @@ import { useCallback, useMemo, useState } from 'react';
 // @ts-expect-error Todo: remove usage of react-data-grid
 import { RowsChangeData } from 'react-data-grid';
 import styled from '@emotion/styled';
+import { IconTrash } from 'twenty-ui';
 
 import { ContinueButton } from '@/spreadsheet-import/components/ContinueButton';
 import { Heading } from '@/spreadsheet-import/components/Heading';
@@ -9,11 +10,11 @@ import { Table } from '@/spreadsheet-import/components/Table';
 import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal';
 import { Data } from '@/spreadsheet-import/types';
 import { addErrorsAndRunHooks } from '@/spreadsheet-import/utils/dataMutations';
-import { IconTrash } from '@/ui/display/icon';
 import { useDialogManager } from '@/ui/feedback/dialog-manager/hooks/useDialogManager';
 import { Button } from '@/ui/input/button/components/Button';
 import { Toggle } from '@/ui/input/components/Toggle';
 import { Modal } from '@/ui/layout/modal/components/Modal';
+import { isDefined } from '~/utils/isDefined';
 
 import { generateColumns } from './components/columns';
 import { Meta } from './types';
@@ -94,7 +95,7 @@ export const ValidationStep = <T extends string>({
   );
 
   const deleteSelectedRows = () => {
-    if (selectedRows.size) {
+    if (selectedRows.size > 0) {
       const newData = data.filter((value) => !selectedRows.has(value.__index));
       updateData(newData);
       setSelectedRows(new Set());
@@ -129,7 +130,7 @@ export const ValidationStep = <T extends string>({
   const tableData = useMemo(() => {
     if (filterByErrors) {
       return data.filter((value) => {
-        if (value?.__errors) {
+        if (isDefined(value?.__errors)) {
           return Object.values(value.__errors)?.filter(
             (err) => err.level === 'error',
           ).length;
@@ -146,7 +147,7 @@ export const ValidationStep = <T extends string>({
     const calculatedData = data.reduce(
       (acc, value) => {
         const { __index, __errors, ...values } = value;
-        if (__errors) {
+        if (isDefined(__errors)) {
           for (const key in __errors) {
             if (__errors[key].level === 'error') {
               acc.invalidData.push(values as unknown as Data<T>);
@@ -165,7 +166,7 @@ export const ValidationStep = <T extends string>({
   };
   const onContinue = () => {
     const invalidData = data.find((value) => {
-      if (value?.__errors) {
+      if (isDefined(value?.__errors)) {
         return !!Object.values(value.__errors)?.filter(
           (err) => err.level === 'error',
         ).length;
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx
index 81b0edac40eb..11d83dbee764 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx
@@ -9,6 +9,7 @@ import { AppTooltip } from '@/ui/display/tooltip/AppTooltip';
 import { Checkbox, CheckboxVariant } from '@/ui/input/components/Checkbox';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { Toggle } from '@/ui/input/components/Toggle';
+import { isDefined } from '~/utils/isDefined';
 
 import { Meta } from '../types';
 
@@ -207,7 +208,7 @@ export const generateColumns = <T extends string>(
             );
         }
 
-        if (row.__errors?.[columnKey]) {
+        if (isDefined(row.__errors?.[columnKey])) {
           return (
             <>
               {component}
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/__stories__/Steps.stories.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/__stories__/Steps.stories.tsx
new file mode 100644
index 000000000000..420fccde9d3c
--- /dev/null
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/__stories__/Steps.stories.tsx
@@ -0,0 +1,27 @@
+import { expect } from '@storybook/jest';
+import { Meta, StoryObj } from '@storybook/react';
+import { within } from '@storybook/test';
+
+import { ComponentWithRecoilScopeDecorator } from '~/testing/decorators/ComponentWithRecoilScopeDecorator';
+import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
+
+import { Steps } from '../Steps';
+
+const meta: Meta<typeof Steps> = {
+  title: 'Modules/SpreadsheetImport/Steps',
+  component: Steps,
+  decorators: [ComponentWithRecoilScopeDecorator, SnackBarDecorator],
+};
+
+export default meta;
+type Story = StoryObj<typeof Steps>;
+
+export const Default: Story = {
+  play: async () => {
+    const canvas = within(document.body);
+    expect(await canvas.findByText('Upload file')).toBeInTheDocument();
+    expect(await canvas.findByText('Match columns')).toBeInTheDocument();
+    expect(await canvas.findByText('Validate data')).toBeInTheDocument();
+    expect(await canvas.findByText('Select file')).toBeInTheDocument();
+  },
+};
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/utils/dataMutations.ts b/packages/twenty-front/src/modules/spreadsheet-import/utils/dataMutations.ts
index 55c0b473e503..f9cb085d93e3 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/utils/dataMutations.ts
+++ b/packages/twenty-front/src/modules/spreadsheet-import/utils/dataMutations.ts
@@ -1,3 +1,4 @@
+import { isNonEmptyString } from '@sniptt/guards';
 import { v4 } from 'uuid';
 
 import {
@@ -11,6 +12,8 @@ import {
   RowHook,
   TableHook,
 } from '@/spreadsheet-import/types';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 export const addErrorsAndRunHooks = <T extends string>(
   data: (Data<T> & Partial<Meta>)[],
@@ -27,11 +30,11 @@ export const addErrorsAndRunHooks = <T extends string>(
     };
   };
 
-  if (tableHook) {
+  if (isDefined(tableHook)) {
     data = tableHook(data, addHookError);
   }
 
-  if (rowHook) {
+  if (isDefined(rowHook)) {
     data = data.map((value, index) =>
       rowHook(value, (...props) => addHookError(index, ...props), data),
     );
@@ -47,7 +50,10 @@ export const addErrorsAndRunHooks = <T extends string>(
           const duplicates = new Set(); // Set of items used multiple times
 
           values.forEach((value) => {
-            if (validation.allowEmpty && !value) {
+            if (
+              validation.allowEmpty === true &&
+              (isUndefinedOrNull(value) || value === '' || !value)
+            ) {
               // If allowEmpty is set, we will not validate falsy fields such as undefined or empty string.
               return;
             }
@@ -95,7 +101,7 @@ export const addErrorsAndRunHooks = <T extends string>(
           data.forEach((entry, index) => {
             const value = entry[field.key]?.toString();
 
-            if (value && !value.match(regex)) {
+            if (isNonEmptyString(value) && !value.match(regex)) {
               errors[index] = {
                 ...errors[index],
                 [field.key]: {
@@ -113,7 +119,7 @@ export const addErrorsAndRunHooks = <T extends string>(
           data.forEach((entry, index) => {
             const value = entry[field.key]?.toString();
 
-            if (value && !validation.isValid(value)) {
+            if (isNonEmptyString(value) && !validation.isValid(value)) {
               errors[index] = {
                 ...errors[index],
                 [field.key]: {
@@ -136,10 +142,10 @@ export const addErrorsAndRunHooks = <T extends string>(
     }
     const newValue = value as Data<T> & Meta;
 
-    if (errors[index]) {
+    if (isDefined(errors[index])) {
       return { ...newValue, __errors: errors[index] };
     }
-    if (!errors[index] && value?.__errors) {
+    if (isUndefinedOrNull(errors[index]) && isDefined(value?.__errors)) {
       return { ...newValue, __errors: null };
     }
     return newValue;
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/utils/getMatchedColumns.ts b/packages/twenty-front/src/modules/spreadsheet-import/utils/getMatchedColumns.ts
index 4f95e2d5ef6c..661466154ceb 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/utils/getMatchedColumns.ts
+++ b/packages/twenty-front/src/modules/spreadsheet-import/utils/getMatchedColumns.ts
@@ -6,6 +6,7 @@ import {
   MatchColumnsStepProps,
 } from '@/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep';
 import { Field, Fields } from '@/spreadsheet-import/types';
+import { isDefined } from '~/utils/isDefined';
 
 import { findMatch } from './findMatch';
 import { setColumn } from './setColumn';
@@ -18,7 +19,7 @@ export const getMatchedColumns = <T extends string>(
 ) =>
   columns.reduce<Column<T>[]>((arr, column) => {
     const autoMatch = findMatch(column.header, fields, autoMapDistance);
-    if (autoMatch) {
+    if (isDefined(autoMatch)) {
       const field = fields.find((field) => field.key === autoMatch) as Field<T>;
       const duplicateIndex = arr.findIndex(
         (column) => 'value' in column && column.value === field.key,
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/utils/normalizeCheckboxValue.ts b/packages/twenty-front/src/modules/spreadsheet-import/utils/normalizeCheckboxValue.ts
index f8ada87f4568..cfb930f42936 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/utils/normalizeCheckboxValue.ts
+++ b/packages/twenty-front/src/modules/spreadsheet-import/utils/normalizeCheckboxValue.ts
@@ -1,3 +1,5 @@
+import { isNonEmptyString } from '@sniptt/guards';
+
 const booleanWhitelist: Record<string, boolean> = {
   yes: true,
   no: false,
@@ -6,7 +8,7 @@ const booleanWhitelist: Record<string, boolean> = {
 };
 
 export const normalizeCheckboxValue = (value: string | undefined): boolean => {
-  if (value && value.toLowerCase() in booleanWhitelist) {
+  if (isNonEmptyString(value) && value.toLowerCase() in booleanWhitelist) {
     return booleanWhitelist[value.toLowerCase()];
   }
   return false;
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/utils/normalizeTableData.ts b/packages/twenty-front/src/modules/spreadsheet-import/utils/normalizeTableData.ts
index 309108f04a15..0782ab69a8fa 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/utils/normalizeTableData.ts
+++ b/packages/twenty-front/src/modules/spreadsheet-import/utils/normalizeTableData.ts
@@ -24,7 +24,7 @@ export const normalizeTableData = <T extends string>(
 
           if (
             'booleanMatches' in field.fieldType &&
-            Object.keys(field.fieldType).length
+            Object.keys(field.fieldType).length > 0
           ) {
             const booleanMatchKey = Object.keys(
               field.fieldType.booleanMatches || [],
diff --git a/packages/twenty-front/src/modules/support/components/SupportChat.tsx b/packages/twenty-front/src/modules/support/components/SupportChat.tsx
index a9993ab11340..d39b2c4a835f 100644
--- a/packages/twenty-front/src/modules/support/components/SupportChat.tsx
+++ b/packages/twenty-front/src/modules/support/components/SupportChat.tsx
@@ -1,14 +1,16 @@
 import { useCallback, useEffect, useState } from 'react';
 import styled from '@emotion/styled';
+import { isNonEmptyString } from '@sniptt/guards';
 import { useRecoilValue } from 'recoil';
+import { IconHelpCircle } from 'twenty-ui';
 
 import { currentUserState } from '@/auth/states/currentUserState';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { supportChatState } from '@/client-config/states/supportChatState';
-import { IconHelpCircle } from '@/ui/display/icon';
 import { Button } from '@/ui/input/button/components/Button';
 import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
 import { User } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
 
 const StyledButtonContainer = styled.div`
   display: flex;
@@ -24,9 +26,9 @@ const insertScript = ({
   onLoad?: (...args: any[]) => void;
 }) => {
   const script = document.createElement('script');
-  if (src) script.src = src;
-  if (innerHTML) script.innerHTML = innerHTML;
-  if (onLoad) script.onload = onLoad;
+  if (isNonEmptyString(src)) script.src = src;
+  if (isNonEmptyString(innerHTML)) script.innerHTML = innerHTML;
+  if (isDefined(onLoad)) script.onload = onLoad;
   document.body.appendChild(script);
 };
 
@@ -43,26 +45,32 @@ export const SupportChat = () => {
       currentWorkspaceMember: Pick<WorkspaceMember, 'name'>,
     ) => {
       const url = 'https://chat-assets.frontapp.com/v1/chat.bundle.js';
-      const script = document.querySelector(`script[src="${url}"]`);
+      let script = document.querySelector(`script[src="${url}"]`);
 
-      if (!script) {
-        insertScript({
-          src: url,
-          onLoad: () => {
-            window.FrontChat?.('init', {
-              chatId,
-              useDefaultLauncher: false,
-              email: currentUser.email,
-              name:
-                currentWorkspaceMember.name.firstName +
-                ' ' +
-                currentWorkspaceMember.name.lastName,
-              userHash: currentUser?.supportUserHash,
-            });
-            setIsFrontChatLoaded(true);
-          },
-        });
+      // This function only gets called when front chat is not loaded
+      // If the script is already defined, but front chat is not loaded
+      // then there was an error loading the script; reload the script
+      if (isDefined(script)) {
+        script.parentNode?.removeChild(script);
+        script = null;
       }
+
+      insertScript({
+        src: url,
+        onLoad: () => {
+          window.FrontChat?.('init', {
+            chatId,
+            useDefaultLauncher: false,
+            email: currentUser.email,
+            name:
+              currentWorkspaceMember.name.firstName +
+              ' ' +
+              currentWorkspaceMember.name.lastName,
+            userHash: currentUser?.supportUserHash,
+          });
+          setIsFrontChatLoaded(true);
+        },
+      });
     },
     [],
   );
@@ -70,9 +78,9 @@ export const SupportChat = () => {
   useEffect(() => {
     if (
       supportChat?.supportDriver === 'front' &&
-      supportChat.supportFrontChatId &&
-      currentUser?.email &&
-      currentWorkspaceMember &&
+      isNonEmptyString(supportChat.supportFrontChatId) &&
+      isNonEmptyString(currentUser?.email) &&
+      isDefined(currentWorkspaceMember) &&
       !isFrontChatLoaded
     ) {
       configureFront(
diff --git a/packages/twenty-front/src/modules/support/components/__stories__/SupportChat.stories.tsx b/packages/twenty-front/src/modules/support/components/__stories__/SupportChat.stories.tsx
new file mode 100644
index 000000000000..7da022306500
--- /dev/null
+++ b/packages/twenty-front/src/modules/support/components/__stories__/SupportChat.stories.tsx
@@ -0,0 +1,52 @@
+import { expect } from '@storybook/jest';
+import { Meta, StoryObj } from '@storybook/react';
+import { within } from '@storybook/test';
+import { useSetRecoilState } from 'recoil';
+
+import { currentUserState } from '@/auth/states/currentUserState';
+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { supportChatState } from '@/client-config/states/supportChatState';
+import { graphqlMocks } from '~/testing/graphqlMocks';
+import {
+  mockDefaultWorkspace,
+  mockedUsersData,
+  mockedWorkspaceMemberData,
+} from '~/testing/mock-data/users';
+
+import { SupportChat } from '../SupportChat';
+
+const meta: Meta<typeof SupportChat> = {
+  title: 'Modules/Support/SupportChat',
+  component: SupportChat,
+  decorators: [
+    (Story) => {
+      const setCurrentUser = useSetRecoilState(currentUserState);
+      const setSupportChat = useSetRecoilState(supportChatState);
+      const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
+      const setCurrentWorkspaceMember = useSetRecoilState(
+        currentWorkspaceMemberState,
+      );
+
+      setCurrentWorkspace(mockDefaultWorkspace);
+      setCurrentWorkspaceMember(mockedWorkspaceMemberData);
+      setCurrentUser(mockedUsersData[0]);
+      setSupportChat({ supportDriver: 'front', supportFrontChatId: '1234' });
+
+      return <Story />;
+    },
+  ],
+  parameters: {
+    msw: graphqlMocks,
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof SupportChat>;
+
+export const Default: Story = {
+  play: async () => {
+    const canvas = within(document.body);
+    expect(await canvas.findByText('Support')).toBeInTheDocument();
+  },
+};
diff --git a/packages/twenty-front/src/modules/types/AppPath.ts b/packages/twenty-front/src/modules/types/AppPath.ts
index e450d0fe62a8..fe66bd4d68c6 100644
--- a/packages/twenty-front/src/modules/types/AppPath.ts
+++ b/packages/twenty-front/src/modules/types/AppPath.ts
@@ -1,8 +1,7 @@
 export enum AppPath {
   // Not logged-in
   Verify = '/verify',
-  SignIn = '/sign-in',
-  SignUp = '/sign-up',
+  SignInUp = '/welcome',
   Invite = '/invite/:workspaceInviteHash',
   ResetPassword = '/reset-password/:passwordResetToken',
 
@@ -26,6 +25,8 @@ export enum AppPath {
   // Impersonate
   Impersonate = '/impersonate/:userId',
 
+  Authorize = '/authorize',
+
   // 404 page not found
   NotFoundWildcard = '*',
   NotFound = '/not-found',
diff --git a/packages/twenty-front/src/modules/types/SettingsPath.ts b/packages/twenty-front/src/modules/types/SettingsPath.ts
index fb47c4f99688..656f57847b6c 100644
--- a/packages/twenty-front/src/modules/types/SettingsPath.ts
+++ b/packages/twenty-front/src/modules/types/SettingsPath.ts
@@ -7,6 +7,7 @@ export enum SettingsPath {
   AccountsCalendarsSettings = 'accounts/calendars/:accountUuid',
   AccountsEmails = 'accounts/emails',
   AccountsEmailsInboxSettings = 'accounts/emails/:accountUuid',
+  Billing = 'billing',
   Objects = 'objects',
   ObjectDetail = 'objects/:objectSlug',
   ObjectEdit = 'objects/:objectSlug/edit',
@@ -20,6 +21,9 @@ export enum SettingsPath {
   DevelopersNewApiKey = 'api-keys/new',
   DevelopersApiKeyDetail = 'api-keys/:apiKeyId',
   Integrations = 'integrations',
+  IntegrationDatabase = 'integrations/:databaseKey',
+  IntegrationDatabaseConnection = 'integrations/:databaseKey/:connectionId',
+  IntegrationNewDatabaseConnection = 'integrations/:databaseKey/new',
   DevelopersNewWebhook = 'webhooks/new',
   DevelopersNewWebhookDetail = 'webhooks/:webhookId',
 }
diff --git a/packages/twenty-front/src/modules/ui/display/checkmark/components/Checkmark.tsx b/packages/twenty-front/src/modules/ui/display/checkmark/components/Checkmark.tsx
index f6a74d7ac41e..584e70f7448b 100644
--- a/packages/twenty-front/src/modules/ui/display/checkmark/components/Checkmark.tsx
+++ b/packages/twenty-front/src/modules/ui/display/checkmark/components/Checkmark.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-
-import { IconCheck } from '@/ui/display/icon';
+import { IconCheck } from 'twenty-ui';
 
 const StyledContainer = styled.div`
   align-items: center;
diff --git a/packages/twenty-front/src/modules/ui/display/chip/components/Chip.tsx b/packages/twenty-front/src/modules/ui/display/chip/components/Chip.tsx
index 9e6f5843d5a1..cec0483d2620 100644
--- a/packages/twenty-front/src/modules/ui/display/chip/components/Chip.tsx
+++ b/packages/twenty-front/src/modules/ui/display/chip/components/Chip.tsx
@@ -1,4 +1,5 @@
 import { MouseEvent, ReactNode } from 'react';
+import { css } from '@emotion/react';
 import styled from '@emotion/styled';
 
 import { OverflowingTextWithTooltip } from '../../tooltip/OverflowingTextWithTooltip';
@@ -34,86 +35,108 @@ type ChipProps = {
   onClick?: (event: MouseEvent<HTMLDivElement>) => void;
 };
 
-const StyledContainer = styled.div<Partial<ChipProps>>`
-  align-items: center;
+const StyledContainer = styled.div<
+  Pick<
+    ChipProps,
+    'accent' | 'clickable' | 'disabled' | 'maxWidth' | 'size' | 'variant'
+  >
+>`
+  --chip-horizontal-padding: ${({ theme }) => theme.spacing(1)};
+  --chip-vertical-padding: ${({ theme }) => theme.spacing(1)};
 
-  background-color: ${({ theme, variant }) =>
-    variant === ChipVariant.Highlighted
-      ? theme.background.transparent.light
-      : variant === ChipVariant.Rounded
-        ? theme.background.transparent.lighter
-        : 'transparent'};
-  border-color: ${({ theme, variant }) =>
-    variant === ChipVariant.Rounded ? theme.border.color.medium : 'none'};
-  border-radius: ${({ theme, variant }) =>
-    variant === ChipVariant.Rounded ? '50px' : theme.border.radius.sm};
-  border-style: ${({ variant }) =>
-    variant === ChipVariant.Rounded ? 'solid' : 'none'};
-  border-width: ${({ variant }) =>
-    variant === ChipVariant.Rounded ? '1px' : '0px'};
-
-  color: ${({ theme, disabled, accent }) =>
-    disabled
-      ? theme.font.color.light
-      : accent === ChipAccent.TextPrimary
-        ? theme.font.color.primary
-        : theme.font.color.secondary};
-  cursor: ${({ clickable, disabled, variant }) =>
-    disabled || variant === ChipVariant.Transparent
-      ? 'inherit'
-      : clickable
-        ? 'pointer'
-        : 'inherit'};
+  align-items: center;
+  border-radius: ${({ theme }) => theme.border.radius.sm};
+  color: ${({ theme, disabled }) =>
+    disabled ? theme.font.color.light : theme.font.color.secondary};
+  cursor: ${({ clickable, disabled }) =>
+    clickable ? 'pointer' : disabled ? 'not-allowed' : 'inherit'};
   display: inline-flex;
-  font-weight: ${({ theme, accent }) =>
-    accent === ChipAccent.TextSecondary ? theme.font.weight.medium : 'inherit'};
   gap: ${({ theme }) => theme.spacing(1)};
-
-  height: ${({ size }) => (size === ChipSize.Large ? '16px' : '12px')};
-  --chip-horizontal-padding: ${({ theme, variant }) =>
-    variant === ChipVariant.Rounded ? theme.spacing(2) : theme.spacing(1)};
+  height: ${({ theme }) => theme.spacing(3)};
   max-width: ${({ maxWidth }) =>
     maxWidth
-      ? `calc( ${maxWidth}px - 2*var(--chip-horizontal-padding))`
+      ? `calc(${maxWidth}px - 2 * var(--chip-horizontal-padding))`
       : '200px'};
-
-  --chip-vertical-padding: ${({ theme, variant }) =>
-    variant === ChipVariant.Rounded ? '3px' : theme.spacing(1)};
-
   overflow: hidden;
   padding: var(--chip-vertical-padding) var(--chip-horizontal-padding);
   user-select: none;
 
-  :hover {
-    ${({ variant, theme, disabled }) => {
-      if (!disabled) {
-        return (
-          'background-color: ' +
-          (variant === ChipVariant.Highlighted
-            ? theme.background.transparent.medium
-            : variant === ChipVariant.Regular
-              ? theme.background.transparent.light
-              : 'transparent') +
-          ';'
-        );
-      }
-    }}
-  }
-  :active {
-    ${({ variant, theme, disabled }) => {
-      if (!disabled) {
-        return (
-          'background-color: ' +
-          (variant === ChipVariant.Highlighted
-            ? theme.background.transparent.strong
-            : variant === ChipVariant.Regular
-              ? theme.background.transparent.medium
-              : 'transparent') +
-          ';'
-        );
-      }
-    }}
-  }
+  // Accent style overrides
+  ${({ accent, disabled, theme }) => {
+    if (accent === ChipAccent.TextPrimary) {
+      return (
+        !disabled &&
+        css`
+          color: ${theme.font.color.primary};
+        `
+      );
+    }
+
+    if (accent === ChipAccent.TextSecondary) {
+      return css`
+        font-weight: ${theme.font.weight.medium};
+      `;
+    }
+  }}
+
+  // Size style overrides
+  ${({ theme, size }) =>
+    size === ChipSize.Large &&
+    css`
+      height: ${theme.spacing(4)};
+    `}
+
+  // Variant style overrides
+  ${({ disabled, theme, variant }) => {
+    if (variant === ChipVariant.Regular) {
+      return (
+        !disabled &&
+        css`
+          :hover {
+            background-color: ${theme.background.transparent.light};
+          }
+
+          :active {
+            background-color: ${theme.background.transparent.medium};
+          }
+        `
+      );
+    }
+
+    if (variant === ChipVariant.Highlighted) {
+      return css`
+        background-color: ${theme.background.transparent.light};
+
+        ${!disabled &&
+        css`
+          :hover {
+            background-color: ${theme.background.transparent.medium};
+          }
+
+          :active {
+            background-color: ${theme.background.transparent.strong};
+          }
+        `}
+      `;
+    }
+
+    if (variant === ChipVariant.Rounded) {
+      return css`
+        --chip-horizontal-padding: ${theme.spacing(2)};
+        --chip-vertical-padding: 3px;
+
+        background-color: ${theme.background.transparent.lighter};
+        border: 1px solid ${theme.border.color.medium};
+        border-radius: 50px;
+      `;
+    }
+
+    if (variant === ChipVariant.Transparent) {
+      return css`
+        cursor: inherit;
+      `;
+    }
+  }}
 `;
 
 const StyledLabel = styled.span`
diff --git a/packages/twenty-front/src/modules/ui/display/chip/components/EntityChip.tsx b/packages/twenty-front/src/modules/ui/display/chip/components/EntityChip.tsx
index 9d64cba07544..017921da1753 100644
--- a/packages/twenty-front/src/modules/ui/display/chip/components/EntityChip.tsx
+++ b/packages/twenty-front/src/modules/ui/display/chip/components/EntityChip.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useTheme } from '@emotion/react';
+import { isNonEmptyString } from '@sniptt/guards';
 
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 import { Avatar, AvatarType } from '@/users/components/Avatar';
@@ -41,7 +42,7 @@ export const EntityChip = ({
   const theme = useTheme();
 
   const handleLinkClick = (event: React.MouseEvent<HTMLDivElement>) => {
-    if (linkToEntity) {
+    if (isNonEmptyString(linkToEntity)) {
       event.preventDefault();
       event.stopPropagation();
       navigate(linkToEntity);
diff --git a/packages/twenty-front/src/modules/ui/display/expandable-list/ExpandableList.tsx b/packages/twenty-front/src/modules/ui/display/expandable-list/ExpandableList.tsx
new file mode 100644
index 000000000000..0d7bf8c2bb8e
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/display/expandable-list/ExpandableList.tsx
@@ -0,0 +1,104 @@
+import React, { ReactElement, useRef, useState } from 'react';
+import { createPortal } from 'react-dom';
+import styled from '@emotion/styled';
+
+import { Chip, ChipVariant } from '@/ui/display/chip/components/Chip';
+import { IntersectionObserverWrapper } from '@/ui/display/expandable-list/IntersectionObserverWrapper';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+
+const StyledContainer = styled.div`
+  align-items: center;
+  display: flex;
+  flex: 1;
+  gap: ${({ theme }) => theme.spacing(1)};
+  box-sizing: border-box;
+  white-space: nowrap;
+  overflow-x: hidden;
+`;
+
+const StyledExpendableCell = styled.div`
+  align-content: center;
+  align-items: center;
+  backdrop-filter: ${({ theme }) => theme.blur.strong};
+  background: ${({ theme }) => theme.background.secondary};
+  border: 1px solid ${({ theme }) => theme.border.color.medium};
+  border-radius: ${({ theme }) => theme.border.radius.sm};
+  box-shadow: ${({ theme }) => theme.boxShadow.light};
+  box-sizing: border-box;
+  display: flex;
+  flex-wrap: wrap;
+  gap: ${({ theme }) => theme.spacing(1)};
+  padding: ${({ theme }) => theme.spacing(2)};
+`;
+
+export const ExpandableList = ({
+  listItems,
+  rootRef,
+  id,
+}: {
+  listItems: ReactElement[];
+  rootRef: React.RefObject<HTMLElement>;
+  id: string;
+}) => {
+  const [listItemsInView, setListItemsInView] = useState(new Set<number>());
+
+  const firstListItem = listItems[0];
+
+  const dropdownId = `expandable-list-dropdown-${id}`;
+
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  const divRef = useRef<HTMLDivElement>(null);
+
+  return (
+    <StyledContainer ref={containerRef}>
+      {firstListItem}
+      {listItems.slice(1).map((listItem, index) => (
+        <React.Fragment key={index}>
+          <IntersectionObserverWrapper
+            set={setListItemsInView}
+            id={index}
+            rootRef={rootRef}
+          >
+            {listItem}
+          </IntersectionObserverWrapper>
+          {index === listItemsInView.size - 1 &&
+            listItems.length - listItemsInView.size - 1 !== 0 && (
+              <Dropdown
+                dropdownId={dropdownId}
+                dropdownHotkeyScope={{
+                  scope: dropdownId,
+                }}
+                clickableComponent={
+                  <Chip
+                    label={`+${listItems.length - listItemsInView.size - 1}`}
+                    variant={ChipVariant.Highlighted}
+                  />
+                }
+                dropdownComponents={
+                  <>
+                    {divRef.current &&
+                      createPortal(
+                        <StyledExpendableCell>
+                          {listItems}
+                        </StyledExpendableCell>,
+                        divRef.current as HTMLElement,
+                      )}
+                  </>
+                }
+              />
+            )}
+        </React.Fragment>
+      ))}
+      <div
+        ref={divRef}
+        style={{
+          position: 'absolute',
+          top: '100%',
+          zIndex: 1,
+          boxSizing: 'border-box',
+        }}
+      ></div>
+    </StyledContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/display/expandable-list/IntersectionObserverWrapper.tsx b/packages/twenty-front/src/modules/ui/display/expandable-list/IntersectionObserverWrapper.tsx
new file mode 100644
index 000000000000..d4a81d2e2974
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/display/expandable-list/IntersectionObserverWrapper.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import { useInView } from 'react-intersection-observer';
+import styled from '@emotion/styled';
+
+const StyledDiv = styled.div<{ inView?: boolean }>`
+  opacity: ${({ inView }) => (inView === undefined || inView ? 1 : 0)};
+`;
+
+export const IntersectionObserverWrapper = ({
+  set,
+  id,
+  rootRef,
+  children,
+}: {
+  set: React.Dispatch<React.SetStateAction<Set<number>>>;
+  id: number;
+  rootRef?: React.RefObject<HTMLElement>;
+  children: React.ReactNode;
+}) => {
+  const { ref, inView } = useInView({
+    threshold: 1,
+    onChange: (inView) => {
+      if (inView) {
+        set((prev: Set<number>) => {
+          const newSet = new Set(prev);
+          newSet.add(id);
+          return newSet;
+        });
+      }
+      if (!inView) {
+        set((prev: Set<number>) => {
+          const newSet = new Set(prev);
+          newSet.delete(id);
+          return newSet;
+        });
+      }
+    },
+    root: rootRef?.current,
+    rootMargin: '0px 0px -50px 0px',
+  });
+
+  return (
+    <StyledDiv ref={ref} inView={inView}>
+      {children}
+    </StyledDiv>
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/display/icon/components/IconAddressBook.tsx b/packages/twenty-front/src/modules/ui/display/icon/components/IconAddressBook.tsx
index 12abfb520405..2c8c72bfcfbf 100644
--- a/packages/twenty-front/src/modules/ui/display/icon/components/IconAddressBook.tsx
+++ b/packages/twenty-front/src/modules/ui/display/icon/components/IconAddressBook.tsx
@@ -1,4 +1,4 @@
-import { TablerIconsProps } from '@/ui/display/icon';
+import { TablerIconsProps } from 'twenty-ui';
 
 import IconAddressBookRaw from '../assets/address-book.svg?react';
 
diff --git a/packages/twenty-front/src/modules/ui/display/icon/components/IconTwentyStar.tsx b/packages/twenty-front/src/modules/ui/display/icon/components/IconTwentyStar.tsx
index 94f43872c913..25ce2eba04e8 100644
--- a/packages/twenty-front/src/modules/ui/display/icon/components/IconTwentyStar.tsx
+++ b/packages/twenty-front/src/modules/ui/display/icon/components/IconTwentyStar.tsx
@@ -1,4 +1,4 @@
-import { TablerIconsProps } from '@/ui/display/icon';
+import { TablerIconsProps } from 'twenty-ui';
 
 import IconTwentyStarRaw from '../assets/twenty-star.svg?react';
 
diff --git a/packages/twenty-front/src/modules/ui/display/icon/components/IconTwentyStarFilled.tsx b/packages/twenty-front/src/modules/ui/display/icon/components/IconTwentyStarFilled.tsx
index 830de612c300..e1933ea6d352 100644
--- a/packages/twenty-front/src/modules/ui/display/icon/components/IconTwentyStarFilled.tsx
+++ b/packages/twenty-front/src/modules/ui/display/icon/components/IconTwentyStarFilled.tsx
@@ -1,4 +1,4 @@
-import { TablerIconsProps } from '@/ui/display/icon';
+import { TablerIconsProps } from 'twenty-ui';
 
 import IconTwentyStarFilledRaw from '../assets/twenty-star-filled.svg?react';
 
diff --git a/packages/twenty-front/src/modules/ui/display/icon/constants/index.ts b/packages/twenty-front/src/modules/ui/display/icon/constants/index.ts
index becf2f91bb37..8c0c4b2676f0 100644
--- a/packages/twenty-front/src/modules/ui/display/icon/constants/index.ts
+++ b/packages/twenty-front/src/modules/ui/display/icon/constants/index.ts
@@ -757,7 +757,6 @@ import {
   IconBrandPocket,
   IconBrandPolymer,
   IconBrandPowershell,
-  IconBrandPrisma,
   IconBrandProducthunt,
   IconBrandPushbullet,
   IconBrandPushover,
@@ -950,6 +949,7 @@ import {
   IconCalendarBolt,
   IconCalendarCancel,
   IconCalendarCheck,
+  IconCalendarClock,
   IconCalendarCode,
   IconCalendarCog,
   IconCalendarDollar,
@@ -4199,14 +4199,14 @@ import {
 } from '@tabler/icons-react';
 
 export default {
+  Icon123,
+  Icon24Hours,
   Icon2fa,
+  Icon360,
+  Icon360View,
   Icon3dCubeSphere,
   Icon3dCubeSphereOff,
   Icon3dRotate,
-  Icon24Hours,
-  Icon123,
-  Icon360,
-  Icon360View,
   IconAB,
   IconAB2,
   IconAbacus,
@@ -4956,7 +4956,6 @@ export default {
   IconBrandPocket,
   IconBrandPolymer,
   IconBrandPowershell,
-  IconBrandPrisma,
   IconBrandProducthunt,
   IconBrandPushbullet,
   IconBrandPushover,
@@ -5149,6 +5148,7 @@ export default {
   IconCalendarBolt,
   IconCalendarCancel,
   IconCalendarCheck,
+  IconCalendarClock,
   IconCalendarCode,
   IconCalendarCog,
   IconCalendarDollar,
@@ -5440,6 +5440,9 @@ export default {
   IconClockExclamation,
   IconClockHeart,
   IconClockHour1,
+  IconClockHour10,
+  IconClockHour11,
+  IconClockHour12,
   IconClockHour2,
   IconClockHour3,
   IconClockHour4,
@@ -5448,9 +5451,6 @@ export default {
   IconClockHour7,
   IconClockHour8,
   IconClockHour9,
-  IconClockHour10,
-  IconClockHour11,
-  IconClockHour12,
   IconClockMinus,
   IconClockOff,
   IconClockPause,
@@ -7117,10 +7117,10 @@ export default {
   IconMovieOff,
   IconMug,
   IconMugOff,
-  IconMultiplier1x,
-  IconMultiplier2x,
   IconMultiplier05x,
   IconMultiplier15x,
+  IconMultiplier1x,
+  IconMultiplier2x,
   IconMushroom,
   IconMushroomOff,
   IconMusic,
@@ -7515,20 +7515,20 @@ export default {
   IconReservedLine,
   IconResize,
   IconRestore,
-  IconRewindBackward5,
   IconRewindBackward10,
   IconRewindBackward15,
   IconRewindBackward20,
   IconRewindBackward30,
   IconRewindBackward40,
+  IconRewindBackward5,
   IconRewindBackward50,
   IconRewindBackward60,
-  IconRewindForward5,
   IconRewindForward10,
   IconRewindForward15,
   IconRewindForward20,
   IconRewindForward30,
   IconRewindForward40,
+  IconRewindForward5,
   IconRewindForward50,
   IconRewindForward60,
   IconRibbonHealth,
@@ -8080,11 +8080,11 @@ export default {
   IconTiltShift,
   IconTiltShiftOff,
   IconTimeDuration0,
-  IconTimeDuration5,
   IconTimeDuration10,
   IconTimeDuration15,
   IconTimeDuration30,
   IconTimeDuration45,
+  IconTimeDuration5,
   IconTimeDuration60,
   IconTimeDuration90,
   IconTimeDurationOff,
diff --git a/packages/twenty-front/src/modules/ui/display/icon/hooks/__tests__/useIcons.test.ts b/packages/twenty-front/src/modules/ui/display/icon/hooks/__tests__/useIcons.test.ts
index 44ce44fc2b94..aaf70aa02de5 100644
--- a/packages/twenty-front/src/modules/ui/display/icon/hooks/__tests__/useIcons.test.ts
+++ b/packages/twenty-front/src/modules/ui/display/icon/hooks/__tests__/useIcons.test.ts
@@ -1,7 +1,7 @@
 import { renderHook } from '@testing-library/react';
 import * as recoil from 'recoil';
+import { Icon123, IconBuildingSkyscraper, IconUser } from 'twenty-ui';
 
-import { Icon123, IconBuildingSkyscraper, IconUser } from '@/ui/display/icon';
 import { useIcons } from '@/ui/display/icon/hooks/useIcons';
 
 describe('useIcons', () => {
diff --git a/packages/twenty-front/src/modules/ui/display/icon/hooks/useIcons.ts b/packages/twenty-front/src/modules/ui/display/icon/hooks/useIcons.ts
index 4efd71e7f63d..a1dd37b4c074 100644
--- a/packages/twenty-front/src/modules/ui/display/icon/hooks/useIcons.ts
+++ b/packages/twenty-front/src/modules/ui/display/icon/hooks/useIcons.ts
@@ -1,6 +1,6 @@
 import { useRecoilValue } from 'recoil';
+import { Icon123 } from 'twenty-ui';
 
-import { Icon123 } from '@/ui/display/icon';
 import { iconsState } from '@/ui/display/icon/states/iconsState';
 
 export const useIcons = () => {
diff --git a/packages/twenty-front/src/modules/ui/display/icon/index.ts b/packages/twenty-front/src/modules/ui/display/icon/index.ts
deleted file mode 100644
index 539cbfa1e3ba..000000000000
--- a/packages/twenty-front/src/modules/ui/display/icon/index.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-/* eslint-disable no-restricted-imports */
-export type { TablerIconsProps } from '@tabler/icons-react';
-export {
-  Icon123,
-  IconAlertCircle,
-  IconAlertTriangle,
-  IconApps,
-  IconArchive,
-  IconArchiveOff,
-  IconArrowBackUp,
-  IconArrowDown,
-  IconArrowLeft,
-  IconArrowRight,
-  IconArrowUp,
-  IconArrowUpRight,
-  IconAt,
-  IconBaselineDensitySmall,
-  IconBell,
-  IconBolt,
-  IconBook2,
-  IconBox,
-  IconBrandGithub,
-  IconBrandGoogle,
-  IconBrandLinkedin,
-  IconBrandX,
-  IconBriefcase,
-  IconBuildingSkyscraper,
-  IconCalendar,
-  IconCalendarEvent,
-  IconCalendarX,
-  IconCheck,
-  IconCheckbox,
-  IconChevronDown,
-  IconChevronLeft,
-  IconChevronRight,
-  IconChevronsRight,
-  IconChevronUp,
-  IconCircleDot,
-  IconClick,
-  IconCode,
-  IconCoins,
-  IconColorSwatch,
-  IconMessageCircle as IconComment,
-  IconCopy,
-  IconCurrencyDollar,
-  IconCurrencyEuro,
-  IconCurrencyFrank,
-  IconCurrencyPound,
-  IconCurrencyYen,
-  IconCurrencyYuan,
-  IconDatabase,
-  IconDeviceFloppy,
-  IconDoorEnter,
-  IconDotsVertical,
-  IconDownload,
-  IconEye,
-  IconEyeOff,
-  IconFile,
-  IconFileCheck,
-  IconFileExport,
-  IconFileImport,
-  IconFileText,
-  IconFileUpload,
-  IconFileZip,
-  IconFilterOff,
-  IconForbid,
-  IconGripVertical,
-  IconHeadphones,
-  IconHeart,
-  IconHeartOff,
-  IconHelpCircle,
-  IconHierarchy2,
-  IconInfoCircle,
-  IconKey,
-  IconLanguage,
-  IconLayersLinked,
-  IconLayoutKanban,
-  IconLayoutSidebarLeftCollapse,
-  IconLayoutSidebarRightCollapse,
-  IconLayoutSidebarRightExpand,
-  IconLink,
-  IconLinkOff,
-  IconList,
-  IconListNumbers,
-  IconLock,
-  IconMail,
-  IconMailCog,
-  IconMap,
-  IconMinus,
-  IconMoneybag,
-  IconMouse2,
-  IconNotes,
-  IconNumbers,
-  IconPaperclip,
-  IconPencil,
-  IconPhone,
-  IconPhoto,
-  IconPlug,
-  IconPlus,
-  IconPresentation,
-  IconProgressCheck,
-  IconPuzzle,
-  IconRefresh,
-  IconRelationManyToMany,
-  IconRelationOneToMany,
-  IconRelationOneToOne,
-  IconRepeat,
-  IconSearch,
-  IconSend,
-  IconSettings,
-  IconTable,
-  IconTag,
-  IconTarget,
-  IconTargetArrow,
-  IconTextSize,
-  IconTimelineEvent,
-  IconTrash,
-  IconUnlink,
-  IconUpload,
-  IconUser,
-  IconUserCircle,
-  IconUsers,
-  IconVideo,
-  IconWand,
-  IconWorld,
-  IconX,
-} from '@tabler/icons-react';
diff --git a/packages/twenty-front/src/modules/ui/display/icon/states/iconsState.ts b/packages/twenty-front/src/modules/ui/display/icon/states/iconsState.ts
index 4f489150a76e..654d6bcb7e28 100644
--- a/packages/twenty-front/src/modules/ui/display/icon/states/iconsState.ts
+++ b/packages/twenty-front/src/modules/ui/display/icon/states/iconsState.ts
@@ -1,8 +1,8 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 
-export const iconsState = atom<Record<string, IconComponent>>({
+export const iconsState = createState<Record<string, IconComponent>>({
   key: 'iconsState',
-  default: {},
+  defaultValue: {},
 });
diff --git a/packages/twenty-front/src/modules/ui/display/icon/types/IconComponent.ts b/packages/twenty-front/src/modules/ui/display/icon/types/IconComponent.ts
index b66ffc568fdb..17b108bda77e 100644
--- a/packages/twenty-front/src/modules/ui/display/icon/types/IconComponent.ts
+++ b/packages/twenty-front/src/modules/ui/display/icon/types/IconComponent.ts
@@ -1,8 +1,10 @@
 import { FunctionComponent } from 'react';
 
-export type IconComponent = FunctionComponent<{
+export type IconComponentProps = {
   className?: string;
   color?: string;
   size?: number;
   stroke?: number;
-}>;
+};
+
+export type IconComponent = FunctionComponent<IconComponentProps>;
diff --git a/packages/twenty-front/src/modules/ui/display/info/components/Info.tsx b/packages/twenty-front/src/modules/ui/display/info/components/Info.tsx
new file mode 100644
index 000000000000..e65a17312fc5
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/display/info/components/Info.tsx
@@ -0,0 +1,65 @@
+import React from 'react';
+import { css, useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import { IconInfoCircle } from 'twenty-ui';
+
+import { Button } from '@/ui/input/button/components/Button.tsx';
+
+export type InfoAccent = 'blue' | 'danger';
+export type InfoProps = {
+  accent?: InfoAccent;
+  text: string;
+  buttonTitle: string;
+  onClick: (event: React.MouseEvent<HTMLButtonElement>) => void;
+};
+
+const StyledTextContainer = styled.div`
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(2)};
+`;
+
+const StyledInfo = styled.div<Pick<InfoProps, 'accent'>>`
+  align-items: center;
+  border-radius: ${({ theme }) => theme.border.radius.md};
+  display: flex;
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  justify-content: space-between;
+  max-width: 512px;
+  padding: ${({ theme }) => theme.spacing(2)};
+  ${({ theme, accent }) => {
+    switch (accent) {
+      case 'blue':
+        return css`
+          background: ${theme.color.blueAccent20};
+          color: ${theme.color.blue50};
+        `;
+      case 'danger':
+        return css`
+          background: ${theme.color.red10};
+          color: ${theme.color.red};
+        `;
+    }
+  }}
+`;
+export const Info = ({
+  accent = 'blue',
+  text,
+  buttonTitle,
+  onClick,
+}: InfoProps) => {
+  const theme = useTheme();
+  return (
+    <StyledInfo accent={accent}>
+      <StyledTextContainer>
+        <IconInfoCircle size={theme.icon.size.md} />
+        {text}
+      </StyledTextContainer>
+      <Button
+        title={buttonTitle}
+        onClick={onClick}
+        size={'small'}
+        variant={'secondary'}
+      />
+    </StyledInfo>
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/display/info/components/__stories__/Info.stories.tsx b/packages/twenty-front/src/modules/ui/display/info/components/__stories__/Info.stories.tsx
new file mode 100644
index 000000000000..98ac1e3179ca
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/display/info/components/__stories__/Info.stories.tsx
@@ -0,0 +1,45 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { Info, InfoAccent } from '@/ui/display/info/components/Info.tsx';
+import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator.tsx';
+import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator.tsx';
+import { CatalogStory } from '~/testing/types.ts';
+
+const meta: Meta<typeof Info> = {
+  title: 'UI/Display/Info/Info',
+  component: Info,
+};
+
+export default meta;
+type Story = StoryObj<typeof Info>;
+
+export const Default: Story = {
+  args: {
+    accent: 'blue',
+    text: 'An info component',
+    buttonTitle: 'Update',
+  },
+  decorators: [ComponentDecorator],
+};
+
+export const Catalog: CatalogStory<Story, typeof Info> = {
+  args: {
+    text: 'An info component',
+    buttonTitle: 'Update',
+  },
+  argTypes: {
+    accent: { control: false },
+  },
+  parameters: {
+    catalog: {
+      dimensions: [
+        {
+          name: 'accents',
+          values: ['blue', 'danger'] satisfies InfoAccent[],
+          props: (accent: InfoAccent) => ({ accent }),
+        },
+      ],
+    },
+  },
+  decorators: [CatalogDecorator],
+};
diff --git a/packages/twenty-front/src/modules/ui/display/pill/components/__stories__/Pill.stories.tsx b/packages/twenty-front/src/modules/ui/display/pill/components/__stories__/Pill.stories.tsx
deleted file mode 100644
index 5ac65f7a0973..000000000000
--- a/packages/twenty-front/src/modules/ui/display/pill/components/__stories__/Pill.stories.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Meta, StoryObj } from '@storybook/react';
-
-import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
-
-import { Pill } from '../Pill';
-
-const meta: Meta<typeof Pill> = {
-  title: 'UI/Display/Pill/Pill',
-  component: Pill,
-  decorators: [ComponentDecorator],
-};
-
-export default meta;
-type Story = StoryObj<typeof Pill>;
-
-export const Default: Story = {};
diff --git a/packages/twenty-front/src/modules/ui/display/tooltip/AppTooltip.tsx b/packages/twenty-front/src/modules/ui/display/tooltip/AppTooltip.tsx
index 99fa35032fe4..ad8abe37afb8 100644
--- a/packages/twenty-front/src/modules/ui/display/tooltip/AppTooltip.tsx
+++ b/packages/twenty-front/src/modules/ui/display/tooltip/AppTooltip.tsx
@@ -35,6 +35,7 @@ export type AppTooltipProps = {
   className?: string;
   anchorSelect?: string;
   content?: string;
+  children?: React.ReactNode;
   delayHide?: number;
   offset?: number;
   noArrow?: boolean;
@@ -53,6 +54,7 @@ export const AppTooltip = ({
   offset,
   place,
   positionStrategy,
+  children,
 }: AppTooltipProps) => (
   <StyledAppTooltip
     {...{
@@ -65,6 +67,7 @@ export const AppTooltip = ({
       offset,
       place,
       positionStrategy,
+      children,
     }}
   />
 );
diff --git a/packages/twenty-front/src/modules/ui/display/tooltip/OverflowingTextWithTooltip.tsx b/packages/twenty-front/src/modules/ui/display/tooltip/OverflowingTextWithTooltip.tsx
index 41b266efaf04..f8ee4ebcd484 100644
--- a/packages/twenty-front/src/modules/ui/display/tooltip/OverflowingTextWithTooltip.tsx
+++ b/packages/twenty-front/src/modules/ui/display/tooltip/OverflowingTextWithTooltip.tsx
@@ -22,9 +22,11 @@ const StyledOverflowingText = styled.div<{ cursorPointer: boolean }>`
 export const OverflowingTextWithTooltip = ({
   text,
   className,
+  mutliline,
 }: {
   text: string | null | undefined;
   className?: string;
+  mutliline?: boolean;
 }) => {
   const textElementId = `title-id-${uuidV4()}`;
 
@@ -65,13 +67,15 @@ export const OverflowingTextWithTooltip = ({
           <div onClick={handleTooltipClick}>
             <AppTooltip
               anchorSelect={`#${textElementId}`}
-              content={text ?? ''}
+              content={mutliline ? undefined : text ?? ''}
               delayHide={0}
               offset={5}
               noArrow
               place="bottom"
               positionStrategy="absolute"
-            />
+            >
+              {mutliline ? <pre>{text}</pre> : ''}
+            </AppTooltip>
           </div>,
           document.body,
         )}
diff --git a/packages/twenty-front/src/modules/ui/display/typography/components/H3Title.tsx b/packages/twenty-front/src/modules/ui/display/typography/components/H3Title.tsx
new file mode 100644
index 000000000000..4e8f8dcaae16
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/display/typography/components/H3Title.tsx
@@ -0,0 +1,19 @@
+import { ReactNode } from 'react';
+import styled from '@emotion/styled';
+
+type H3TitleProps = {
+  title: ReactNode;
+  className?: string;
+};
+
+const StyledH3Title = styled.h3`
+  color: ${({ theme }) => theme.font.color.primary};
+  font-size: ${({ theme }) => theme.font.size.lg};
+  font-weight: ${({ theme }) => theme.font.weight.semiBold};
+  margin: 0;
+  margin-bottom: ${({ theme }) => theme.spacing(4)};
+`;
+
+export const H3Title = ({ title, className }: H3TitleProps) => {
+  return <StyledH3Title className={className}>{title}</StyledH3Title>;
+};
diff --git a/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H3Title.stories.tsx b/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H3Title.stories.tsx
new file mode 100644
index 000000000000..7ea720df9e08
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/display/typography/components/__stories__/H3Title.stories.tsx
@@ -0,0 +1,22 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+
+import { H3Title } from '../H3Title';
+
+const meta: Meta<typeof H3Title> = {
+  title: 'UI/Display/Typography/Title/H3Title',
+  component: H3Title,
+  decorators: [ComponentDecorator],
+  args: {
+    title: 'H3 title',
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof H3Title>;
+
+export const Default: Story = {
+  decorators: [ComponentDecorator],
+};
diff --git a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/components/Dialog.tsx b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/components/Dialog.tsx
index 259e15a08fe4..905bbe033638 100644
--- a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/components/Dialog.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/components/Dialog.tsx
@@ -5,6 +5,7 @@ import { Key } from 'ts-key-enum';
 
 import { Button } from '@/ui/input/button/components/Button';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
+import { isDefined } from '~/utils/isDefined';
 
 import { DialogHotkeyScope } from '../types/DialogHotkeyScope';
 
@@ -104,7 +105,7 @@ export const Dialog = ({
 
       event.preventDefault();
 
-      if (confirmButton) {
+      if (isDefined(confirmButton)) {
         confirmButton?.onClick?.(event);
         closeSnackbar();
       }
diff --git a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/scopes/scope-internal-context/DialogManagerScopeInternalContext.ts b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/scopes/scope-internal-context/DialogManagerScopeInternalContext.ts
index 428596e8f44d..fb6183db810a 100644
--- a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/scopes/scope-internal-context/DialogManagerScopeInternalContext.ts
+++ b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/scopes/scope-internal-context/DialogManagerScopeInternalContext.ts
@@ -1,7 +1,7 @@
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
 import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
-type DialogManagerScopeInternalContextProps = StateScopeMapKey;
+type DialogManagerScopeInternalContextProps = ComponentStateKey;
 
 export const DialogManagerScopeInternalContext =
   createScopeInternalContext<DialogManagerScopeInternalContextProps>();
diff --git a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/states/dialogInternalScopedState.ts b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/states/dialogInternalScopedState.ts
index 13bc5cb7df02..4f8c44a3454e 100644
--- a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/states/dialogInternalScopedState.ts
+++ b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/states/dialogInternalScopedState.ts
@@ -1,4 +1,4 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
 
 import { DialogOptions } from '../types/DialogOptions';
 
@@ -7,7 +7,7 @@ type DialogState = {
   queue: DialogOptions[];
 };
 
-export const dialogInternalScopedState = createStateScopeMap<DialogState>({
+export const dialogInternalScopedState = createComponentState<DialogState>({
   key: 'dialog/internal-state',
   defaultValue: {
     maxQueue: 2,
diff --git a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx
index fc73db771362..07e0c52dd9da 100644
--- a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx
@@ -1,13 +1,14 @@
 import { useCallback, useMemo, useRef } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconAlertTriangle, IconX } from 'twenty-ui';
 
-import { IconAlertTriangle, IconX } from '@/ui/display/icon';
 import {
   ProgressBar,
   ProgressBarControls,
 } from '@/ui/feedback/progress-bar/components/ProgressBar';
 import { RGBA } from '@/ui/theme/constants/Rgba';
+import { isDefined } from '~/utils/isDefined';
 
 import { usePausableTimeout } from '../hooks/usePausableTimeout';
 
@@ -131,7 +132,7 @@ export const SnackBar = ({
   );
 
   const icon = useMemo(() => {
-    if (iconComponent) {
+    if (isDefined(iconComponent)) {
       return iconComponent;
     }
 
diff --git a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/hooks/usePausableTimeout.ts b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/hooks/usePausableTimeout.ts
index df4de15ca1f1..6e58b08878a2 100644
--- a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/hooks/usePausableTimeout.ts
+++ b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/hooks/usePausableTimeout.ts
@@ -1,5 +1,7 @@
 import { useCallback, useEffect, useRef } from 'react';
 
+import { isDefined } from '~/utils/isDefined';
+
 export const usePausableTimeout = (callback: () => void, delay: number) => {
   // eslint-disable-next-line @nx/workspace-no-state-useref
   const savedCallback = useRef<() => void>(callback);
@@ -11,7 +13,7 @@ export const usePausableTimeout = (callback: () => void, delay: number) => {
   const timeoutId = useRef<ReturnType<typeof setTimeout> | null>(null);
 
   const tick = () => {
-    if (savedCallback.current) {
+    if (isDefined(savedCallback.current)) {
       savedCallback.current();
     }
   };
@@ -31,7 +33,7 @@ export const usePausableTimeout = (callback: () => void, delay: number) => {
     if (delay !== null) {
       startTimeout();
       return () => {
-        if (timeoutId.current) {
+        if (isDefined(timeoutId.current)) {
           clearTimeout(timeoutId.current);
         }
       };
@@ -39,7 +41,7 @@ export const usePausableTimeout = (callback: () => void, delay: number) => {
   }, [delay, startTimeout]);
 
   const pauseTimeout = () => {
-    if (timeoutId.current) {
+    if (isDefined(timeoutId.current)) {
       clearTimeout(timeoutId.current);
     }
     const elapsedTime = Date.now() - startTime.current;
diff --git a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/hooks/useSnackBar.ts b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/hooks/useSnackBar.ts
new file mode 100644
index 000000000000..d60a9d6b3957
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/hooks/useSnackBar.ts
@@ -0,0 +1,59 @@
+import { useCallback } from 'react';
+import { useRecoilCallback } from 'recoil';
+import { v4 as uuidv4 } from 'uuid';
+
+import { SnackBarManagerScopeInternalContext } from '@/ui/feedback/snack-bar-manager/scopes/scope-internal-context/SnackBarManagerScopeInternalContext';
+import {
+  snackBarInternalScopedState,
+  SnackBarOptions,
+} from '@/ui/feedback/snack-bar-manager/states/snackBarInternalScopedState';
+import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
+
+export const useSnackBar = () => {
+  const scopeId = useAvailableScopeIdOrThrow(
+    SnackBarManagerScopeInternalContext,
+  );
+
+  const handleSnackBarClose = useRecoilCallback(
+    ({ set }) =>
+      (id: string) => {
+        set(snackBarInternalScopedState({ scopeId }), (prevState) => ({
+          ...prevState,
+          queue: prevState.queue.filter((snackBar) => snackBar.id !== id),
+        }));
+      },
+    [scopeId],
+  );
+
+  const setSnackBarQueue = useRecoilCallback(
+    ({ set }) =>
+      (newValue) =>
+        set(snackBarInternalScopedState({ scopeId }), (prev) => {
+          if (prev.queue.length >= prev.maxQueue) {
+            return {
+              ...prev,
+              queue: [...prev.queue.slice(1), newValue] as SnackBarOptions[],
+            };
+          }
+
+          return {
+            ...prev,
+            queue: [...prev.queue, newValue] as SnackBarOptions[],
+          };
+        }),
+    [scopeId],
+  );
+
+  const enqueueSnackBar = useCallback(
+    (message: string, options?: Omit<SnackBarOptions, 'message' | 'id'>) => {
+      setSnackBarQueue({
+        id: uuidv4(),
+        message,
+        ...options,
+      });
+    },
+    [setSnackBarQueue],
+  );
+
+  return { handleSnackBarClose, enqueueSnackBar };
+};
diff --git a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/hooks/useSnackBar.tsx b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/hooks/useSnackBar.tsx
deleted file mode 100644
index 0731889e6e3e..000000000000
--- a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/hooks/useSnackBar.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { useCallback } from 'react';
-import { useRecoilCallback } from 'recoil';
-import { v4 as uuidv4 } from 'uuid';
-
-import { SnackBarManagerScopeInternalContext } from '@/ui/feedback/snack-bar-manager/scopes/scope-internal-context/SnackBarManagerScopeInternalContext';
-import {
-  snackBarInternalScopedState,
-  SnackBarOptions,
-} from '@/ui/feedback/snack-bar-manager/states/snackBarInternalScopedState';
-import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
-
-export const useSnackBar = () => {
-  const scopeId = useAvailableScopeIdOrThrow(
-    SnackBarManagerScopeInternalContext,
-  );
-
-  const handleSnackBarClose = useRecoilCallback(({ set }) => (id: string) => {
-    set(snackBarInternalScopedState({ scopeId }), (prevState) => ({
-      ...prevState,
-      queue: prevState.queue.filter((snackBar) => snackBar.id !== id),
-    }));
-  });
-
-  const setSnackBarQueue = useRecoilCallback(
-    ({ set }) =>
-      (newValue) =>
-        set(snackBarInternalScopedState({ scopeId }), (prev) => {
-          if (prev.queue.length >= prev.maxQueue) {
-            return {
-              ...prev,
-              queue: [...prev.queue.slice(1), newValue] as SnackBarOptions[],
-            };
-          }
-
-          return {
-            ...prev,
-            queue: [...prev.queue, newValue] as SnackBarOptions[],
-          };
-        }),
-    [scopeId],
-  );
-
-  const enqueueSnackBar = useCallback(
-    (message: string, options?: Omit<SnackBarOptions, 'message' | 'id'>) => {
-      setSnackBarQueue({
-        id: uuidv4(),
-        message,
-        ...options,
-      });
-    },
-    [setSnackBarQueue],
-  );
-
-  return { handleSnackBarClose, enqueueSnackBar };
-};
diff --git a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/scopes/scope-internal-context/SnackBarManagerScopeInternalContext.ts b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/scopes/scope-internal-context/SnackBarManagerScopeInternalContext.ts
index 274d356a84c0..75b7e1e13588 100644
--- a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/scopes/scope-internal-context/SnackBarManagerScopeInternalContext.ts
+++ b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/scopes/scope-internal-context/SnackBarManagerScopeInternalContext.ts
@@ -1,7 +1,7 @@
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
 import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
-type SnackBarManagerScopeInternalContextProps = StateScopeMapKey;
+type SnackBarManagerScopeInternalContextProps = ComponentStateKey;
 
 export const SnackBarManagerScopeInternalContext =
   createScopeInternalContext<SnackBarManagerScopeInternalContextProps>();
diff --git a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/states/snackBarInternalScopedState.ts b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/states/snackBarInternalScopedState.ts
index e6f613fcdf06..a880abccceb5 100644
--- a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/states/snackBarInternalScopedState.ts
+++ b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/states/snackBarInternalScopedState.ts
@@ -1,4 +1,4 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
 
 import { SnackBarProps } from '../components/SnackBar';
 
@@ -11,7 +11,7 @@ export type SnackBarState = {
   queue: SnackBarOptions[];
 };
 
-export const snackBarInternalScopedState = createStateScopeMap<SnackBarState>({
+export const snackBarInternalScopedState = createComponentState<SnackBarState>({
   key: 'snackBarState',
   defaultValue: {
     maxQueue: 3,
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
index 80d3a968fd69..715ab0c47364 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
@@ -1,10 +1,51 @@
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+
+import { FieldCurrencyValue } from '@/object-record/record-field/types/FieldMetadata';
+import { SETTINGS_FIELD_CURRENCY_CODES } from '@/settings/data-model/constants/SettingsFieldCurrencyCodes';
+import { formatAmount } from '~/utils/format/formatAmount';
+import { isDefined } from '~/utils/isDefined';
+
 import { EllipsisDisplay } from './EllipsisDisplay';
 
 type CurrencyDisplayProps = {
-  amount?: number | null;
+  currencyValue: FieldCurrencyValue | null | undefined;
 };
 
-// TODO: convert currencyCode to currency symbol
-export const CurrencyDisplay = ({ amount }: CurrencyDisplayProps) => {
-  return <EllipsisDisplay>{amount}</EllipsisDisplay>;
+const StyledEllipsisDisplay = styled(EllipsisDisplay)`
+  align-items: center;
+  display: flex;
+`;
+
+export const CurrencyDisplay = ({ currencyValue }: CurrencyDisplayProps) => {
+  const theme = useTheme();
+
+  const shouldDisplayCurrency = isDefined(currencyValue?.currencyCode);
+
+  const CurrencyIcon = isDefined(currencyValue?.currencyCode)
+    ? SETTINGS_FIELD_CURRENCY_CODES[currencyValue?.currencyCode]?.Icon
+    : null;
+
+  const amountToDisplay = isDefined(currencyValue?.amountMicros)
+    ? currencyValue.amountMicros / 1000000
+    : 0;
+
+  if (!shouldDisplayCurrency) {
+    return <StyledEllipsisDisplay>{0}</StyledEllipsisDisplay>;
+  }
+
+  return (
+    <StyledEllipsisDisplay>
+      {isDefined(CurrencyIcon) && (
+        <>
+          <CurrencyIcon
+            color={theme.font.color.primary}
+            size={theme.icon.size.md}
+            stroke={theme.icon.stroke.sm}
+          />{' '}
+        </>
+      )}
+      {amountToDisplay !== 0 ? formatAmount(amountToDisplay) : ''}
+    </StyledEllipsisDisplay>
+  );
 };
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/EllipsisDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/EllipsisDisplay.tsx
index e8cb03fe5adf..608019e93cc8 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/EllipsisDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/EllipsisDisplay.tsx
@@ -11,11 +11,15 @@ const StyledEllipsisDisplay = styled.div<{ maxWidth?: number }>`
 type EllipsisDisplayProps = {
   children: React.ReactNode;
   maxWidth?: number;
+  className?: string;
 };
 
 export const EllipsisDisplay = ({
   children,
   maxWidth,
+  className,
 }: EllipsisDisplayProps) => (
-  <StyledEllipsisDisplay style={{ maxWidth }}>{children}</StyledEllipsisDisplay>
+  <StyledEllipsisDisplay style={{ maxWidth }} className={className}>
+    {children}
+  </StyledEllipsisDisplay>
 );
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/JsonDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/JsonDisplay.tsx
new file mode 100644
index 000000000000..63614d358c04
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/field/display/components/JsonDisplay.tsx
@@ -0,0 +1,10 @@
+import { EllipsisDisplay } from './EllipsisDisplay';
+
+type JsonDisplayProps = {
+  text: string;
+  maxWidth?: number;
+};
+
+export const JsonDisplay = ({ text, maxWidth }: JsonDisplayProps) => (
+  <EllipsisDisplay maxWidth={maxWidth}>{text}</EllipsisDisplay>
+);
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/PhoneDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/PhoneDisplay.tsx
index 7ad5b97ecbf7..b9e73c45dad1 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/PhoneDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/PhoneDisplay.tsx
@@ -18,7 +18,7 @@ export const PhoneDisplay = ({ value }: PhoneDisplayProps) => (
           event.stopPropagation();
         }}
       >
-        {parsePhoneNumber(value, 'FR')?.formatInternational() || value}
+        {parsePhoneNumber(value, 'FR')?.formatNational() || value}
       </ContactLink>
     ) : (
       <ContactLink href="#">{value}</ContactLink>
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/AddressInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/AddressInput.tsx
new file mode 100644
index 000000000000..40e83f39e482
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/field/input/components/AddressInput.tsx
@@ -0,0 +1,254 @@
+import { RefObject, useEffect, useRef, useState } from 'react';
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import { flip, offset, useFloating } from '@floating-ui/react';
+import { Key } from 'ts-key-enum';
+
+import { FieldAddressDraftValue } from '@/object-record/record-field/types/FieldInputDraftValue';
+import { FieldAddressValue } from '@/object-record/record-field/types/FieldMetadata';
+import { CountrySelect } from '@/ui/input/components/internal/country/components/CountrySelect';
+import { TextInput } from '@/ui/input/components/TextInput';
+import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
+import { useClickOutsideListener } from '@/ui/utilities/pointer-event/hooks/useClickOutsideListener';
+import { isDefined } from '~/utils/isDefined';
+
+const StyledAddressContainer = styled.div`
+  background: ${({ theme }) => theme.background.secondary};
+  border: 1px solid ${({ theme }) => theme.border.color.light};
+  border-radius: ${({ theme }) => theme.border.radius.md};
+  box-shadow: ${({ theme }) => theme.boxShadow.strong};
+
+  padding: 4px 8px;
+
+  width: 100%;
+  min-width: 260px;
+  > div {
+    margin-bottom: 6px;
+  }
+`;
+
+const StyledHalfRowContainer = styled.div`
+  display: flex;
+  gap: 8px;
+`;
+
+export type AddressInputProps = {
+  value: FieldAddressValue;
+  onTab: (newAddress: FieldAddressDraftValue) => void;
+  onShiftTab: (newAddress: FieldAddressDraftValue) => void;
+  onEnter: (newAddress: FieldAddressDraftValue) => void;
+  onEscape: (newAddress: FieldAddressDraftValue) => void;
+  onClickOutside: (
+    event: MouseEvent | TouchEvent,
+    newAddress: FieldAddressDraftValue,
+  ) => void;
+  hotkeyScope: string;
+  clearable?: boolean;
+  onChange?: (updatedValue: FieldAddressDraftValue) => void;
+};
+
+export const AddressInput = ({
+  value,
+  hotkeyScope,
+  onTab,
+  onShiftTab,
+  onEnter,
+  onEscape,
+  onClickOutside,
+  onChange,
+}: AddressInputProps) => {
+  const theme = useTheme();
+
+  const [internalValue, setInternalValue] = useState(value);
+  const addressStreet1InputRef = useRef<HTMLInputElement>(null);
+  const addressStreet2InputRef = useRef<HTMLInputElement>(null);
+  const addressCityInputRef = useRef<HTMLInputElement>(null);
+  const addressStateInputRef = useRef<HTMLInputElement>(null);
+  const addressPostCodeInputRef = useRef<HTMLInputElement>(null);
+
+  const inputRefs: {
+    [key in keyof FieldAddressDraftValue]?: RefObject<HTMLInputElement>;
+  } = {
+    addressStreet1: addressStreet1InputRef,
+    addressStreet2: addressStreet2InputRef,
+    addressCity: addressCityInputRef,
+    addressState: addressStateInputRef,
+    addressPostcode: addressPostCodeInputRef,
+  };
+
+  const [focusPosition, setFocusPosition] =
+    useState<keyof FieldAddressDraftValue>('addressStreet1');
+
+  const wrapperRef = useRef<HTMLDivElement>(null);
+
+  const { refs, floatingStyles } = useFloating({
+    placement: 'top-start',
+    middleware: [
+      flip(),
+      offset({
+        mainAxis: theme.spacingMultiplicator * 2,
+      }),
+    ],
+  });
+
+  const getChangeHandler =
+    (field: keyof FieldAddressDraftValue) => (updatedAddressPart: string) => {
+      const updatedAddress = { ...value, [field]: updatedAddressPart };
+      setInternalValue(updatedAddress);
+      onChange?.(updatedAddress);
+    };
+
+  const getFocusHandler = (fieldName: keyof FieldAddressDraftValue) => () => {
+    setFocusPosition(fieldName);
+
+    inputRefs[fieldName]?.current?.focus();
+  };
+
+  useScopedHotkeys(
+    'tab',
+    () => {
+      const currentFocusPosition = Object.keys(inputRefs).findIndex(
+        (key) => key === focusPosition,
+      );
+      const maxFocusPosition = Object.keys(inputRefs).length - 1;
+
+      const nextFocusPosition = currentFocusPosition + 1;
+
+      const isFocusPositionAfterLast = nextFocusPosition > maxFocusPosition;
+
+      if (isFocusPositionAfterLast) {
+        onTab?.(internalValue);
+      } else {
+        const nextFocusFieldName = Object.keys(inputRefs)[
+          nextFocusPosition
+        ] as keyof FieldAddressDraftValue;
+
+        setFocusPosition(nextFocusFieldName);
+        inputRefs[nextFocusFieldName]?.current?.focus();
+      }
+    },
+    hotkeyScope,
+    [onTab, internalValue, focusPosition],
+  );
+
+  useScopedHotkeys(
+    'shift+tab',
+    () => {
+      const currentFocusPosition = Object.keys(inputRefs).findIndex(
+        (key) => key === focusPosition,
+      );
+
+      const nextFocusPosition = currentFocusPosition - 1;
+
+      const isFocusPositionBeforeFirst = nextFocusPosition < 0;
+
+      if (isFocusPositionBeforeFirst) {
+        onShiftTab?.(internalValue);
+      } else {
+        const nextFocusFieldName = Object.keys(inputRefs)[
+          nextFocusPosition
+        ] as keyof FieldAddressDraftValue;
+
+        setFocusPosition(nextFocusFieldName);
+        inputRefs[nextFocusFieldName]?.current?.focus();
+      }
+    },
+    hotkeyScope,
+    [onTab, internalValue, focusPosition],
+  );
+
+  useScopedHotkeys(
+    Key.Enter,
+    () => {
+      onEnter(internalValue);
+    },
+    hotkeyScope,
+    [onEnter, internalValue],
+  );
+
+  useScopedHotkeys(
+    [Key.Escape],
+    () => {
+      onEscape(internalValue);
+    },
+    hotkeyScope,
+    [onEscape, internalValue],
+  );
+
+  const { useListenClickOutside } = useClickOutsideListener('addressInput');
+
+  useListenClickOutside({
+    refs: [wrapperRef],
+    callback: (event) => {
+      event.stopImmediatePropagation();
+
+      onClickOutside?.(event, internalValue);
+    },
+    enabled: isDefined(onClickOutside),
+  });
+
+  useEffect(() => {
+    setInternalValue(value);
+  }, [value]);
+
+  return (
+    <div ref={refs.setFloating} style={floatingStyles}>
+      <StyledAddressContainer ref={wrapperRef}>
+        <TextInput
+          autoFocus
+          value={internalValue.addressStreet1 ?? ''}
+          ref={inputRefs['addressStreet1']}
+          label="ADDRESS 1"
+          fullWidth
+          onChange={getChangeHandler('addressStreet1')}
+          onFocus={getFocusHandler('addressStreet1')}
+          disableHotkeys
+        />
+        <TextInput
+          value={internalValue.addressStreet2 ?? ''}
+          ref={inputRefs['addressStreet2']}
+          label="ADDRESS 2"
+          fullWidth
+          onChange={getChangeHandler('addressStreet2')}
+          onFocus={getFocusHandler('addressStreet2')}
+          disableHotkeys
+        />
+        <StyledHalfRowContainer>
+          <TextInput
+            value={internalValue.addressCity ?? ''}
+            ref={inputRefs['addressCity']}
+            label="CITY"
+            fullWidth
+            onChange={getChangeHandler('addressCity')}
+            onFocus={getFocusHandler('addressCity')}
+            disableHotkeys
+          />
+          <TextInput
+            value={internalValue.addressState ?? ''}
+            ref={inputRefs['addressState']}
+            label="STATE"
+            fullWidth
+            onChange={getChangeHandler('addressState')}
+            onFocus={getFocusHandler('addressState')}
+            disableHotkeys
+          />
+        </StyledHalfRowContainer>
+        <StyledHalfRowContainer>
+          <TextInput
+            value={internalValue.addressPostcode ?? ''}
+            ref={inputRefs['addressPostcode']}
+            label="POST CODE"
+            fullWidth
+            onChange={getChangeHandler('addressPostcode')}
+            onFocus={getFocusHandler('addressPostcode')}
+            disableHotkeys
+          />
+          <CountrySelect
+            onChange={getChangeHandler('addressCountry')}
+            selectedCountryName={internalValue.addressCountry ?? ''}
+          />
+        </StyledHalfRowContainer>
+      </StyledAddressContainer>
+    </div>
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/BooleanInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/BooleanInput.tsx
index 1c0dcdc6590f..348c89d7889e 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/BooleanInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/BooleanInput.tsx
@@ -1,8 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-
-import { IconCheck, IconX } from '@/ui/display/icon';
+import { IconCheck, IconX } from 'twenty-ui';
 
 const StyledEditableBooleanFieldContainer = styled.div`
   align-items: center;
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx
new file mode 100644
index 000000000000..925bcc1b9b1d
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx
@@ -0,0 +1,143 @@
+import { ChangeEvent, useEffect, useMemo, useRef, useState } from 'react';
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+
+import { useRegisterInputEvents } from '@/object-record/record-field/meta-types/input/hooks/useRegisterInputEvents';
+import { SETTINGS_FIELD_CURRENCY_CODES } from '@/settings/data-model/constants/SettingsFieldCurrencyCodes';
+import { IconComponent } from '@/ui/display/icon/types/IconComponent';
+import { CurrencyPickerDropdownButton } from '@/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton';
+import { TEXT_INPUT_STYLE } from '@/ui/theme/constants/TextInputStyle';
+
+export const StyledInput = styled.input`
+  margin: 0;
+  ${TEXT_INPUT_STYLE}
+  width: 100%;
+  padding: ${({ theme }) => `${theme.spacing(0)} ${theme.spacing(1)}`};
+`;
+
+const StyledContainer = styled.div`
+  align-items: center;
+
+  border: none;
+  border-radius: ${({ theme }) => theme.border.radius.sm};
+  box-shadow: ${({ theme }) => theme.boxShadow.strong};
+
+  display: flex;
+  justify-content: center;
+`;
+
+const StyledIcon = styled.div`
+  align-items: center;
+  display: flex;
+
+  & > svg {
+    padding-left: ${({ theme }) => theme.spacing(1)};
+    color: ${({ theme }) => theme.font.color.tertiary};
+    height: ${({ theme }) => theme.icon.size.md}px;
+    width: ${({ theme }) => theme.icon.size.md}px;
+  }
+`;
+
+export type CurrencyInputProps = {
+  placeholder?: string;
+  autoFocus?: boolean;
+  value: string;
+  currencyCode: string;
+  onEnter: (newText: string) => void;
+  onEscape: (newText: string) => void;
+  onTab?: (newText: string) => void;
+  onShiftTab?: (newText: string) => void;
+  onClickOutside: (event: MouseEvent | TouchEvent, inputValue: string) => void;
+  onChange?: (newText: string) => void;
+  onSelect?: (newText: string) => void;
+  hotkeyScope: string;
+};
+
+type Currency = {
+  label: string;
+  value: string;
+  Icon: any;
+};
+
+export const CurrencyInput = ({
+  autoFocus,
+  value,
+  currencyCode,
+  placeholder,
+  onEnter,
+  onEscape,
+  onTab,
+  onShiftTab,
+  onClickOutside,
+  onChange,
+  onSelect,
+  hotkeyScope,
+}: CurrencyInputProps) => {
+  const theme = useTheme();
+
+  const [internalText, setInternalText] = useState(value);
+
+  const wrapperRef = useRef<HTMLInputElement>(null);
+
+  const handleChange = (event: ChangeEvent<HTMLInputElement>) => {
+    setInternalText(event.target.value);
+    onChange?.(event.target.value);
+  };
+
+  const handleCurrencyChange = (currency: Currency) => {
+    onSelect?.(currency.value);
+  };
+
+  useRegisterInputEvents({
+    inputRef: wrapperRef,
+    inputValue: internalText,
+    onEnter,
+    onEscape,
+    onClickOutside,
+    onTab,
+    onShiftTab,
+    hotkeyScope,
+  });
+
+  const currencies = useMemo<Currency[]>(
+    () =>
+      Object.entries(SETTINGS_FIELD_CURRENCY_CODES).map(
+        ([key, { Icon, label }]) => ({
+          value: key,
+          Icon,
+          label,
+        }),
+      ),
+    [],
+  );
+
+  const currency = currencies.find(({ value }) => value === currencyCode);
+
+  useEffect(() => {
+    setInternalText(value);
+  }, [value]);
+
+  const Icon: IconComponent = currency?.Icon;
+
+  return (
+    <StyledContainer ref={wrapperRef}>
+      <CurrencyPickerDropdownButton
+        valueCode={currency?.value ?? ''}
+        onChange={handleCurrencyChange}
+        currencies={currencies}
+      />
+      <StyledIcon>
+        {Icon && (
+          <Icon size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />
+        )}
+      </StyledIcon>
+      <StyledInput
+        autoComplete="off"
+        placeholder={placeholder}
+        onChange={handleChange}
+        autoFocus={autoFocus}
+        value={value}
+      />
+    </StyledContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx
index d680a07b9b43..ac3ffaafb61a 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from 'react';
+import { useRef, useState } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { flip, offset, useFloating } from '@floating-ui/react';
@@ -14,8 +14,6 @@ const StyledCalendarContainer = styled.div`
   border-radius: ${({ theme }) => theme.border.radius.md};
   box-shadow: ${({ theme }) => theme.boxShadow.strong};
 
-  margin-top: 1px;
-
   position: absolute;
 
   z-index: 1;
@@ -38,6 +36,7 @@ export type DateInputProps = {
   hotkeyScope: string;
   clearable?: boolean;
   onChange?: (newDate: Nullable<Date>) => void;
+  isDateTimeInput?: boolean;
 };
 
 export const DateInput = ({
@@ -48,6 +47,7 @@ export const DateInput = ({
   onClickOutside,
   clearable,
   onChange,
+  isDateTimeInput,
 }: DateInputProps) => {
   const theme = useTheme();
 
@@ -60,7 +60,7 @@ export const DateInput = ({
     middleware: [
       flip(),
       offset({
-        mainAxis: theme.spacingMultiplicator * 2,
+        mainAxis: theme.spacingMultiplicator * -6,
       }),
     ],
   });
@@ -70,10 +70,6 @@ export const DateInput = ({
     onChange?.(newDate);
   };
 
-  useEffect(() => {
-    setInternalValue(value);
-  }, [value]);
-
   useRegisterInputEvents({
     inputRef: wrapperRef,
     inputValue: internalValue,
@@ -99,6 +95,7 @@ export const DateInput = ({
               onEnter(newDate);
             }}
             clearable={clearable ? clearable : false}
+            isDateTimeInput={isDateTimeInput}
           />
         </StyledCalendarContainer>
       </div>
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/DoubleTextInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/DoubleTextInput.tsx
index 5e87a3025d52..48b4bc2596e6 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/DoubleTextInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/DoubleTextInput.tsx
@@ -1,13 +1,19 @@
-import { ChangeEvent, useEffect, useRef, useState } from 'react';
+import {
+  ChangeEvent,
+  ClipboardEvent,
+  useEffect,
+  useRef,
+  useState,
+} from 'react';
 import styled from '@emotion/styled';
 import { Key } from 'ts-key-enum';
 
 import { FieldDoubleText } from '@/object-record/record-field/types/FieldDoubleText';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
-import { StyledInput } from './TextInput';
+import { StyledTextInput } from './TextInput';
 
 const StyledContainer = styled.div`
   align-items: center;
@@ -39,6 +45,7 @@ type DoubleTextInputProps = {
     newDoubleTextValue: FieldDoubleText,
   ) => void;
   onChange?: (newDoubleTextValue: FieldDoubleText) => void;
+  onPaste?: (newDoubleTextValue: FieldDoubleText) => void;
 };
 
 export const DoubleTextInput = ({
@@ -53,6 +60,7 @@ export const DoubleTextInput = ({
   onShiftTab,
   onTab,
   onChange,
+  onPaste,
 }: DoubleTextInputProps) => {
   const [firstInternalValue, setFirstInternalValue] = useState(firstValue);
   const [secondInternalValue, setSecondInternalValue] = useState(secondValue);
@@ -147,12 +155,26 @@ export const DoubleTextInput = ({
         secondValue: secondInternalValue,
       });
     },
-    enabled: isNonNullable(onClickOutside),
+    enabled: isDefined(onClickOutside),
   });
 
+  const handleOnPaste = (event: ClipboardEvent<HTMLInputElement>) => {
+    if (firstInternalValue.length > 0 || secondInternalValue.length > 0) {
+      return;
+    }
+
+    event.preventDefault();
+
+    const name = event.clipboardData.getData('Text');
+
+    const splittedName = name.split(' ');
+
+    onPaste?.({ firstValue: splittedName[0], secondValue: splittedName[1] });
+  };
+
   return (
     <StyledContainer ref={containerRef}>
-      <StyledInput
+      <StyledTextInput
         autoComplete="off"
         autoFocus
         onFocus={() => setFocusPosition('left')}
@@ -162,8 +184,11 @@ export const DoubleTextInput = ({
         onChange={(event: ChangeEvent<HTMLInputElement>) => {
           handleChange(event.target.value, secondInternalValue);
         }}
+        onPaste={(event: ClipboardEvent<HTMLInputElement>) =>
+          handleOnPaste(event)
+        }
       />
-      <StyledInput
+      <StyledTextInput
         autoComplete="off"
         onFocus={() => setFocusPosition('right')}
         ref={secondValueInputRef}
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/PhoneInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/PhoneInput.tsx
index 4b232637bc9c..36b7650c03d2 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/PhoneInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/PhoneInput.tsx
@@ -3,7 +3,7 @@ import ReactPhoneNumberInput from 'react-phone-number-input';
 import styled from '@emotion/styled';
 
 import { useRegisterInputEvents } from '@/object-record/record-field/meta-types/input/hooks/useRegisterInputEvents';
-import { CountryPickerDropdownButton } from '@/ui/input/components/internal/phone/components/CountryPickerDropdownButton';
+import { PhoneCountryPickerDropdownButton } from '@/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton';
 
 import 'react-phone-number-input/style.css';
 
@@ -102,7 +102,7 @@ export const PhoneInput = ({
         onChange={handleChange}
         international={true}
         withCountryCallingCode={true}
-        countrySelectComponent={CountryPickerDropdownButton}
+        countrySelectComponent={PhoneCountryPickerDropdownButton}
       />
     </StyledContainer>
   );
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/TextAreaInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/TextAreaInput.tsx
index 7525c185772e..29b754391362 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/TextAreaInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/TextAreaInput.tsx
@@ -4,6 +4,7 @@ import styled from '@emotion/styled';
 
 import { useRegisterInputEvents } from '@/object-record/record-field/meta-types/input/hooks/useRegisterInputEvents';
 import { TEXT_INPUT_STYLE } from '@/ui/theme/constants/TextInputStyle';
+import { isDefined } from '~/utils/isDefined';
 
 export type TextAreaInputProps = {
   disabled?: boolean;
@@ -18,6 +19,7 @@ export type TextAreaInputProps = {
   onClickOutside: (event: MouseEvent | TouchEvent, inputValue: string) => void;
   hotkeyScope: string;
   onChange?: (newText: string) => void;
+  maxRows?: number;
 };
 
 const StyledTextArea = styled(TextareaAutosize)`
@@ -44,6 +46,7 @@ export const TextAreaInput = ({
   onShiftTab,
   onClickOutside,
   onChange,
+  maxRows,
 }: TextAreaInputProps) => {
   const [internalText, setInternalText] = useState(value);
 
@@ -55,7 +58,7 @@ export const TextAreaInput = ({
   const wrapperRef = useRef<HTMLTextAreaElement>(null);
 
   useEffect(() => {
-    if (wrapperRef.current) {
+    if (isDefined(wrapperRef.current)) {
       wrapperRef.current.setSelectionRange(
         wrapperRef.current.value.length,
         wrapperRef.current.value.length,
@@ -83,6 +86,7 @@ export const TextAreaInput = ({
       onChange={handleChange}
       autoFocus={autoFocus}
       value={internalText}
+      maxRows={maxRows}
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx
index 245d298c15cb..382897f96f47 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx
@@ -4,7 +4,7 @@ import styled from '@emotion/styled';
 import { useRegisterInputEvents } from '@/object-record/record-field/meta-types/input/hooks/useRegisterInputEvents';
 import { TEXT_INPUT_STYLE } from '@/ui/theme/constants/TextInputStyle';
 
-export const StyledInput = styled.input`
+export const StyledTextInput = styled.input`
   margin: 0;
   ${TEXT_INPUT_STYLE}
   width: 100%;
@@ -60,7 +60,7 @@ export const TextInput = ({
   });
 
   return (
-    <StyledInput
+    <StyledTextInput
       autoComplete="off"
       ref={wrapperRef}
       placeholder={placeholder}
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx b/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx
index 4c3a3fc476fc..14a896c80acf 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { css, useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { Pill } from 'twenty-ui';
 
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
-import { Pill } from '@/ui/display/pill/components/Pill';
 
 export type ButtonSize = 'medium' | 'small';
 export type ButtonPosition = 'standalone' | 'left' | 'middle' | 'right';
@@ -20,6 +20,7 @@ export type ButtonProps = {
   position?: ButtonPosition;
   accent?: ButtonAccent;
   soon?: boolean;
+  justify?: 'center' | 'flex-start' | 'flex-end';
   disabled?: boolean;
   focus?: boolean;
   onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void;
@@ -28,7 +29,13 @@ export type ButtonProps = {
 const StyledButton = styled.button<
   Pick<
     ButtonProps,
-    'fullWidth' | 'variant' | 'size' | 'position' | 'accent' | 'focus'
+    | 'fullWidth'
+    | 'variant'
+    | 'size'
+    | 'position'
+    | 'accent'
+    | 'focus'
+    | 'justify'
   >
 >`
   align-items: center;
@@ -177,9 +184,7 @@ const StyledButton = styled.button<
             `;
           case 'danger':
             return css`
-              background: ${!disabled
-                ? theme.background.transparent.primary
-                : 'transparent'};
+              background: transparent;
               border-color: ${variant === 'secondary'
                 ? focus
                   ? theme.color.red
@@ -236,6 +241,7 @@ const StyledButton = styled.button<
   font-weight: 500;
   gap: ${({ theme }) => theme.spacing(1)};
   height: ${({ size }) => (size === 'small' ? '24px' : '32px')};
+  justify-content: ${({ justify }) => justify};
   padding: ${({ theme }) => {
     return `0 ${theme.spacing(2)}`;
   }};
@@ -266,6 +272,7 @@ export const Button = ({
   position = 'standalone',
   soon = false,
   disabled = false,
+  justify = 'flex-start',
   focus = false,
   onClick,
 }: ButtonProps) => {
@@ -279,6 +286,7 @@ export const Button = ({
       position={position}
       disabled={soon || disabled}
       focus={focus}
+      justify={justify}
       accent={accent}
       className={className}
       onClick={onClick}
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/ButtonGroup.tsx b/packages/twenty-front/src/modules/ui/input/button/components/ButtonGroup.tsx
index 2be5c3aa1dee..9bac9d6ddd4f 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/ButtonGroup.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/ButtonGroup.tsx
@@ -1,6 +1,8 @@
 import React, { ReactNode } from 'react';
 import styled from '@emotion/styled';
 
+import { isDefined } from '~/utils/isDefined';
+
 import { ButtonPosition, ButtonProps } from './Button';
 
 const StyledButtonGroupContainer = styled.div`
@@ -39,15 +41,15 @@ export const ButtonGroup = ({
 
       const additionalProps: any = { position, variant, accent, size };
 
-      if (variant) {
+      if (isDefined(variant)) {
         additionalProps.variant = variant;
       }
 
-      if (accent) {
+      if (isDefined(accent)) {
         additionalProps.variant = variant;
       }
 
-      if (size) {
+      if (isDefined(size)) {
         additionalProps.size = size;
       }
 
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/FloatingButtonGroup.tsx b/packages/twenty-front/src/modules/ui/input/button/components/FloatingButtonGroup.tsx
index a194dcc22f0e..db9485c175f6 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/FloatingButtonGroup.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/FloatingButtonGroup.tsx
@@ -1,6 +1,8 @@
 import React from 'react';
 import styled from '@emotion/styled';
 
+import { isDefined } from '~/utils/isDefined';
+
 import { FloatingButtonPosition, FloatingButtonProps } from './FloatingButton';
 
 const StyledFloatingButtonGroupContainer = styled.div`
@@ -40,7 +42,7 @@ export const FloatingButtonGroup = ({
         applyBlur: false,
       };
 
-      if (size) {
+      if (isDefined(size)) {
         additionalProps.size = size;
       }
 
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/LightIconButtonGroup.tsx b/packages/twenty-front/src/modules/ui/input/button/components/LightIconButtonGroup.tsx
index ff548e5df72c..adb20d64bcac 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/LightIconButtonGroup.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/LightIconButtonGroup.tsx
@@ -31,6 +31,7 @@ export const LightIconButtonGroup = ({
         <LightIconButton
           key={`light-icon-button-${index}`}
           Icon={Icon}
+          disabled={!onClick}
           onClick={onClick}
           size={size}
         />
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/MainButton.tsx b/packages/twenty-front/src/modules/ui/input/button/components/MainButton.tsx
index c872cef410d0..5bdc9ae0b936 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/MainButton.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/MainButton.tsx
@@ -19,7 +19,7 @@ const StyledButton = styled.button<
 >`
   align-items: center;
   background: ${({ theme, variant, disabled }) => {
-    if (disabled) {
+    if (disabled === true) {
       return theme.background.secondary;
     }
 
@@ -34,7 +34,7 @@ const StyledButton = styled.button<
   }};
   border: 1px solid;
   border-color: ${({ theme, disabled, variant }) => {
-    if (disabled) {
+    if (disabled === true) {
       return theme.background.transparent.lighter;
     }
 
@@ -49,14 +49,14 @@ const StyledButton = styled.button<
   }};
   border-radius: ${({ theme }) => theme.border.radius.md};
   ${({ theme, disabled }) => {
-    if (disabled) {
+    if (disabled === true) {
       return '';
     }
 
     return `box-shadow: ${theme.boxShadow.light};`;
   }}
   color: ${({ theme, variant, disabled }) => {
-    if (disabled) {
+    if (disabled === true) {
       return theme.font.color.light;
     }
 
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/Button.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/Button.stories.tsx
index f86b88ec3810..7dd03a023968 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/Button.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/Button.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconSearch } from 'twenty-ui';
 
-import { IconSearch } from '@/ui/display/icon';
 import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { CatalogStory } from '~/testing/types';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/ButtonGroup.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/ButtonGroup.stories.tsx
index bee6eb538515..6ebbc6e42680 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/ButtonGroup.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/ButtonGroup.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconCheckbox, IconNotes, IconTimelineEvent } from 'twenty-ui';
 
-import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/display/icon';
 import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { CatalogStory } from '~/testing/types';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButton.stories.tsx
index ef5e40bf3b1c..a2d55b456869 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButton.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconSearch } from 'twenty-ui';
 
-import { IconSearch } from '@/ui/display/icon';
 import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { CatalogStory } from '~/testing/types';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButtonGroup.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButtonGroup.stories.tsx
index 4a5e212065a6..66f1d3d75475 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButtonGroup.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingButtonGroup.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconCheckbox, IconNotes, IconTimelineEvent } from 'twenty-ui';
 
-import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/display/icon';
 import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { CatalogStory } from '~/testing/types';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButton.stories.tsx
index 4e8359c145a4..386da63b6502 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButton.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconSearch } from 'twenty-ui';
 
-import { IconSearch } from '@/ui/display/icon';
 import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { CatalogStory } from '~/testing/types';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButtonGroup.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButtonGroup.stories.tsx
index 3fffe0c90561..2bb3c8fe9d64 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButtonGroup.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/FloatingIconButtonGroup.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconCheckbox, IconNotes, IconTimelineEvent } from 'twenty-ui';
 
-import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/display/icon';
 import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { CatalogStory } from '~/testing/types';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButton.stories.tsx
index 39ef4ac6517b..1ea9af451def 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButton.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconSearch } from 'twenty-ui';
 
-import { IconSearch } from '@/ui/display/icon';
 import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { CatalogStory } from '~/testing/types';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButtonGroup.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButtonGroup.stories.tsx
index ff59166008e6..386ae6b56d76 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButtonGroup.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/IconButtonGroup.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconCheckbox, IconNotes, IconTimelineEvent } from 'twenty-ui';
 
-import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/display/icon';
 import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { CatalogStory } from '~/testing/types';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightButton.stories.tsx
index f943c8eafb8e..c89de5ffa168 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightButton.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconSearch } from 'twenty-ui';
 
-import { IconSearch } from '@/ui/display/icon';
 import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { CatalogStory } from '~/testing/types';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightIconButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightIconButton.stories.tsx
index e8a9fb3ff4e6..14e605c44a31 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightIconButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/LightIconButton.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconSearch } from 'twenty-ui';
 
-import { IconSearch } from '@/ui/display/icon';
 import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { CatalogStory } from '~/testing/types';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/MainButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/MainButton.stories.tsx
index e5d8cb2bad78..f146e25d2661 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/MainButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/MainButton.stories.tsx
@@ -1,7 +1,7 @@
 import { Meta, StoryObj } from '@storybook/react';
 import { expect, fn, userEvent, within } from '@storybook/test';
+import { IconBrandGoogle } from 'twenty-ui';
 
-import { IconBrandGoogle } from '@/ui/display/icon';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 
 import { MainButton } from '../MainButton';
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/RoundedIconButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/RoundedIconButton.stories.tsx
index ca0fae790f39..8f43ab235458 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/__stories__/RoundedIconButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/__stories__/RoundedIconButton.stories.tsx
@@ -1,7 +1,7 @@
 import { Meta, StoryObj } from '@storybook/react';
 import { expect, fn, userEvent, within } from '@storybook/test';
+import { IconArrowRight } from 'twenty-ui';
 
-import { IconArrowRight } from '@/ui/display/icon';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 
 import { RoundedIconButton } from '../RoundedIconButton';
diff --git a/packages/twenty-front/src/modules/ui/input/components/AutosizeTextInput.tsx b/packages/twenty-front/src/modules/ui/input/components/AutosizeTextInput.tsx
index 7fd67c6bffeb..b827b8e08fd5 100644
--- a/packages/twenty-front/src/modules/ui/input/components/AutosizeTextInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/AutosizeTextInput.tsx
@@ -3,8 +3,8 @@ import { HotkeysEvent } from 'react-hotkeys-hook/dist/types';
 import TextareaAutosize from 'react-textarea-autosize';
 import styled from '@emotion/styled';
 import { Key } from 'ts-key-enum';
+import { IconArrowRight } from 'twenty-ui';
 
-import { IconArrowRight } from '@/ui/display/icon/index';
 import { Button } from '@/ui/input/button/components/Button';
 import { RoundedIconButton } from '@/ui/input/button/components/RoundedIconButton';
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
diff --git a/packages/twenty-front/src/modules/ui/input/components/Checkbox.tsx b/packages/twenty-front/src/modules/ui/input/components/Checkbox.tsx
index 1d7c49bc852a..f3d6df936988 100644
--- a/packages/twenty-front/src/modules/ui/input/components/Checkbox.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/Checkbox.tsx
@@ -1,9 +1,8 @@
 import * as React from 'react';
 import styled from '@emotion/styled';
+import { IconCheck, IconMinus } from 'twenty-ui';
 import { v4 } from 'uuid';
 
-import { IconCheck, IconMinus } from '@/ui/display/icon';
-
 export enum CheckboxVariant {
   Primary = 'primary',
   Secondary = 'secondary',
diff --git a/packages/twenty-front/src/modules/ui/input/components/EntityTitleDoubleTextInput.tsx b/packages/twenty-front/src/modules/ui/input/components/EntityTitleDoubleTextInput.tsx
index 56bc6720371c..fc1673974368 100644
--- a/packages/twenty-front/src/modules/ui/input/components/EntityTitleDoubleTextInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/EntityTitleDoubleTextInput.tsx
@@ -1,7 +1,7 @@
 import { ChangeEvent } from 'react';
 import styled from '@emotion/styled';
 
-import { StyledInput } from '@/ui/field/input/components/TextInput';
+import { StyledTextInput as UIStyledTextInput } from '@/ui/field/input/components/TextInput';
 import { ComputeNodeDimensions } from '@/ui/utilities/dimensions/components/ComputeNodeDimensions';
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
 
@@ -23,7 +23,7 @@ const StyledDoubleTextContainer = styled.div`
   text-align: center;
 `;
 
-const StyledTextInput = styled(StyledInput)`
+const StyledTextInput = styled(UIStyledTextInput)`
   margin: 0 ${({ theme }) => theme.spacing(0.5)};
   padding: 0;
   width: ${({ width }) => (width ? `${width}px` : 'auto')};
diff --git a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
index 2c4c195164e7..f22bf568e1df 100644
--- a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
@@ -1,8 +1,8 @@
 import { useMemo, useState } from 'react';
 import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
+import { IconApps } from 'twenty-ui';
 
-import { IconApps } from '@/ui/display/icon';
 import { useIcons } from '@/ui/display/icon/hooks/useIcons';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
@@ -30,6 +30,7 @@ type IconPickerProps = {
   onOpen?: () => void;
   variant?: IconButtonVariant;
   className?: string;
+  disableBlur?: boolean;
 };
 
 const StyledMenuIconItemsContainer = styled.div`
@@ -86,6 +87,7 @@ export const IconPicker = ({
   onClose,
   onOpen,
   variant = 'secondary',
+  disableBlur = false,
   className,
 }: IconPickerProps) => {
   const [searchString, setSearchString] = useState('');
@@ -99,35 +101,47 @@ export const IconPicker = ({
   const { getIcons, getIcon } = useIcons();
   const icons = getIcons();
   const matchingSearchIconKeys = useMemo(() => {
-    const filteredIconKeys = icons
-      ? Object.keys(icons).filter((iconKey) => {
-          if (searchString === '') {
-            return true;
-          }
-
-          const isMatchingSearchString = [
-            iconKey,
-            convertIconKeyToLabel(iconKey),
-          ].some((label) =>
-            label.toLowerCase().includes(searchString.toLowerCase()),
-          );
-
-          return isMatchingSearchString;
-        })
-      : [];
+    if (icons == null) return [];
+    const scoreIconMatch = (iconKey: string, searchString: string) => {
+      const iconLabel = convertIconKeyToLabel(iconKey)
+        .toLowerCase()
+        .replace('icon ', '')
+        .replace(/\s/g, '');
+
+      const searchLower = searchString
+        .toLowerCase()
+        .trimEnd()
+        .replace(/\s/g, '');
+
+      if (iconKey === searchString || iconLabel === searchString) return 100;
+      if (iconKey.startsWith(searchLower) || iconLabel.startsWith(searchLower))
+        return 75;
+      if (iconKey.includes(searchLower) || iconLabel.includes(searchLower))
+        return 50;
+
+      return 0;
+    };
+    const scoredIcons = Object.keys(icons).map((iconKey) => ({
+      iconKey,
+      score: scoreIconMatch(iconKey, searchString),
+    }));
+
+    const filteredAndSortedIconKeys = scoredIcons
+      .filter(({ score }) => score > 0)
+      .sort((a, b) => b.score - a.score)
+      .map(({ iconKey }) => iconKey);
 
     const isSelectedIconMatchingFilter =
-      selectedIconKey && filteredIconKeys.includes(selectedIconKey);
-
-    const uniqueFilteredIconKeys = [
-      ...new Set(
-        selectedIconKey && isSelectedIconMatchingFilter
-          ? [selectedIconKey, ...filteredIconKeys]
-          : filteredIconKeys,
-      ),
-    ];
-
-    return uniqueFilteredIconKeys.slice(0, 25);
+      selectedIconKey && filteredAndSortedIconKeys.includes(selectedIconKey);
+
+    return isSelectedIconMatchingFilter
+      ? [
+          selectedIconKey,
+          ...filteredAndSortedIconKeys.filter(
+            (iconKey) => iconKey !== selectedIconKey,
+          ),
+        ].slice(0, 25)
+      : filteredAndSortedIconKeys.slice(0, 25);
   }, [icons, searchString, selectedIconKey]);
 
   const iconKeys2d = useMemo(
@@ -148,6 +162,7 @@ export const IconPicker = ({
           />
         }
         dropdownMenuWidth={176}
+        disableBlur={disableBlur}
         dropdownComponents={
           <SelectableList
             selectableListId="icon-list"
diff --git a/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx b/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx
index 4c6641ac76f1..c992e5381197 100644
--- a/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx
@@ -1,14 +1,10 @@
 import React from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconFileUpload, IconTrash, IconUpload, IconX } from 'twenty-ui';
 
-import {
-  IconFileUpload,
-  IconTrash,
-  IconUpload,
-  IconX,
-} from '@/ui/display/icon';
 import { Button } from '@/ui/input/button/components/Button';
+import { isDefined } from '~/utils/isDefined';
 
 const StyledContainer = styled.div`
   display: flex;
@@ -39,7 +35,7 @@ const StyledPicture = styled.button<{ withPicture: boolean }>`
   }
 
   ${({ theme, withPicture, disabled }) => {
-    if (withPicture || disabled) {
+    if ((withPicture || disabled) === true) {
       return '';
     }
 
@@ -132,10 +128,8 @@ export const ImageInput = ({
             ref={hiddenFileInput}
             accept="image/jpeg, image/png, image/gif" // to desired specification
             onChange={(event) => {
-              if (onUpload) {
-                if (event.target.files) {
-                  onUpload(event.target.files[0]);
-                }
+              if (isDefined(onUpload) && isDefined(event.target.files)) {
+                onUpload(event.target.files[0]);
               }
             }}
           />
diff --git a/packages/twenty-front/src/modules/ui/input/components/Select.tsx b/packages/twenty-front/src/modules/ui/input/components/Select.tsx
index ab5174b8666b..783958fbdecf 100644
--- a/packages/twenty-front/src/modules/ui/input/components/Select.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/Select.tsx
@@ -1,8 +1,8 @@
-import { useMemo, useState } from 'react';
+import { useMemo, useRef, useState } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconChevronDown } from 'twenty-ui';
 
-import { IconChevronDown } from '@/ui/display/icon';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -22,11 +22,14 @@ export type SelectOption<Value extends string | number | null> = {
 export type SelectProps<Value extends string | number | null> = {
   className?: string;
   disabled?: boolean;
+  disableBlur?: boolean;
   dropdownId: string;
   dropdownWidth?: `${string}px` | 'auto' | number;
+  emptyOption?: SelectOption<Value>;
   fullWidth?: boolean;
   label?: string;
   onChange?: (value: Value) => void;
+  onBlur?: () => void;
   options: SelectOption<Value>[];
   value?: Value;
   withSearchInput?: boolean;
@@ -40,6 +43,7 @@ const StyledControlContainer = styled.div<{ disabled?: boolean }>`
   align-items: center;
   background-color: ${({ theme }) => theme.background.transparent.lighter};
   border: 1px solid ${({ theme }) => theme.border.color.medium};
+  box-sizing: border-box;
   border-radius: ${({ theme }) => theme.border.radius.sm};
   color: ${({ disabled, theme }) =>
     disabled ? theme.font.color.tertiary : theme.font.color.primary};
@@ -57,7 +61,6 @@ const StyledLabel = styled.span`
   font-size: ${({ theme }) => theme.font.size.xs};
   font-weight: ${({ theme }) => theme.font.weight.semiBold};
   margin-bottom: ${({ theme }) => theme.spacing(1)};
-  text-transform: uppercase;
 `;
 
 const StyledControlLabel = styled.div`
@@ -73,21 +76,28 @@ const StyledIconChevronDown = styled(IconChevronDown)<{ disabled?: boolean }>`
 
 export const Select = <Value extends string | number | null>({
   className,
-  disabled,
+  disabled: disabledFromProps,
+  disableBlur = false,
   dropdownId,
   dropdownWidth = 176,
+  emptyOption,
   fullWidth,
   label,
   onChange,
+  onBlur,
   options,
   value,
   withSearchInput,
 }: SelectProps<Value>) => {
+  const selectContainerRef = useRef<HTMLDivElement>(null);
+
   const theme = useTheme();
   const [searchInputValue, setSearchInputValue] = useState('');
 
   const selectedOption =
-    options.find(({ value: key }) => key === value) || options[0];
+    options.find(({ value: key }) => key === value) ||
+    options[0] ||
+    emptyOption;
   const filteredOptions = useMemo(
     () =>
       searchInputValue
@@ -98,28 +108,38 @@ export const Select = <Value extends string | number | null>({
     [options, searchInputValue],
   );
 
+  const isDisabled = disabledFromProps || options.length <= 1;
+
   const { closeDropdown } = useDropdown(dropdownId);
 
   const selectControl = (
-    <StyledControlContainer disabled={disabled}>
+    <StyledControlContainer disabled={isDisabled}>
       <StyledControlLabel>
         {!!selectedOption?.Icon && (
           <selectedOption.Icon
-            color={disabled ? theme.font.color.light : theme.font.color.primary}
+            color={
+              isDisabled ? theme.font.color.light : theme.font.color.primary
+            }
             size={theme.icon.size.md}
             stroke={theme.icon.stroke.sm}
           />
         )}
         {selectedOption?.label}
       </StyledControlLabel>
-      <StyledIconChevronDown disabled={disabled} size={theme.icon.size.md} />
+      <StyledIconChevronDown disabled={isDisabled} size={theme.icon.size.md} />
     </StyledControlContainer>
   );
 
   return (
-    <StyledContainer className={className} fullWidth={fullWidth}>
+    <StyledContainer
+      className={className}
+      fullWidth={fullWidth}
+      tabIndex={0}
+      onBlur={onBlur}
+      ref={selectContainerRef}
+    >
       {!!label && <StyledLabel>{label}</StyledLabel>}
-      {disabled ? (
+      {isDisabled ? (
         selectControl
       ) : (
         <Dropdown
@@ -127,6 +147,7 @@ export const Select = <Value extends string | number | null>({
           dropdownMenuWidth={dropdownWidth}
           dropdownPlacement="bottom-start"
           clickableComponent={selectControl}
+          disableBlur={disableBlur}
           dropdownComponents={
             <>
               {!!withSearchInput && (
@@ -148,6 +169,7 @@ export const Select = <Value extends string | number | null>({
                       text={option.label}
                       onClick={() => {
                         onChange?.(option.value);
+                        onBlur?.();
                         closeDropdown();
                       }}
                     />
diff --git a/packages/twenty-front/src/modules/ui/input/components/TextInput.tsx b/packages/twenty-front/src/modules/ui/input/components/TextInput.tsx
index 1beb07271f60..f7453fbb1b31 100644
--- a/packages/twenty-front/src/modules/ui/input/components/TextInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/TextInput.tsx
@@ -10,9 +10,8 @@ import {
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { Key } from 'ts-key-enum';
+import { IconAlertCircle, IconEye, IconEyeOff } from 'twenty-ui';
 
-import { IconAlertCircle } from '@/ui/display/icon';
-import { IconEye, IconEyeOff } from '@/ui/display/icon/index';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
@@ -20,20 +19,6 @@ import { useCombinedRefs } from '~/hooks/useCombinedRefs';
 
 import { InputHotkeyScope } from '../types/InputHotkeyScope';
 
-export type TextInputComponentProps = Omit<
-  InputHTMLAttributes<HTMLInputElement>,
-  'onChange' | 'onKeyDown'
-> & {
-  className?: string;
-  label?: string;
-  onChange?: (text: string) => void;
-  fullWidth?: boolean;
-  disableHotkeys?: boolean;
-  error?: string;
-  RightIcon?: IconComponent;
-  onKeyDown?: (event: React.KeyboardEvent<HTMLInputElement>) => void;
-};
-
 const StyledContainer = styled.div<Pick<TextInputComponentProps, 'fullWidth'>>`
   display: inline-flex;
   flex-direction: column;
@@ -45,7 +30,6 @@ const StyledLabel = styled.span`
   font-size: ${({ theme }) => theme.font.size.xs};
   font-weight: ${({ theme }) => theme.font.weight.semiBold};
   margin-bottom: ${({ theme }) => theme.spacing(1)};
-  text-transform: uppercase;
 `;
 
 const StyledInputContainer = styled.div`
@@ -60,15 +44,15 @@ const StyledInput = styled.input<Pick<TextInputComponentProps, 'fullWidth'>>`
   border-bottom-left-radius: ${({ theme }) => theme.border.radius.sm};
   border-right: none;
   border-top-left-radius: ${({ theme }) => theme.border.radius.sm};
+  box-sizing: border-box;
   color: ${({ theme }) => theme.font.color.primary};
   display: flex;
   flex-grow: 1;
   font-family: ${({ theme }) => theme.font.family};
-
   font-weight: ${({ theme }) => theme.font.weight.regular};
+  height: 32px;
   outline: none;
   padding: ${({ theme }) => theme.spacing(2)};
-
   width: 100%;
 
   &::placeholder,
@@ -111,6 +95,21 @@ const StyledTrailingIcon = styled.div`
 
 const INPUT_TYPE_PASSWORD = 'password';
 
+export type TextInputComponentProps = Omit<
+  InputHTMLAttributes<HTMLInputElement>,
+  'onChange' | 'onKeyDown'
+> & {
+  className?: string;
+  label?: string;
+  onChange?: (text: string) => void;
+  fullWidth?: boolean;
+  disableHotkeys?: boolean;
+  error?: string;
+  RightIcon?: IconComponent;
+  onKeyDown?: (event: React.KeyboardEvent<HTMLInputElement>) => void;
+  onBlur?: () => void;
+};
+
 const TextInputComponent = (
   {
     className,
@@ -146,6 +145,7 @@ const TextInputComponent = (
 
   const handleFocus: FocusEventHandler<HTMLInputElement> = (e) => {
     onFocus?.(e);
+
     if (!disableHotkeys) {
       setHotkeyScopeAndMemorizePreviousScope(InputHotkeyScope.TextInput);
     }
@@ -153,6 +153,7 @@ const TextInputComponent = (
 
   const handleBlur: FocusEventHandler<HTMLInputElement> = (e) => {
     onBlur?.(e);
+
     if (!disableHotkeys) {
       goBackToPreviousHotkeyScope();
     }
@@ -164,6 +165,7 @@ const TextInputComponent = (
       inputRef.current?.blur();
     },
     InputHotkeyScope.TextInput,
+    { enabled: !disableHotkeys },
   );
 
   const [passwordVisible, setPasswordVisible] = useState(false);
diff --git a/packages/twenty-front/src/modules/ui/input/components/Toggle.tsx b/packages/twenty-front/src/modules/ui/input/components/Toggle.tsx
index 894222a90d83..2efd7b06e369 100644
--- a/packages/twenty-front/src/modules/ui/input/components/Toggle.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/Toggle.tsx
@@ -2,12 +2,15 @@ import { useEffect, useState } from 'react';
 import styled from '@emotion/styled';
 import { motion } from 'framer-motion';
 
+import { isDefined } from '~/utils/isDefined';
+
 export type ToggleSize = 'small' | 'medium';
 
 type ContainerProps = {
   isOn: boolean;
   color?: string;
   toggleSize: ToggleSize;
+  disabled?: boolean;
 };
 
 const StyledContainer = styled.div<ContainerProps>`
@@ -20,6 +23,8 @@ const StyledContainer = styled.div<ContainerProps>`
   height: ${({ toggleSize }) => (toggleSize === 'small' ? 16 : 20)}px;
   transition: background-color 0.3s ease;
   width: ${({ toggleSize }) => (toggleSize === 'small' ? 24 : 32)}px;
+  opacity: ${({ disabled }) => (disabled ? 0.5 : 1)};
+  pointer-events: ${({ disabled }) => (disabled ? 'none' : 'auto')};
 `;
 
 const StyledCircle = styled(motion.div)<{
@@ -37,6 +42,7 @@ export type ToggleProps = {
   color?: string;
   toggleSize?: ToggleSize;
   className?: string;
+  disabled?: boolean;
 };
 
 export const Toggle = ({
@@ -45,6 +51,7 @@ export const Toggle = ({
   color,
   toggleSize = 'medium',
   className,
+  disabled,
 }: ToggleProps) => {
   const [isOn, setIsOn] = useState(value ?? false);
 
@@ -56,7 +63,7 @@ export const Toggle = ({
   const handleChange = () => {
     setIsOn(!isOn);
 
-    if (onChange) {
+    if (isDefined(onChange)) {
       onChange(!isOn);
     }
   };
@@ -75,6 +82,7 @@ export const Toggle = ({
       color={color}
       toggleSize={toggleSize}
       className={className}
+      disabled={disabled}
     >
       <StyledCircle
         animate={isOn ? 'on' : 'off'}
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/IconPicker.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/IconPicker.stories.tsx
index 95b433dfa1de..8167a00cb5ed 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/IconPicker.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/IconPicker.stories.tsx
@@ -58,7 +58,7 @@ export const WithSearch: Story = {
 
     await sleep(100);
 
-    const searchedIcon = canvas.getByRole('button', {
+    const searchedIcon = await canvas.findByRole('button', {
       name: 'Icon Building Skyscraper',
     });
 
@@ -81,7 +81,7 @@ export const WithSearchAndClose: Story = {
 
     await sleep(100);
 
-    const searchedIcon = canvas.getByRole('button', {
+    const searchedIcon = await canvas.findByRole('button', {
       name: 'Icon Building Skyscraper',
     });
 
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/country/components/CountrySelect.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/country/components/CountrySelect.tsx
new file mode 100644
index 000000000000..38bbbd98f2e4
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/country/components/CountrySelect.tsx
@@ -0,0 +1,37 @@
+import { useMemo } from 'react';
+
+import { IconComponentProps } from '@/ui/display/icon/types/IconComponent';
+import { SELECT_COUNTRY_DROPDOWN_ID } from '@/ui/input/components/internal/country/constants/SelectCountryDropdownId';
+import { useCountries } from '@/ui/input/components/internal/hooks/useCountries';
+import { Select, SelectOption } from '@/ui/input/components/Select';
+
+export const CountrySelect = ({
+  selectedCountryName,
+  onChange,
+}: {
+  selectedCountryName: string;
+  onChange: (countryCode: string) => void;
+}) => {
+  const countries = useCountries();
+
+  const options: SelectOption<string>[] = useMemo(() => {
+    return countries.map<SelectOption<string>>(({ countryName, Flag }) => ({
+      label: countryName,
+      value: countryName,
+      Icon: (props: IconComponentProps) =>
+        Flag({ width: props.size, height: props.size }), // TODO : improve this ?
+    }));
+  }, [countries]);
+
+  return (
+    <Select
+      fullWidth
+      dropdownId={SELECT_COUNTRY_DROPDOWN_ID}
+      options={options}
+      label="COUNTRY"
+      withSearchInput
+      onChange={onChange}
+      value={selectedCountryName}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/country/constants/SelectCountryDropdownId.ts b/packages/twenty-front/src/modules/ui/input/components/internal/country/constants/SelectCountryDropdownId.ts
new file mode 100644
index 000000000000..45ccf6e0bf05
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/country/constants/SelectCountryDropdownId.ts
@@ -0,0 +1 @@
+export const SELECT_COUNTRY_DROPDOWN_ID = 'select-country-picker';
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton.tsx
new file mode 100644
index 000000000000..3ee47ff2c3e6
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton.tsx
@@ -0,0 +1,102 @@
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import { IconChevronDown } from 'twenty-ui';
+
+import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+
+import { CurrencyPickerHotkeyScope } from '../types/CurrencyPickerHotkeyScope';
+
+import { CurrencyPickerDropdownSelect } from './CurrencyPickerDropdownSelect';
+
+type StyledDropdownButtonProps = {
+  isUnfolded: boolean;
+};
+
+export const StyledDropdownButtonContainer = styled.div<StyledDropdownButtonProps>`
+  align-items: center;
+  color: ${({ color }) => color ?? 'none'};
+  cursor: pointer;
+  display: flex;
+  border-right: ${({ theme }) => `1px solid ${theme.border.color.medium}`};
+  height: 32px;
+  padding-left: ${({ theme }) => theme.spacing(2)};
+  padding-right: ${({ theme }) => theme.spacing(2)};
+  user-select: none;
+  &:hover {
+    filter: brightness(0.95);
+  }
+`;
+
+const StyledIconContainer = styled.div`
+  align-items: center;
+  color: ${({ theme }) => theme.font.color.tertiary};
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  justify-content: center;
+
+  svg {
+    align-items: center;
+    display: flex;
+    height: 16px;
+    justify-content: center;
+  }
+`;
+
+export type Currency = {
+  label: string;
+  value: string;
+  Icon: any;
+};
+
+export const CurrencyPickerDropdownButton = ({
+  valueCode,
+  onChange,
+  currencies,
+}: {
+  valueCode: string;
+  onChange: (currency: Currency) => void;
+  currencies: Currency[];
+}) => {
+  const theme = useTheme();
+
+  const { isDropdownOpen, closeDropdown } = useDropdown(
+    CurrencyPickerHotkeyScope.CurrencyPicker,
+  );
+
+  const handleChange = (currency: Currency) => {
+    onChange(currency);
+    closeDropdown();
+  };
+
+  const currency = currencies.find(({ value }) => value === valueCode);
+
+  const currencyCode = currency?.value ?? CurrencyCode.USD;
+
+  return (
+    <Dropdown
+      dropdownMenuWidth={200}
+      dropdownId="currncy-picker-dropdown-id"
+      dropdownHotkeyScope={{ scope: CurrencyPickerHotkeyScope.CurrencyPicker }}
+      clickableComponent={
+        <StyledDropdownButtonContainer isUnfolded={isDropdownOpen}>
+          <StyledIconContainer>
+            {currencyCode}
+            <IconChevronDown size={theme.icon.size.sm} />
+          </StyledIconContainer>
+        </StyledDropdownButtonContainer>
+      }
+      dropdownComponents={
+        <CurrencyPickerDropdownSelect
+          currencies={currencies}
+          selectedCurrency={currency}
+          onChange={handleChange}
+        />
+      }
+      dropdownPlacement="bottom-start"
+      dropdownOffset={{ x: 0, y: 4 }}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx
new file mode 100644
index 000000000000..98f4348f0f97
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx
@@ -0,0 +1,71 @@
+import { useMemo, useState } from 'react';
+
+import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
+import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
+import { MenuItemSelectAvatar } from '@/ui/navigation/menu-item/components/MenuItemSelectAvatar';
+
+import { Currency } from './CurrencyPickerDropdownButton';
+
+export const CurrencyPickerDropdownSelect = ({
+  currencies,
+  selectedCurrency,
+  onChange,
+}: {
+  currencies: Currency[];
+  selectedCurrency?: Currency;
+  onChange: (currency: Currency) => void;
+}) => {
+  const [searchFilter, setSearchFilter] = useState<string>('');
+
+  const filteredCurrencies = useMemo(
+    () =>
+      currencies.filter(
+        ({ value, label }) =>
+          value
+            .toLocaleLowerCase()
+            .includes(searchFilter.toLocaleLowerCase()) ||
+          label.toLocaleLowerCase().includes(searchFilter.toLocaleLowerCase()),
+      ),
+    [currencies, searchFilter],
+  );
+
+  return (
+    <DropdownMenu width="200px" disableBlur>
+      <DropdownMenuSearchInput
+        value={searchFilter}
+        onChange={(event) => setSearchFilter(event.target.value)}
+        autoFocus
+      />
+      <DropdownMenuSeparator />
+      <DropdownMenuItemsContainer hasMaxHeight>
+        {filteredCurrencies.length === 0 ? (
+          <MenuItem text="No result" />
+        ) : (
+          <>
+            {selectedCurrency && (
+              <MenuItemSelectAvatar
+                key={selectedCurrency.value}
+                selected={true}
+                onClick={() => onChange(selectedCurrency)}
+                text={`${selectedCurrency.label} (${selectedCurrency.value})`}
+              />
+            )}
+            {filteredCurrencies.map((item) =>
+              selectedCurrency?.value === item.value ? null : (
+                <MenuItemSelectAvatar
+                  key={item.value}
+                  selected={selectedCurrency?.value === item.value}
+                  onClick={() => onChange(item)}
+                  text={`${item.label} (${item.value})`}
+                />
+              ),
+            )}
+          </>
+        )}
+      </DropdownMenuItemsContainer>
+    </DropdownMenu>
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/currency/types/CurrencyPickerHotkeyScope.ts b/packages/twenty-front/src/modules/ui/input/components/internal/currency/types/CurrencyPickerHotkeyScope.ts
new file mode 100644
index 000000000000..cfeaebd04a65
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/currency/types/CurrencyPickerHotkeyScope.ts
@@ -0,0 +1,3 @@
+export enum CurrencyPickerHotkeyScope {
+  CurrencyPicker = 'currency-picker',
+}
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/InternalDatePicker.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/InternalDatePicker.tsx
index e3a231fd7529..a36bad5c863d 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/InternalDatePicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/InternalDatePicker.tsx
@@ -1,8 +1,9 @@
-import React from 'react';
+import { useState } from 'react';
 import ReactDatePicker from 'react-datepicker';
 import styled from '@emotion/styled';
+import { DateTime } from 'luxon';
+import { IconCalendarX } from 'twenty-ui';
 
-import { IconCalendarX } from '@/ui/display/icon';
 import { MenuItemLeftContent } from '@/ui/navigation/menu-item/internals/components/MenuItemLeftContent';
 import { StyledHoverableMenuItemBase } from '@/ui/navigation/menu-item/internals/components/StyledMenuItemBase';
 import { OVERLAY_BACKGROUND } from '@/ui/theme/constants/OverlayBackground';
@@ -235,7 +236,7 @@ const StyledButtonContainer = styled(StyledHoverableMenuItemBase)`
 `;
 
 const StyledButton = styled(MenuItemLeftContent)`
-  justify-content: center;
+  justify-content: start;
 `;
 
 export type InternalDatePickerProps = {
@@ -243,24 +244,100 @@ export type InternalDatePickerProps = {
   onMouseSelect?: (date: Date | null) => void;
   onChange?: (date: Date) => void;
   clearable?: boolean;
+  isDateTimeInput?: boolean;
 };
 
+const StyledInputContainer = styled.div`
+  width: 100%;
+  display: flex;
+  border-bottom: 1px solid ${({ theme }) => theme.border.color.light};
+  height: ${({ theme }) => theme.spacing(8)};
+`;
+
+const StyledInput = styled.input`
+  background: ${({ theme }) => theme.background.secondary};
+  border: none;
+  color: ${({ theme }) => theme.font.color.primary};
+  outline: none;
+  padding: 8px;
+  font-weight: 500;
+  font-size: ${({ theme }) => theme.font.size.md};
+  width: 100%;
+`;
+
+const PICKER_DATE_FORMAT = 'MM/dd/yyyy';
+
 export const InternalDatePicker = ({
   date,
   onChange,
   onMouseSelect,
   clearable = true,
+  isDateTimeInput,
 }: InternalDatePickerProps) => {
   const handleClear = () => {
     onMouseSelect?.(null);
   };
 
+  const initialDate = date
+    ? DateTime.fromJSDate(date).toFormat(PICKER_DATE_FORMAT)
+    : DateTime.now().toFormat(PICKER_DATE_FORMAT);
+
+  const [dateValue, setDateValue] = useState(initialDate);
+
+  const dateValueAsJSDate = DateTime.fromFormat(dateValue, PICKER_DATE_FORMAT)
+    .isValid
+    ? DateTime.fromFormat(dateValue, PICKER_DATE_FORMAT).toJSDate()
+    : null;
+
   return (
     <StyledContainer>
       <div className={clearable ? 'clearable ' : ''}>
+        <StyledInputContainer>
+          <StyledInput
+            type="text"
+            placeholder={`Type date${
+              isDateTimeInput ? ' and time' : ' (mm/dd/yyyy)'
+            }`}
+            inputMode="numeric"
+            value={dateValue}
+            onChange={(e) => {
+              const inputValue = e.target.value;
+              setDateValue(inputValue);
+
+              if (!isDateTimeInput) {
+                const parsedInputDate = DateTime.fromFormat(
+                  inputValue,
+                  PICKER_DATE_FORMAT,
+                  { zone: 'utc' },
+                );
+
+                const isValid = parsedInputDate.isValid;
+
+                if (isValid) {
+                  onChange?.(parsedInputDate.toJSDate());
+                }
+              } else {
+                // TODO: implement time also
+                const parsedInputDate = DateTime.fromFormat(
+                  inputValue,
+                  PICKER_DATE_FORMAT,
+                  { zone: 'utc' },
+                );
+
+                const isValid = parsedInputDate.isValid;
+
+                if (isValid) {
+                  onChange?.(parsedInputDate.toJSDate());
+                }
+              }
+            }}
+          />
+        </StyledInputContainer>
+
         <ReactDatePicker
           open={true}
-          selected={date}
+          selected={dateValueAsJSDate}
+          value={dateValue}
           showMonthDropdown
           showYearDropdown
           onChange={() => {
@@ -268,10 +345,18 @@ export const InternalDatePicker = ({
           }}
           customInput={<></>}
           onSelect={(date: Date, event) => {
+            // Setting the time to midnight might sometimes return the previous day
+            // We set to 21:00 to avoid any timezone issues
+            const dateForDateField = new Date(date.setHours(21, 0, 0, 0));
+
+            setDateValue(
+              DateTime.fromJSDate(date).toFormat(PICKER_DATE_FORMAT),
+            );
+
             if (event?.type === 'click') {
-              onMouseSelect?.(date);
+              onMouseSelect?.(isDateTimeInput ? date : dateForDateField);
             } else {
-              onChange?.(date);
+              onChange?.(isDateTimeInput ? date : dateForDateField);
             }
           }}
         ></ReactDatePicker>
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/hooks/useCountries.ts b/packages/twenty-front/src/modules/ui/input/components/internal/hooks/useCountries.ts
new file mode 100644
index 000000000000..60ecd57a470f
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/hooks/useCountries.ts
@@ -0,0 +1,37 @@
+import { useMemo } from 'react';
+import { hasFlag } from 'country-flag-icons';
+import * as Flags from 'country-flag-icons/react/3x2';
+import { getCountries, getCountryCallingCode } from 'libphonenumber-js';
+
+import { Country } from '@/ui/input/components/internal/types/Country';
+
+export const useCountries = () => {
+  return useMemo<Country[]>(() => {
+    const regionNamesInEnglish = new Intl.DisplayNames(['en'], {
+      type: 'region',
+    });
+
+    const countryCodes = getCountries();
+
+    return countryCodes.reduce<Country[]>((result, countryCode) => {
+      const countryName = regionNamesInEnglish.of(countryCode);
+
+      if (!countryName) return result;
+
+      if (!hasFlag(countryCode)) return result;
+
+      const Flag = Flags[countryCode];
+
+      const callingCode = getCountryCallingCode(countryCode);
+
+      result.push({
+        countryCode,
+        countryName,
+        callingCode,
+        Flag,
+      });
+
+      return result;
+    }, []);
+  }, []);
+};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/CountryPickerDropdownButton.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/CountryPickerDropdownButton.tsx
deleted file mode 100644
index 8f5aa8119c0e..000000000000
--- a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/CountryPickerDropdownButton.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-import { useEffect, useMemo, useState } from 'react';
-import { getCountries, getCountryCallingCode } from 'react-phone-number-input';
-import { useTheme } from '@emotion/react';
-import styled from '@emotion/styled';
-import { hasFlag } from 'country-flag-icons';
-import * as Flags from 'country-flag-icons/react/3x2';
-import { CountryCallingCode } from 'libphonenumber-js';
-
-import { IconChevronDown, IconWorld } from '@/ui/display/icon';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
-
-import { CountryPickerHotkeyScope } from '../types/CountryPickerHotkeyScope';
-
-import { CountryPickerDropdownSelect } from './CountryPickerDropdownSelect';
-
-import 'react-phone-number-input/style.css';
-
-type StyledDropdownButtonProps = {
-  isUnfolded: boolean;
-};
-
-export const StyledDropdownButtonContainer = styled.div<StyledDropdownButtonProps>`
-  align-items: center;
-  background: ${({ theme }) => theme.background.primary};
-  border-radius: ${({ theme }) => theme.border.radius.xs};
-  color: ${({ color }) => color ?? 'none'};
-  cursor: pointer;
-  display: flex;
-
-  height: 32px;
-
-  padding-left: ${({ theme }) => theme.spacing(2)};
-  padding-right: ${({ theme }) => theme.spacing(2)};
-
-  padding-right: ${({ theme }) => theme.spacing(2)};
-  user-select: none;
-
-  &:hover {
-    filter: brightness(0.95);
-  }
-`;
-
-const StyledIconContainer = styled.div`
-  align-items: center;
-  color: ${({ theme }) => theme.font.color.tertiary};
-  display: flex;
-  gap: ${({ theme }) => theme.spacing(1)};
-  justify-content: center;
-
-  svg {
-    align-items: center;
-    display: flex;
-    height: 16px;
-    justify-content: center;
-  }
-`;
-
-export type Country = {
-  countryCode: string;
-  countryName: string;
-  callingCode: CountryCallingCode;
-  Flag: Flags.FlagComponent;
-};
-
-export const CountryPickerDropdownButton = ({
-  value,
-  onChange,
-}: {
-  value: string;
-  onChange: (countryCode: string) => void;
-}) => {
-  const theme = useTheme();
-
-  const [selectedCountry, setSelectedCountry] = useState<Country>();
-
-  const { isDropdownOpen, closeDropdown } = useDropdown('country-picker');
-
-  const handleChange = (countryCode: string) => {
-    onChange(countryCode);
-    closeDropdown();
-  };
-
-  const countries = useMemo<Country[]>(() => {
-    const regionNamesInEnglish = new Intl.DisplayNames(['en'], {
-      type: 'region',
-    });
-
-    const countryCodes = getCountries();
-
-    return countryCodes.reduce<Country[]>((result, countryCode) => {
-      const countryName = regionNamesInEnglish.of(countryCode);
-
-      if (!countryName) return result;
-
-      if (!hasFlag(countryCode)) return result;
-
-      const Flag = Flags[countryCode];
-
-      const callingCode = getCountryCallingCode(countryCode);
-
-      result.push({
-        countryCode,
-        countryName,
-        callingCode,
-        Flag,
-      });
-
-      return result;
-    }, []);
-  }, []);
-
-  useEffect(() => {
-    const country = countries.find(({ countryCode }) => countryCode === value);
-    if (country) {
-      setSelectedCountry(country);
-    }
-  }, [countries, value]);
-
-  return (
-    <Dropdown
-      dropdownId="country-picker-dropdown-id"
-      dropdownHotkeyScope={{ scope: CountryPickerHotkeyScope.CountryPicker }}
-      clickableComponent={
-        <StyledDropdownButtonContainer isUnfolded={isDropdownOpen}>
-          <StyledIconContainer>
-            {selectedCountry ? <selectedCountry.Flag /> : <IconWorld />}
-            <IconChevronDown size={theme.icon.size.sm} />
-          </StyledIconContainer>
-        </StyledDropdownButtonContainer>
-      }
-      dropdownComponents={
-        <CountryPickerDropdownSelect
-          countries={countries}
-          selectedCountry={selectedCountry}
-          onChange={handleChange}
-        />
-      }
-      dropdownPlacement="bottom-start"
-      dropdownOffset={{ x: 0, y: 4 }}
-    />
-  );
-};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/CountryPickerDropdownSelect.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/CountryPickerDropdownSelect.tsx
deleted file mode 100644
index 7ca51504830e..000000000000
--- a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/CountryPickerDropdownSelect.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { useMemo, useState } from 'react';
-import styled from '@emotion/styled';
-
-import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
-import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
-import { MenuItemSelectAvatar } from '@/ui/navigation/menu-item/components/MenuItemSelectAvatar';
-
-import { Country } from './CountryPickerDropdownButton';
-
-import 'react-phone-number-input/style.css';
-
-const StyledIconContainer = styled.div`
-  align-items: center;
-  color: ${({ theme }) => theme.font.color.tertiary};
-  display: flex;
-  padding-right: ${({ theme }) => theme.spacing(1)};
-
-  svg {
-    align-items: center;
-    border-radius: ${({ theme }) => theme.border.radius.xs};
-    display: flex;
-    height: 12px;
-    justify-content: center;
-  }
-`;
-
-export const CountryPickerDropdownSelect = ({
-  countries,
-  selectedCountry,
-  onChange,
-}: {
-  countries: Country[];
-  selectedCountry?: Country;
-  onChange: (countryCode: string) => void;
-}) => {
-  const [searchFilter, setSearchFilter] = useState<string>('');
-
-  const filteredCountries = useMemo(
-    () =>
-      countries.filter(({ countryName }) =>
-        countryName
-          .toLocaleLowerCase()
-          .includes(searchFilter.toLocaleLowerCase()),
-      ),
-    [countries, searchFilter],
-  );
-
-  return (
-    <DropdownMenu width="200px" disableBlur>
-      <DropdownMenuSearchInput
-        value={searchFilter}
-        onChange={(event) => setSearchFilter(event.currentTarget.value)}
-        autoFocus
-      />
-      <DropdownMenuSeparator />
-      <DropdownMenuItemsContainer hasMaxHeight>
-        {filteredCountries?.length === 0 ? (
-          <MenuItem text="No result" />
-        ) : (
-          <>
-            {selectedCountry && (
-              <MenuItemSelectAvatar
-                key={selectedCountry.countryCode}
-                selected={true}
-                onClick={() => onChange(selectedCountry.countryCode)}
-                text={`${selectedCountry.countryName} (+${selectedCountry.callingCode})`}
-                avatar={
-                  <StyledIconContainer>
-                    <selectedCountry.Flag />
-                  </StyledIconContainer>
-                }
-              />
-            )}
-            {filteredCountries.map(
-              ({ countryCode, countryName, callingCode, Flag }) =>
-                selectedCountry?.countryCode === countryCode ? null : (
-                  <MenuItemSelectAvatar
-                    key={countryCode}
-                    selected={selectedCountry?.countryCode === countryCode}
-                    onClick={() => onChange(countryCode)}
-                    text={`${countryName} (+${callingCode})`}
-                    avatar={
-                      <StyledIconContainer>
-                        <Flag />
-                      </StyledIconContainer>
-                    }
-                  />
-                ),
-            )}
-          </>
-        )}
-      </DropdownMenuItemsContainer>
-    </DropdownMenu>
-  );
-};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton.tsx
new file mode 100644
index 000000000000..4cfdfb9b751b
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton.tsx
@@ -0,0 +1,109 @@
+import { useEffect, useState } from 'react';
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import { IconChevronDown, IconWorld } from 'twenty-ui';
+
+import { useCountries } from '@/ui/input/components/internal/hooks/useCountries';
+import { Country } from '@/ui/input/components/internal/types/Country';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+import { isDefined } from '~/utils/isDefined';
+
+import { CountryPickerHotkeyScope } from '../types/CountryPickerHotkeyScope';
+
+import { PhoneCountryPickerDropdownSelect } from './PhoneCountryPickerDropdownSelect';
+
+import 'react-phone-number-input/style.css';
+
+type StyledDropdownButtonProps = {
+  isUnfolded: boolean;
+};
+
+export const StyledDropdownButtonContainer = styled.div<StyledDropdownButtonProps>`
+  align-items: center;
+  background: ${({ theme }) => theme.background.primary};
+  border-radius: ${({ theme }) => theme.border.radius.xs};
+  color: ${({ color }) => color ?? 'none'};
+  cursor: pointer;
+  display: flex;
+
+  height: 32px;
+
+  padding-left: ${({ theme }) => theme.spacing(2)};
+  padding-right: ${({ theme }) => theme.spacing(2)};
+
+  padding-right: ${({ theme }) => theme.spacing(2)};
+  user-select: none;
+
+  &:hover {
+    filter: brightness(0.95);
+  }
+`;
+
+const StyledIconContainer = styled.div`
+  align-items: center;
+  color: ${({ theme }) => theme.font.color.tertiary};
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+  justify-content: center;
+
+  svg {
+    align-items: center;
+    display: flex;
+    height: 16px;
+    justify-content: center;
+  }
+`;
+
+export const PhoneCountryPickerDropdownButton = ({
+  value,
+  onChange,
+}: {
+  value: string;
+  onChange: (countryCode: string) => void;
+}) => {
+  const theme = useTheme();
+
+  const [selectedCountry, setSelectedCountry] = useState<Country>();
+
+  const { isDropdownOpen, closeDropdown } = useDropdown('country-picker');
+
+  const handleChange = (countryCode: string) => {
+    onChange(countryCode);
+    closeDropdown();
+  };
+
+  const countries = useCountries();
+
+  useEffect(() => {
+    const country = countries.find(({ countryCode }) => countryCode === value);
+    if (isDefined(country)) {
+      setSelectedCountry(country);
+    }
+  }, [countries, value]);
+
+  return (
+    <Dropdown
+      dropdownMenuWidth={'100%'}
+      dropdownId="country-picker-dropdown-id"
+      dropdownHotkeyScope={{ scope: CountryPickerHotkeyScope.CountryPicker }}
+      clickableComponent={
+        <StyledDropdownButtonContainer isUnfolded={isDropdownOpen}>
+          <StyledIconContainer>
+            {selectedCountry ? <selectedCountry.Flag /> : <IconWorld />}
+            <IconChevronDown size={theme.icon.size.sm} />
+          </StyledIconContainer>
+        </StyledDropdownButtonContainer>
+      }
+      dropdownComponents={
+        <PhoneCountryPickerDropdownSelect
+          countries={countries}
+          selectedCountry={selectedCountry}
+          onChange={handleChange}
+        />
+      }
+      dropdownPlacement="bottom-start"
+      dropdownOffset={{ x: 0, y: 4 }}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownSelect.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownSelect.tsx
new file mode 100644
index 000000000000..b651d38007e6
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownSelect.tsx
@@ -0,0 +1,97 @@
+import { useMemo, useState } from 'react';
+import styled from '@emotion/styled';
+
+import { Country } from '@/ui/input/components/internal/types/Country';
+import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
+import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
+import { MenuItemSelectAvatar } from '@/ui/navigation/menu-item/components/MenuItemSelectAvatar';
+
+import 'react-phone-number-input/style.css';
+
+const StyledIconContainer = styled.div`
+  align-items: center;
+  color: ${({ theme }) => theme.font.color.tertiary};
+  display: flex;
+  padding-right: ${({ theme }) => theme.spacing(1)};
+
+  svg {
+    align-items: center;
+    border-radius: ${({ theme }) => theme.border.radius.xs};
+    display: flex;
+    height: 12px;
+    justify-content: center;
+  }
+`;
+
+export const PhoneCountryPickerDropdownSelect = ({
+  countries,
+  selectedCountry,
+  onChange,
+}: {
+  countries: Country[];
+  selectedCountry?: Country;
+  onChange: (countryCode: string) => void;
+}) => {
+  const [searchFilter, setSearchFilter] = useState<string>('');
+
+  const filteredCountries = useMemo(
+    () =>
+      countries.filter(({ countryName }) =>
+        countryName
+          .toLocaleLowerCase()
+          .includes(searchFilter.toLocaleLowerCase()),
+      ),
+    [countries, searchFilter],
+  );
+
+  return (
+    <DropdownMenu width="200px" disableBlur>
+      <DropdownMenuSearchInput
+        value={searchFilter}
+        onChange={(event) => setSearchFilter(event.currentTarget.value)}
+        autoFocus
+      />
+      <DropdownMenuSeparator />
+      <DropdownMenuItemsContainer hasMaxHeight>
+        {filteredCountries?.length === 0 ? (
+          <MenuItem text="No result" />
+        ) : (
+          <>
+            {selectedCountry && (
+              <MenuItemSelectAvatar
+                key={selectedCountry.countryCode}
+                selected={true}
+                onClick={() => onChange(selectedCountry.countryCode)}
+                text={`${selectedCountry.countryName} (+${selectedCountry.callingCode})`}
+                avatar={
+                  <StyledIconContainer>
+                    <selectedCountry.Flag />
+                  </StyledIconContainer>
+                }
+              />
+            )}
+            {filteredCountries.map(
+              ({ countryCode, countryName, callingCode, Flag }) =>
+                selectedCountry?.countryCode === countryCode ? null : (
+                  <MenuItemSelectAvatar
+                    key={countryCode}
+                    selected={selectedCountry?.countryCode === countryCode}
+                    onClick={() => onChange(countryCode)}
+                    text={`${countryName} (+${callingCode})`}
+                    avatar={
+                      <StyledIconContainer>
+                        <Flag />
+                      </StyledIconContainer>
+                    }
+                  />
+                ),
+            )}
+          </>
+        )}
+      </DropdownMenuItemsContainer>
+    </DropdownMenu>
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/types/Country.ts b/packages/twenty-front/src/modules/ui/input/components/internal/types/Country.ts
new file mode 100644
index 000000000000..5f4f65689bd9
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/types/Country.ts
@@ -0,0 +1,9 @@
+import * as Flags from 'country-flag-icons/react/3x2';
+import { CountryCallingCode } from 'libphonenumber-js';
+
+export type Country = {
+  countryCode: string;
+  countryName: string;
+  callingCode: CountryCallingCode;
+  Flag: Flags.FlagComponent;
+};
diff --git a/packages/twenty-front/src/modules/ui/input/editor/components/BlockEditor.tsx b/packages/twenty-front/src/modules/ui/input/editor/components/BlockEditor.tsx
index 0ca49bca52be..fc5138359763 100644
--- a/packages/twenty-front/src/modules/ui/input/editor/components/BlockEditor.tsx
+++ b/packages/twenty-front/src/modules/ui/input/editor/components/BlockEditor.tsx
@@ -1,12 +1,22 @@
-import { BlockNoteEditor } from '@blocknote/core';
-import { BlockNoteView } from '@blocknote/react';
+import { ClipboardEvent } from 'react';
+import { filterSuggestionItems } from '@blocknote/core';
+import { BlockNoteView, SuggestionMenuController } from '@blocknote/react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 
+import { blockSchema } from '@/activities/blocks/schema';
+import { getSlashMenu } from '@/activities/blocks/slashMenu';
+import {
+  CustomSlashMenu,
+  SuggestionItem,
+} from '@/ui/input/editor/components/CustomSlashMenu';
+
 interface BlockEditorProps {
-  editor: BlockNoteEditor;
+  editor: typeof blockSchema.BlockNoteEditor;
   onFocus?: () => void;
   onBlur?: () => void;
+  onPaste?: (event: ClipboardEvent) => void;
+  onChange?: () => void;
 }
 
 const StyledEditor = styled.div`
@@ -22,7 +32,13 @@ const StyledEditor = styled.div`
   }
 `;
 
-export const BlockEditor = ({ editor, onFocus, onBlur }: BlockEditorProps) => {
+export const BlockEditor = ({
+  editor,
+  onFocus,
+  onBlur,
+  onChange,
+  onPaste,
+}: BlockEditorProps) => {
   const theme = useTheme();
   const blockNoteTheme = theme.name === 'light' ? 'light' : 'dark';
 
@@ -34,14 +50,33 @@ export const BlockEditor = ({ editor, onFocus, onBlur }: BlockEditorProps) => {
     onBlur?.();
   };
 
+  const handleChange = () => {
+    onChange?.();
+  };
+
+  const handlePaste = (event: ClipboardEvent) => {
+    onPaste?.(event);
+  };
+
   return (
     <StyledEditor>
       <BlockNoteView
         onFocus={handleFocus}
         onBlur={handleBlur}
+        onPaste={handlePaste}
+        onChange={handleChange}
         editor={editor}
         theme={blockNoteTheme}
-      />
+        slashMenu={false}
+      >
+        <SuggestionMenuController
+          triggerCharacter={'/'}
+          getItems={async (query) =>
+            filterSuggestionItems<SuggestionItem>(getSlashMenu(editor), query)
+          }
+          suggestionMenuComponent={CustomSlashMenu}
+        />
+      </BlockNoteView>
     </StyledEditor>
   );
 };
diff --git a/packages/twenty-front/src/modules/ui/input/editor/components/CustomSlashMenu.tsx b/packages/twenty-front/src/modules/ui/input/editor/components/CustomSlashMenu.tsx
new file mode 100644
index 000000000000..509fd9a740f1
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/editor/components/CustomSlashMenu.tsx
@@ -0,0 +1,42 @@
+import { SuggestionMenuProps } from '@blocknote/react';
+import styled from '@emotion/styled';
+
+import { IconComponent } from '@/ui/display/icon/types/IconComponent';
+import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { MenuItemSuggestion } from '@/ui/navigation/menu-item/components/MenuItemSuggestion';
+
+export type SuggestionItem = {
+  title: string;
+  onItemClick: () => void;
+  aliases?: string[];
+  Icon?: IconComponent;
+};
+
+type CustomSlashMenuProps = SuggestionMenuProps<SuggestionItem>;
+
+const StyledSlashMenu = styled.div`
+  * {
+    box-sizing: content-box;
+  }
+`;
+
+export const CustomSlashMenu = (props: CustomSlashMenuProps) => {
+  return (
+    <StyledSlashMenu>
+      <DropdownMenu style={{ zIndex: 2001 }}>
+        <DropdownMenuItemsContainer>
+          {props.items.map((item, index) => (
+            <MenuItemSuggestion
+              key={item.title}
+              onClick={() => item.onItemClick()}
+              text={item.title}
+              LeftIcon={item.Icon}
+              selected={props.selectedIndex === index}
+            />
+          ))}
+        </DropdownMenuItemsContainer>
+      </DropdownMenu>
+    </StyledSlashMenu>
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/input/hooks/__tests__/useIconPicker.test.tsx b/packages/twenty-front/src/modules/ui/input/hooks/__tests__/useIconPicker.test.tsx
index 5dca2175017c..7799d7220660 100644
--- a/packages/twenty-front/src/modules/ui/input/hooks/__tests__/useIconPicker.test.tsx
+++ b/packages/twenty-front/src/modules/ui/input/hooks/__tests__/useIconPicker.test.tsx
@@ -1,8 +1,8 @@
 import { act } from 'react-dom/test-utils';
 import { renderHook } from '@testing-library/react';
 import { RecoilRoot } from 'recoil';
+import { Icon123, IconApps } from 'twenty-ui';
 
-import { Icon123, IconApps } from '@/ui/display/icon';
 import { useIconPicker } from '@/ui/input/hooks/useIconPicker';
 
 describe('useIconPicker', () => {
diff --git a/packages/twenty-front/src/modules/ui/input/states/iconPickerState.ts b/packages/twenty-front/src/modules/ui/input/states/iconPickerState.ts
index f2698c007794..8d744bee4a2c 100644
--- a/packages/twenty-front/src/modules/ui/input/states/iconPickerState.ts
+++ b/packages/twenty-front/src/modules/ui/input/states/iconPickerState.ts
@@ -1,6 +1,5 @@
-import { atom } from 'recoil';
+import { createState, IconApps } from 'twenty-ui';
 
-import { IconApps } from '@/ui/display/icon';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 
 type IconPickerState = {
@@ -8,7 +7,7 @@ type IconPickerState = {
   iconKey: string;
 };
 
-export const iconPickerState = atom<IconPickerState>({
+export const iconPickerState = createState<IconPickerState>({
   key: 'iconPickerState',
-  default: { Icon: IconApps, iconKey: 'IconApps' },
+  defaultValue: { Icon: IconApps, iconKey: 'IconApps' },
 });
diff --git a/packages/twenty-front/src/modules/ui/layout/animated-placeholder/components/AnimatedPlaceholder.tsx b/packages/twenty-front/src/modules/ui/layout/animated-placeholder/components/AnimatedPlaceholder.tsx
index 87b0fa79150b..cd173e0aeaea 100644
--- a/packages/twenty-front/src/modules/ui/layout/animated-placeholder/components/AnimatedPlaceholder.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/animated-placeholder/components/AnimatedPlaceholder.tsx
@@ -1,8 +1,7 @@
 import { useEffect } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-import { motion, useMotionValue, useTransform } from 'framer-motion';
-import { animate } from 'framer-motion';
+import { animate, motion, useMotionValue, useTransform } from 'framer-motion';
 
 import { BACKGROUND } from '@/ui/layout/animated-placeholder/constants/Background';
 import { DARK_BACKGROUND } from '@/ui/layout/animated-placeholder/constants/DarkBackground';
diff --git a/packages/twenty-front/src/modules/ui/layout/card/components/CardContent.tsx b/packages/twenty-front/src/modules/ui/layout/card/components/CardContent.tsx
index 7b7fbb1489c0..5c7c5fb94b2d 100644
--- a/packages/twenty-front/src/modules/ui/layout/card/components/CardContent.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/card/components/CardContent.tsx
@@ -1,7 +1,8 @@
 import { css } from '@emotion/react';
 import styled from '@emotion/styled';
+import { motion } from 'framer-motion';
 
-const StyledCardContent = styled.div<{ divider?: boolean }>`
+const StyledCardContent = styled(motion.div)<{ divider?: boolean }>`
   background-color: ${({ theme }) => theme.background.secondary};
   padding: ${({ theme }) => theme.spacing(4)};
 
diff --git a/packages/twenty-front/src/modules/ui/layout/card/components/CardFooter.tsx b/packages/twenty-front/src/modules/ui/layout/card/components/CardFooter.tsx
index 1cc953db335c..e1813bf98bf6 100644
--- a/packages/twenty-front/src/modules/ui/layout/card/components/CardFooter.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/card/components/CardFooter.tsx
@@ -1,8 +1,10 @@
+import { css } from '@emotion/react';
 import styled from '@emotion/styled';
 
-const StyledCardFooter = styled.div`
+const StyledCardFooter = styled.div<{ divider?: boolean }>`
   background-color: ${({ theme }) => theme.background.primary};
-  border-top: 1px solid ${({ theme }) => theme.border.color.medium};
+  border-top: ${({ divider = true, theme }) =>
+    divider ? css`1px solid ${theme.border.color.medium}` : 0};
   font-size: ${({ theme }) => theme.font.size.sm};
   padding: ${({ theme }) => theme.spacing(2, 4)};
 `;
diff --git a/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableItem.stories.tsx b/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableItem.stories.tsx
index ff97d8c5ee2d..6c87c8ec3bac 100644
--- a/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableItem.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableItem.stories.tsx
@@ -1,7 +1,7 @@
 import { DragDropContext, Droppable } from '@hello-pangea/dnd';
 import { Meta, StoryObj } from '@storybook/react';
+import { IconBell } from 'twenty-ui';
 
-import { IconBell } from '@/ui/display/icon';
 import { MenuItemDraggable } from '@/ui/navigation/menu-item/components/MenuItemDraggable';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 
diff --git a/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableList.stories.tsx b/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableList.stories.tsx
index 6f44711088fb..469e0f7e0c74 100644
--- a/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableList.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/draggable-list/__stories__/DraggableList.stories.tsx
@@ -1,6 +1,7 @@
+import { action } from '@storybook/addon-actions';
 import { Meta, StoryObj } from '@storybook/react';
+import { IconBell } from 'twenty-ui';
 
-import { IconBell } from '@/ui/display/icon';
 import { MenuItemDraggable } from '@/ui/navigation/menu-item/components/MenuItemDraggable';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 
@@ -12,7 +13,7 @@ const meta: Meta<typeof DraggableList> = {
   component: DraggableList,
   decorators: [ComponentDecorator],
   parameters: {
-    onDragEnd: () => console.log('dragged'),
+    onDragEnd: action('dragged'),
   },
   argTypes: {
     draggableItems: { control: false },
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx
index dac09885fcd0..70c58355d4da 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx
@@ -14,6 +14,8 @@ import { HotkeyEffect } from '@/ui/utilities/hotkey/components/HotkeyEffect';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
 import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
+import { getScopeIdFromComponentId } from '@/ui/utilities/recoil-scope/utils/getScopeIdFromComponentId';
+import { isDefined } from '~/utils/isDefined';
 
 import { useDropdown } from '../hooks/useDropdown';
 import { useInternalHotkeyScopeManagement } from '../hooks/useInternalHotkeyScopeManagement';
@@ -32,8 +34,9 @@ type DropdownProps = {
   dropdownHotkeyScope: HotkeyScope;
   dropdownId: string;
   dropdownPlacement?: Placement;
-  dropdownMenuWidth?: `${string}px` | 'auto' | number;
+  dropdownMenuWidth?: `${string}px` | `${number}%` | 'auto' | number;
   dropdownOffset?: { x?: number; y?: number };
+  disableBlur?: boolean;
   onClickOutside?: () => void;
   onClose?: () => void;
   onOpen?: () => void;
@@ -49,6 +52,7 @@ export const Dropdown = ({
   dropdownHotkeyScope,
   dropdownPlacement = 'bottom-end',
   dropdownOffset = { x: 0, y: 0 },
+  disableBlur = false,
   onClickOutside,
   onClose,
   onOpen,
@@ -59,11 +63,11 @@ export const Dropdown = ({
     useDropdown(dropdownId);
   const offsetMiddlewares = [];
 
-  if (dropdownOffset.x) {
+  if (isDefined(dropdownOffset.x)) {
     offsetMiddlewares.push(offset({ crossAxis: dropdownOffset.x }));
   }
 
-  if (dropdownOffset.y) {
+  if (isDefined(dropdownOffset.y)) {
     offsetMiddlewares.push(offset({ mainAxis: dropdownOffset.y }));
   }
 
@@ -89,7 +93,7 @@ export const Dropdown = ({
   });
 
   useInternalHotkeyScopeManagement({
-    dropdownScopeId: `${dropdownId}-scope`,
+    dropdownScopeId: getScopeIdFromComponentId(dropdownId),
     dropdownHotkeyScopeFromParent: dropdownHotkeyScope,
   });
 
@@ -103,12 +107,15 @@ export const Dropdown = ({
   );
 
   return (
-    <DropdownScope dropdownScopeId={`${dropdownId}-scope`}>
+    <DropdownScope dropdownScopeId={getScopeIdFromComponentId(dropdownId)}>
       <div ref={containerRef} className={className}>
         {clickableComponent && (
           <div
             ref={refs.setReference}
-            onClick={toggleDropdown}
+            onClick={() => {
+              toggleDropdown();
+              onClickOutside?.();
+            }}
             className={className}
           >
             {clickableComponent}
@@ -122,6 +129,7 @@ export const Dropdown = ({
         )}
         {isDropdownOpen && (
           <DropdownMenu
+            disableBlur={disableBlur}
             width={dropdownMenuWidth ?? dropdownWidth}
             data-select-disable
             ref={refs.setFloating}
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenu.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenu.tsx
index cee912701902..8acfcadfaee7 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenu.tsx
@@ -2,11 +2,21 @@ import styled from '@emotion/styled';
 
 const StyledDropdownMenu = styled.div<{
   disableBlur?: boolean;
-  width?: `${string}px` | 'auto' | number;
+  disableBorder?: boolean;
+  width?: `${string}px` | `${number}%` | 'auto' | number;
 }>`
-  backdrop-filter: ${({ disableBlur }) => (disableBlur ? 'none' : 'blur(8px)')};
-  background: ${({ theme }) => theme.background.transparent.secondary};
-  border: 1px solid ${({ theme }) => theme.border.color.medium};
+  backdrop-filter: ${({ disableBlur }) =>
+    disableBlur
+      ? 'none'
+      : 'blur(12px) saturate(200%) contrast(50%) brightness(130%)'};
+
+  background: ${({ theme, disableBlur }) =>
+    disableBlur
+      ? theme.background.primary
+      : theme.background.transparent.secondary};
+
+  border: ${({ disableBorder, theme }) =>
+    disableBorder ? 'none' : `1px solid ${theme.border.color.medium}`};
   border-radius: ${({ theme }) => theme.border.radius.md};
 
   box-shadow: ${({ theme }) => theme.boxShadow.strong};
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader.tsx
index fc959c1a9340..3b6c829cdfeb 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader.tsx
@@ -1,4 +1,5 @@
 import { ComponentProps, MouseEvent } from 'react';
+import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
@@ -7,23 +8,38 @@ import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 const StyledHeader = styled.li`
   align-items: center;
   color: ${({ theme }) => theme.font.color.primary};
+  cursor: ${({ onClick }) => (onClick ? 'pointer' : 'default')};
   display: flex;
   font-size: ${({ theme }) => theme.font.size.sm};
   font-weight: ${({ theme }) => theme.font.weight.medium};
+  border-top-left-radius: ${({ theme }) => theme.border.radius.sm};
+  border-top-right-radius: ${({ theme }) => theme.border.radius.sm};
 
   padding: ${({ theme }) => theme.spacing(1)};
 
   user-select: none;
-`;
 
-const StyledChildrenWrapper = styled.span`
-  padding: 0 ${({ theme }) => theme.spacing(1)};
+  &:hover {
+    background: ${({ theme, onClick }) =>
+      onClick ? theme.background.transparent.light : 'none'};
+  }
 `;
 
-const StyledLightIconButton = styled(LightIconButton)`
+const StyledEndIcon = styled.div`
   display: inline-flex;
+  color: ${({ theme }) => theme.font.color.tertiary};
+  padding: ${({ theme }) => theme.spacing(1)};
   margin-left: auto;
   margin-right: 0;
+
+  & > svg {
+    height: ${({ theme }) => theme.icon.size.md}px;
+    width: ${({ theme }) => theme.icon.size.md}px;
+  }
+`;
+
+const StyledChildrenWrapper = styled.span`
+  padding: 0 ${({ theme }) => theme.spacing(1)};
 `;
 
 type DropdownMenuHeaderProps = ComponentProps<'li'> & {
@@ -40,27 +56,29 @@ export const DropdownMenuHeader = ({
   onClick,
   testId,
 }: DropdownMenuHeaderProps) => {
+  const theme = useTheme();
   return (
-    <StyledHeader data-testid={testId}>
-      {StartIcon && (
-        <LightIconButton
-          testId="dropdown-menu-header-end-icon"
-          Icon={StartIcon}
-          onClick={onClick}
-          accent="tertiary"
-          size="small"
-        />
-      )}
-      <StyledChildrenWrapper>{children}</StyledChildrenWrapper>
+    <>
       {EndIcon && (
-        <StyledLightIconButton
-          testId="dropdown-menu-header-end-icon"
-          Icon={EndIcon}
-          onClick={onClick}
-          accent="tertiary"
-          size="small"
-        />
+        <StyledHeader data-testid={testId} onClick={onClick}>
+          <StyledChildrenWrapper>{children}</StyledChildrenWrapper>
+          <StyledEndIcon>
+            <EndIcon size={theme.icon.size.md} />
+          </StyledEndIcon>
+        </StyledHeader>
+      )}
+      {StartIcon && (
+        <StyledHeader data-testid={testId}>
+          <LightIconButton
+            testId="dropdown-menu-header-end-icon"
+            Icon={StartIcon}
+            accent="tertiary"
+            size="small"
+            onClick={onClick}
+          />
+          <StyledChildrenWrapper>{children}</StyledChildrenWrapper>
+        </StyledHeader>
       )}
-    </StyledHeader>
+    </>
   );
 };
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInput.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInput.tsx
index 913534a8d7b9..424bcb1b3727 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInput.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInput.tsx
@@ -30,13 +30,14 @@ const StyledInputContainer = styled.div`
 export const DropdownMenuInput = forwardRef<
   HTMLInputElement,
   InputHTMLAttributes<HTMLInputElement>
->(({ autoFocus, defaultValue, placeholder }, ref) => {
+>(({ autoFocus, value, placeholder, onChange }, ref) => {
   return (
     <StyledInputContainer>
       <StyledInput
         autoFocus={autoFocus}
-        defaultValue={defaultValue}
+        value={value}
         placeholder={placeholder}
+        onChange={onChange}
         ref={ref}
       />
     </StyledInputContainer>
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuItemsContainer.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuItemsContainer.tsx
index 43da12e60340..89c0cef0eae8 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuItemsContainer.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuItemsContainer.tsx
@@ -13,13 +13,12 @@ const StyledDropdownMenuItemsExternalContainer = styled.div<{
   flex-direction: column;
   gap: 2px;
   height: 100%;
-  max-height: ${({ hasMaxHeight }) => (hasMaxHeight ? '180px' : 'none')};
+  max-height: ${({ hasMaxHeight }) => (hasMaxHeight ? '188px' : 'none')};
   overflow-y: auto;
 
   padding: var(--padding);
-  padding-right: 0;
 
-  width: calc(100% - 1 * var(--padding));
+  width: calc(100% - 2 * var(--padding));
 `;
 
 const StyledScrollWrapper = styled(ScrollWrapper)`
@@ -45,11 +44,17 @@ export const DropdownMenuItemsContainer = ({
 }) => {
   return (
     <StyledDropdownMenuItemsExternalContainer hasMaxHeight={hasMaxHeight}>
-      <StyledScrollWrapper>
+      {hasMaxHeight ? (
+        <StyledScrollWrapper>
+          <StyledDropdownMenuItemsInternalContainer>
+            {children}
+          </StyledDropdownMenuItemsInternalContainer>
+        </StyledScrollWrapper>
+      ) : (
         <StyledDropdownMenuItemsInternalContainer>
           {children}
         </StyledDropdownMenuItemsInternalContainer>
-      </StyledScrollWrapper>
+      )}
     </StyledDropdownMenuItemsExternalContainer>
   );
 };
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenu.stories.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenu.stories.tsx
index 0e2a412a6f6e..d362e1ed7958 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenu.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenu.stories.tsx
@@ -274,7 +274,7 @@ export const WithInput: Story = {
   args: {
     dropdownComponents: (
       <>
-        <DropdownMenuInput defaultValue="Lorem ipsum" autoFocus />
+        <DropdownMenuInput value="Lorem ipsum" autoFocus />
         <DropdownMenuSeparator />
         <DropdownMenuItemsContainer hasMaxHeight>
           {optionsMock.map(({ name }) => (
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuInput.stories.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuInput.stories.tsx
index 21e5d765399a..42838fca3b4d 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuInput.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuInput.stories.tsx
@@ -8,7 +8,7 @@ const meta: Meta<typeof DropdownMenuInput> = {
   title: 'UI/Layout/Dropdown/DropdownMenuInput',
   component: DropdownMenuInput,
   decorators: [ComponentDecorator],
-  args: { defaultValue: 'Lorem ipsum' },
+  args: { value: 'Lorem ipsum' },
 };
 
 export default meta;
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useInternalHotkeyScopeManagement.test.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useInternalHotkeyScopeManagement.test.tsx
index 9bdb17bae49f..3bfd0f3a3585 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useInternalHotkeyScopeManagement.test.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useInternalHotkeyScopeManagement.test.tsx
@@ -27,7 +27,7 @@ describe('useInternalHotkeyScopeManagement', () => {
         const { dropdownHotkeyScopeState } = useDropdownStates({
           dropdownScopeId,
         });
-        const dropdownHotkeyScope = useRecoilValue(dropdownHotkeyScopeState());
+        const dropdownHotkeyScope = useRecoilValue(dropdownHotkeyScopeState);
         return { dropdownHotkeyScope };
       },
       {
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/internal/useDropdownStates.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/internal/useDropdownStates.ts
index b0f35ce5859f..c976f2bd003a 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/internal/useDropdownStates.ts
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/internal/useDropdownStates.ts
@@ -1,9 +1,9 @@
 import { DropdownScopeInternalContext } from '@/ui/layout/dropdown/scopes/scope-internal-context/DropdownScopeInternalContext';
-import { dropdownHotkeyStateScopeMap } from '@/ui/layout/dropdown/states/dropdownHotkeyStateScopeMap';
-import { dropdownWidthStateScopeMap } from '@/ui/layout/dropdown/states/dropdownWidthStateScopeMap';
-import { isDropdownOpenStateScopeMap } from '@/ui/layout/dropdown/states/isDropdownOpenStateScopeMap';
+import { dropdownHotkeyComponentState } from '@/ui/layout/dropdown/states/dropdownHotkeyComponentState';
+import { dropdownWidthComponentState } from '@/ui/layout/dropdown/states/dropdownWidthComponentState';
+import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
 import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
-import { getState } from '@/ui/utilities/recoil-scope/utils/getState';
+import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
 
 type UseDropdownStatesProps = {
   dropdownScopeId?: string;
@@ -19,8 +19,17 @@ export const useDropdownStates = ({
 
   return {
     scopeId,
-    dropdownHotkeyScopeState: getState(dropdownHotkeyStateScopeMap, scopeId),
-    dropdownWidthState: getState(dropdownWidthStateScopeMap, scopeId),
-    isDropdownOpenState: getState(isDropdownOpenStateScopeMap, scopeId),
+    dropdownHotkeyScopeState: extractComponentState(
+      dropdownHotkeyComponentState,
+      scopeId,
+    ),
+    dropdownWidthState: extractComponentState(
+      dropdownWidthComponentState,
+      scopeId,
+    ),
+    isDropdownOpenState: extractComponentState(
+      isDropdownOpenComponentState,
+      scopeId,
+    ),
   };
 };
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useDropdown.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useDropdown.ts
index 00f16c174f85..f3b196f41808 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useDropdown.ts
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useDropdown.ts
@@ -3,6 +3,7 @@ import { useRecoilState } from 'recoil';
 import { useDropdownStates } from '@/ui/layout/dropdown/hooks/internal/useDropdownStates';
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
 import { getScopeIdOrUndefinedFromComponentId } from '@/ui/utilities/recoil-scope/utils/getScopeIdOrUndefinedFromComponentId';
+import { isDefined } from '~/utils/isDefined';
 
 export const useDropdown = (dropdownId?: string) => {
   const {
@@ -19,14 +20,12 @@ export const useDropdown = (dropdownId?: string) => {
     goBackToPreviousHotkeyScope,
   } = usePreviousHotkeyScope();
 
-  const [dropdownHotkeyScope] = useRecoilState(dropdownHotkeyScopeState());
+  const [dropdownHotkeyScope] = useRecoilState(dropdownHotkeyScopeState);
 
-  const [dropdownWidth, setDropdownWidth] =
-    useRecoilState(dropdownWidthState());
+  const [dropdownWidth, setDropdownWidth] = useRecoilState(dropdownWidthState);
 
-  const [isDropdownOpen, setIsDropdownOpen] = useRecoilState(
-    isDropdownOpenState(),
-  );
+  const [isDropdownOpen, setIsDropdownOpen] =
+    useRecoilState(isDropdownOpenState);
 
   const closeDropdown = () => {
     goBackToPreviousHotkeyScope();
@@ -35,7 +34,7 @@ export const useDropdown = (dropdownId?: string) => {
 
   const openDropdown = () => {
     setIsDropdownOpen(true);
-    if (dropdownHotkeyScope) {
+    if (isDefined(dropdownHotkeyScope)) {
       setHotkeyScopeAndMemorizePreviousScope(
         dropdownHotkeyScope.scope,
         dropdownHotkeyScope.customScopes,
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useDropdownV2.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useDropdownV2.ts
new file mode 100644
index 000000000000..59ae9358bd2a
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useDropdownV2.ts
@@ -0,0 +1,85 @@
+import { useRecoilCallback } from 'recoil';
+
+import { dropdownHotkeyComponentState } from '@/ui/layout/dropdown/states/dropdownHotkeyComponentState';
+import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
+import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
+import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
+import { getScopeIdFromComponentId } from '@/ui/utilities/recoil-scope/utils/getScopeIdFromComponentId';
+import { isDefined } from '~/utils/isDefined';
+
+export const useDropdownV2 = () => {
+  const {
+    setHotkeyScopeAndMemorizePreviousScope,
+    goBackToPreviousHotkeyScope,
+  } = usePreviousHotkeyScope();
+
+  const closeDropdown = useRecoilCallback(
+    ({ set }) =>
+      (specificComponentId: string) => {
+        const scopeId = getScopeIdFromComponentId(specificComponentId);
+
+        goBackToPreviousHotkeyScope();
+        set(
+          isDropdownOpenComponentState({
+            scopeId,
+          }),
+          false,
+        );
+      },
+    [goBackToPreviousHotkeyScope],
+  );
+
+  const openDropdown = useRecoilCallback(
+    ({ set, snapshot }) =>
+      (specificComponentId: string, customHotkeyScope?: HotkeyScope) => {
+        const scopeId = getScopeIdFromComponentId(specificComponentId);
+
+        const dropdownHotkeyScope = snapshot
+          .getLoadable(dropdownHotkeyComponentState({ scopeId }))
+          .getValue();
+
+        set(
+          isDropdownOpenComponentState({
+            scopeId,
+          }),
+          true,
+        );
+
+        if (isDefined(customHotkeyScope)) {
+          setHotkeyScopeAndMemorizePreviousScope(
+            customHotkeyScope.scope,
+            customHotkeyScope.customScopes,
+          );
+        } else if (isDefined(dropdownHotkeyScope)) {
+          setHotkeyScopeAndMemorizePreviousScope(
+            dropdownHotkeyScope.scope,
+            dropdownHotkeyScope.customScopes,
+          );
+        }
+      },
+    [setHotkeyScopeAndMemorizePreviousScope],
+  );
+
+  const toggleDropdown = useRecoilCallback(
+    ({ snapshot }) =>
+      (specificComponentId: string) => {
+        const scopeId = getScopeIdFromComponentId(specificComponentId);
+        const isDropdownOpen = snapshot
+          .getLoadable(isDropdownOpenComponentState({ scopeId }))
+          .getValue();
+
+        if (isDropdownOpen) {
+          closeDropdown(specificComponentId);
+        } else {
+          openDropdown(specificComponentId);
+        }
+      },
+    [closeDropdown, openDropdown],
+  );
+
+  return {
+    closeDropdown,
+    openDropdown,
+    toggleDropdown,
+  };
+};
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useInternalHotkeyScopeManagement.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useInternalHotkeyScopeManagement.ts
index 74f29b508d17..9ea9db797362 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useInternalHotkeyScopeManagement.ts
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useInternalHotkeyScopeManagement.ts
@@ -15,7 +15,7 @@ export const useInternalHotkeyScopeManagement = ({
   const { dropdownHotkeyScopeState } = useDropdownStates({ dropdownScopeId });
 
   const [dropdownHotkeyScope, setDropdownHotkeyScope] = useRecoilState(
-    dropdownHotkeyScopeState(),
+    dropdownHotkeyScopeState,
   );
 
   useEffect(() => {
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/scopes/scope-internal-context/DropdownScopeInternalContext.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/scopes/scope-internal-context/DropdownScopeInternalContext.ts
index 5b6ae045b9c4..0d117b23f227 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/scopes/scope-internal-context/DropdownScopeInternalContext.ts
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/scopes/scope-internal-context/DropdownScopeInternalContext.ts
@@ -1,7 +1,7 @@
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
 import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
-type DropdownScopeInternalContextProps = StateScopeMapKey;
+type DropdownScopeInternalContextProps = ComponentStateKey;
 
 export const DropdownScopeInternalContext =
   createScopeInternalContext<DropdownScopeInternalContextProps>();
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/states/dropdownHotkeyComponentState.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/states/dropdownHotkeyComponentState.ts
new file mode 100644
index 000000000000..72947255547d
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/states/dropdownHotkeyComponentState.ts
@@ -0,0 +1,9 @@
+import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const dropdownHotkeyComponentState = createComponentState<
+  HotkeyScope | null | undefined
+>({
+  key: 'dropdownHotkeyComponentState',
+  defaultValue: null,
+});
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/states/dropdownHotkeyStateScopeMap.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/states/dropdownHotkeyStateScopeMap.ts
deleted file mode 100644
index 60951e8f5a1d..000000000000
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/states/dropdownHotkeyStateScopeMap.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const dropdownHotkeyStateScopeMap = createStateScopeMap<
-  HotkeyScope | null | undefined
->({
-  key: 'dropdownHotkeyStateScopeMap',
-  defaultValue: null,
-});
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/states/dropdownWidthComponentState.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/states/dropdownWidthComponentState.ts
new file mode 100644
index 000000000000..a9879b5f0150
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/states/dropdownWidthComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const dropdownWidthComponentState = createComponentState<
+  number | undefined
+>({
+  key: 'dropdownWidthComponentState',
+  defaultValue: 160,
+});
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/states/dropdownWidthStateScopeMap.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/states/dropdownWidthStateScopeMap.ts
deleted file mode 100644
index 9a39a52fd15f..000000000000
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/states/dropdownWidthStateScopeMap.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const dropdownWidthStateScopeMap = createStateScopeMap<
-  number | undefined
->({
-  key: 'dropdownWidthStateScopeMap',
-  defaultValue: 160,
-});
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/states/isDropdownOpenComponentState.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/states/isDropdownOpenComponentState.ts
new file mode 100644
index 000000000000..22aa5bc66992
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/states/isDropdownOpenComponentState.ts
@@ -0,0 +1,6 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const isDropdownOpenComponentState = createComponentState<boolean>({
+  key: 'isDropdownOpenComponentState',
+  defaultValue: false,
+});
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/states/isDropdownOpenStateScopeMap.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/states/isDropdownOpenStateScopeMap.ts
deleted file mode 100644
index 124ae55be51e..000000000000
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/states/isDropdownOpenStateScopeMap.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const isDropdownOpenStateScopeMap = createStateScopeMap<boolean>({
-  key: 'isDropdownOpenStateScopeMap',
-  defaultValue: false,
-});
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx
index e71955d62bad..53eef42d40e7 100644
--- a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx
@@ -1,13 +1,13 @@
 import { ReactNode, useState } from 'react';
 import styled from '@emotion/styled';
 import { AnimatePresence, LayoutGroup } from 'framer-motion';
-import debounce from 'lodash.debounce';
+import { useDebouncedCallback } from 'use-debounce';
 
 import {
   H1Title,
   H1TitleFontColor,
 } from '@/ui/display/typography/components/H1Title';
-import { Button } from '@/ui/input/button/components/Button';
+import { Button, ButtonAccent } from '@/ui/input/button/components/Button';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { Modal } from '@/ui/layout/modal/components/Modal';
 import {
@@ -25,6 +25,7 @@ export type ConfirmationModalProps = {
   deleteButtonText?: string;
   confirmationPlaceholder?: string;
   confirmationValue?: string;
+  confirmButtonAccent?: ButtonAccent;
 };
 
 const StyledConfirmationModal = styled(Modal)`
@@ -66,6 +67,7 @@ export const ConfirmationModal = ({
   deleteButtonText = 'Delete',
   confirmationValue,
   confirmationPlaceholder,
+  confirmButtonAccent = 'danger',
 }: ConfirmationModalProps) => {
   const [inputConfirmationValue, setInputConfirmationValue] =
     useState<string>('');
@@ -76,7 +78,7 @@ export const ConfirmationModal = ({
     isValueMatchingInput(confirmationValue, value);
   };
 
-  const isValueMatchingInput = debounce(
+  const isValueMatchingInput = useDebouncedCallback(
     (value?: string, inputValue?: string) => {
       setIsValidValue(Boolean(value && inputValue && value === inputValue));
     },
@@ -127,7 +129,7 @@ export const ConfirmationModal = ({
               setIsOpen(false);
             }}
             variant="secondary"
-            accent="danger"
+            accent={confirmButtonAccent}
             title={deleteButtonText}
             disabled={!isValidValue}
             fullWidth
diff --git a/packages/twenty-front/src/modules/ui/layout/page/BlankLayout.tsx b/packages/twenty-front/src/modules/ui/layout/page/BlankLayout.tsx
new file mode 100644
index 000000000000..7836cd39d70f
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/page/BlankLayout.tsx
@@ -0,0 +1,31 @@
+import { Outlet } from 'react-router-dom';
+import { css, Global, useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+
+const StyledLayout = styled.div`
+  background: ${({ theme }) => theme.background.noisy};
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  position: relative;
+  scrollbar-width: 4px;
+  width: 100%;
+`;
+
+export const BlankLayout = () => {
+  const theme = useTheme();
+  return (
+    <>
+      <Global
+        styles={css`
+          body {
+            background: ${theme.background.tertiary};
+          }
+        `}
+      />
+      <StyledLayout>
+        <Outlet />
+      </StyledLayout>
+    </>
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/layout/page/DefaultLayout.tsx b/packages/twenty-front/src/modules/ui/layout/page/DefaultLayout.tsx
index 3c872dd1715e..8cbe647b5ed4 100644
--- a/packages/twenty-front/src/modules/ui/layout/page/DefaultLayout.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/page/DefaultLayout.tsx
@@ -1,8 +1,8 @@
-import { ReactNode, useMemo } from 'react';
+import { useMemo } from 'react';
+import { Outlet } from 'react-router-dom';
 import { css, Global, useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-import { motion } from 'framer-motion';
-import { AnimatePresence, LayoutGroup } from 'framer-motion';
+import { AnimatePresence, LayoutGroup, motion } from 'framer-motion';
 
 import { AuthModal } from '@/auth/components/Modal';
 import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus';
@@ -63,11 +63,7 @@ const StyledMainContainer = styled.div`
   overflow: hidden;
 `;
 
-type DefaultLayoutProps = {
-  children: ReactNode;
-};
-
-export const DefaultLayout = ({ children }: DefaultLayoutProps) => {
+export const DefaultLayout = () => {
   const onboardingStatus = useOnboardingStatus();
   const isMobile = useIsMobile();
   const isSettingsPage = useIsSettingsPage();
@@ -76,8 +72,17 @@ export const DefaultLayout = ({ children }: DefaultLayoutProps) => {
   const isMatchingLocation = useIsMatchingLocation();
   const showAuthModal = useMemo(() => {
     return (
-      (onboardingStatus && onboardingStatus !== OnboardingStatus.Completed) ||
-      isMatchingLocation(AppPath.ResetPassword)
+      (onboardingStatus &&
+        [
+          OnboardingStatus.Incomplete,
+          OnboardingStatus.OngoingUserCreation,
+          OnboardingStatus.OngoingProfileCreation,
+          OnboardingStatus.OngoingWorkspaceActivation,
+        ].includes(onboardingStatus)) ||
+      isMatchingLocation(AppPath.ResetPassword) ||
+      (isMatchingLocation(AppPath.PlanRequired) &&
+        (OnboardingStatus.CompletedWithoutSubscription ||
+          OnboardingStatus.Canceled))
     );
   }, [isMatchingLocation, onboardingStatus]);
 
@@ -116,12 +121,16 @@ export const DefaultLayout = ({ children }: DefaultLayoutProps) => {
                 <SignInBackgroundMockPage />
                 <AnimatePresence mode="wait">
                   <LayoutGroup>
-                    <AuthModal>{children}</AuthModal>
+                    <AuthModal>
+                      <Outlet />
+                    </AuthModal>
                   </LayoutGroup>
                 </AnimatePresence>
               </>
             ) : (
-              <AppErrorBoundary>{children}</AppErrorBoundary>
+              <AppErrorBoundary>
+                <Outlet />
+              </AppErrorBoundary>
             )}
           </StyledMainContainer>
         </StyledPageContainer>
diff --git a/packages/twenty-front/src/modules/ui/layout/page/PageAddButton.tsx b/packages/twenty-front/src/modules/ui/layout/page/PageAddButton.tsx
index 1faf82336ae1..d6a977a18c13 100644
--- a/packages/twenty-front/src/modules/ui/layout/page/PageAddButton.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/page/PageAddButton.tsx
@@ -1,4 +1,5 @@
-import { IconPlus } from '@/ui/display/icon';
+import { IconPlus } from 'twenty-ui';
+
 import { IconButton } from '@/ui/input/button/components/IconButton';
 
 type PageAddButtonProps = {
diff --git a/packages/twenty-front/src/modules/ui/layout/page/PageFavoriteButton.tsx b/packages/twenty-front/src/modules/ui/layout/page/PageFavoriteButton.tsx
index ec719e23c02e..b66a73807d64 100644
--- a/packages/twenty-front/src/modules/ui/layout/page/PageFavoriteButton.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/page/PageFavoriteButton.tsx
@@ -1,4 +1,5 @@
-import { IconHeart } from '@/ui/display/icon';
+import { IconHeart } from 'twenty-ui';
+
 import { IconButton } from '@/ui/input/button/components/IconButton';
 
 type PageFavoriteButtonProps = {
diff --git a/packages/twenty-front/src/modules/ui/layout/page/PageHeader.tsx b/packages/twenty-front/src/modules/ui/layout/page/PageHeader.tsx
index fc67db03dcfa..c258a5d55ae1 100644
--- a/packages/twenty-front/src/modules/ui/layout/page/PageHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/page/PageHeader.tsx
@@ -4,8 +4,8 @@ import { useNavigate } from 'react-router-dom';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
+import { IconChevronLeft } from 'twenty-ui';
 
-import { IconChevronLeft } from '@/ui/display/icon/index';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 import { OverflowingTextWithTooltip } from '@/ui/display/tooltip/OverflowingTextWithTooltip';
 import { IconButton } from '@/ui/input/button/components/IconButton';
diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawer.tsx b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawer.tsx
index 1543b1f67b2e..b5de9a806336 100644
--- a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawer.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawer.tsx
@@ -2,15 +2,16 @@ import { useRef } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { motion } from 'framer-motion';
-import { useRecoilState } from 'recoil';
+import { useRecoilCallback, useRecoilState, useRecoilValue } from 'recoil';
 import { Key } from 'ts-key-enum';
 
 import { RIGHT_DRAWER_CLICK_OUTSIDE_LISTENER_ID } from '@/ui/layout/right-drawer/constants/RightDrawerClickOutsideListener';
+import { rightDrawerCloseEventState } from '@/ui/layout/right-drawer/states/rightDrawerCloseEventsState';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { useClickOutsideListener } from '@/ui/utilities/pointer-event/hooks/useClickOutsideListener';
 import { ClickOutsideMode } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 import { useRightDrawer } from '../hooks/useRightDrawer';
 import { isRightDrawerExpandedState } from '../states/isRightDrawerExpandedState';
@@ -44,9 +45,9 @@ export const RightDrawer = () => {
     isRightDrawerOpenState,
   );
 
-  const [isRightDrawerExpanded] = useRecoilState(isRightDrawerExpandedState);
+  const isRightDrawerExpanded = useRecoilValue(isRightDrawerExpandedState);
 
-  const [rightDrawerPage] = useRecoilState(rightDrawerPageState);
+  const rightDrawerPage = useRecoilValue(rightDrawerPageState);
 
   const { closeRightDrawer } = useRightDrawer();
 
@@ -58,9 +59,20 @@ export const RightDrawer = () => {
 
   useListenClickOutside({
     refs: [rightDrawerRef],
-    callback: () => {
-      closeRightDrawer();
-    },
+    callback: useRecoilCallback(
+      ({ snapshot, set }) =>
+        (event) => {
+          const isRightDrawerOpen = snapshot
+            .getLoadable(isRightDrawerOpenState)
+            .getValue();
+
+          if (isRightDrawerOpen) {
+            set(rightDrawerCloseEventState, event);
+            closeRightDrawer();
+          }
+        },
+      [closeRightDrawer],
+    ),
     mode: ClickOutsideMode.comparePixels,
   });
 
@@ -84,19 +96,20 @@ export const RightDrawer = () => {
       : theme.rightDrawerWidth
     : '0';
 
-  if (!isNonNullable(rightDrawerPage)) {
+  if (!isDefined(rightDrawerPage)) {
     return <></>;
   }
 
   const variants = {
     fullScreen: {
-      width: '100%',
+      x: '0%',
     },
     normal: {
+      x: '0%',
       width: rightDrawerWidth,
     },
     closed: {
-      width: 0,
+      x: '100%',
     },
   };
 
diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerRouter.tsx b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerRouter.tsx
index d35dc5781cc7..77daadb0eb4c 100644
--- a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerRouter.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerRouter.tsx
@@ -1,8 +1,8 @@
 import styled from '@emotion/styled';
 import { useRecoilState } from 'recoil';
 
+import { RightDrawerCalendarEvent } from '@/activities/calendar/right-drawer/components/RightDrawerCalendarEvent';
 import { RightDrawerEmailThread } from '@/activities/emails/right-drawer/components/RightDrawerEmailThread';
-import { RightDrawerEmailThreadTopBar } from '@/activities/emails/right-drawer/components/RightDrawerEmailThreadTopBar';
 import { RightDrawerCreateActivity } from '@/activities/right-drawer/components/create/RightDrawerCreateActivity';
 import { RightDrawerEditActivity } from '@/activities/right-drawer/components/edit/RightDrawerEditActivity';
 
@@ -23,32 +23,35 @@ const StyledRightDrawerBody = styled.div`
   height: calc(
     100vh - ${({ theme }) => theme.spacing(14)} - 1px
   ); // (-1 for border)
-  overflow: auto;
+  //overflow: auto;
   position: relative;
 `;
 
+const RIGHT_DRAWER_PAGES_CONFIG = {
+  [RightDrawerPages.CreateActivity]: {
+    page: <RightDrawerCreateActivity />,
+    topBar: <RightDrawerActivityTopBar />,
+  },
+  [RightDrawerPages.EditActivity]: {
+    page: <RightDrawerEditActivity />,
+    topBar: <RightDrawerActivityTopBar />,
+  },
+  [RightDrawerPages.ViewEmailThread]: {
+    page: <RightDrawerEmailThread />,
+    topBar: <RightDrawerActivityTopBar showActionBar={false} />,
+  },
+  [RightDrawerPages.ViewCalendarEvent]: {
+    page: <RightDrawerCalendarEvent />,
+    topBar: <RightDrawerActivityTopBar showActionBar={false} />,
+  },
+};
+
 export const RightDrawerRouter = () => {
   const [rightDrawerPage] = useRecoilState(rightDrawerPageState);
 
-  let page = <></>;
-  let topBar = <></>;
-
-  switch (rightDrawerPage) {
-    case RightDrawerPages.CreateActivity:
-      page = <RightDrawerCreateActivity />;
-      topBar = <RightDrawerActivityTopBar />;
-      break;
-    case RightDrawerPages.EditActivity:
-      page = <RightDrawerEditActivity />;
-      topBar = <RightDrawerActivityTopBar />;
-      break;
-    case RightDrawerPages.ViewEmailThread:
-      page = <RightDrawerEmailThread />;
-      topBar = <RightDrawerEmailThreadTopBar />;
-      break;
-    default:
-      break;
-  }
+  const { topBar = null, page = null } = rightDrawerPage
+    ? RIGHT_DRAWER_PAGES_CONFIG[rightDrawerPage]
+    : {};
 
   return (
     <StyledRightDrawerPage>
diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBarCloseButton.tsx b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBarCloseButton.tsx
index f7acb0a8d853..b7e0f0102ee2 100644
--- a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBarCloseButton.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBarCloseButton.tsx
@@ -1,4 +1,5 @@
-import { IconChevronsRight } from '@/ui/display/icon/index';
+import { IconChevronsRight } from 'twenty-ui';
+
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 
 import { useRightDrawer } from '../hooks/useRightDrawer';
diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBarExpandButton.tsx b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBarExpandButton.tsx
index 701c69edfabf..2af3063ca412 100644
--- a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBarExpandButton.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBarExpandButton.tsx
@@ -1,9 +1,9 @@
 import { useRecoilState } from 'recoil';
-
 import {
   IconLayoutSidebarRightCollapse,
   IconLayoutSidebarRightExpand,
-} from '@/ui/display/icon';
+} from 'twenty-ui';
+
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 
 import { isRightDrawerExpandedState } from '../states/isRightDrawerExpandedState';
diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/hooks/useRightDrawer.ts b/packages/twenty-front/src/modules/ui/layout/right-drawer/hooks/useRightDrawer.ts
index 08cb391cc8b9..5cf5cc621456 100644
--- a/packages/twenty-front/src/modules/ui/layout/right-drawer/hooks/useRightDrawer.ts
+++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/hooks/useRightDrawer.ts
@@ -1,4 +1,6 @@
-import { useRecoilState } from 'recoil';
+import { useRecoilCallback, useRecoilState } from 'recoil';
+
+import { rightDrawerCloseEventState } from '@/ui/layout/right-drawer/states/rightDrawerCloseEventsState';
 
 import { isRightDrawerExpandedState } from '../states/isRightDrawerExpandedState';
 import { isRightDrawerOpenState } from '../states/isRightDrawerOpenState';
@@ -6,31 +8,50 @@ import { rightDrawerPageState } from '../states/rightDrawerPageState';
 import { RightDrawerPages } from '../types/RightDrawerPages';
 
 export const useRightDrawer = () => {
-  const [isRightDrawerOpen, setIsRightDrawerOpen] = useRecoilState(
-    isRightDrawerOpenState,
+  const [isRightDrawerOpen] = useRecoilState(isRightDrawerOpenState);
+
+  const [rightDrawerPage] = useRecoilState(rightDrawerPageState);
+
+  const openRightDrawer = useRecoilCallback(
+    ({ set }) =>
+      (rightDrawerPage: RightDrawerPages) => {
+        set(rightDrawerPageState, rightDrawerPage);
+        set(isRightDrawerExpandedState, false);
+        set(isRightDrawerOpenState, true);
+      },
+    [],
   );
-  const [, setIsRightDrawerExpanded] = useRecoilState(
-    isRightDrawerExpandedState,
+
+  const closeRightDrawer = useRecoilCallback(
+    ({ set }) =>
+      () => {
+        set(isRightDrawerExpandedState, false);
+        set(isRightDrawerOpenState, false);
+      },
+    [],
   );
 
-  const [rightDrawerPage, setRightDrawerPage] =
-    useRecoilState(rightDrawerPageState);
+  const isSameEventThanRightDrawerClose = useRecoilCallback(
+    ({ snapshot }) =>
+      (event: MouseEvent | TouchEvent) => {
+        const rightDrawerCloseEvent = snapshot
+          .getLoadable(rightDrawerCloseEventState)
+          .getValue();
 
-  const openRightDrawer = (rightDrawerPage: RightDrawerPages) => {
-    setRightDrawerPage(rightDrawerPage);
-    setIsRightDrawerExpanded(false);
-    setIsRightDrawerOpen(true);
-  };
+        const isSameEvent =
+          rightDrawerCloseEvent?.target === event.target &&
+          rightDrawerCloseEvent?.timeStamp === event.timeStamp;
 
-  const closeRightDrawer = () => {
-    setIsRightDrawerExpanded(false);
-    setIsRightDrawerOpen(false);
-  };
+        return isSameEvent;
+      },
+    [],
+  );
 
   return {
     rightDrawerPage,
     isRightDrawerOpen,
     openRightDrawer,
     closeRightDrawer,
+    isSameEventThanRightDrawerClose,
   };
 };
diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/states/isRightDrawerExpandedState.ts b/packages/twenty-front/src/modules/ui/layout/right-drawer/states/isRightDrawerExpandedState.ts
index 09a450fc1c4b..002c9e8cd4df 100644
--- a/packages/twenty-front/src/modules/ui/layout/right-drawer/states/isRightDrawerExpandedState.ts
+++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/states/isRightDrawerExpandedState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const isRightDrawerExpandedState = atom<boolean>({
+export const isRightDrawerExpandedState = createState<boolean>({
   key: 'isRightDrawerExpandedState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/states/isRightDrawerOpenState.ts b/packages/twenty-front/src/modules/ui/layout/right-drawer/states/isRightDrawerOpenState.ts
index fcfd62975214..b0149a5881a6 100644
--- a/packages/twenty-front/src/modules/ui/layout/right-drawer/states/isRightDrawerOpenState.ts
+++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/states/isRightDrawerOpenState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const isRightDrawerOpenState = atom<boolean>({
+export const isRightDrawerOpenState = createState<boolean>({
   key: 'ui/layout/is-right-drawer-open',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/states/rightDrawerCloseEventsState.ts b/packages/twenty-front/src/modules/ui/layout/right-drawer/states/rightDrawerCloseEventsState.ts
new file mode 100644
index 000000000000..ac0813d8ea93
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/states/rightDrawerCloseEventsState.ts
@@ -0,0 +1,6 @@
+import { createState } from 'twenty-ui';
+
+export const rightDrawerCloseEventState = createState<Event | null>({
+  key: 'rightDrawerCloseEventState',
+  defaultValue: null,
+});
diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/states/rightDrawerPageState.ts b/packages/twenty-front/src/modules/ui/layout/right-drawer/states/rightDrawerPageState.ts
index 8d0de858e279..0cbcdee85f46 100644
--- a/packages/twenty-front/src/modules/ui/layout/right-drawer/states/rightDrawerPageState.ts
+++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/states/rightDrawerPageState.ts
@@ -1,8 +1,8 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { RightDrawerPages } from '../types/RightDrawerPages';
 
-export const rightDrawerPageState = atom<RightDrawerPages | null>({
+export const rightDrawerPageState = createState<RightDrawerPages | null>({
   key: 'ui/layout/right-drawer-page',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/types/RightDrawerPages.ts b/packages/twenty-front/src/modules/ui/layout/right-drawer/types/RightDrawerPages.ts
index e0028a7c5e08..df0cd28ca53c 100644
--- a/packages/twenty-front/src/modules/ui/layout/right-drawer/types/RightDrawerPages.ts
+++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/types/RightDrawerPages.ts
@@ -2,4 +2,5 @@ export enum RightDrawerPages {
   CreateActivity = 'create-activity',
   EditActivity = 'edit-activity',
   ViewEmailThread = 'view-email-thread',
+  ViewCalendarEvent = 'view-calendar-event',
 }
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/components/SelectableList.tsx b/packages/twenty-front/src/modules/ui/layout/selectable-list/components/SelectableList.tsx
index c0830dac5d13..96badbceef29 100644
--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/components/SelectableList.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/components/SelectableList.tsx
@@ -4,6 +4,7 @@ import { useSelectableListHotKeys } from '@/ui/layout/selectable-list/hooks/inte
 import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
 import { SelectableListScope } from '@/ui/layout/selectable-list/scopes/SelectableListScope';
 import { arrayToChunks } from '~/utils/array/arrayToChunks';
+import { isDefined } from '~/utils/isDefined';
 
 type SelectableListProps = {
   children: ReactNode;
@@ -39,11 +40,11 @@ export const SelectableList = ({
       );
     }
 
-    if (selectableItemIdMatrix) {
+    if (isDefined(selectableItemIdMatrix)) {
       setSelectableItemIds(selectableItemIdMatrix);
     }
 
-    if (selectableItemIdArray) {
+    if (isDefined(selectableItemIdArray)) {
       setSelectableItemIds(arrayToChunks(selectableItemIdArray, 1));
     }
   }, [selectableItemIdArray, selectableItemIdMatrix, setSelectableItemIds]);
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/__tests__/useSelectableList.test.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/__tests__/useSelectableList.test.ts
index a7bbe398dd50..930ea10ad521 100644
--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/__tests__/useSelectableList.test.ts
+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/__tests__/useSelectableList.test.ts
@@ -21,7 +21,7 @@ describe('useSelectableList', () => {
           selectableListScopeId,
         });
 
-        const selectableItemIds = useRecoilValue(selectableItemIdsState());
+        const selectableItemIds = useRecoilValue(selectableItemIdsState);
 
         return {
           setSelectableItemIds,
@@ -51,9 +51,8 @@ describe('useSelectableList', () => {
           selectableListScopeId,
         });
 
-        const [selectedItemId, setSelectedItemId] = useRecoilState(
-          selectedItemIdState(),
-        );
+        const [selectedItemId, setSelectedItemId] =
+          useRecoilState(selectedItemIdState);
 
         return {
           resetSelectedItem,
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/internal/useSelectableListHotKeys.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/internal/useSelectableListHotKeys.ts
new file mode 100644
index 000000000000..12c100ed64c7
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/internal/useSelectableListHotKeys.ts
@@ -0,0 +1,154 @@
+import { isNonEmptyString } from '@sniptt/guards';
+import { useRecoilCallback } from 'recoil';
+import { Key } from 'ts-key-enum';
+
+import { useSelectableListStates } from '@/ui/layout/selectable-list/hooks/internal/useSelectableListStates';
+import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
+import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
+
+type Direction = 'up' | 'down' | 'left' | 'right';
+
+export const useSelectableListHotKeys = (
+  scopeId: string,
+  hotkeyScope: string,
+) => {
+  const findPosition = (
+    selectableItemIds: string[][],
+    selectedItemId?: string | null,
+  ) => {
+    if (!selectedItemId) {
+      return;
+    }
+
+    for (let row = 0; row < selectableItemIds.length; row++) {
+      const col = selectableItemIds[row].indexOf(selectedItemId);
+      if (col !== -1) {
+        return { row, col };
+      }
+    }
+  };
+
+  const {
+    selectedItemIdState,
+    selectableItemIdsState,
+    isSelectedItemIdSelector,
+    selectableListOnEnterState,
+  } = useSelectableListStates({
+    selectableListScopeId: scopeId,
+  });
+
+  const handleSelect = useRecoilCallback(
+    ({ snapshot, set }) =>
+      (direction: Direction) => {
+        const selectedItemId = getSnapshotValue(snapshot, selectedItemIdState);
+        const selectableItemIds = getSnapshotValue(
+          snapshot,
+          selectableItemIdsState,
+        );
+
+        const currentPosition = findPosition(selectableItemIds, selectedItemId);
+
+        const computeNextId = (direction: Direction) => {
+          if (!selectedItemId || !currentPosition) {
+            return selectableItemIds[0][0];
+          }
+
+          const { row: currentRow, col: currentCol } = currentPosition;
+
+          if (selectableItemIds.length === 0) {
+            return;
+          }
+
+          const isSingleRow = selectableItemIds.length === 1;
+
+          let nextRow: number;
+          let nextCol: number;
+
+          switch (direction) {
+            case 'up':
+              nextRow = isSingleRow ? currentRow : Math.max(0, currentRow - 1);
+              nextCol = isSingleRow ? Math.max(0, currentCol - 1) : currentCol;
+              break;
+            case 'down':
+              nextRow = isSingleRow
+                ? currentRow
+                : Math.min(selectableItemIds.length - 1, currentRow + 1);
+              nextCol = isSingleRow
+                ? Math.min(
+                    selectableItemIds[currentRow].length - 1,
+                    currentCol + 1,
+                  )
+                : currentCol;
+              break;
+            case 'left':
+              nextRow = currentRow;
+              nextCol = Math.max(0, currentCol - 1);
+              break;
+            case 'right':
+              nextRow = currentRow;
+              nextCol = Math.min(
+                selectableItemIds[currentRow].length - 1,
+                currentCol + 1,
+              );
+              break;
+            default:
+              nextRow = currentRow;
+              nextCol = currentCol;
+          }
+
+          return selectableItemIds[nextRow][nextCol];
+        };
+
+        const nextId = computeNextId(direction);
+
+        if (selectedItemId !== nextId) {
+          if (isNonEmptyString(nextId)) {
+            set(isSelectedItemIdSelector(nextId), true);
+            set(selectedItemIdState, nextId);
+          }
+
+          if (isNonEmptyString(selectedItemId)) {
+            set(isSelectedItemIdSelector(selectedItemId), false);
+          }
+        }
+      },
+    [isSelectedItemIdSelector, selectableItemIdsState, selectedItemIdState],
+  );
+
+  useScopedHotkeys(Key.ArrowUp, () => handleSelect('up'), hotkeyScope, []);
+
+  useScopedHotkeys(Key.ArrowDown, () => handleSelect('down'), hotkeyScope, []);
+
+  useScopedHotkeys(Key.ArrowLeft, () => handleSelect('left'), hotkeyScope, []);
+
+  useScopedHotkeys(
+    Key.ArrowRight,
+    () => handleSelect('right'),
+    hotkeyScope,
+    [],
+  );
+
+  useScopedHotkeys(
+    Key.Enter,
+    useRecoilCallback(
+      ({ snapshot }) =>
+        () => {
+          const selectedItemId = getSnapshotValue(
+            snapshot,
+            selectedItemIdState,
+          );
+          const onEnter = getSnapshotValue(
+            snapshot,
+            selectableListOnEnterState,
+          );
+
+          if (isNonEmptyString(selectedItemId)) {
+            onEnter?.(selectedItemId);
+          }
+        },
+      [selectableListOnEnterState, selectedItemIdState],
+    ),
+    hotkeyScope,
+    [],
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/internal/useSelectableListHotKeys.tsx b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/internal/useSelectableListHotKeys.tsx
deleted file mode 100644
index 1a15ef112e2b..000000000000
--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/internal/useSelectableListHotKeys.tsx
+++ /dev/null
@@ -1,158 +0,0 @@
-import { useRecoilCallback } from 'recoil';
-import { Key } from 'ts-key-enum';
-
-import { useSelectableListStates } from '@/ui/layout/selectable-list/hooks/internal/useSelectableListStates';
-import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
-import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
-
-type Direction = 'up' | 'down' | 'left' | 'right';
-
-export const useSelectableListHotKeys = (
-  scopeId: string,
-  hotkeyScope: string,
-) => {
-  const findPosition = (
-    selectableItemIds: string[][],
-    selectedItemId?: string | null,
-  ) => {
-    if (!selectedItemId) {
-      return;
-    }
-
-    for (let row = 0; row < selectableItemIds.length; row++) {
-      const col = selectableItemIds[row].indexOf(selectedItemId);
-      if (col !== -1) {
-        return { row, col };
-      }
-    }
-  };
-
-  const {
-    selectedItemIdState,
-    selectableItemIdsState,
-    isSelectedItemIdSelector,
-    selectableListOnEnterState,
-  } = useSelectableListStates({
-    selectableListScopeId: scopeId,
-  });
-
-  const handleSelect = useRecoilCallback(
-    ({ snapshot, set }) =>
-      (direction: Direction) => {
-        const selectedItemId = getSnapshotValue(
-          snapshot,
-          selectedItemIdState(),
-        );
-        const selectableItemIds = getSnapshotValue(
-          snapshot,
-          selectableItemIdsState(),
-        );
-
-        const currentPosition = findPosition(selectableItemIds, selectedItemId);
-
-        const computeNextId = (direction: Direction) => {
-          if (!selectedItemId || !currentPosition) {
-            return selectableItemIds[0][0];
-          }
-
-          const { row: currentRow, col: currentCol } = currentPosition;
-
-          if (selectableItemIds.length === 0) {
-            return;
-          }
-
-          const isSingleRow = selectableItemIds.length === 1;
-
-          let nextRow: number;
-          let nextCol: number;
-
-          switch (direction) {
-            case 'up':
-              nextRow = isSingleRow ? currentRow : Math.max(0, currentRow - 1);
-              nextCol = isSingleRow ? Math.max(0, currentCol - 1) : currentCol;
-              break;
-            case 'down':
-              nextRow = isSingleRow
-                ? currentRow
-                : Math.min(selectableItemIds.length - 1, currentRow + 1);
-              nextCol = isSingleRow
-                ? Math.min(
-                    selectableItemIds[currentRow].length - 1,
-                    currentCol + 1,
-                  )
-                : currentCol;
-              break;
-            case 'left':
-              nextRow = currentRow;
-              nextCol = Math.max(0, currentCol - 1);
-              break;
-            case 'right':
-              nextRow = currentRow;
-              nextCol = Math.min(
-                selectableItemIds[currentRow].length - 1,
-                currentCol + 1,
-              );
-              break;
-            default:
-              nextRow = currentRow;
-              nextCol = currentCol;
-          }
-
-          return selectableItemIds[nextRow][nextCol];
-        };
-
-        const nextId = computeNextId(direction);
-
-        if (selectedItemId !== nextId) {
-          if (nextId) {
-            set(isSelectedItemIdSelector(nextId), true);
-            set(selectedItemIdState(), nextId);
-          }
-
-          if (selectedItemId) {
-            set(isSelectedItemIdSelector(selectedItemId), false);
-          }
-        }
-      },
-    [isSelectedItemIdSelector, selectableItemIdsState, selectedItemIdState],
-  );
-
-  useScopedHotkeys(Key.ArrowUp, () => handleSelect('up'), hotkeyScope, []);
-
-  useScopedHotkeys(Key.ArrowDown, () => handleSelect('down'), hotkeyScope, []);
-
-  useScopedHotkeys(Key.ArrowLeft, () => handleSelect('left'), hotkeyScope, []);
-
-  useScopedHotkeys(
-    Key.ArrowRight,
-    () => handleSelect('right'),
-    hotkeyScope,
-    [],
-  );
-
-  useScopedHotkeys(
-    Key.Enter,
-    useRecoilCallback(
-      ({ snapshot }) =>
-        () => {
-          const selectedItemId = getSnapshotValue(
-            snapshot,
-            selectedItemIdState(),
-          );
-          const onEnter = getSnapshotValue(
-            snapshot,
-            selectableListOnEnterState(),
-          );
-
-          if (selectedItemId) {
-            onEnter?.(selectedItemId);
-          }
-        },
-      [selectableListOnEnterState, selectedItemIdState],
-    ),
-    hotkeyScope,
-    [],
-  );
-
-  return <></>;
-};
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/internal/useSelectableListStates.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/internal/useSelectableListStates.ts
index 97179525c1ac..004132921bdd 100644
--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/internal/useSelectableListStates.ts
+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/internal/useSelectableListStates.ts
@@ -1,11 +1,11 @@
 import { SelectableListScopeInternalContext } from '@/ui/layout/selectable-list/scopes/scope-internal-context/SelectableListScopeInternalContext';
-import { selectableItemIdsStateScopeMap } from '@/ui/layout/selectable-list/states/selectableItemIdsStateScopeMap';
-import { selectableListOnEnterStateScopeMap } from '@/ui/layout/selectable-list/states/selectableListOnEnterStateScopeMap';
-import { selectedItemIdStateScopeMap } from '@/ui/layout/selectable-list/states/selectedItemIdStateScopeMap';
-import { isSelectedItemIdFamilySelectorScopeMap } from '@/ui/layout/selectable-list/states/selectors/isSelectedItemIdFamilySelectorScopeMap';
+import { selectableItemIdsComponentState } from '@/ui/layout/selectable-list/states/selectableItemIdsComponentState';
+import { selectableListOnEnterComponentState } from '@/ui/layout/selectable-list/states/selectableListOnEnterComponentState';
+import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
+import { isSelectedItemIdFamilySelector } from '@/ui/layout/selectable-list/states/selectors/isSelectedItemIdFamilySelector';
 import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
-import { getFamilyState } from '@/ui/utilities/recoil-scope/utils/getFamilyState';
-import { getState } from '@/ui/utilities/recoil-scope/utils/getState';
+import { extractComponentFamilyState } from '@/ui/utilities/state/component-state/utils/extractComponentFamilyState';
+import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
 
 type useSelectableListStatesProps = {
   selectableListScopeId?: string;
@@ -21,15 +21,21 @@ export const useSelectableListStates = ({
 
   return {
     scopeId,
-    isSelectedItemIdSelector: getFamilyState(
-      isSelectedItemIdFamilySelectorScopeMap,
+    isSelectedItemIdSelector: extractComponentFamilyState(
+      isSelectedItemIdFamilySelector,
       scopeId,
     ),
-    selectableItemIdsState: getState(selectableItemIdsStateScopeMap, scopeId),
-    selectableListOnEnterState: getState(
-      selectableListOnEnterStateScopeMap,
+    selectableItemIdsState: extractComponentState(
+      selectableItemIdsComponentState,
+      scopeId,
+    ),
+    selectableListOnEnterState: extractComponentState(
+      selectableListOnEnterComponentState,
+      scopeId,
+    ),
+    selectedItemIdState: extractComponentState(
+      selectedItemIdComponentState,
       scopeId,
     ),
-    selectedItemIdState: getState(selectedItemIdStateScopeMap, scopeId),
   };
 };
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/useSelectableList.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/useSelectableList.ts
index 7d33e15ac18e..37098d3c90c3 100644
--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/useSelectableList.ts
+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/useSelectableList.ts
@@ -13,12 +13,12 @@ export const useSelectableList = (selectableListId?: string) => {
     selectableListScopeId: selectableListId,
   });
 
-  const setSelectableItemIds = useSetRecoilState(selectableItemIdsState());
+  const setSelectableItemIds = useSetRecoilState(selectableItemIdsState);
   const setSelectableListOnEnter = useSetRecoilState(
-    selectableListOnEnterState(),
+    selectableListOnEnterState,
   );
 
-  const resetSelectedItemIdState = useResetRecoilState(selectedItemIdState());
+  const resetSelectedItemIdState = useResetRecoilState(selectedItemIdState);
 
   const resetSelectedItem = () => {
     resetSelectedItemIdState();
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/scopes/scope-internal-context/SelectableListScopeInternalContext.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/scopes/scope-internal-context/SelectableListScopeInternalContext.ts
index 7857bfdd37bd..c347ce3f0548 100644
--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/scopes/scope-internal-context/SelectableListScopeInternalContext.ts
+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/scopes/scope-internal-context/SelectableListScopeInternalContext.ts
@@ -1,7 +1,7 @@
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
 import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
-type SelectableListScopeInternalContextProps = StateScopeMapKey;
+type SelectableListScopeInternalContextProps = ComponentStateKey;
 
 export const SelectableListScopeInternalContext =
   createScopeInternalContext<SelectableListScopeInternalContextProps>();
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState.ts
new file mode 100644
index 000000000000..8dcbeb829f6f
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState.ts
@@ -0,0 +1,9 @@
+import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState';
+
+export const isSelectedItemIdComponentFamilyState = createComponentFamilyState<
+  boolean,
+  string
+>({
+  key: 'isSelectedItemIdComponentFamilyState',
+  defaultValue: false,
+});
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/states/isSelectedItemIdFamilyStateScopeMap.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/states/isSelectedItemIdFamilyStateScopeMap.ts
deleted file mode 100644
index 84bc20fd41c5..000000000000
--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/states/isSelectedItemIdFamilyStateScopeMap.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-export const isSelectedItemIdFamilyStateScopeMap = createFamilyStateScopeMap<
-  boolean,
-  string
->({
-  key: 'isSelectedItemIdMapScopedFamilyState',
-  defaultValue: false,
-});
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectableItemIdsComponentState.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectableItemIdsComponentState.ts
new file mode 100644
index 000000000000..05a239e567dd
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectableItemIdsComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const selectableItemIdsComponentState = createComponentState<string[][]>(
+  {
+    key: 'selectableItemIdsComponentState',
+    defaultValue: [[]],
+  },
+);
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectableItemIdsStateScopeMap.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectableItemIdsStateScopeMap.ts
deleted file mode 100644
index 19c3e68eb602..000000000000
--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectableItemIdsStateScopeMap.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const selectableItemIdsStateScopeMap = createStateScopeMap<string[][]>({
-  key: 'selectableItemIdsScopedState',
-  defaultValue: [[]],
-});
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectableListOnEnterComponentState.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectableListOnEnterComponentState.ts
new file mode 100644
index 000000000000..f0cbc21eac03
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectableListOnEnterComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const selectableListOnEnterComponentState = createComponentState<
+  ((itemId: string) => void) | undefined
+>({
+  key: 'selectableListOnEnterComponentState',
+  defaultValue: undefined,
+});
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectableListOnEnterStateScopeMap.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectableListOnEnterStateScopeMap.ts
deleted file mode 100644
index 055b1d117f45..000000000000
--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectableListOnEnterStateScopeMap.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const selectableListOnEnterStateScopeMap = createStateScopeMap<
-  ((itemId: string) => void) | undefined
->({
-  key: 'selectableListOnEnterScopedState',
-  defaultValue: undefined,
-});
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectedItemIdComponentState.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectedItemIdComponentState.ts
new file mode 100644
index 000000000000..8587373a1025
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectedItemIdComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const selectedItemIdComponentState = createComponentState<string | null>(
+  {
+    key: 'selectedItemIdComponentState',
+    defaultValue: null,
+  },
+);
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectedItemIdStateScopeMap.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectedItemIdStateScopeMap.ts
deleted file mode 100644
index 8445a2c2ec11..000000000000
--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectedItemIdStateScopeMap.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const selectedItemIdStateScopeMap = createStateScopeMap<string | null>({
-  key: 'selectedItemIdScopedState',
-  defaultValue: null,
-});
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectors/isSelectedItemIdFamilySelector.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectors/isSelectedItemIdFamilySelector.ts
new file mode 100644
index 000000000000..a93df20ce5af
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectors/isSelectedItemIdFamilySelector.ts
@@ -0,0 +1,28 @@
+import { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';
+import { createComponentFamilySelector } from '@/ui/utilities/state/component-state/utils/createComponentFamilySelector';
+
+export const isSelectedItemIdFamilySelector = createComponentFamilySelector<
+  boolean,
+  string
+>({
+  key: 'isSelectedItemIdFamilySelector',
+  get:
+    ({ scopeId, familyKey }: { scopeId: string; familyKey: string }) =>
+    ({ get }) =>
+      get(
+        isSelectedItemIdComponentFamilyState({
+          scopeId: scopeId,
+          familyKey: familyKey,
+        }),
+      ),
+  set:
+    ({ scopeId, familyKey }: { scopeId: string; familyKey: string }) =>
+    ({ set }, newValue) =>
+      set(
+        isSelectedItemIdComponentFamilyState({
+          scopeId: scopeId,
+          familyKey: familyKey,
+        }),
+        newValue,
+      ),
+});
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectors/isSelectedItemIdFamilySelectorScopeMap.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectors/isSelectedItemIdFamilySelectorScopeMap.ts
deleted file mode 100644
index 6eae4ad0c1cf..000000000000
--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/states/selectors/isSelectedItemIdFamilySelectorScopeMap.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { isSelectedItemIdFamilyStateScopeMap } from '@/ui/layout/selectable-list/states/isSelectedItemIdFamilyStateScopeMap';
-import { createFamilySelectorScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilySelectorScopeMap';
-
-export const isSelectedItemIdFamilySelectorScopeMap =
-  createFamilySelectorScopeMap<boolean, string>({
-    key: 'isSelectedItemIdScopedFamilySelector',
-    get:
-      ({ scopeId, familyKey }: { scopeId: string; familyKey: string }) =>
-      ({ get }) =>
-        get(
-          isSelectedItemIdFamilyStateScopeMap({
-            scopeId: scopeId,
-            familyKey: familyKey,
-          }),
-        ),
-    set:
-      ({ scopeId, familyKey }: { scopeId: string; familyKey: string }) =>
-      ({ set }, newValue) =>
-        set(
-          isSelectedItemIdFamilyStateScopeMap({
-            scopeId: scopeId,
-            familyKey: familyKey,
-          }),
-          newValue,
-        ),
-  });
diff --git a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx
index 1b3f27383551..883317ca5346 100644
--- a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx
@@ -1,10 +1,10 @@
 import styled from '@emotion/styled';
+import { IconCheckbox, IconNotes, IconPlus } from 'twenty-ui';
 
 import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
 import { ActivityType } from '@/activities/types/Activity';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
-import { IconCheckbox, IconNotes, IconPlus } from '@/ui/display/icon/index';
 import { IconButton } from '@/ui/input/button/components/IconButton';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
diff --git a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageLeftContainer.tsx b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageLeftContainer.tsx
index fa5d5c1e82c8..d6fa4c6f8499 100644
--- a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageLeftContainer.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageLeftContainer.tsx
@@ -20,6 +20,7 @@ const StyledInnerContainer = styled.div`
   display: flex;
   flex-direction: column;
   width: ${() => (useIsMobile() ? `100%` : '348px')};
+  overflow-x: hidden;
 `;
 
 const StyledIntermediateContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageMoreButton.tsx b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageMoreButton.tsx
index fee1454b6f8c..166b568c85ee 100644
--- a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageMoreButton.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageMoreButton.tsx
@@ -1,10 +1,10 @@
 import { useNavigate } from 'react-router-dom';
 import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
+import { IconDotsVertical, IconTrash } from 'twenty-ui';
 
 import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
-import { IconDotsVertical, IconTrash } from '@/ui/display/icon/index';
 import { IconButton } from '@/ui/input/button/components/IconButton';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
diff --git a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageRightContainer.tsx b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageRightContainer.tsx
index 8838967446ea..0362a13e5e36 100644
--- a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageRightContainer.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageRightContainer.tsx
@@ -1,25 +1,28 @@
 import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
+import {
+  IconCalendarEvent,
+  IconCheckbox,
+  IconMail,
+  IconNotes,
+  IconPaperclip,
+  IconTimelineEvent,
+} from 'twenty-ui';
 
+import { Calendar } from '@/activities/calendar/components/Calendar';
 import { EmailThreads } from '@/activities/emails/components/EmailThreads';
+import { Events } from '@/activities/events/components/Events';
 import { Attachments } from '@/activities/files/components/Attachments';
 import { Notes } from '@/activities/notes/components/Notes';
 import { ObjectTasks } from '@/activities/tasks/components/ObjectTasks';
 import { Timeline } from '@/activities/timeline/components/Timeline';
 import { TimelineQueryEffect } from '@/activities/timeline/components/TimelineQueryEffect';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import {
-  IconCheckbox,
-  IconMail,
-  IconNotes,
-  IconPaperclip,
-  IconTimelineEvent,
-} from '@/ui/display/icon';
 import { TabList } from '@/ui/layout/tab/components/TabList';
 import { useTabList } from '@/ui/layout/tab/hooks/useTabList';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 
 const StyledShowPageRightContainer = styled.div`
   display: flex;
@@ -59,13 +62,11 @@ export const ShowPageRightContainer = ({
   notes,
   emails,
 }: ShowPageRightContainerProps) => {
-  const { getActiveTabIdState } = useTabList(TAB_LIST_COMPONENT_ID);
-  const activeTabId = useRecoilValue(getActiveTabIdState());
+  const { activeTabIdState } = useTabList(TAB_LIST_COMPONENT_ID);
+  const activeTabId = useRecoilValue(activeTabIdState);
 
-  const { objectMetadataItem: targetableObjectMetadataItem } =
-    useObjectMetadataItem({
-      objectNameSingular: targetableObject.targetObjectNameSingular,
-    });
+  const shouldDisplayCalendarTab = useIsFeatureEnabled('IS_CALENDAR_ENABLED');
+  const shouldDisplayLogTab = useIsFeatureEnabled('IS_EVENT_OBJECT_ENABLED');
 
   const shouldDisplayEmailsTab =
     (emails &&
@@ -97,13 +98,24 @@ export const ShowPageRightContainer = ({
       title: 'Files',
       Icon: IconPaperclip,
       hide: !notes,
-      disabled: targetableObjectMetadataItem.isCustom,
     },
     {
       id: 'emails',
       title: 'Emails',
       Icon: IconMail,
       hide: !shouldDisplayEmailsTab,
+    },
+    {
+      id: 'calendar',
+      title: 'Calendar',
+      Icon: IconCalendarEvent,
+      hide: !shouldDisplayCalendarTab,
+    },
+    {
+      id: 'logs',
+      title: 'Logs',
+      Icon: IconTimelineEvent,
+      hide: !shouldDisplayLogTab,
       hasBetaPill: true,
     },
   ];
@@ -126,7 +138,13 @@ export const ShowPageRightContainer = ({
       {activeTabId === 'files' && (
         <Attachments targetableObject={targetableObject} />
       )}
-      {activeTabId === 'emails' && <EmailThreads entity={targetableObject} />}
+      {activeTabId === 'emails' && (
+        <EmailThreads targetableObject={targetableObject} />
+      )}
+      {activeTabId === 'calendar' && (
+        <Calendar targetableObject={targetableObject} />
+      )}
+      {activeTabId === 'logs' && <Events targetableObject={targetableObject} />}
     </StyledShowPageRightContainer>
   );
 };
diff --git a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx
index 680d5329f171..93c5575ccf27 100644
--- a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx
@@ -8,6 +8,7 @@ import {
   beautifyExactDateTime,
   beautifyPastDateRelativeToNow,
 } from '~/utils/date-utils';
+import { isDefined } from '~/utils/isDefined';
 
 type ShowPageSummaryCardProps = {
   avatarPlaceholder: string;
@@ -85,7 +86,7 @@ export const ShowPageSummaryCard = ({
   const inputFileRef = useRef<HTMLInputElement>(null);
 
   const onFileChange = (e: ChangeEvent<HTMLInputElement>) => {
-    if (e.target.files) onUploadPicture?.(e.target.files[0]);
+    if (isDefined(e.target.files)) onUploadPicture?.(e.target.files[0]);
   };
 
   const handleAvatarClick = () => {
diff --git a/packages/twenty-front/src/modules/ui/layout/tab/components/Tab.tsx b/packages/twenty-front/src/modules/ui/layout/tab/components/Tab.tsx
index e83aa260a0a1..240cc1666a0a 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab/components/Tab.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab/components/Tab.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { Pill } from 'twenty-ui';
 
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
-import { Pill } from '@/ui/display/pill/components/Pill';
 
 type TabProps = {
   id: string;
diff --git a/packages/twenty-front/src/modules/ui/layout/tab/components/TabList.tsx b/packages/twenty-front/src/modules/ui/layout/tab/components/TabList.tsx
index 8554be46b83c..ccb821faf598 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab/components/TabList.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab/components/TabList.tsx
@@ -5,6 +5,7 @@ import { useRecoilValue } from 'recoil';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 import { useTabList } from '@/ui/layout/tab/hooks/useTabList';
 import { TabListScope } from '@/ui/layout/tab/scopes/TabListScope';
+import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
 
 import { Tab } from './Tab';
 
@@ -30,15 +31,14 @@ const StyledContainer = styled.div`
   height: 40px;
   padding-left: ${({ theme }) => theme.spacing(2)};
   user-select: none;
-  overflow: auto;
 `;
 
 export const TabList = ({ tabs, tabListId }: TabListProps) => {
   const initialActiveTabId = tabs[0].id;
 
-  const { getActiveTabIdState, setActiveTabId } = useTabList(tabListId);
+  const { activeTabIdState, setActiveTabId } = useTabList(tabListId);
 
-  const activeTabId = useRecoilValue(getActiveTabIdState());
+  const activeTabId = useRecoilValue(activeTabIdState);
 
   React.useEffect(() => {
     setActiveTabId(initialActiveTabId);
@@ -46,24 +46,26 @@ export const TabList = ({ tabs, tabListId }: TabListProps) => {
 
   return (
     <TabListScope tabListScopeId={tabListId}>
-      <StyledContainer>
-        {tabs
-          .filter((tab) => !tab.hide)
-          .map((tab) => (
-            <Tab
-              id={tab.id}
-              key={tab.id}
-              title={tab.title}
-              Icon={tab.Icon}
-              active={tab.id === activeTabId}
-              onClick={() => {
-                setActiveTabId(tab.id);
-              }}
-              disabled={tab.disabled}
-              hasBetaPill={tab.hasBetaPill}
-            />
-          ))}
-      </StyledContainer>
+      <ScrollWrapper hideY>
+        <StyledContainer>
+          {tabs
+            .filter((tab) => !tab.hide)
+            .map((tab) => (
+              <Tab
+                id={tab.id}
+                key={tab.id}
+                title={tab.title}
+                Icon={tab.Icon}
+                active={tab.id === activeTabId}
+                onClick={() => {
+                  setActiveTabId(tab.id);
+                }}
+                disabled={tab.disabled}
+                hasBetaPill={tab.hasBetaPill}
+              />
+            ))}
+        </StyledContainer>
+      </ScrollWrapper>
     </TabListScope>
   );
 };
diff --git a/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tab.stories.tsx b/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tab.stories.tsx
index 606029693097..86d426bbae64 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tab.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tab.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconCheckbox } from 'twenty-ui';
 
-import { IconCheckbox } from '@/ui/display/icon';
 import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { CatalogStory } from '~/testing/types';
diff --git a/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tablist.stories.tsx b/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tablist.stories.tsx
index a8eae0e9c1b8..4023d17565e3 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tablist.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab/components/__stories__/Tablist.stories.tsx
@@ -1,7 +1,7 @@
 import { Meta, StoryObj } from '@storybook/react';
 import { expect, within } from '@storybook/test';
+import { IconCheckbox } from 'twenty-ui';
 
-import { IconCheckbox } from '@/ui/display/icon';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 
diff --git a/packages/twenty-front/src/modules/ui/layout/tab/hooks/__tests__/useTabList.test.tsx b/packages/twenty-front/src/modules/ui/layout/tab/hooks/__tests__/useTabList.test.tsx
index 986e243bfa8b..83e30532fcf3 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab/hooks/__tests__/useTabList.test.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab/hooks/__tests__/useTabList.test.tsx
@@ -8,12 +8,11 @@ describe('useTabList', () => {
   it('Should update the activeTabId state', async () => {
     const { result } = renderHook(
       () => {
-        const { getActiveTabIdState, setActiveTabId } =
+        const { activeTabIdState, setActiveTabId } =
           useTabList('TEST_TAB_LIST_ID');
-        const activeTabId = useRecoilValue(getActiveTabIdState());
+        const activeTabId = useRecoilValue(activeTabIdState);
 
         return {
-          getActiveTabIdState: getActiveTabIdState,
           activeTabId,
           setActiveTabId: setActiveTabId,
         };
@@ -22,7 +21,6 @@ describe('useTabList', () => {
         wrapper: RecoilRoot,
       },
     );
-    expect(result.current.getActiveTabIdState).toBeInstanceOf(Function);
     expect(result.current.setActiveTabId).toBeInstanceOf(Function);
     expect(result.current.activeTabId).toBeNull();
 
diff --git a/packages/twenty-front/src/modules/ui/layout/tab/hooks/internal/useTabListStates.ts b/packages/twenty-front/src/modules/ui/layout/tab/hooks/internal/useTabListStates.ts
index c1a47b9ca49a..2d33932be5a7 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab/hooks/internal/useTabListStates.ts
+++ b/packages/twenty-front/src/modules/ui/layout/tab/hooks/internal/useTabListStates.ts
@@ -1,7 +1,7 @@
 import { TabListScopeInternalContext } from '@/ui/layout/tab/scopes/scope-internal-context/TabListScopeInternalContext';
-import { activeTabIdStateScopeMap } from '@/ui/layout/tab/states/activeTabIdStateScopeMap';
+import { activeTabIdComponentState } from '@/ui/layout/tab/states/activeTabIdComponentState';
 import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
-import { getState } from '@/ui/utilities/recoil-scope/utils/getState';
+import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
 
 type useTabListStatesProps = {
   tabListScopeId?: string;
@@ -15,6 +15,6 @@ export const useTabListStates = ({ tabListScopeId }: useTabListStatesProps) => {
 
   return {
     scopeId,
-    getActiveTabIdState: getState(activeTabIdStateScopeMap, scopeId),
+    activeTabIdState: extractComponentState(activeTabIdComponentState, scopeId),
   };
 };
diff --git a/packages/twenty-front/src/modules/ui/layout/tab/hooks/useTabList.ts b/packages/twenty-front/src/modules/ui/layout/tab/hooks/useTabList.ts
index c02624ada45e..9925dec4c655 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab/hooks/useTabList.ts
+++ b/packages/twenty-front/src/modules/ui/layout/tab/hooks/useTabList.ts
@@ -3,14 +3,14 @@ import { useSetRecoilState } from 'recoil';
 import { useTabListStates } from '@/ui/layout/tab/hooks/internal/useTabListStates';
 
 export const useTabList = (tabListId?: string) => {
-  const { getActiveTabIdState } = useTabListStates({
+  const { activeTabIdState } = useTabListStates({
     tabListScopeId: `${tabListId}-scope`,
   });
 
-  const setActiveTabId = useSetRecoilState(getActiveTabIdState());
+  const setActiveTabId = useSetRecoilState(activeTabIdState);
 
   return {
-    getActiveTabIdState,
+    activeTabIdState,
     setActiveTabId,
   };
 };
diff --git a/packages/twenty-front/src/modules/ui/layout/tab/scopes/scope-internal-context/TabListScopeInternalContext.ts b/packages/twenty-front/src/modules/ui/layout/tab/scopes/scope-internal-context/TabListScopeInternalContext.ts
index be207055bb51..878955256f77 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab/scopes/scope-internal-context/TabListScopeInternalContext.ts
+++ b/packages/twenty-front/src/modules/ui/layout/tab/scopes/scope-internal-context/TabListScopeInternalContext.ts
@@ -1,7 +1,7 @@
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
 import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
-type TabListScopeInternalContextProps = StateScopeMapKey;
+type TabListScopeInternalContextProps = ComponentStateKey;
 
 export const TabListScopeInternalContext =
   createScopeInternalContext<TabListScopeInternalContextProps>();
diff --git a/packages/twenty-front/src/modules/ui/layout/tab/states/activeTabIdComponentState.ts b/packages/twenty-front/src/modules/ui/layout/tab/states/activeTabIdComponentState.ts
new file mode 100644
index 000000000000..fcb07559b73a
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/tab/states/activeTabIdComponentState.ts
@@ -0,0 +1,6 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const activeTabIdComponentState = createComponentState<string | null>({
+  key: 'activeTabIdComponentState',
+  defaultValue: null,
+});
diff --git a/packages/twenty-front/src/modules/ui/layout/tab/states/activeTabIdStateScopeMap.ts b/packages/twenty-front/src/modules/ui/layout/tab/states/activeTabIdStateScopeMap.ts
deleted file mode 100644
index 500ccc57a226..000000000000
--- a/packages/twenty-front/src/modules/ui/layout/tab/states/activeTabIdStateScopeMap.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const activeTabIdStateScopeMap = createStateScopeMap<string | null>({
-  key: 'activeTabIdStateScopeMap',
-  defaultValue: null,
-});
diff --git a/packages/twenty-front/src/modules/ui/layout/table/components/TableSection.tsx b/packages/twenty-front/src/modules/ui/layout/table/components/TableSection.tsx
index e37822299c1b..cbec405327e2 100644
--- a/packages/twenty-front/src/modules/ui/layout/table/components/TableSection.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/table/components/TableSection.tsx
@@ -1,8 +1,7 @@
 import { ReactNode, useState } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-
-import { IconChevronDown, IconChevronUp } from '@/ui/display/icon';
+import { IconChevronDown, IconChevronUp } from 'twenty-ui';
 
 import { TableBody } from './TableBody';
 
diff --git a/packages/twenty-front/src/modules/ui/layout/top-bar/TopBar.tsx b/packages/twenty-front/src/modules/ui/layout/top-bar/TopBar.tsx
index 2ec13e4c4d0b..0515660129c2 100644
--- a/packages/twenty-front/src/modules/ui/layout/top-bar/TopBar.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/top-bar/TopBar.tsx
@@ -27,7 +27,7 @@ const StyledTopBar = styled.div<{ displayBottomBorder: boolean }>`
   justify-content: space-between;
   padding-left: ${({ theme }) => theme.spacing(2)};
   padding-right: ${({ theme }) => theme.spacing(2)};
-  z-index: 5;
+  z-index: 7;
 `;
 
 const StyledLeftSection = styled.div`
diff --git a/packages/twenty-front/src/modules/ui/navigation/action-bar/components/ActionBar.tsx b/packages/twenty-front/src/modules/ui/navigation/action-bar/components/ActionBar.tsx
index bf5c2586a0af..f0e2a9d2f488 100644
--- a/packages/twenty-front/src/modules/ui/navigation/action-bar/components/ActionBar.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/action-bar/components/ActionBar.tsx
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import { useRef } from 'react';
 import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
 
@@ -7,6 +7,10 @@ import { contextMenuIsOpenState } from '@/ui/navigation/context-menu/states/cont
 
 import { ActionBarItem } from './ActionBarItem';
 
+type ActionBarProps = {
+  selectedIds?: string[];
+};
+
 const StyledContainerActionBar = styled.div`
   align-items: center;
   background: ${({ theme }) => theme.background.secondary};
@@ -27,7 +31,15 @@ const StyledContainerActionBar = styled.div`
   z-index: 1;
 `;
 
-export const ActionBar = () => {
+const StyledLabel = styled.div`
+  color: ${({ theme }) => theme.font.color.tertiary};
+  font-size: ${({ theme }) => theme.font.size.md};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  padding-left: ${({ theme }) => theme.spacing(2)};
+  padding-right: ${({ theme }) => theme.spacing(2)};
+`;
+
+export const ActionBar = ({ selectedIds }: ActionBarProps) => {
   const contextMenuIsOpen = useRecoilValue(contextMenuIsOpenState);
   const actionBarEntries = useRecoilValue(actionBarEntriesState);
   const wrapperRef = useRef<HTMLDivElement>(null);
@@ -37,14 +49,22 @@ export const ActionBar = () => {
   }
 
   return (
-    <StyledContainerActionBar
-      data-select-disable
-      className="action-bar"
-      ref={wrapperRef}
-    >
-      {actionBarEntries.map((item, index) => (
-        <ActionBarItem key={index} item={item} />
-      ))}
-    </StyledContainerActionBar>
+    <>
+      <StyledContainerActionBar
+        data-select-disable
+        className="action-bar"
+        ref={wrapperRef}
+      >
+        {selectedIds && (
+          <StyledLabel>{selectedIds.length} selected:</StyledLabel>
+        )}
+        {actionBarEntries.map((item, index) => (
+          <ActionBarItem key={index} item={item} />
+        ))}
+      </StyledContainerActionBar>
+      <div data-select-disable className="action-bar">
+        {actionBarEntries[0]?.ConfirmationModal}
+      </div>
+    </>
   );
 };
diff --git a/packages/twenty-front/src/modules/ui/navigation/action-bar/components/ActionBarItem.tsx b/packages/twenty-front/src/modules/ui/navigation/action-bar/components/ActionBarItem.tsx
index e6061b797355..dbb7623d25d4 100644
--- a/packages/twenty-front/src/modules/ui/navigation/action-bar/components/ActionBarItem.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/action-bar/components/ActionBarItem.tsx
@@ -1,12 +1,12 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-import { MenuItem } from 'tsup.ui.index';
+import { IconChevronDown } from 'twenty-ui';
 
-import { IconChevronDown } from '@/ui/display/icon';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { ActionBarEntry } from '@/ui/navigation/action-bar/types/ActionBarEntry';
+import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
 import { MenuItemAccent } from '@/ui/navigation/menu-item/types/MenuItemAccent';
 
 type ActionBarItemProps = {
diff --git a/packages/twenty-front/src/modules/ui/navigation/action-bar/states/actionBarEntriesState.ts b/packages/twenty-front/src/modules/ui/navigation/action-bar/states/actionBarEntriesState.ts
index 2e9d0cf61a9c..35f8cab412b7 100644
--- a/packages/twenty-front/src/modules/ui/navigation/action-bar/states/actionBarEntriesState.ts
+++ b/packages/twenty-front/src/modules/ui/navigation/action-bar/states/actionBarEntriesState.ts
@@ -1,8 +1,8 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { ActionBarEntry } from '../types/ActionBarEntry';
 
-export const actionBarEntriesState = atom<ActionBarEntry[]>({
+export const actionBarEntriesState = createState<ActionBarEntry[]>({
   key: 'actionBarEntriesState',
-  default: [],
+  defaultValue: [],
 });
diff --git a/packages/twenty-front/src/modules/ui/navigation/action-bar/states/actionBarIsOpenState.ts b/packages/twenty-front/src/modules/ui/navigation/action-bar/states/actionBarIsOpenState.ts
index 3d150e9783dd..0ef918e6652e 100644
--- a/packages/twenty-front/src/modules/ui/navigation/action-bar/states/actionBarIsOpenState.ts
+++ b/packages/twenty-front/src/modules/ui/navigation/action-bar/states/actionBarIsOpenState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const actionBarOpenState = atom<boolean>({
+export const actionBarOpenState = createState<boolean>({
   key: 'actionBarOpenState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/ui/navigation/action-bar/types/ActionBarEntry.ts b/packages/twenty-front/src/modules/ui/navigation/action-bar/types/ActionBarEntry.ts
index ddd947a16635..1ef345e3c5e2 100644
--- a/packages/twenty-front/src/modules/ui/navigation/action-bar/types/ActionBarEntry.ts
+++ b/packages/twenty-front/src/modules/ui/navigation/action-bar/types/ActionBarEntry.ts
@@ -7,4 +7,5 @@ export type ActionBarEntry = {
   accent?: MenuItemAccent;
   onClick?: () => void;
   subActions?: ActionBarEntry[];
+  ConfirmationModal?: JSX.Element;
 };
diff --git a/packages/twenty-front/src/modules/ui/navigation/context-menu/states/contextMenuEntriesState.ts b/packages/twenty-front/src/modules/ui/navigation/context-menu/states/contextMenuEntriesState.ts
index e5ba5396d6ed..1e22b562187e 100644
--- a/packages/twenty-front/src/modules/ui/navigation/context-menu/states/contextMenuEntriesState.ts
+++ b/packages/twenty-front/src/modules/ui/navigation/context-menu/states/contextMenuEntriesState.ts
@@ -1,8 +1,8 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { ContextMenuEntry } from '../types/ContextMenuEntry';
 
-export const contextMenuEntriesState = atom<ContextMenuEntry[]>({
+export const contextMenuEntriesState = createState<ContextMenuEntry[]>({
   key: 'contextMenuEntriesState',
-  default: [],
+  defaultValue: [],
 });
diff --git a/packages/twenty-front/src/modules/ui/navigation/context-menu/states/contextMenuIsOpenState.ts b/packages/twenty-front/src/modules/ui/navigation/context-menu/states/contextMenuIsOpenState.ts
index a41032e21849..d5aec39b905e 100644
--- a/packages/twenty-front/src/modules/ui/navigation/context-menu/states/contextMenuIsOpenState.ts
+++ b/packages/twenty-front/src/modules/ui/navigation/context-menu/states/contextMenuIsOpenState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const contextMenuIsOpenState = atom<boolean>({
+export const contextMenuIsOpenState = createState<boolean>({
   key: 'contextMenuIsOpenState',
-  default: false,
+  defaultValue: false,
 });
diff --git a/packages/twenty-front/src/modules/ui/navigation/context-menu/states/contextMenuPositionState.ts b/packages/twenty-front/src/modules/ui/navigation/context-menu/states/contextMenuPositionState.ts
index efa4c44732ef..a47df13eb017 100644
--- a/packages/twenty-front/src/modules/ui/navigation/context-menu/states/contextMenuPositionState.ts
+++ b/packages/twenty-front/src/modules/ui/navigation/context-menu/states/contextMenuPositionState.ts
@@ -1,10 +1,10 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { PositionType } from '@/ui/navigation/context-menu/types/PositionType';
 
-export const contextMenuPositionState = atom<PositionType>({
+export const contextMenuPositionState = createState<PositionType>({
   key: 'contextMenuPositionState',
-  default: {
+  defaultValue: {
     x: null,
     y: null,
   },
diff --git a/packages/twenty-front/src/modules/ui/navigation/link/components/GithubVersionLink.tsx b/packages/twenty-front/src/modules/ui/navigation/link/components/GithubVersionLink.tsx
index 67bc94ed939d..57e86a6e67d4 100644
--- a/packages/twenty-front/src/modules/ui/navigation/link/components/GithubVersionLink.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/link/components/GithubVersionLink.tsx
@@ -1,6 +1,6 @@
 import { useTheme } from '@emotion/react';
+import { IconBrandGithub } from 'twenty-ui';
 
-import { IconBrandGithub } from '@/ui/display/icon';
 import { ActionLink } from '@/ui/navigation/link/components/ActionLink.tsx';
 
 import packageJson from '../../../../../../package.json';
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItem.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItem.tsx
index 77e479df4d6f..ea0c09c2be22 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItem.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItem.tsx
@@ -20,6 +20,7 @@ export type MenuItemProps = {
   accent?: MenuItemAccent;
   text: string;
   iconButtons?: MenuItemIconButton[];
+  isIconDisplayedOnHoverOnly?: boolean;
   isTooltipOpen?: boolean;
   className?: string;
   testId?: string;
@@ -32,6 +33,7 @@ export const MenuItem = ({
   text,
   iconButtons,
   isTooltipOpen,
+  isIconDisplayedOnHoverOnly = true,
   className,
   testId,
   onClick,
@@ -53,6 +55,7 @@ export const MenuItem = ({
       className={className}
       accent={accent}
       isMenuOpen={!!isTooltipOpen}
+      isIconDisplayedOnHoverOnly={isIconDisplayedOnHoverOnly}
     >
       <StyledMenuItemLeftContent>
         <MenuItemLeftContent LeftIcon={LeftIcon ?? undefined} text={text} />
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemMultiSelect.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemMultiSelect.tsx
index 84f851e21720..81e1cd324b3c 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemMultiSelect.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemMultiSelect.tsx
@@ -1,9 +1,11 @@
 import styled from '@emotion/styled';
 
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
+import { Tag } from '@/ui/display/tag/components/Tag';
 import { Checkbox } from '@/ui/input/components/Checkbox';
+import { MenuItemLeftContent } from '@/ui/navigation/menu-item/internals/components/MenuItemLeftContent';
+import { ThemeColor } from '@/ui/theme/constants/MainColorNames';
 
-import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent';
 import { StyledMenuItemBase } from '../internals/components/StyledMenuItemBase';
 
 const StyledLeftContentWithCheckboxContainer = styled.div`
@@ -14,6 +16,7 @@ const StyledLeftContentWithCheckboxContainer = styled.div`
 `;
 
 type MenuItemMultiSelectProps = {
+  color?: ThemeColor;
   LeftIcon?: IconComponent;
   selected: boolean;
   text: string;
@@ -22,6 +25,7 @@ type MenuItemMultiSelectProps = {
 };
 
 export const MenuItemMultiSelect = ({
+  color,
   LeftIcon,
   text,
   selected,
@@ -36,7 +40,11 @@ export const MenuItemMultiSelect = ({
     <StyledMenuItemBase className={className} onClick={handleOnClick}>
       <StyledLeftContentWithCheckboxContainer>
         <Checkbox checked={selected} />
-        <MenuItemLeftContent LeftIcon={LeftIcon} text={text} />
+        {color ? (
+          <Tag color={color} text={text} Icon={LeftIcon} />
+        ) : (
+          <MenuItemLeftContent LeftIcon={LeftIcon} text={text} />
+        )}
       </StyledLeftContentWithCheckboxContainer>
     </StyledMenuItemBase>
   );
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemMultiSelectTag.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemMultiSelectTag.tsx
new file mode 100644
index 000000000000..14ebec21765d
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemMultiSelectTag.tsx
@@ -0,0 +1,41 @@
+import { Tag } from '@/ui/display/tag/components/Tag';
+import {
+  Checkbox,
+  CheckboxShape,
+  CheckboxSize,
+} from '@/ui/input/components/Checkbox';
+import { ThemeColor } from '@/ui/theme/constants/MainColorNames';
+
+import {
+  StyledMenuItemBase,
+  StyledMenuItemLeftContent,
+} from '../internals/components/StyledMenuItemBase';
+
+type MenuItemMultiSelectTagProps = {
+  selected: boolean;
+  className?: string;
+  onClick?: () => void;
+  color: ThemeColor;
+  text: string;
+};
+
+export const MenuItemMultiSelectTag = ({
+  color,
+  selected,
+  className,
+  onClick,
+  text,
+}: MenuItemMultiSelectTagProps) => {
+  return (
+    <StyledMenuItemBase onClick={onClick} className={className}>
+      <Checkbox
+        size={CheckboxSize.Small}
+        shape={CheckboxShape.Squared}
+        checked={selected}
+      />
+      <StyledMenuItemLeftContent>
+        <Tag color={color} text={text} />
+      </StyledMenuItemLeftContent>
+    </StyledMenuItemBase>
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemNavigate.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemNavigate.tsx
index f470273e83c7..e8f9ef8a4f30 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemNavigate.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemNavigate.tsx
@@ -1,6 +1,6 @@
 import { useTheme } from '@emotion/react';
+import { IconChevronRight } from 'twenty-ui';
 
-import { IconChevronRight } from '@/ui/display/icon';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 
 import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent';
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelect.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelect.tsx
index 12fba7064aee..8d6e24ecd332 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelect.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelect.tsx
@@ -1,7 +1,7 @@
 import { css, useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconCheck } from 'twenty-ui';
 
-import { IconCheck } from '@/ui/display/icon';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 
 import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent';
@@ -20,7 +20,7 @@ export const StyledMenuItemSelect = styled(StyledMenuItemBase)<{
           background: ${theme.background.transparent.medium};
         }
       `;
-    } else if (disabled) {
+    } else if (disabled === true) {
       return css`
         background: inherit;
         &:hover {
@@ -31,7 +31,7 @@ export const StyledMenuItemSelect = styled(StyledMenuItemBase)<{
 
         cursor: default;
       `;
-    } else if (hovered) {
+    } else if (hovered === true) {
       return css`
         background: ${theme.background.transparent.light};
       `;
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelectAvatar.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelectAvatar.tsx
index 59026208dead..dfe6730662a3 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelectAvatar.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelectAvatar.tsx
@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
 import { useTheme } from '@emotion/react';
+import { IconCheck } from 'twenty-ui';
 
-import { IconCheck } from '@/ui/display/icon';
 import { OverflowingTextWithTooltip } from '@/ui/display/tooltip/OverflowingTextWithTooltip';
 
 import {
@@ -12,7 +12,7 @@ import {
 import { StyledMenuItemSelect } from './MenuItemSelect';
 
 type MenuItemSelectAvatarProps = {
-  avatar: ReactNode;
+  avatar?: ReactNode;
   selected: boolean;
   text: string;
   className?: string;
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelectColor.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelectColor.tsx
index 90e535fab9a2..e22b91f5d056 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelectColor.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelectColor.tsx
@@ -1,10 +1,10 @@
 import { useTheme } from '@emotion/react';
+import { IconCheck } from 'twenty-ui';
 
 import {
   ColorSample,
   ColorSampleVariant,
 } from '@/ui/display/color/components/ColorSample';
-import { IconCheck } from '@/ui/display/icon';
 import { ThemeColor } from '@/ui/theme/constants/MainColorNames';
 
 import {
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelectTag.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelectTag.tsx
new file mode 100644
index 000000000000..2f6baf22cdc6
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSelectTag.tsx
@@ -0,0 +1,40 @@
+import { useTheme } from '@emotion/react';
+import { IconCheck } from 'twenty-ui';
+
+import { Tag } from '@/ui/display/tag/components/Tag';
+import { ThemeColor } from '@/ui/theme/constants/MainColorNames';
+
+import { StyledMenuItemLeftContent } from '../internals/components/StyledMenuItemBase';
+
+import { StyledMenuItemSelect } from './MenuItemSelect';
+
+type MenuItemSelectTagProps = {
+  selected: boolean;
+  className?: string;
+  onClick?: () => void;
+  color: ThemeColor;
+  text: string;
+};
+
+export const MenuItemSelectTag = ({
+  color,
+  selected,
+  className,
+  onClick,
+  text,
+}: MenuItemSelectTagProps) => {
+  const theme = useTheme();
+
+  return (
+    <StyledMenuItemSelect
+      onClick={onClick}
+      className={className}
+      selected={selected}
+    >
+      <StyledMenuItemLeftContent>
+        <Tag color={color} text={text} />
+      </StyledMenuItemLeftContent>
+      {selected && <IconCheck size={theme.icon.size.sm} />}
+    </StyledMenuItemSelect>
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSuggestion.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSuggestion.tsx
new file mode 100644
index 000000000000..52d3a12ee8b4
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemSuggestion.tsx
@@ -0,0 +1,79 @@
+import { MouseEvent } from 'react';
+import styled from '@emotion/styled';
+
+import { IconComponent } from '@/ui/display/icon/types/IconComponent';
+import { HOVER_BACKGROUND } from '@/ui/theme/constants/HoverBackground';
+
+import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent';
+import { StyledMenuItemLeftContent } from '../internals/components/StyledMenuItemBase';
+
+export type MenuItemSuggestionProps = {
+  LeftIcon?: IconComponent | null;
+  text: string;
+  selected?: boolean;
+  className?: string;
+  onClick?: (event: MouseEvent<HTMLLIElement>) => void;
+};
+
+const StyledSuggestionMenuItem = styled.li<{
+  selected?: boolean;
+}>`
+  --horizontal-padding: ${({ theme }) => theme.spacing(1)};
+  --vertical-padding: ${({ theme }) => theme.spacing(2)};
+
+  align-items: center;
+
+  border-radius: ${({ theme }) => theme.border.radius.sm};
+  cursor: pointer;
+
+  display: flex;
+
+  flex-direction: row;
+
+  font-size: ${({ theme }) => theme.font.size.sm};
+
+  gap: ${({ theme }) => theme.spacing(2)};
+
+  height: calc(32px - 2 * var(--vertical-padding));
+  justify-content: space-between;
+
+  padding: var(--vertical-padding) var(--horizontal-padding);
+
+  background: ${({ selected, theme }) =>
+    selected ? theme.background.transparent.medium : ''};
+
+  ${HOVER_BACKGROUND};
+
+  position: relative;
+  user-select: none;
+
+  width: calc(100% - 2 * var(--horizontal-padding));
+`;
+
+export const MenuItemSuggestion = ({
+  LeftIcon,
+  text,
+  className,
+  selected,
+  onClick,
+}: MenuItemSuggestionProps) => {
+  const handleMenuItemClick = (event: MouseEvent<HTMLLIElement>) => {
+    if (!onClick) return;
+    event.preventDefault();
+    event.stopPropagation();
+
+    onClick?.(event);
+  };
+
+  return (
+    <StyledSuggestionMenuItem
+      onClick={handleMenuItemClick}
+      className={className}
+      selected={selected}
+    >
+      <StyledMenuItemLeftContent>
+        <MenuItemLeftContent LeftIcon={LeftIcon ?? undefined} text={text} />
+      </StyledMenuItemLeftContent>
+    </StyledSuggestionMenuItem>
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemToggle.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemToggle.tsx
index 70ed9dfb6a6e..99465e0ca8d5 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemToggle.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/MenuItemToggle.tsx
@@ -24,12 +24,8 @@ export const MenuItemToggle = ({
   onToggleChange,
   toggleSize,
 }: MenuItemToggleProps) => {
-  const handleOnClick = () => {
-    onToggleChange?.(!toggled);
-  };
-
   return (
-    <StyledMenuItemBase className={className} onClick={handleOnClick}>
+    <StyledMenuItemBase className={className}>
       <MenuItemLeftContent LeftIcon={LeftIcon} text={text} />
       <StyledMenuItemRightContent>
         <Toggle
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItem.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItem.stories.tsx
index 171421c326b1..8a20708e8065 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItem.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItem.stories.tsx
@@ -1,6 +1,7 @@
+import { action } from '@storybook/addon-actions';
 import { Meta, StoryObj } from '@storybook/react';
+import { IconBell } from 'twenty-ui';
 
-import { IconBell } from '@/ui/display/icon';
 import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { CatalogStory } from '~/testing/types';
@@ -23,8 +24,8 @@ export const Default: Story = {
     LeftIcon: IconBell,
     accent: 'default',
     iconButtons: [
-      { Icon: IconBell, onClick: () => console.log('Clicked') },
-      { Icon: IconBell, onClick: () => console.log('Clicked') },
+      { Icon: IconBell, onClick: action('Clicked') },
+      { Icon: IconBell, onClick: action('Clicked') },
     ],
   },
   decorators: [ComponentDecorator],
@@ -84,13 +85,11 @@ export const Catalog: CatalogStory<Story, typeof MenuItem> = {
                   iconButtons: [
                     {
                       Icon: IconBell,
-                      onClick: () =>
-                        console.log('Clicked on first icon button'),
+                      onClick: action('Clicked on first icon button'),
                     },
                     {
                       Icon: IconBell,
-                      onClick: () =>
-                        console.log('Clicked on second icon button'),
+                      onClick: action('Clicked on second icon button'),
                     },
                   ],
                 };
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemCommand.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemCommand.stories.tsx
index 6162d06eaaba..1f7899d50600 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemCommand.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemCommand.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconBell } from 'twenty-ui';
 
-import { IconBell } from '@/ui/display/icon';
 import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { CatalogStory } from '~/testing/types';
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemDraggable.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemDraggable.stories.tsx
index 0e6cd65d5f69..827a52b5b749 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemDraggable.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemDraggable.stories.tsx
@@ -1,6 +1,7 @@
+import { action } from '@storybook/addon-actions';
 import { Meta, StoryObj } from '@storybook/react';
+import { IconBell, IconMinus } from 'twenty-ui';
 
-import { IconBell, IconMinus } from '@/ui/display/icon';
 import {
   CatalogDecorator,
   CatalogDimension,
@@ -24,8 +25,8 @@ export const Default: Story = {
   args: {
     LeftIcon: IconBell,
     accent: 'default',
-    iconButtons: [{ Icon: IconMinus, onClick: () => console.log('Clicked') }],
-    onClick: () => console.log('Clicked'),
+    iconButtons: [{ Icon: IconMinus, onClick: action('Clicked') }],
+    onClick: action('Clicked'),
     text: 'Menu item draggable',
     isDragDisabled: false,
   },
@@ -85,8 +86,7 @@ export const Catalog: Story = {
                   iconButtons: [
                     {
                       Icon: IconMinus,
-                      onClick: () =>
-                        console.log('Clicked on minus icon button'),
+                      onClick: action('Clicked on minus icon button'),
                     },
                   ],
                 };
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx
index 3433154083d9..b4aaebff7821 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemMultiSelect.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconBell } from 'twenty-ui';
 
-import { IconBell } from '@/ui/display/icon';
 import {
   CatalogDecorator,
   CatalogDimension,
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemNavigate.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemNavigate.stories.tsx
index 3c7d00983a67..53a7bf2be3b4 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemNavigate.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemNavigate.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconBell } from 'twenty-ui';
 
-import { IconBell } from '@/ui/display/icon';
 import {
   CatalogDecorator,
   CatalogDimension,
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelect.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelect.stories.tsx
index 420f2c94ad6a..501156039a33 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelect.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemSelect.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconBell } from 'twenty-ui';
 
-import { IconBell } from '@/ui/display/icon';
 import {
   CatalogDecorator,
   CatalogDimension,
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemToggle.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemToggle.stories.tsx
index 10b04995f432..9c7d05389093 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemToggle.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/components/__stories__/MenuItemToggle.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconBell } from 'twenty-ui';
 
-import { IconBell } from '@/ui/display/icon';
 import {
   CatalogDecorator,
   CatalogDimension,
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/internals/components/MenuItemLeftContent.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/internals/components/MenuItemLeftContent.tsx
index 28ff53e5eb89..7c41b4a31ba9 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/internals/components/MenuItemLeftContent.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/internals/components/MenuItemLeftContent.tsx
@@ -1,6 +1,6 @@
 import { useTheme } from '@emotion/react';
+import { IconGripVertical } from 'twenty-ui';
 
-import { IconGripVertical } from '@/ui/display/icon';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 import { OverflowingTextWithTooltip } from '@/ui/display/tooltip/OverflowingTextWithTooltip';
 
diff --git a/packages/twenty-front/src/modules/ui/navigation/menu-item/internals/components/StyledMenuItemBase.tsx b/packages/twenty-front/src/modules/ui/navigation/menu-item/internals/components/StyledMenuItemBase.tsx
index a1dc523c1953..66b6ab1b0dd2 100644
--- a/packages/twenty-front/src/modules/ui/navigation/menu-item/internals/components/StyledMenuItemBase.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/menu-item/internals/components/StyledMenuItemBase.tsx
@@ -16,10 +16,6 @@ export const StyledMenuItemBase = styled.li<MenuItemBaseProps>`
 
   align-items: center;
 
-  background: ${({ isKeySelected, theme }) =>
-    isKeySelected
-      ? theme.background.transparent.light
-      : theme.background.secondary};
   border-radius: ${({ theme }) => theme.border.radius.sm};
   cursor: pointer;
 
@@ -106,12 +102,14 @@ export const StyledMenuItemRightContent = styled.div`
 
 export const StyledHoverableMenuItemBase = styled(StyledMenuItemBase)<{
   isMenuOpen: boolean;
+  isIconDisplayedOnHoverOnly?: boolean;
 }>`
   & .hoverable-buttons {
-    opacity: ${({ isMenuOpen }) => (isMenuOpen ? 1 : 0)};
     pointer-events: none;
     position: fixed;
     right: ${({ theme }) => theme.spacing(2)};
+    opacity: ${({ isIconDisplayedOnHoverOnly }) =>
+      isIconDisplayedOnHoverOnly ? 0 : 1};
     transition: opacity ${({ theme }) => theme.animation.duration.instant}s ease;
   }
 
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-bar/components/__stories__/NavigationBar.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-bar/components/__stories__/NavigationBar.stories.tsx
index e1bc8bb72e25..30d9d86d7a08 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-bar/components/__stories__/NavigationBar.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-bar/components/__stories__/NavigationBar.stories.tsx
@@ -1,11 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
+import { IconCheckbox, IconList, IconSearch, IconSettings } from 'twenty-ui';
 
-import {
-  IconCheckbox,
-  IconList,
-  IconSearch,
-  IconSettings,
-} from '@/ui/display/icon';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
 
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton.tsx
new file mode 100644
index 000000000000..f89bc1eef4da
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton.tsx
@@ -0,0 +1,124 @@
+import { useState } from 'react';
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import { useRecoilValue } from 'recoil';
+import { IconChevronDown } from 'twenty-ui';
+
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { Workspaces } from '@/auth/states/workspaces';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+import { MenuItemSelectAvatar } from '@/ui/navigation/menu-item/components/MenuItemSelectAvatar';
+import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';
+import { MULTI_WORKSPACE_DROPDOWN_ID } from '@/ui/navigation/navigation-drawer/constants/MulitWorkspaceDropdownId';
+import { useWorkspaceSwitching } from '@/ui/navigation/navigation-drawer/hooks/useWorkspaceSwitching';
+import { NavigationDrawerHotKeyScope } from '@/ui/navigation/navigation-drawer/types/NavigationDrawerHotKeyScope';
+
+const StyledLogo = styled.div<{ logo: string }>`
+  background: url(${({ logo }) => logo});
+  background-position: center;
+  background-size: cover;
+  border-radius: ${({ theme }) => theme.border.radius.xs};
+  height: 16px;
+  width: 16px;
+`;
+
+const StyledContainer = styled.div`
+  align-items: center;
+  cursor: pointer;
+  color: ${({ theme }) => theme.font.color.primary};
+  border-radius: ${({ theme }) => theme.border.radius.sm};
+  border: 1px solid transparent;
+  display: flex;
+  justify-content: space-between;
+  height: ${({ theme }) => theme.spacing(7)};
+  padding: 0 ${({ theme }) => theme.spacing(2)};
+  width: 100%;
+
+  &:hover {
+    background-color: ${({ theme }) => theme.background.transparent.lighter};
+    border: 1px solid ${({ theme }) => theme.border.color.medium};
+  }
+`;
+
+const StyledLabel = styled.div`
+  align-items: center;
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(2)};
+`;
+
+const StyledIconChevronDown = styled(IconChevronDown)<{ disabled?: boolean }>`
+  color: ${({ disabled, theme }) =>
+    disabled ? theme.font.color.extraLight : theme.font.color.tertiary};
+`;
+
+type MultiWorkspaceDropdownButtonProps = {
+  workspaces: Workspaces[];
+};
+
+export const MultiWorkspaceDropdownButton = ({
+  workspaces,
+}: MultiWorkspaceDropdownButtonProps) => {
+  const theme = useTheme();
+  const currentWorkspace = useRecoilValue(currentWorkspaceState);
+
+  const [isMultiWorkspaceDropdownOpen, setToggleMultiWorkspaceDropdown] =
+    useState(false);
+
+  const { switchWorkspace } = useWorkspaceSwitching();
+
+  const { closeDropdown } = useDropdown(MULTI_WORKSPACE_DROPDOWN_ID);
+
+  const handleChange = async (workspaceId: string) => {
+    setToggleMultiWorkspaceDropdown(!isMultiWorkspaceDropdownOpen);
+    closeDropdown();
+    await switchWorkspace(workspaceId);
+  };
+
+  return (
+    <Dropdown
+      dropdownId={MULTI_WORKSPACE_DROPDOWN_ID}
+      dropdownHotkeyScope={{
+        scope: NavigationDrawerHotKeyScope.MultiWorkspaceDropdownButton,
+      }}
+      clickableComponent={
+        <StyledContainer>
+          <StyledLogo
+            logo={
+              currentWorkspace?.logo === null
+                ? DEFAULT_WORKSPACE_LOGO
+                : currentWorkspace?.logo ?? ''
+            }
+          />
+          <StyledLabel>{currentWorkspace?.displayName ?? ''}</StyledLabel>
+          <StyledIconChevronDown
+            size={theme.icon.size.md}
+            stroke={theme.icon.stroke.sm}
+          />
+        </StyledContainer>
+      }
+      dropdownComponents={
+        <DropdownMenuItemsContainer>
+          {workspaces.map((workspace) => (
+            <MenuItemSelectAvatar
+              key={workspace.id}
+              text={workspace.displayName ?? ''}
+              avatar={
+                <StyledLogo
+                  logo={
+                    workspace.logo === null
+                      ? DEFAULT_WORKSPACE_LOGO
+                      : workspace.logo ?? ''
+                  }
+                />
+              }
+              selected={currentWorkspace?.id === workspace.id}
+              onClick={() => handleChange(workspace.id)}
+            />
+          ))}
+        </DropdownMenuItemsContainer>
+      }
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx
index 30f478a9336f..3c775d230e5f 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx
@@ -2,8 +2,8 @@ import { useNavigate } from 'react-router-dom';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
+import { IconChevronLeft } from 'twenty-ui';
 
-import { IconChevronLeft } from '@/ui/display/icon/index';
 import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
 
 type NavigationDrawerBackButtonProps = {
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx
index 2f82eb4c8c6f..856cb3041a88 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx
@@ -1,10 +1,10 @@
 import styled from '@emotion/styled';
 import { useSetRecoilState } from 'recoil';
-
 import {
   IconLayoutSidebarLeftCollapse,
   IconLayoutSidebarRightCollapse,
-} from '@/ui/display/icon';
+} from 'twenty-ui';
+
 import { IconButton } from '@/ui/input/button/components/IconButton';
 import { isNavigationDrawerOpenState } from '@/ui/navigation/states/isNavigationDrawerOpenState';
 
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
index 568fbb4b6b85..eae27e8c73d3 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
@@ -1,5 +1,10 @@
 import styled from '@emotion/styled';
+import { useRecoilValue } from 'recoil';
 
+import { workspacesState } from '@/auth/states/workspaces';
+import { MultiWorkspaceDropdownButton } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton';
+import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';
+import { DEFAULT_WORKSPACE_NAME } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceName';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 
 import { NavigationDrawerCollapseButton } from './NavigationDrawerCollapseButton';
@@ -44,16 +49,24 @@ type NavigationDrawerHeaderProps = {
 };
 
 export const NavigationDrawerHeader = ({
-  name = 'Twenty',
-  logo = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAA7EAAAOxAGVKw4bAAACb0lEQVR4nO2VO4taQRTHr3AblbjxEVlwCwVhg7BoqqCIjy/gAyyFWNlYBOxsfH0KuxgQGwXRUkGuL2S7i1barGAgiwbdW93SnGOc4BonPiKahf3DwXFmuP/fPM4ZlvmlTxAhCBdzHnEQWYiv7Mr4C3NeuVYhQYDPzOUUQgDLBQGcLHNhvQK8DACPx8PTxiqVyvISG43GbyaT6Qfpn06n0m63e/tPAPF4vJ1MJu8kEsnWTCkWi1yr1RKGw+GDRqPBOTfr44vFQvD7/Q/lcpmaaVQAr9fLp1IpO22c47hGOBz+MB6PH+Vy+VYDAL8qlUoGtVotzOfzq4MAgsHgE/6KojiQyWR/bKVSqbSszHFM8Pl8z1YK48JsNltCOBwOnrYLO+8AAIjb+nHbycoTiUQfDJ7tFq4YAHiVSmXBxcD41u8flQU8z7fhzO0r83atVns3Go3u9Xr9x0O/RQXo9/tsIBBg6vX606a52Wz+bZ7P5/WwG29gxSJzhKgA6XTaDoFNF+krFAocmC//4yWEcSf2wTm7mCO19xFgSsKOLI16vV7b7XY7mRNoLwA0JymJ5uQIzgIAuX5PzDElT2m+E8BqtQ4ymcx7Yq7T6a6ZE4sKgOadTucaCwkxp1UzlEKh0GDxIXOwDWHAdi6Xe3swQDQa/Q7mywoolUpvsaptymazDWKxmBHTlWXZm405BFZoNpuGgwEmk4mE2SGtVivii4f1AO7J3ZopkQCQj7Ar1FeRChCJRJzVapX6DKNIfSc1Ax+wtQWQ55h6bH8FWDfYV4fO3wlwDr0C/BcADYiTPCxHqIEA2QsCZAkAKnRGkMbKN/sTX5YHPQ1e7SkAAAAASUVORK5CYII=',
+  name = DEFAULT_WORKSPACE_NAME,
+  logo = DEFAULT_WORKSPACE_LOGO,
   showCollapseButton,
 }: NavigationDrawerHeaderProps) => {
   const isMobile = useIsMobile();
+  const workspaces = useRecoilValue(workspacesState);
 
   return (
     <StyledContainer>
-      <StyledLogo logo={logo} />
-      <StyledName>{name}</StyledName>
+      {workspaces !== null && workspaces.length > 1 ? (
+        <MultiWorkspaceDropdownButton workspaces={workspaces} />
+      ) : (
+        <>
+          <StyledLogo logo={logo} />
+          <StyledName>{name}</StyledName>
+        </>
+      )}
+
       {!isMobile && (
         <StyledNavigationDrawerCollapseButton
           direction="left"
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
index f3445397e512..aec5d35cf52d 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
@@ -1,12 +1,15 @@
 import { useNavigate } from 'react-router-dom';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { isNonEmptyString } from '@sniptt/guards';
 import { useSetRecoilState } from 'recoil';
+import { Pill } from 'twenty-ui';
 
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 import { isNavigationDrawerOpenState } from '@/ui/navigation/states/isNavigationDrawerOpenState';
 import { MOBILE_VIEWPORT } from '@/ui/theme/constants/MobileViewport';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
+import { isDefined } from '~/utils/isDefined';
 
 export type NavigationDrawerItemProps = {
   className?: string;
@@ -36,13 +39,13 @@ const StyledItem = styled.div<StyledItemProps>`
   border: none;
   border-radius: ${({ theme }) => theme.border.radius.sm};
   color: ${(props) => {
-    if (props.active) {
+    if (props.active === true) {
       return props.theme.font.color.primary;
     }
-    if (props.danger) {
+    if (props.danger === true) {
       return props.theme.color.red;
     }
-    if (props.soon) {
+    if (props.soon === true) {
       return props.theme.font.color.light;
     }
     return props.theme.font.color.secondary;
@@ -83,18 +86,6 @@ const StyledItemLabel = styled.div`
   white-space: nowrap;
 `;
 
-const StyledSoonPill = styled.div`
-  align-items: center;
-  background-color: ${({ theme }) => theme.background.transparent.light};
-  border-radius: 50px;
-  display: flex;
-  font-size: ${({ theme }) => theme.font.size.xs};
-  height: 16px;
-  justify-content: center;
-  padding-left: ${({ theme }) => theme.spacing(2)};
-  padding-right: ${({ theme }) => theme.spacing(2)};
-`;
-
 const StyledItemCount = styled.div`
   align-items: center;
   background-color: ${({ theme }) => theme.color.blue};
@@ -146,12 +137,12 @@ export const NavigationDrawerItem = ({
       setIsNavigationDrawerOpen(false);
     }
 
-    if (onClick) {
+    if (isDefined(onClick)) {
       onClick();
       return;
     }
 
-    if (to) navigate(to);
+    if (isNonEmptyString(to)) navigate(to);
   };
 
   return (
@@ -164,9 +155,9 @@ export const NavigationDrawerItem = ({
       danger={danger}
       soon={soon}
     >
-      {Icon && <Icon size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />}
+      {Icon && <Icon size={theme.icon.size.md} stroke={theme.icon.stroke.md} />}
       <StyledItemLabel>{label}</StyledItemLabel>
-      {soon && <StyledSoonPill>Soon</StyledSoonPill>}
+      {soon && <Pill label="Soon" />}
       {!!count && <StyledItemCount>{count}</StyledItemCount>}
       {keyboard && (
         <StyledKeyBoardShortcut className="keyboard-shortcuts">
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx
index efd78f5e3dc4..96d16a5526fe 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx
@@ -1,8 +1,4 @@
 import { Meta, StoryObj } from '@storybook/react';
-
-import { Favorites } from '@/favorites/components/Favorites';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
-import { SettingsPath } from '@/types/SettingsPath';
 import {
   IconAt,
   IconBell,
@@ -18,7 +14,11 @@ import {
   IconUser,
   IconUserCircle,
   IconUsers,
-} from '@/ui/display/icon';
+} from 'twenty-ui';
+
+import { Favorites } from '@/favorites/components/Favorites';
+import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
+import { SettingsPath } from '@/types/SettingsPath';
 import { GithubVersionLink } from '@/ui/navigation/link/components/GithubVersionLink';
 import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx
index c7f7957d89e9..90fb66e33f73 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled';
 import { Meta, StoryObj } from '@storybook/react';
+import { IconSearch } from 'twenty-ui';
 
-import { IconSearch } from '@/ui/display/icon';
 import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
 import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
 import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo.ts b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo.ts
new file mode 100644
index 000000000000..7f58ca06ba31
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo.ts
@@ -0,0 +1,2 @@
+export const DEFAULT_WORKSPACE_LOGO =
+  'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAA7EAAAOxAGVKw4bAAACb0lEQVR4nO2VO4taQRTHr3AblbjxEVlwCwVhg7BoqqCIjy/gAyyFWNlYBOxsfH0KuxgQGwXRUkGuL2S7i1barGAgiwbdW93SnGOc4BonPiKahf3DwXFmuP/fPM4ZlvmlTxAhCBdzHnEQWYiv7Mr4C3NeuVYhQYDPzOUUQgDLBQGcLHNhvQK8DACPx8PTxiqVyvISG43GbyaT6Qfpn06n0m63e/tPAPF4vJ1MJu8kEsnWTCkWi1yr1RKGw+GDRqPBOTfr44vFQvD7/Q/lcpmaaVQAr9fLp1IpO22c47hGOBz+MB6PH+Vy+VYDAL8qlUoGtVotzOfzq4MAgsHgE/6KojiQyWR/bKVSqbSszHFM8Pl8z1YK48JsNltCOBwOnrYLO+8AAIjb+nHbycoTiUQfDJ7tFq4YAHiVSmXBxcD41u8flQU8z7fhzO0r83atVns3Go3u9Xr9x0O/RQXo9/tsIBBg6vX606a52Wz+bZ7P5/WwG29gxSJzhKgA6XTaDoFNF+krFAocmC//4yWEcSf2wTm7mCO19xFgSsKOLI16vV7b7XY7mRNoLwA0JymJ5uQIzgIAuX5PzDElT2m+E8BqtQ4ymcx7Yq7T6a6ZE4sKgOadTucaCwkxp1UzlEKh0GDxIXOwDWHAdi6Xe3swQDQa/Q7mywoolUpvsaptymazDWKxmBHTlWXZm405BFZoNpuGgwEmk4mE2SGtVivii4f1AO7J3ZopkQCQj7Ar1FeRChCJRJzVapX6DKNIfSc1Ax+wtQWQ55h6bH8FWDfYV4fO3wlwDr0C/BcADYiTPCxHqIEA2QsCZAkAKnRGkMbKN/sTX5YHPQ1e7SkAAAAASUVORK5CYII=';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/DefaultWorkspaceName.ts b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/DefaultWorkspaceName.ts
new file mode 100644
index 000000000000..de9ed6e96ada
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/DefaultWorkspaceName.ts
@@ -0,0 +1 @@
+export const DEFAULT_WORKSPACE_NAME = 'Twenty';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/MulitWorkspaceDropdownId.ts b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/MulitWorkspaceDropdownId.ts
new file mode 100644
index 000000000000..77e212e32a48
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/MulitWorkspaceDropdownId.ts
@@ -0,0 +1 @@
+export const MULTI_WORKSPACE_DROPDOWN_ID = 'multi-workspace-dropdown-id';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useWorkspaceSwitching.ts b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useWorkspaceSwitching.ts
new file mode 100644
index 000000000000..4ba363686b23
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useWorkspaceSwitching.ts
@@ -0,0 +1,38 @@
+import { useNavigate } from 'react-router-dom';
+import { useRecoilValue, useSetRecoilState } from 'recoil';
+
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { tokenPairState } from '@/auth/states/tokenPairState';
+import { useGenerateJwtMutation } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
+
+export const useWorkspaceSwitching = () => {
+  const navigate = useNavigate();
+  const setTokenPair = useSetRecoilState(tokenPairState);
+  const [generateJWT] = useGenerateJwtMutation();
+  const currentWorkspace = useRecoilValue(currentWorkspaceState);
+
+  const switchWorkspace = async (workspaceId: string) => {
+    if (currentWorkspace?.id === workspaceId) return;
+    const jwt = await generateJWT({
+      variables: {
+        workspaceId,
+      },
+    });
+
+    if (isDefined(jwt.errors)) {
+      throw jwt.errors;
+    }
+
+    if (!isDefined(jwt.data?.generateJWT)) {
+      throw new Error('could not create token');
+    }
+
+    const { tokens } = jwt.data.generateJWT;
+    setTokenPair(tokens);
+    navigate(`/objects/companies`);
+    window.location.reload();
+  };
+
+  return { switchWorkspace };
+};
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/types/NavigationDrawerHotKeyScope.ts b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/types/NavigationDrawerHotKeyScope.ts
new file mode 100644
index 000000000000..834b5d50ea56
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/types/NavigationDrawerHotKeyScope.ts
@@ -0,0 +1,3 @@
+export enum NavigationDrawerHotKeyScope {
+  MultiWorkspaceDropdownButton = 'multi-workspace-dropdown',
+}
diff --git a/packages/twenty-front/src/modules/ui/navigation/states/navigationMemorizedUrlState.ts b/packages/twenty-front/src/modules/ui/navigation/states/navigationMemorizedUrlState.ts
index 6537c265ae81..bb8318ecd952 100644
--- a/packages/twenty-front/src/modules/ui/navigation/states/navigationMemorizedUrlState.ts
+++ b/packages/twenty-front/src/modules/ui/navigation/states/navigationMemorizedUrlState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const navigationMemorizedUrlState = atom<string>({
+export const navigationMemorizedUrlState = createState<string>({
   key: 'navigationMemorizedUrlState',
-  default: '/',
+  defaultValue: '/',
 });
diff --git a/packages/twenty-front/src/modules/ui/navigation/step-bar/states/stepBarInternalState.ts b/packages/twenty-front/src/modules/ui/navigation/step-bar/states/stepBarInternalState.ts
index 5917096d9201..d2bf60d60839 100644
--- a/packages/twenty-front/src/modules/ui/navigation/step-bar/states/stepBarInternalState.ts
+++ b/packages/twenty-front/src/modules/ui/navigation/step-bar/states/stepBarInternalState.ts
@@ -1,12 +1,12 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 export type StepsState = {
   activeStep: number;
 };
 
-export const stepBarInternalState = atom<StepsState>({
+export const stepBarInternalState = createState<StepsState>({
   key: 'step-bar/internal-state',
-  default: {
+  defaultValue: {
     activeStep: -1,
   },
 });
diff --git a/packages/twenty-front/src/modules/ui/theme/components/AppThemeProvider.tsx b/packages/twenty-front/src/modules/ui/theme/components/AppThemeProvider.tsx
index d1f14d262360..e4d03580a4b1 100644
--- a/packages/twenty-front/src/modules/ui/theme/components/AppThemeProvider.tsx
+++ b/packages/twenty-front/src/modules/ui/theme/components/AppThemeProvider.tsx
@@ -1,7 +1,5 @@
 import { ThemeProvider } from '@emotion/react';
-
-import { THEME_DARK } from '@/ui/theme/constants/ThemeDark';
-import { THEME_LIGHT } from '@/ui/theme/constants/ThemeLight';
+import { THEME_DARK, THEME_LIGHT } from 'twenty-ui';
 
 import { useColorScheme } from '../hooks/useColorScheme';
 import { useSystemColorScheme } from '../hooks/useSystemColorScheme';
diff --git a/packages/twenty-front/src/modules/ui/theme/constants/BackgroundDark.ts b/packages/twenty-front/src/modules/ui/theme/constants/BackgroundDark.ts
index c5204dbbaf33..e91329882d07 100644
--- a/packages/twenty-front/src/modules/ui/theme/constants/BackgroundDark.ts
+++ b/packages/twenty-front/src/modules/ui/theme/constants/BackgroundDark.ts
@@ -20,6 +20,7 @@ export const BACKGROUND_DARK = {
     light: RGBA(GRAY_SCALE.gray0, 0.06),
     lighter: RGBA(GRAY_SCALE.gray0, 0.03),
     danger: RGBA(COLOR.red, 0.08),
+    forBackdropFilter: RGBA(GRAY_SCALE.gray80, 0.5),
   },
   overlay: RGBA(GRAY_SCALE.gray80, 0.8),
   radialGradient: `radial-gradient(50% 62.62% at 50% 0%, #505050 0%, ${GRAY_SCALE.gray60} 100%)`,
diff --git a/packages/twenty-front/src/modules/ui/theme/constants/BackgroundLight.ts b/packages/twenty-front/src/modules/ui/theme/constants/BackgroundLight.ts
index 3247f5f9fbf5..e78f8e6bb5cc 100644
--- a/packages/twenty-front/src/modules/ui/theme/constants/BackgroundLight.ts
+++ b/packages/twenty-front/src/modules/ui/theme/constants/BackgroundLight.ts
@@ -20,6 +20,7 @@ export const BACKGROUND_LIGHT = {
     light: RGBA(GRAY_SCALE.gray100, 0.04),
     lighter: RGBA(GRAY_SCALE.gray100, 0.02),
     danger: RGBA(COLOR.red, 0.08),
+    forBackdropFilter: RGBA(GRAY_SCALE.gray10, 0.5),
   },
   overlay: RGBA(GRAY_SCALE.gray80, 0.8),
   radialGradient: `radial-gradient(50% 62.62% at 50% 0%, #505050 0%, ${GRAY_SCALE.gray60} 100%)`,
diff --git a/packages/twenty-front/src/modules/ui/theme/constants/OverlayBackground.ts b/packages/twenty-front/src/modules/ui/theme/constants/OverlayBackground.ts
index b86741fff75a..083133298ebd 100644
--- a/packages/twenty-front/src/modules/ui/theme/constants/OverlayBackground.ts
+++ b/packages/twenty-front/src/modules/ui/theme/constants/OverlayBackground.ts
@@ -3,7 +3,7 @@ import { css } from '@emotion/react';
 import { ThemeType } from './ThemeLight';
 
 export const OVERLAY_BACKGROUND = (props: { theme: ThemeType }) => css`
-  backdrop-filter: blur(8px);
+  backdrop-filter: blur(12px) saturate(200%) contrast(50%) brightness(130%);
   background: ${props.theme.background.transparent.secondary};
   box-shadow: ${props.theme.boxShadow.strong};
 `;
diff --git a/packages/twenty-front/src/modules/ui/theme/hooks/useSystemColorScheme.ts b/packages/twenty-front/src/modules/ui/theme/hooks/useSystemColorScheme.ts
index ea9f02648ee0..a246b236fca6 100644
--- a/packages/twenty-front/src/modules/ui/theme/hooks/useSystemColorScheme.ts
+++ b/packages/twenty-front/src/modules/ui/theme/hooks/useSystemColorScheme.ts
@@ -1,6 +1,7 @@
 import { useEffect, useMemo, useState } from 'react';
 
 import { ColorScheme } from '@/workspace-member/types/WorkspaceMember';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 export const useSystemColorScheme = (): ColorScheme => {
   const mediaQuery = useMemo(
@@ -13,7 +14,7 @@ export const useSystemColorScheme = (): ColorScheme => {
   );
 
   useEffect(() => {
-    if (!window.matchMedia) {
+    if (isUndefinedOrNull(window.matchMedia)) {
       return;
     }
 
diff --git a/packages/twenty-front/src/modules/ui/utilities/dimensions/components/ComputeNodeDimensions.tsx b/packages/twenty-front/src/modules/ui/utilities/dimensions/components/ComputeNodeDimensions.tsx
index 4e255214238a..2d3acb3f0f85 100644
--- a/packages/twenty-front/src/modules/ui/utilities/dimensions/components/ComputeNodeDimensions.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/dimensions/components/ComputeNodeDimensions.tsx
@@ -1,6 +1,8 @@
 import { ReactNode, useLayoutEffect, useRef, useState } from 'react';
 import styled from '@emotion/styled';
 
+import { isDefined } from '~/utils/isDefined';
+
 type ComputeNodeDimensionsProps = {
   children: (
     dimensions: { height: number; width: number } | undefined,
@@ -32,7 +34,7 @@ export const ComputeNodeDimensions = ({
       return;
     }
     const resizeObserver = new ResizeObserver(() => {
-      if (nodeWrapperRef.current) {
+      if (isDefined(nodeWrapperRef.current)) {
         setNodeDimensions({
           width: nodeWrapperRef.current.offsetWidth,
           height: nodeWrapperRef.current.offsetHeight,
diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/usePreviousHotkeyScope.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/usePreviousHotkeyScope.ts
index 36601c63bc37..a8a9f901184c 100644
--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/usePreviousHotkeyScope.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/usePreviousHotkeyScope.ts
@@ -1,5 +1,8 @@
 import { useRecoilCallback } from 'recoil';
 
+import { DEBUG_HOTKEY_SCOPE } from '@/ui/utilities/hotkey/hooks/useScopedHotkeyCallback';
+import { logDebug } from '~/utils/logDebug';
+
 import { currentHotkeyScopeState } from '../states/internal/currentHotkeyScopeState';
 import { previousHotkeyScopeState } from '../states/internal/previousHotkeyScopeState';
 import { CustomHotkeyScopes } from '../types/CustomHotkeyScope';
@@ -14,12 +17,17 @@ export const usePreviousHotkeyScope = () => {
       () => {
         const previousHotkeyScope = snapshot
           .getLoadable(previousHotkeyScopeState)
-          .valueOrThrow();
+          .getValue();
 
         if (!previousHotkeyScope) {
           return;
         }
 
+        // eslint-disable-next-line @nx/workspace-explicit-boolean-predicates-in-if
+        if (DEBUG_HOTKEY_SCOPE) {
+          logDebug('DEBUG: goBackToPreviousHotkeyScope', previousHotkeyScope);
+        }
+
         setHotkeyScope(
           previousHotkeyScope.scope,
           previousHotkeyScope.customScopes,
@@ -35,7 +43,16 @@ export const usePreviousHotkeyScope = () => {
       (scope: string, customScopes?: CustomHotkeyScopes) => {
         const currentHotkeyScope = snapshot
           .getLoadable(currentHotkeyScopeState)
-          .valueOrThrow();
+          .getValue();
+
+        // eslint-disable-next-line @nx/workspace-explicit-boolean-predicates-in-if
+        if (DEBUG_HOTKEY_SCOPE) {
+          logDebug('DEBUG: setHotkeyScopeAndMemorizePreviousScope', {
+            currentHotkeyScope,
+            scope,
+            customScopes,
+          });
+        }
 
         setHotkeyScope(scope, customScopes);
         set(previousHotkeyScopeState, currentHotkeyScope);
diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useScopedHotkeyCallback.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useScopedHotkeyCallback.ts
index 74ea22e95b9a..053ac4c850cc 100644
--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useScopedHotkeyCallback.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useScopedHotkeyCallback.ts
@@ -5,7 +5,7 @@ import { logDebug } from '~/utils/logDebug';
 
 import { internalHotkeysEnabledScopesState } from '../states/internal/internalHotkeysEnabledScopesState';
 
-const DEBUG_HOTKEY_SCOPE = false;
+export const DEBUG_HOTKEY_SCOPE = true;
 
 export const useScopedHotkeyCallback = () =>
   useRecoilCallback(
@@ -25,12 +25,13 @@ export const useScopedHotkeyCallback = () =>
       }) => {
         const currentHotkeyScopes = snapshot
           .getLoadable(internalHotkeysEnabledScopesState)
-          .valueOrThrow();
+          .getValue();
 
         if (!currentHotkeyScopes.includes(scope)) {
+          // eslint-disable-next-line @nx/workspace-explicit-boolean-predicates-in-if
           if (DEBUG_HOTKEY_SCOPE) {
             logDebug(
-              `%cI can't call hotkey (${
+              `DEBUG: %cI can't call hotkey (${
                 hotkeysEvent.keys
               }) because I'm in scope [${scope}] and the active scopes are : [${currentHotkeyScopes.join(
                 ', ',
@@ -42,9 +43,10 @@ export const useScopedHotkeyCallback = () =>
           return;
         }
 
+        // eslint-disable-next-line @nx/workspace-explicit-boolean-predicates-in-if
         if (DEBUG_HOTKEY_SCOPE) {
           logDebug(
-            `%cI can call hotkey (${
+            `DEBUG: %cI can call hotkey (${
               hotkeysEvent.keys
             }) because I'm in scope [${scope}] and the active scopes are : [${currentHotkeyScopes.join(
               ', ',
diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useSequenceScopedHotkeys.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useSequenceScopedHotkeys.ts
index 46152de351c3..1ab3fe8e04fa 100644
--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useSequenceScopedHotkeys.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useSequenceScopedHotkeys.ts
@@ -2,6 +2,8 @@ import { Options, useHotkeys } from 'react-hotkeys-hook';
 import { Keys } from 'react-hotkeys-hook/dist/types';
 import { useRecoilState } from 'recoil';
 
+import { isDefined } from '~/utils/isDefined';
+
 import { pendingHotkeyState } from '../states/internal/pendingHotkeysState';
 
 import { useScopedHotkeyCallback } from './useScopedHotkeyCallback';
@@ -55,7 +57,7 @@ export const useSequenceHotkeys = (
 
           setPendingHotkey(null);
 
-          if (options.preventDefault) {
+          if (isDefined(options.preventDefault)) {
             keyboardEvent.stopImmediatePropagation();
             keyboardEvent.stopPropagation();
             keyboardEvent.preventDefault();
diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useSetHotkeyScope.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useSetHotkeyScope.ts
index 26f29170cc3d..65f4261c4747 100644
--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useSetHotkeyScope.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useSetHotkeyScope.ts
@@ -1,6 +1,8 @@
 import { useRecoilCallback } from 'recoil';
 
-import { isNonNullable } from '~/utils/isNonNullable';
+import { DEBUG_HOTKEY_SCOPE } from '@/ui/utilities/hotkey/hooks/useScopedHotkeyCallback';
+import { isDefined } from '~/utils/isDefined';
+import { logDebug } from '~/utils/logDebug';
 
 import { DEFAULT_HOTKEYS_SCOPE_CUSTOM_SCOPES } from '../constants/DefaultHotkeysScopeCustomScopes';
 import { currentHotkeyScopeState } from '../states/internal/currentHotkeyScopeState';
@@ -27,10 +29,10 @@ export const useSetHotkeyScope = () =>
       async (hotkeyScopeToSet: string, customScopes?: CustomHotkeyScopes) => {
         const currentHotkeyScope = snapshot
           .getLoadable(currentHotkeyScopeState)
-          .valueOrThrow();
+          .getValue();
 
         if (currentHotkeyScope.scope === hotkeyScopeToSet) {
-          if (!isNonNullable(customScopes)) {
+          if (!isDefined(customScopes)) {
             if (
               isCustomScopesEqual(
                 currentHotkeyScope?.customScopes,
@@ -63,19 +65,30 @@ export const useSetHotkeyScope = () =>
 
         const scopesToSet: string[] = [];
 
-        if (newHotkeyScope.customScopes?.commandMenu) {
+        if (newHotkeyScope.customScopes?.commandMenu === true) {
           scopesToSet.push(AppHotkeyScope.CommandMenu);
         }
 
-        if (newHotkeyScope?.customScopes?.goto) {
+        if (newHotkeyScope?.customScopes?.goto === true) {
           scopesToSet.push(AppHotkeyScope.Goto);
         }
 
-        if (newHotkeyScope?.customScopes?.keyboardShortcutMenu) {
+        if (newHotkeyScope?.customScopes?.keyboardShortcutMenu === true) {
           scopesToSet.push(AppHotkeyScope.KeyboardShortcutMenu);
         }
 
         scopesToSet.push(newHotkeyScope.scope);
+
+        // TODO: fix eslint rule not understanding a boolean constant
+        //    See issue https://github.com/twentyhq/twenty/issues/4881
+        // eslint-disable-next-line @nx/workspace-explicit-boolean-predicates-in-if
+        if (DEBUG_HOTKEY_SCOPE) {
+          logDebug('DEBUG: set new hotkey scope', {
+            scopesToSet,
+            newHotkeyScope,
+          });
+        }
+
         set(internalHotkeysEnabledScopesState, scopesToSet);
         set(currentHotkeyScopeState, newHotkeyScope);
       },
diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/currentHotkeyScopeState.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/currentHotkeyScopeState.ts
index 98eeabde6a4a..6b41a6705ed2 100644
--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/currentHotkeyScopeState.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/currentHotkeyScopeState.ts
@@ -1,9 +1,9 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { INITIAL_HOTKEYS_SCOPE } from '../../constants/InitialHotkeysScope';
 import { HotkeyScope } from '../../types/HotkeyScope';
 
-export const currentHotkeyScopeState = atom<HotkeyScope>({
+export const currentHotkeyScopeState = createState<HotkeyScope>({
   key: 'currentHotkeyScopeState',
-  default: INITIAL_HOTKEYS_SCOPE,
+  defaultValue: INITIAL_HOTKEYS_SCOPE,
 });
diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/internalHotkeysEnabledScopesState.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/internalHotkeysEnabledScopesState.ts
index 5bc666110dc0..e2e06b62f46d 100644
--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/internalHotkeysEnabledScopesState.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/internalHotkeysEnabledScopesState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const internalHotkeysEnabledScopesState = atom<string[]>({
+export const internalHotkeysEnabledScopesState = createState<string[]>({
   key: 'internalHotkeysEnabledScopesState',
-  default: [],
+  defaultValue: [],
 });
diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/pendingHotkeysState.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/pendingHotkeysState.ts
index da2dbf173be3..13e1cc652c3d 100644
--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/pendingHotkeysState.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/pendingHotkeysState.ts
@@ -1,7 +1,7 @@
 import { Keys } from 'react-hotkeys-hook/dist/types';
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const pendingHotkeyState = atom<Keys | null>({
+export const pendingHotkeyState = createState<Keys | null>({
   key: 'pendingHotkeyState',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/previousHotkeyScopeState.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/previousHotkeyScopeState.ts
index fd076d8e22ed..3e438fef1b94 100644
--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/previousHotkeyScopeState.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/states/internal/previousHotkeyScopeState.ts
@@ -1,8 +1,8 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
 import { HotkeyScope } from '../../types/HotkeyScope';
 
-export const previousHotkeyScopeState = atom<HotkeyScope | null>({
+export const previousHotkeyScopeState = createState<HotkeyScope | null>({
   key: 'previousHotkeyScopeState',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/ui/utilities/loading-state/states/currentPageLocationState.ts b/packages/twenty-front/src/modules/ui/utilities/loading-state/states/currentPageLocationState.ts
index 0d96571b386a..601831e5a312 100644
--- a/packages/twenty-front/src/modules/ui/utilities/loading-state/states/currentPageLocationState.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/loading-state/states/currentPageLocationState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const currentPageLocationState = atom<string>({
+export const currentPageLocationState = createState<string>({
   key: 'currentPageLocationState',
-  default: '',
+  defaultValue: '',
 });
diff --git a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useClickOutsideListener.test.tsx b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useClickOutsideListener.test.tsx
index 5916fa12ad7d..04d2b882544f 100644
--- a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useClickOutsideListener.test.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useClickOutsideListener.test.tsx
@@ -15,9 +15,7 @@ describe('useClickOutsideListener', () => {
 
         return {
           useClickOutside: useClickOutsideListener(componentId),
-          isActivated: useRecoilValue(
-            getClickOutsideListenerIsActivatedState(),
-          ),
+          isActivated: useRecoilValue(getClickOutsideListenerIsActivatedState),
         };
       },
       {
diff --git a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useListenClickOutsideArrayOfRef.test.tsx b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useListenClickOutsideArrayOfRef.test.tsx
index 91325ecfec54..f236b78840f9 100644
--- a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useListenClickOutsideArrayOfRef.test.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useListenClickOutsideArrayOfRef.test.tsx
@@ -2,6 +2,8 @@ import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { fireEvent, render, renderHook } from '@testing-library/react';
 
+import { isDefined } from '~/utils/isDefined';
+
 import {
   ClickOutsideMode,
   useListenClickOutside,
@@ -46,7 +48,7 @@ describe('useListenClickOutside', () => {
     );
 
     act(() => {
-      if (containerRef.current) {
+      if (isDefined(containerRef.current)) {
         fireEvent.mouseDown(containerRef.current);
         fireEvent.click(containerRef.current);
       }
@@ -95,7 +97,7 @@ describe('useListenClickOutsideByClassName', () => {
 
     act(() => {
       const notClickableElement = container.querySelector('.will-trigger');
-      if (notClickableElement) {
+      if (isDefined(notClickableElement)) {
         fireEvent.mouseDown(notClickableElement);
         fireEvent.click(notClickableElement);
       }
@@ -122,7 +124,7 @@ describe('useListenClickOutsideByClassName', () => {
 
     act(() => {
       const notClickableElement = container.querySelector('.wont-trigger');
-      if (notClickableElement) {
+      if (isDefined(notClickableElement)) {
         fireEvent.mouseDown(notClickableElement);
         fireEvent.click(notClickableElement);
       }
diff --git a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useListenClickOutsideV2.test.tsx b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useListenClickOutsideV2.test.tsx
index 12f254299165..1afd8d13aac9 100644
--- a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useListenClickOutsideV2.test.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useListenClickOutsideV2.test.tsx
@@ -7,6 +7,7 @@ import {
   ClickOutsideMode,
   useListenClickOutsideV2,
 } from '@/ui/utilities/pointer-event/hooks/useListenClickOutsideV2';
+import { isDefined } from '~/utils/isDefined';
 
 const containerRef = React.createRef<HTMLDivElement>();
 const nullRef = React.createRef<HTMLDivElement>();
@@ -76,7 +77,7 @@ describe('useListenClickOutsideV2', () => {
     );
 
     act(() => {
-      if (containerRef.current) {
+      if (isDefined(containerRef.current)) {
         fireEvent.mouseDown(containerRef.current);
         fireEvent.click(containerRef.current);
       }
@@ -100,7 +101,7 @@ describe('useListenClickOutsideV2', () => {
     );
 
     act(() => {
-      if (containerRef.current) {
+      if (isDefined(containerRef.current)) {
         fireEvent.mouseDown(containerRef.current);
         fireEvent.click(containerRef.current);
       }
diff --git a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useClickOustideListenerStates.ts b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useClickOustideListenerStates.ts
index 9ca424aef76b..dc2675440399 100644
--- a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useClickOustideListenerStates.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useClickOustideListenerStates.ts
@@ -1,25 +1,25 @@
-import { clickOutsideListenerCallbacksStateScopeMap } from '@/ui/utilities/pointer-event/states/clickOutsideListenerCallbacksStateScopeMap';
-import { clickOutsideListenerIsActivatedStateScopeMap } from '@/ui/utilities/pointer-event/states/clickOutsideListenerIsActivatedStateScopeMap';
-import { clickOutsideListenerIsMouseDownInsideStateScopeMap } from '@/ui/utilities/pointer-event/states/clickOutsideListenerIsMouseDownInsideStateScopeMap';
+import { clickOutsideListenerCallbacksComponentState } from '@/ui/utilities/pointer-event/states/clickOutsideListenerCallbacksComponentState';
+import { clickOutsideListenerIsActivatedComponentState } from '@/ui/utilities/pointer-event/states/clickOutsideListenerIsActivatedComponentState';
+import { clickOutsideListenerIsMouseDownInsideComponentState } from '@/ui/utilities/pointer-event/states/clickOutsideListenerIsMouseDownInsideComponentState';
 import { lockedListenerIdState } from '@/ui/utilities/pointer-event/states/lockedListenerIdState';
 import { getScopeIdFromComponentId } from '@/ui/utilities/recoil-scope/utils/getScopeIdFromComponentId';
-import { getState } from '@/ui/utilities/recoil-scope/utils/getState';
+import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
 
 export const useClickOustideListenerStates = (componentId: string) => {
   const scopeId = getScopeIdFromComponentId(componentId);
 
   return {
     scopeId,
-    getClickOutsideListenerCallbacksState: getState(
-      clickOutsideListenerCallbacksStateScopeMap,
+    getClickOutsideListenerCallbacksState: extractComponentState(
+      clickOutsideListenerCallbacksComponentState,
       scopeId,
     ),
-    getClickOutsideListenerIsMouseDownInsideState: getState(
-      clickOutsideListenerIsMouseDownInsideStateScopeMap,
+    getClickOutsideListenerIsMouseDownInsideState: extractComponentState(
+      clickOutsideListenerIsMouseDownInsideComponentState,
       scopeId,
     ),
-    getClickOutsideListenerIsActivatedState: getState(
-      clickOutsideListenerIsActivatedStateScopeMap,
+    getClickOutsideListenerIsActivatedState: extractComponentState(
+      clickOutsideListenerIsActivatedComponentState,
       scopeId,
     ),
     lockedListenerIdState,
diff --git a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useClickOutsideListener.ts b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useClickOutsideListener.ts
index 3c41eab55483..a03da62510f8 100644
--- a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useClickOutsideListener.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useClickOutsideListener.ts
@@ -8,7 +8,7 @@ import {
 } from '@/ui/utilities/pointer-event/hooks/useListenClickOutsideV2';
 import { ClickOutsideListenerCallback } from '@/ui/utilities/pointer-event/types/ClickOutsideListenerCallback';
 import { getScopeIdFromComponentId } from '@/ui/utilities/recoil-scope/utils/getScopeIdFromComponentId';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const useClickOutsideListener = (componentId: string) => {
   // TODO: improve typing
@@ -34,7 +34,7 @@ export const useClickOutsideListener = (componentId: string) => {
             callback(event);
 
             const additionalCallbacks = snapshot
-              .getLoadable(getClickOutsideListenerCallbacksState())
+              .getLoadable(getClickOutsideListenerCallbacksState)
               .getValue();
 
             additionalCallbacks.forEach((additionalCallback) => {
@@ -51,7 +51,7 @@ export const useClickOutsideListener = (componentId: string) => {
   const toggleClickOutsideListener = useRecoilCallback(
     ({ set }) =>
       (activated: boolean) => {
-        set(getClickOutsideListenerIsActivatedState(), activated);
+        set(getClickOutsideListenerIsActivatedState, activated);
       },
     [getClickOutsideListenerIsActivatedState],
   );
@@ -60,21 +60,21 @@ export const useClickOutsideListener = (componentId: string) => {
     ({ set, snapshot }) =>
       ({ callbackFunction, callbackId }: ClickOutsideListenerCallback) => {
         const existingCallbacks = snapshot
-          .getLoadable(getClickOutsideListenerCallbacksState())
+          .getLoadable(getClickOutsideListenerCallbacksState)
           .getValue();
 
         const existingCallbackWithSameId = existingCallbacks.find(
           (callback) => callback.callbackId === callbackId,
         );
 
-        if (!isNonNullable(existingCallbackWithSameId)) {
+        if (!isDefined(existingCallbackWithSameId)) {
           const existingCallbacksWithNewCallback = existingCallbacks.concat({
             callbackId,
             callbackFunction,
           });
 
           set(
-            getClickOutsideListenerCallbacksState(),
+            getClickOutsideListenerCallbacksState,
             existingCallbacksWithNewCallback,
           );
         } else {
@@ -95,7 +95,7 @@ export const useClickOutsideListener = (componentId: string) => {
           };
 
           set(
-            getClickOutsideListenerCallbacksState(),
+            getClickOutsideListenerCallbacksState,
             existingCallbacksWithOverwrittenCallback,
           );
         }
@@ -107,7 +107,7 @@ export const useClickOutsideListener = (componentId: string) => {
     ({ set, snapshot }) =>
       ({ callbackId }: { callbackId: string }) => {
         const existingCallbacks = snapshot
-          .getLoadable(getClickOutsideListenerCallbacksState())
+          .getLoadable(getClickOutsideListenerCallbacksState)
           .getValue();
 
         const indexOfCallbackToUnsubscribe = existingCallbacks.findIndex(
@@ -121,7 +121,7 @@ export const useClickOutsideListener = (componentId: string) => {
             existingCallbacks.toSpliced(indexOfCallbackToUnsubscribe, 1);
 
           set(
-            getClickOutsideListenerCallbacksState(),
+            getClickOutsideListenerCallbacksState,
             newCallbacksWithoutCallbackToUnsubscribe,
           );
         }
diff --git a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useListenClickOutsideV2.ts b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useListenClickOutsideV2.ts
index e7f178e7d761..287d6b0f8e6d 100644
--- a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useListenClickOutsideV2.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useListenClickOutsideV2.ts
@@ -32,7 +32,7 @@ export const useListenClickOutsideV2 = <T extends Element>({
     ({ snapshot, set }) =>
       (event: MouseEvent | TouchEvent) => {
         const clickOutsideListenerIsActivated = snapshot
-          .getLoadable(getClickOutsideListenerIsActivatedState())
+          .getLoadable(getClickOutsideListenerIsActivatedState)
           .getValue();
 
         const isListening = clickOutsideListenerIsActivated && enabled;
@@ -47,7 +47,7 @@ export const useListenClickOutsideV2 = <T extends Element>({
             .some((ref) => ref.current?.contains(event.target as Node));
 
           set(
-            getClickOutsideListenerIsMouseDownInsideState(),
+            getClickOutsideListenerIsMouseDownInsideState,
             clickedOnAtLeastOneRef,
           );
         }
@@ -84,7 +84,7 @@ export const useListenClickOutsideV2 = <T extends Element>({
             });
 
           set(
-            getClickOutsideListenerIsMouseDownInsideState(),
+            getClickOutsideListenerIsMouseDownInsideState,
             clickedOnAtLeastOneRef,
           );
         }
@@ -102,7 +102,7 @@ export const useListenClickOutsideV2 = <T extends Element>({
     ({ snapshot }) =>
       (event: MouseEvent | TouchEvent) => {
         const isMouseDownInside = snapshot
-          .getLoadable(getClickOutsideListenerIsMouseDownInsideState())
+          .getLoadable(getClickOutsideListenerIsMouseDownInsideState)
           .getValue();
 
         if (mode === ClickOutsideMode.compareHTMLRef) {
diff --git a/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerCallbacksComponentState.ts b/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerCallbacksComponentState.ts
new file mode 100644
index 000000000000..d0c1ec291822
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerCallbacksComponentState.ts
@@ -0,0 +1,9 @@
+import { ClickOutsideListenerCallback } from '@/ui/utilities/pointer-event/types/ClickOutsideListenerCallback';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const clickOutsideListenerCallbacksComponentState = createComponentState<
+  ClickOutsideListenerCallback[]
+>({
+  key: 'clickOutsideListenerCallbacksComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerCallbacksStateScopeMap.ts b/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerCallbacksStateScopeMap.ts
deleted file mode 100644
index 425c3ca81d8b..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerCallbacksStateScopeMap.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ClickOutsideListenerCallback } from '@/ui/utilities/pointer-event/types/ClickOutsideListenerCallback';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const clickOutsideListenerCallbacksStateScopeMap = createStateScopeMap<
-  ClickOutsideListenerCallback[]
->({
-  key: 'clickOutsideListenerCallbacksStateScopeMap',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerIsActivatedComponentState.ts b/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerIsActivatedComponentState.ts
new file mode 100644
index 000000000000..8c08b27decfe
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerIsActivatedComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const clickOutsideListenerIsActivatedComponentState =
+  createComponentState<boolean>({
+    key: 'clickOutsideListenerIsActivatedComponentState',
+    defaultValue: true,
+  });
diff --git a/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerIsActivatedStateScopeMap.ts b/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerIsActivatedStateScopeMap.ts
deleted file mode 100644
index 61367a9aee12..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerIsActivatedStateScopeMap.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const clickOutsideListenerIsActivatedStateScopeMap =
-  createStateScopeMap<boolean>({
-    key: 'clickOutsideListenerIsActivatedStateScopeMap',
-    defaultValue: true,
-  });
diff --git a/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerIsMouseDownInsideComponentState.ts b/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerIsMouseDownInsideComponentState.ts
new file mode 100644
index 000000000000..47bb8f0f5187
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerIsMouseDownInsideComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const clickOutsideListenerIsMouseDownInsideComponentState =
+  createComponentState<boolean>({
+    key: 'clickOutsideListenerIsMouseDownInsideComponentState',
+    defaultValue: false,
+  });
diff --git a/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerIsMouseDownInsideStateScopeMap.ts b/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerIsMouseDownInsideStateScopeMap.ts
deleted file mode 100644
index cf425313977f..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/clickOutsideListenerIsMouseDownInsideStateScopeMap.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const clickOutsideListenerIsMouseDownInsideStateScopeMap =
-  createStateScopeMap<boolean>({
-    key: 'clickOutsideListenerIsMouseDownInsideStateScopeMap',
-    defaultValue: false,
-  });
diff --git a/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/lockedListenerIdState.ts b/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/lockedListenerIdState.ts
index 1349627fce9c..c91421dae3e8 100644
--- a/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/lockedListenerIdState.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/pointer-event/states/lockedListenerIdState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const lockedListenerIdState = atom<string | null>({
+export const lockedListenerIdState = createState<string | null>({
   key: 'lockedListenerIdState',
-  default: null,
+  defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useRecoilScopedFamilyState.test.tsx b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useRecoilScopedFamilyState.test.tsx
deleted file mode 100644
index d670a9554439..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useRecoilScopedFamilyState.test.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { act, renderHook } from '@testing-library/react';
-import { RecoilRoot, RecoilState } from 'recoil';
-import { undefined } from 'zod';
-
-import { useRecoilScopedFamilyState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedFamilyState';
-import { FamilyStateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/FamilyStateScopeMapKey';
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-const testState = createFamilyStateScopeMap({
-  key: 'sampleKey',
-  defaultValue: 'defaultValue',
-});
-
-describe('useRecoilScopedFamilyState', () => {
-  it('Should work as expected', async () => {
-    const { result, rerender } = renderHook(
-      ({
-        recoilState,
-        scopeId,
-        familyKey,
-      }: {
-        recoilState: (
-          scopedFamilyKey: FamilyStateScopeMapKey<string>,
-        ) => RecoilState<string>;
-        scopeId: string;
-        familyKey?: string;
-      }) => useRecoilScopedFamilyState(recoilState, scopeId, familyKey),
-      {
-        wrapper: RecoilRoot,
-        initialProps: {
-          recoilState: testState,
-          scopeId: 'scopeId',
-        },
-      },
-    );
-
-    expect(result.current).toEqual([undefined, undefined]);
-
-    rerender({
-      recoilState: testState,
-      scopeId: 'scopeId',
-      familyKey: 'familyKey',
-    });
-
-    const [value, setValue] = result.current;
-
-    expect(value).toBe('defaultValue');
-    expect(setValue).toBeInstanceOf(Function);
-
-    act(() => {
-      setValue?.('newValue');
-    });
-
-    expect(result.current[0]).toBe('newValue');
-
-    rerender({
-      recoilState: testState,
-      scopeId: 'scopeId1',
-      familyKey: 'familyKey',
-    });
-
-    expect(result.current[0]).toBe('defaultValue');
-  });
-});
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useRecoilScopedState.test.tsx b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useRecoilScopedState.test.tsx
deleted file mode 100644
index 706e72f9077d..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useRecoilScopedState.test.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { createContext } from 'react';
-import { act, renderHook } from '@testing-library/react';
-import { atomFamily, RecoilRoot } from 'recoil';
-
-import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
-
-const testScopedState = atomFamily<string | null, string>({
-  key: 'testKey',
-  default: null,
-});
-
-const mockedContextValue = 'mocked-scope-id';
-const MockedContext = createContext<string | null>(mockedContextValue);
-const nullContext = createContext<string | null>(null);
-
-const ERROR_MESSAGE =
-  'Using a scoped atom without a RecoilScope : testKey__"", verify that you are using a RecoilScope with a specific context if you intended to do so.';
-
-describe('useRecoilScopedState', () => {
-  it('Should return the getter and setter for the state and context passed and work properly', async () => {
-    const { result } = renderHook(
-      () => useRecoilScopedState(testScopedState, MockedContext),
-      {
-        wrapper: ({ children }) => (
-          <MockedContext.Provider value={mockedContextValue}>
-            <RecoilRoot>{children}</RecoilRoot>
-          </MockedContext.Provider>
-        ),
-      },
-    );
-
-    const [scopedState, setScopedState] = result.current;
-
-    expect(scopedState).toBeNull();
-
-    await act(async () => {
-      setScopedState('testValue');
-    });
-
-    const [scopedStateAfterSetter] = result.current;
-
-    expect(scopedStateAfterSetter).toEqual('testValue');
-  });
-
-  it('Should throw an error when the recoilScopeId is not found by the context', () => {
-    expect(() => {
-      renderHook(() => useRecoilScopedState(testScopedState, nullContext));
-    }).toThrow(ERROR_MESSAGE);
-  });
-});
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useRecoilScopedValue.test.tsx b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useRecoilScopedValue.test.tsx
deleted file mode 100644
index 500612163832..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useRecoilScopedValue.test.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { createContext } from 'react';
-import { renderHook } from '@testing-library/react';
-import { atomFamily, RecoilRoot } from 'recoil';
-
-import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
-
-const testScopedState = atomFamily<string | null, string>({
-  key: 'testKey',
-  default: null,
-});
-
-const mockedContextValue = 'mocked-scope-id';
-const MockedContext = createContext<string | null>(mockedContextValue);
-const nullContext = createContext<string | null>(null);
-
-const ERROR_MESSAGE =
-  'Using a scoped atom without a RecoilScope : testKey__"", verify that you are using a RecoilScope with a specific context if you intended to do so.';
-
-describe('useRecoilScopedValue', () => {
-  it('Should return the getter and setter for the state and context passed and work properly', async () => {
-    const { result } = renderHook(
-      () => useRecoilScopedValue(testScopedState, MockedContext),
-      {
-        wrapper: ({ children }) => (
-          <MockedContext.Provider value={mockedContextValue}>
-            <RecoilRoot>{children}</RecoilRoot>
-          </MockedContext.Provider>
-        ),
-      },
-    );
-
-    const scopedState = result.current;
-
-    expect(scopedState).toBeNull();
-  });
-
-  it('Should throw an error when the recoilScopeId is not found by the context', () => {
-    expect(() => {
-      renderHook(() => useRecoilScopedValue(testScopedState, nullContext));
-    }).toThrow(ERROR_MESSAGE);
-  });
-});
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useRecoilScopedValueV2.test.tsx b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useRecoilScopedValueV2.test.tsx
deleted file mode 100644
index ddd9230c4526..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useRecoilScopedValueV2.test.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import { atomFamily, RecoilRoot } from 'recoil';
-
-import { useRecoilScopedValueV2 } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValueV2';
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
-
-const scopedAtom = atomFamily<string, StateScopeMapKey>({
-  key: 'scopedAtomKey',
-  default: 'initialValue',
-});
-
-describe('useRecoilScopedValueV2', () => {
-  const mockedScopeId = 'mocked-scope-id';
-
-  it('Should return the scoped value using useRecoilScopedValueV2', () => {
-    const { result } = renderHook(
-      () => useRecoilScopedValueV2(scopedAtom, mockedScopeId),
-      {
-        wrapper: RecoilRoot,
-      },
-    );
-
-    const scopedValue = result.current;
-
-    expect(scopedValue).toBe('initialValue');
-  });
-});
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useSetRecoilScopedFamilyState.test.tsx b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useSetRecoilScopedFamilyState.test.tsx
deleted file mode 100644
index f2d1a2592472..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useSetRecoilScopedFamilyState.test.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { act, renderHook } from '@testing-library/react';
-import { atomFamily, RecoilRoot } from 'recoil';
-
-import { useRecoilScopedFamilyState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedFamilyState';
-import { useSetRecoilScopedFamilyState } from '@/ui/utilities/recoil-scope/hooks/useSetRecoilScopedFamilyState';
-import { FamilyStateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/FamilyStateScopeMapKey';
-
-const mockedScopedFamilyState = atomFamily<
-  string,
-  FamilyStateScopeMapKey<string>
->({
-  key: 'scopedAtomKey',
-  default: 'initialValue',
-});
-
-describe('useSetRecoilScopedFamilyState', () => {
-  const mockedScopeId = 'mocked-scope-id';
-  const mockedFamilyKey = 'test-key-value';
-
-  it('Should return a setter that updates the state value and work properly', async () => {
-    const useCombinedHooks = () => {
-      const setRecoilScopedFamilyState = useSetRecoilScopedFamilyState(
-        mockedScopedFamilyState,
-        mockedScopeId,
-        mockedFamilyKey,
-      );
-
-      const [mocked] = useRecoilScopedFamilyState(
-        mockedScopedFamilyState,
-        mockedScopeId,
-        mockedFamilyKey,
-      );
-
-      return {
-        setRecoilScopedFamilyState,
-        scopedFamilyState: mocked,
-      };
-    };
-
-    const { result } = renderHook(() => useCombinedHooks(), {
-      wrapper: RecoilRoot,
-    });
-
-    expect(result.current.scopedFamilyState).toBe('initialValue');
-    expect(result.current.setRecoilScopedFamilyState).toBeInstanceOf(Function);
-
-    await act(async () => {
-      result.current.setRecoilScopedFamilyState?.('testValue');
-    });
-
-    expect(result.current.scopedFamilyState).toBe('testValue');
-  });
-
-  it('Should return undefined when familyKey is missing', async () => {
-    const useCombinedHooks = () => {
-      const setRecoilScopedFamilyState = useSetRecoilScopedFamilyState(
-        mockedScopedFamilyState,
-        mockedScopeId,
-      );
-
-      const [mocked] = useRecoilScopedFamilyState(
-        mockedScopedFamilyState,
-        mockedScopeId,
-      );
-
-      return {
-        setRecoilScopedFamilyState,
-        scopedFamilyState: mocked,
-      };
-    };
-
-    const { result } = renderHook(() => useCombinedHooks(), {
-      wrapper: RecoilRoot,
-    });
-
-    expect(result.current.scopedFamilyState).toBeUndefined();
-    expect(result.current.setRecoilScopedFamilyState).toBeUndefined();
-  });
-});
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useSetRecoilScopedStateV2.test.tsx b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useSetRecoilScopedStateV2.test.tsx
deleted file mode 100644
index da1b93ba2aae..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/__tests__/useSetRecoilScopedStateV2.test.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { act, renderHook } from '@testing-library/react';
-import { atomFamily, RecoilRoot } from 'recoil';
-
-import { useRecoilScopedValueV2 } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValueV2';
-import { useSetRecoilScopedStateV2 } from '@/ui/utilities/recoil-scope/hooks/useSetRecoilScopedStateV2';
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
-
-const scopedAtom = atomFamily<string, StateScopeMapKey>({
-  key: 'scopedAtomKey',
-  default: 'initialValue',
-});
-
-describe('useSetRecoilScopedStateV2', () => {
-  const mockedScopeId = 'mocked-scope-id';
-
-  it('Should return a setter that updates the state value', async () => {
-    const useCombinedHooks = () => {
-      const setRecoilScopedStateV2 = useSetRecoilScopedStateV2(
-        scopedAtom,
-        mockedScopeId,
-      );
-
-      const recoilScopedStateValue = useRecoilScopedValueV2(
-        scopedAtom,
-        mockedScopeId,
-      );
-
-      return {
-        setRecoilScopedStateV2,
-        recoilScopedStateValue,
-      };
-    };
-
-    const { result } = renderHook(() => useCombinedHooks(), {
-      wrapper: RecoilRoot,
-    });
-
-    expect(result.current.recoilScopedStateValue).toBe('initialValue');
-    expect(result.current.setRecoilScopedStateV2).toBeInstanceOf(Function);
-
-    await act(async () => {
-      result.current.setRecoilScopedStateV2('testValue');
-    });
-
-    expect(result.current.recoilScopedStateValue).toBe('testValue');
-  });
-});
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedFamilyState.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedFamilyState.ts
deleted file mode 100644
index 457a8fb09ba6..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedFamilyState.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { RecoilState, SerializableParam, useRecoilState } from 'recoil';
-
-import { FamilyStateScopeMapKey } from '../scopes-internal/types/FamilyStateScopeMapKey';
-
-export const useRecoilScopedFamilyState = <
-  StateType,
-  FamilyKey extends SerializableParam,
->(
-  recoilState: (
-    scopedFamilyKey: FamilyStateScopeMapKey<FamilyKey>,
-  ) => RecoilState<StateType>,
-  scopeId: string,
-  familyKey?: FamilyKey,
-) => {
-  const familyState = useRecoilState<StateType>(
-    recoilState({
-      scopeId,
-      familyKey: familyKey || ('' as FamilyKey),
-    }),
-  );
-
-  if (!familyKey) {
-    return [undefined, undefined];
-  }
-
-  return familyState;
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedState.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedState.ts
deleted file mode 100644
index a4c37a62069f..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedState.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Context, useContext } from 'react';
-import { RecoilState, useRecoilState } from 'recoil';
-
-import { RecoilScopeContext } from '../states/RecoilScopeContext';
-
-export const useRecoilScopedState = <StateType>(
-  recoilState: (param: string) => RecoilState<StateType>,
-  CustomRecoilScopeContext?: Context<string | null>,
-) => {
-  const recoilScopeId = useContext(
-    CustomRecoilScopeContext ?? RecoilScopeContext,
-  );
-
-  if (!recoilScopeId)
-    throw new Error(
-      `Using a scoped atom without a RecoilScope : ${
-        recoilState('').key
-      }, verify that you are using a RecoilScope with a specific context if you intended to do so.`,
-    );
-
-  return useRecoilState<StateType>(recoilState(recoilScopeId));
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedStateV2.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedStateV2.ts
index 389a4aa32f88..952fbfb0ee04 100644
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedStateV2.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedStateV2.ts
@@ -1,9 +1,9 @@
 import { RecoilState, useRecoilState } from 'recoil';
 
-import { StateScopeMapKey } from '../scopes-internal/types/StateScopeMapKey';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
 export const useRecoilScopedStateV2 = <StateType>(
-  recoilState: (scopedKey: StateScopeMapKey) => RecoilState<StateType>,
+  recoilState: (scopedKey: ComponentStateKey) => RecoilState<StateType>,
   scopeId: string,
 ) => {
   return useRecoilState<StateType>(
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedValue.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedValue.ts
deleted file mode 100644
index 413b55605233..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedValue.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Context, useContext } from 'react';
-import { RecoilState, RecoilValueReadOnly, useRecoilValue } from 'recoil';
-
-import { RecoilScopeContext } from '../states/RecoilScopeContext';
-
-/**
- * @deprecated use useRecoilScopedStateV2 instead
- */
-export const useRecoilScopedValue = <T>(
-  recoilState: (param: string) => RecoilState<T> | RecoilValueReadOnly<T>,
-  CustomRecoilScopeContext?: Context<string | null>,
-) => {
-  const recoilScopeId = useContext(
-    CustomRecoilScopeContext ?? RecoilScopeContext,
-  );
-
-  if (!recoilScopeId)
-    throw new Error(
-      `Using a scoped atom without a RecoilScope : ${
-        recoilState('').key
-      }, verify that you are using a RecoilScope with a specific context if you intended to do so.`,
-    );
-
-  return useRecoilValue<T>(recoilState(recoilScopeId));
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedValueV2.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedValueV2.ts
deleted file mode 100644
index f3f90d1e8da4..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useRecoilScopedValueV2.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { RecoilState, useRecoilValue } from 'recoil';
-
-import { StateScopeMapKey } from '../scopes-internal/types/StateScopeMapKey';
-
-export const useRecoilScopedValueV2 = <StateType>(
-  recoilState: (scopedKey: StateScopeMapKey) => RecoilState<StateType>,
-  scopeId: string,
-) => {
-  return useRecoilValue<StateType>(
-    recoilState({
-      scopeId,
-    }),
-  );
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useSetRecoilScopedFamilyState.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useSetRecoilScopedFamilyState.ts
deleted file mode 100644
index e74d1f171f5f..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useSetRecoilScopedFamilyState.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { RecoilState, SerializableParam, useSetRecoilState } from 'recoil';
-
-import { FamilyStateScopeMapKey } from '../scopes-internal/types/FamilyStateScopeMapKey';
-
-export const useSetRecoilScopedFamilyState = <
-  StateType,
-  FamilyKey extends SerializableParam,
->(
-  recoilState: (
-    scopedFamilyKey: FamilyStateScopeMapKey<FamilyKey>,
-  ) => RecoilState<StateType>,
-  scopeId: string,
-  familyKey?: FamilyKey,
-) => {
-  const familyState = useSetRecoilState<StateType>(
-    recoilState({
-      scopeId,
-      familyKey: familyKey || ('' as FamilyKey),
-    }),
-  );
-
-  if (!familyKey) {
-    return;
-  }
-
-  return familyState;
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useSetRecoilScopedStateV2.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useSetRecoilScopedStateV2.ts
deleted file mode 100644
index 35396eebcd59..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/hooks/useSetRecoilScopedStateV2.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { RecoilState, useSetRecoilState } from 'recoil';
-
-import { StateScopeMapKey } from '../scopes-internal/types/StateScopeMapKey';
-
-export const useSetRecoilScopedStateV2 = <StateType>(
-  recoilState: (scopedKey: StateScopeMapKey) => RecoilState<StateType>,
-  scopeId: string,
-) => {
-  return useSetRecoilState<StateType>(
-    recoilState({
-      scopeId,
-    }),
-  );
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/__tests__/useAvailableScopeId.test.tsx b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/__tests__/useAvailableScopeId.test.tsx
index 4187805be061..afb281b9a759 100644
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/__tests__/useAvailableScopeId.test.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/__tests__/useAvailableScopeId.test.tsx
@@ -52,7 +52,7 @@ describe('useAvailableScopeIdOrThrow', () => {
   });
 
   it('should throw an error if no scopeId is provided and scopeId is undefined in the context', () => {
-    console.error = jest.fn();
+    global.console.error = jest.fn();
 
     const renderFunction = () =>
       renderHook(() => ({
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/__tests__/useScopeInternalContextOrThrow.test.tsx b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/__tests__/useScopeInternalContextOrThrow.test.tsx
deleted file mode 100644
index c83c7d246d86..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/__tests__/useScopeInternalContextOrThrow.test.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { createContext } from 'react';
-import { renderHook } from '@testing-library/react';
-
-import { useScopeInternalContextOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useScopeInternalContextOrThrow';
-import { ScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/types/ScopeInternalContext';
-
-const mockedContextValue = 'mocked-scope-id';
-const MockedContext = createContext<string | null>(mockedContextValue);
-const nullContext = createContext<string | null>(null);
-
-const ERROR_MESSAGE =
-  'Using a scope context without a ScopeInternalContext.Provider wrapper for context';
-
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
-  <MockedContext.Provider value={mockedContextValue}>
-    {children}
-  </MockedContext.Provider>
-);
-
-describe('useScopeInternalContextOrThrow', () => {
-  it('should work as expected', () => {
-    const { result } = renderHook(
-      () =>
-        useScopeInternalContextOrThrow(
-          MockedContext as ScopeInternalContext<{ scopeId: string }>,
-        ),
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    expect(result.current).toBe(mockedContextValue);
-  });
-
-  it('should throw an error when used outside of the specified context', () => {
-    expect(() => {
-      renderHook(() =>
-        useScopeInternalContextOrThrow(
-          nullContext as ScopeInternalContext<{ scopeId: string }>,
-        ),
-      );
-    }).toThrow(ERROR_MESSAGE);
-  });
-});
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/__tests__/useScopedState.test.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/__tests__/useScopedState.test.ts
deleted file mode 100644
index 1e5374797c5f..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/__tests__/useScopedState.test.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-import { expect } from '@storybook/test';
-import { act, renderHook } from '@testing-library/react';
-import {
-  atomFamily,
-  RecoilRoot,
-  selector,
-  useRecoilCallback,
-  useRecoilState,
-  useRecoilValue,
-} from 'recoil';
-
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-import { getFamilyScopeInjector } from '@/ui/utilities/recoil-scope/utils/getFamilyScopeInjector';
-import { getScopeInjector } from '@/ui/utilities/recoil-scope/utils/getScopeInjector';
-import { getSelectorScopeInjector } from '@/ui/utilities/recoil-scope/utils/getSelectorScopeInjector';
-
-import { useScopedState } from '../useScopedState';
-
-const scopeId = 'scopeId';
-
-// scoped state
-const defaultScopedState = 'defaultString';
-const scopedState = atomFamily<string, StateScopeMapKey>({
-  key: 'ScopedStateKey',
-  default: defaultScopedState,
-});
-const scopedStateScopeInjector = getScopeInjector(scopedState);
-
-// scoped selector
-const anotherScopedState = atomFamily<number[], StateScopeMapKey>({
-  key: 'ScopedStateKey',
-  default: [1, 2, 3, 4, 5],
-});
-const scopedSelector = ({ scopeId }: StateScopeMapKey) =>
-  selector({
-    key: 'FilteredState',
-    get: ({ get }) => {
-      const scopedStateValue = get(anotherScopedState({ scopeId }));
-      return scopedStateValue.filter((value) => value % 2 === 0);
-    },
-  });
-const selectorScopeInjector = getSelectorScopeInjector(scopedSelector);
-
-// family state
-const defaultValue = 'defaultString';
-const scopedFamilyState = createFamilyStateScopeMap<string, string>({
-  key: 'FamilyStateKey',
-  defaultValue,
-});
-const familyScopeInjector = getFamilyScopeInjector(scopedFamilyState);
-
-describe('useScopedState', () => {
-  it('should get scoped state', () => {
-    const {
-      result: {
-        current: { getScopedState },
-      },
-    } = renderHook(() => useScopedState(scopeId));
-
-    const scopedState = getScopedState(scopedStateScopeInjector);
-
-    const { result } = renderHook(
-      () => {
-        const [scoped, setScoped] = useRecoilState(scopedState);
-        return { scoped, setScoped };
-      },
-      {
-        wrapper: RecoilRoot,
-      },
-    );
-
-    expect(result.current.scoped).toBe(defaultScopedState);
-
-    const newValue = 'anotherValue';
-
-    act(() => {
-      result.current.setScoped(newValue);
-    });
-
-    expect(result.current.scoped).toBe(newValue);
-  });
-
-  it('should get scoped snapshot value', () => {
-    const {
-      result: {
-        current: { getScopedSnapshotValue },
-      },
-    } = renderHook(() => useScopedState(scopeId));
-
-    const { result } = renderHook(
-      () =>
-        useRecoilCallback(
-          ({ snapshot }) =>
-            () =>
-              getScopedSnapshotValue(snapshot, scopedStateScopeInjector),
-        )(),
-      { wrapper: RecoilRoot },
-    );
-
-    expect(result.current).toBe(defaultScopedState);
-  });
-
-  it('should get scoped selector', () => {
-    const {
-      result: {
-        current: { getScopedSelector },
-      },
-    } = renderHook(() => useScopedState(scopeId));
-
-    const recoilValue = getScopedSelector(selectorScopeInjector);
-
-    const { result } = renderHook(() => useRecoilValue(recoilValue), {
-      wrapper: RecoilRoot,
-    });
-
-    expect(result.current).toEqual([2, 4]);
-  });
-
-  it('should get scoped selector snapshot value', () => {
-    const {
-      result: {
-        current: { getScopedSelectorSnapshotValue },
-      },
-    } = renderHook(() => useScopedState(scopeId));
-
-    const { result } = renderHook(
-      () =>
-        useRecoilCallback(
-          ({ snapshot }) =>
-            () =>
-              getScopedSelectorSnapshotValue(snapshot, selectorScopeInjector),
-        )(),
-      { wrapper: RecoilRoot },
-    );
-
-    expect(result.current).toEqual([2, 4]);
-  });
-
-  it('should get scoped family state', () => {
-    const {
-      result: {
-        current: { getScopedFamilyState },
-      },
-    } = renderHook(() => useScopedState(scopeId));
-
-    const scopedFamilyState = getScopedFamilyState(familyScopeInjector);
-
-    const { result } = renderHook(
-      () => {
-        const [familyState, setFamilyState] = useRecoilState(
-          scopedFamilyState('familyKey'),
-        );
-
-        return { familyState, setFamilyState };
-      },
-      {
-        wrapper: RecoilRoot,
-      },
-    );
-
-    expect(result.current.familyState).toBe('defaultString');
-
-    const newValue = 'newValue';
-
-    act(() => {
-      result.current.setFamilyState(newValue);
-    });
-
-    expect(result.current.familyState).toBe(newValue);
-  });
-
-  it('should get scoped family snapshot value', () => {
-    const {
-      result: {
-        current: { getScopedFamilySnapshotValue },
-      },
-    } = renderHook(() => useScopedState(scopeId));
-
-    const { result } = renderHook(
-      () =>
-        useRecoilCallback(
-          ({ snapshot }) =>
-            () =>
-              getScopedFamilySnapshotValue(snapshot, familyScopeInjector),
-        )(),
-      { wrapper: RecoilRoot },
-    );
-
-    expect(result.current('sampleKey')).toBe('defaultString');
-  });
-});
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId.ts
index 6a747291ef11..6dd6b2ed5b92 100644
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId.ts
@@ -1,3 +1,5 @@
+import { isNonEmptyString } from '@sniptt/guards';
+
 import { ScopeInternalContext } from '../types/ScopeInternalContext';
 
 import { useScopeInternalContext } from './useScopeInternalContext';
@@ -10,9 +12,9 @@ export const useAvailableScopeIdOrThrow = <T extends { scopeId: string }>(
 
   const scopeIdFromContext = scopeInternalContext?.scopeId;
 
-  if (scopeIdFromProps) {
+  if (isNonEmptyString(scopeIdFromProps)) {
     return scopeIdFromProps;
-  } else if (scopeIdFromContext) {
+  } else if (isNonEmptyString(scopeIdFromContext)) {
     return scopeIdFromContext;
   } else {
     throw new Error('Scope id is not provided and cannot be found in context.');
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/useScopeInternalContextOrThrow.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/useScopeInternalContextOrThrow.ts
deleted file mode 100644
index 4c199e8d9cb1..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/useScopeInternalContextOrThrow.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { useContext } from 'react';
-
-import { isNonNullable } from '~/utils/isNonNullable';
-
-import { ScopeInternalContext } from '../types/ScopeInternalContext';
-
-export const useScopeInternalContextOrThrow = <T extends { scopeId: string }>(
-  Context: ScopeInternalContext<T>,
-) => {
-  const context = useContext(Context);
-
-  if (!isNonNullable(context)) {
-    throw new Error(
-      `Using a scope context without a ScopeInternalContext.Provider wrapper for context : ${Context.displayName}.`,
-    );
-  }
-
-  return context;
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/useScopedState.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/useScopedState.ts
deleted file mode 100644
index a1a82a184622..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/hooks/useScopedState.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { SerializableParam, Snapshot } from 'recoil';
-
-import { FamilyScopeInjector } from '@/ui/utilities/recoil-scope/utils/getFamilyScopeInjector';
-import { ScopeInjector } from '@/ui/utilities/recoil-scope/utils/getScopeInjector';
-import { SelectorScopeInjector } from '@/ui/utilities/recoil-scope/utils/getSelectorScopeInjector';
-import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
-
-export const useScopedState = (scopeId: string) => {
-  const getScopedState = <StateType>(scopeInjector: ScopeInjector<StateType>) =>
-    scopeInjector(scopeId);
-
-  const getScopedSelector = <StateType>(
-    scopeInjector: SelectorScopeInjector<StateType>,
-  ) => scopeInjector(scopeId);
-
-  const getScopedFamilyState =
-    <StateType, FamilyKey extends SerializableParam>(
-      familyScopeInjector: FamilyScopeInjector<StateType, FamilyKey>,
-    ) =>
-    (familyKey: FamilyKey) =>
-      familyScopeInjector(scopeId, familyKey);
-
-  const getScopedSnapshotValue = <StateType>(
-    snapshot: Snapshot,
-    scopeInjector: ScopeInjector<StateType>,
-  ) => getSnapshotValue(snapshot, scopeInjector(scopeId));
-
-  const getScopedSelectorSnapshotValue = <StateType>(
-    snapshot: Snapshot,
-    scopeInjector: SelectorScopeInjector<StateType>,
-  ) => getSnapshotValue(snapshot, scopeInjector(scopeId));
-
-  const getScopedFamilySnapshotValue =
-    <StateType, FamilyKey extends SerializableParam>(
-      snapshot: Snapshot,
-      familyScopeInjector: FamilyScopeInjector<StateType, FamilyKey>,
-    ) =>
-    (familyKey: FamilyKey) =>
-      getSnapshotValue(snapshot, familyScopeInjector(scopeId, familyKey));
-
-  return {
-    scopeId,
-    getScopedState,
-    getScopedSelector,
-    getScopedFamilyState,
-    getScopedSnapshotValue,
-    getScopedSelectorSnapshotValue,
-    getScopedFamilySnapshotValue,
-  };
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/types/FamilyStateScopeMapKey.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/types/FamilyStateScopeMapKey.ts
deleted file mode 100644
index 96733c979d99..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/types/FamilyStateScopeMapKey.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { SerializableParam } from 'recoil';
-
-export type FamilyStateScopeMapKey<FamilyKey extends SerializableParam> = {
-  scopeId: string;
-  familyKey: FamilyKey;
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey.ts
deleted file mode 100644
index 3915d9478ee9..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export type StateScopeMapKey = {
-  scopeId: string;
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext.ts
index 8789a15726c5..78911a1abcdd 100644
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext.ts
@@ -1,10 +1,10 @@
 import { Context, createContext } from 'react';
 
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
-type ScopeInternalContext<T extends StateScopeMapKey> = Context<T | null>;
+type ScopeInternalContext<T extends ComponentStateKey> = Context<T | null>;
 
-export const createScopeInternalContext = <T extends StateScopeMapKey>(
+export const createScopeInternalContext = <T extends ComponentStateKey>(
   initialValue?: T,
 ) => {
   return createContext<T | null>(
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/types/RecoilScopedSelector.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/types/RecoilScopedSelector.ts
index 69803560096c..8e92014b557d 100644
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/types/RecoilScopedSelector.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/types/RecoilScopedSelector.ts
@@ -1,7 +1,7 @@
 import { RecoilValueReadOnly } from 'recoil';
 
-import { StateScopeMapKey } from '../scopes-internal/types/StateScopeMapKey';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
 export type RecoilScopedSelector<StateType> = (
-  scopedKey: StateScopeMapKey,
+  scopedKey: ComponentStateKey,
 ) => RecoilValueReadOnly<StateType>;
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/types/RecoilScopedState.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/types/RecoilScopedState.ts
index ace7ab39ec90..beb36d9e9947 100644
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/types/RecoilScopedState.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/types/RecoilScopedState.ts
@@ -1,7 +1,7 @@
 import { RecoilState } from 'recoil';
 
-import { StateScopeMapKey } from '../scopes-internal/types/StateScopeMapKey';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
 export type RecoilScopedState<StateType> = (
-  scopedKey: StateScopeMapKey,
+  scopedKey: ComponentStateKey,
 ) => RecoilState<StateType>;
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/__tests__/getFamilyScopeInjector.test.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/__tests__/getFamilyScopeInjector.test.ts
deleted file mode 100644
index 559221bcb1ec..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/__tests__/getFamilyScopeInjector.test.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { act, renderHook } from '@testing-library/react';
-import { RecoilRoot, useRecoilState } from 'recoil';
-
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-import { getFamilyScopeInjector } from '../getFamilyScopeInjector';
-
-const defaultValue = 'defaultString';
-
-const testState = createFamilyStateScopeMap<string, string>({
-  key: 'familyStateKey',
-  defaultValue,
-});
-
-describe('getFamilyScopeInjector', () => {
-  it('should return a scoped family state', () => {
-    const familyScopeInjector = getFamilyScopeInjector(testState);
-    const familyState = familyScopeInjector('scopeId', 'familyKey');
-
-    const { result } = renderHook(
-      () => {
-        const [family, setFamily] = useRecoilState(familyState);
-        return { family, setFamily };
-      },
-      {
-        wrapper: RecoilRoot,
-      },
-    );
-
-    expect(result.current.family).toBe(defaultValue);
-
-    const newValue = 'anotherValue';
-
-    act(() => {
-      result.current.setFamily(newValue);
-    });
-
-    expect(result.current.family).toBe(newValue);
-  });
-});
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/__tests__/getScopeInjector.test.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/__tests__/getScopeInjector.test.ts
deleted file mode 100644
index ef8ab5993ecb..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/__tests__/getScopeInjector.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { act, renderHook } from '@testing-library/react';
-import { atomFamily, RecoilRoot, useRecoilState } from 'recoil';
-
-import { getScopeInjector } from '../getScopeInjector';
-
-const defaultValue = 'defaultString';
-
-const scopedState = atomFamily<
-  string,
-  {
-    scopeId: string;
-  }
->({
-  key: 'myStateKey',
-  default: defaultValue,
-});
-
-describe('getScopeInjector', () => {
-  it('should return the scoped state for the given scopeId', () => {
-    const scopeInjector = getScopeInjector(scopedState);
-
-    const scopeId = 'scopeId';
-    const recoilState = scopeInjector(scopeId);
-
-    const { result } = renderHook(
-      () => {
-        const [recoil, setRecoil] = useRecoilState(recoilState);
-        return { recoil, setRecoil };
-      },
-      {
-        wrapper: RecoilRoot,
-      },
-    );
-
-    expect(result.current.recoil).toBe(defaultValue);
-
-    const newValue = 'anotherValue';
-
-    act(() => {
-      result.current.setRecoil(newValue);
-    });
-
-    expect(result.current.recoil).toBe(newValue);
-  });
-});
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/__tests__/getSelectorScopeInjector.test.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/__tests__/getSelectorScopeInjector.test.ts
deleted file mode 100644
index 0f3e6d0bd7f4..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/__tests__/getSelectorScopeInjector.test.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import { atomFamily, RecoilRoot, selector, useRecoilValue } from 'recoil';
-
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
-
-import { getSelectorScopeInjector } from '../getSelectorScopeInjector';
-
-const scopedState = atomFamily<
-  number[],
-  {
-    scopeId: string;
-  }
->({
-  key: 'myStateKey',
-  default: [1, 2, 3, 4, 5],
-});
-
-const scopedSelector = ({ scopeId }: StateScopeMapKey) =>
-  selector({
-    key: 'FilteredState',
-    get: ({ get }) => {
-      const scopedStateValue = get(scopedState({ scopeId }));
-      return scopedStateValue.filter((value) => value % 2 === 0);
-    },
-  });
-
-describe('getSelectorScopeInjector', () => {
-  it('should return a valid SelectorScopeInjector', () => {
-    const selectorScopeInjector = getSelectorScopeInjector(scopedSelector);
-    const recoilValue = selectorScopeInjector('scopeId');
-
-    const { result } = renderHook(() => useRecoilValue(recoilValue), {
-      wrapper: RecoilRoot,
-    });
-
-    expect(result.current).toEqual([2, 4]);
-  });
-});
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/createFamilySelectorScopeMap.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/createFamilySelectorScopeMap.ts
deleted file mode 100644
index cdfbc6a102da..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/createFamilySelectorScopeMap.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import {
-  DefaultValue,
-  GetCallback,
-  GetRecoilValue,
-  Loadable,
-  RecoilValue,
-  ResetRecoilState,
-  selectorFamily,
-  SerializableParam,
-  SetRecoilState,
-  WrappedValue,
-} from 'recoil';
-
-import { FamilyStateScopeMapKey } from '../scopes-internal/types/FamilyStateScopeMapKey';
-
-type SelectorGetter<T, P> = (
-  param: P,
-) => (opts: {
-  get: GetRecoilValue;
-  getCallback: GetCallback;
-}) => Promise<T> | RecoilValue<T> | Loadable<T> | WrappedValue<T> | T;
-
-type SelectorSetter<T, P> = (
-  param: P,
-) => (
-  opts: { set: SetRecoilState; get: GetRecoilValue; reset: ResetRecoilState },
-  newValue: T | DefaultValue,
-) => void;
-
-export const createFamilySelectorScopeMap = <
-  ValueType,
-  FamilyKey extends SerializableParam,
->({
-  key,
-  get,
-  set,
-}: {
-  key: string;
-  get: SelectorGetter<ValueType, FamilyStateScopeMapKey<FamilyKey>>;
-  set: SelectorSetter<ValueType, FamilyStateScopeMapKey<FamilyKey>>;
-}) => {
-  return selectorFamily<ValueType, FamilyStateScopeMapKey<FamilyKey>>({
-    key,
-    get,
-    set,
-  });
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap.ts
deleted file mode 100644
index 0c44711cc2f9..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { atomFamily, SerializableParam } from 'recoil';
-
-import { FamilyStateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/FamilyStateScopeMapKey';
-
-export const createFamilyStateScopeMap = <
-  ValueType,
-  FamilyKey extends SerializableParam,
->({
-  key,
-  defaultValue,
-}: {
-  key: string;
-  defaultValue: ValueType;
-}) => {
-  return atomFamily<ValueType, FamilyStateScopeMapKey<FamilyKey>>({
-    key,
-    default: defaultValue,
-  });
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/createSelectorReadOnlyScopeMap.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/createSelectorReadOnlyScopeMap.ts
deleted file mode 100644
index 8b537fdf97f3..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/createSelectorReadOnlyScopeMap.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import {
-  GetCallback,
-  GetRecoilValue,
-  Loadable,
-  RecoilValue,
-  selectorFamily,
-  WrappedValue,
-} from 'recoil';
-
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
-
-type SelectorGetter<T, P> = (
-  param: P,
-) => (opts: {
-  get: GetRecoilValue;
-  getCallback: GetCallback;
-}) => Promise<T> | RecoilValue<T> | Loadable<T> | WrappedValue<T> | T;
-
-export const createSelectorReadOnlyScopeMap = <ValueType>({
-  key,
-  get,
-}: {
-  key: string;
-  get: SelectorGetter<ValueType, StateScopeMapKey>;
-}) => {
-  return selectorFamily<ValueType, StateScopeMapKey>({
-    key,
-    get,
-  });
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/createSelectorScopeMap.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/createSelectorScopeMap.ts
deleted file mode 100644
index 81e34b8af586..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/createSelectorScopeMap.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import {
-  DefaultValue,
-  GetCallback,
-  GetRecoilValue,
-  Loadable,
-  RecoilValue,
-  ResetRecoilState,
-  selectorFamily,
-  SetRecoilState,
-  WrappedValue,
-} from 'recoil';
-
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
-
-type SelectorGetter<T, P> = (
-  param: P,
-) => (opts: {
-  get: GetRecoilValue;
-  getCallback: GetCallback;
-}) => Promise<T> | RecoilValue<T> | Loadable<T> | WrappedValue<T> | T;
-
-type SelectorSetter<T, P> = (
-  param: P,
-) => (
-  opts: { set: SetRecoilState; get: GetRecoilValue; reset: ResetRecoilState },
-  newValue: T | DefaultValue,
-) => void;
-
-export const createSelectorScopeMap = <ValueType>({
-  key,
-  get,
-  set,
-}: {
-  key: string;
-  get: SelectorGetter<ValueType, StateScopeMapKey>;
-  set: SelectorSetter<ValueType, StateScopeMapKey>;
-}) => {
-  return selectorFamily<ValueType, StateScopeMapKey>({
-    key,
-    get,
-    set,
-  });
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/createStateScopeMap.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/createStateScopeMap.ts
deleted file mode 100644
index 58efdf2ec08b..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/createStateScopeMap.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { atomFamily } from 'recoil';
-
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
-
-export const createStateScopeMap = <ValueType>({
-  key,
-  defaultValue,
-}: {
-  key: string;
-  defaultValue: ValueType;
-}) => {
-  return atomFamily<ValueType, StateScopeMapKey>({
-    key,
-    default: defaultValue,
-  });
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getFamilyScopeInjector.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getFamilyScopeInjector.ts
deleted file mode 100644
index ffde95aa1f90..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getFamilyScopeInjector.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { RecoilState, SerializableParam } from 'recoil';
-
-import { FamilyStateScopeMapKey } from '../scopes-internal/types/FamilyStateScopeMapKey';
-
-export type FamilyScopeInjector<
-  StateType,
-  FamilyKey extends SerializableParam,
-> = (scopeId: string, familyKey: FamilyKey) => RecoilState<StateType>;
-
-export const getFamilyScopeInjector = <
-  StateType,
-  FamilyKey extends SerializableParam,
->(
-  scopedFamilyState: (
-    scopedFamilyKey: FamilyStateScopeMapKey<FamilyKey>,
-  ) => RecoilState<StateType>,
-) => {
-  return (scopeId: string, familyKey: FamilyKey) =>
-    scopedFamilyState({
-      scopeId,
-      familyKey: familyKey || ('' as FamilyKey),
-    });
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getFamilyState.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getFamilyState.ts
deleted file mode 100644
index 932920bab576..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getFamilyState.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { RecoilState, SerializableParam } from 'recoil';
-
-import { FamilyStateScopeMapKey } from '../scopes-internal/types/FamilyStateScopeMapKey';
-
-export const getFamilyState = <StateType, FamilyKey extends SerializableParam>(
-  familyStateScopeMap: (
-    scopedFamilyKey: FamilyStateScopeMapKey<FamilyKey>,
-  ) => RecoilState<StateType>,
-  scopeId: string,
-) => {
-  return (familyKey: FamilyKey) =>
-    familyStateScopeMap({
-      scopeId,
-      familyKey: familyKey || ('' as FamilyKey),
-    });
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getScopeInjector.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getScopeInjector.ts
deleted file mode 100644
index 453372700239..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getScopeInjector.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { RecoilState } from 'recoil';
-
-import { RecoilScopedState } from '../types/RecoilScopedState';
-
-export type ScopeInjector<StateType> = (
-  scopeId: string,
-) => RecoilState<StateType>;
-
-export const getScopeInjector = <StateType>(
-  scopedState: RecoilScopedState<StateType>,
-): ScopeInjector<StateType> => {
-  return (scopeId: string) =>
-    scopedState({
-      scopeId,
-    });
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getScopedFamilyStateDeprecated.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getScopedFamilyStateDeprecated.ts
deleted file mode 100644
index 771d61a1cb0f..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getScopedFamilyStateDeprecated.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { RecoilState, SerializableParam } from 'recoil';
-
-import { FamilyStateScopeMapKey } from '../scopes-internal/types/FamilyStateScopeMapKey';
-
-export const getScopedFamilyStateDeprecated = <
-  StateType,
-  FamilyKey extends SerializableParam,
->(
-  recoilState: (
-    scopedFamilyKey: FamilyStateScopeMapKey<FamilyKey>,
-  ) => RecoilState<StateType>,
-  scopeId: string,
-  familyKey: FamilyKey,
-) => {
-  return recoilState({
-    scopeId,
-    familyKey: familyKey || ('' as FamilyKey),
-  });
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getScopedSelectorDeprecated.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getScopedSelectorDeprecated.ts
deleted file mode 100644
index 7ff7d3d9147f..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getScopedSelectorDeprecated.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { RecoilScopedSelector } from '../types/RecoilScopedSelector';
-
-export const getScopedSelectorDeprecated = <StateType>(
-  recoilScopedState: RecoilScopedSelector<StateType>,
-  scopeId: string,
-) => {
-  return recoilScopedState({
-    scopeId,
-  });
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getSelector.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getSelector.ts
deleted file mode 100644
index e81a0c60037a..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getSelector.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { RecoilState } from 'recoil';
-
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
-
-export const getSelector = <StateType>(
-  stateScopeMap: (stateScopeMapKey: StateScopeMapKey) => RecoilState<StateType>,
-  scopeId: string,
-) => {
-  return () => stateScopeMap({ scopeId });
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getSelectorReadOnly.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getSelectorReadOnly.ts
deleted file mode 100644
index ff40618a3df9..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getSelectorReadOnly.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { RecoilValueReadOnly } from 'recoil';
-
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
-
-export const getSelectorReadOnly = <StateType>(
-  stateScopeMap: (
-    stateScopeMapKey: StateScopeMapKey,
-  ) => RecoilValueReadOnly<StateType>,
-  scopeId: string,
-) => {
-  return () => stateScopeMap({ scopeId });
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getSelectorScopeInjector.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getSelectorScopeInjector.ts
deleted file mode 100644
index ffd4e49866b6..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getSelectorScopeInjector.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { RecoilValueReadOnly } from 'recoil';
-
-import { RecoilScopedSelector } from '@/ui/utilities/recoil-scope/types/RecoilScopedSelector';
-
-export type SelectorScopeInjector<StateType> = (
-  scopeId: string,
-) => RecoilValueReadOnly<StateType>;
-
-export const getSelectorScopeInjector = <StateType>(
-  scopedSelector: RecoilScopedSelector<StateType>,
-): SelectorScopeInjector<StateType> => {
-  return (scopeId: string) =>
-    scopedSelector({
-      scopeId,
-    });
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getState.ts b/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getState.ts
deleted file mode 100644
index 556edb66cbbd..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/recoil-scope/utils/getState.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { RecoilState } from 'recoil';
-
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
-
-export const getState = <StateType>(
-  stateScopeMap: (stateScopeMapKey: StateScopeMapKey) => RecoilState<StateType>,
-  scopeId: string,
-) => {
-  return () => stateScopeMap({ scopeId });
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsx b/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsx
index f5e50f5f08b7..028f3f1db510 100644
--- a/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsx
@@ -1,7 +1,13 @@
-import { createContext, RefObject, useRef } from 'react';
+import { createContext, RefObject, useEffect, useRef } from 'react';
 import styled from '@emotion/styled';
+import { OverlayScrollbars } from 'overlayscrollbars';
+import { useOverlayScrollbars } from 'overlayscrollbars-react';
+import { useRecoilCallback } from 'recoil';
 
-import { useListenScroll } from '../hooks/useListenScroll';
+import { scrollLeftState } from '@/ui/utilities/scroll/states/scrollLeftState';
+import { scrollTopState } from '@/ui/utilities/scroll/states/scrollTopState';
+
+import 'overlayscrollbars/overlayscrollbars.css';
 
 export const ScrollWrapperContext = createContext<RefObject<HTMLDivElement>>({
   current: null,
@@ -10,11 +16,9 @@ export const ScrollWrapperContext = createContext<RefObject<HTMLDivElement>>({
 const StyledScrollWrapper = styled.div`
   display: flex;
   height: 100%;
-  overflow: auto;
-  scrollbar-gutter: stable;
   width: 100%;
 
-  &.scrolling::-webkit-scrollbar-thumb {
+  .os-scrollbar-handle {
     background-color: ${({ theme }) => theme.border.color.medium};
   }
 `;
@@ -22,15 +26,47 @@ const StyledScrollWrapper = styled.div`
 export type ScrollWrapperProps = {
   children: React.ReactNode;
   className?: string;
+  hideY?: boolean;
+  hideX?: boolean;
 };
 
-export const ScrollWrapper = ({ children, className }: ScrollWrapperProps) => {
+export const ScrollWrapper = ({
+  children,
+  className,
+  hideX,
+  hideY,
+}: ScrollWrapperProps) => {
   const scrollableRef = useRef<HTMLDivElement>(null);
 
-  useListenScroll({
-    scrollableRef,
+  const handleScroll = useRecoilCallback(
+    ({ set }) =>
+      (overlayScroll: OverlayScrollbars) => {
+        const target = overlayScroll.elements().scrollOffsetElement;
+        set(scrollTopState, target.scrollTop);
+        set(scrollLeftState, target.scrollLeft);
+      },
+    [],
+  );
+
+  const [initialize] = useOverlayScrollbars({
+    options: {
+      scrollbars: { autoHide: 'scroll' },
+      overflow: {
+        y: hideY ? 'hidden' : undefined,
+        x: hideX ? 'hidden' : undefined,
+      },
+    },
+    events: {
+      scroll: handleScroll,
+    },
   });
 
+  useEffect(() => {
+    if (scrollableRef?.current !== null) {
+      initialize(scrollableRef.current);
+    }
+  }, [initialize, scrollableRef]);
+
   return (
     <ScrollWrapperContext.Provider value={scrollableRef}>
       <StyledScrollWrapper ref={scrollableRef} className={className}>
diff --git a/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/__tests__/useListenScroll.test.tsx b/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/__tests__/useListenScroll.test.tsx
deleted file mode 100644
index 8b5fc065781b..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/__tests__/useListenScroll.test.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react';
-import { act, fireEvent, renderHook } from '@testing-library/react';
-import { RecoilRoot, useRecoilValue } from 'recoil';
-
-import { useListenScroll } from '@/ui/utilities/scroll/hooks/useListenScroll';
-import { isScrollingState } from '@/ui/utilities/scroll/states/isScrollingState';
-
-const containerRef = React.createRef<HTMLDivElement>();
-
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
-  <RecoilRoot>
-    <div id="container" ref={containerRef}>
-      {children}
-    </div>
-  </RecoilRoot>
-);
-
-jest.useFakeTimers();
-
-describe('useListenScroll', () => {
-  it('should trigger the callback when scrolling', () => {
-    const { result } = renderHook(
-      () => {
-        useListenScroll({ scrollableRef: containerRef });
-        const isScrolling = useRecoilValue(isScrollingState);
-
-        return { isScrolling };
-      },
-      {
-        wrapper: Wrapper,
-      },
-    );
-
-    expect(result.current.isScrolling).toBe(false);
-
-    jest.advanceTimersByTime(500);
-
-    const container = document.querySelector('#container');
-
-    act(() => {
-      if (container) fireEvent.scroll(container);
-    });
-
-    expect(result.current.isScrolling).toBe(true);
-  });
-});
diff --git a/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useListenScroll.ts b/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useListenScroll.ts
deleted file mode 100644
index c6039fc2acf2..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useListenScroll.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { useEffect } from 'react';
-import debounce from 'lodash.debounce';
-import { useRecoilCallback } from 'recoil';
-
-import { scrollLeftState } from '@/ui/utilities/scroll/states/scrollLeftState';
-import { scrollTopState } from '@/ui/utilities/scroll/states/scrollTopState';
-
-import { isScrollingState } from '../states/isScrollingState';
-
-export const useListenScroll = <T extends Element>({
-  scrollableRef,
-}: {
-  scrollableRef: React.RefObject<T>;
-}) => {
-  const hideScrollBarsCallback = useRecoilCallback(({ snapshot }) => () => {
-    const isScrolling = snapshot.getLoadable(isScrollingState).getValue();
-
-    if (!isScrolling) {
-      scrollableRef.current?.classList.remove('scrolling');
-    }
-  });
-
-  const handleScrollStart = useRecoilCallback(({ set }) => (event: Event) => {
-    set(isScrollingState, true);
-    scrollableRef.current?.classList.add('scrolling');
-
-    const target = event.target as HTMLElement;
-
-    set(scrollTopState, target.scrollTop);
-    set(scrollLeftState, target.scrollLeft);
-  });
-
-  const handleScrollEnd = useRecoilCallback(({ set }) => () => {
-    set(isScrollingState, false);
-    debounce(hideScrollBarsCallback, 1000)();
-  });
-
-  useEffect(() => {
-    const refTarget = scrollableRef.current;
-
-    refTarget?.addEventListener('scrollend', handleScrollEnd);
-    refTarget?.addEventListener('scroll', handleScrollStart);
-
-    return () => {
-      refTarget?.removeEventListener('scrollend', handleScrollEnd);
-      refTarget?.removeEventListener('scroll', handleScrollStart);
-    };
-  }, [
-    hideScrollBarsCallback,
-    handleScrollStart,
-    handleScrollEnd,
-    scrollableRef,
-  ]);
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollWrapperScopedRef.ts b/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollWrapperScopedRef.ts
index 40754b87223d..bbbeecf07059 100644
--- a/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollWrapperScopedRef.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollWrapperScopedRef.ts
@@ -1,11 +1,13 @@
 import { useContext } from 'react';
 
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+
 import { ScrollWrapperContext } from '../components/ScrollWrapper';
 
 export const useScrollWrapperScopedRef = () => {
   const scrollWrapperRef = useContext(ScrollWrapperContext);
 
-  if (!scrollWrapperRef)
+  if (isUndefinedOrNull(scrollWrapperRef))
     throw new Error(
       `Using a scroll ref without a ScrollWrapper : verify that you are using a ScrollWrapper if you intended to do so.`,
     );
diff --git a/packages/twenty-front/src/modules/ui/utilities/scroll/states/isScrollingState.ts b/packages/twenty-front/src/modules/ui/utilities/scroll/states/isScrollingState.ts
deleted file mode 100644
index 5dad01cf4ff2..000000000000
--- a/packages/twenty-front/src/modules/ui/utilities/scroll/states/isScrollingState.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { atom } from 'recoil';
-
-export const isScrollingState = atom({
-  key: 'scroll/isScollingState',
-  default: false,
-});
diff --git a/packages/twenty-front/src/modules/ui/utilities/scroll/states/scrollLeftState.ts b/packages/twenty-front/src/modules/ui/utilities/scroll/states/scrollLeftState.ts
index 97ab75dffc79..e8acb2be3788 100644
--- a/packages/twenty-front/src/modules/ui/utilities/scroll/states/scrollLeftState.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/scroll/states/scrollLeftState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const scrollLeftState = atom<number>({
+export const scrollLeftState = createState<number>({
   key: 'scroll/scrollLeftState',
-  default: 0,
+  defaultValue: 0,
 });
diff --git a/packages/twenty-front/src/modules/ui/utilities/scroll/states/scrollTopState.ts b/packages/twenty-front/src/modules/ui/utilities/scroll/states/scrollTopState.ts
index cc8ceef3214b..fdf4a8de154a 100644
--- a/packages/twenty-front/src/modules/ui/utilities/scroll/states/scrollTopState.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/scroll/states/scrollTopState.ts
@@ -1,6 +1,6 @@
-import { atom } from 'recoil';
+import { createState } from 'twenty-ui';
 
-export const scrollTopState = atom<number>({
+export const scrollTopState = createState<number>({
   key: 'scroll/scrollTopState',
-  default: 0,
+  defaultValue: 0,
 });
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentFamilyStateKey.ts b/packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentFamilyStateKey.ts
new file mode 100644
index 000000000000..e5b9fa304a57
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentFamilyStateKey.ts
@@ -0,0 +1,6 @@
+import { SerializableParam } from 'recoil';
+
+export type ComponentFamilyStateKey<FamilyKey extends SerializableParam> = {
+  scopeId: string;
+  familyKey: FamilyKey;
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentStateKey.ts b/packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentStateKey.ts
new file mode 100644
index 000000000000..fb69c4c12212
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentStateKey.ts
@@ -0,0 +1,3 @@
+export type ComponentStateKey = {
+  scopeId: string;
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/createComponentFamilySelector.ts b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/createComponentFamilySelector.ts
new file mode 100644
index 000000000000..af2c6c427169
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/createComponentFamilySelector.ts
@@ -0,0 +1,24 @@
+import { selectorFamily, SerializableParam } from 'recoil';
+
+import { ComponentFamilyStateKey } from '@/ui/utilities/state/component-state/types/ComponentFamilyStateKey';
+import { SelectorGetter } from '@/ui/utilities/state/types/SelectorGetter';
+import { SelectorSetter } from '@/ui/utilities/state/types/SelectorSetter';
+
+export const createComponentFamilySelector = <
+  ValueType,
+  FamilyKey extends SerializableParam,
+>({
+  key,
+  get,
+  set,
+}: {
+  key: string;
+  get: SelectorGetter<ValueType, ComponentFamilyStateKey<FamilyKey>>;
+  set: SelectorSetter<ValueType, ComponentFamilyStateKey<FamilyKey>>;
+}) => {
+  return selectorFamily<ValueType, ComponentFamilyStateKey<FamilyKey>>({
+    key,
+    get,
+    set,
+  });
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/createComponentFamilyState.ts b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/createComponentFamilyState.ts
new file mode 100644
index 000000000000..fea9894e1bb1
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/createComponentFamilyState.ts
@@ -0,0 +1,19 @@
+import { atomFamily, SerializableParam } from 'recoil';
+
+import { ComponentFamilyStateKey } from '@/ui/utilities/state/component-state/types/ComponentFamilyStateKey';
+
+export const createComponentFamilyState = <
+  ValueType,
+  FamilyKey extends SerializableParam,
+>({
+  key,
+  defaultValue,
+}: {
+  key: string;
+  defaultValue: ValueType;
+}) => {
+  return atomFamily<ValueType, ComponentFamilyStateKey<FamilyKey>>({
+    key,
+    default: defaultValue,
+  });
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/createComponentReadOnlySelector.ts b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/createComponentReadOnlySelector.ts
new file mode 100644
index 000000000000..3369abc7743c
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/createComponentReadOnlySelector.ts
@@ -0,0 +1,17 @@
+import { selectorFamily } from 'recoil';
+
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
+import { SelectorGetter } from '@/ui/utilities/state/types/SelectorGetter';
+
+export const createComponentReadOnlySelector = <ValueType>({
+  key,
+  get,
+}: {
+  key: string;
+  get: SelectorGetter<ValueType, ComponentStateKey>;
+}) => {
+  return selectorFamily<ValueType, ComponentStateKey>({
+    key,
+    get,
+  });
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/createComponentSelector.ts b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/createComponentSelector.ts
new file mode 100644
index 000000000000..c4dfc647bb85
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/createComponentSelector.ts
@@ -0,0 +1,21 @@
+import { selectorFamily } from 'recoil';
+
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
+import { SelectorGetter } from '@/ui/utilities/state/types/SelectorGetter';
+import { SelectorSetter } from '@/ui/utilities/state/types/SelectorSetter';
+
+export const createComponentSelector = <ValueType>({
+  key,
+  get,
+  set,
+}: {
+  key: string;
+  get: SelectorGetter<ValueType, ComponentStateKey>;
+  set: SelectorSetter<ValueType, ComponentStateKey>;
+}) => {
+  return selectorFamily<ValueType, ComponentStateKey>({
+    key,
+    get,
+    set,
+  });
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/createComponentState.ts b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/createComponentState.ts
new file mode 100644
index 000000000000..2e2cd8ada9d9
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/createComponentState.ts
@@ -0,0 +1,16 @@
+import { atomFamily } from 'recoil';
+
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
+
+export const createComponentState = <ValueType>({
+  key,
+  defaultValue,
+}: {
+  key: string;
+  defaultValue: ValueType;
+}) => {
+  return atomFamily<ValueType, ComponentStateKey>({
+    key,
+    default: defaultValue,
+  });
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/extractComponentFamilyState.ts b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/extractComponentFamilyState.ts
new file mode 100644
index 000000000000..85ada7fd6ca4
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/extractComponentFamilyState.ts
@@ -0,0 +1,19 @@
+import { RecoilState, SerializableParam } from 'recoil';
+
+import { ComponentFamilyStateKey } from '@/ui/utilities/state/component-state/types/ComponentFamilyStateKey';
+
+export const extractComponentFamilyState = <
+  StateType,
+  FamilyKey extends SerializableParam,
+>(
+  componentfamilyState: (
+    componentFamilyStateKey: ComponentFamilyStateKey<FamilyKey>,
+  ) => RecoilState<StateType>,
+  scopeId: string,
+) => {
+  return (familyKey: FamilyKey) =>
+    componentfamilyState({
+      scopeId,
+      familyKey: familyKey || ('' as FamilyKey),
+    });
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/extractComponentReadOnlySelector.ts b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/extractComponentReadOnlySelector.ts
new file mode 100644
index 000000000000..98489a2669e2
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/extractComponentReadOnlySelector.ts
@@ -0,0 +1,12 @@
+import { RecoilValueReadOnly } from 'recoil';
+
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
+
+export const extractComponentReadOnlySelector = <StateType>(
+  componentSelector: (
+    componentStateKey: ComponentStateKey,
+  ) => RecoilValueReadOnly<StateType>,
+  scopeId: string,
+) => {
+  return () => componentSelector({ scopeId });
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/extractComponentSelector.ts b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/extractComponentSelector.ts
new file mode 100644
index 000000000000..60f6fa75da60
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/extractComponentSelector.ts
@@ -0,0 +1,12 @@
+import { RecoilState } from 'recoil';
+
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
+
+export const extractComponentSelector = <StateType>(
+  componentSelector: (
+    componentStateKey: ComponentStateKey,
+  ) => RecoilState<StateType>,
+  scopeId: string,
+) => {
+  return () => componentSelector({ scopeId });
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/extractComponentState.ts b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/extractComponentState.ts
new file mode 100644
index 000000000000..ea797fe77ea7
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/extractComponentState.ts
@@ -0,0 +1,12 @@
+import { RecoilState } from 'recoil';
+
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
+
+export const extractComponentState = <StateType>(
+  componentState: (
+    componentStateKey: ComponentStateKey,
+  ) => RecoilState<StateType>,
+  scopeId: string,
+) => {
+  return componentState({ scopeId });
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/types/SelectorGetter.ts b/packages/twenty-front/src/modules/ui/utilities/state/types/SelectorGetter.ts
new file mode 100644
index 000000000000..330fa568d422
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/types/SelectorGetter.ts
@@ -0,0 +1,14 @@
+import {
+  GetCallback,
+  GetRecoilValue,
+  Loadable,
+  RecoilValue,
+  WrappedValue,
+} from 'recoil';
+
+export type SelectorGetter<T, P> = (
+  param: P,
+) => (opts: {
+  get: GetRecoilValue;
+  getCallback: GetCallback;
+}) => Promise<T> | RecoilValue<T> | Loadable<T> | WrappedValue<T> | T;
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/types/SelectorSetter.ts b/packages/twenty-front/src/modules/ui/utilities/state/types/SelectorSetter.ts
new file mode 100644
index 000000000000..d21af0380c01
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/types/SelectorSetter.ts
@@ -0,0 +1,13 @@
+import {
+  DefaultValue,
+  GetRecoilValue,
+  ResetRecoilState,
+  SetRecoilState,
+} from 'recoil';
+
+export type SelectorSetter<T, P> = (
+  param: P,
+) => (
+  opts: { set: SetRecoilState; get: GetRecoilValue; reset: ResetRecoilState },
+  newValue: T | DefaultValue,
+) => void;
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/utils/createFamilyState.ts b/packages/twenty-front/src/modules/ui/utilities/state/utils/createFamilyState.ts
new file mode 100644
index 000000000000..8fc8a5d941c3
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/utils/createFamilyState.ts
@@ -0,0 +1,17 @@
+import { atomFamily, SerializableParam } from 'recoil';
+
+export const createFamilyState = <
+  ValueType,
+  FamilyKey extends SerializableParam,
+>({
+  key,
+  defaultValue,
+}: {
+  key: string;
+  defaultValue: ValueType;
+}) => {
+  return atomFamily<ValueType, FamilyKey>({
+    key,
+    default: defaultValue,
+  });
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/utils/getSnapshotValue.ts b/packages/twenty-front/src/modules/ui/utilities/state/utils/getSnapshotValue.ts
new file mode 100644
index 000000000000..711d21a4ae5c
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/utils/getSnapshotValue.ts
@@ -0,0 +1,8 @@
+import { RecoilState, RecoilValueReadOnly, Snapshot } from 'recoil';
+
+export const getSnapshotValue = <StateType>(
+  snapshot: Snapshot,
+  state: RecoilState<StateType> | RecoilValueReadOnly<StateType>,
+) => {
+  return snapshot.getLoadable(state).getValue();
+};
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/utils/guardRecoilDefaultValue.ts b/packages/twenty-front/src/modules/ui/utilities/state/utils/guardRecoilDefaultValue.ts
new file mode 100644
index 000000000000..843496011262
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/utils/guardRecoilDefaultValue.ts
@@ -0,0 +1,8 @@
+import { DefaultValue } from 'recoil';
+
+export const guardRecoilDefaultValue = (
+  candidate: any,
+): candidate is DefaultValue => {
+  if (candidate instanceof DefaultValue) return true;
+  return false;
+};
diff --git a/packages/twenty-front/src/modules/users/components/Avatar.tsx b/packages/twenty-front/src/modules/users/components/Avatar.tsx
index 9097c3ddceaf..8cc37a71b901 100644
--- a/packages/twenty-front/src/modules/users/components/Avatar.tsx
+++ b/packages/twenty-front/src/modules/users/components/Avatar.tsx
@@ -12,7 +12,7 @@ export type AvatarType = 'squared' | 'rounded';
 export type AvatarSize = 'xl' | 'lg' | 'md' | 'sm' | 'xs';
 
 export type AvatarProps = {
-  avatarUrl: string | null | undefined;
+  avatarUrl?: string | null;
   className?: string;
   size?: AvatarSize;
   placeholder: string | undefined;
@@ -23,6 +23,29 @@ export type AvatarProps = {
   onClick?: () => void;
 };
 
+const propertiesBySize = {
+  xl: {
+    fontSize: '16px',
+    width: '40px',
+  },
+  lg: {
+    fontSize: '13px',
+    width: '24px',
+  },
+  md: {
+    fontSize: '12px',
+    width: '16px',
+  },
+  sm: {
+    fontSize: '10px',
+    width: '14px',
+  },
+  xs: {
+    fontSize: '8px',
+    width: '12px',
+  },
+};
+
 export const StyledAvatar = styled.div<
   AvatarProps & { color: string; backgroundColor: string }
 >`
@@ -38,54 +61,12 @@ export const StyledAvatar = styled.div<
   display: flex;
 
   flex-shrink: 0;
-  font-size: ${({ size }) => {
-    switch (size) {
-      case 'xl':
-        return '16px';
-      case 'lg':
-        return '13px';
-      case 'md':
-      default:
-        return '12px';
-      case 'sm':
-        return '10px';
-      case 'xs':
-        return '8px';
-    }
-  }};
+  font-size: ${({ size = 'md' }) => propertiesBySize[size].fontSize};
   font-weight: ${({ theme }) => theme.font.weight.medium};
 
-  height: ${({ size }) => {
-    switch (size) {
-      case 'xl':
-        return '40px';
-      case 'lg':
-        return '24px';
-      case 'md':
-      default:
-        return '16px';
-      case 'sm':
-        return '14px';
-      case 'xs':
-        return '12px';
-    }
-  }};
+  height: ${({ size = 'md' }) => propertiesBySize[size].width};
   justify-content: center;
-  width: ${({ size }) => {
-    switch (size) {
-      case 'xl':
-        return '40px';
-      case 'lg':
-        return '24px';
-      case 'md':
-      default:
-        return '16px';
-      case 'sm':
-        return '14px';
-      case 'xs':
-        return '12px';
-    }
-  }};
+  width: ${({ size = 'md' }) => propertiesBySize[size].width};
 
   &:hover {
     box-shadow: ${({ theme, onClick }) =>
@@ -107,7 +88,7 @@ export const Avatar = ({
   const noAvatarUrl = !isNonEmptyString(avatarUrl);
   const [isInvalidAvatarUrl, setIsInvalidAvatarUrl] = useState(false);
   useEffect(() => {
-    if (avatarUrl) {
+    if (isNonEmptyString(avatarUrl)) {
       new Promise((resolve) => {
         const img = new Image();
         img.onload = () => resolve(false);
diff --git a/packages/twenty-front/src/modules/users/components/AvatarGroup.tsx b/packages/twenty-front/src/modules/users/components/AvatarGroup.tsx
new file mode 100644
index 000000000000..6bf437b878a1
--- /dev/null
+++ b/packages/twenty-front/src/modules/users/components/AvatarGroup.tsx
@@ -0,0 +1,29 @@
+import { ReactNode } from 'react';
+import styled from '@emotion/styled';
+
+export type AvatarGroupProps = {
+  avatars: ReactNode[];
+};
+
+const StyledContainer = styled.div`
+  align-items: center;
+  display: flex;
+`;
+
+const StyledItemContainer = styled.div`
+  margin-right: -3px;
+`;
+
+const MAX_AVATARS_NB = 4;
+
+export const AvatarGroup = ({ avatars }: AvatarGroupProps) => {
+  if (!avatars.length) return null;
+
+  return (
+    <StyledContainer>
+      {avatars.slice(0, MAX_AVATARS_NB).map((avatar, index) => (
+        <StyledItemContainer key={index}>{avatar}</StyledItemContainer>
+      ))}
+    </StyledContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/users/components/UserProvider.tsx b/packages/twenty-front/src/modules/users/components/UserProvider.tsx
index 7bb02561eb5a..5287cb4e24f4 100644
--- a/packages/twenty-front/src/modules/users/components/UserProvider.tsx
+++ b/packages/twenty-front/src/modules/users/components/UserProvider.tsx
@@ -1,48 +1,10 @@
-import { useEffect, useState } from 'react';
-import { useQuery } from '@apollo/client';
-import { useSetRecoilState } from 'recoil';
+import React from 'react';
+import { useRecoilValue } from 'recoil';
 
-import { currentUserState } from '@/auth/states/currentUserState';
-import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
-import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
-import { ColorScheme } from '@/workspace-member/types/WorkspaceMember';
+import { isCurrentUserLoadedState } from '@/auth/states/isCurrentUserLoadingState';
 
 export const UserProvider = ({ children }: React.PropsWithChildren) => {
-  const [isLoading, setIsLoading] = useState(true);
+  const isCurrentUserLoaded = useRecoilValue(isCurrentUserLoadedState);
 
-  const setCurrentUser = useSetRecoilState(currentUserState);
-  const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
-
-  const setCurrentWorkspaceMember = useSetRecoilState(
-    currentWorkspaceMemberState,
-  );
-
-  const { loading: queryLoading, data: queryData } = useQuery(GET_CURRENT_USER);
-
-  useEffect(() => {
-    if (!queryLoading) {
-      setIsLoading(false);
-    }
-    if (queryData?.currentUser) {
-      setCurrentUser(queryData.currentUser);
-      setCurrentWorkspace(queryData.currentUser.defaultWorkspace);
-    }
-    if (queryData?.currentUser?.workspaceMember) {
-      const workspaceMember = queryData.currentUser.workspaceMember;
-      setCurrentWorkspaceMember({
-        ...workspaceMember,
-        colorScheme: (workspaceMember.colorScheme as ColorScheme) ?? 'Light',
-      });
-    }
-  }, [
-    setCurrentUser,
-    isLoading,
-    queryLoading,
-    setCurrentWorkspace,
-    setCurrentWorkspaceMember,
-    queryData?.currentUser,
-  ]);
-
-  return isLoading ? <></> : <>{children}</>;
+  return !isCurrentUserLoaded ? <></> : <>{children}</>;
 };
diff --git a/packages/twenty-front/src/modules/users/components/UserProviderEffect.tsx b/packages/twenty-front/src/modules/users/components/UserProviderEffect.tsx
new file mode 100644
index 000000000000..d7ac742ff080
--- /dev/null
+++ b/packages/twenty-front/src/modules/users/components/UserProviderEffect.tsx
@@ -0,0 +1,75 @@
+import React, { useEffect, useState } from 'react';
+import { useQuery } from '@apollo/client';
+import { useRecoilState, useSetRecoilState } from 'recoil';
+
+import { currentUserState } from '@/auth/states/currentUserState';
+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { isCurrentUserLoadedState } from '@/auth/states/isCurrentUserLoadingState';
+import { workspacesState } from '@/auth/states/workspaces';
+import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
+import { ColorScheme } from '@/workspace-member/types/WorkspaceMember';
+import { User } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
+
+export const UserProviderEffect = () => {
+  const [isLoading, setIsLoading] = useState(true);
+
+  const [isCurrentUserLoaded, setIsCurrentUserLoaded] = useRecoilState(
+    isCurrentUserLoadedState,
+  );
+  const setCurrentUser = useSetRecoilState(currentUserState);
+  const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
+  const setWorkspaces = useSetRecoilState(workspacesState);
+
+  const setCurrentWorkspaceMember = useSetRecoilState(
+    currentWorkspaceMemberState,
+  );
+
+  const { loading: queryLoading, data: queryData } = useQuery<{
+    currentUser: User;
+  }>(GET_CURRENT_USER, {
+    skip: isCurrentUserLoaded,
+  });
+
+  useEffect(() => {
+    if (!queryLoading) {
+      setIsLoading(false);
+      setIsCurrentUserLoaded(true);
+    }
+
+    if (!isDefined(queryData?.currentUser)) return;
+
+    setCurrentUser(queryData.currentUser);
+    setCurrentWorkspace(queryData.currentUser.defaultWorkspace);
+
+    const { workspaceMember, workspaces: userWorkspaces } =
+      queryData.currentUser;
+
+    if (isDefined(workspaceMember)) {
+      setCurrentWorkspaceMember({
+        ...workspaceMember,
+        colorScheme: (workspaceMember.colorScheme as ColorScheme) ?? 'Light',
+      });
+    }
+
+    if (isDefined(userWorkspaces)) {
+      const workspaces = userWorkspaces
+        .map(({ workspace }) => workspace)
+        .filter(isDefined);
+
+      setWorkspaces(workspaces);
+    }
+  }, [
+    setCurrentUser,
+    isLoading,
+    queryLoading,
+    setCurrentWorkspace,
+    setCurrentWorkspaceMember,
+    setWorkspaces,
+    queryData?.currentUser,
+    setIsCurrentUserLoaded,
+  ]);
+
+  return <></>;
+};
diff --git a/packages/twenty-front/src/modules/users/components/__stories__/AvatarGroup.stories.tsx b/packages/twenty-front/src/modules/users/components/__stories__/AvatarGroup.stories.tsx
new file mode 100644
index 000000000000..0a6676cdc4d6
--- /dev/null
+++ b/packages/twenty-front/src/modules/users/components/__stories__/AvatarGroup.stories.tsx
@@ -0,0 +1,68 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import {
+  Avatar,
+  AvatarProps,
+  AvatarSize,
+  AvatarType,
+} from '@/users/components/Avatar';
+import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator';
+import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
+import { avatarUrl } from '~/testing/mock-data/users';
+
+import { AvatarGroup, AvatarGroupProps } from '../AvatarGroup';
+
+const makeAvatar = (userName: string, props: Partial<AvatarProps> = {}) => (
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  <Avatar placeholder={userName} entityId={userName} {...props} />
+);
+
+const getAvatars = (commonProps: Partial<AvatarProps> = {}) => [
+  makeAvatar('Matthew', { avatarUrl, ...commonProps }),
+  makeAvatar('Sophie', commonProps),
+  makeAvatar('Jane', commonProps),
+  makeAvatar('Lily', commonProps),
+  makeAvatar('John', commonProps),
+];
+
+const meta: Meta<
+  AvatarGroupProps & AvatarProps & { numberOfAvatars?: number }
+> = {
+  title: 'Modules/Users/AvatarGroup',
+  component: AvatarGroup,
+  render: ({ numberOfAvatars = 5, ...args }) => (
+    <AvatarGroup avatars={getAvatars(args).slice(0, numberOfAvatars)} />
+  ),
+};
+
+export default meta;
+type Story = StoryObj<typeof AvatarGroup>;
+
+export const Default: Story = {
+  decorators: [ComponentDecorator],
+};
+
+export const Catalog: Story = {
+  parameters: {
+    catalog: {
+      dimensions: [
+        {
+          name: 'number of avatars',
+          values: [1, 2, 3, 4, 5],
+          props: (numberOfAvatars: number) => ({ numberOfAvatars }),
+        },
+        {
+          name: 'types',
+          values: ['rounded', 'squared'] as AvatarType[],
+          props: (type: AvatarType) => ({ type }),
+        },
+        {
+          name: 'sizes',
+          values: ['xs', 'sm', 'md', 'lg', 'xl'] as AvatarSize[],
+          props: (size: AvatarSize) => ({ size }),
+        },
+      ],
+    },
+  },
+  decorators: [CatalogDecorator],
+};
diff --git a/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts b/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts
index a19b5ff18f16..bd02380fae6b 100644
--- a/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts
+++ b/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts
@@ -34,5 +34,13 @@ export const USER_QUERY_FRAGMENT = gql`
         workspaceId
       }
     }
+    workspaces {
+      workspace {
+        id
+        logo
+        displayName
+        domainName
+      }
+    }
   }
 `;
diff --git a/packages/twenty-front/src/modules/users/graphql/queries/getCurrentUser.ts b/packages/twenty-front/src/modules/users/graphql/queries/getCurrentUser.ts
index b7b10ce7892f..1d61ab1a6b2f 100644
--- a/packages/twenty-front/src/modules/users/graphql/queries/getCurrentUser.ts
+++ b/packages/twenty-front/src/modules/users/graphql/queries/getCurrentUser.ts
@@ -35,6 +35,19 @@ export const GET_CURRENT_USER = gql`
           value
           workspaceId
         }
+        currentCacheVersion
+        currentBillingSubscription {
+          status
+          interval
+        }
+      }
+      workspaces {
+        workspace {
+          id
+          displayName
+          logo
+          domainName
+        }
       }
     }
   }
diff --git a/packages/twenty-front/src/modules/users/utils/getProfilePictureAbsoluteURI.ts b/packages/twenty-front/src/modules/users/utils/getProfilePictureAbsoluteURI.ts
index 86f97c1df47c..b38880af8fe0 100644
--- a/packages/twenty-front/src/modules/users/utils/getProfilePictureAbsoluteURI.ts
+++ b/packages/twenty-front/src/modules/users/utils/getProfilePictureAbsoluteURI.ts
@@ -1,4 +1,4 @@
-import { REACT_APP_SERVER_FILES_URL } from '~/config';
+import { REACT_APP_SERVER_BASE_URL } from '~/config';
 
 export const getImageAbsoluteURIOrBase64 = (imageUrl?: string | null) => {
   if (!imageUrl) {
@@ -13,7 +13,7 @@ export const getImageAbsoluteURIOrBase64 = (imageUrl?: string | null) => {
     return imageUrl;
   }
 
-  const serverFilesUrl = REACT_APP_SERVER_FILES_URL;
+  const serverFilesUrl = REACT_APP_SERVER_BASE_URL;
 
-  return `${serverFilesUrl}/${imageUrl}`;
+  return `${serverFilesUrl}/files/${imageUrl}`;
 };
diff --git a/packages/twenty-front/src/modules/views/components/EditableFilterChip.tsx b/packages/twenty-front/src/modules/views/components/EditableFilterChip.tsx
index b054c58fb8de..af75297298a9 100644
--- a/packages/twenty-front/src/modules/views/components/EditableFilterChip.tsx
+++ b/packages/twenty-front/src/modules/views/components/EditableFilterChip.tsx
@@ -1,10 +1,10 @@
+import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
 import { getOperandLabelShort } from '@/object-record/object-filter-dropdown/utils/getOperandLabel';
 import { useIcons } from '@/ui/display/icon/hooks/useIcons';
 import { SortOrFilterChip } from '@/views/components/SortOrFilterChip';
-import { ViewFilter } from '@/views/types/ViewFilter';
 
 type EditableFilterChipProps = {
-  viewFilter: ViewFilter;
+  viewFilter: Filter;
   onRemove: () => void;
 };
 
diff --git a/packages/twenty-front/src/modules/views/components/EditableFilterDropdownButton.tsx b/packages/twenty-front/src/modules/views/components/EditableFilterDropdownButton.tsx
index 55537c4738fd..ee7f4dedb1f7 100644
--- a/packages/twenty-front/src/modules/views/components/EditableFilterDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/views/components/EditableFilterDropdownButton.tsx
@@ -1,17 +1,19 @@
 import { useCallback, useEffect } from 'react';
+import { useRecoilValue } from 'recoil';
 
 import { MultipleFiltersDropdownContent } from '@/object-record/object-filter-dropdown/components/MultipleFiltersDropdownContent';
 import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
 import { EditableFilterChip } from '@/views/components/EditableFilterChip';
-import { useViewBar } from '@/views/hooks/useViewBar';
-import { ViewFilter } from '@/views/types/ViewFilter';
+import { useCombinedViewFilters } from '@/views/hooks/useCombinedViewFilters';
+import { isDefined } from '~/utils/isDefined';
 
 type EditableFilterDropdownButtonProps = {
   viewFilterDropdownId: string;
-  viewFilter: ViewFilter;
+  viewFilter: Filter;
   hotkeyScope: HotkeyScope;
 };
 
@@ -21,7 +23,7 @@ export const EditableFilterDropdownButton = ({
   hotkeyScope,
 }: EditableFilterDropdownButtonProps) => {
   const {
-    availableFilterDefinitions,
+    availableFilterDefinitionsState,
     setFilterDefinitionUsedInDropdown,
     setSelectedOperandInDropdown,
     setSelectedFilter,
@@ -29,9 +31,13 @@ export const EditableFilterDropdownButton = ({
     filterDropdownId: viewFilterDropdownId,
   });
 
+  const availableFilterDefinitions = useRecoilValue(
+    availableFilterDefinitionsState,
+  );
+
   const { closeDropdown } = useDropdown(viewFilterDropdownId);
 
-  const { removeViewFilter } = useViewBar();
+  const { removeCombinedViewFilter } = useCombinedViewFilters();
 
   useEffect(() => {
     const filterDefinition = availableFilterDefinitions.find(
@@ -39,7 +45,7 @@ export const EditableFilterDropdownButton = ({
         filterDefinition.fieldMetadataId === viewFilter.fieldMetadataId,
     );
 
-    if (filterDefinition) {
+    if (isDefined(filterDefinition)) {
       setFilterDefinitionUsedInDropdown(filterDefinition);
       setSelectedOperandInDropdown(viewFilter.operand);
       setSelectedFilter(viewFilter);
@@ -56,19 +62,19 @@ export const EditableFilterDropdownButton = ({
   const handleRemove = () => {
     closeDropdown();
 
-    removeViewFilter(viewFilter.fieldMetadataId);
+    removeCombinedViewFilter(viewFilter.fieldMetadataId);
   };
 
   const handleDropdownClickOutside = useCallback(() => {
     const { value, fieldMetadataId } = viewFilter;
     if (!value) {
-      removeViewFilter(fieldMetadataId);
+      removeCombinedViewFilter(fieldMetadataId);
     }
-  }, [viewFilter, removeViewFilter]);
+  }, [viewFilter, removeCombinedViewFilter]);
 
   return (
     <Dropdown
-      dropdownId={viewFilter.fieldMetadataId}
+      dropdownId={viewFilterDropdownId}
       clickableComponent={
         <EditableFilterChip viewFilter={viewFilter} onRemove={handleRemove} />
       }
diff --git a/packages/twenty-front/src/modules/views/components/EditableSortChip.tsx b/packages/twenty-front/src/modules/views/components/EditableSortChip.tsx
index 4dbd7f6e93ba..c1cab0fdaede 100644
--- a/packages/twenty-front/src/modules/views/components/EditableSortChip.tsx
+++ b/packages/twenty-front/src/modules/views/components/EditableSortChip.tsx
@@ -1,21 +1,23 @@
-import { IconArrowDown, IconArrowUp } from '@/ui/display/icon/index';
+import { IconArrowDown, IconArrowUp } from 'twenty-ui';
+
+import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
 import { SortOrFilterChip } from '@/views/components/SortOrFilterChip';
-import { useViewBar } from '@/views/hooks/useViewBar';
-import { ViewSort } from '@/views/types/ViewSort';
+import { useCombinedViewSorts } from '@/views/hooks/useCombinedViewSorts';
 
 type EditableSortChipProps = {
-  viewSort: ViewSort;
+  viewSort: Sort;
 };
 
 export const EditableSortChip = ({ viewSort }: EditableSortChipProps) => {
-  const { removeViewSort, upsertViewSort } = useViewBar();
+  const { removeCombinedViewSort, upsertCombinedViewSort } =
+    useCombinedViewSorts();
 
   const handleRemoveClick = () => {
-    removeViewSort(viewSort.fieldMetadataId);
+    removeCombinedViewSort(viewSort.fieldMetadataId);
   };
 
   const handleClick = () => {
-    upsertViewSort({
+    upsertCombinedViewSort({
       ...viewSort,
       direction: viewSort.direction === 'asc' ? 'desc' : 'asc',
     });
@@ -27,7 +29,6 @@ export const EditableSortChip = ({ viewSort }: EditableSortChipProps) => {
       testId={viewSort.fieldMetadataId}
       labelValue={viewSort.definition.label}
       Icon={viewSort.direction === 'desc' ? IconArrowDown : IconArrowUp}
-      isSort
       onRemove={handleRemoveClick}
       onClick={handleClick}
     />
diff --git a/packages/twenty-front/src/modules/views/components/FilterQueryParamsEffect.tsx b/packages/twenty-front/src/modules/views/components/FilterQueryParamsEffect.tsx
deleted file mode 100644
index fe72b24bc0d4..000000000000
--- a/packages/twenty-front/src/modules/views/components/FilterQueryParamsEffect.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useEffect } from 'react';
-import { useRecoilValue, useSetRecoilState } from 'recoil';
-
-import { useFiltersFromQueryParams } from '@/views/hooks/internal/useFiltersFromQueryParams';
-import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
-import { useViewBar } from '@/views/hooks/useViewBar';
-
-export const FilterQueryParamsEffect = () => {
-  const { hasFiltersQueryParams, getFiltersFromQueryParams } =
-    useFiltersFromQueryParams();
-  const { currentViewFiltersState, onViewFiltersChangeState } =
-    useViewScopedStates();
-  const setCurrentViewFilters = useSetRecoilState(currentViewFiltersState);
-  const onViewFiltersChange = useRecoilValue(onViewFiltersChangeState);
-  const { resetViewBar } = useViewBar();
-
-  useEffect(() => {
-    if (!hasFiltersQueryParams) return;
-
-    getFiltersFromQueryParams().then((filtersFromParams) => {
-      if (Array.isArray(filtersFromParams)) {
-        setCurrentViewFilters(filtersFromParams);
-        onViewFiltersChange?.(filtersFromParams);
-      }
-    });
-
-    return () => {
-      resetViewBar();
-    };
-  }, [
-    getFiltersFromQueryParams,
-    hasFiltersQueryParams,
-    onViewFiltersChange,
-    resetViewBar,
-    setCurrentViewFilters,
-  ]);
-
-  return null;
-};
diff --git a/packages/twenty-front/src/modules/views/components/QueryParamsFiltersEffect.tsx b/packages/twenty-front/src/modules/views/components/QueryParamsFiltersEffect.tsx
new file mode 100644
index 000000000000..25278a77c9c4
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/components/QueryParamsFiltersEffect.tsx
@@ -0,0 +1,39 @@
+import { useEffect } from 'react';
+import { useSetRecoilState } from 'recoil';
+
+import { useViewFromQueryParams } from '@/views/hooks/internal/useViewFromQueryParams';
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+import { useResetCurrentView } from '@/views/hooks/useResetCurrentView';
+
+export const QueryParamsFiltersEffect = () => {
+  const { hasFiltersQueryParams, getFiltersFromQueryParams } =
+    useViewFromQueryParams();
+  const { unsavedToUpsertViewFiltersState } = useViewStates();
+  const setUnsavedViewFilter = useSetRecoilState(
+    unsavedToUpsertViewFiltersState,
+  );
+  const { resetCurrentView } = useResetCurrentView();
+
+  useEffect(() => {
+    if (!hasFiltersQueryParams) {
+      return;
+    }
+
+    getFiltersFromQueryParams().then((filtersFromParams) => {
+      if (Array.isArray(filtersFromParams)) {
+        setUnsavedViewFilter(filtersFromParams);
+      }
+    });
+
+    return () => {
+      resetCurrentView();
+    };
+  }, [
+    getFiltersFromQueryParams,
+    hasFiltersQueryParams,
+    resetCurrentView,
+    setUnsavedViewFilter,
+  ]);
+
+  return <></>;
+};
diff --git a/packages/twenty-front/src/modules/views/components/QueryParamsViewIdEffect.tsx b/packages/twenty-front/src/modules/views/components/QueryParamsViewIdEffect.tsx
new file mode 100644
index 000000000000..a7130fb3bf17
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/components/QueryParamsViewIdEffect.tsx
@@ -0,0 +1,38 @@
+import { useEffect } from 'react';
+import { isUndefined } from '@sniptt/guards';
+import { useRecoilState } from 'recoil';
+
+import { useViewFromQueryParams } from '@/views/hooks/internal/useViewFromQueryParams';
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
+import { isDefined } from '~/utils/isDefined';
+
+export const QueryParamsViewIdEffect = () => {
+  const { getFiltersFromQueryParams, viewIdQueryParam } =
+    useViewFromQueryParams();
+  const { currentViewIdState } = useViewStates();
+
+  const [currentViewId, setCurrentViewId] = useRecoilState(currentViewIdState);
+  const { viewsOnCurrentObject } = useGetCurrentView();
+
+  useEffect(() => {
+    const indexView = viewsOnCurrentObject.find((view) => view.key === 'INDEX');
+
+    if (isUndefined(viewIdQueryParam) && isDefined(indexView)) {
+      setCurrentViewId(indexView.id);
+      return;
+    }
+
+    if (isDefined(viewIdQueryParam)) {
+      setCurrentViewId(viewIdQueryParam);
+    }
+  }, [
+    currentViewId,
+    getFiltersFromQueryParams,
+    setCurrentViewId,
+    viewIdQueryParam,
+    viewsOnCurrentObject,
+  ]);
+
+  return <></>;
+};
diff --git a/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx b/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx
index b7fb3717c123..3da7f3405a02 100644
--- a/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx
+++ b/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx
@@ -1,14 +1,10 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconX } from 'twenty-ui';
 
-import { IconX } from '@/ui/display/icon/index';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
 
-type StyledChipProps = {
-  isSort?: boolean;
-};
-
-const StyledChip = styled.div<StyledChipProps>`
+const StyledChip = styled.div`
   align-items: center;
   background-color: ${({ theme }) => theme.accent.quaternary};
   border: 1px solid ${({ theme }) => theme.accent.tertiary};
@@ -19,7 +15,7 @@ const StyledChip = styled.div<StyledChipProps>`
   flex-direction: row;
   flex-shrink: 0;
   font-size: ${({ theme }) => theme.font.size.sm};
-  font-weight: ${({ isSort }) => (isSort ? 'bold' : 'normal')};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
   padding: ${({ theme }) => theme.spacing(1) + ' ' + theme.spacing(2)};
   user-select: none;
 `;
@@ -54,7 +50,6 @@ type SortOrFilterChipProps = {
   Icon?: IconComponent;
   onRemove: () => void;
   onClick?: () => void;
-  isSort?: boolean;
   testId?: string;
 };
 
@@ -63,7 +58,6 @@ export const SortOrFilterChip = ({
   labelValue,
   Icon,
   onRemove,
-  isSort,
   testId,
   onClick,
 }: SortOrFilterChipProps) => {
@@ -75,7 +69,7 @@ export const SortOrFilterChip = ({
   };
 
   return (
-    <StyledChip isSort={isSort} onClick={onClick}>
+    <StyledChip onClick={onClick}>
       {Icon && (
         <StyledIcon>
           <Icon size={theme.icon.size.sm} />
diff --git a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx
index ac8c6da739e0..b41269b4e7a5 100644
--- a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx
+++ b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx
@@ -1,21 +1,25 @@
 import { useCallback } from 'react';
 import styled from '@emotion/styled';
-import { useRecoilValue } from 'recoil';
+import { useRecoilValue, useSetRecoilState } from 'recoil';
+import { IconChevronDown, IconPlus } from 'twenty-ui';
 
-import { IconChevronDown, IconPlus } from '@/ui/display/icon';
 import { Button } from '@/ui/input/button/components/Button';
 import { ButtonGroup } from '@/ui/input/button/components/ButtonGroup';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
-import { UPDATE_VIEW_DROPDOWN_ID } from '@/views/constants/UpdateViewDropdownId';
-import { useViewBar } from '@/views/hooks/useViewBar';
-
-import { useViewScopedStates } from '../hooks/internal/useViewScopedStates';
+import { UPDATE_VIEW_BUTTON_DROPDOWN_ID } from '@/views/constants/UpdateViewButtonDropdownId';
+import { useViewFromQueryParams } from '@/views/hooks/internal/useViewFromQueryParams';
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
+import { useSaveCurrentViewFiltersAndSorts } from '@/views/hooks/useSaveCurrentViewFiltersAndSorts';
+import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';
+import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
+import { useViewPickerStates } from '@/views/view-picker/hooks/useViewPickerStates';
 
 const StyledContainer = styled.div`
-  background: ${({ theme }) => theme.color.blue};
   border-radius: ${({ theme }) => theme.border.radius.md};
   display: inline-flex;
   margin-right: ${({ theme }) => theme.spacing(2)};
@@ -24,58 +28,99 @@ const StyledContainer = styled.div`
 
 export type UpdateViewButtonGroupProps = {
   hotkeyScope: HotkeyScope;
-  onViewEditModeChange?: () => void;
 };
 
 export const UpdateViewButtonGroup = ({
   hotkeyScope,
-  onViewEditModeChange,
 }: UpdateViewButtonGroupProps) => {
-  const { updateCurrentView, setViewEditMode } = useViewBar();
-  const { canPersistFiltersSelector, canPersistSortsSelector } =
-    useViewScopedStates();
+  const { canPersistViewSelector, currentViewIdState } = useViewStates();
+  const { saveCurrentViewFilterAndSorts } = useSaveCurrentViewFiltersAndSorts();
 
-  const canPersistFilters = useRecoilValue(canPersistFiltersSelector);
-  const canPersistSorts = useRecoilValue(canPersistSortsSelector);
+  const { setViewPickerMode } = useViewPickerMode();
+  const { viewPickerReferenceViewIdState } = useViewPickerStates();
+  const canPersistView = useRecoilValue(canPersistViewSelector());
 
-  const canPersistView = canPersistFilters || canPersistSorts;
+  const { closeDropdown: closeUpdateViewButtonDropdown } = useDropdown(
+    UPDATE_VIEW_BUTTON_DROPDOWN_ID,
+  );
+  const { openDropdown: openViewPickerDropdown } = useDropdown(
+    VIEW_PICKER_DROPDOWN_ID,
+  );
+  const { currentViewWithCombinedFiltersAndSorts } = useGetCurrentView();
 
-  const handleCreateViewButtonClick = useCallback(() => {
-    setViewEditMode('create');
-    onViewEditModeChange?.();
-  }, [setViewEditMode, onViewEditModeChange]);
+  const currentViewId = useRecoilValue(currentViewIdState);
+
+  const setViewPickerReferenceViewId = useSetRecoilState(
+    viewPickerReferenceViewIdState,
+  );
 
-  const handleViewSubmit = async () => {
-    await updateCurrentView?.();
+  const handleViewCreate = useCallback(() => {
+    if (!currentViewId) {
+      return;
+    }
+    openViewPickerDropdown();
+    setViewPickerReferenceViewId(currentViewId);
+    setViewPickerMode('create');
+
+    closeUpdateViewButtonDropdown();
+  }, [
+    closeUpdateViewButtonDropdown,
+    currentViewId,
+    openViewPickerDropdown,
+    setViewPickerMode,
+    setViewPickerReferenceViewId,
+  ]);
+
+  const handleViewUpdate = async () => {
+    await saveCurrentViewFilterAndSorts();
   };
 
-  if (!canPersistView) {
+  const { hasFiltersQueryParams } = useViewFromQueryParams();
+
+  const canShowButton = canPersistView && !hasFiltersQueryParams;
+
+  if (!canShowButton) {
     return <></>;
   }
 
   return (
     <StyledContainer>
-      <ButtonGroup size="small" accent="blue">
-        <Button title="Update view" onClick={handleViewSubmit} />
-        <Dropdown
-          dropdownId={UPDATE_VIEW_DROPDOWN_ID}
-          dropdownHotkeyScope={hotkeyScope}
-          clickableComponent={
-            <Button size="small" accent="blue" Icon={IconChevronDown} />
-          }
-          dropdownComponents={
-            <>
-              <DropdownMenuItemsContainer>
-                <MenuItem
-                  onClick={handleCreateViewButtonClick}
-                  LeftIcon={IconPlus}
-                  text="Create view"
-                />
-              </DropdownMenuItemsContainer>
-            </>
-          }
+      {currentViewWithCombinedFiltersAndSorts?.key !== 'INDEX' ? (
+        <ButtonGroup size="small" accent="blue">
+          <Button title="Update view" onClick={handleViewUpdate} />
+          <Dropdown
+            dropdownId={UPDATE_VIEW_BUTTON_DROPDOWN_ID}
+            dropdownHotkeyScope={hotkeyScope}
+            clickableComponent={
+              <Button
+                size="small"
+                accent="blue"
+                Icon={IconChevronDown}
+                position="right"
+              />
+            }
+            dropdownComponents={
+              <>
+                <DropdownMenuItemsContainer>
+                  <MenuItem
+                    onClick={handleViewCreate}
+                    LeftIcon={IconPlus}
+                    text="Create view"
+                  />
+                </DropdownMenuItemsContainer>
+              </>
+            }
+          />
+        </ButtonGroup>
+      ) : (
+        <Button
+          title="Save as new view"
+          onClick={handleViewCreate}
+          accent="blue"
+          size="small"
+          variant="secondary"
         />
-      </ButtonGroup>
+      )}
     </StyledContainer>
   );
 };
diff --git a/packages/twenty-front/src/modules/views/components/ViewBar.tsx b/packages/twenty-front/src/modules/views/components/ViewBar.tsx
index 2ee4be3f2e1b..ca9903c468f2 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBar.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBar.tsx
@@ -4,89 +4,60 @@ import { useParams } from 'react-router-dom';
 import { ObjectFilterDropdownButton } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton';
 import { FiltersHotkeyScope } from '@/object-record/object-filter-dropdown/types/FiltersHotkeyScope';
 import { ObjectSortDropdownButton } from '@/object-record/object-sort-dropdown/components/ObjectSortDropdownButton';
-import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { TopBar } from '@/ui/layout/top-bar/TopBar';
-import { FilterQueryParamsEffect } from '@/views/components/FilterQueryParamsEffect';
+import { QueryParamsFiltersEffect } from '@/views/components/QueryParamsFiltersEffect';
+import { QueryParamsViewIdEffect } from '@/views/components/QueryParamsViewIdEffect';
 import { ViewBarEffect } from '@/views/components/ViewBarEffect';
 import { ViewBarFilterEffect } from '@/views/components/ViewBarFilterEffect';
 import { ViewBarSortEffect } from '@/views/components/ViewBarSortEffect';
-import { useViewBar } from '@/views/hooks/useViewBar';
 import { ViewScope } from '@/views/scopes/ViewScope';
-import { ViewField } from '@/views/types/ViewField';
-import { ViewFilter } from '@/views/types/ViewFilter';
-import { ViewSort } from '@/views/types/ViewSort';
-import { ViewType } from '@/views/types/ViewType';
+import { GraphQLView } from '@/views/types/GraphQLView';
+import { ViewPickerDropdown } from '@/views/view-picker/components/ViewPickerDropdown';
 
 import { ViewsHotkeyScope } from '../types/ViewsHotkeyScope';
 
 import { UpdateViewButtonGroup } from './UpdateViewButtonGroup';
 import { ViewBarDetails } from './ViewBarDetails';
-import { ViewsDropdownButton } from './ViewsDropdownButton';
 
 export type ViewBarProps = {
   viewBarId: string;
   className?: string;
   optionsDropdownButton: ReactNode;
-  optionsDropdownScopeId: string;
-  onViewSortsChange?: (sorts: ViewSort[]) => void | Promise<void>;
-  onViewFiltersChange?: (filters: ViewFilter[]) => void | Promise<void>;
-  onViewFieldsChange?: (fields: ViewField[]) => void | Promise<void>;
-  onViewTypeChange?: (viewType: ViewType) => void | Promise<void>;
-  onViewCompactModeChange?: (
-    isCompactModeActive: boolean,
-  ) => void | Promise<void>;
+  onCurrentViewChange: (view: GraphQLView | undefined) => void | Promise<void>;
 };
 
 export const ViewBar = ({
   viewBarId,
   className,
   optionsDropdownButton,
-  optionsDropdownScopeId,
-  onViewFieldsChange,
-  onViewFiltersChange,
-  onViewSortsChange,
-  onViewTypeChange,
-  onViewCompactModeChange,
+  onCurrentViewChange,
 }: ViewBarProps) => {
-  const { openDropdown: openOptionsDropdownButton } = useDropdown(
-    optionsDropdownScopeId,
-  );
-  const { upsertViewSort, upsertViewFilter } = useViewBar({
-    viewBarId,
-  });
   const { objectNamePlural } = useParams();
 
   const filterDropdownId = 'view-filter';
   const sortDropdownId = 'view-sort';
 
+  if (!objectNamePlural) {
+    return;
+  }
+
   return (
     <ViewScope
       viewScopeId={viewBarId}
-      onViewFieldsChange={onViewFieldsChange}
-      onViewFiltersChange={onViewFiltersChange}
-      onViewSortsChange={onViewSortsChange}
-      onViewTypeChange={onViewTypeChange}
-      onViewCompactModeChange={onViewCompactModeChange}
+      onCurrentViewChange={onCurrentViewChange}
     >
-      <ViewBarEffect />
-      <ViewBarFilterEffect
-        filterDropdownId={filterDropdownId}
-        onFilterSelect={upsertViewFilter}
-      />
-      <ViewBarSortEffect
-        sortDropdownId={sortDropdownId}
-        onSortSelect={upsertViewSort}
-      />
-      {!!objectNamePlural && <FilterQueryParamsEffect />}
+      <ViewBarEffect viewBarId={viewBarId} />
+      <ViewBarFilterEffect filterDropdownId={filterDropdownId} />
+      <ViewBarSortEffect sortDropdownId={sortDropdownId} />
+      <QueryParamsFiltersEffect />
+      <QueryParamsViewIdEffect />
 
       <TopBar
         className={className}
         leftComponent={
-          <ViewsDropdownButton
-            onViewEditModeChange={openOptionsDropdownButton}
-            hotkeyScope={{ scope: ViewsHotkeyScope.ListDropdown }}
-            optionsDropdownScopeId={optionsDropdownScopeId}
-          />
+          <>
+            <ViewPickerDropdown />
+          </>
         }
         displayBottomBorder={false}
         rightComponent={
@@ -113,8 +84,9 @@ export const ViewBar = ({
             viewBarId={viewBarId}
             rightComponent={
               <UpdateViewButtonGroup
-                onViewEditModeChange={openOptionsDropdownButton}
-                hotkeyScope={{ scope: ViewsHotkeyScope.CreateDropdown }}
+                hotkeyScope={{
+                  scope: ViewsHotkeyScope.UpdateViewButtonDropdown,
+                }}
               />
             }
           />
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx b/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx
index 0841b3e3901f..6a0a2882dd4a 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx
@@ -4,14 +4,16 @@ import { useRecoilValue } from 'recoil';
 
 import { AddObjectFilterFromDetailsButton } from '@/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton';
 import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
-import { FiltersHotkeyScope } from '@/object-record/object-filter-dropdown/types/FiltersHotkeyScope';
 import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
 import { EditableFilterDropdownButton } from '@/views/components/EditableFilterDropdownButton';
 import { EditableSortChip } from '@/views/components/EditableSortChip';
 import { ViewBarFilterEffect } from '@/views/components/ViewBarFilterEffect';
-import { useViewBar } from '@/views/hooks/useViewBar';
-
-import { useViewScopedStates } from '../hooks/internal/useViewScopedStates';
+import { useViewFromQueryParams } from '@/views/hooks/internal/useViewFromQueryParams';
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
+import { useResetCurrentView } from '@/views/hooks/useResetCurrentView';
+import { mapViewFiltersToFilters } from '@/views/utils/mapViewFiltersToFilters';
+import { mapViewSortsToSorts } from '@/views/utils/mapViewSortsToSorts';
 
 export type ViewBarDetailsProps = {
   hasFilterButton?: boolean;
@@ -25,9 +27,11 @@ const StyledBar = styled.div`
   border-top: 1px solid ${({ theme }) => theme.border.color.light};
   display: flex;
   flex-direction: row;
-  height: 40px;
+  min-height: 32px;
   justify-content: space-between;
   z-index: 4;
+  padding-top: ${({ theme }) => theme.spacing(1)};
+  padding-bottom: ${({ theme }) => theme.spacing(1)};
 `;
 
 const StyledChipcontainer = styled.div`
@@ -35,10 +39,9 @@ const StyledChipcontainer = styled.div`
   display: flex;
   flex-direction: row;
   gap: ${({ theme }) => theme.spacing(1)};
-  height: 40px;
-  justify-content: space-between;
+  min-height: 32px;
   margin-left: ${({ theme }) => theme.spacing(2)};
-  overflow-x: auto;
+  flex-wrap: wrap;
 `;
 
 const StyledCancelButton = styled.button`
@@ -92,37 +95,37 @@ export const ViewBarDetails = ({
   hasFilterButton = false,
   rightComponent,
   filterDropdownId,
-  viewBarId,
 }: ViewBarDetailsProps) => {
   const {
-    currentViewSortsState,
-    currentViewFiltersState,
-    canPersistFiltersSelector,
-    canPersistSortsSelector,
+    canPersistViewSelector,
     isViewBarExpandedState,
-  } = useViewScopedStates();
+    availableFilterDefinitionsState,
+    availableSortDefinitionsState,
+  } = useViewStates();
 
-  const currentViewSorts = useRecoilValue(currentViewSortsState);
-  const currentViewFilters = useRecoilValue(currentViewFiltersState);
-  const canPersistFilters = useRecoilValue(canPersistFiltersSelector);
-  const canPersistSorts = useRecoilValue(canPersistSortsSelector);
-  const isViewBarExpanded = useRecoilValue(isViewBarExpandedState);
+  const { currentViewWithCombinedFiltersAndSorts } = useGetCurrentView();
 
-  const { resetViewBar } = useViewBar();
+  const isViewBarExpanded = useRecoilValue(isViewBarExpandedState);
+  const { hasFiltersQueryParams } = useViewFromQueryParams();
+  const canPersistView = useRecoilValue(canPersistViewSelector());
+  const availableFilterDefinitions = useRecoilValue(
+    availableFilterDefinitionsState,
+  );
+  const availableSortDefinitions = useRecoilValue(
+    availableSortDefinitionsState,
+  );
 
-  const canPersistView = canPersistFilters || canPersistSorts;
+  const { resetCurrentView } = useResetCurrentView();
+  const canResetView = canPersistView && !hasFiltersQueryParams;
 
   const handleCancelClick = () => {
-    resetViewBar();
+    resetCurrentView();
   };
 
-  const { upsertViewFilter } = useViewBar({
-    viewBarId: viewBarId,
-  });
-
   const shouldExpandViewBar =
     canPersistView ||
-    ((currentViewSorts?.length || currentViewFilters?.length) &&
+    ((currentViewWithCombinedFiltersAndSorts?.viewSorts?.length ||
+      currentViewWithCombinedFiltersAndSorts?.viewFilters?.length) &&
       isViewBarExpanded);
 
   if (!shouldExpandViewBar) {
@@ -133,28 +136,34 @@ export const ViewBarDetails = ({
     <StyledBar>
       <StyledFilterContainer>
         <StyledChipcontainer>
-          {currentViewSorts?.map((sort) => (
-            <EditableSortChip key={sort.id} viewSort={sort} />
+          {mapViewSortsToSorts(
+            currentViewWithCombinedFiltersAndSorts?.viewSorts ?? [],
+            availableSortDefinitions,
+          ).map((sort) => (
+            <EditableSortChip key={sort.fieldMetadataId} viewSort={sort} />
           ))}
-          {!!currentViewSorts?.length && !!currentViewFilters?.length && (
-            <StyledSeperatorContainer>
-              <StyledSeperator />
-            </StyledSeperatorContainer>
-          )}
-          {currentViewFilters?.map((viewFilter) => (
+          {!!currentViewWithCombinedFiltersAndSorts?.viewSorts?.length &&
+            !!currentViewWithCombinedFiltersAndSorts?.viewFilters?.length && (
+              <StyledSeperatorContainer>
+                <StyledSeperator />
+              </StyledSeperatorContainer>
+            )}
+          {mapViewFiltersToFilters(
+            currentViewWithCombinedFiltersAndSorts?.viewFilters ?? [],
+            availableFilterDefinitions,
+          ).map((viewFilter) => (
             <ObjectFilterDropdownScope
-              key={viewFilter.id}
+              key={viewFilter.fieldMetadataId}
               filterScopeId={viewFilter.fieldMetadataId}
             >
               <DropdownScope dropdownScopeId={viewFilter.fieldMetadataId}>
                 <ViewBarFilterEffect
                   filterDropdownId={viewFilter.fieldMetadataId}
-                  onFilterSelect={upsertViewFilter}
                 />
                 <EditableFilterDropdownButton
                   viewFilter={viewFilter}
                   hotkeyScope={{
-                    scope: FiltersHotkeyScope.ObjectFilterDropdownButton,
+                    scope: viewFilter.fieldMetadataId,
                   }}
                   viewFilterDropdownId={viewFilter.fieldMetadataId}
                 />
@@ -170,7 +179,7 @@ export const ViewBarDetails = ({
           </StyledAddFilterContainer>
         )}
       </StyledFilterContainer>
-      {canPersistView && (
+      {canResetView && (
         <StyledCancelButton
           data-testid="cancel-button"
           onClick={handleCancelClick}
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarEffect.tsx b/packages/twenty-front/src/modules/views/components/ViewBarEffect.tsx
index 4bf984b09e00..518ed1590b46 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarEffect.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarEffect.tsx
@@ -1,83 +1,60 @@
-import { useEffect } from 'react';
-import { useSearchParams } from 'react-router-dom';
-import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
+import { useEffect, useState } from 'react';
+import { isUndefined } from '@sniptt/guards';
+import { useRecoilValue } from 'recoil';
 
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { useViewBar } from '@/views/hooks/useViewBar';
-import { GraphQLView } from '@/views/types/GraphQLView';
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
+import { View } from '@/views/types/View';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
 
-import { useViewScopedStates } from '../hooks/internal/useViewScopedStates';
+type ViewBarEffectProps = {
+  viewBarId: string;
+};
 
-export const ViewBarEffect = () => {
+export const ViewBarEffect = ({ viewBarId }: ViewBarEffectProps) => {
+  const { currentViewWithCombinedFiltersAndSorts } =
+    useGetCurrentView(viewBarId);
   const {
-    loadView,
-    changeViewInUrl,
-    loadViewFields,
-    loadViewFilters,
-    loadViewSorts,
-  } = useViewBar();
-
-  const [searchParams] = useSearchParams();
-  const currentViewIdFromUrl = searchParams.get('view');
+    onCurrentViewChangeState,
+    availableFilterDefinitionsState,
+    isPersistingViewFieldsState,
+  } = useViewStates(viewBarId);
 
-  const { viewObjectMetadataIdState, viewsState, currentViewIdState } =
-    useViewScopedStates();
+  const [currentViewSnapshot, setCurrentViewSnapshot] = useState<
+    View | undefined
+  >(undefined);
 
-  const [views, setViews] = useRecoilState(viewsState);
-  const viewObjectMetadataId = useRecoilValue(viewObjectMetadataIdState);
-  const setCurrentViewId = useSetRecoilState(currentViewIdState);
-
-  const { records: newViews } = useFindManyRecords<GraphQLView>({
-    skip: !viewObjectMetadataId,
-    objectNameSingular: CoreObjectNameSingular.View,
-    filter: {
-      objectMetadataId: { eq: viewObjectMetadataId },
-    },
-    useRecordsWithoutConnection: true,
-  });
+  const onCurrentViewChange = useRecoilValue(onCurrentViewChangeState);
+  const availableFilterDefinitions = useRecoilValue(
+    availableFilterDefinitionsState,
+  );
+  const isPersistingViewFields = useRecoilValue(isPersistingViewFieldsState);
 
   useEffect(() => {
-    if (!newViews.length) return;
-
-    if (!isDeeplyEqual(views, newViews)) {
-      setViews(newViews);
+    if (
+      !isDeeplyEqual(
+        currentViewWithCombinedFiltersAndSorts,
+        currentViewSnapshot,
+      )
+    ) {
+      if (isUndefined(currentViewWithCombinedFiltersAndSorts)) {
+        setCurrentViewSnapshot(currentViewWithCombinedFiltersAndSorts);
+        onCurrentViewChange?.(undefined);
+        return;
+      }
+
+      if (!isPersistingViewFields) {
+        setCurrentViewSnapshot(currentViewWithCombinedFiltersAndSorts);
+        onCurrentViewChange?.(currentViewWithCombinedFiltersAndSorts);
+      }
     }
-
-    const currentView =
-      newViews.find((view) => view.id === currentViewIdFromUrl) ??
-      newViews[0] ??
-      null;
-
-    if (!currentView) return;
-
-    setCurrentViewId(currentView.id);
-
-    if (currentView?.viewFields) {
-      loadViewFields(currentView.viewFields, currentView.id);
-      loadViewFilters(currentView.viewFilters, currentView.id);
-      loadViewSorts(currentView.viewSorts, currentView.id);
-    }
-
-    if (!currentViewIdFromUrl) return changeViewInUrl(currentView.id);
   }, [
-    changeViewInUrl,
-    currentViewIdFromUrl,
-    loadViewFields,
-    loadViewFilters,
-    loadViewSorts,
-    newViews,
-    setCurrentViewId,
-    setViews,
-    views,
+    availableFilterDefinitions,
+    currentViewSnapshot,
+    currentViewWithCombinedFiltersAndSorts,
+    isPersistingViewFields,
+    onCurrentViewChange,
   ]);
 
-  useEffect(() => {
-    if (!currentViewIdFromUrl || !newViews.length) return;
-
-    loadView(currentViewIdFromUrl);
-  }, [currentViewIdFromUrl, loadView, newViews]);
-
   return <></>;
 };
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterEffect.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterEffect.tsx
index 991ed56c0d54..1f19e48103da 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterEffect.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterEffect.tsx
@@ -4,19 +4,21 @@ import { useRecoilValue } from 'recoil';
 
 import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
 import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+import { useCombinedViewFilters } from '@/views/hooks/useCombinedViewFilters';
+import { isDefined } from '~/utils/isDefined';
 
 type ViewBarFilterEffectProps = {
   filterDropdownId: string;
-  onFilterSelect?: ((filter: Filter) => void) | undefined;
 };
 
 export const ViewBarFilterEffect = ({
   filterDropdownId,
-  onFilterSelect,
 }: ViewBarFilterEffectProps) => {
-  const { availableFilterDefinitionsState, currentViewFiltersState } =
-    useViewScopedStates();
+  const { availableFilterDefinitionsState, unsavedToUpsertViewFiltersState } =
+    useViewStates();
+
+  const { upsertCombinedViewFilter } = useCombinedViewFilters();
 
   const availableFilterDefinitions = useRecoilValue(
     availableFilterDefinitionsState,
@@ -24,31 +26,38 @@ export const ViewBarFilterEffect = ({
   const {
     setAvailableFilterDefinitions,
     setOnFilterSelect,
-    filterDefinitionUsedInDropdown,
+    filterDefinitionUsedInDropdownState,
     setObjectFilterDropdownSelectedRecordIds,
-    isObjectFilterDropdownUnfolded,
+    setObjectFilterDropdownSelectedOptionValues,
   } = useFilterDropdown({ filterDropdownId });
 
+  const filterDefinitionUsedInDropdown = useRecoilValue(
+    filterDefinitionUsedInDropdownState,
+  );
+
   useEffect(() => {
-    if (availableFilterDefinitions) {
+    if (isDefined(availableFilterDefinitions)) {
       setAvailableFilterDefinitions(availableFilterDefinitions);
     }
-
-    if (onFilterSelect) {
-      setOnFilterSelect(() => onFilterSelect);
-    }
+    setOnFilterSelect(() => (filter: Filter | null) => {
+      if (isDefined(filter)) {
+        upsertCombinedViewFilter(filter);
+      }
+    });
   }, [
     availableFilterDefinitions,
-    onFilterSelect,
     setAvailableFilterDefinitions,
     setOnFilterSelect,
+    upsertCombinedViewFilter,
   ]);
 
-  const currentViewFilters = useRecoilValue(currentViewFiltersState);
+  const unsavedToUpsertViewFilters = useRecoilValue(
+    unsavedToUpsertViewFiltersState,
+  );
 
   useEffect(() => {
     if (filterDefinitionUsedInDropdown?.type === 'RELATION') {
-      const viewFilterUsedInDropdown = currentViewFilters.find(
+      const viewFilterUsedInDropdown = unsavedToUpsertViewFilters.find(
         (filter) =>
           filter.fieldMetadataId ===
           filterDefinitionUsedInDropdown.fieldMetadataId,
@@ -61,12 +70,28 @@ export const ViewBarFilterEffect = ({
         : [];
 
       setObjectFilterDropdownSelectedRecordIds(viewFilterSelectedRecordIds);
+    } else if (filterDefinitionUsedInDropdown?.type === 'SELECT') {
+      const viewFilterUsedInDropdown = unsavedToUpsertViewFilters.find(
+        (filter) =>
+          filter.fieldMetadataId ===
+          filterDefinitionUsedInDropdown.fieldMetadataId,
+      );
+
+      const viewFilterSelectedOptionValues = isNonEmptyString(
+        viewFilterUsedInDropdown?.value,
+      )
+        ? JSON.parse(viewFilterUsedInDropdown.value)
+        : [];
+
+      setObjectFilterDropdownSelectedOptionValues(
+        viewFilterSelectedOptionValues,
+      );
     }
   }, [
     filterDefinitionUsedInDropdown,
-    currentViewFilters,
     setObjectFilterDropdownSelectedRecordIds,
-    isObjectFilterDropdownUnfolded,
+    setObjectFilterDropdownSelectedOptionValues,
+    unsavedToUpsertViewFilters,
   ]);
 
   return <></>;
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarSortEffect.tsx b/packages/twenty-front/src/modules/views/components/ViewBarSortEffect.tsx
index c8428f38917f..0baba6d0b403 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarSortEffect.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarSortEffect.tsx
@@ -1,41 +1,52 @@
 import { useEffect } from 'react';
-import { useRecoilValue } from 'recoil';
+import { useRecoilValue, useSetRecoilState } from 'recoil';
 
 import { useSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useSortDropdown';
 import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
-import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+import { useCombinedViewSorts } from '@/views/hooks/useCombinedViewSorts';
+import { isDefined } from '~/utils/isDefined';
 
 type ViewBarSortEffectProps = {
   sortDropdownId: string;
-  onSortSelect?: ((sort: Sort) => void) | undefined;
 };
 
 export const ViewBarSortEffect = ({
   sortDropdownId,
-  onSortSelect,
 }: ViewBarSortEffectProps) => {
-  const { availableSortDefinitionsState } = useViewScopedStates();
+  const { availableSortDefinitionsState } = useViewStates();
+  const { upsertCombinedViewSort } = useCombinedViewSorts();
 
   const availableSortDefinitions = useRecoilValue(
     availableSortDefinitionsState,
   );
 
-  const { setAvailableSortDefinitions, setOnSortSelect } = useSortDropdown({
+  const {
+    availableSortDefinitionsState: availableSortDefinitionsInSortDropdownState,
+    onSortSelectState,
+  } = useSortDropdown({
     sortDropdownId,
   });
 
+  const setAvailableSortDefinitionsInSortDropdown = useSetRecoilState(
+    availableSortDefinitionsInSortDropdownState,
+  );
+  const setOnSortSelect = useSetRecoilState(onSortSelectState);
+
   useEffect(() => {
-    if (availableSortDefinitions) {
-      setAvailableSortDefinitions(availableSortDefinitions);
-    }
-    if (onSortSelect) {
-      setOnSortSelect(() => onSortSelect);
+    if (isDefined(availableSortDefinitions)) {
+      setAvailableSortDefinitionsInSortDropdown(availableSortDefinitions);
     }
+    setOnSortSelect(() => (sort: Sort | null) => {
+      if (isDefined(sort)) {
+        upsertCombinedViewSort(sort);
+      }
+    });
   }, [
     availableSortDefinitions,
-    onSortSelect,
-    setAvailableSortDefinitions,
+    setAvailableSortDefinitionsInSortDropdown,
     setOnSortSelect,
+    upsertCombinedViewSort,
   ]);
 
   return <></>;
diff --git a/packages/twenty-front/src/modules/views/components/ViewFieldsVisibilityDropdownSection.tsx b/packages/twenty-front/src/modules/views/components/ViewFieldsVisibilityDropdownSection.tsx
index 58983701402b..bd8b19cc6cbb 100644
--- a/packages/twenty-front/src/modules/views/components/ViewFieldsVisibilityDropdownSection.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewFieldsVisibilityDropdownSection.tsx
@@ -5,11 +5,10 @@ import {
   OnDragEndResponder,
   ResponderProvided,
 } from '@hello-pangea/dnd';
+import { IconInfoCircle, IconMinus, IconPlus } from 'twenty-ui';
 
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
-import { IconMinus, IconPlus } from '@/ui/display/icon';
-import { IconInfoCircle } from '@/ui/display/icon';
 import { useIcons } from '@/ui/display/icon/hooks/useIcons';
 import { AppTooltip } from '@/ui/display/tooltip/AppTooltip';
 import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';
@@ -20,7 +19,7 @@ import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
 import { MenuItemDraggable } from '@/ui/navigation/menu-item/components/MenuItemDraggable';
 import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
 import { groupArrayItemsBy } from '~/utils/array/groupArrayItemsBy';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 type ViewFieldsVisibilityDropdownSectionProps = {
   fields: Omit<ColumnDefinition<FieldMetadata>, 'size'>[];
@@ -69,7 +68,7 @@ export const ViewFieldsVisibilityDropdownSection = ({
             Icon: field.isVisible ? IconMinus : IconPlus,
             onClick: () => onVisibilityChange(field),
           },
-    ].filter(isNonNullable);
+    ].filter(isDefined);
 
     return iconButtons.length ? iconButtons : undefined;
   };
@@ -134,7 +133,7 @@ export const ViewFieldsVisibilityDropdownSection = ({
           />
         )}
       </DropdownMenuItemsContainer>
-      {isNonNullable(openToolTipIndex) &&
+      {isDefined(openToolTipIndex) &&
         createPortal(
           <AppTooltip
             anchorSelect={`.${title}-${
diff --git a/packages/twenty-front/src/modules/views/components/ViewsDropdownButton.tsx b/packages/twenty-front/src/modules/views/components/ViewsDropdownButton.tsx
deleted file mode 100644
index 5bd7ae6cb529..000000000000
--- a/packages/twenty-front/src/modules/views/components/ViewsDropdownButton.tsx
+++ /dev/null
@@ -1,183 +0,0 @@
-import { MouseEvent } from 'react';
-import { useTheme } from '@emotion/react';
-import styled from '@emotion/styled';
-import { useRecoilCallback, useRecoilValue } from 'recoil';
-
-import {
-  IconChevronDown,
-  IconList,
-  IconPencil,
-  IconPlus,
-  IconTrash,
-} from '@/ui/display/icon';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
-import { StyledDropdownButtonContainer } from '@/ui/layout/dropdown/components/StyledDropdownButtonContainer';
-import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
-import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
-import { MOBILE_VIEWPORT } from '@/ui/theme/constants/MobileViewport';
-import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
-import { VIEWS_DROPDOWN_ID } from '@/views/constants/ViewsDropdownId';
-import { useViewBar } from '@/views/hooks/useViewBar';
-import { isNonNullable } from '~/utils/isNonNullable';
-
-import { useViewScopedStates } from '../hooks/internal/useViewScopedStates';
-
-const StyledBoldDropdownMenuItemsContainer = styled(DropdownMenuItemsContainer)`
-  font-weight: ${({ theme }) => theme.font.weight.regular};
-`;
-
-const StyledDropdownLabelAdornments = styled.span`
-  align-items: center;
-  color: ${({ theme }) => theme.grayScale.gray35};
-  display: inline-flex;
-  gap: ${({ theme }) => theme.spacing(1)};
-  margin-left: ${({ theme }) => theme.spacing(1)};
-`;
-
-const StyledViewIcon = styled(IconList)`
-  margin-right: ${({ theme }) => theme.spacing(1)};
-`;
-
-const StyledViewName = styled.span`
-  display: inline-block;
-  max-width: 130px;
-  @media (max-width: 375px) {
-    max-width: 90px;
-  }
-  @media (min-width: 376px) and (max-width: ${MOBILE_VIEWPORT}px) {
-    max-width: 110px;
-  }
-  overflow: hidden;
-  text-overflow: ellipsis;
-  vertical-align: middle;
-  white-space: nowrap;
-`;
-
-export type ViewsDropdownButtonProps = {
-  hotkeyScope: HotkeyScope;
-  onViewEditModeChange?: () => void;
-  optionsDropdownScopeId: string;
-};
-
-export const ViewsDropdownButton = ({
-  hotkeyScope,
-  onViewEditModeChange,
-  optionsDropdownScopeId,
-}: ViewsDropdownButtonProps) => {
-  const theme = useTheme();
-  const { removeView, changeViewInUrl } = useViewBar();
-
-  const { viewsState, currentViewSelector, entityCountInCurrentViewState } =
-    useViewScopedStates();
-
-  const views = useRecoilValue(viewsState);
-  const currentView = useRecoilValue(currentViewSelector);
-  const entityCountInCurrentView = useRecoilValue(
-    entityCountInCurrentViewState,
-  );
-
-  const { setViewEditMode, setCurrentViewId, loadView } = useViewBar();
-
-  const {
-    isDropdownOpen: isViewsDropdownOpen,
-    closeDropdown: closeViewsDropdown,
-  } = useDropdown(VIEWS_DROPDOWN_ID);
-
-  const { openDropdown: openOptionsDropdown } = useDropdown(
-    optionsDropdownScopeId,
-  );
-
-  const handleViewSelect = useRecoilCallback(
-    () => async (viewId: string) => {
-      changeViewInUrl(viewId);
-      loadView(viewId);
-      closeViewsDropdown();
-    },
-    [changeViewInUrl, closeViewsDropdown, loadView],
-  );
-
-  const handleAddViewButtonClick = () => {
-    setViewEditMode('create');
-    onViewEditModeChange?.();
-    closeViewsDropdown();
-    openOptionsDropdown();
-  };
-
-  const handleEditViewButtonClick = (
-    event: MouseEvent<HTMLButtonElement>,
-    viewId: string,
-  ) => {
-    event.stopPropagation();
-    changeViewInUrl(viewId);
-    setCurrentViewId(viewId);
-    setViewEditMode('edit');
-    onViewEditModeChange?.();
-    closeViewsDropdown();
-    openOptionsDropdown();
-  };
-
-  const handleDeleteViewButtonClick = async (
-    event: MouseEvent<HTMLButtonElement>,
-    viewId: string,
-  ) => {
-    event.stopPropagation();
-
-    await removeView(viewId);
-    closeViewsDropdown();
-  };
-
-  return (
-    <Dropdown
-      dropdownId={VIEWS_DROPDOWN_ID}
-      dropdownHotkeyScope={hotkeyScope}
-      clickableComponent={
-        <StyledDropdownButtonContainer isUnfolded={isViewsDropdownOpen}>
-          <StyledViewIcon size={theme.icon.size.md} />
-          <StyledViewName>{currentView?.name ?? 'All'}</StyledViewName>
-          <StyledDropdownLabelAdornments>
-            · {entityCountInCurrentView}{' '}
-            <IconChevronDown size={theme.icon.size.sm} />
-          </StyledDropdownLabelAdornments>
-        </StyledDropdownButtonContainer>
-      }
-      dropdownComponents={
-        <>
-          <DropdownMenuItemsContainer>
-            {views.map((view) => (
-              <MenuItem
-                key={view.id}
-                iconButtons={[
-                  {
-                    Icon: IconPencil,
-                    onClick: (event: MouseEvent<HTMLButtonElement>) =>
-                      handleEditViewButtonClick(event, view.id),
-                  },
-                  views.length > 1
-                    ? {
-                        Icon: IconTrash,
-                        onClick: (event: MouseEvent<HTMLButtonElement>) =>
-                          handleDeleteViewButtonClick(event, view.id),
-                      }
-                    : null,
-                ].filter(isNonNullable)}
-                onClick={() => handleViewSelect(view.id)}
-                LeftIcon={IconList}
-                text={view.name}
-              />
-            ))}
-          </DropdownMenuItemsContainer>
-          <DropdownMenuSeparator />
-          <StyledBoldDropdownMenuItemsContainer>
-            <MenuItem
-              onClick={handleAddViewButtonClick}
-              LeftIcon={IconPlus}
-              text="Add view"
-            />
-          </StyledBoldDropdownMenuItemsContainer>
-        </>
-      }
-    />
-  );
-};
diff --git a/packages/twenty-front/src/modules/views/constants/UpdateViewButtonDropdownId.ts b/packages/twenty-front/src/modules/views/constants/UpdateViewButtonDropdownId.ts
new file mode 100644
index 000000000000..9f82edf76445
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/constants/UpdateViewButtonDropdownId.ts
@@ -0,0 +1 @@
+export const UPDATE_VIEW_BUTTON_DROPDOWN_ID = 'update-view-button';
diff --git a/packages/twenty-front/src/modules/views/constants/UpdateViewDropdownId.ts b/packages/twenty-front/src/modules/views/constants/UpdateViewDropdownId.ts
deleted file mode 100644
index 3df0661f20c9..000000000000
--- a/packages/twenty-front/src/modules/views/constants/UpdateViewDropdownId.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const UPDATE_VIEW_DROPDOWN_ID = 'update-view';
diff --git a/packages/twenty-front/src/modules/views/constants/ViewsDropdownId.ts b/packages/twenty-front/src/modules/views/constants/ViewsDropdownId.ts
deleted file mode 100644
index da6b17a6abea..000000000000
--- a/packages/twenty-front/src/modules/views/constants/ViewsDropdownId.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const VIEWS_DROPDOWN_ID = 'views';
diff --git a/packages/twenty-front/src/modules/views/constants/index.ts b/packages/twenty-front/src/modules/views/constants/index.ts
deleted file mode 100644
index 932654ac31ab..000000000000
--- a/packages/twenty-front/src/modules/views/constants/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// TODO: find a better pattern than using '' as a fallback
-export const UNDEFINED_FAMILY_ITEM_ID = '';
diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useViewBar.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useViewBar.test.tsx
index 3170a5f27d19..1906765f638d 100644
--- a/packages/twenty-front/src/modules/views/hooks/__tests__/useViewBar.test.tsx
+++ b/packages/twenty-front/src/modules/views/hooks/__tests__/useViewBar.test.tsx
@@ -1,33 +1,11 @@
-import { act } from 'react-dom/test-utils';
-import { MemoryRouter, useSearchParams } from 'react-router-dom';
+import { MemoryRouter } from 'react-router-dom';
 import { MockedProvider } from '@apollo/client/testing';
-import { renderHook, waitFor } from '@testing-library/react';
-import { RecoilRoot, useRecoilState, useRecoilValue } from 'recoil';
+import { RecoilRoot } from 'recoil';
 import { v4 as uuidv4 } from 'uuid';
 
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { generateDeleteOneRecordMutation } from '@/object-record/utils/generateDeleteOneRecordMutation';
-import { getScopedStateDeprecated } from '@/ui/utilities/recoil-scope/utils/getScopedStateDeprecated';
-import {
-  filterDefinition,
-  viewFilter,
-} from '@/views/hooks/__tests__/useViewBar_ViewFilters.test';
-import {
-  sortDefinition,
-  viewSort,
-} from '@/views/hooks/__tests__/useViewBar_ViewSorts.test';
-import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
-import { useViewBar } from '@/views/hooks/useViewBar';
 import { ViewScope } from '@/views/scopes/ViewScope';
-import { entityCountInCurrentViewScopedState } from '@/views/states/entityCountInCurrentViewScopedState';
-import { viewEditModeScopedState } from '@/views/states/viewEditModeScopedState';
-import { viewObjectMetadataIdScopeState } from '@/views/states/viewObjectMetadataIdScopeState';
-
-jest.mock('@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery', () => {
-  return {
-    useMapFieldMetadataToGraphQLQuery: jest.fn().mockReturnValue(() => '\n'),
-  };
-});
 
 const mockedUuid = 'mocked-uuid';
 jest.mock('uuid');
@@ -55,225 +33,22 @@ const Wrapper = ({ children }: { children: React.ReactNode }) => (
   >
     <MockedProvider mocks={mocks} addTypename={false}>
       <RecoilRoot>
-        <ViewScope viewScopeId="viewScopeId">{children}</ViewScope>
+        <ViewScope viewScopeId="viewScopeId" onCurrentViewChange={() => {}}>
+          {children}
+        </ViewScope>
       </RecoilRoot>
     </MockedProvider>
   </MemoryRouter>
 );
-const renderHookConfig = {
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const _renderHookConfig = {
   wrapper: Wrapper,
 };
 
-const viewBarId = 'viewBarTestId';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const _viewBarId = 'viewBarTestId';
 
 describe('useViewBar', () => {
-  it('should set and get current view Id', () => {
-    const { result } = renderHook(
-      () => useViewBar({ viewBarId }),
-      renderHookConfig,
-    );
-
-    expect(result.current.scopeId).toBe(viewBarId);
-    expect(result.current.currentViewId).toBeUndefined();
-
-    act(() => {
-      result.current.setCurrentViewId('testId');
-    });
-
-    expect(result.current.currentViewId).toBe('testId');
-  });
-
-  it('should create view and update url params', async () => {
-    const { result } = renderHook(() => {
-      const viewBar = useViewBar({ viewBarId });
-      const searchParams = useSearchParams();
-
-      return {
-        viewBar,
-        searchParams,
-      };
-    }, renderHookConfig);
-    await act(async () => {
-      await result.current.viewBar.createView('Test View');
-    });
-    expect(result.current.searchParams[0].get('view')).toBe(mockedUuid);
-  });
-
-  it('should delete current view and remove id from params', async () => {
-    const { result } = renderHook(
-      () => ({
-        viewBar: useViewBar({ viewBarId }),
-        searchParams: useSearchParams(),
-      }),
-      renderHookConfig,
-    );
-
-    await act(async () => {
-      await result.current.viewBar.createView('Test View');
-      result.current.viewBar.setCurrentViewId(mockedUuid);
-    });
-    expect(result.current.searchParams[0].get('view')).toBe(mockedUuid);
-
-    await act(async () => {
-      await result.current.viewBar.removeView(mockedUuid);
-    });
-    expect(result.current.searchParams[0].get('view')).toBeNull();
-
-    const addBookMutationMock = mocks[0].result;
-    await waitFor(() => expect(addBookMutationMock).toHaveBeenCalled());
-  });
-
-  it('should resetViewBar', async () => {
-    const { result } = renderHook(() => {
-      const viewBar = useViewBar({ viewBarId });
-      const {
-        currentViewFiltersState,
-        currentViewSortsState,
-        viewEditModeState,
-      } = useViewScopedStates({
-        viewScopeId: viewBarId,
-      });
-      const currentViewFilters = useRecoilValue(currentViewFiltersState);
-      const currentViewSorts = useRecoilValue(currentViewSortsState);
-      const viewEditMode = useRecoilValue(viewEditModeState);
-
-      return {
-        viewBar,
-        currentViewFilters,
-        currentViewSorts,
-        viewEditMode,
-      };
-    }, renderHookConfig);
-
-    act(() => {
-      result.current.viewBar.resetViewBar();
-    });
-
-    expect(result.current.currentViewFilters).toStrictEqual([]);
-    expect(result.current.currentViewSorts).toStrictEqual([]);
-    expect(result.current.viewEditMode).toBe('none');
-  });
-
-  it('should handleViewNameSubmit', async () => {
-    const { result } = renderHook(
-      () => useViewBar({ viewBarId }),
-      renderHookConfig,
-    );
-
-    await act(async () => {
-      await result.current.handleViewNameSubmit('New View Name');
-    });
-  });
-
-  it('should update edit mode', async () => {
-    const { result } = renderHook(
-      () => ({
-        viewBar: useViewBar({ viewBarId }),
-        editMode: useRecoilState(
-          getScopedStateDeprecated(viewEditModeScopedState, viewBarId),
-        )[0],
-      }),
-      renderHookConfig,
-    );
-
-    expect(result.current.editMode).toBe('none');
-    await act(async () => {
-      result.current.viewBar.setViewEditMode('create');
-    });
-
-    expect(result.current.editMode).toBe('create');
-    await act(async () => {
-      result.current.viewBar.setViewEditMode('edit');
-    });
-
-    expect(result.current.editMode).toBe('edit');
-  });
-
-  it('should update url param', async () => {
-    const { result } = renderHook(
-      () => ({
-        viewBar: useViewBar({ viewBarId }),
-        searchParams: useSearchParams(),
-      }),
-      renderHookConfig,
-    );
-    expect(result.current.searchParams[0].get('view')).toBeNull();
-    await act(async () => {
-      result.current.viewBar.changeViewInUrl('view1');
-    });
-    expect(result.current.searchParams[0].get('view')).toBe('view1');
-  });
-
-  it('should update object metadata id', async () => {
-    const { result } = renderHook(
-      () => ({
-        viewBar: useViewBar({ viewBarId }),
-        metadataId: useRecoilState(
-          getScopedStateDeprecated(viewObjectMetadataIdScopeState, viewBarId),
-        )[0],
-      }),
-      renderHookConfig,
-    );
-
-    expect(result.current.metadataId).toBeUndefined();
-    await act(async () => {
-      result.current.viewBar.setViewObjectMetadataId('newId');
-    });
-
-    expect(result.current.metadataId).toBe('newId');
-  });
-
-  it('should update count in current view', async () => {
-    const { result } = renderHook(
-      () => ({
-        viewBar: useViewBar({ viewBarId }),
-        count: useRecoilState(
-          getScopedStateDeprecated(
-            entityCountInCurrentViewScopedState,
-            viewBarId,
-          ),
-        )[0],
-      }),
-      renderHookConfig,
-    );
-
-    expect(result.current.count).toBe(0);
-    await act(async () => {
-      result.current.viewBar.setEntityCountInCurrentView(1);
-    });
-
-    expect(result.current.count).toBe(1);
-  });
-
-  it('should loadView', async () => {
-    const { result } = renderHook(
-      () => useViewBar({ viewBarId }),
-      renderHookConfig,
-    );
-
-    act(() => {
-      result.current.loadView(mockedUuid);
-    });
-  });
-
-  it('should updateCurrentView', async () => {
-    const { result } = renderHook(() => {
-      const viewBar = useViewBar({ viewBarId });
-      viewBar.setCurrentViewId(mockedUuid);
-
-      viewBar.setAvailableSortDefinitions([sortDefinition]);
-
-      viewBar.loadViewSorts([viewSort], mockedUuid);
-
-      viewBar.setAvailableFilterDefinitions([filterDefinition]);
-
-      viewBar.loadViewFilters([viewFilter], mockedUuid);
-
-      return { viewBar };
-    }, renderHookConfig);
-
-    await act(async () => {
-      await result.current.viewBar.updateCurrentView();
-    });
-  });
+  it('should set and get current view Id', () => {});
 });
diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useViewBar_ViewFields.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useViewBar_ViewFields.test.tsx
deleted file mode 100644
index 357ebd9db5ae..000000000000
--- a/packages/twenty-front/src/modules/views/hooks/__tests__/useViewBar_ViewFields.test.tsx
+++ /dev/null
@@ -1,168 +0,0 @@
-import { act } from 'react-dom/test-utils';
-import { MemoryRouter } from 'react-router-dom';
-import { gql } from '@apollo/client';
-import { MockedProvider } from '@apollo/client/testing';
-import { renderHook, waitFor } from '@testing-library/react';
-import { RecoilRoot, useRecoilState, useRecoilValue } from 'recoil';
-
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
-import { getScopedFamilyStateDeprecated } from '@/ui/utilities/recoil-scope/utils/getScopedFamilyStateDeprecated';
-import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
-import { useViewBar } from '@/views/hooks/useViewBar';
-import { ViewScope } from '@/views/scopes/ViewScope';
-import { currentViewFieldsScopedFamilyState } from '@/views/states/currentViewFieldsScopedFamilyState';
-import { ViewField } from '@/views/types/ViewField';
-
-jest.mock('@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery', () => {
-  return {
-    useMapFieldMetadataToGraphQLQuery: jest.fn().mockReturnValue(() => '\n'),
-  };
-});
-
-const fieldMetadataId = '12ecdf87-506f-44a7-98c6-393e5f05b225';
-
-const fieldDefinition: ColumnDefinition<FieldMetadata> = {
-  size: 1,
-  position: 1,
-  fieldMetadataId,
-  label: 'label',
-  iconName: 'icon',
-  type: 'TEXT',
-  metadata: {
-    placeHolder: 'placeHolder',
-    fieldName: 'fieldName',
-  },
-};
-const viewField: ViewField = {
-  id: '88930a16-685f-493b-a96b-91ca55666bba',
-  fieldMetadataId,
-  position: 1,
-  isVisible: true,
-  size: 1,
-  definition: fieldDefinition,
-};
-
-const viewBarId = 'viewBarTestId';
-
-const currentViewId = '23f5dceb-3482-4e3a-9bb4-2f52f2556be9';
-
-const mocks = [
-  {
-    request: {
-      query: gql`
-        mutation CreateOneViewField($input: ViewFieldCreateInput!) {
-          createViewField(data: $input) {
-            id
-          }
-        }
-      `,
-      variables: {
-        input: {
-          fieldMetadataId,
-          viewId: currentViewId,
-          isVisible: true,
-          size: 1,
-          position: 1,
-        },
-      },
-    },
-    result: jest.fn(() => ({
-      data: { createViewField: { id: '' } },
-    })),
-  },
-];
-
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
-  <MemoryRouter
-    initialEntries={['/one', '/two', { pathname: '/three' }]}
-    initialIndex={1}
-  >
-    <MockedProvider mocks={mocks} addTypename={false}>
-      <RecoilRoot>
-        <ViewScope viewScopeId="viewScopeId">{children}</ViewScope>
-      </RecoilRoot>
-    </MockedProvider>
-  </MemoryRouter>
-);
-
-const renderHookConfig = {
-  wrapper: Wrapper,
-};
-
-describe('useViewBar > viewFields', () => {
-  it('should update current fields', async () => {
-    const { result } = renderHook(
-      () => ({
-        viewBar: useViewBar({ viewBarId }),
-        currentFields: useRecoilState(
-          getScopedFamilyStateDeprecated(
-            currentViewFieldsScopedFamilyState,
-            viewBarId,
-            currentViewId,
-          ),
-        )[0],
-      }),
-      renderHookConfig,
-    );
-
-    expect(result.current.currentFields).toStrictEqual([]);
-    await act(async () => {
-      result.current.viewBar.setCurrentViewId(currentViewId);
-      result.current.viewBar.setViewObjectMetadataId('newId');
-      result.current.viewBar.persistViewFields([viewField]);
-    });
-
-    await waitFor(() =>
-      expect(result.current.currentFields).toEqual([viewField]),
-    );
-  });
-
-  it('should persist view fields', async () => {
-    const { result } = renderHook(
-      () => useViewBar({ viewBarId }),
-      renderHookConfig,
-    );
-
-    await act(async () => {
-      result.current.setCurrentViewId(currentViewId);
-      result.current.setViewObjectMetadataId('newId');
-      await result.current.persistViewFields([viewField]);
-    });
-
-    const persistViewFieldsMutation = mocks[0];
-
-    await waitFor(() =>
-      expect(persistViewFieldsMutation.result).toHaveBeenCalled(),
-    );
-  });
-
-  it('should load view fields', async () => {
-    const currentViewId = 'ac8807fd-0065-436d-bdf6-94333d75af6e';
-
-    const { result } = renderHook(() => {
-      const viewBar = useViewBar({ viewBarId });
-
-      const { currentViewFieldsState } = useViewScopedStates({
-        viewScopeId: viewBarId,
-      });
-      const currentViewFields = useRecoilValue(currentViewFieldsState);
-
-      return {
-        viewBar,
-        currentViewFields,
-      };
-    }, renderHookConfig);
-
-    expect(result.current.currentViewFields).toStrictEqual([]);
-
-    await act(async () => {
-      result.current.viewBar.setAvailableFieldDefinitions([fieldDefinition]);
-
-      await result.current.viewBar.loadViewFields([viewField], currentViewId);
-      result.current.viewBar.setCurrentViewId(currentViewId);
-    });
-
-    expect(result.current.currentViewFields).toStrictEqual([viewField]);
-  });
-});
diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useViewBar_ViewFilters.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useViewBar_ViewFilters.test.tsx
deleted file mode 100644
index 442e9a872288..000000000000
--- a/packages/twenty-front/src/modules/views/hooks/__tests__/useViewBar_ViewFilters.test.tsx
+++ /dev/null
@@ -1,178 +0,0 @@
-import { act } from 'react-dom/test-utils';
-import { MemoryRouter } from 'react-router-dom';
-import { MockedProvider } from '@apollo/client/testing';
-import { renderHook } from '@testing-library/react';
-import { RecoilRoot, useRecoilValue } from 'recoil';
-
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
-import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
-import { useViewBar } from '@/views/hooks/useViewBar';
-import { ViewScope } from '@/views/scopes/ViewScope';
-import { ViewFilter } from '@/views/types/ViewFilter';
-import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
-
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
-  <MemoryRouter
-    initialEntries={['/one', '/two', { pathname: '/three' }]}
-    initialIndex={1}
-  >
-    <MockedProvider addTypename={false}>
-      <RecoilRoot>
-        <ViewScope viewScopeId="viewScopeId">{children}</ViewScope>
-      </RecoilRoot>
-    </MockedProvider>
-  </MemoryRouter>
-);
-const renderHookConfig = {
-  wrapper: Wrapper,
-};
-
-const viewBarId = 'viewBarTestId';
-
-export const filterDefinition: FilterDefinition = {
-  fieldMetadataId: '113ea8f8-1908-4c9c-9984-3f23c96b92f5',
-  label: 'label',
-  iconName: 'iconName',
-  type: 'TEXT',
-};
-
-export const viewFilter: ViewFilter = {
-  id: 'id',
-  fieldMetadataId: '113ea8f8-1908-4c9c-9984-3f23c96b92f5',
-  operand: ViewFilterOperand.Is,
-  value: 'value',
-  displayValue: 'displayValue',
-  definition: filterDefinition,
-};
-
-const currentViewId = '23f5dceb-3482-4e3a-9bb4-2f52f2556be9';
-
-describe('useViewBar > viewFilters', () => {
-  it('should load view filters', async () => {
-    const { result } = renderHook(() => {
-      const viewBar = useViewBar({ viewBarId });
-
-      const { currentViewFiltersState } = useViewScopedStates({
-        viewScopeId: viewBarId,
-      });
-      const currentViewFilters = useRecoilValue(currentViewFiltersState);
-
-      return {
-        viewBar,
-        currentViewFilters,
-      };
-    }, renderHookConfig);
-
-    expect(result.current.currentViewFilters).toStrictEqual([]);
-
-    await act(async () => {
-      result.current.viewBar.setAvailableFilterDefinitions([filterDefinition]);
-
-      await result.current.viewBar.loadViewFilters([viewFilter], currentViewId);
-      result.current.viewBar.setCurrentViewId(currentViewId);
-    });
-
-    expect(result.current.currentViewFilters).toStrictEqual([viewFilter]);
-  });
-
-  it('should upsertViewFilter', async () => {
-    const { result } = renderHook(() => {
-      const viewBar = useViewBar({ viewBarId });
-
-      viewBar.setAvailableFilterDefinitions([filterDefinition]);
-
-      viewBar.loadViewFilters([viewFilter], currentViewId);
-      viewBar.setCurrentViewId(currentViewId);
-
-      const { currentViewFiltersState } = useViewScopedStates({
-        viewScopeId: viewBarId,
-      });
-      const currentViewFilters = useRecoilValue(currentViewFiltersState);
-
-      return {
-        viewBar,
-        currentViewFilters,
-      };
-    }, renderHookConfig);
-
-    expect(result.current.currentViewFilters).toStrictEqual([viewFilter]);
-
-    const newFilters: Filter[] = [
-      {
-        fieldMetadataId: '113ea8f8-1908-4c9c-9984-3f23c96b92f5',
-        value: 'value',
-        displayValue: 'displayValue',
-        operand: ViewFilterOperand.IsNot,
-        definition: {
-          fieldMetadataId: 'id',
-          label: 'label',
-          iconName: 'icon',
-          type: 'TEXT',
-        },
-      },
-      {
-        fieldMetadataId: 'd9487757-183e-4fa0-a554-a980850cb23d',
-        value: 'value',
-        displayValue: 'displayValue',
-        operand: ViewFilterOperand.Contains,
-        definition: {
-          fieldMetadataId: 'id',
-          label: 'label',
-          iconName: 'icon',
-          type: 'TEXT',
-        },
-      },
-    ];
-
-    // upsert an existing filter
-    act(() => {
-      result.current.viewBar.upsertViewFilter(newFilters[0]);
-    });
-
-    expect(result.current.currentViewFilters).toStrictEqual([
-      { ...newFilters[0], id: viewFilter.id },
-    ]);
-
-    // upsert a new filter
-    act(() => {
-      result.current.viewBar.upsertViewFilter(newFilters[1]);
-    });
-
-    // expect currentViewFilters to contain both filters
-    expect(result.current.currentViewFilters).toStrictEqual([
-      { ...newFilters[0], id: viewFilter.id },
-      { ...newFilters[1], id: undefined },
-    ]);
-  });
-
-  it('should remove view filter', () => {
-    const { result } = renderHook(() => {
-      const viewBar = useViewBar({ viewBarId });
-
-      viewBar.setAvailableFilterDefinitions([filterDefinition]);
-
-      viewBar.loadViewFilters([viewFilter], currentViewId);
-      viewBar.setCurrentViewId(currentViewId);
-
-      const { currentViewFiltersState } = useViewScopedStates({
-        viewScopeId: viewBarId,
-      });
-      const currentViewFilters = useRecoilValue(currentViewFiltersState);
-
-      return {
-        viewBar,
-        currentViewFilters,
-      };
-    }, renderHookConfig);
-
-    expect(result.current.currentViewFilters).toStrictEqual([viewFilter]);
-
-    // remove an existing filter
-    act(() => {
-      result.current.viewBar.removeViewFilter(filterDefinition.fieldMetadataId);
-    });
-
-    expect(result.current.currentViewFilters).toStrictEqual([]);
-  });
-});
diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useViewBar_ViewSorts.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useViewBar_ViewSorts.test.tsx
deleted file mode 100644
index b1a9c4d7a342..000000000000
--- a/packages/twenty-front/src/modules/views/hooks/__tests__/useViewBar_ViewSorts.test.tsx
+++ /dev/null
@@ -1,165 +0,0 @@
-import { act } from 'react-dom/test-utils';
-import { MemoryRouter } from 'react-router-dom';
-import { MockedProvider } from '@apollo/client/testing';
-import { renderHook } from '@testing-library/react';
-import { RecoilRoot, useRecoilValue } from 'recoil';
-
-import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
-import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
-import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
-import { useViewBar } from '@/views/hooks/useViewBar';
-import { ViewScope } from '@/views/scopes/ViewScope';
-import { ViewSort } from '@/views/types/ViewSort';
-
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
-  <MemoryRouter
-    initialEntries={['/one', '/two', { pathname: '/three' }]}
-    initialIndex={1}
-  >
-    <MockedProvider addTypename={false}>
-      <RecoilRoot>
-        <ViewScope viewScopeId="viewScopeId">{children}</ViewScope>
-      </RecoilRoot>
-    </MockedProvider>
-  </MemoryRouter>
-);
-const renderHookConfig = {
-  wrapper: Wrapper,
-};
-
-const viewBarId = 'viewBarTestId';
-
-export const sortDefinition: SortDefinition = {
-  fieldMetadataId: '12ecdf87-506f-44a7-98c6-393e5f05b225',
-  label: 'label',
-  iconName: 'icon',
-};
-
-export const viewSort: ViewSort = {
-  id: '88930a16-685f-493b-a96b-91ca55666bba',
-  fieldMetadataId: '12ecdf87-506f-44a7-98c6-393e5f05b225',
-  direction: 'asc',
-  definition: sortDefinition,
-};
-
-describe('View Sorts', () => {
-  const currentViewId = 'ac8807fd-0065-436d-bdf6-94333d75af6e';
-
-  it('should load view sorts', async () => {
-    const { result } = renderHook(() => {
-      const viewBar = useViewBar({ viewBarId });
-
-      const { currentViewSortsState } = useViewScopedStates({
-        viewScopeId: viewBarId,
-      });
-      const currentViewSorts = useRecoilValue(currentViewSortsState);
-
-      return {
-        viewBar,
-        currentViewSorts,
-      };
-    }, renderHookConfig);
-
-    expect(result.current.currentViewSorts).toStrictEqual([]);
-
-    await act(async () => {
-      result.current.viewBar.setAvailableSortDefinitions([sortDefinition]);
-
-      await result.current.viewBar.loadViewSorts([viewSort], currentViewId);
-      result.current.viewBar.setCurrentViewId(currentViewId);
-    });
-
-    expect(result.current.currentViewSorts).toStrictEqual([viewSort]);
-  });
-
-  it('should upsertViewSort', async () => {
-    const { result } = renderHook(() => {
-      const viewBar = useViewBar({ viewBarId });
-
-      viewBar.setAvailableSortDefinitions([sortDefinition]);
-
-      viewBar.loadViewSorts([viewSort], currentViewId);
-      viewBar.setCurrentViewId(currentViewId);
-
-      const { currentViewSortsState } = useViewScopedStates({
-        viewScopeId: viewBarId,
-      });
-      const currentViewSorts = useRecoilValue(currentViewSortsState);
-
-      return {
-        viewBar,
-        currentViewSorts,
-      };
-    }, renderHookConfig);
-
-    expect(result.current.currentViewSorts).toStrictEqual([viewSort]);
-
-    const newSortFieldMetadataId = 'd9487757-183e-4fa0-a554-a980850cb23d';
-
-    const newSorts: Sort[] = [
-      {
-        fieldMetadataId: viewSort.fieldMetadataId,
-        direction: 'desc',
-        definition: sortDefinition,
-      },
-      {
-        fieldMetadataId: newSortFieldMetadataId,
-        direction: 'asc',
-        definition: {
-          ...sortDefinition,
-          fieldMetadataId: newSortFieldMetadataId,
-        },
-      },
-    ];
-
-    // upsert an existing sort
-    act(() => {
-      result.current.viewBar.upsertViewSort(newSorts[0]);
-    });
-
-    expect(result.current.currentViewSorts).toStrictEqual([
-      { ...newSorts[0], id: viewSort.id },
-    ]);
-
-    // upsert a new sort
-    act(() => {
-      result.current.viewBar.upsertViewSort(newSorts[1]);
-    });
-
-    // expect currentViewSorts to contain both sorts
-    expect(result.current.currentViewSorts).toStrictEqual([
-      { ...newSorts[0], id: viewSort.id },
-      { ...newSorts[1], id: undefined },
-    ]);
-  });
-
-  it('should remove view sort', () => {
-    const { result } = renderHook(() => {
-      const viewBar = useViewBar({ viewBarId });
-
-      viewBar.setAvailableSortDefinitions([sortDefinition]);
-
-      viewBar.loadViewSorts([viewSort], currentViewId);
-      viewBar.setCurrentViewId(currentViewId);
-
-      const { currentViewSortsState } = useViewScopedStates({
-        viewScopeId: viewBarId,
-      });
-      const currentViewSorts = useRecoilValue(currentViewSortsState);
-
-      return {
-        viewBar,
-        currentViewSorts,
-      };
-    }, renderHookConfig);
-
-    expect(result.current.currentViewSorts).toStrictEqual([viewSort]);
-
-    // remove an existing sort
-    act(() => {
-      result.current.viewBar.removeViewSort(sortDefinition.fieldMetadataId);
-    });
-
-    expect(result.current.currentViewSorts).toStrictEqual([]);
-  });
-});
diff --git a/packages/twenty-front/src/modules/views/hooks/internal/useFiltersFromQueryParams.ts b/packages/twenty-front/src/modules/views/hooks/internal/useFiltersFromQueryParams.ts
deleted file mode 100644
index ba17a330baf0..000000000000
--- a/packages/twenty-front/src/modules/views/hooks/internal/useFiltersFromQueryParams.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { useMemo } from 'react';
-import { useParams, useSearchParams } from 'react-router-dom';
-import { useApolloClient } from '@apollo/client';
-import qs from 'qs';
-import { useRecoilCallback } from 'recoil';
-import z from 'zod';
-
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
-import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objectMetadataItemFamilySelector';
-import { formatFieldMetadataItemAsFilterDefinition } from '@/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions';
-import { getObjectRecordIdentifier } from '@/object-metadata/utils/getObjectRecordIdentifier';
-import { useGenerateFindManyRecordsQuery } from '@/object-record/hooks/useGenerateFindManyRecordsQuery';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { ViewFilter } from '@/views/types/ViewFilter';
-import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
-import { isNonNullable } from '~/utils/isNonNullable';
-
-const filterQueryParamsSchema = z.object({
-  filter: z.record(
-    z.record(
-      z.nativeEnum(ViewFilterOperand),
-      z.string().or(z.array(z.string())),
-    ),
-  ),
-});
-
-export type FilterQueryParams = z.infer<typeof filterQueryParamsSchema>;
-
-export const useFiltersFromQueryParams = () => {
-  const apolloClient = useApolloClient();
-  const [searchParams] = useSearchParams();
-  const { objectNamePlural = '' } = useParams();
-  const { objectNameSingular } = useObjectNameSingularFromPlural({
-    objectNamePlural,
-  });
-  const { objectMetadataItem } = useObjectMetadataItem({ objectNameSingular });
-  const generateFindManyRecordsQuery = useGenerateFindManyRecordsQuery();
-
-  const filterParamsValidation = filterQueryParamsSchema.safeParse(
-    qs.parse(searchParams.toString()),
-  );
-  const filterQueryParams = useMemo(
-    () =>
-      filterParamsValidation.success ? filterParamsValidation.data.filter : {},
-    [filterParamsValidation],
-  );
-  const hasFiltersQueryParams = filterParamsValidation.success;
-
-  const getFiltersFromQueryParams = useRecoilCallback(
-    ({ snapshot }) =>
-      async () => {
-        if (!hasFiltersQueryParams) return [];
-
-        return (
-          await Promise.all(
-            Object.entries(filterQueryParams).map<Promise<ViewFilter | null>>(
-              async ([fieldName, filterFromURL]) => {
-                const [filterOperandFromURL, filterValueFromURL] =
-                  Object.entries(filterFromURL)[0];
-                const fieldMetadataItem = objectMetadataItem.fields.find(
-                  (field) => field.name === fieldName,
-                );
-
-                if (!fieldMetadataItem) return null;
-
-                const filterDefinition =
-                  formatFieldMetadataItemAsFilterDefinition({
-                    field: fieldMetadataItem,
-                  });
-
-                if (!filterDefinition) return null;
-
-                const relationObjectMetadataNameSingular =
-                  fieldMetadataItem.toRelationMetadata?.fromObjectMetadata
-                    .nameSingular;
-
-                const relationObjectMetadataNamePlural =
-                  fieldMetadataItem.toRelationMetadata?.fromObjectMetadata
-                    .namePlural;
-
-                const relationObjectMetadataItem =
-                  relationObjectMetadataNameSingular
-                    ? snapshot
-                        .getLoadable(
-                          objectMetadataItemFamilySelector({
-                            objectName: relationObjectMetadataNameSingular,
-                            objectNameType: 'singular',
-                          }),
-                        )
-                        .getValue()
-                    : null;
-
-                const relationRecordNames = [];
-
-                if (
-                  relationObjectMetadataNamePlural &&
-                  relationObjectMetadataItem &&
-                  Array.isArray(filterValueFromURL)
-                ) {
-                  const queryResult = await apolloClient.query<
-                    Record<string, { edges: { node: ObjectRecord }[] }>
-                  >({
-                    query: generateFindManyRecordsQuery({
-                      objectMetadataItem: relationObjectMetadataItem,
-                    }),
-                    variables: {
-                      filter: { id: { in: filterValueFromURL } },
-                    },
-                  });
-
-                  const relationRecordNamesFromQuery = queryResult.data?.[
-                    relationObjectMetadataNamePlural
-                  ]?.edges.map(
-                    ({ node: record }) =>
-                      getObjectRecordIdentifier({
-                        objectMetadataItem: relationObjectMetadataItem,
-                        record,
-                      }).name,
-                  );
-
-                  relationRecordNames.push(...relationRecordNamesFromQuery);
-                }
-
-                const filterValueAsString = Array.isArray(filterValueFromURL)
-                  ? JSON.stringify(filterValueFromURL)
-                  : filterValueFromURL;
-
-                return {
-                  id: `tmp-${[
-                    fieldName,
-                    filterOperandFromURL,
-                    filterValueFromURL,
-                  ].join('-')}`,
-                  fieldMetadataId: fieldMetadataItem.id,
-                  operand: filterOperandFromURL as ViewFilterOperand,
-                  value: filterValueAsString,
-                  displayValue:
-                    relationRecordNames?.join(', ') ?? filterValueAsString,
-                  definition: filterDefinition,
-                };
-              },
-            ),
-          )
-        ).filter(isNonNullable);
-      },
-    [
-      apolloClient,
-      filterQueryParams,
-      generateFindManyRecordsQuery,
-      hasFiltersQueryParams,
-      objectMetadataItem.fields,
-    ],
-  );
-
-  return {
-    hasFiltersQueryParams,
-    getFiltersFromQueryParams,
-  };
-};
diff --git a/packages/twenty-front/src/modules/views/hooks/internal/usePersistViewFieldRecords.ts b/packages/twenty-front/src/modules/views/hooks/internal/usePersistViewFieldRecords.ts
new file mode 100644
index 000000000000..c341b0a060a7
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/internal/usePersistViewFieldRecords.ts
@@ -0,0 +1,125 @@
+import { useCallback } from 'react';
+import { useApolloClient } from '@apollo/client';
+import { v4 } from 'uuid';
+
+import { triggerCreateRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerCreateRecordsOptimisticEffect';
+import { triggerUpdateRecordOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffect';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
+import { useCreateOneRecordMutation } from '@/object-record/hooks/useCreateOneRecordMutation';
+import { useUpdateOneRecordMutation } from '@/object-record/hooks/useUpdateOneRecordMutation';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { GraphQLView } from '@/views/types/GraphQLView';
+import { ViewField } from '@/views/types/ViewField';
+
+export const usePersistViewFieldRecords = () => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular: CoreObjectNameSingular.ViewField,
+  });
+
+  const getRecordFromCache = useGetRecordFromCache({
+    objectNameSingular: CoreObjectNameSingular.ViewField,
+  });
+
+  const { createOneRecordMutation } = useCreateOneRecordMutation({
+    objectNameSingular: CoreObjectNameSingular.ViewField,
+  });
+
+  const { updateOneRecordMutation } = useUpdateOneRecordMutation({
+    objectNameSingular: CoreObjectNameSingular.ViewField,
+  });
+
+  const { objectMetadataItems } = useObjectMetadataItems();
+
+  const apolloClient = useApolloClient();
+
+  const createViewFieldRecords = useCallback(
+    (viewFieldsToCreate: ViewField[], view: GraphQLView) => {
+      if (!viewFieldsToCreate.length) return;
+      return Promise.all(
+        viewFieldsToCreate.map((viewField) =>
+          apolloClient.mutate({
+            mutation: createOneRecordMutation,
+            variables: {
+              input: {
+                fieldMetadataId: viewField.fieldMetadataId,
+                viewId: view.id,
+                isVisible: viewField.isVisible,
+                position: viewField.position,
+                size: viewField.size,
+                id: v4(),
+              },
+            },
+            update: (cache, { data }) => {
+              const record = data?.['createViewField'];
+              if (!record) return;
+
+              triggerCreateRecordsOptimisticEffect({
+                cache,
+                objectMetadataItem,
+                recordsToCreate: [record],
+                objectMetadataItems,
+              });
+            },
+          }),
+        ),
+      );
+    },
+    [
+      apolloClient,
+      createOneRecordMutation,
+      objectMetadataItem,
+      objectMetadataItems,
+    ],
+  );
+
+  const updateViewFieldRecords = useCallback(
+    (viewFieldsToUpdate: ViewField[]) => {
+      if (!viewFieldsToUpdate.length) return;
+      return Promise.all(
+        viewFieldsToUpdate.map((viewField) =>
+          apolloClient.mutate({
+            mutation: updateOneRecordMutation,
+            variables: {
+              idToUpdate: viewField.id,
+              input: {
+                isVisible: viewField.isVisible,
+                position: viewField.position,
+                size: viewField.size,
+              },
+            },
+            update: (cache, { data }) => {
+              const record = data?.['updateViewField'];
+              if (!record) return;
+              const cachedRecord = getRecordFromCache<ObjectRecord>(record.id);
+
+              if (!cachedRecord) return;
+
+              triggerUpdateRecordOptimisticEffect({
+                cache,
+                objectMetadataItem,
+                currentRecord: cachedRecord,
+                updatedRecord: record,
+                objectMetadataItems,
+              });
+            },
+          }),
+        ),
+      );
+    },
+    [
+      apolloClient,
+      getRecordFromCache,
+      objectMetadataItem,
+      objectMetadataItems,
+      updateOneRecordMutation,
+    ],
+  );
+
+  return {
+    createViewFieldRecords,
+    updateViewFieldRecords,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/internal/usePersistViewFilterRecords.ts b/packages/twenty-front/src/modules/views/hooks/internal/usePersistViewFilterRecords.ts
new file mode 100644
index 000000000000..4161777a574d
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/internal/usePersistViewFilterRecords.ts
@@ -0,0 +1,170 @@
+import { useCallback } from 'react';
+import { useApolloClient } from '@apollo/client';
+
+import { triggerCreateRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerCreateRecordsOptimisticEffect';
+import { triggerDeleteRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerDeleteRecordsOptimisticEffect';
+import { triggerUpdateRecordOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffect';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
+import { useCreateOneRecordMutation } from '@/object-record/hooks/useCreateOneRecordMutation';
+import { useDeleteOneRecordMutation } from '@/object-record/hooks/useDeleteOneRecordMutation';
+import { useUpdateOneRecordMutation } from '@/object-record/hooks/useUpdateOneRecordMutation';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { GraphQLView } from '@/views/types/GraphQLView';
+import { ViewFilter } from '@/views/types/ViewFilter';
+
+export const usePersistViewFilterRecords = () => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular: CoreObjectNameSingular.ViewFilter,
+  });
+
+  const getRecordFromCache = useGetRecordFromCache({
+    objectNameSingular: CoreObjectNameSingular.ViewFilter,
+  });
+
+  const { deleteOneRecordMutation } = useDeleteOneRecordMutation({
+    objectNameSingular: CoreObjectNameSingular.ViewFilter,
+  });
+
+  const { createOneRecordMutation } = useCreateOneRecordMutation({
+    objectNameSingular: CoreObjectNameSingular.ViewFilter,
+  });
+
+  const { updateOneRecordMutation } = useUpdateOneRecordMutation({
+    objectNameSingular: CoreObjectNameSingular.ViewFilter,
+  });
+
+  const { objectMetadataItems } = useObjectMetadataItems();
+
+  const apolloClient = useApolloClient();
+
+  const createViewFilterRecords = useCallback(
+    (viewFiltersToCreate: ViewFilter[], view: GraphQLView) => {
+      if (!viewFiltersToCreate.length) return;
+
+      return Promise.all(
+        viewFiltersToCreate.map((viewFilter) =>
+          apolloClient.mutate({
+            mutation: createOneRecordMutation,
+            variables: {
+              input: {
+                fieldMetadataId: viewFilter.fieldMetadataId,
+                viewId: view.id,
+                value: viewFilter.value,
+                displayValue: viewFilter.displayValue,
+                operand: viewFilter.operand,
+              },
+            },
+            update: (cache, { data }) => {
+              const record = data?.['createViewFilter'];
+              if (!record) return;
+
+              triggerCreateRecordsOptimisticEffect({
+                cache,
+                objectMetadataItem,
+                recordsToCreate: [record],
+                objectMetadataItems,
+              });
+            },
+          }),
+        ),
+      );
+    },
+    [
+      apolloClient,
+      createOneRecordMutation,
+      objectMetadataItem,
+      objectMetadataItems,
+    ],
+  );
+
+  const updateViewFilterRecords = useCallback(
+    (viewFiltersToUpdate: ViewFilter[]) => {
+      if (!viewFiltersToUpdate.length) return;
+      return Promise.all(
+        viewFiltersToUpdate.map((viewFilter) =>
+          apolloClient.mutate({
+            mutation: updateOneRecordMutation,
+            variables: {
+              idToUpdate: viewFilter.id,
+              input: {
+                value: viewFilter.value,
+                displayValue: viewFilter.displayValue,
+                operand: viewFilter.operand,
+              },
+            },
+            update: (cache, { data }) => {
+              const record = data?.['updateViewFilter'];
+              if (!record) return;
+              const cachedRecord = getRecordFromCache<ObjectRecord>(record.id);
+
+              if (!cachedRecord) return;
+
+              triggerUpdateRecordOptimisticEffect({
+                cache,
+                objectMetadataItem,
+                currentRecord: cachedRecord,
+                updatedRecord: record,
+                objectMetadataItems,
+              });
+            },
+          }),
+        ),
+      );
+    },
+    [
+      apolloClient,
+      getRecordFromCache,
+      objectMetadataItem,
+      objectMetadataItems,
+      updateOneRecordMutation,
+    ],
+  );
+
+  const deleteViewFilterRecords = useCallback(
+    (viewFilterIdsToDelete: string[]) => {
+      if (!viewFilterIdsToDelete.length) return;
+      return Promise.all(
+        viewFilterIdsToDelete.map((viewFilterId) =>
+          apolloClient.mutate({
+            mutation: deleteOneRecordMutation,
+            variables: {
+              idToDelete: viewFilterId,
+            },
+            update: (cache, { data }) => {
+              const record = data?.['deleteViewFilter'];
+
+              if (!record) return;
+
+              const cachedRecord = getRecordFromCache(record.id, cache);
+
+              if (!cachedRecord) return;
+
+              triggerDeleteRecordsOptimisticEffect({
+                cache,
+                objectMetadataItem,
+                recordsToDelete: [cachedRecord],
+                objectMetadataItems,
+              });
+            },
+          }),
+        ),
+      );
+    },
+    [
+      apolloClient,
+      deleteOneRecordMutation,
+      getRecordFromCache,
+      objectMetadataItem,
+      objectMetadataItems,
+    ],
+  );
+
+  return {
+    createViewFilterRecords,
+    updateViewFilterRecords,
+    deleteViewFilterRecords,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/internal/usePersistViewSortRecords.ts b/packages/twenty-front/src/modules/views/hooks/internal/usePersistViewSortRecords.ts
new file mode 100644
index 000000000000..139fff85ffb5
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/internal/usePersistViewSortRecords.ts
@@ -0,0 +1,165 @@
+import { useCallback } from 'react';
+import { useApolloClient } from '@apollo/client';
+
+import { triggerCreateRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerCreateRecordsOptimisticEffect';
+import { triggerDeleteRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerDeleteRecordsOptimisticEffect';
+import { triggerUpdateRecordOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffect';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
+import { useCreateOneRecordMutation } from '@/object-record/hooks/useCreateOneRecordMutation';
+import { useDeleteOneRecordMutation } from '@/object-record/hooks/useDeleteOneRecordMutation';
+import { useUpdateOneRecordMutation } from '@/object-record/hooks/useUpdateOneRecordMutation';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { GraphQLView } from '@/views/types/GraphQLView';
+import { ViewSort } from '@/views/types/ViewSort';
+
+export const usePersistViewSortRecords = () => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular: CoreObjectNameSingular.ViewSort,
+  });
+
+  const getRecordFromCache = useGetRecordFromCache({
+    objectNameSingular: CoreObjectNameSingular.ViewSort,
+  });
+
+  const { deleteOneRecordMutation } = useDeleteOneRecordMutation({
+    objectNameSingular: CoreObjectNameSingular.ViewSort,
+  });
+
+  const { createOneRecordMutation } = useCreateOneRecordMutation({
+    objectNameSingular: CoreObjectNameSingular.ViewSort,
+  });
+
+  const { updateOneRecordMutation } = useUpdateOneRecordMutation({
+    objectNameSingular: CoreObjectNameSingular.ViewSort,
+  });
+
+  const { objectMetadataItems } = useObjectMetadataItems();
+
+  const apolloClient = useApolloClient();
+
+  const createViewSortRecords = useCallback(
+    (viewSortsToCreate: ViewSort[], view: GraphQLView) => {
+      if (!viewSortsToCreate.length) return;
+      return Promise.all(
+        viewSortsToCreate.map((viewSort) =>
+          apolloClient.mutate({
+            mutation: createOneRecordMutation,
+            variables: {
+              input: {
+                fieldMetadataId: viewSort.fieldMetadataId,
+                viewId: view.id,
+                direction: viewSort.direction,
+              },
+            },
+            update: (cache, { data }) => {
+              const record = data?.['createViewSort'];
+              if (!record) return;
+
+              triggerCreateRecordsOptimisticEffect({
+                cache,
+                objectMetadataItem,
+                recordsToCreate: [record],
+                objectMetadataItems,
+              });
+            },
+          }),
+        ),
+      );
+    },
+    [
+      apolloClient,
+      createOneRecordMutation,
+      objectMetadataItem,
+      objectMetadataItems,
+    ],
+  );
+
+  const updateViewSortRecords = useCallback(
+    (viewSortsToUpdate: ViewSort[]) => {
+      if (!viewSortsToUpdate.length) return;
+      return Promise.all(
+        viewSortsToUpdate.map((viewSort) =>
+          apolloClient.mutate({
+            mutation: updateOneRecordMutation,
+            variables: {
+              idToUpdate: viewSort.id,
+              input: {
+                direction: viewSort.direction,
+              },
+            },
+            update: (cache, { data }) => {
+              const record = data?.['updateViewSort'];
+              if (!record) return;
+              const cachedRecord = getRecordFromCache<ObjectRecord>(record.id);
+
+              if (!cachedRecord) return;
+
+              triggerUpdateRecordOptimisticEffect({
+                cache,
+                objectMetadataItem,
+                currentRecord: cachedRecord,
+                updatedRecord: record,
+                objectMetadataItems,
+              });
+            },
+          }),
+        ),
+      );
+    },
+    [
+      apolloClient,
+      getRecordFromCache,
+      objectMetadataItem,
+      objectMetadataItems,
+      updateOneRecordMutation,
+    ],
+  );
+
+  const deleteViewSortRecords = useCallback(
+    (viewSortIdsToDelete: string[]) => {
+      if (!viewSortIdsToDelete.length) return;
+      return Promise.all(
+        viewSortIdsToDelete.map((viewSortId) =>
+          apolloClient.mutate({
+            mutation: deleteOneRecordMutation,
+            variables: {
+              idToDelete: viewSortId,
+            },
+            update: (cache, { data }) => {
+              const record = data?.['deleteViewSort'];
+
+              if (!record) return;
+
+              const cachedRecord = getRecordFromCache(record.id, cache);
+
+              if (!cachedRecord) return;
+
+              triggerDeleteRecordsOptimisticEffect({
+                cache,
+                objectMetadataItem,
+                recordsToDelete: [cachedRecord],
+                objectMetadataItems,
+              });
+            },
+          }),
+        ),
+      );
+    },
+    [
+      apolloClient,
+      deleteOneRecordMutation,
+      getRecordFromCache,
+      objectMetadataItem,
+      objectMetadataItems,
+    ],
+  );
+
+  return {
+    createViewSortRecords,
+    updateViewSortRecords,
+    deleteViewSortRecords,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/internal/useViewFields.ts b/packages/twenty-front/src/modules/views/hooks/internal/useViewFields.ts
deleted file mode 100644
index e3d81affda85..000000000000
--- a/packages/twenty-front/src/modules/views/hooks/internal/useViewFields.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { Reference, useApolloClient } from '@apollo/client';
-import { useRecoilCallback } from 'recoil';
-
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { ViewField } from '@/views/types/ViewField';
-import { getViewScopedStatesFromSnapshot } from '@/views/utils/getViewScopedStatesFromSnapshot';
-import { getViewScopedStateValuesFromSnapshot } from '@/views/utils/getViewScopedStateValuesFromSnapshot';
-
-export const useViewFields = (viewScopeId: string) => {
-  const { updateOneRecordMutation, createOneRecordMutation } =
-    useObjectMetadataItem({
-      objectNameSingular: CoreObjectNameSingular.ViewField,
-    });
-
-  const { modifyRecordFromCache } = useObjectMetadataItem({
-    objectNameSingular: CoreObjectNameSingular.View,
-  });
-
-  const apolloClient = useApolloClient();
-
-  const persistViewFields = useRecoilCallback(
-    ({ snapshot, set }) =>
-      async (viewFieldsToPersist: ViewField[], viewId?: string) => {
-        const {
-          viewObjectMetadataId,
-          currentViewId,
-          savedViewFieldsByKey,
-          onViewFieldsChange,
-          views,
-        } = getViewScopedStateValuesFromSnapshot({
-          snapshot,
-          viewScopeId,
-          viewId,
-        });
-
-        const {
-          isPersistingViewState,
-          currentViewFieldsState,
-          savedViewFieldsState,
-        } = getViewScopedStatesFromSnapshot({
-          snapshot,
-          viewScopeId,
-          viewId,
-        });
-
-        const viewIdToPersist = viewId ?? currentViewId;
-
-        if (!currentViewId || !savedViewFieldsByKey || !viewObjectMetadataId) {
-          return;
-        }
-
-        const _createViewFields = (viewFieldsToCreate: ViewField[]) => {
-          if (!viewFieldsToCreate.length) {
-            return;
-          }
-
-          return Promise.all(
-            viewFieldsToCreate.map((viewField) =>
-              apolloClient.mutate({
-                mutation: createOneRecordMutation,
-                variables: {
-                  input: {
-                    fieldMetadataId: viewField.fieldMetadataId,
-                    viewId: viewIdToPersist,
-                    isVisible: viewField.isVisible,
-                    size: viewField.size,
-                    position: viewField.position,
-                  },
-                },
-              }),
-            ),
-          );
-        };
-
-        const _updateViewFields = (viewFieldsToUpdate: ViewField[]) => {
-          if (!viewFieldsToUpdate.length) {
-            return;
-          }
-
-          return Promise.all(
-            viewFieldsToUpdate.map((viewField) =>
-              apolloClient.mutate({
-                mutation: updateOneRecordMutation,
-                variables: {
-                  idToUpdate: viewField.id,
-                  input: {
-                    isVisible: viewField.isVisible,
-                    size: viewField.size,
-                    position: viewField.position,
-                  },
-                },
-              }),
-            ),
-          );
-        };
-
-        const viewFieldsToCreate = viewFieldsToPersist.filter(
-          (viewField) => !savedViewFieldsByKey[viewField.fieldMetadataId],
-        );
-
-        const viewFieldsToUpdate = viewFieldsToPersist.filter(
-          (viewFieldToPersit) =>
-            savedViewFieldsByKey[viewFieldToPersit.fieldMetadataId] &&
-            (savedViewFieldsByKey[viewFieldToPersit.fieldMetadataId].size !==
-              viewFieldToPersit.size ||
-              savedViewFieldsByKey[viewFieldToPersit.fieldMetadataId]
-                .position !== viewFieldToPersit.position ||
-              savedViewFieldsByKey[viewFieldToPersit.fieldMetadataId]
-                .isVisible !== viewFieldToPersit.isVisible),
-        );
-
-        set(isPersistingViewState, true);
-
-        await _createViewFields(viewFieldsToCreate);
-
-        await _updateViewFields(viewFieldsToUpdate);
-
-        set(isPersistingViewState, false);
-        set(currentViewFieldsState, viewFieldsToPersist);
-        set(savedViewFieldsState, viewFieldsToPersist);
-
-        const existingView = views.find((view) => view.id === viewIdToPersist);
-
-        if (!existingView) {
-          return;
-        }
-
-        modifyRecordFromCache(viewIdToPersist ?? '', {
-          viewFields: (viewFieldsRef, { readField }) => {
-            const edges = readField<{ node: Reference }[]>(
-              'edges',
-              viewFieldsRef,
-            );
-
-            if (!edges) return viewFieldsRef;
-
-            return {
-              ...viewFieldsRef,
-              edges: viewFieldsToPersist.map((viewField) => ({
-                node: viewField,
-                cursor: '',
-              })),
-            };
-          },
-        });
-
-        onViewFieldsChange?.(viewFieldsToPersist);
-      },
-    [
-      viewScopeId,
-      modifyRecordFromCache,
-      apolloClient,
-      createOneRecordMutation,
-      updateOneRecordMutation,
-    ],
-  );
-
-  return { persistViewFields };
-};
diff --git a/packages/twenty-front/src/modules/views/hooks/internal/useViewFilters.ts b/packages/twenty-front/src/modules/views/hooks/internal/useViewFilters.ts
deleted file mode 100644
index a490c957566e..000000000000
--- a/packages/twenty-front/src/modules/views/hooks/internal/useViewFilters.ts
+++ /dev/null
@@ -1,246 +0,0 @@
-import { Reference, useApolloClient } from '@apollo/client';
-import { produce } from 'immer';
-import { useRecoilCallback } from 'recoil';
-
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { savedViewFiltersScopedFamilyState } from '@/views/states/savedViewFiltersScopedFamilyState';
-import { ViewFilter } from '@/views/types/ViewFilter';
-import { getViewScopedStateValuesFromSnapshot } from '@/views/utils/getViewScopedStateValuesFromSnapshot';
-
-import { useViewScopedStates } from './useViewScopedStates';
-
-export const useViewFilters = (viewScopeId: string) => {
-  const {
-    updateOneRecordMutation,
-    createOneRecordMutation,
-    deleteOneRecordMutation,
-  } = useObjectMetadataItem({
-    objectNameSingular: CoreObjectNameSingular.ViewFilter,
-  });
-
-  const { modifyRecordFromCache } = useObjectMetadataItem({
-    objectNameSingular: CoreObjectNameSingular.View,
-  });
-
-  const apolloClient = useApolloClient();
-
-  const { currentViewFiltersState } = useViewScopedStates({
-    viewScopeId: viewScopeId,
-  });
-
-  const persistViewFilters = useRecoilCallback(
-    ({ snapshot, set }) =>
-      async (viewId?: string) => {
-        const {
-          currentViewId,
-          currentViewFilters,
-          savedViewFiltersByKey,
-          views,
-        } = getViewScopedStateValuesFromSnapshot({
-          snapshot,
-          viewScopeId,
-        });
-
-        if (!currentViewId || !currentViewFilters || !savedViewFiltersByKey) {
-          return;
-        }
-
-        const createViewFilters = (viewFiltersToCreate: ViewFilter[]) => {
-          if (!viewFiltersToCreate.length) return;
-
-          return Promise.all(
-            viewFiltersToCreate.map((viewFilter) =>
-              apolloClient.mutate({
-                mutation: createOneRecordMutation,
-                variables: {
-                  input: {
-                    fieldMetadataId: viewFilter.fieldMetadataId,
-                    viewId: viewId ?? currentViewId,
-                    value: viewFilter.value,
-                    displayValue: viewFilter.displayValue,
-                    operand: viewFilter.operand,
-                  },
-                },
-              }),
-            ),
-          );
-        };
-
-        const updateViewFilters = (viewFiltersToUpdate: ViewFilter[]) => {
-          if (!viewFiltersToUpdate.length) return;
-
-          return Promise.all(
-            viewFiltersToUpdate.map((viewFilter) =>
-              apolloClient.mutate({
-                mutation: updateOneRecordMutation,
-                variables: {
-                  idToUpdate: viewFilter.id,
-                  input: {
-                    value: viewFilter.value,
-                    displayValue: viewFilter.displayValue,
-                    operand: viewFilter.operand,
-                  },
-                },
-              }),
-            ),
-          );
-        };
-
-        const deleteViewFilters = (viewFilterIdsToDelete: string[]) => {
-          if (!viewFilterIdsToDelete.length) return;
-
-          return Promise.all(
-            viewFilterIdsToDelete.map((viewFilterId) =>
-              apolloClient.mutate({
-                mutation: deleteOneRecordMutation,
-                variables: {
-                  idToDelete: viewFilterId,
-                },
-              }),
-            ),
-          );
-        };
-
-        const filtersToCreate = currentViewFilters.filter(
-          (filter) => !savedViewFiltersByKey[filter.fieldMetadataId],
-        );
-        await createViewFilters(filtersToCreate);
-
-        const filtersToUpdate = currentViewFilters.filter(
-          (filter) =>
-            savedViewFiltersByKey[filter.fieldMetadataId] &&
-            (savedViewFiltersByKey[filter.fieldMetadataId].operand !==
-              filter.operand ||
-              savedViewFiltersByKey[filter.fieldMetadataId].value !==
-                filter.value),
-        );
-        await updateViewFilters(filtersToUpdate);
-
-        const filterKeys = currentViewFilters.map(
-          (filter) => filter.fieldMetadataId,
-        );
-        const filterKeysToDelete = Object.keys(savedViewFiltersByKey).filter(
-          (previousFilterKey) => !filterKeys.includes(previousFilterKey),
-        );
-        const filterIdsToDelete = filterKeysToDelete.map(
-          (filterKeyToDelete) =>
-            savedViewFiltersByKey[filterKeyToDelete].id ?? '',
-        );
-        await deleteViewFilters(filterIdsToDelete);
-        set(
-          savedViewFiltersScopedFamilyState({
-            scopeId: viewScopeId,
-            familyKey: viewId ?? currentViewId,
-          }),
-          currentViewFilters,
-        );
-
-        const existingViewId = viewId ?? currentViewId;
-        const existingView = views.find((view) => view.id === existingViewId);
-
-        if (!existingView) {
-          return;
-        }
-
-        modifyRecordFromCache(existingViewId, {
-          viewFilters: (viewFiltersRef, { readField }) => {
-            const edges = readField<{ node: Reference }[]>(
-              'edges',
-              viewFiltersRef,
-            );
-
-            if (!edges) return viewFiltersRef;
-
-            return {
-              ...viewFiltersRef,
-              edges: currentViewFilters.map((viewFilter) => ({
-                node: viewFilter,
-                cursor: '',
-              })),
-            };
-          },
-        });
-      },
-    [
-      apolloClient,
-      createOneRecordMutation,
-      deleteOneRecordMutation,
-      modifyRecordFromCache,
-      updateOneRecordMutation,
-      viewScopeId,
-    ],
-  );
-
-  const upsertViewFilter = useRecoilCallback(
-    ({ snapshot, set }) =>
-      (filterToUpsert: Filter) => {
-        const { currentViewId, savedViewFiltersByKey, onViewFiltersChange } =
-          getViewScopedStateValuesFromSnapshot({
-            snapshot,
-            viewScopeId,
-          });
-
-        if (!currentViewId) {
-          return;
-        }
-
-        if (!savedViewFiltersByKey) {
-          return;
-        }
-
-        const existingSavedFilterId =
-          savedViewFiltersByKey[filterToUpsert.fieldMetadataId]?.id;
-
-        set(currentViewFiltersState, (filters) => {
-          const newViewFilters = produce(filters, (filtersDraft) => {
-            const existingFilterIndex = filtersDraft.findIndex(
-              (filter) =>
-                filter.fieldMetadataId === filterToUpsert.fieldMetadataId,
-            );
-
-            if (existingFilterIndex === -1 && filterToUpsert.value !== '') {
-              filtersDraft.push({
-                ...filterToUpsert,
-                id: existingSavedFilterId,
-              });
-              return filtersDraft;
-            }
-
-            filtersDraft[existingFilterIndex] = {
-              ...filterToUpsert,
-              id: existingSavedFilterId,
-            };
-          });
-          onViewFiltersChange?.(newViewFilters);
-          return newViewFilters;
-        });
-      },
-    [currentViewFiltersState, viewScopeId],
-  );
-
-  const removeViewFilter = useRecoilCallback(
-    ({ snapshot, set }) =>
-      (fieldMetadataId: string) => {
-        const { currentViewId, currentViewFilters, onViewFiltersChange } =
-          getViewScopedStateValuesFromSnapshot({
-            snapshot,
-            viewScopeId,
-          });
-
-        if (!currentViewId) {
-          return;
-        }
-
-        const newViewFilters = currentViewFilters.filter((filter) => {
-          return filter.fieldMetadataId !== fieldMetadataId;
-        });
-        set(currentViewFiltersState, newViewFilters);
-        onViewFiltersChange?.(newViewFilters);
-      },
-    [currentViewFiltersState, viewScopeId],
-  );
-
-  return { persistViewFilters, removeViewFilter, upsertViewFilter };
-};
diff --git a/packages/twenty-front/src/modules/views/hooks/internal/useViewFromQueryParams.ts b/packages/twenty-front/src/modules/views/hooks/internal/useViewFromQueryParams.ts
new file mode 100644
index 000000000000..9198268946d4
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/internal/useViewFromQueryParams.ts
@@ -0,0 +1,184 @@
+import { useMemo } from 'react';
+import { useParams, useSearchParams } from 'react-router-dom';
+import { useApolloClient } from '@apollo/client';
+import { isNonEmptyString } from '@sniptt/guards';
+import qs from 'qs';
+import { useRecoilCallback, useRecoilValue } from 'recoil';
+import z from 'zod';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
+import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objectMetadataItemFamilySelector';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { formatFieldMetadataItemAsFilterDefinition } from '@/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions';
+import { getObjectRecordIdentifier } from '@/object-metadata/utils/getObjectRecordIdentifier';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { generateFindManyRecordsQuery } from '@/object-record/utils/generateFindManyRecordsQuery';
+import { ViewFilter } from '@/views/types/ViewFilter';
+import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+
+const filterQueryParamsSchema = z.object({
+  view: z.string().optional(),
+  filter: z
+    .record(
+      z.record(
+        z.nativeEnum(ViewFilterOperand),
+        z.string().or(z.array(z.string())),
+      ),
+    )
+    .optional(),
+});
+
+export type FilterQueryParams = z.infer<typeof filterQueryParamsSchema>;
+
+export const useViewFromQueryParams = () => {
+  const apolloClient = useApolloClient();
+  const [searchParams] = useSearchParams();
+  const { objectNamePlural = '' } = useParams();
+  const { objectNameSingular } = useObjectNameSingularFromPlural({
+    objectNamePlural,
+  });
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
+
+  const queryParamsValidation = filterQueryParamsSchema.safeParse(
+    qs.parse(searchParams.toString()),
+  );
+
+  const filterQueryParams = useMemo(
+    () =>
+      queryParamsValidation.success ? queryParamsValidation.data.filter : {},
+    [queryParamsValidation],
+  );
+  const viewIdQueryParam = useMemo(
+    () =>
+      queryParamsValidation.success
+        ? queryParamsValidation.data.view
+        : undefined,
+    [queryParamsValidation],
+  );
+
+  const hasFiltersQueryParams =
+    isDefined(filterQueryParams) &&
+    Object.entries(filterQueryParams).length > 0;
+
+  const getFiltersFromQueryParams = useRecoilCallback(
+    ({ snapshot }) =>
+      async () => {
+        if (!hasFiltersQueryParams) return [];
+
+        return (
+          await Promise.all(
+            Object.entries(filterQueryParams).map<Promise<ViewFilter | null>>(
+              async ([fieldName, filterFromURL]) => {
+                const [filterOperandFromURL, filterValueFromURL] =
+                  Object.entries(filterFromURL)[0];
+                const fieldMetadataItem = objectMetadataItem.fields.find(
+                  (field) => field.name === fieldName,
+                );
+
+                if (!fieldMetadataItem) return null;
+
+                const filterDefinition =
+                  formatFieldMetadataItemAsFilterDefinition({
+                    field: fieldMetadataItem,
+                  });
+
+                if (isUndefinedOrNull(filterDefinition)) return null;
+
+                const relationObjectMetadataNameSingular =
+                  fieldMetadataItem.toRelationMetadata?.fromObjectMetadata
+                    .nameSingular;
+
+                const relationObjectMetadataNamePlural =
+                  fieldMetadataItem.toRelationMetadata?.fromObjectMetadata
+                    .namePlural;
+
+                const relationObjectMetadataItem =
+                  relationObjectMetadataNameSingular
+                    ? snapshot
+                        .getLoadable(
+                          objectMetadataItemFamilySelector({
+                            objectName: relationObjectMetadataNameSingular,
+                            objectNameType: 'singular',
+                          }),
+                        )
+                        .getValue()
+                    : null;
+
+                const relationRecordNames = [];
+
+                if (
+                  isNonEmptyString(relationObjectMetadataNamePlural) &&
+                  isDefined(relationObjectMetadataItem) &&
+                  Array.isArray(filterValueFromURL)
+                ) {
+                  const queryResult = await apolloClient.query<
+                    Record<string, { edges: { node: ObjectRecord }[] }>
+                  >({
+                    query: generateFindManyRecordsQuery({
+                      objectMetadataItem: relationObjectMetadataItem,
+                      objectMetadataItems,
+                    }),
+                    variables: {
+                      filter: { id: { in: filterValueFromURL } },
+                    },
+                  });
+
+                  const relationRecordNamesFromQuery = queryResult.data?.[
+                    relationObjectMetadataNamePlural
+                  ]?.edges.map(
+                    ({ node: record }) =>
+                      getObjectRecordIdentifier({
+                        objectMetadataItem: relationObjectMetadataItem,
+                        record,
+                      }).name,
+                  );
+
+                  relationRecordNames.push(...relationRecordNamesFromQuery);
+                }
+
+                const filterValueAsString = Array.isArray(filterValueFromURL)
+                  ? JSON.stringify(filterValueFromURL)
+                  : filterValueFromURL;
+
+                return {
+                  __typename: 'ViewFilter',
+                  id: `tmp-${[
+                    fieldName,
+                    filterOperandFromURL,
+                    filterValueFromURL,
+                  ].join('-')}`,
+                  fieldMetadataId: fieldMetadataItem.id,
+                  operand: filterOperandFromURL as ViewFilterOperand,
+                  value: filterValueAsString,
+                  displayValue:
+                    relationRecordNames?.join(', ') ?? filterValueAsString,
+                  definition: filterDefinition,
+                  persistAction: 'NONE',
+                };
+              },
+            ),
+          )
+        ).filter(isDefined);
+      },
+    [
+      apolloClient,
+      filterQueryParams,
+      hasFiltersQueryParams,
+      objectMetadataItem.fields,
+      objectMetadataItems,
+    ],
+  );
+
+  return {
+    viewIdQueryParam,
+    hasFiltersQueryParams,
+    getFiltersFromQueryParams,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/internal/useViewScopedStates.ts b/packages/twenty-front/src/modules/views/hooks/internal/useViewScopedStates.ts
deleted file mode 100644
index ecc4465e9961..000000000000
--- a/packages/twenty-front/src/modules/views/hooks/internal/useViewScopedStates.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { useRecoilState } from 'recoil';
-
-import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
-import { getScopedStateDeprecated } from '@/ui/utilities/recoil-scope/utils/getScopedStateDeprecated';
-
-import { UNDEFINED_FAMILY_ITEM_ID } from '../../constants';
-import { ViewScopeInternalContext } from '../../scopes/scope-internal-context/ViewScopeInternalContext';
-import { currentViewIdScopedState } from '../../states/currentViewIdScopedState';
-import { getViewScopedStates } from '../../utils/internal/getViewScopedStates';
-
-export const useViewScopedStates = (args?: { viewScopeId?: string }) => {
-  const { viewScopeId } = args ?? {};
-
-  const scopeId = useAvailableScopeIdOrThrow(
-    ViewScopeInternalContext,
-    viewScopeId,
-  );
-
-  // View
-  const [currentViewId] = useRecoilState(
-    getScopedStateDeprecated(currentViewIdScopedState, scopeId),
-  );
-
-  const viewId = currentViewId ?? UNDEFINED_FAMILY_ITEM_ID;
-
-  const {
-    availableFieldDefinitionsState,
-    availableFilterDefinitionsState,
-    availableSortDefinitionsState,
-    canPersistFiltersSelector,
-    canPersistSortsSelector,
-    currentViewFieldsState,
-    currentViewFiltersState,
-    currentViewIdState,
-    currentViewSelector,
-    currentViewSortsState,
-    entityCountInCurrentViewState,
-    isViewBarExpandedState,
-    isPersistingViewState,
-    onViewFieldsChangeState,
-    onViewFiltersChangeState,
-    onViewSortsChangeState,
-    onViewTypeChangeState,
-    onViewCompactModeChangeState,
-    savedViewFieldsByKeySelector,
-    savedViewFieldsState,
-    savedViewFiltersByKeySelector,
-    savedViewFiltersState,
-    savedViewSortsByKeySelector,
-    savedViewSortsState,
-    viewEditModeState,
-    viewObjectMetadataIdState,
-    viewTypeState,
-    viewsState,
-  } = getViewScopedStates({
-    viewScopeId: scopeId,
-    viewId,
-  });
-
-  return {
-    availableFieldDefinitionsState,
-    availableFilterDefinitionsState,
-    availableSortDefinitionsState,
-    canPersistFiltersSelector,
-    canPersistSortsSelector,
-    currentViewFieldsState,
-    currentViewFiltersState,
-    currentViewIdState,
-    currentViewSelector,
-    currentViewSortsState,
-    entityCountInCurrentViewState,
-    isViewBarExpandedState,
-    isPersistingViewState,
-    onViewFieldsChangeState,
-    onViewFiltersChangeState,
-    onViewSortsChangeState,
-    onViewTypeChangeState,
-    onViewCompactModeChangeState,
-    savedViewFieldsByKeySelector,
-    savedViewFieldsState,
-    savedViewFiltersByKeySelector,
-    savedViewFiltersState,
-    savedViewSortsByKeySelector,
-    savedViewSortsState,
-    viewEditModeState,
-    viewObjectMetadataIdState,
-    viewTypeState,
-    viewsState,
-  };
-};
diff --git a/packages/twenty-front/src/modules/views/hooks/internal/useViewSorts.ts b/packages/twenty-front/src/modules/views/hooks/internal/useViewSorts.ts
deleted file mode 100644
index 989d93677df4..000000000000
--- a/packages/twenty-front/src/modules/views/hooks/internal/useViewSorts.ts
+++ /dev/null
@@ -1,235 +0,0 @@
-import { Reference, useApolloClient } from '@apollo/client';
-import { produce } from 'immer';
-import { useRecoilCallback } from 'recoil';
-
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
-import { savedViewSortsScopedFamilyState } from '@/views/states/savedViewSortsScopedFamilyState';
-import { ViewSort } from '@/views/types/ViewSort';
-import { getViewScopedStateValuesFromSnapshot } from '@/views/utils/getViewScopedStateValuesFromSnapshot';
-
-import { useViewScopedStates } from './useViewScopedStates';
-
-export const useViewSorts = (viewScopeId: string) => {
-  const {
-    updateOneRecordMutation,
-    createOneRecordMutation,
-    deleteOneRecordMutation,
-  } = useObjectMetadataItem({
-    objectNameSingular: CoreObjectNameSingular.ViewSort,
-  });
-
-  const { modifyRecordFromCache } = useObjectMetadataItem({
-    objectNameSingular: CoreObjectNameSingular.View,
-  });
-  const apolloClient = useApolloClient();
-
-  const { currentViewSortsState } = useViewScopedStates({
-    viewScopeId: viewScopeId,
-  });
-
-  const persistViewSorts = useRecoilCallback(
-    ({ snapshot, set }) =>
-      async (viewId?: string) => {
-        const { currentViewId, currentViewSorts, savedViewSortsByKey, views } =
-          getViewScopedStateValuesFromSnapshot({
-            snapshot,
-            viewScopeId,
-          });
-
-        if (!currentViewId) {
-          return;
-        }
-
-        if (!currentViewSorts) {
-          return;
-        }
-        if (!savedViewSortsByKey) {
-          return;
-        }
-
-        const createViewSorts = (viewSortsToCreate: ViewSort[]) => {
-          if (!viewSortsToCreate.length) return;
-
-          return Promise.all(
-            viewSortsToCreate.map((viewSort) =>
-              apolloClient.mutate({
-                mutation: createOneRecordMutation,
-                variables: {
-                  input: {
-                    fieldMetadataId: viewSort.fieldMetadataId,
-                    viewId: viewId ?? currentViewId,
-                    direction: viewSort.direction,
-                  },
-                },
-              }),
-            ),
-          );
-        };
-
-        const updateViewSorts = (viewSortsToUpdate: ViewSort[]) => {
-          if (!viewSortsToUpdate.length) return;
-
-          return Promise.all(
-            viewSortsToUpdate.map((viewSort) =>
-              apolloClient.mutate({
-                mutation: updateOneRecordMutation,
-                variables: {
-                  idToUpdate: viewSort.id,
-                  input: {
-                    direction: viewSort.direction,
-                  },
-                },
-              }),
-            ),
-          );
-        };
-
-        const deleteViewSorts = (viewSortIdsToDelete: string[]) => {
-          if (!viewSortIdsToDelete.length) return;
-
-          return Promise.all(
-            viewSortIdsToDelete.map((viewSortId) =>
-              apolloClient.mutate({
-                mutation: deleteOneRecordMutation,
-                variables: {
-                  idToDelete: viewSortId,
-                },
-              }),
-            ),
-          );
-        };
-
-        const sortsToCreate = currentViewSorts.filter(
-          (sort) => !savedViewSortsByKey[sort.fieldMetadataId],
-        );
-
-        await createViewSorts(sortsToCreate);
-
-        const sortsToUpdate = currentViewSorts.filter(
-          (sort) =>
-            savedViewSortsByKey[sort.fieldMetadataId] &&
-            savedViewSortsByKey[sort.fieldMetadataId].direction !==
-              sort.direction,
-        );
-        await updateViewSorts(sortsToUpdate);
-
-        const sortKeys = currentViewSorts.map((sort) => sort.fieldMetadataId);
-        const sortKeysToDelete = Object.keys(savedViewSortsByKey).filter(
-          (previousSortKey) => !sortKeys.includes(previousSortKey),
-        );
-        const sortIdsToDelete = sortKeysToDelete.map(
-          (sortKeyToDelete) => savedViewSortsByKey[sortKeyToDelete].id ?? '',
-        );
-        await deleteViewSorts(sortIdsToDelete);
-        set(
-          savedViewSortsScopedFamilyState({
-            scopeId: viewScopeId,
-            familyKey: viewId ?? currentViewId,
-          }),
-          currentViewSorts,
-        );
-        const existingViewId = viewId ?? currentViewId;
-        const existingView = views.find((view) => view.id === existingViewId);
-
-        if (!existingView) {
-          return;
-        }
-
-        modifyRecordFromCache(existingViewId, {
-          viewSorts: (viewSortsRef, { readField }) => {
-            const edges = readField<{ node: Reference }[]>(
-              'edges',
-              viewSortsRef,
-            );
-
-            if (!edges) return viewSortsRef;
-
-            return {
-              ...viewSortsRef,
-              edges: currentViewSorts.map((viewSort) => ({
-                node: viewSort,
-                cursor: '',
-              })),
-            };
-          },
-        });
-      },
-    [
-      apolloClient,
-      createOneRecordMutation,
-      deleteOneRecordMutation,
-      modifyRecordFromCache,
-      updateOneRecordMutation,
-      viewScopeId,
-    ],
-  );
-
-  const upsertViewSort = useRecoilCallback(
-    ({ snapshot, set }) =>
-      (sortToUpsert: Sort) => {
-        const { currentViewId, onViewSortsChange, savedViewSortsByKey } =
-          getViewScopedStateValuesFromSnapshot({
-            snapshot,
-            viewScopeId,
-          });
-
-        if (!currentViewId) {
-          return;
-        }
-
-        if (!savedViewSortsByKey) {
-          return;
-        }
-
-        const existingSavedSortId =
-          savedViewSortsByKey[sortToUpsert.fieldMetadataId]?.id;
-
-        set(currentViewSortsState, (sorts) => {
-          const newViewSorts = produce(sorts, (sortsDraft) => {
-            const existingSortIndex = sortsDraft.findIndex(
-              (sort) => sort.fieldMetadataId === sortToUpsert.fieldMetadataId,
-            );
-
-            if (existingSortIndex === -1) {
-              sortsDraft.push({ ...sortToUpsert, id: existingSavedSortId });
-              return sortsDraft;
-            }
-
-            sortsDraft[existingSortIndex] = {
-              ...sortToUpsert,
-              id: existingSavedSortId,
-            };
-          });
-          onViewSortsChange?.(newViewSorts);
-          return newViewSorts;
-        });
-      },
-    [currentViewSortsState, viewScopeId],
-  );
-
-  const removeViewSort = useRecoilCallback(
-    ({ snapshot, set }) =>
-      (fieldMetadataId: string) => {
-        const { currentViewId, onViewSortsChange, currentViewSorts } =
-          getViewScopedStateValuesFromSnapshot({
-            snapshot,
-            viewScopeId,
-          });
-
-        if (!currentViewId) {
-          return;
-        }
-
-        const newViewSorts = currentViewSorts.filter((filter) => {
-          return filter.fieldMetadataId !== fieldMetadataId;
-        });
-        set(currentViewSortsState, newViewSorts);
-        onViewSortsChange?.(newViewSorts);
-      },
-    [currentViewSortsState, viewScopeId],
-  );
-
-  return { persistViewSorts, upsertViewSort, removeViewSort };
-};
diff --git a/packages/twenty-front/src/modules/views/hooks/internal/useViewStates.ts b/packages/twenty-front/src/modules/views/hooks/internal/useViewStates.ts
new file mode 100644
index 000000000000..02f1a4cf6004
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/internal/useViewStates.ts
@@ -0,0 +1,91 @@
+import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
+import { extractComponentReadOnlySelector } from '@/ui/utilities/state/component-state/utils/extractComponentReadOnlySelector';
+import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
+import { availableFieldDefinitionsComponentState } from '@/views/states/availableFieldDefinitionsComponentState';
+import { availableFilterDefinitionsComponentState } from '@/views/states/availableFilterDefinitionsComponentState';
+import { availableSortDefinitionsComponentState } from '@/views/states/availableSortDefinitionsComponentState';
+import { currentViewIdComponentState } from '@/views/states/currentViewIdComponentState';
+import { entityCountInCurrentViewComponentState } from '@/views/states/entityCountInCurrentViewComponentState';
+import { isCurrentViewKeyIndexComponentState } from '@/views/states/isCurrentViewIndexComponentState';
+import { isPersistingViewFieldsComponentState } from '@/views/states/isPersistingViewFieldsComponentState';
+import { isViewBarExpandedComponentState } from '@/views/states/isViewBarExpandedComponentState';
+import { onCurrentViewChangeComponentState } from '@/views/states/onCurrentViewChangeComponentState';
+import { canPersistViewComponentSelector } from '@/views/states/selectors/canPersistViewComponentSelector';
+import { unsavedToDeleteViewFilterIdsComponentState } from '@/views/states/unsavedToDeleteViewFilterIdsComponentState';
+import { unsavedToDeleteViewSortIdsComponentState } from '@/views/states/unsavedToDeleteViewSortIdsComponentState';
+import { unsavedToUpsertViewFiltersComponentState } from '@/views/states/unsavedToUpsertViewFiltersComponentState';
+import { unsavedToUpsertViewSortsComponentState } from '@/views/states/unsavedToUpsertViewSortsComponentState';
+import { viewObjectMetadataIdComponentState } from '@/views/states/viewObjectMetadataIdComponentState';
+
+import { ViewScopeInternalContext } from '../../scopes/scope-internal-context/ViewScopeInternalContext';
+
+export const useViewStates = (viewComponentId?: string) => {
+  const componentId = useAvailableScopeIdOrThrow(
+    ViewScopeInternalContext,
+    viewComponentId,
+  );
+
+  return {
+    componentId,
+    currentViewIdState: extractComponentState(
+      currentViewIdComponentState,
+      componentId,
+    ),
+    availableFieldDefinitionsState: extractComponentState(
+      availableFieldDefinitionsComponentState,
+      componentId,
+    ),
+    availableFilterDefinitionsState: extractComponentState(
+      availableFilterDefinitionsComponentState,
+      componentId,
+    ),
+    availableSortDefinitionsState: extractComponentState(
+      availableSortDefinitionsComponentState,
+      componentId,
+    ),
+    canPersistViewSelector: extractComponentReadOnlySelector(
+      canPersistViewComponentSelector,
+      componentId,
+    ),
+    isViewBarExpandedState: extractComponentState(
+      isViewBarExpandedComponentState,
+      componentId,
+    ),
+    onCurrentViewChangeState: extractComponentState(
+      onCurrentViewChangeComponentState,
+      componentId,
+    ),
+    entityCountInCurrentViewState: extractComponentState(
+      entityCountInCurrentViewComponentState,
+      componentId,
+    ),
+    viewObjectMetadataIdState: extractComponentState(
+      viewObjectMetadataIdComponentState,
+      componentId,
+    ),
+    unsavedToUpsertViewFiltersState: extractComponentState(
+      unsavedToUpsertViewFiltersComponentState,
+      componentId,
+    ),
+    unsavedToUpsertViewSortsState: extractComponentState(
+      unsavedToUpsertViewSortsComponentState,
+      componentId,
+    ),
+    unsavedToDeleteViewFilterIdsState: extractComponentState(
+      unsavedToDeleteViewFilterIdsComponentState,
+      componentId,
+    ),
+    unsavedToDeleteViewSortIdsState: extractComponentState(
+      unsavedToDeleteViewSortIdsComponentState,
+      componentId,
+    ),
+    isPersistingViewFieldsState: extractComponentState(
+      isPersistingViewFieldsComponentState,
+      componentId,
+    ),
+    isCurrentViewKeyIndexState: extractComponentState(
+      isCurrentViewKeyIndexComponentState,
+      componentId,
+    ),
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/internal/useViews.ts b/packages/twenty-front/src/modules/views/hooks/internal/useViews.ts
deleted file mode 100644
index 8bc05a85a729..000000000000
--- a/packages/twenty-front/src/modules/views/hooks/internal/useViews.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { useApolloClient } from '@apollo/client';
-import { useRecoilCallback } from 'recoil';
-
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { GraphQLView } from '@/views/types/GraphQLView';
-import { getViewScopedStateValuesFromSnapshot } from '@/views/utils/getViewScopedStateValuesFromSnapshot';
-
-export const useViews = (scopeId: string) => {
-  const {
-    updateOneRecordMutation: updateOneMutation,
-    createOneRecordMutation: createOneMutation,
-    deleteOneRecordMutation: deleteOneMutation,
-    findManyRecordsQuery: findManyQuery,
-  } = useObjectMetadataItem({
-    objectNameSingular: CoreObjectNameSingular.View,
-  });
-
-  const apolloClient = useApolloClient();
-
-  const createView = useRecoilCallback(
-    ({ snapshot }) =>
-      async (view: Pick<GraphQLView, 'id' | 'name'>) => {
-        const { viewObjectMetadataId, viewType } =
-          getViewScopedStateValuesFromSnapshot({
-            snapshot,
-            viewScopeId: scopeId,
-          });
-
-        if (!viewObjectMetadataId || !viewType) {
-          return;
-        }
-        await apolloClient.mutate({
-          mutation: createOneMutation,
-          variables: {
-            input: {
-              id: view.id,
-              name: view.name,
-              objectMetadataId: viewObjectMetadataId,
-              type: viewType,
-            },
-          },
-          refetchQueries: [findManyQuery],
-        });
-      },
-    [scopeId, apolloClient, createOneMutation, findManyQuery],
-  );
-
-  const updateView = async (view: GraphQLView) => {
-    await apolloClient.mutate({
-      mutation: updateOneMutation,
-      variables: {
-        idToUpdate: view.id,
-        input: {
-          id: view.id,
-          name: view.name,
-          isCompact: view.isCompact,
-        },
-      },
-      refetchQueries: [findManyQuery],
-    });
-  };
-
-  const deleteView = async (viewId: string) => {
-    await apolloClient.mutate({
-      mutation: deleteOneMutation,
-      variables: {
-        idToDelete: viewId,
-      },
-      refetchQueries: [findManyQuery],
-    });
-  };
-
-  return {
-    createView,
-    deleteView,
-    isFetchingViews: false,
-    updateView,
-  };
-};
diff --git a/packages/twenty-front/src/modules/views/hooks/useCombinedViewFilters.ts b/packages/twenty-front/src/modules/views/hooks/useCombinedViewFilters.ts
new file mode 100644
index 000000000000..e3eceeed3ebd
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/useCombinedViewFilters.ts
@@ -0,0 +1,158 @@
+import { useRecoilCallback } from 'recoil';
+import { v4 } from 'uuid';
+
+import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+import { useGetViewFromCache } from '@/views/hooks/useGetViewFromCache';
+import { ViewFilter } from '@/views/types/ViewFilter';
+import { isDefined } from '~/utils/isDefined';
+
+export const useCombinedViewFilters = (viewBarComponentId?: string) => {
+  const {
+    unsavedToUpsertViewFiltersState,
+    unsavedToDeleteViewFilterIdsState,
+    currentViewIdState,
+  } = useViewStates(viewBarComponentId);
+
+  const { getViewFromCache } = useGetViewFromCache();
+
+  const upsertCombinedViewFilter = useRecoilCallback(
+    ({ snapshot, set }) =>
+      async (upsertedFilter: Filter) => {
+        const unsavedToUpsertViewFilters = getSnapshotValue(
+          snapshot,
+          unsavedToUpsertViewFiltersState,
+        );
+
+        const unsavedToDeleteViewFilterIds = getSnapshotValue(
+          snapshot,
+          unsavedToDeleteViewFilterIdsState,
+        );
+
+        const currentViewId = getSnapshotValue(snapshot, currentViewIdState);
+
+        if (!currentViewId) {
+          return;
+        }
+
+        const currentView = await getViewFromCache(currentViewId);
+
+        if (!currentView) {
+          return;
+        }
+
+        const matchingFilterInCurrentView = currentView.viewFilters.find(
+          (viewFilter) =>
+            viewFilter.fieldMetadataId === upsertedFilter.fieldMetadataId,
+        );
+
+        const matchingFilterInUnsavedFilters = unsavedToUpsertViewFilters.find(
+          (viewFilter) =>
+            viewFilter.fieldMetadataId === upsertedFilter.fieldMetadataId,
+        );
+
+        if (isDefined(matchingFilterInUnsavedFilters)) {
+          const updatedFilters = unsavedToUpsertViewFilters.map((viewFilter) =>
+            viewFilter.id === matchingFilterInUnsavedFilters.id
+              ? { ...viewFilter, ...upsertedFilter }
+              : viewFilter,
+          );
+
+          set(unsavedToUpsertViewFiltersState, updatedFilters);
+          return;
+        }
+
+        if (isDefined(matchingFilterInCurrentView)) {
+          set(unsavedToUpsertViewFiltersState, [
+            ...unsavedToUpsertViewFilters,
+            { ...matchingFilterInCurrentView, ...upsertedFilter },
+          ]);
+          set(
+            unsavedToDeleteViewFilterIdsState,
+            unsavedToDeleteViewFilterIds.filter(
+              (id) => id !== matchingFilterInCurrentView.id,
+            ),
+          );
+          return;
+        }
+
+        set(unsavedToUpsertViewFiltersState, [
+          ...unsavedToUpsertViewFilters,
+          {
+            ...upsertedFilter,
+            id: v4(),
+            __typename: 'ViewFilter',
+          } satisfies ViewFilter,
+        ]);
+      },
+    [
+      currentViewIdState,
+      getViewFromCache,
+      unsavedToDeleteViewFilterIdsState,
+      unsavedToUpsertViewFiltersState,
+    ],
+  );
+  const removeCombinedViewFilter = useRecoilCallback(
+    ({ snapshot, set }) =>
+      async (fieldMetadataId: string) => {
+        const unsavedToUpsertViewFilters = getSnapshotValue(
+          snapshot,
+          unsavedToUpsertViewFiltersState,
+        );
+
+        const unsavedToDeleteViewFilterIds = getSnapshotValue(
+          snapshot,
+          unsavedToDeleteViewFilterIdsState,
+        );
+
+        const currentViewId = getSnapshotValue(snapshot, currentViewIdState);
+
+        if (!currentViewId) {
+          return;
+        }
+
+        const currentView = await getViewFromCache(currentViewId);
+
+        if (!currentView) {
+          return;
+        }
+
+        const matchingFilterInCurrentView = currentView.viewFilters.find(
+          (viewFilter) => viewFilter.fieldMetadataId === fieldMetadataId,
+        );
+
+        const matchingFilterInUnsavedFilters = unsavedToUpsertViewFilters.find(
+          (viewFilter) => viewFilter.fieldMetadataId === fieldMetadataId,
+        );
+
+        if (isDefined(matchingFilterInUnsavedFilters)) {
+          set(
+            unsavedToUpsertViewFiltersState,
+            unsavedToUpsertViewFilters.filter(
+              (viewFilter) => viewFilter.fieldMetadataId !== fieldMetadataId,
+            ),
+          );
+        }
+
+        if (isDefined(matchingFilterInCurrentView)) {
+          set(unsavedToDeleteViewFilterIdsState, [
+            ...new Set([
+              ...unsavedToDeleteViewFilterIds,
+              matchingFilterInCurrentView.id,
+            ]),
+          ]);
+        }
+      },
+    [
+      currentViewIdState,
+      getViewFromCache,
+      unsavedToDeleteViewFilterIdsState,
+      unsavedToUpsertViewFiltersState,
+    ],
+  );
+  return {
+    upsertCombinedViewFilter,
+    removeCombinedViewFilter,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/useCombinedViewSorts.ts b/packages/twenty-front/src/modules/views/hooks/useCombinedViewSorts.ts
new file mode 100644
index 000000000000..6f08d77b1715
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/useCombinedViewSorts.ts
@@ -0,0 +1,159 @@
+import { useRecoilCallback } from 'recoil';
+import { v4 } from 'uuid';
+
+import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
+import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+import { useGetViewFromCache } from '@/views/hooks/useGetViewFromCache';
+import { ViewSort } from '@/views/types/ViewSort';
+import { isDefined } from '~/utils/isDefined';
+
+export const useCombinedViewSorts = (viewBarComponentId?: string) => {
+  const {
+    unsavedToUpsertViewSortsState,
+    unsavedToDeleteViewSortIdsState,
+    currentViewIdState,
+  } = useViewStates(viewBarComponentId);
+
+  const { getViewFromCache } = useGetViewFromCache();
+
+  const upsertCombinedViewSort = useRecoilCallback(
+    ({ snapshot, set }) =>
+      async (upsertedSort: Sort) => {
+        const unsavedToUpsertViewSorts = getSnapshotValue(
+          snapshot,
+          unsavedToUpsertViewSortsState,
+        );
+
+        const unsavedToDeleteViewSortIds = getSnapshotValue(
+          snapshot,
+          unsavedToDeleteViewSortIdsState,
+        );
+
+        const currentViewId = getSnapshotValue(snapshot, currentViewIdState);
+
+        if (!currentViewId) {
+          return;
+        }
+
+        const currentView = await getViewFromCache(currentViewId);
+
+        if (!currentView) {
+          return;
+        }
+
+        const matchingSortInCurrentView = currentView.viewSorts.find(
+          (viewSort) =>
+            viewSort.fieldMetadataId === upsertedSort.fieldMetadataId,
+        );
+
+        const matchingSortInUnsavedSorts = unsavedToUpsertViewSorts.find(
+          (viewSort) =>
+            viewSort.fieldMetadataId === upsertedSort.fieldMetadataId,
+        );
+
+        if (isDefined(matchingSortInUnsavedSorts)) {
+          const updatedSorts = unsavedToUpsertViewSorts.map((viewSort) =>
+            viewSort.id === matchingSortInUnsavedSorts.id
+              ? { ...viewSort, ...upsertedSort }
+              : viewSort,
+          );
+
+          set(unsavedToUpsertViewSortsState, updatedSorts);
+          return;
+        }
+
+        if (isDefined(matchingSortInCurrentView)) {
+          set(unsavedToUpsertViewSortsState, [
+            ...unsavedToUpsertViewSorts,
+            { ...matchingSortInCurrentView, ...upsertedSort },
+          ]);
+          set(
+            unsavedToDeleteViewSortIdsState,
+            unsavedToDeleteViewSortIds.filter(
+              (id) => id !== matchingSortInCurrentView.id,
+            ),
+          );
+          return;
+        }
+
+        set(unsavedToUpsertViewSortsState, [
+          ...unsavedToUpsertViewSorts,
+          {
+            ...upsertedSort,
+            id: v4(),
+            __typename: 'ViewSort',
+          } satisfies ViewSort,
+        ]);
+      },
+    [
+      currentViewIdState,
+      getViewFromCache,
+      unsavedToDeleteViewSortIdsState,
+      unsavedToUpsertViewSortsState,
+    ],
+  );
+  const removeCombinedViewSort = useRecoilCallback(
+    ({ snapshot, set }) =>
+      async (fieldMetadataId: string) => {
+        const unsavedToUpsertViewSorts = getSnapshotValue(
+          snapshot,
+          unsavedToUpsertViewSortsState,
+        );
+
+        const unsavedToDeleteViewSortIds = getSnapshotValue(
+          snapshot,
+          unsavedToDeleteViewSortIdsState,
+        );
+
+        const currentViewId = getSnapshotValue(snapshot, currentViewIdState);
+
+        if (!currentViewId) {
+          return;
+        }
+
+        const currentView = await getViewFromCache(currentViewId);
+
+        if (!currentView) {
+          return;
+        }
+
+        const matchingSortInCurrentView = currentView.viewSorts.find(
+          (viewSort) => viewSort.fieldMetadataId === fieldMetadataId,
+        );
+
+        const matchingSortInUnsavedSorts = unsavedToUpsertViewSorts.find(
+          (viewSort) => viewSort.fieldMetadataId === fieldMetadataId,
+        );
+
+        if (isDefined(matchingSortInUnsavedSorts)) {
+          set(
+            unsavedToUpsertViewSortsState,
+            unsavedToUpsertViewSorts.filter(
+              (viewSort) => viewSort.fieldMetadataId !== fieldMetadataId,
+            ),
+          );
+          return;
+        }
+
+        if (isDefined(matchingSortInCurrentView)) {
+          set(unsavedToDeleteViewSortIdsState, [
+            ...new Set([
+              ...unsavedToDeleteViewSortIds,
+              matchingSortInCurrentView.id,
+            ]),
+          ]);
+        }
+      },
+    [
+      currentViewIdState,
+      getViewFromCache,
+      unsavedToDeleteViewSortIdsState,
+      unsavedToUpsertViewSortsState,
+    ],
+  );
+  return {
+    upsertCombinedViewSort,
+    removeCombinedViewSort,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/useGetCurrentView.ts b/packages/twenty-front/src/modules/views/hooks/useGetCurrentView.ts
new file mode 100644
index 000000000000..70d3cd8160c1
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/useGetCurrentView.ts
@@ -0,0 +1,100 @@
+import { useEffect } from 'react';
+import { useRecoilValue, useSetRecoilState } from 'recoil';
+
+import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
+import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
+import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+import { ViewScopeInternalContext } from '@/views/scopes/scope-internal-context/ViewScopeInternalContext';
+import { View } from '@/views/types/View';
+import { combinedViewFilters } from '@/views/utils/combinedViewFilters';
+import { combinedViewSorts } from '@/views/utils/combinedViewSorts';
+import { getObjectMetadataItemViews } from '@/views/utils/getObjectMetadataItemViews';
+import { isDefined } from '~/utils/isDefined';
+
+export const useGetCurrentView = (viewBarComponentId?: string) => {
+  const componentId = useAvailableScopeIdOrThrow(
+    ViewScopeInternalContext,
+    viewBarComponentId,
+  );
+
+  const { records: views } = usePrefetchedData<View>(PrefetchKey.AllViews);
+
+  const {
+    currentViewIdState,
+    viewObjectMetadataIdState,
+    unsavedToUpsertViewFiltersState,
+    unsavedToDeleteViewFilterIdsState,
+    unsavedToDeleteViewSortIdsState,
+    unsavedToUpsertViewSortsState,
+    isCurrentViewKeyIndexState,
+  } = useViewStates(componentId);
+
+  const currentViewId = useRecoilValue(currentViewIdState);
+  const viewObjectMetadataId = useRecoilValue(viewObjectMetadataIdState);
+  const setIsCurrentViewKeyIndex = useSetRecoilState(
+    isCurrentViewKeyIndexState,
+  );
+
+  const currentViewFromCurrentViewId = views.find(
+    (view) => view.id === currentViewId,
+  );
+  const indexView = views.find(
+    (view) =>
+      view.key === 'INDEX' && view.objectMetadataId === viewObjectMetadataId,
+  );
+
+  const currentView = currentViewId ? currentViewFromCurrentViewId : indexView;
+
+  useEffect(() => {
+    setIsCurrentViewKeyIndex(currentView?.key === 'INDEX');
+  }, [currentView, setIsCurrentViewKeyIndex]);
+
+  const viewsOnCurrentObject = getObjectMetadataItemViews(
+    viewObjectMetadataId ?? '',
+    views,
+  );
+
+  const unsavedToUpsertViewFilters = useRecoilValue(
+    unsavedToUpsertViewFiltersState,
+  );
+  const unsavedToUpsertViewSorts = useRecoilValue(
+    unsavedToUpsertViewSortsState,
+  );
+  const unsavedToDeleteViewFilterIds = useRecoilValue(
+    unsavedToDeleteViewFilterIdsState,
+  );
+  const unsavedToDeleteViewSortIds = useRecoilValue(
+    unsavedToDeleteViewSortIdsState,
+  );
+
+  if (!isDefined(currentView)) {
+    return {
+      componentId,
+      currentViewWithSavedFiltersAndSorts: undefined,
+      currentViewWithCombinedFiltersAndSorts: undefined,
+      viewsOnCurrentObject: viewsOnCurrentObject ?? [],
+    };
+  }
+
+  const currentViewWithCombinedFiltersAndSorts = {
+    ...currentView,
+    viewFilters: combinedViewFilters(
+      currentView.viewFilters,
+      unsavedToUpsertViewFilters,
+      unsavedToDeleteViewFilterIds,
+    ),
+    viewSorts: combinedViewSorts(
+      currentView.viewSorts,
+      unsavedToUpsertViewSorts,
+      unsavedToDeleteViewSortIds,
+    ),
+  };
+
+  return {
+    componentId,
+    currentViewWithSavedFiltersAndSorts: currentView,
+    currentViewWithCombinedFiltersAndSorts,
+    viewsOnCurrentObject: viewsOnCurrentObject ?? [],
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/useGetViewFromCache.ts b/packages/twenty-front/src/modules/views/hooks/useGetViewFromCache.ts
new file mode 100644
index 000000000000..cdc95e1e8fbd
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/useGetViewFromCache.ts
@@ -0,0 +1,26 @@
+import { useCallback } from 'react';
+import { useApolloClient } from '@apollo/client';
+
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
+import { View } from '@/views/types/View';
+
+export const useGetViewFromCache = () => {
+  const client = useApolloClient();
+  const cache = client.cache;
+
+  const getRecordFromCache = useGetRecordFromCache({
+    objectNameSingular: CoreObjectNameSingular.View,
+  });
+
+  const getViewFromCache = useCallback(
+    async (viewId: string) => {
+      return getRecordFromCache<View>(viewId, cache);
+    },
+    [cache, getRecordFromCache],
+  );
+
+  return {
+    getViewFromCache,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/useHandleViews.ts b/packages/twenty-front/src/modules/views/hooks/useHandleViews.ts
new file mode 100644
index 000000000000..e0acd68598c9
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/useHandleViews.ts
@@ -0,0 +1,164 @@
+import { useCallback } from 'react';
+import { useSearchParams } from 'react-router-dom';
+import { useRecoilCallback } from 'recoil';
+import { v4 } from 'uuid';
+
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
+import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
+import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
+import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
+import { usePersistViewFieldRecords } from '@/views/hooks/internal/usePersistViewFieldRecords';
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+import { useGetViewFromCache } from '@/views/hooks/useGetViewFromCache';
+import { useResetCurrentView } from '@/views/hooks/useResetCurrentView';
+import { useSaveCurrentViewFiltersAndSorts } from '@/views/hooks/useSaveCurrentViewFiltersAndSorts';
+import { GraphQLView } from '@/views/types/GraphQLView';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+
+export const useHandleViews = (viewBarComponentId?: string) => {
+  const { resetCurrentView } = useResetCurrentView(viewBarComponentId);
+
+  const { currentViewIdState, isPersistingViewFieldsState } =
+    useViewStates(viewBarComponentId);
+
+  const { getViewFromCache } = useGetViewFromCache();
+
+  const { deleteOneRecord } = useDeleteOneRecord({
+    objectNameSingular: CoreObjectNameSingular.View,
+  });
+
+  const { createOneRecord } = useCreateOneRecord<GraphQLView>({
+    objectNameSingular: CoreObjectNameSingular.View,
+  });
+
+  const { updateOneRecord } = useUpdateOneRecord({
+    objectNameSingular: CoreObjectNameSingular.View,
+  });
+
+  const { createViewFieldRecords } = usePersistViewFieldRecords();
+  const { saveCurrentViewFilterAndSorts } =
+    useSaveCurrentViewFiltersAndSorts(viewBarComponentId);
+
+  const [, setSearchParams] = useSearchParams();
+
+  const removeView = useRecoilCallback(
+    () => async (viewId: string) => {
+      await deleteOneRecord(viewId);
+    },
+    [deleteOneRecord],
+  );
+
+  const createView = useRecoilCallback(
+    ({ snapshot, set }) =>
+      async ({
+        id,
+        name,
+        icon,
+        kanbanFieldMetadataId,
+        type,
+      }: Partial<
+        Pick<
+          GraphQLView,
+          'id' | 'name' | 'icon' | 'kanbanFieldMetadataId' | 'type'
+        >
+      >) => {
+        const currentViewId = getSnapshotValue(snapshot, currentViewIdState);
+
+        if (!isDefined(currentViewId)) {
+          return;
+        }
+
+        const view = await getViewFromCache(currentViewId);
+
+        if (!isDefined(view)) {
+          return;
+        }
+
+        set(isPersistingViewFieldsState, true);
+
+        const newView = await createOneRecord({
+          id: id ?? v4(),
+          name: name ?? view.name,
+          icon: icon ?? view.icon,
+          key: null,
+          kanbanFieldMetadataId:
+            kanbanFieldMetadataId ?? view.kanbanFieldMetadataId,
+          type: type ?? view.type,
+          objectMetadataId: view.objectMetadataId,
+        });
+
+        if (isUndefinedOrNull(newView)) {
+          throw new Error('Failed to create view');
+        }
+
+        await createViewFieldRecords(view.viewFields, newView);
+        await saveCurrentViewFilterAndSorts(newView.id);
+        set(isPersistingViewFieldsState, false);
+      },
+    [
+      createOneRecord,
+      createViewFieldRecords,
+      currentViewIdState,
+      getViewFromCache,
+      isPersistingViewFieldsState,
+      saveCurrentViewFilterAndSorts,
+    ],
+  );
+
+  const changeViewInUrl = useCallback(
+    (viewId: string) => {
+      setSearchParams(() => {
+        const searchParams = new URLSearchParams();
+        searchParams.set('view', viewId);
+        return searchParams;
+      });
+    },
+    [setSearchParams],
+  );
+
+  const selectView = useRecoilCallback(
+    () => async (viewId: string) => {
+      changeViewInUrl(viewId);
+      resetCurrentView();
+    },
+    [changeViewInUrl, resetCurrentView],
+  );
+
+  const updateCurrentView = useRecoilCallback(
+    ({ snapshot }) =>
+      async (view: Partial<GraphQLView>) => {
+        const currentViewId = snapshot
+          .getLoadable(currentViewIdState)
+          .getValue();
+        if (isDefined(currentViewId)) {
+          await updateOneRecord({
+            idToUpdate: currentViewId,
+            updateOneRecordInput: view,
+          });
+        }
+      },
+    [currentViewIdState, updateOneRecord],
+  );
+
+  const updateView = useRecoilCallback(
+    () => async (view: Partial<GraphQLView>) => {
+      if (isDefined(view.id)) {
+        await updateOneRecord({
+          idToUpdate: view.id,
+          updateOneRecordInput: view,
+        });
+      }
+    },
+    [updateOneRecord],
+  );
+
+  return {
+    selectView,
+    updateCurrentView,
+    updateView,
+    removeView,
+    createView,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/useInitViewBar.ts b/packages/twenty-front/src/modules/views/hooks/useInitViewBar.ts
new file mode 100644
index 000000000000..e81802846868
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/useInitViewBar.ts
@@ -0,0 +1,31 @@
+import { useSetRecoilState } from 'recoil';
+
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+
+export const useInitViewBar = (viewBarComponentId?: string) => {
+  const {
+    availableFieldDefinitionsState,
+    availableSortDefinitionsState,
+    availableFilterDefinitionsState,
+    viewObjectMetadataIdState,
+  } = useViewStates(viewBarComponentId);
+
+  const setAvailableFieldDefinitions = useSetRecoilState(
+    availableFieldDefinitionsState,
+  );
+  const setAvailableSortDefinitions = useSetRecoilState(
+    availableSortDefinitionsState,
+  );
+  const setAvailableFilterDefinitions = useSetRecoilState(
+    availableFilterDefinitionsState,
+  );
+
+  const setViewObjectMetadataId = useSetRecoilState(viewObjectMetadataIdState);
+
+  return {
+    setAvailableFieldDefinitions,
+    setAvailableSortDefinitions,
+    setAvailableFilterDefinitions,
+    setViewObjectMetadataId,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/useResetCurrentView.ts b/packages/twenty-front/src/modules/views/hooks/useResetCurrentView.ts
new file mode 100644
index 000000000000..d188580ca355
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/useResetCurrentView.ts
@@ -0,0 +1,32 @@
+import { useRecoilCallback } from 'recoil';
+
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+
+export const useResetCurrentView = (viewBarComponentId?: string) => {
+  const {
+    unsavedToDeleteViewSortIdsState,
+    unsavedToUpsertViewSortsState,
+    unsavedToDeleteViewFilterIdsState,
+    unsavedToUpsertViewFiltersState,
+  } = useViewStates(viewBarComponentId);
+
+  const resetCurrentView = useRecoilCallback(
+    ({ set }) =>
+      async () => {
+        set(unsavedToDeleteViewFilterIdsState, []);
+        set(unsavedToDeleteViewSortIdsState, []);
+        set(unsavedToUpsertViewFiltersState, []);
+        set(unsavedToUpsertViewSortsState, []);
+      },
+    [
+      unsavedToDeleteViewFilterIdsState,
+      unsavedToDeleteViewSortIdsState,
+      unsavedToUpsertViewFiltersState,
+      unsavedToUpsertViewSortsState,
+    ],
+  );
+
+  return {
+    resetCurrentView,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewFields.ts b/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewFields.ts
new file mode 100644
index 000000000000..fed1518f1f18
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewFields.ts
@@ -0,0 +1,87 @@
+import { useRecoilCallback } from 'recoil';
+
+import { usePersistViewFieldRecords } from '@/views/hooks/internal/usePersistViewFieldRecords';
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+import { useGetViewFromCache } from '@/views/hooks/useGetViewFromCache';
+import { ViewField } from '@/views/types/ViewField';
+import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+
+export const useSaveCurrentViewFields = (viewBarComponentId?: string) => {
+  const { createViewFieldRecords, updateViewFieldRecords } =
+    usePersistViewFieldRecords();
+
+  const { getViewFromCache } = useGetViewFromCache();
+
+  const { isPersistingViewFieldsState, currentViewIdState } =
+    useViewStates(viewBarComponentId);
+
+  const saveViewFields = useRecoilCallback(
+    ({ set, snapshot }) =>
+      async (fields: ViewField[]) => {
+        const currentViewId = snapshot
+          .getLoadable(currentViewIdState)
+          .getValue();
+
+        if (!currentViewId) {
+          return;
+        }
+
+        set(isPersistingViewFieldsState, true);
+        const view = await getViewFromCache(currentViewId);
+
+        if (isUndefinedOrNull(view)) {
+          return;
+        }
+
+        const viewFieldsToUpdate = fields
+          .map((field) => {
+            const existingField = view.viewFields.find(
+              (viewField) => viewField.id === field.id,
+            );
+
+            if (isUndefinedOrNull(existingField)) {
+              return undefined;
+            }
+            if (
+              isDeeplyEqual(
+                {
+                  position: existingField.position,
+                  size: existingField.size,
+                  isVisible: existingField.isVisible,
+                },
+                {
+                  position: field.position,
+                  size: field.size,
+                  isVisible: field.isVisible,
+                },
+              )
+            ) {
+              return undefined;
+            }
+            return field;
+          })
+          .filter(isDefined);
+
+        const viewFieldsToCreate = fields.filter((field) => !field.id);
+
+        await Promise.all([
+          createViewFieldRecords(viewFieldsToCreate, view),
+          updateViewFieldRecords(viewFieldsToUpdate),
+        ]);
+        set(isPersistingViewFieldsState, false);
+      },
+    [
+      createViewFieldRecords,
+      currentViewIdState,
+      getViewFromCache,
+      isPersistingViewFieldsState,
+      updateViewFieldRecords,
+    ],
+  );
+
+  return {
+    saveViewFields,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewFiltersAndSorts.ts b/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewFiltersAndSorts.ts
new file mode 100644
index 000000000000..1cfe064b05d1
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewFiltersAndSorts.ts
@@ -0,0 +1,147 @@
+import { useRecoilCallback } from 'recoil';
+
+import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
+import { usePersistViewFilterRecords } from '@/views/hooks/internal/usePersistViewFilterRecords';
+import { usePersistViewSortRecords } from '@/views/hooks/internal/usePersistViewSortRecords';
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+import { useGetViewFromCache } from '@/views/hooks/useGetViewFromCache';
+import { useResetCurrentView } from '@/views/hooks/useResetCurrentView';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+
+export const useSaveCurrentViewFiltersAndSorts = (
+  viewBarComponentId?: string,
+) => {
+  const { getViewFromCache } = useGetViewFromCache();
+
+  const {
+    unsavedToDeleteViewSortIdsState,
+    unsavedToUpsertViewSortsState,
+    unsavedToDeleteViewFilterIdsState,
+    unsavedToUpsertViewFiltersState,
+    currentViewIdState,
+  } = useViewStates(viewBarComponentId);
+
+  const {
+    createViewSortRecords,
+    updateViewSortRecords,
+    deleteViewSortRecords,
+  } = usePersistViewSortRecords();
+
+  const {
+    createViewFilterRecords,
+    updateViewFilterRecords,
+    deleteViewFilterRecords,
+  } = usePersistViewFilterRecords();
+
+  const { resetCurrentView } = useResetCurrentView(viewBarComponentId);
+
+  const saveViewSorts = useRecoilCallback(
+    ({ snapshot }) =>
+      async (viewId: string) => {
+        const unsavedToDeleteViewSortIds = getSnapshotValue(
+          snapshot,
+          unsavedToDeleteViewSortIdsState,
+        );
+
+        const unsavedToUpsertViewSorts = getSnapshotValue(
+          snapshot,
+          unsavedToUpsertViewSortsState,
+        );
+
+        const view = await getViewFromCache(viewId);
+
+        if (isUndefinedOrNull(view)) {
+          return;
+        }
+
+        const viewSortsToCreate = unsavedToUpsertViewSorts.filter(
+          (viewSort) =>
+            !view.viewSorts.some(
+              (vf) => vf.fieldMetadataId === viewSort.fieldMetadataId,
+            ),
+        );
+
+        const viewSortsToUpdate = unsavedToUpsertViewSorts.filter((viewSort) =>
+          view.viewSorts.some((vf) => vf.id === viewSort.id),
+        );
+
+        await createViewSortRecords(viewSortsToCreate, view);
+        await updateViewSortRecords(viewSortsToUpdate);
+        await deleteViewSortRecords(unsavedToDeleteViewSortIds);
+      },
+    [
+      createViewSortRecords,
+      deleteViewSortRecords,
+      getViewFromCache,
+      unsavedToDeleteViewSortIdsState,
+      unsavedToUpsertViewSortsState,
+      updateViewSortRecords,
+    ],
+  );
+
+  const saveViewFilters = useRecoilCallback(
+    ({ snapshot }) =>
+      async (viewId: string) => {
+        const unsavedToDeleteViewFilterIds = getSnapshotValue(
+          snapshot,
+          unsavedToDeleteViewFilterIdsState,
+        );
+
+        const unsavedToUpsertViewFilters = getSnapshotValue(
+          snapshot,
+          unsavedToUpsertViewFiltersState,
+        );
+
+        const view = await getViewFromCache(viewId);
+
+        if (isUndefinedOrNull(view)) {
+          return;
+        }
+
+        const viewFiltersToCreate = unsavedToUpsertViewFilters.filter(
+          (viewFilter) =>
+            !view.viewFilters.some((vf) => vf.id === viewFilter.id),
+        );
+
+        const viewFiltersToUpdate = unsavedToUpsertViewFilters.filter(
+          (viewFilter) =>
+            view.viewFilters.some((vf) => vf.id === viewFilter.id),
+        );
+
+        await createViewFilterRecords(viewFiltersToCreate, view);
+        await updateViewFilterRecords(viewFiltersToUpdate);
+        await deleteViewFilterRecords(unsavedToDeleteViewFilterIds);
+      },
+    [
+      createViewFilterRecords,
+      deleteViewFilterRecords,
+      getViewFromCache,
+      unsavedToDeleteViewFilterIdsState,
+      unsavedToUpsertViewFiltersState,
+      updateViewFilterRecords,
+    ],
+  );
+
+  const saveCurrentViewFilterAndSorts = useRecoilCallback(
+    ({ snapshot }) =>
+      async (viewId?: string) => {
+        const currentViewId = snapshot
+          .getLoadable(currentViewIdState)
+          .getValue();
+
+        if (!isDefined(currentViewId)) {
+          return;
+        }
+
+        await saveViewFilters(viewId ?? currentViewId);
+        await saveViewSorts(viewId ?? currentViewId);
+        resetCurrentView();
+      },
+    [currentViewIdState, resetCurrentView, saveViewFilters, saveViewSorts],
+  );
+
+  return {
+    saveCurrentViewFilterAndSorts,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/useSetRecordCountInCurrentView.ts b/packages/twenty-front/src/modules/views/hooks/useSetRecordCountInCurrentView.ts
new file mode 100644
index 000000000000..8deeece5a1a5
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/useSetRecordCountInCurrentView.ts
@@ -0,0 +1,15 @@
+import { useSetRecoilState } from 'recoil';
+
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+
+export const useSetRecordCountInCurrentView = (viewBarComponentId?: string) => {
+  const { entityCountInCurrentViewState } = useViewStates(viewBarComponentId);
+
+  const setEntityCountInCurrentView = useSetRecoilState(
+    entityCountInCurrentViewState,
+  );
+
+  return {
+    setRecordCountInCurrentView: setEntityCountInCurrentView,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/useViewBar.ts b/packages/twenty-front/src/modules/views/hooks/useViewBar.ts
deleted file mode 100644
index 358dcfa3c0c6..000000000000
--- a/packages/twenty-front/src/modules/views/hooks/useViewBar.ts
+++ /dev/null
@@ -1,439 +0,0 @@
-import { useCallback } from 'react';
-import { useSearchParams } from 'react-router-dom';
-import { useRecoilCallback, useRecoilState, useSetRecoilState } from 'recoil';
-import { v4 } from 'uuid';
-
-import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
-import { ViewField } from '@/views/types/ViewField';
-import { ViewFilter } from '@/views/types/ViewFilter';
-import { ViewSort } from '@/views/types/ViewSort';
-import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
-import { isNonNullable } from '~/utils/isNonNullable';
-
-import { ViewScopeInternalContext } from '../scopes/scope-internal-context/ViewScopeInternalContext';
-import { currentViewFieldsScopedFamilyState } from '../states/currentViewFieldsScopedFamilyState';
-import { currentViewFiltersScopedFamilyState } from '../states/currentViewFiltersScopedFamilyState';
-import { currentViewSortsScopedFamilyState } from '../states/currentViewSortsScopedFamilyState';
-import { getViewScopedStatesFromSnapshot } from '../utils/getViewScopedStatesFromSnapshot';
-import { getViewScopedStateValuesFromSnapshot } from '../utils/getViewScopedStateValuesFromSnapshot';
-
-import { useViewFields } from './internal/useViewFields';
-import { useViewFilters } from './internal/useViewFilters';
-import { useViews } from './internal/useViews';
-import { useViewScopedStates } from './internal/useViewScopedStates';
-import { useViewSorts } from './internal/useViewSorts';
-
-type UseViewProps = {
-  viewBarId?: string;
-};
-
-export const useViewBar = (props?: UseViewProps) => {
-  const scopeId = useAvailableScopeIdOrThrow(
-    ViewScopeInternalContext,
-    props?.viewBarId,
-  );
-
-  const {
-    currentViewFiltersState,
-    currentViewIdState,
-    currentViewSortsState,
-    viewEditModeState,
-    availableFieldDefinitionsState,
-    availableFilterDefinitionsState,
-    availableSortDefinitionsState,
-    entityCountInCurrentViewState,
-    viewObjectMetadataIdState,
-  } = useViewScopedStates({
-    viewScopeId: scopeId,
-  });
-
-  const { persistViewSorts, upsertViewSort, removeViewSort } =
-    useViewSorts(scopeId);
-  const { persistViewFilters, upsertViewFilter, removeViewFilter } =
-    useViewFilters(scopeId);
-  const { persistViewFields } = useViewFields(scopeId);
-  const {
-    createView: internalCreateView,
-    updateView: internalUpdateView,
-    deleteView: internalDeleteView,
-  } = useViews(scopeId);
-
-  const [currentViewId, setCurrentViewId] = useRecoilState(currentViewIdState);
-
-  const setAvailableFieldDefinitions = useSetRecoilState(
-    availableFieldDefinitionsState,
-  );
-
-  const setAvailableSortDefinitions = useSetRecoilState(
-    availableSortDefinitionsState,
-  );
-
-  const setAvailableFilterDefinitions = useSetRecoilState(
-    availableFilterDefinitionsState,
-  );
-
-  const setEntityCountInCurrentView = useSetRecoilState(
-    entityCountInCurrentViewState,
-  );
-
-  const setViewEditMode = useSetRecoilState(viewEditModeState);
-  const setViewObjectMetadataId = useSetRecoilState(viewObjectMetadataIdState);
-
-  const [_, setSearchParams] = useSearchParams();
-
-  const changeViewInUrl = useCallback(
-    (viewId: string) => {
-      setSearchParams((previousSearchParams) => {
-        previousSearchParams.set('view', viewId);
-        return previousSearchParams;
-      });
-    },
-    [setSearchParams],
-  );
-
-  const loadViewFields = useRecoilCallback(
-    ({ snapshot, set }) =>
-      async (viewFields: ViewField[], currentViewId: string) => {
-        const {
-          availableFieldDefinitions,
-          onViewFieldsChange,
-          savedViewFields,
-          isPersistingView,
-        } = getViewScopedStateValuesFromSnapshot({
-          snapshot,
-          viewScopeId: scopeId,
-          viewId: currentViewId,
-        });
-
-        const { savedViewFieldsState, currentViewFieldsState } =
-          getViewScopedStatesFromSnapshot({
-            snapshot,
-            viewScopeId: scopeId,
-            viewId: currentViewId,
-          });
-
-        if (!availableFieldDefinitions) {
-          return;
-        }
-
-        const queriedViewFields = viewFields.filter(isNonNullable);
-
-        if (isPersistingView) {
-          return;
-        }
-
-        if (!isDeeplyEqual(savedViewFields, queriedViewFields)) {
-          set(currentViewFieldsState, queriedViewFields);
-          set(savedViewFieldsState, queriedViewFields);
-        }
-
-        onViewFieldsChange?.(queriedViewFields);
-      },
-    [scopeId],
-  );
-
-  const loadViewFilters = useRecoilCallback(
-    ({ snapshot, set }) =>
-      async (viewFilters: ViewFilter[], currentViewId: string) => {
-        const {
-          availableFilterDefinitions,
-          savedViewFilters,
-          onViewFiltersChange,
-        } = getViewScopedStateValuesFromSnapshot({
-          snapshot,
-          viewScopeId: scopeId,
-          viewId: currentViewId,
-        });
-
-        const { savedViewFiltersState, currentViewFiltersState } =
-          getViewScopedStatesFromSnapshot({
-            snapshot,
-            viewScopeId: scopeId,
-            viewId: currentViewId,
-          });
-
-        if (!availableFilterDefinitions) {
-          return;
-        }
-
-        const queriedViewFilters = viewFilters
-          .map((viewFilter) => {
-            const availableFilterDefinition = availableFilterDefinitions.find(
-              (filterDefinition) =>
-                filterDefinition.fieldMetadataId === viewFilter.fieldMetadataId,
-            );
-
-            if (!availableFilterDefinition) return null;
-
-            return {
-              ...viewFilter,
-              displayValue: viewFilter.displayValue ?? viewFilter.value,
-              definition: availableFilterDefinition,
-            };
-          })
-          .filter(isNonNullable);
-
-        if (!isDeeplyEqual(savedViewFilters, queriedViewFilters)) {
-          set(savedViewFiltersState, queriedViewFilters);
-          set(currentViewFiltersState, queriedViewFilters);
-        }
-        onViewFiltersChange?.(queriedViewFilters);
-      },
-    [scopeId],
-  );
-
-  const loadViewSorts = useRecoilCallback(
-    ({ snapshot, set }) =>
-      async (viewSorts: Required<ViewSort>[], currentViewId: string) => {
-        const { availableSortDefinitions, savedViewSorts, onViewSortsChange } =
-          getViewScopedStateValuesFromSnapshot({
-            snapshot,
-            viewScopeId: scopeId,
-            viewId: currentViewId,
-          });
-
-        const { savedViewSortsState, currentViewSortsState } =
-          getViewScopedStatesFromSnapshot({
-            snapshot,
-            viewScopeId: scopeId,
-            viewId: currentViewId,
-          });
-
-        if (!availableSortDefinitions || !currentViewId) {
-          return;
-        }
-
-        const queriedViewSorts = viewSorts
-          .map((viewSort) => {
-            const availableSortDefinition = availableSortDefinitions.find(
-              (sort) => sort.fieldMetadataId === viewSort.fieldMetadataId,
-            );
-
-            if (!availableSortDefinition) return null;
-
-            return {
-              id: viewSort.id,
-              fieldMetadataId: viewSort.fieldMetadataId,
-              direction: viewSort.direction,
-              definition: availableSortDefinition,
-            };
-          })
-          .filter(isNonNullable);
-
-        if (!isDeeplyEqual(savedViewSorts, queriedViewSorts)) {
-          set(savedViewSortsState, queriedViewSorts);
-          set(currentViewSortsState, queriedViewSorts);
-        }
-        onViewSortsChange?.(queriedViewSorts);
-      },
-    [scopeId],
-  );
-
-  const loadView = useRecoilCallback(
-    ({ snapshot }) =>
-      (viewId: string) => {
-        setCurrentViewId?.(viewId);
-
-        const { currentView, onViewTypeChange, onViewCompactModeChange } =
-          getViewScopedStateValuesFromSnapshot({
-            snapshot,
-            viewScopeId: scopeId,
-            viewId,
-          });
-
-        if (!currentView) {
-          return;
-        }
-
-        onViewTypeChange?.(currentView.type);
-        onViewCompactModeChange?.(currentView.isCompact);
-        loadViewFields(currentView.viewFields, viewId);
-        loadViewFilters(currentView.viewFilters, viewId);
-        loadViewSorts(currentView.viewSorts, viewId);
-      },
-    [setCurrentViewId, scopeId, loadViewFields, loadViewFilters, loadViewSorts],
-  );
-
-  const resetViewBar = useRecoilCallback(
-    ({ snapshot, set }) =>
-      () => {
-        const {
-          savedViewFilters,
-          savedViewSorts,
-          onViewFiltersChange,
-          onViewSortsChange,
-        } = getViewScopedStateValuesFromSnapshot({
-          snapshot,
-          viewScopeId: scopeId,
-        });
-
-        if (savedViewFilters) {
-          set(currentViewFiltersState, savedViewFilters);
-          onViewFiltersChange?.(savedViewFilters);
-        }
-        if (savedViewSorts) {
-          set(currentViewSortsState, savedViewSorts);
-          onViewSortsChange?.(savedViewSorts);
-        }
-
-        set(viewEditModeState, 'none');
-      },
-    [
-      currentViewFiltersState,
-      currentViewSortsState,
-      scopeId,
-      viewEditModeState,
-    ],
-  );
-
-  const createView = useRecoilCallback(
-    ({ snapshot, set }) =>
-      async (name: string) => {
-        const newViewId = v4();
-        await internalCreateView({ id: newViewId, name });
-
-        const { currentViewFields, currentViewFilters, currentViewSorts } =
-          getViewScopedStateValuesFromSnapshot({
-            snapshot,
-            viewScopeId: scopeId,
-          });
-
-        set(
-          currentViewFieldsScopedFamilyState({ scopeId, familyKey: newViewId }),
-          currentViewFields,
-        );
-
-        set(
-          currentViewFiltersScopedFamilyState({
-            scopeId,
-            familyKey: newViewId,
-          }),
-          currentViewFilters,
-        );
-
-        set(
-          currentViewSortsScopedFamilyState({
-            scopeId,
-            familyKey: newViewId,
-          }),
-          currentViewSorts,
-        );
-
-        await persistViewFields(currentViewFields, newViewId);
-        await persistViewFilters(newViewId);
-        await persistViewSorts(newViewId);
-
-        changeViewInUrl(newViewId);
-      },
-    [
-      changeViewInUrl,
-      internalCreateView,
-      persistViewFields,
-      persistViewFilters,
-      persistViewSorts,
-      scopeId,
-    ],
-  );
-
-  const updateCurrentView = async () => {
-    await persistViewFilters();
-    await persistViewSorts();
-  };
-
-  const removeView = useRecoilCallback(
-    ({ set, snapshot }) =>
-      async (viewIdToDelete: string) => {
-        const { currentViewId } = getViewScopedStateValuesFromSnapshot({
-          snapshot,
-          viewScopeId: scopeId,
-        });
-
-        const { currentViewIdState, viewsState } =
-          getViewScopedStatesFromSnapshot({
-            snapshot,
-            viewScopeId: scopeId,
-          });
-
-        if (currentViewId === viewIdToDelete) {
-          set(currentViewIdState, undefined);
-        }
-
-        set(viewsState, (previousViews) =>
-          previousViews.filter((view) => view.id !== viewIdToDelete),
-        );
-
-        internalDeleteView(viewIdToDelete);
-
-        if (currentViewId === viewIdToDelete) {
-          setSearchParams();
-        }
-      },
-    [internalDeleteView, scopeId, setSearchParams],
-  );
-
-  const handleViewNameSubmit = useRecoilCallback(
-    ({ snapshot }) =>
-      async (name?: string) => {
-        if (!name) {
-          return;
-        }
-
-        const { viewEditMode, currentView } =
-          getViewScopedStateValuesFromSnapshot({
-            snapshot,
-            viewScopeId: scopeId,
-          });
-
-        if (!currentView) {
-          return;
-        }
-
-        if (viewEditMode === 'create' && name) {
-          await createView(name);
-
-          // Temporary to force refetch
-          await internalUpdateView({
-            ...currentView,
-          });
-        } else {
-          await internalUpdateView({
-            ...currentView,
-            name,
-          });
-        }
-      },
-    [createView, internalUpdateView, scopeId],
-  );
-
-  return {
-    scopeId,
-    currentViewId,
-
-    setCurrentViewId,
-    updateCurrentView,
-    createView,
-    removeView,
-    resetViewBar,
-    handleViewNameSubmit,
-
-    setViewEditMode,
-    setViewObjectMetadataId,
-    setEntityCountInCurrentView,
-    setAvailableFieldDefinitions,
-
-    setAvailableSortDefinitions,
-    upsertViewSort,
-    removeViewSort,
-
-    setAvailableFilterDefinitions,
-    upsertViewFilter,
-    removeViewFilter,
-
-    persistViewFields,
-    changeViewInUrl,
-    loadView,
-    loadViewFields,
-    loadViewFilters,
-    loadViewSorts,
-  };
-};
diff --git a/packages/twenty-front/src/modules/views/scopes/ViewScope.tsx b/packages/twenty-front/src/modules/views/scopes/ViewScope.tsx
index 2f83a182384d..e70372fab5a8 100644
--- a/packages/twenty-front/src/modules/views/scopes/ViewScope.tsx
+++ b/packages/twenty-front/src/modules/views/scopes/ViewScope.tsx
@@ -1,10 +1,6 @@
 import { ReactNode } from 'react';
 
-import { ViewFilter } from '@/views/types/ViewFilter';
-import { ViewSort } from '@/views/types/ViewSort';
-import { ViewType } from '@/views/types/ViewType';
-
-import { ViewField } from '../types/ViewField';
+import { GraphQLView } from '@/views/types/GraphQLView';
 
 import { ViewScopeInitEffect } from './init-effect/ViewScopeInitEffect';
 import { ViewScopeInternalContext } from './scope-internal-context/ViewScopeInternalContext';
@@ -12,23 +8,13 @@ import { ViewScopeInternalContext } from './scope-internal-context/ViewScopeInte
 type ViewScopeProps = {
   children: ReactNode;
   viewScopeId: string;
-  onViewSortsChange?: (sorts: ViewSort[]) => void | Promise<void>;
-  onViewFiltersChange?: (filters: ViewFilter[]) => void | Promise<void>;
-  onViewFieldsChange?: (fields: ViewField[]) => void | Promise<void>;
-  onViewTypeChange?: (viewType: ViewType) => void | Promise<void>;
-  onViewCompactModeChange?: (
-    isCompactModeActive: boolean,
-  ) => void | Promise<void>;
+  onCurrentViewChange: (view: GraphQLView | undefined) => void | Promise<void>;
 };
 
 export const ViewScope = ({
   children,
   viewScopeId,
-  onViewSortsChange,
-  onViewFiltersChange,
-  onViewFieldsChange,
-  onViewTypeChange,
-  onViewCompactModeChange,
+  onCurrentViewChange,
 }: ViewScopeProps) => {
   return (
     <ViewScopeInternalContext.Provider
@@ -38,11 +24,7 @@ export const ViewScope = ({
     >
       <ViewScopeInitEffect
         viewScopeId={viewScopeId}
-        onViewSortsChange={onViewSortsChange}
-        onViewFiltersChange={onViewFiltersChange}
-        onViewFieldsChange={onViewFieldsChange}
-        onViewTypeChange={onViewTypeChange}
-        onViewCompactModeChange={onViewCompactModeChange}
+        onCurrentViewChange={onCurrentViewChange}
       />
       {children}
     </ViewScopeInternalContext.Provider>
diff --git a/packages/twenty-front/src/modules/views/scopes/init-effect/ViewScopeInitEffect.tsx b/packages/twenty-front/src/modules/views/scopes/init-effect/ViewScopeInitEffect.tsx
index 2452eab20d84..330c270d8fd8 100644
--- a/packages/twenty-front/src/modules/views/scopes/init-effect/ViewScopeInitEffect.tsx
+++ b/packages/twenty-front/src/modules/views/scopes/init-effect/ViewScopeInitEffect.tsx
@@ -1,64 +1,24 @@
 import { useEffect } from 'react';
 import { useSetRecoilState } from 'recoil';
 
-import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
-import { ViewField } from '@/views/types/ViewField';
-import { ViewFilter } from '@/views/types/ViewFilter';
-import { ViewSort } from '@/views/types/ViewSort';
-import { ViewType } from '@/views/types/ViewType';
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+import { GraphQLView } from '@/views/types/GraphQLView';
 
 type ViewScopeInitEffectProps = {
   viewScopeId: string;
-  onViewSortsChange?: (sorts: ViewSort[]) => void | Promise<void>;
-  onViewFiltersChange?: (filters: ViewFilter[]) => void | Promise<void>;
-  onViewFieldsChange?: (fields: ViewField[]) => void | Promise<void>;
-  onViewTypeChange?: (viewType: ViewType) => void | Promise<void>;
-  onViewCompactModeChange?: (
-    isCompactModeActive: boolean,
-  ) => void | Promise<void>;
+  onCurrentViewChange: (view: GraphQLView | undefined) => void | Promise<void>;
 };
 
 export const ViewScopeInitEffect = ({
-  onViewSortsChange,
-  onViewFiltersChange,
-  onViewFieldsChange,
-  onViewTypeChange,
-  onViewCompactModeChange,
+  onCurrentViewChange,
 }: ViewScopeInitEffectProps) => {
-  const {
-    onViewFieldsChangeState,
-    onViewFiltersChangeState,
-    onViewSortsChangeState,
-    onViewTypeChangeState,
-    onViewCompactModeChangeState,
-  } = useViewScopedStates();
+  const { onCurrentViewChangeState } = useViewStates();
 
-  const setOnViewSortsChange = useSetRecoilState(onViewSortsChangeState);
-  const setOnViewFiltersChange = useSetRecoilState(onViewFiltersChangeState);
-  const setOnViewFieldsChange = useSetRecoilState(onViewFieldsChangeState);
-  const setOnViewTypeChange = useSetRecoilState(onViewTypeChangeState);
-  const setOnViewCompactModeChange = useSetRecoilState(
-    onViewCompactModeChangeState,
-  );
+  const setOnCurrentViewChange = useSetRecoilState(onCurrentViewChangeState);
 
   useEffect(() => {
-    setOnViewSortsChange(() => onViewSortsChange);
-    setOnViewFiltersChange(() => onViewFiltersChange);
-    setOnViewFieldsChange(() => onViewFieldsChange);
-    setOnViewTypeChange(() => onViewTypeChange);
-    setOnViewCompactModeChange(() => onViewCompactModeChange);
-  }, [
-    onViewCompactModeChange,
-    onViewFieldsChange,
-    onViewFiltersChange,
-    onViewSortsChange,
-    onViewTypeChange,
-    setOnViewCompactModeChange,
-    setOnViewFieldsChange,
-    setOnViewFiltersChange,
-    setOnViewSortsChange,
-    setOnViewTypeChange,
-  ]);
+    setOnCurrentViewChange(() => onCurrentViewChange);
+  }, [onCurrentViewChange, setOnCurrentViewChange]);
 
   return <></>;
 };
diff --git a/packages/twenty-front/src/modules/views/scopes/scope-internal-context/ViewScopeInternalContext.ts b/packages/twenty-front/src/modules/views/scopes/scope-internal-context/ViewScopeInternalContext.ts
index 39dcf9684329..d9affe26c251 100644
--- a/packages/twenty-front/src/modules/views/scopes/scope-internal-context/ViewScopeInternalContext.ts
+++ b/packages/twenty-front/src/modules/views/scopes/scope-internal-context/ViewScopeInternalContext.ts
@@ -1,7 +1,7 @@
-import { StateScopeMapKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/StateScopeMapKey';
 import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
+import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey';
 
-type ViewScopeInternalContextProps = StateScopeMapKey;
+type ViewScopeInternalContextProps = ComponentStateKey;
 
 export const ViewScopeInternalContext =
   createScopeInternalContext<ViewScopeInternalContextProps>();
diff --git a/packages/twenty-front/src/modules/views/states/availableFieldDefinitionsComponentState.ts b/packages/twenty-front/src/modules/views/states/availableFieldDefinitionsComponentState.ts
new file mode 100644
index 000000000000..9f11648305d5
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/availableFieldDefinitionsComponentState.ts
@@ -0,0 +1,10 @@
+import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
+import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const availableFieldDefinitionsComponentState = createComponentState<
+  ColumnDefinition<FieldMetadata>[]
+>({
+  key: 'availableFieldDefinitionsComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/views/states/availableFieldDefinitionsScopedState.ts b/packages/twenty-front/src/modules/views/states/availableFieldDefinitionsScopedState.ts
deleted file mode 100644
index cf7744d4f162..000000000000
--- a/packages/twenty-front/src/modules/views/states/availableFieldDefinitionsScopedState.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const availableFieldDefinitionsScopedState = createStateScopeMap<
-  ColumnDefinition<FieldMetadata>[]
->({
-  key: 'availableFieldDefinitionsScopedState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/views/states/availableFilterDefinitionsComponentState.ts b/packages/twenty-front/src/modules/views/states/availableFilterDefinitionsComponentState.ts
new file mode 100644
index 000000000000..9a3f649ea491
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/availableFilterDefinitionsComponentState.ts
@@ -0,0 +1,9 @@
+import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const availableFilterDefinitionsComponentState = createComponentState<
+  FilterDefinition[]
+>({
+  key: 'availableFilterDefinitionsComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/views/states/availableFilterDefinitionsScopedState.ts b/packages/twenty-front/src/modules/views/states/availableFilterDefinitionsScopedState.ts
deleted file mode 100644
index 4ed3c9ce7778..000000000000
--- a/packages/twenty-front/src/modules/views/states/availableFilterDefinitionsScopedState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const availableFilterDefinitionsScopedState = createStateScopeMap<
-  FilterDefinition[]
->({
-  key: 'availableFilterDefinitionsScopedState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/views/states/availableSortDefinitionsComponentState.ts b/packages/twenty-front/src/modules/views/states/availableSortDefinitionsComponentState.ts
new file mode 100644
index 000000000000..9281f1d75780
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/availableSortDefinitionsComponentState.ts
@@ -0,0 +1,9 @@
+import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const availableSortDefinitionsComponentState = createComponentState<
+  SortDefinition[]
+>({
+  key: 'availableSortDefinitionsComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/views/states/availableSortDefinitionsScopedState.ts b/packages/twenty-front/src/modules/views/states/availableSortDefinitionsScopedState.ts
deleted file mode 100644
index 43912ec24294..000000000000
--- a/packages/twenty-front/src/modules/views/states/availableSortDefinitionsScopedState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const availableSortDefinitionsScopedState = createStateScopeMap<
-  SortDefinition[]
->({
-  key: 'availableSortDefinitionsScopedState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/views/states/currentViewFieldsScopedFamilyState.ts b/packages/twenty-front/src/modules/views/states/currentViewFieldsScopedFamilyState.ts
deleted file mode 100644
index 4c071e69bead..000000000000
--- a/packages/twenty-front/src/modules/views/states/currentViewFieldsScopedFamilyState.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-import { ViewField } from '../types/ViewField';
-
-export const currentViewFieldsScopedFamilyState = createFamilyStateScopeMap<
-  ViewField[],
-  string
->({
-  key: 'currentViewFieldsScopedFamilyState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/views/states/currentViewFiltersScopedFamilyState.ts b/packages/twenty-front/src/modules/views/states/currentViewFiltersScopedFamilyState.ts
deleted file mode 100644
index fa807a56ddca..000000000000
--- a/packages/twenty-front/src/modules/views/states/currentViewFiltersScopedFamilyState.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-import { ViewFilter } from '../types/ViewFilter';
-
-export const currentViewFiltersScopedFamilyState = createFamilyStateScopeMap<
-  ViewFilter[],
-  string
->({
-  key: 'currentViewFiltersScopedFamilyState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/views/states/currentViewIdComponentState.ts b/packages/twenty-front/src/modules/views/states/currentViewIdComponentState.ts
new file mode 100644
index 000000000000..799ba48005b3
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/currentViewIdComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const currentViewIdComponentState = createComponentState<
+  string | undefined
+>({
+  key: 'currentViewIdComponentState',
+  defaultValue: undefined,
+});
diff --git a/packages/twenty-front/src/modules/views/states/currentViewIdScopedState.ts b/packages/twenty-front/src/modules/views/states/currentViewIdScopedState.ts
deleted file mode 100644
index 98a46cbbd3f4..000000000000
--- a/packages/twenty-front/src/modules/views/states/currentViewIdScopedState.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const currentViewIdScopedState = createStateScopeMap<string | undefined>(
-  {
-    key: 'currentViewIdScopedState',
-    defaultValue: undefined,
-  },
-);
diff --git a/packages/twenty-front/src/modules/views/states/currentViewSortsScopedFamilyState.ts b/packages/twenty-front/src/modules/views/states/currentViewSortsScopedFamilyState.ts
deleted file mode 100644
index f12bd262636e..000000000000
--- a/packages/twenty-front/src/modules/views/states/currentViewSortsScopedFamilyState.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-import { ViewSort } from '../types/ViewSort';
-
-export const currentViewSortsScopedFamilyState = createFamilyStateScopeMap<
-  ViewSort[],
-  string
->({
-  key: 'currentViewSortsScopedFamilyState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/views/states/entityCountInCurrentViewComponentState.ts b/packages/twenty-front/src/modules/views/states/entityCountInCurrentViewComponentState.ts
new file mode 100644
index 000000000000..02a42b251b9d
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/entityCountInCurrentViewComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const entityCountInCurrentViewComponentState =
+  createComponentState<number>({
+    key: 'entityCountInCurrentViewComponentState',
+    defaultValue: 0,
+  });
diff --git a/packages/twenty-front/src/modules/views/states/entityCountInCurrentViewScopedState.ts b/packages/twenty-front/src/modules/views/states/entityCountInCurrentViewScopedState.ts
deleted file mode 100644
index 6bea66a6d0d3..000000000000
--- a/packages/twenty-front/src/modules/views/states/entityCountInCurrentViewScopedState.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const entityCountInCurrentViewScopedState = createStateScopeMap<number>({
-  key: 'entityCountInCurrentViewScopedState',
-  defaultValue: 0,
-});
diff --git a/packages/twenty-front/src/modules/views/states/isCurrentViewIndexComponentState.ts b/packages/twenty-front/src/modules/views/states/isCurrentViewIndexComponentState.ts
new file mode 100644
index 000000000000..ee3252d3680d
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/isCurrentViewIndexComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const isCurrentViewKeyIndexComponentState =
+  createComponentState<boolean>({
+    key: 'isCurrentViewKeyIndexComponentState',
+    defaultValue: true,
+  });
diff --git a/packages/twenty-front/src/modules/views/states/isPersistingViewFieldsComponentState.ts b/packages/twenty-front/src/modules/views/states/isPersistingViewFieldsComponentState.ts
new file mode 100644
index 000000000000..60cfdd2c0562
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/isPersistingViewFieldsComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const isPersistingViewFieldsComponentState =
+  createComponentState<boolean>({
+    key: 'isPersistingViewFieldsComponentState',
+    defaultValue: false,
+  });
diff --git a/packages/twenty-front/src/modules/views/states/isPersistingViewScopedState.ts b/packages/twenty-front/src/modules/views/states/isPersistingViewScopedState.ts
deleted file mode 100644
index 24b11da0ce2f..000000000000
--- a/packages/twenty-front/src/modules/views/states/isPersistingViewScopedState.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const isPersistingViewScopedState = createStateScopeMap<boolean>({
-  key: 'isPersistingViewScopedState',
-  defaultValue: false,
-});
diff --git a/packages/twenty-front/src/modules/views/states/isViewBarExpandedComponentState.ts b/packages/twenty-front/src/modules/views/states/isViewBarExpandedComponentState.ts
new file mode 100644
index 000000000000..9742ce77e350
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/isViewBarExpandedComponentState.ts
@@ -0,0 +1,6 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const isViewBarExpandedComponentState = createComponentState<boolean>({
+  key: 'isViewBarExpandedComponentState',
+  defaultValue: true,
+});
diff --git a/packages/twenty-front/src/modules/views/states/isViewBarExpandedScopedState.ts b/packages/twenty-front/src/modules/views/states/isViewBarExpandedScopedState.ts
deleted file mode 100644
index acd1a312ea1d..000000000000
--- a/packages/twenty-front/src/modules/views/states/isViewBarExpandedScopedState.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const isViewBarExpandedScopedState = createStateScopeMap<boolean>({
-  key: 'isViewBarExpandedScopedState',
-  defaultValue: true,
-});
diff --git a/packages/twenty-front/src/modules/views/states/noneScopedFamilyState.ts b/packages/twenty-front/src/modules/views/states/noneScopedFamilyState.ts
deleted file mode 100644
index 0c318836ddbf..000000000000
--- a/packages/twenty-front/src/modules/views/states/noneScopedFamilyState.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-export const noneScopedFamilyState = createFamilyStateScopeMap<any, string>({
-  key: 'noneScopedFamilyState',
-  defaultValue: null,
-});
diff --git a/packages/twenty-front/src/modules/views/states/onCurrentViewChangeComponentState.ts b/packages/twenty-front/src/modules/views/states/onCurrentViewChangeComponentState.ts
new file mode 100644
index 000000000000..085eb03682a8
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/onCurrentViewChangeComponentState.ts
@@ -0,0 +1,9 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { View } from '@/views/types/View';
+
+export const onCurrentViewChangeComponentState = createComponentState<
+  ((view: View | undefined) => void | Promise<void>) | undefined
+>({
+  key: 'onCurrentViewChangeComponentState',
+  defaultValue: undefined,
+});
diff --git a/packages/twenty-front/src/modules/views/states/onViewCompactModeChangeScopeState.ts b/packages/twenty-front/src/modules/views/states/onViewCompactModeChangeScopeState.ts
deleted file mode 100644
index c1e18cbaad7a..000000000000
--- a/packages/twenty-front/src/modules/views/states/onViewCompactModeChangeScopeState.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const onViewCompactModeChangeScopeState = createStateScopeMap<
-  ((isCompactModeActive: boolean) => void | Promise<void>) | undefined
->({
-  key: 'onViewCompactModeChangeScopeState',
-  defaultValue: undefined,
-});
diff --git a/packages/twenty-front/src/modules/views/states/onViewFieldsChangeScopedState.ts b/packages/twenty-front/src/modules/views/states/onViewFieldsChangeScopedState.ts
deleted file mode 100644
index baed107d650d..000000000000
--- a/packages/twenty-front/src/modules/views/states/onViewFieldsChangeScopedState.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { ViewField } from '../types/ViewField';
-
-export const onViewFieldsChangeScopedState = createStateScopeMap<
-  ((fields: ViewField[]) => void | Promise<void>) | undefined
->({
-  key: 'onViewFieldsChangeScopedState',
-  defaultValue: undefined,
-});
diff --git a/packages/twenty-front/src/modules/views/states/onViewFiltersChangeScopedState.ts b/packages/twenty-front/src/modules/views/states/onViewFiltersChangeScopedState.ts
deleted file mode 100644
index a2abce59f208..000000000000
--- a/packages/twenty-front/src/modules/views/states/onViewFiltersChangeScopedState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-import { ViewFilter } from '@/views/types/ViewFilter';
-
-export const onViewFiltersChangeScopedState = createStateScopeMap<
-  ((filters: ViewFilter[]) => void | Promise<void>) | undefined
->({
-  key: 'onViewFiltersChangeScopedState',
-  defaultValue: undefined,
-});
diff --git a/packages/twenty-front/src/modules/views/states/onViewSortsChangeScopedState.ts b/packages/twenty-front/src/modules/views/states/onViewSortsChangeScopedState.ts
deleted file mode 100644
index d72a0dfa98b2..000000000000
--- a/packages/twenty-front/src/modules/views/states/onViewSortsChangeScopedState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-import { ViewSort } from '@/views/types/ViewSort';
-
-export const onViewSortsChangeScopedState = createStateScopeMap<
-  ((sorts: ViewSort[]) => void | Promise<void>) | undefined
->({
-  key: 'onViewSortsChangeScopedState',
-  defaultValue: undefined,
-});
diff --git a/packages/twenty-front/src/modules/views/states/onViewTypeChangeScopedState.ts b/packages/twenty-front/src/modules/views/states/onViewTypeChangeScopedState.ts
deleted file mode 100644
index cc40b91ffe96..000000000000
--- a/packages/twenty-front/src/modules/views/states/onViewTypeChangeScopedState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-import { ViewType } from '@/views/types/ViewType';
-
-export const onViewTypeChangeScopedState = createStateScopeMap<
-  ((viewType: ViewType) => void | Promise<void>) | undefined
->({
-  key: 'onViewTypeChangeScopedState',
-  defaultValue: undefined,
-});
diff --git a/packages/twenty-front/src/modules/views/states/savedViewFieldsScopedFamilyState.ts b/packages/twenty-front/src/modules/views/states/savedViewFieldsScopedFamilyState.ts
deleted file mode 100644
index 1610e5d6bc7f..000000000000
--- a/packages/twenty-front/src/modules/views/states/savedViewFieldsScopedFamilyState.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-import { ViewField } from '../types/ViewField';
-
-export const savedViewFieldsScopedFamilyState = createFamilyStateScopeMap<
-  ViewField[],
-  string
->({
-  key: 'savedViewFieldsScopedFamilyState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/views/states/savedViewFiltersScopedFamilyState.ts b/packages/twenty-front/src/modules/views/states/savedViewFiltersScopedFamilyState.ts
deleted file mode 100644
index 06a49096b78b..000000000000
--- a/packages/twenty-front/src/modules/views/states/savedViewFiltersScopedFamilyState.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-import { ViewFilter } from '../types/ViewFilter';
-
-export const savedViewFiltersScopedFamilyState = createFamilyStateScopeMap<
-  ViewFilter[],
-  string
->({
-  key: 'savedViewFiltersScopedFamilyState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/views/states/savedViewSortsScopedFamilyState.ts b/packages/twenty-front/src/modules/views/states/savedViewSortsScopedFamilyState.ts
deleted file mode 100644
index ea0a9811d0cf..000000000000
--- a/packages/twenty-front/src/modules/views/states/savedViewSortsScopedFamilyState.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { createFamilyStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilyStateScopeMap';
-
-import { ViewSort } from '../types/ViewSort';
-
-export const savedViewSortsScopedFamilyState = createFamilyStateScopeMap<
-  ViewSort[],
-  string
->({
-  key: 'savedViewSortsScopedFamilyState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/views/states/selectors/canPersistViewComponentSelector.ts b/packages/twenty-front/src/modules/views/states/selectors/canPersistViewComponentSelector.ts
new file mode 100644
index 000000000000..2d28c5735993
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/selectors/canPersistViewComponentSelector.ts
@@ -0,0 +1,21 @@
+import { selectorFamily } from 'recoil';
+
+import { unsavedToDeleteViewFilterIdsComponentState } from '@/views/states/unsavedToDeleteViewFilterIdsComponentState';
+import { unsavedToDeleteViewSortIdsComponentState } from '@/views/states/unsavedToDeleteViewSortIdsComponentState';
+import { unsavedToUpsertViewFiltersComponentState } from '@/views/states/unsavedToUpsertViewFiltersComponentState';
+import { unsavedToUpsertViewSortsComponentState } from '@/views/states/unsavedToUpsertViewSortsComponentState';
+
+export const canPersistViewComponentSelector = selectorFamily({
+  key: 'canPersistViewComponentSelector',
+  get:
+    ({ scopeId }: { scopeId: string }) =>
+    ({ get }) => {
+      return (
+        get(unsavedToUpsertViewFiltersComponentState({ scopeId })).length > 0 ||
+        get(unsavedToUpsertViewSortsComponentState({ scopeId })).length > 0 ||
+        get(unsavedToDeleteViewFilterIdsComponentState({ scopeId })).length >
+          0 ||
+        get(unsavedToDeleteViewSortIdsComponentState({ scopeId })).length > 0
+      );
+    },
+});
diff --git a/packages/twenty-front/src/modules/views/states/selectors/canPersistViewFiltersScopedFamilySelector.ts b/packages/twenty-front/src/modules/views/states/selectors/canPersistViewFiltersScopedFamilySelector.ts
deleted file mode 100644
index b13e6041d30d..000000000000
--- a/packages/twenty-front/src/modules/views/states/selectors/canPersistViewFiltersScopedFamilySelector.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { selectorFamily } from 'recoil';
-
-import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
-
-import { currentViewFiltersScopedFamilyState } from '../currentViewFiltersScopedFamilyState';
-import { savedViewFiltersScopedFamilyState } from '../savedViewFiltersScopedFamilyState';
-
-export const canPersistViewFiltersScopedFamilySelector = selectorFamily({
-  key: 'canPersistFiltersScopedFamilySelector',
-  get:
-    ({ viewScopeId, viewId }: { viewScopeId: string; viewId?: string }) =>
-    ({ get }) => {
-      if (!viewId) {
-        return;
-      }
-
-      return !isDeeplyEqual(
-        get(
-          savedViewFiltersScopedFamilyState({
-            scopeId: viewScopeId,
-            familyKey: viewId,
-          }),
-        ),
-        get(
-          currentViewFiltersScopedFamilyState({
-            scopeId: viewScopeId,
-            familyKey: viewId,
-          }),
-        ),
-      );
-    },
-});
diff --git a/packages/twenty-front/src/modules/views/states/selectors/canPersistViewSortsScopedFamilySelector.ts b/packages/twenty-front/src/modules/views/states/selectors/canPersistViewSortsScopedFamilySelector.ts
deleted file mode 100644
index 37020a7d1b22..000000000000
--- a/packages/twenty-front/src/modules/views/states/selectors/canPersistViewSortsScopedFamilySelector.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { selectorFamily } from 'recoil';
-
-import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
-
-import { currentViewSortsScopedFamilyState } from '../currentViewSortsScopedFamilyState';
-import { savedViewSortsScopedFamilyState } from '../savedViewSortsScopedFamilyState';
-
-export const canPersistViewSortsScopedFamilySelector = selectorFamily({
-  key: 'canPersistSortsScopedFamilySelector',
-  get:
-    ({ viewScopeId, viewId }: { viewScopeId: string; viewId?: string }) =>
-    ({ get }) => {
-      if (!viewId) {
-        return;
-      }
-      return !isDeeplyEqual(
-        get(
-          savedViewSortsScopedFamilyState({
-            scopeId: viewScopeId,
-            familyKey: viewId,
-          }),
-        ),
-        get(
-          currentViewSortsScopedFamilyState({
-            scopeId: viewScopeId,
-            familyKey: viewId,
-          }),
-        ),
-      );
-    },
-});
diff --git a/packages/twenty-front/src/modules/views/states/selectors/canResetViewComponentSelector.ts b/packages/twenty-front/src/modules/views/states/selectors/canResetViewComponentSelector.ts
new file mode 100644
index 000000000000..5ad2bd408d5c
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/selectors/canResetViewComponentSelector.ts
@@ -0,0 +1,22 @@
+import { selectorFamily } from 'recoil';
+
+import { unsavedToDeleteViewFilterIdsComponentState } from '@/views/states/unsavedToDeleteViewFilterIdsComponentState';
+import { unsavedToDeleteViewSortIdsComponentState } from '@/views/states/unsavedToDeleteViewSortIdsComponentState';
+import { unsavedToUpsertViewFiltersComponentState } from '@/views/states/unsavedToUpsertViewFiltersComponentState';
+import { unsavedToUpsertViewSortsComponentState } from '@/views/states/unsavedToUpsertViewSortsComponentState';
+
+export const canResetViewComponentSelector = selectorFamily({
+  key: 'canResetViewComponentSelector',
+  get:
+    ({ scopeId }: { scopeId: string }) =>
+    ({ get }) => {
+      return (
+        get(unsavedToUpsertViewFiltersComponentState({ scopeId })).length ===
+          0 &&
+        get(unsavedToUpsertViewSortsComponentState({ scopeId })).length === 0 &&
+        get(unsavedToDeleteViewFilterIdsComponentState({ scopeId })).length ===
+          0 &&
+        get(unsavedToDeleteViewSortIdsComponentState({ scopeId })).length === 0
+      );
+    },
+});
diff --git a/packages/twenty-front/src/modules/views/states/selectors/currentViewScopedSelector.ts b/packages/twenty-front/src/modules/views/states/selectors/currentViewScopedSelector.ts
deleted file mode 100644
index 3719da07fb80..000000000000
--- a/packages/twenty-front/src/modules/views/states/selectors/currentViewScopedSelector.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { createSelectorReadOnlyScopeMap } from '@/ui/utilities/recoil-scope/utils/createSelectorReadOnlyScopeMap';
-import { GraphQLView } from '@/views/types/GraphQLView';
-
-import { currentViewIdScopedState } from '../currentViewIdScopedState';
-
-import { viewsByIdScopedSelector } from './viewsByIdScopedSelector';
-
-export const currentViewScopedSelector = createSelectorReadOnlyScopeMap<
-  GraphQLView | undefined
->({
-  key: 'currentViewScopedSelector',
-  get:
-    ({ scopeId }: { scopeId: string }) =>
-    ({ get }) => {
-      const currentViewId = get(currentViewIdScopedState({ scopeId: scopeId }));
-
-      return currentViewId
-        ? get(viewsByIdScopedSelector(scopeId))[currentViewId]
-        : undefined;
-    },
-});
diff --git a/packages/twenty-front/src/modules/views/states/selectors/savedViewFieldByKeyScopedFamilySelector.ts b/packages/twenty-front/src/modules/views/states/selectors/savedViewFieldByKeyScopedFamilySelector.ts
deleted file mode 100644
index fc56e7fdeef9..000000000000
--- a/packages/twenty-front/src/modules/views/states/selectors/savedViewFieldByKeyScopedFamilySelector.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { selectorFamily } from 'recoil';
-
-import { ViewField } from '@/views/types/ViewField';
-
-import { savedViewFieldsScopedFamilyState } from '../savedViewFieldsScopedFamilyState';
-
-export const savedViewFieldByKeyScopedFamilySelector = selectorFamily({
-  key: 'savedViewFieldByKeyScopedFamilySelector',
-  get:
-    ({
-      viewScopeId,
-      viewId,
-    }: {
-      viewScopeId: string;
-      viewId: string | undefined;
-    }) =>
-    ({ get }) => {
-      if (viewId === undefined) {
-        return undefined;
-      }
-
-      return get(
-        savedViewFieldsScopedFamilyState({
-          scopeId: viewScopeId,
-          familyKey: viewId,
-        }),
-      ).reduce<Record<string, ViewField>>(
-        (result, column) => ({ ...result, [column.fieldMetadataId]: column }),
-        {},
-      );
-    },
-});
diff --git a/packages/twenty-front/src/modules/views/states/selectors/savedViewFiltersByKeyScopedFamilySelector.ts b/packages/twenty-front/src/modules/views/states/selectors/savedViewFiltersByKeyScopedFamilySelector.ts
deleted file mode 100644
index 235d5375f666..000000000000
--- a/packages/twenty-front/src/modules/views/states/selectors/savedViewFiltersByKeyScopedFamilySelector.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { selectorFamily } from 'recoil';
-
-import { ViewFilter } from '@/views/types/ViewFilter';
-
-import { savedViewFiltersScopedFamilyState } from '../savedViewFiltersScopedFamilyState';
-
-export const savedViewFiltersByKeyScopedFamilySelector = selectorFamily({
-  key: 'savedViewFiltersByKeyScopedFamilySelector',
-  get:
-    ({ scopeId, viewId }: { scopeId: string; viewId: string | undefined }) =>
-    ({ get }) => {
-      if (viewId === undefined) {
-        return undefined;
-      }
-      return get(
-        savedViewFiltersScopedFamilyState({
-          scopeId: scopeId,
-          familyKey: viewId,
-        }),
-      ).reduce<Record<string, ViewFilter>>(
-        (result, filter) => ({ ...result, [filter.fieldMetadataId]: filter }),
-        {},
-      );
-    },
-});
diff --git a/packages/twenty-front/src/modules/views/states/selectors/savedViewSortsByKeyScopedFamilySelector.ts b/packages/twenty-front/src/modules/views/states/selectors/savedViewSortsByKeyScopedFamilySelector.ts
deleted file mode 100644
index 2348464d40d6..000000000000
--- a/packages/twenty-front/src/modules/views/states/selectors/savedViewSortsByKeyScopedFamilySelector.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { selectorFamily } from 'recoil';
-
-import { ViewSort } from '@/views/types/ViewSort';
-
-import { savedViewSortsScopedFamilyState } from '../savedViewSortsScopedFamilyState';
-
-export const savedViewSortsByKeyScopedFamilySelector = selectorFamily({
-  key: 'savedViewSortsByKeyScopedFamilySelector',
-  get:
-    ({ scopeId, viewId }: { scopeId: string; viewId: string | undefined }) =>
-    ({ get }) => {
-      if (viewId === undefined) {
-        return undefined;
-      }
-      return get(
-        savedViewSortsScopedFamilyState({
-          scopeId: scopeId,
-          familyKey: viewId,
-        }),
-      ).reduce<Record<string, ViewSort>>(
-        (result, sort) => ({ ...result, [sort.fieldMetadataId]: sort }),
-        {},
-      );
-    },
-});
diff --git a/packages/twenty-front/src/modules/views/states/selectors/savedViewSortsFamilySelector.ts b/packages/twenty-front/src/modules/views/states/selectors/savedViewSortsFamilySelector.ts
deleted file mode 100644
index ee0a98353048..000000000000
--- a/packages/twenty-front/src/modules/views/states/selectors/savedViewSortsFamilySelector.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { selectorFamily } from 'recoil';
-
-import { savedViewSortsScopedFamilyState } from '../savedViewSortsScopedFamilyState';
-
-export const savedViewSortsFamilySelector = selectorFamily({
-  key: 'savedViewSortsFamilySelector',
-  get:
-    ({ scopeId, viewId }: { scopeId: string; viewId: string }) =>
-    ({ get }) =>
-      get(
-        savedViewSortsScopedFamilyState({
-          scopeId: scopeId,
-          familyKey: viewId,
-        }),
-      ),
-});
diff --git a/packages/twenty-front/src/modules/views/states/selectors/viewsByIdScopedSelector.ts b/packages/twenty-front/src/modules/views/states/selectors/viewsByIdScopedSelector.ts
deleted file mode 100644
index 0ec9d8919202..000000000000
--- a/packages/twenty-front/src/modules/views/states/selectors/viewsByIdScopedSelector.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { selectorFamily } from 'recoil';
-
-import { GraphQLView } from '@/views/types/GraphQLView';
-
-import { viewsScopedState } from '../viewsScopedState';
-
-export const viewsByIdScopedSelector = selectorFamily<
-  Record<string, GraphQLView>,
-  string
->({
-  key: 'viewsByIdScopedSelector',
-  get:
-    (scopeId) =>
-    ({ get }) =>
-      get(viewsScopedState({ scopeId: scopeId })).reduce<
-        Record<string, GraphQLView>
-      >((result, view) => ({ ...result, [view.id]: view }), {}),
-});
diff --git a/packages/twenty-front/src/modules/views/states/unsavedToDeleteViewFilterIdsComponentState.ts b/packages/twenty-front/src/modules/views/states/unsavedToDeleteViewFilterIdsComponentState.ts
new file mode 100644
index 000000000000..60b89afbbb1c
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/unsavedToDeleteViewFilterIdsComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const unsavedToDeleteViewFilterIdsComponentState = createComponentState<
+  string[]
+>({
+  key: 'unsavedToDeleteViewFilterIdsComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/views/states/unsavedToDeleteViewSortIdsComponentState.ts b/packages/twenty-front/src/modules/views/states/unsavedToDeleteViewSortIdsComponentState.ts
new file mode 100644
index 000000000000..bb44082bf807
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/unsavedToDeleteViewSortIdsComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const unsavedToDeleteViewSortIdsComponentState = createComponentState<
+  string[]
+>({
+  key: 'unsavedToDeleteViewSortIdsComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/views/states/unsavedToUpsertViewFiltersComponentState.ts b/packages/twenty-front/src/modules/views/states/unsavedToUpsertViewFiltersComponentState.ts
new file mode 100644
index 000000000000..108ad0847910
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/unsavedToUpsertViewFiltersComponentState.ts
@@ -0,0 +1,10 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+import { ViewFilter } from '../types/ViewFilter';
+
+export const unsavedToUpsertViewFiltersComponentState = createComponentState<
+  ViewFilter[]
+>({
+  key: 'unsavedToUpsertViewFiltersComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/views/states/unsavedToUpsertViewSortsComponentState.ts b/packages/twenty-front/src/modules/views/states/unsavedToUpsertViewSortsComponentState.ts
new file mode 100644
index 000000000000..57fa5f0b9af9
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/unsavedToUpsertViewSortsComponentState.ts
@@ -0,0 +1,10 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+import { ViewSort } from '../types/ViewSort';
+
+export const unsavedToUpsertViewSortsComponentState = createComponentState<
+  ViewSort[]
+>({
+  key: 'unsavedToUpsertViewSortsComponentState',
+  defaultValue: [],
+});
diff --git a/packages/twenty-front/src/modules/views/states/viewEditModeScopedState.ts b/packages/twenty-front/src/modules/views/states/viewEditModeScopedState.ts
deleted file mode 100644
index 5234afb9694d..000000000000
--- a/packages/twenty-front/src/modules/views/states/viewEditModeScopedState.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const viewEditModeScopedState = createStateScopeMap<
-  'none' | 'edit' | 'create'
->({
-  key: 'viewEditModeScopedState',
-  defaultValue: 'none',
-});
diff --git a/packages/twenty-front/src/modules/views/states/viewObjectMetadataIdComponentState.ts b/packages/twenty-front/src/modules/views/states/viewObjectMetadataIdComponentState.ts
new file mode 100644
index 000000000000..a20cbb9016fb
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/states/viewObjectMetadataIdComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const viewObjectMetadataIdComponentState = createComponentState<
+  string | undefined
+>({
+  key: 'viewObjectMetadataIdComponentState',
+  defaultValue: undefined,
+});
diff --git a/packages/twenty-front/src/modules/views/states/viewObjectMetadataIdScopeState.ts b/packages/twenty-front/src/modules/views/states/viewObjectMetadataIdScopeState.ts
deleted file mode 100644
index a67bc387d681..000000000000
--- a/packages/twenty-front/src/modules/views/states/viewObjectMetadataIdScopeState.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-export const viewObjectMetadataIdScopeState = createStateScopeMap<
-  string | undefined
->({
-  key: 'viewObjectMetadataIdScopeState',
-  defaultValue: undefined,
-});
diff --git a/packages/twenty-front/src/modules/views/states/viewTypeScopedState.ts b/packages/twenty-front/src/modules/views/states/viewTypeScopedState.ts
deleted file mode 100644
index 2424bc19ce0c..000000000000
--- a/packages/twenty-front/src/modules/views/states/viewTypeScopedState.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-
-import { ViewType } from '../types/ViewType';
-
-export const viewTypeScopedState = createStateScopeMap<ViewType>({
-  key: 'viewTypeScopedState',
-  defaultValue: ViewType.Table,
-});
diff --git a/packages/twenty-front/src/modules/views/states/viewsScopedState.ts b/packages/twenty-front/src/modules/views/states/viewsScopedState.ts
deleted file mode 100644
index 23c2c29b062c..000000000000
--- a/packages/twenty-front/src/modules/views/states/viewsScopedState.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStateScopeMap } from '@/ui/utilities/recoil-scope/utils/createStateScopeMap';
-import { GraphQLView } from '@/views/types/GraphQLView';
-
-export const viewsScopedState = createStateScopeMap<GraphQLView[]>({
-  key: 'viewsScopedState',
-  defaultValue: [],
-});
diff --git a/packages/twenty-front/src/modules/views/types/GraphQLView.ts b/packages/twenty-front/src/modules/views/types/GraphQLView.ts
index 2562079d8ff4..c657f83b5749 100644
--- a/packages/twenty-front/src/modules/views/types/GraphQLView.ts
+++ b/packages/twenty-front/src/modules/views/types/GraphQLView.ts
@@ -1,5 +1,6 @@
 import { ViewField } from '@/views/types/ViewField';
 import { ViewFilter } from '@/views/types/ViewFilter';
+import { ViewKey } from '@/views/types/ViewKey';
 import { ViewSort } from '@/views/types/ViewSort';
 import { ViewType } from '@/views/types/ViewType';
 
@@ -7,9 +8,13 @@ export type GraphQLView = {
   id: string;
   name: string;
   type: ViewType;
+  key: ViewKey | null;
+  kanbanFieldMetadataId: string;
   objectMetadataId: string;
   isCompact: boolean;
   viewFields: ViewField[];
   viewFilters: ViewFilter[];
   viewSorts: ViewSort[];
+  position: number;
+  icon: string;
 };
diff --git a/packages/twenty-front/src/modules/views/types/View.ts b/packages/twenty-front/src/modules/views/types/View.ts
index 7e9a043c0ff4..59c506a63cb0 100644
--- a/packages/twenty-front/src/modules/views/types/View.ts
+++ b/packages/twenty-front/src/modules/views/types/View.ts
@@ -1,8 +1,20 @@
+import { ViewField } from '@/views/types/ViewField';
+import { ViewFilter } from '@/views/types/ViewFilter';
+import { ViewKey } from '@/views/types/ViewKey';
+import { ViewSort } from '@/views/types/ViewSort';
 import { ViewType } from '@/views/types/ViewType';
 
 export type View = {
   id: string;
   name: string;
-  objectMetadataId: string;
   type: ViewType;
+  key: ViewKey | null;
+  objectMetadataId: string;
+  isCompact: boolean;
+  viewFields: ViewField[];
+  viewFilters: ViewFilter[];
+  viewSorts: ViewSort[];
+  kanbanFieldMetadataId: string;
+  position: number;
+  icon: string;
 };
diff --git a/packages/twenty-front/src/modules/views/types/ViewField.ts b/packages/twenty-front/src/modules/views/types/ViewField.ts
index 0703b00bf007..708f2b034385 100644
--- a/packages/twenty-front/src/modules/views/types/ViewField.ts
+++ b/packages/twenty-front/src/modules/views/types/ViewField.ts
@@ -1,8 +1,9 @@
-import { BoardFieldDefinition } from '@/object-record/record-board-deprecated/types/BoardFieldDefinition';
+import { RecordBoardFieldDefinition } from '@/object-record/record-board/types/RecordBoardFieldDefinition';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
 
 export type ViewField = {
+  __typename: 'ViewField';
   id: string;
   fieldMetadataId: string;
   position: number;
@@ -10,5 +11,5 @@ export type ViewField = {
   size: number;
   definition:
     | ColumnDefinition<FieldMetadata>
-    | BoardFieldDefinition<FieldMetadata>;
+    | RecordBoardFieldDefinition<FieldMetadata>;
 };
diff --git a/packages/twenty-front/src/modules/views/types/ViewFilter.ts b/packages/twenty-front/src/modules/views/types/ViewFilter.ts
index 793357ce7c47..1a21b111f071 100644
--- a/packages/twenty-front/src/modules/views/types/ViewFilter.ts
+++ b/packages/twenty-front/src/modules/views/types/ViewFilter.ts
@@ -1,12 +1,13 @@
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
-
 import { ViewFilterOperand } from './ViewFilterOperand';
 
 export type ViewFilter = {
+  __typename: 'ViewFilter';
   id: string;
   fieldMetadataId: string;
   operand: ViewFilterOperand;
   value: string;
   displayValue: string;
-  definition: FilterDefinition;
+  createdAt?: string;
+  updatedAt?: string;
+  viewId?: string;
 };
diff --git a/packages/twenty-front/src/modules/views/types/ViewKey.ts b/packages/twenty-front/src/modules/views/types/ViewKey.ts
new file mode 100644
index 000000000000..aff161965065
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/types/ViewKey.ts
@@ -0,0 +1,3 @@
+export enum ViewKey {
+  Index = 'INDEX',
+}
diff --git a/packages/twenty-front/src/modules/views/types/ViewSort.ts b/packages/twenty-front/src/modules/views/types/ViewSort.ts
index c88aaa13a5fe..67d48fc59e27 100644
--- a/packages/twenty-front/src/modules/views/types/ViewSort.ts
+++ b/packages/twenty-front/src/modules/views/types/ViewSort.ts
@@ -1,9 +1,8 @@
-import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
 import { SortDirection } from '@/object-record/object-sort-dropdown/types/SortDirection';
 
 export type ViewSort = {
+  __typename: 'ViewSort';
   id: string;
   fieldMetadataId: string;
   direction: SortDirection;
-  definition: SortDefinition;
 };
diff --git a/packages/twenty-front/src/modules/views/types/ViewsHotkeyScope.ts b/packages/twenty-front/src/modules/views/types/ViewsHotkeyScope.ts
index a3f392ce8dc9..6e68490b1344 100644
--- a/packages/twenty-front/src/modules/views/types/ViewsHotkeyScope.ts
+++ b/packages/twenty-front/src/modules/views/types/ViewsHotkeyScope.ts
@@ -1,4 +1,4 @@
 export enum ViewsHotkeyScope {
   ListDropdown = 'views-list-dropdown',
-  CreateDropdown = 'views-create-dropdown',
+  UpdateViewButtonDropdown = 'update-view-button-dropdown',
 }
diff --git a/packages/twenty-front/src/modules/companies/utils/__tests__/mapBoardFieldDefinitionsToViewFields.test.ts b/packages/twenty-front/src/modules/views/utils/__tests__/mapBoardFieldDefinitionsToViewFields.test.ts
similarity index 83%
rename from packages/twenty-front/src/modules/companies/utils/__tests__/mapBoardFieldDefinitionsToViewFields.test.ts
rename to packages/twenty-front/src/modules/views/utils/__tests__/mapBoardFieldDefinitionsToViewFields.test.ts
index b8a34352ad21..6f432e93374c 100644
--- a/packages/twenty-front/src/modules/companies/utils/__tests__/mapBoardFieldDefinitionsToViewFields.test.ts
+++ b/packages/twenty-front/src/modules/views/utils/__tests__/mapBoardFieldDefinitionsToViewFields.test.ts
@@ -1,10 +1,10 @@
-import { mapBoardFieldDefinitionsToViewFields } from '@/companies/utils/mapBoardFieldDefinitionsToViewFields';
-import { BoardFieldDefinition } from '@/object-record/record-board-deprecated/types/BoardFieldDefinition';
+import { RecordBoardFieldDefinition } from '@/object-record/record-board/types/RecordBoardFieldDefinition';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
+import { mapBoardFieldDefinitionsToViewFields } from '@/views/utils/mapBoardFieldDefinitionsToViewFields';
 
 describe('mapBoardFieldDefinitionsToViewFields', () => {
   it('should map board field definitions to view fields', () => {
-    const fieldDefinitions: BoardFieldDefinition<FieldMetadata>[] = [
+    const fieldDefinitions: RecordBoardFieldDefinition<FieldMetadata>[] = [
       {
         fieldMetadataId: 'fieldMetadataId',
         label: 'label',
diff --git a/packages/twenty-front/src/modules/views/utils/__tests__/viewMapFunctions.test.ts b/packages/twenty-front/src/modules/views/utils/__tests__/viewMapFunctions.test.ts
index 74d1f6d66fac..a1c0b58193ca 100644
--- a/packages/twenty-front/src/modules/views/utils/__tests__/viewMapFunctions.test.ts
+++ b/packages/twenty-front/src/modules/views/utils/__tests__/viewMapFunctions.test.ts
@@ -1,6 +1,5 @@
 import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
 import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
-import { BoardFieldDefinition } from '@/object-record/record-board-deprecated/types/BoardFieldDefinition';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
 import { ViewField } from '@/views/types/ViewField';
@@ -8,13 +7,12 @@ import { ViewFilter } from '@/views/types/ViewFilter';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { ViewSort } from '@/views/types/ViewSort';
 import { mapColumnDefinitionsToViewFields } from '@/views/utils/mapColumnDefinitionToViewField';
-import { mapViewFieldsToBoardFieldDefinitions } from '@/views/utils/mapViewFieldsToBoardFieldDefinitions';
 import { mapViewFieldsToColumnDefinitions } from '@/views/utils/mapViewFieldsToColumnDefinitions';
 import { mapViewFiltersToFilters } from '@/views/utils/mapViewFiltersToFilters';
 import { mapViewSortsToSorts } from '@/views/utils/mapViewSortsToSorts';
 
 const baseDefinition = {
-  fieldMetadataId: 'fieldMetadataId',
+  fieldMetadataId: '05731f68-6e7a-4903-8374-c0b6a9063482',
   label: 'label',
   iconName: 'iconName',
 };
@@ -23,20 +21,22 @@ describe('mapViewSortsToSorts', () => {
   it('should map each ViewSort object to a corresponding Sort object', () => {
     const viewSorts: ViewSort[] = [
       {
+        __typename: 'ViewSort',
         id: 'id',
-        fieldMetadataId: 'fieldMetadataId',
+        fieldMetadataId: '05731f68-6e7a-4903-8374-c0b6a9063482',
         direction: 'asc',
-        definition: baseDefinition,
       },
     ];
     const expectedSorts: Sort[] = [
       {
-        fieldMetadataId: 'fieldMetadataId',
+        fieldMetadataId: '05731f68-6e7a-4903-8374-c0b6a9063482',
         direction: 'asc',
         definition: baseDefinition,
       },
     ];
-    expect(mapViewSortsToSorts(viewSorts)).toEqual(expectedSorts);
+    expect(mapViewSortsToSorts(viewSorts, [baseDefinition])).toEqual(
+      expectedSorts,
+    );
   });
 });
 
@@ -44,20 +44,17 @@ describe('mapViewFiltersToFilters', () => {
   it('should map each ViewFilter object to a corresponding Filter object', () => {
     const viewFilters: ViewFilter[] = [
       {
+        __typename: 'ViewFilter',
         id: 'id',
-        fieldMetadataId: '1',
+        fieldMetadataId: '05731f68-6e7a-4903-8374-c0b6a9063482',
         value: 'testValue',
         displayValue: 'Test Display Value',
         operand: ViewFilterOperand.Is,
-        definition: {
-          ...baseDefinition,
-          type: 'FULL_NAME',
-        },
       },
     ];
     const expectedFilters: Filter[] = [
       {
-        fieldMetadataId: '1',
+        fieldMetadataId: '05731f68-6e7a-4903-8374-c0b6a9063482',
         value: 'testValue',
         displayValue: 'Test Display Value',
         operand: ViewFilterOperand.Is,
@@ -67,7 +64,14 @@ describe('mapViewFiltersToFilters', () => {
         },
       },
     ];
-    expect(mapViewFiltersToFilters(viewFilters)).toEqual(expectedFilters);
+    expect(
+      mapViewFiltersToFilters(viewFilters, [
+        {
+          ...baseDefinition,
+          type: 'FULL_NAME',
+        },
+      ]),
+    ).toEqual(expectedFilters);
   });
 });
 
@@ -75,6 +79,7 @@ describe('mapViewFieldsToColumnDefinitions', () => {
   it('should map visible ViewFields to ColumnDefinitions and filter out missing fieldMetadata', () => {
     const viewFields: ViewField[] = [
       {
+        __typename: 'ViewField',
         id: '1',
         fieldMetadataId: '1',
         position: 1,
@@ -94,6 +99,7 @@ describe('mapViewFieldsToColumnDefinitions', () => {
         },
       },
       {
+        __typename: 'ViewField',
         id: '2',
         fieldMetadataId: '2',
         position: 2,
@@ -113,6 +119,7 @@ describe('mapViewFieldsToColumnDefinitions', () => {
         },
       },
       {
+        __typename: 'ViewField',
         id: '3',
         fieldMetadataId: '3',
         position: 3,
@@ -192,84 +199,6 @@ describe('mapViewFieldsToColumnDefinitions', () => {
   });
 });
 
-describe('mapViewFieldsToBoardFieldDefinitions', () => {
-  it('should map visible ViewFields to BoardFieldDefinitions and filter out missing fieldMetadata', () => {
-    const viewFields = [
-      {
-        id: 1,
-        fieldMetadataId: 1,
-        position: 1,
-        isVisible: true,
-      },
-      {
-        id: 2,
-        fieldMetadataId: 2,
-        position: 2,
-        isVisible: false,
-      },
-      {
-        id: 3,
-        fieldMetadataId: 3,
-        position: 3,
-        isVisible: true,
-      },
-    ];
-
-    const fieldsMetadata = [
-      {
-        fieldMetadataId: 1,
-        label: 'Field 1',
-        metadata: {},
-        position: 1,
-        infoTooltipContent: 'Tooltip content for Field 1',
-        iconName: 'icon-field-1',
-        type: 'string',
-      },
-      {
-        fieldMetadataId: 3,
-        label: 'Field 3',
-        metadata: {},
-        position: 3,
-        infoTooltipContent: 'Tooltip for Field 3',
-        iconName: 'icon-field-3',
-        type: 'number',
-      },
-    ];
-
-    const expectedBoardFieldDefinitions = [
-      {
-        fieldMetadataId: 1,
-        label: 'Field 1',
-        metadata: {},
-        position: 1,
-        infoTooltipContent: 'Tooltip content for Field 1',
-        iconName: 'icon-field-1',
-        type: 'string',
-        isVisible: true,
-        viewFieldId: 1,
-      },
-      {
-        fieldMetadataId: 3,
-        label: 'Field 3',
-        metadata: {},
-        position: 3,
-        infoTooltipContent: 'Tooltip for Field 3',
-        iconName: 'icon-field-3',
-        type: 'number',
-        isVisible: true,
-        viewFieldId: 3,
-      },
-    ];
-
-    const actualBoardFieldDefinitions = mapViewFieldsToBoardFieldDefinitions(
-      viewFields as unknown as ViewField[],
-      fieldsMetadata as unknown as BoardFieldDefinition<FieldMetadata>[],
-    );
-
-    expect(actualBoardFieldDefinitions).toEqual(expectedBoardFieldDefinitions);
-  });
-});
-
 describe('mapColumnDefinitionsToViewFields', () => {
   it('should map ColumnDefinitions to ViewFields, setting defaults and using viewFieldId if present', () => {
     const columnDefinitions = [
@@ -289,13 +218,16 @@ describe('mapColumnDefinitionsToViewFields', () => {
 
     const expectedViewFields = [
       {
+        __typename: 'ViewField',
         id: 'custom-id-1',
         fieldMetadataId: 1,
         position: 1,
         isVisible: true,
         definition: columnDefinitions[0],
+        size: undefined,
       },
       {
+        __typename: 'ViewField',
         id: '',
         fieldMetadataId: 2,
         position: 2,
diff --git a/packages/twenty-front/src/modules/views/utils/combinedViewFilters.ts b/packages/twenty-front/src/modules/views/utils/combinedViewFilters.ts
new file mode 100644
index 000000000000..ac33a83f396c
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/utils/combinedViewFilters.ts
@@ -0,0 +1,34 @@
+import { ViewFilter } from '@/views/types/ViewFilter';
+
+export const combinedViewFilters = (
+  viewFilter: ViewFilter[],
+  toUpsertViewFilters: ViewFilter[],
+  toDeleteViewFilterIds: string[],
+): ViewFilter[] => {
+  const toCreateViewFilters = toUpsertViewFilters.filter(
+    (toUpsertViewFilter) =>
+      !viewFilter.some((viewFilter) => viewFilter.id === toUpsertViewFilter.id),
+  );
+
+  const toUpdateViewFilters = toUpsertViewFilters.filter((toUpsertViewFilter) =>
+    viewFilter.some((viewFilter) => viewFilter.id === toUpsertViewFilter.id),
+  );
+
+  const combinedViewFilters = viewFilter
+    .filter((viewFilter) => !toDeleteViewFilterIds.includes(viewFilter.id))
+    .map((viewFilter) => {
+      const toUpdateViewFilter = toUpdateViewFilters.find(
+        (toUpdateViewFilter) => toUpdateViewFilter.id === viewFilter.id,
+      );
+
+      return toUpdateViewFilter ?? viewFilter;
+    })
+    .concat(toCreateViewFilters);
+
+  return Object.values(
+    combinedViewFilters.reduce(
+      (acc, obj) => ({ ...acc, [obj.fieldMetadataId]: obj }),
+      {},
+    ),
+  );
+};
diff --git a/packages/twenty-front/src/modules/views/utils/combinedViewSorts.ts b/packages/twenty-front/src/modules/views/utils/combinedViewSorts.ts
new file mode 100644
index 000000000000..c0fad726aa99
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/utils/combinedViewSorts.ts
@@ -0,0 +1,34 @@
+import { ViewSort } from '@/views/types/ViewSort';
+
+export const combinedViewSorts = (
+  viewSort: ViewSort[],
+  toUpsertViewSorts: ViewSort[],
+  toDeleteViewSortIds: string[],
+): ViewSort[] => {
+  const toCreateViewSorts = toUpsertViewSorts.filter(
+    (toUpsertViewSort) =>
+      !viewSort.some((viewSort) => viewSort.id === toUpsertViewSort.id),
+  );
+
+  const toUpdateViewSorts = toUpsertViewSorts.filter((toUpsertViewSort) =>
+    viewSort.some((viewSort) => viewSort.id === toUpsertViewSort.id),
+  );
+
+  const combinedViewSorts = viewSort
+    .filter((viewSort) => !toDeleteViewSortIds.includes(viewSort.id))
+    .map((viewSort) => {
+      const toUpdateViewSort = toUpdateViewSorts.find(
+        (toUpdateViewSort) => toUpdateViewSort.id === viewSort.id,
+      );
+
+      return toUpdateViewSort ?? viewSort;
+    })
+    .concat(toCreateViewSorts);
+
+  return Object.values(
+    combinedViewSorts.reduce(
+      (acc, obj) => ({ ...acc, [obj.fieldMetadataId]: obj }),
+      {},
+    ),
+  );
+};
diff --git a/packages/twenty-front/src/modules/views/utils/getObjectMetadataItemViews.ts b/packages/twenty-front/src/modules/views/utils/getObjectMetadataItemViews.ts
new file mode 100644
index 000000000000..da5c5b039881
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/utils/getObjectMetadataItemViews.ts
@@ -0,0 +1,29 @@
+import { GraphQLView } from '@/views/types/GraphQLView';
+
+export const getObjectMetadataItemViews = (
+  viewObjectMetadataId: string,
+  views: GraphQLView[],
+) => {
+  const indexView = views.find(
+    (view) =>
+      view.key === 'INDEX' && view.objectMetadataId === viewObjectMetadataId,
+  );
+
+  return [
+    ...views
+      .filter((view) => view.objectMetadataId === viewObjectMetadataId)
+      .filter((view) => view.key !== 'INDEX'),
+  ]
+    .sort((a, b) => a.position - b.position)
+    .concat(indexView ? [indexView] : [])
+    .map((view) => ({
+      id: view.id,
+      name: view.name,
+      type: view.type,
+      key: view.key,
+      position: view.position,
+      objectMetadataId: view.objectMetadataId,
+      kanbanFieldMetadataId: view.kanbanFieldMetadataId,
+      icon: view.icon,
+    }));
+};
diff --git a/packages/twenty-front/src/modules/views/utils/getViewScopedStateValuesFromSnapshot.ts b/packages/twenty-front/src/modules/views/utils/getViewScopedStateValuesFromSnapshot.ts
deleted file mode 100644
index 3d7b749f0173..000000000000
--- a/packages/twenty-front/src/modules/views/utils/getViewScopedStateValuesFromSnapshot.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import { Snapshot } from 'recoil';
-
-import { getScopedStateDeprecated } from '@/ui/utilities/recoil-scope/utils/getScopedStateDeprecated';
-import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
-
-import { UNDEFINED_FAMILY_ITEM_ID } from '../constants';
-import { currentViewIdScopedState } from '../states/currentViewIdScopedState';
-
-import { getViewScopedStates } from './internal/getViewScopedStates';
-
-export const getViewScopedStateValuesFromSnapshot = ({
-  snapshot,
-  viewScopeId,
-  viewId,
-}: {
-  snapshot: Snapshot;
-  viewScopeId: string;
-  viewId?: string;
-}) => {
-  const currentViewId = getSnapshotValue(
-    snapshot,
-    getScopedStateDeprecated(currentViewIdScopedState, viewScopeId),
-  );
-
-  const familyItemId = viewId ?? currentViewId ?? UNDEFINED_FAMILY_ITEM_ID;
-
-  const {
-    availableFieldDefinitionsState,
-    availableFilterDefinitionsState,
-    availableSortDefinitionsState,
-    canPersistFiltersSelector,
-    canPersistSortsSelector,
-    currentViewFieldsState,
-    currentViewFiltersState,
-    currentViewIdState,
-    currentViewSelector,
-    currentViewSortsState,
-    entityCountInCurrentViewState,
-    isViewBarExpandedState,
-    isPersistingViewState,
-    onViewFieldsChangeState,
-    onViewFiltersChangeState,
-    onViewSortsChangeState,
-    onViewTypeChangeState,
-    onViewCompactModeChangeState,
-    savedViewFieldsByKeySelector,
-    savedViewFieldsState,
-    savedViewFiltersByKeySelector,
-    savedViewFiltersState,
-    savedViewSortsByKeySelector,
-    savedViewSortsState,
-    viewEditModeState,
-    viewObjectMetadataIdState,
-    viewTypeState,
-    viewsState,
-  } = getViewScopedStates({
-    viewScopeId,
-    viewId: familyItemId,
-  });
-
-  return {
-    availableFieldDefinitions: getSnapshotValue(
-      snapshot,
-      availableFieldDefinitionsState,
-    ),
-    availableFilterDefinitions: getSnapshotValue(
-      snapshot,
-      availableFilterDefinitionsState,
-    ),
-    availableSortDefinitions: getSnapshotValue(
-      snapshot,
-      availableSortDefinitionsState,
-    ),
-    canPersistFilters: getSnapshotValue(snapshot, canPersistFiltersSelector),
-    canPersistSorts: getSnapshotValue(snapshot, canPersistSortsSelector),
-    currentViewFields: getSnapshotValue(snapshot, currentViewFieldsState),
-    currentViewFilters: getSnapshotValue(snapshot, currentViewFiltersState),
-    currentViewId: getSnapshotValue(snapshot, currentViewIdState),
-    currentView: getSnapshotValue(snapshot, currentViewSelector),
-    currentViewSorts: getSnapshotValue(snapshot, currentViewSortsState),
-    entityCountInCurrentView: getSnapshotValue(
-      snapshot,
-      entityCountInCurrentViewState,
-    ),
-    isViewBarExpanded: getSnapshotValue(snapshot, isViewBarExpandedState),
-    isPersistingView: getSnapshotValue(snapshot, isPersistingViewState),
-    onViewFieldsChange: getSnapshotValue(snapshot, onViewFieldsChangeState),
-    onViewFiltersChange: getSnapshotValue(snapshot, onViewFiltersChangeState),
-    onViewSortsChange: getSnapshotValue(snapshot, onViewSortsChangeState),
-    onViewTypeChange: getSnapshotValue(snapshot, onViewTypeChangeState),
-    onViewCompactModeChange: getSnapshotValue(
-      snapshot,
-      onViewCompactModeChangeState,
-    ),
-    savedViewFieldsByKey: getSnapshotValue(
-      snapshot,
-      savedViewFieldsByKeySelector,
-    ),
-    savedViewFields: getSnapshotValue(snapshot, savedViewFieldsState),
-    savedViewFiltersByKey: getSnapshotValue(
-      snapshot,
-      savedViewFiltersByKeySelector,
-    ),
-    savedViewFilters: getSnapshotValue(snapshot, savedViewFiltersState),
-    savedViewSortsByKey: getSnapshotValue(
-      snapshot,
-      savedViewSortsByKeySelector,
-    ),
-    savedViewSorts: getSnapshotValue(snapshot, savedViewSortsState),
-    viewEditMode: getSnapshotValue(snapshot, viewEditModeState),
-    viewObjectMetadataId: getSnapshotValue(snapshot, viewObjectMetadataIdState),
-    viewType: getSnapshotValue(snapshot, viewTypeState),
-    views: getSnapshotValue(snapshot, viewsState),
-  };
-};
diff --git a/packages/twenty-front/src/modules/views/utils/getViewScopedStatesFromSnapshot.ts b/packages/twenty-front/src/modules/views/utils/getViewScopedStatesFromSnapshot.ts
deleted file mode 100644
index b6b9f0ea5ad8..000000000000
--- a/packages/twenty-front/src/modules/views/utils/getViewScopedStatesFromSnapshot.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { Snapshot } from 'recoil';
-
-import { getScopedStateDeprecated } from '@/ui/utilities/recoil-scope/utils/getScopedStateDeprecated';
-import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
-
-import { UNDEFINED_FAMILY_ITEM_ID } from '../constants';
-import { currentViewIdScopedState } from '../states/currentViewIdScopedState';
-
-import { getViewScopedStates } from './internal/getViewScopedStates';
-
-export const getViewScopedStatesFromSnapshot = ({
-  snapshot,
-  viewScopeId,
-  viewId,
-}: {
-  snapshot: Snapshot;
-  viewScopeId: string;
-  viewId?: string;
-}) => {
-  const currentViewId = getSnapshotValue(
-    snapshot,
-    getScopedStateDeprecated(currentViewIdScopedState, viewScopeId),
-  );
-
-  const usedViewId = viewId ?? currentViewId ?? UNDEFINED_FAMILY_ITEM_ID;
-
-  const {
-    availableFieldDefinitionsState,
-    availableFilterDefinitionsState,
-    availableSortDefinitionsState,
-    canPersistFiltersSelector,
-    canPersistSortsSelector,
-    currentViewFieldsState,
-    currentViewFiltersState,
-    currentViewIdState,
-    currentViewSelector,
-    currentViewSortsState,
-    entityCountInCurrentViewState,
-    isViewBarExpandedState,
-    isPersistingViewState,
-    onViewFieldsChangeState,
-    onViewFiltersChangeState,
-    onViewSortsChangeState,
-    savedViewFieldsByKeySelector,
-    savedViewFieldsState,
-    savedViewFiltersByKeySelector,
-    savedViewFiltersState,
-    savedViewSortsByKeySelector,
-    savedViewSortsState,
-    viewEditModeState,
-    viewObjectMetadataIdState,
-    viewTypeState,
-    viewsState,
-  } = getViewScopedStates({
-    viewScopeId,
-    viewId: usedViewId,
-  });
-
-  return {
-    availableFieldDefinitionsState,
-    availableFilterDefinitionsState,
-    availableSortDefinitionsState,
-    canPersistFiltersReadOnlyState: canPersistFiltersSelector,
-    canPersistSortsReadOnlyState: canPersistSortsSelector,
-    currentViewFieldsState,
-    currentViewFiltersState,
-    currentViewIdState,
-    currentViewSelector,
-    currentViewSortsState,
-    entityCountInCurrentViewState,
-    isViewBarExpandedState,
-    isPersistingViewState,
-    onViewFieldsChangeState,
-    onViewFiltersChangeState,
-    onViewSortsChangeState,
-    savedViewFieldsByKeyReadOnlyState: savedViewFieldsByKeySelector,
-    savedViewFieldsState,
-    savedViewFiltersByKeyReadOnlyState: savedViewFiltersByKeySelector,
-    savedViewFiltersState,
-    savedViewSortsByKeyReadOnlyState: savedViewSortsByKeySelector,
-    savedViewSortsState,
-    viewEditModeState,
-    viewObjectMetadataIdState,
-    viewTypeState,
-    viewsState,
-  };
-};
diff --git a/packages/twenty-front/src/modules/views/utils/internal/getViewScopedStates.ts b/packages/twenty-front/src/modules/views/utils/internal/getViewScopedStates.ts
deleted file mode 100644
index eb47990c9528..000000000000
--- a/packages/twenty-front/src/modules/views/utils/internal/getViewScopedStates.ts
+++ /dev/null
@@ -1,225 +0,0 @@
-import { getScopedFamilyStateDeprecated } from '@/ui/utilities/recoil-scope/utils/getScopedFamilyStateDeprecated';
-import { getScopedSelectorDeprecated } from '@/ui/utilities/recoil-scope/utils/getScopedSelectorDeprecated';
-import { getScopedStateDeprecated } from '@/ui/utilities/recoil-scope/utils/getScopedStateDeprecated';
-import { currentViewIdScopedState } from '@/views/states/currentViewIdScopedState';
-import { isPersistingViewScopedState } from '@/views/states/isPersistingViewScopedState';
-import { onViewCompactModeChangeScopeState } from '@/views/states/onViewCompactModeChangeScopeState';
-import { onViewTypeChangeScopedState } from '@/views/states/onViewTypeChangeScopedState';
-import { currentViewScopedSelector } from '@/views/states/selectors/currentViewScopedSelector';
-
-import { availableFieldDefinitionsScopedState } from '../../states/availableFieldDefinitionsScopedState';
-import { availableFilterDefinitionsScopedState } from '../../states/availableFilterDefinitionsScopedState';
-import { availableSortDefinitionsScopedState } from '../../states/availableSortDefinitionsScopedState';
-import { currentViewFieldsScopedFamilyState } from '../../states/currentViewFieldsScopedFamilyState';
-import { currentViewFiltersScopedFamilyState } from '../../states/currentViewFiltersScopedFamilyState';
-import { currentViewSortsScopedFamilyState } from '../../states/currentViewSortsScopedFamilyState';
-import { entityCountInCurrentViewScopedState } from '../../states/entityCountInCurrentViewScopedState';
-import { isViewBarExpandedScopedState } from '../../states/isViewBarExpandedScopedState';
-import { onViewFieldsChangeScopedState } from '../../states/onViewFieldsChangeScopedState';
-import { onViewFiltersChangeScopedState } from '../../states/onViewFiltersChangeScopedState';
-import { onViewSortsChangeScopedState } from '../../states/onViewSortsChangeScopedState';
-import { savedViewFieldsScopedFamilyState } from '../../states/savedViewFieldsScopedFamilyState';
-import { savedViewFiltersScopedFamilyState } from '../../states/savedViewFiltersScopedFamilyState';
-import { savedViewSortsScopedFamilyState } from '../../states/savedViewSortsScopedFamilyState';
-import { canPersistViewFiltersScopedFamilySelector } from '../../states/selectors/canPersistViewFiltersScopedFamilySelector';
-import { canPersistViewSortsScopedFamilySelector } from '../../states/selectors/canPersistViewSortsScopedFamilySelector';
-import { savedViewFieldByKeyScopedFamilySelector } from '../../states/selectors/savedViewFieldByKeyScopedFamilySelector';
-import { savedViewFiltersByKeyScopedFamilySelector } from '../../states/selectors/savedViewFiltersByKeyScopedFamilySelector';
-import { savedViewSortsByKeyScopedFamilySelector } from '../../states/selectors/savedViewSortsByKeyScopedFamilySelector';
-import { viewEditModeScopedState } from '../../states/viewEditModeScopedState';
-import { viewObjectMetadataIdScopeState } from '../../states/viewObjectMetadataIdScopeState';
-import { viewsScopedState } from '../../states/viewsScopedState';
-import { viewTypeScopedState } from '../../states/viewTypeScopedState';
-
-export const getViewScopedStates = ({
-  viewScopeId,
-  viewId,
-}: {
-  viewScopeId: string;
-  viewId: string;
-}) => {
-  const viewEditModeState = getScopedStateDeprecated(
-    viewEditModeScopedState,
-    viewScopeId,
-  );
-
-  const viewsState = getScopedStateDeprecated(viewsScopedState, viewScopeId);
-
-  const viewObjectMetadataIdState = getScopedStateDeprecated(
-    viewObjectMetadataIdScopeState,
-    viewScopeId,
-  );
-
-  const viewTypeState = getScopedStateDeprecated(
-    viewTypeScopedState,
-    viewScopeId,
-  );
-
-  const entityCountInCurrentViewState = getScopedStateDeprecated(
-    entityCountInCurrentViewScopedState,
-    viewScopeId,
-  );
-
-  const isViewBarExpandedState = getScopedStateDeprecated(
-    isViewBarExpandedScopedState,
-    viewScopeId,
-  );
-
-  const isPersistingViewState = getScopedStateDeprecated(
-    isPersistingViewScopedState,
-    viewScopeId,
-  );
-
-  // ViewSorts
-  const currentViewSortsState = getScopedFamilyStateDeprecated(
-    currentViewSortsScopedFamilyState,
-    viewScopeId,
-    viewId,
-  );
-
-  const savedViewSortsState = getScopedFamilyStateDeprecated(
-    savedViewSortsScopedFamilyState,
-    viewScopeId,
-    viewId,
-  );
-
-  const savedViewSortsByKeySelector = savedViewSortsByKeyScopedFamilySelector({
-    scopeId: viewScopeId,
-    viewId: viewId,
-  });
-
-  const availableSortDefinitionsState = getScopedStateDeprecated(
-    availableSortDefinitionsScopedState,
-    viewScopeId,
-  );
-
-  const canPersistSortsSelector = canPersistViewSortsScopedFamilySelector({
-    viewScopeId: viewScopeId,
-    viewId: viewId,
-  });
-
-  // ViewFilters
-  const currentViewFiltersState = getScopedFamilyStateDeprecated(
-    currentViewFiltersScopedFamilyState,
-    viewScopeId,
-    viewId,
-  );
-
-  const savedViewFiltersState = getScopedFamilyStateDeprecated(
-    savedViewFiltersScopedFamilyState,
-    viewScopeId,
-    viewId,
-  );
-
-  const savedViewFiltersByKeySelector =
-    savedViewFiltersByKeyScopedFamilySelector({
-      scopeId: viewScopeId,
-      viewId: viewId,
-    });
-
-  const availableFilterDefinitionsState = getScopedStateDeprecated(
-    availableFilterDefinitionsScopedState,
-    viewScopeId,
-  );
-
-  const canPersistFiltersSelector = canPersistViewFiltersScopedFamilySelector({
-    viewScopeId: viewScopeId,
-    viewId: viewId,
-  });
-
-  // ViewFields
-  const availableFieldDefinitionsState = getScopedStateDeprecated(
-    availableFieldDefinitionsScopedState,
-    viewScopeId,
-  );
-
-  const currentViewFieldsState = getScopedFamilyStateDeprecated(
-    currentViewFieldsScopedFamilyState,
-    viewScopeId,
-    viewId,
-  );
-
-  const savedViewFieldsState = getScopedFamilyStateDeprecated(
-    savedViewFieldsScopedFamilyState,
-    viewScopeId,
-    viewId,
-  );
-
-  const savedViewFieldsByKeySelector = savedViewFieldByKeyScopedFamilySelector({
-    viewScopeId,
-    viewId,
-  });
-
-  // ViewChangeHandlers
-  const onViewSortsChangeState = getScopedStateDeprecated(
-    onViewSortsChangeScopedState,
-    viewScopeId,
-  );
-
-  const onViewFiltersChangeState = getScopedStateDeprecated(
-    onViewFiltersChangeScopedState,
-    viewScopeId,
-  );
-
-  const onViewFieldsChangeState = getScopedStateDeprecated(
-    onViewFieldsChangeScopedState,
-    viewScopeId,
-  );
-
-  const onViewTypeChangeState = getScopedStateDeprecated(
-    onViewTypeChangeScopedState,
-    viewScopeId,
-  );
-
-  const onViewCompactModeChangeState = getScopedStateDeprecated(
-    onViewCompactModeChangeScopeState,
-    viewScopeId,
-  );
-
-  const currentViewIdState = getScopedStateDeprecated(
-    currentViewIdScopedState,
-    viewScopeId,
-  );
-
-  const currentViewSelector = getScopedSelectorDeprecated(
-    currentViewScopedSelector,
-    viewScopeId,
-  );
-
-  return {
-    currentViewIdState,
-    currentViewSelector,
-
-    isViewBarExpandedState,
-    isPersistingViewState,
-
-    viewsState,
-    viewEditModeState,
-    viewObjectMetadataIdState,
-    viewTypeState,
-    entityCountInCurrentViewState,
-
-    availableSortDefinitionsState,
-    currentViewSortsState,
-    savedViewSortsState,
-    savedViewSortsByKeySelector,
-    canPersistSortsSelector,
-
-    availableFilterDefinitionsState,
-    currentViewFiltersState,
-    savedViewFiltersState,
-    savedViewFiltersByKeySelector,
-    canPersistFiltersSelector,
-
-    availableFieldDefinitionsState,
-    currentViewFieldsState,
-    savedViewFieldsByKeySelector,
-    savedViewFieldsState,
-
-    onViewSortsChangeState,
-    onViewFiltersChangeState,
-    onViewFieldsChangeState,
-    onViewTypeChangeState,
-    onViewCompactModeChangeState,
-  };
-};
diff --git a/packages/twenty-front/src/modules/views/utils/mapBoardFieldDefinitionsToViewFields.ts b/packages/twenty-front/src/modules/views/utils/mapBoardFieldDefinitionsToViewFields.ts
new file mode 100644
index 000000000000..873187cb0f73
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/utils/mapBoardFieldDefinitionsToViewFields.ts
@@ -0,0 +1,19 @@
+import { RecordBoardFieldDefinition } from '@/object-record/record-board/types/RecordBoardFieldDefinition';
+import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
+import { ViewField } from '@/views/types/ViewField';
+
+export const mapBoardFieldDefinitionsToViewFields = (
+  fieldsDefinitions: RecordBoardFieldDefinition<FieldMetadata>[],
+): ViewField[] => {
+  return fieldsDefinitions.map(
+    (fieldDefinition): ViewField => ({
+      __typename: 'ViewField',
+      id: fieldDefinition.viewFieldId || '',
+      fieldMetadataId: fieldDefinition.fieldMetadataId,
+      size: 0,
+      position: fieldDefinition.position,
+      isVisible: fieldDefinition.isVisible ?? true,
+      definition: fieldDefinition,
+    }),
+  );
+};
diff --git a/packages/twenty-front/src/modules/views/utils/mapColumnDefinitionToViewField.ts b/packages/twenty-front/src/modules/views/utils/mapColumnDefinitionToViewField.ts
index 833c1a65b6e7..7b00889bbded 100644
--- a/packages/twenty-front/src/modules/views/utils/mapColumnDefinitionToViewField.ts
+++ b/packages/twenty-front/src/modules/views/utils/mapColumnDefinitionToViewField.ts
@@ -7,6 +7,7 @@ export const mapColumnDefinitionsToViewFields = (
   columnDefinitions: ColumnDefinition<FieldMetadata>[],
 ): ViewField[] => {
   return columnDefinitions.map((columnDefinition) => ({
+    __typename: 'ViewField',
     id: columnDefinition.viewFieldId || '',
     fieldMetadataId: columnDefinition.fieldMetadataId,
     position: columnDefinition.position,
diff --git a/packages/twenty-front/src/modules/views/utils/mapViewFieldsToBoardFieldDefinitions.ts b/packages/twenty-front/src/modules/views/utils/mapViewFieldsToBoardFieldDefinitions.ts
deleted file mode 100644
index 5a9573f2f058..000000000000
--- a/packages/twenty-front/src/modules/views/utils/mapViewFieldsToBoardFieldDefinitions.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { BoardFieldDefinition } from '@/object-record/record-board-deprecated/types/BoardFieldDefinition';
-import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { isNonNullable } from '~/utils/isNonNullable';
-
-import { ViewField } from '../types/ViewField';
-
-export const mapViewFieldsToBoardFieldDefinitions = (
-  viewFields: ViewField[],
-  fieldsMetadata: BoardFieldDefinition<FieldMetadata>[],
-): BoardFieldDefinition<FieldMetadata>[] => {
-  return viewFields
-    .map((viewField) => {
-      const correspondingFieldMetadata = fieldsMetadata.find(
-        ({ fieldMetadataId }) => viewField.fieldMetadataId === fieldMetadataId,
-      );
-
-      return correspondingFieldMetadata
-        ? {
-            fieldMetadataId: viewField.fieldMetadataId,
-            label: correspondingFieldMetadata.label,
-            metadata: correspondingFieldMetadata.metadata,
-            infoTooltipContent: correspondingFieldMetadata.infoTooltipContent,
-            iconName: correspondingFieldMetadata.iconName,
-            type: correspondingFieldMetadata.type,
-            position: viewField.position,
-            isVisible: viewField.isVisible,
-            viewFieldId: viewField.id,
-          }
-        : null;
-    })
-    .filter(isNonNullable);
-};
diff --git a/packages/twenty-front/src/modules/views/utils/mapViewFieldsToColumnDefinitions.ts b/packages/twenty-front/src/modules/views/utils/mapViewFieldsToColumnDefinitions.ts
index 9ebdd36f0dc9..139ac042751f 100644
--- a/packages/twenty-front/src/modules/views/utils/mapViewFieldsToColumnDefinitions.ts
+++ b/packages/twenty-front/src/modules/views/utils/mapViewFieldsToColumnDefinitions.ts
@@ -2,7 +2,8 @@ import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata'
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
 import { mapArrayToObject } from '~/utils/array/mapArrayToObject';
 import { moveArrayItem } from '~/utils/array/moveArrayItem';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 import { ViewField } from '../types/ViewField';
 
@@ -25,11 +26,11 @@ export const mapViewFieldsToColumnDefinitions = ({
       const correspondingColumnDefinition =
         columnDefinitionsByFieldMetadataId[viewField.fieldMetadataId];
 
-      if (!correspondingColumnDefinition) return null;
+      if (isUndefinedOrNull(correspondingColumnDefinition)) return null;
 
       const { isLabelIdentifier } = correspondingColumnDefinition;
 
-      if (isLabelIdentifier) {
+      if (isLabelIdentifier === true) {
         labelIdentifierFieldMetadataId =
           correspondingColumnDefinition.fieldMetadataId;
       }
@@ -46,9 +47,12 @@ export const mapViewFieldsToColumnDefinitions = ({
         isLabelIdentifier,
         isVisible: isLabelIdentifier || viewField.isVisible,
         viewFieldId: viewField.id,
-      };
+        isSortable: correspondingColumnDefinition.isSortable,
+        isFilterable: correspondingColumnDefinition.isFilterable,
+        defaultValue: correspondingColumnDefinition.defaultValue,
+      } as ColumnDefinition<FieldMetadata>;
     })
-    .filter(isNonNullable);
+    .filter(isDefined);
 
   // No label identifier set for this object
   if (!labelIdentifierFieldMetadataId) return columnDefinitionsFromViewFields;
diff --git a/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts b/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts
index 8cca29540688..4df8f1e993fb 100644
--- a/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts
+++ b/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts
@@ -1,17 +1,29 @@
 import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
+import { isDefined } from '~/utils/isDefined';
 
 import { ViewFilter } from '../types/ViewFilter';
 
 export const mapViewFiltersToFilters = (
   viewFilters: ViewFilter[],
+  availableFilterDefinitions: FilterDefinition[],
 ): Filter[] => {
-  return viewFilters.map((viewFilter) => {
-    return {
-      fieldMetadataId: viewFilter.fieldMetadataId,
-      value: viewFilter.value,
-      displayValue: viewFilter.displayValue,
-      operand: viewFilter.operand,
-      definition: viewFilter.definition,
-    };
-  });
+  return viewFilters
+    .map((viewFilter) => {
+      const availableFilterDefinition = availableFilterDefinitions.find(
+        (filterDefinition) =>
+          filterDefinition.fieldMetadataId === viewFilter.fieldMetadataId,
+      );
+
+      if (!availableFilterDefinition) return null;
+
+      return {
+        fieldMetadataId: viewFilter.fieldMetadataId,
+        value: viewFilter.value,
+        displayValue: viewFilter.displayValue,
+        operand: viewFilter.operand,
+        definition: availableFilterDefinition,
+      };
+    })
+    .filter(isDefined);
 };
diff --git a/packages/twenty-front/src/modules/views/utils/mapViewSortsToSorts.ts b/packages/twenty-front/src/modules/views/utils/mapViewSortsToSorts.ts
index 7ceec1a62242..34e8c2f07c4f 100644
--- a/packages/twenty-front/src/modules/views/utils/mapViewSortsToSorts.ts
+++ b/packages/twenty-front/src/modules/views/utils/mapViewSortsToSorts.ts
@@ -1,13 +1,26 @@
 import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
+import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
+import { isDefined } from '~/utils/isDefined';
 
 import { ViewSort } from '../types/ViewSort';
 
-export const mapViewSortsToSorts = (viewSorts: ViewSort[]): Sort[] => {
-  return viewSorts.map((viewSort) => {
-    return {
-      fieldMetadataId: viewSort.fieldMetadataId,
-      direction: viewSort.direction,
-      definition: viewSort.definition,
-    };
-  });
+export const mapViewSortsToSorts = (
+  viewSorts: ViewSort[],
+  availableSortDefinitions: SortDefinition[],
+): Sort[] => {
+  return viewSorts
+    .map((viewSort) => {
+      const availableSortDefinition = availableSortDefinitions.find(
+        (sortDefinition) =>
+          sortDefinition.fieldMetadataId === viewSort.fieldMetadataId,
+      );
+
+      if (!availableSortDefinition) return null;
+      return {
+        fieldMetadataId: viewSort.fieldMetadataId,
+        direction: viewSort.direction,
+        definition: availableSortDefinition,
+      };
+    })
+    .filter(isDefined);
 };
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateOrEditButton.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateOrEditButton.tsx
new file mode 100644
index 000000000000..c54a9daa8dd2
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateOrEditButton.tsx
@@ -0,0 +1,81 @@
+import { useRecoilValue } from 'recoil';
+
+import { Button } from '@/ui/input/button/components/Button';
+import { ViewType } from '@/views/types/ViewType';
+import { useGetAvailableFieldsForKanban } from '@/views/view-picker/hooks/useGetAvailableFieldsForKanban';
+import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
+import { useViewPickerPersistView } from '@/views/view-picker/hooks/useViewPickerPersistView';
+import { useViewPickerStates } from '@/views/view-picker/hooks/useViewPickerStates';
+
+export const ViewPickerCreateOrEditButton = () => {
+  const { availableFieldsForKanban, navigateToSelectSettings } =
+    useGetAvailableFieldsForKanban();
+
+  const {
+    viewPickerIsPersistingState,
+    viewPickerKanbanFieldMetadataIdState,
+    viewPickerTypeState,
+  } = useViewPickerStates();
+
+  const { viewPickerMode } = useViewPickerMode();
+  const viewPickerType = useRecoilValue(viewPickerTypeState);
+  const viewPickerIsPersisting = useRecoilValue(viewPickerIsPersistingState);
+  const viewPickerKanbanFieldMetadataId = useRecoilValue(
+    viewPickerKanbanFieldMetadataIdState,
+  );
+
+  const { handleCreate, handleDelete } = useViewPickerPersistView();
+
+  if (viewPickerMode === 'edit') {
+    return (
+      <Button
+        title="Delete"
+        onClick={handleDelete}
+        accent="danger"
+        fullWidth
+        size="small"
+        justify="center"
+        focus={false}
+        variant="secondary"
+        disabled={viewPickerIsPersisting}
+      />
+    );
+  }
+
+  if (
+    viewPickerType === ViewType.Kanban &&
+    availableFieldsForKanban.length === 0
+  ) {
+    return (
+      <Button
+        title="Go to Settings"
+        onClick={navigateToSelectSettings}
+        size="small"
+        accent="blue"
+        fullWidth
+        justify="center"
+      />
+    );
+  }
+
+  if (
+    viewPickerType === ViewType.Table ||
+    viewPickerKanbanFieldMetadataId !== ''
+  ) {
+    return (
+      <Button
+        title="Create"
+        onClick={handleCreate}
+        accent="blue"
+        fullWidth
+        size="small"
+        justify="center"
+        disabled={
+          viewPickerIsPersisting ||
+          (viewPickerType === ViewType.Kanban &&
+            viewPickerKanbanFieldMetadataId === '')
+        }
+      />
+    );
+  }
+};
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateOrEditContent.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateOrEditContent.tsx
new file mode 100644
index 000000000000..127e644005b6
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateOrEditContent.tsx
@@ -0,0 +1,197 @@
+import styled from '@emotion/styled';
+import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
+import { Key } from 'ts-key-enum';
+import { IconChevronLeft, IconLayoutKanban, IconTable, IconX } from 'twenty-ui';
+
+import { IconPicker } from '@/ui/input/components/IconPicker';
+import { Select } from '@/ui/input/components/Select';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
+import { DropdownMenuInput } from '@/ui/layout/dropdown/components/DropdownMenuInput';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
+import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { ViewsHotkeyScope } from '@/views/types/ViewsHotkeyScope';
+import { ViewType } from '@/views/types/ViewType';
+import { ViewPickerCreateOrEditButton } from '@/views/view-picker/components/ViewPickerCreateOrEditButton';
+import { VIEW_PICKER_KANBAN_FIELD_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerKanbanFieldDropdownId';
+import { VIEW_PICKER_VIEW_TYPE_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerViewTypeDropdownId';
+import { useGetAvailableFieldsForKanban } from '@/views/view-picker/hooks/useGetAvailableFieldsForKanban';
+import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
+import { useViewPickerPersistView } from '@/views/view-picker/hooks/useViewPickerPersistView';
+import { useViewPickerStates } from '@/views/view-picker/hooks/useViewPickerStates';
+
+const StyledIconAndNameContainer = styled.div`
+  align-items: center;
+  display: flex;
+  margin-left: ${({ theme }) => theme.spacing(1)};
+  gap: ${({ theme }) => theme.spacing(1)};
+`;
+
+const StyledSelectContainer = styled.div`
+  display: flex;
+  width: calc(100% - ${({ theme }) => theme.spacing(2)});
+  margin: ${({ theme }) => theme.spacing(1)};
+  color: ${({ theme }) => theme.font.color.light};
+  user-select: none;
+`;
+
+const StyledNoKanbanFieldAvailableContainer = styled.div`
+  color: ${({ theme }) => theme.font.color.light};
+  display: flex;
+  margin: ${({ theme }) => theme.spacing(1, 2)};
+  user-select: none;
+  width: calc(100% - ${({ theme }) => theme.spacing(4)});
+`;
+
+const StyledSaveButtonContainer = styled.div`
+  display: flex;
+  padding: ${({ theme }) => theme.spacing(1)};
+  width: calc(100% - ${({ theme }) => theme.spacing(2)});
+`;
+export const ViewPickerCreateOrEditContent = () => {
+  const { viewPickerMode, setViewPickerMode } = useViewPickerMode();
+  const {
+    viewPickerInputNameState,
+    viewPickerSelectedIconState,
+    viewPickerIsPersistingState,
+    viewPickerKanbanFieldMetadataIdState,
+    viewPickerTypeState,
+    viewPickerIsDirtyState,
+  } = useViewPickerStates();
+
+  const [viewPickerInputName, setViewPickerInputName] = useRecoilState(
+    viewPickerInputNameState,
+  );
+  const [viewPickerSelectedIcon, setViewPickerSelectedIcon] = useRecoilState(
+    viewPickerSelectedIconState,
+  );
+  const viewPickerIsPersisting = useRecoilValue(viewPickerIsPersistingState);
+  const setViewPickerIsDirty = useSetRecoilState(viewPickerIsDirtyState);
+
+  const [viewPickerKanbanFieldMetadataId, setViewPickerKanbanFieldMetadataId] =
+    useRecoilState(viewPickerKanbanFieldMetadataIdState);
+
+  const [viewPickerType, setViewPickerType] =
+    useRecoilState(viewPickerTypeState);
+
+  const setHotkeyScope = useSetHotkeyScope();
+
+  const { handleCreate, handleUpdate } = useViewPickerPersistView();
+
+  useScopedHotkeys(
+    Key.Enter,
+    async () => {
+      if (viewPickerIsPersisting) {
+        return;
+      }
+      if (viewPickerMode === 'create') {
+        await handleCreate();
+      }
+      if (viewPickerMode === 'edit') {
+        await handleUpdate();
+      }
+    },
+    ViewsHotkeyScope.ListDropdown,
+  );
+
+  const onIconChange = ({ iconKey }: { iconKey: string }) => {
+    setViewPickerIsDirty(true);
+    setViewPickerSelectedIcon(iconKey);
+  };
+
+  const { availableFieldsForKanban } = useGetAvailableFieldsForKanban();
+
+  const handleClose = async () => {
+    if (viewPickerMode === 'edit') {
+      await handleUpdate();
+    }
+    setViewPickerMode('list');
+  };
+
+  return (
+    <>
+      <DropdownMenuHeader
+        StartIcon={viewPickerMode === 'create' ? IconX : IconChevronLeft}
+        onClick={handleClose}
+      >
+        {viewPickerMode === 'create' ? 'Create view' : 'Edit view'}
+      </DropdownMenuHeader>
+      <DropdownMenuSeparator />
+      <DropdownMenuItemsContainer>
+        <StyledIconAndNameContainer>
+          <IconPicker
+            onChange={onIconChange}
+            selectedIconKey={viewPickerSelectedIcon}
+            disableBlur
+            onClose={() => setHotkeyScope(ViewsHotkeyScope.ListDropdown)}
+          />
+          <DropdownMenuInput
+            value={viewPickerInputName}
+            onChange={(event) => {
+              setViewPickerIsDirty(true);
+              setViewPickerInputName(event.target.value);
+            }}
+            autoFocus
+          />
+        </StyledIconAndNameContainer>
+        {viewPickerMode === 'create' && (
+          <StyledSelectContainer>
+            <Select
+              disableBlur
+              label="View type"
+              fullWidth
+              value={viewPickerType}
+              onChange={(value) => {
+                setViewPickerIsDirty(true);
+                setViewPickerType(value);
+              }}
+              options={[
+                { value: ViewType.Table, label: 'Table', Icon: IconTable },
+                {
+                  value: ViewType.Kanban,
+                  label: 'Kanban',
+                  Icon: IconLayoutKanban,
+                },
+              ]}
+              dropdownId={VIEW_PICKER_VIEW_TYPE_DROPDOWN_ID}
+            />
+          </StyledSelectContainer>
+        )}
+        {viewPickerType === ViewType.Kanban && viewPickerMode === 'create' && (
+          <>
+            <StyledSelectContainer>
+              <Select
+                disableBlur
+                label="Stages"
+                fullWidth
+                value={viewPickerKanbanFieldMetadataId}
+                onChange={(value) => setViewPickerKanbanFieldMetadataId(value)}
+                options={
+                  availableFieldsForKanban.length > 0
+                    ? availableFieldsForKanban.map((field) => ({
+                        value: field.id,
+                        label: field.label,
+                      }))
+                    : [{ value: '', label: 'No Select field' }]
+                }
+                dropdownId={VIEW_PICKER_KANBAN_FIELD_DROPDOWN_ID}
+              />
+            </StyledSelectContainer>
+            {availableFieldsForKanban.length === 0 && (
+              <StyledNoKanbanFieldAvailableContainer>
+                Set up a Select field on Companies to create a Kanban
+              </StyledNoKanbanFieldAvailableContainer>
+            )}
+          </>
+        )}
+      </DropdownMenuItemsContainer>
+      <DropdownMenuSeparator />
+      <DropdownMenuItemsContainer>
+        <StyledSaveButtonContainer>
+          <ViewPickerCreateOrEditButton />
+        </StyledSaveButtonContainer>
+      </DropdownMenuItemsContainer>
+    </>
+  );
+};
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateOrEditContentEffect.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateOrEditContentEffect.tsx
new file mode 100644
index 000000000000..45c143222fce
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateOrEditContentEffect.tsx
@@ -0,0 +1,73 @@
+import { useEffect } from 'react';
+import { useRecoilValue, useSetRecoilState } from 'recoil';
+
+import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
+import { useGetAvailableFieldsForKanban } from '@/views/view-picker/hooks/useGetAvailableFieldsForKanban';
+import { useViewPickerStates } from '@/views/view-picker/hooks/useViewPickerStates';
+import { isDefined } from '~/utils/isDefined';
+
+export const ViewPickerCreateOrEditContentEffect = () => {
+  const {
+    viewPickerSelectedIconState,
+    viewPickerInputNameState,
+    viewPickerReferenceViewIdState,
+    viewPickerIsPersistingState,
+    viewPickerKanbanFieldMetadataIdState,
+    viewPickerTypeState,
+    viewPickerIsDirtyState,
+  } = useViewPickerStates();
+
+  const setViewPickerSelectedIcon = useSetRecoilState(
+    viewPickerSelectedIconState,
+  );
+  const setViewPickerInputName = useSetRecoilState(viewPickerInputNameState);
+
+  const setViewPickerKanbanFieldMetadataId = useSetRecoilState(
+    viewPickerKanbanFieldMetadataIdState,
+  );
+  const setViewPickerType = useSetRecoilState(viewPickerTypeState);
+
+  const viewPickerReferenceViewId = useRecoilValue(
+    viewPickerReferenceViewIdState,
+  );
+
+  const viewPickerIsDirty = useRecoilValue(viewPickerIsDirtyState);
+
+  const viewPickerIsPersisting = useRecoilValue(viewPickerIsPersistingState);
+
+  const { viewsOnCurrentObject } = useGetCurrentView();
+  const referenceView = viewsOnCurrentObject.find(
+    (view) => view.id === viewPickerReferenceViewId,
+  );
+
+  const { availableFieldsForKanban } = useGetAvailableFieldsForKanban();
+
+  useEffect(() => {
+    if (
+      isDefined(referenceView) &&
+      !viewPickerIsPersisting &&
+      !viewPickerIsDirty
+    ) {
+      setViewPickerSelectedIcon(referenceView.icon);
+      setViewPickerInputName(referenceView.name);
+      setViewPickerKanbanFieldMetadataId(referenceView.kanbanFieldMetadataId);
+      setViewPickerType(referenceView.type);
+    }
+  }, [
+    referenceView,
+    setViewPickerInputName,
+    setViewPickerKanbanFieldMetadataId,
+    setViewPickerSelectedIcon,
+    setViewPickerType,
+    viewPickerIsPersisting,
+    viewPickerIsDirty,
+  ]);
+
+  useEffect(() => {
+    if (availableFieldsForKanban.length > 0) {
+      setViewPickerKanbanFieldMetadataId(availableFieldsForKanban[0].id);
+    }
+  }, [availableFieldsForKanban, setViewPickerKanbanFieldMetadataId]);
+
+  return <></>;
+};
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx
new file mode 100644
index 000000000000..53e455feb31c
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx
@@ -0,0 +1,110 @@
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import { useRecoilValue } from 'recoil';
+import { IconChevronDown, IconList } from 'twenty-ui';
+
+import { useIcons } from '@/ui/display/icon/hooks/useIcons';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { StyledDropdownButtonContainer } from '@/ui/layout/dropdown/components/StyledDropdownButtonContainer';
+import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+import { MOBILE_VIEWPORT } from '@/ui/theme/constants/MobileViewport';
+import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
+import { ViewsHotkeyScope } from '@/views/types/ViewsHotkeyScope';
+import { ViewPickerCreateOrEditContent } from '@/views/view-picker/components/ViewPickerCreateOrEditContent';
+import { ViewPickerCreateOrEditContentEffect } from '@/views/view-picker/components/ViewPickerCreateOrEditContentEffect';
+import { ViewPickerListContent } from '@/views/view-picker/components/ViewPickerListContent';
+import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';
+import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
+import { useViewPickerPersistView } from '@/views/view-picker/hooks/useViewPickerPersistView';
+
+import { useViewStates } from '../../hooks/internal/useViewStates';
+
+const StyledDropdownLabelAdornments = styled.span`
+  align-items: center;
+  color: ${({ theme }) => theme.grayScale.gray35};
+  display: inline-flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+  margin-left: ${({ theme }) => theme.spacing(1)};
+`;
+
+const StyledViewName = styled.span`
+  margin-left: ${({ theme }) => theme.spacing(1)};
+  display: inline-block;
+  max-width: 130px;
+  @media (max-width: 375px) {
+    max-width: 90px;
+  }
+  @media (min-width: 376px) and (max-width: ${MOBILE_VIEWPORT}px) {
+    max-width: 110px;
+  }
+  overflow: hidden;
+  text-overflow: ellipsis;
+  vertical-align: middle;
+  white-space: nowrap;
+`;
+
+export const ViewPickerDropdown = () => {
+  const theme = useTheme();
+
+  const { entityCountInCurrentViewState } = useViewStates();
+
+  const { currentViewWithCombinedFiltersAndSorts } = useGetCurrentView();
+
+  const { handleUpdate } = useViewPickerPersistView();
+
+  const entityCountInCurrentView = useRecoilValue(
+    entityCountInCurrentViewState,
+  );
+
+  const { isDropdownOpen: isViewsListDropdownOpen } = useDropdown(
+    VIEW_PICKER_DROPDOWN_ID,
+  );
+
+  const { viewPickerMode, setViewPickerMode } = useViewPickerMode();
+
+  const { getIcon } = useIcons();
+  const CurrentViewIcon = getIcon(currentViewWithCombinedFiltersAndSorts?.icon);
+
+  const handleClickOutside = async () => {
+    if (isViewsListDropdownOpen && viewPickerMode === 'edit') {
+      await handleUpdate();
+    }
+    setViewPickerMode('list');
+  };
+
+  return (
+    <Dropdown
+      dropdownId={VIEW_PICKER_DROPDOWN_ID}
+      dropdownHotkeyScope={{ scope: ViewsHotkeyScope.ListDropdown }}
+      dropdownOffset={{ x: 0, y: 8 }}
+      dropdownMenuWidth={200}
+      onClickOutside={handleClickOutside}
+      clickableComponent={
+        <StyledDropdownButtonContainer isUnfolded={isViewsListDropdownOpen}>
+          {currentViewWithCombinedFiltersAndSorts && CurrentViewIcon ? (
+            <CurrentViewIcon size={theme.icon.size.md} />
+          ) : (
+            <IconList size={theme.icon.size.md} />
+          )}
+          <StyledViewName>
+            {currentViewWithCombinedFiltersAndSorts?.name ?? 'All'}
+          </StyledViewName>
+          <StyledDropdownLabelAdornments>
+            · {entityCountInCurrentView}{' '}
+            <IconChevronDown size={theme.icon.size.sm} />
+          </StyledDropdownLabelAdornments>
+        </StyledDropdownButtonContainer>
+      }
+      dropdownComponents={
+        viewPickerMode === 'list' ? (
+          <ViewPickerListContent />
+        ) : (
+          <>
+            <ViewPickerCreateOrEditContent />
+            <ViewPickerCreateOrEditContentEffect />
+          </>
+        )
+      }
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
new file mode 100644
index 000000000000..03aec00172fb
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
@@ -0,0 +1,94 @@
+import { MouseEvent } from 'react';
+import styled from '@emotion/styled';
+import { useSetRecoilState } from 'recoil';
+import { IconLock, IconPencil, IconPlus } from 'twenty-ui';
+
+import { useIcons } from '@/ui/display/icon/hooks/useIcons';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
+import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
+import { useHandleViews } from '@/views/hooks/useHandleViews';
+import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';
+import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
+import { useViewPickerStates } from '@/views/view-picker/hooks/useViewPickerStates';
+import { isDefined } from '~/utils/isDefined';
+
+const StyledBoldDropdownMenuItemsContainer = styled(DropdownMenuItemsContainer)`
+  font-weight: ${({ theme }) => theme.font.weight.regular};
+`;
+
+export const ViewPickerListContent = () => {
+  const { selectView } = useHandleViews();
+
+  const { currentViewWithCombinedFiltersAndSorts, viewsOnCurrentObject } =
+    useGetCurrentView();
+
+  const { viewPickerReferenceViewIdState } = useViewPickerStates();
+  const setViewPickerReferenceViewId = useSetRecoilState(
+    viewPickerReferenceViewIdState,
+  );
+
+  const { setViewPickerMode } = useViewPickerMode();
+
+  const { closeDropdown } = useDropdown(VIEW_PICKER_DROPDOWN_ID);
+
+  const handleViewSelect = (viewId: string) => {
+    selectView(viewId);
+    closeDropdown();
+  };
+
+  const handleAddViewButtonClick = () => {
+    if (isDefined(currentViewWithCombinedFiltersAndSorts?.id)) {
+      setViewPickerReferenceViewId(currentViewWithCombinedFiltersAndSorts.id);
+      setViewPickerMode('create');
+    }
+  };
+
+  const handleEditViewButtonClick = (
+    event: MouseEvent<HTMLButtonElement>,
+    viewId: string,
+  ) => {
+    event.stopPropagation();
+    setViewPickerReferenceViewId(viewId);
+    setViewPickerMode('edit');
+  };
+
+  const { getIcon } = useIcons();
+
+  return (
+    <>
+      <DropdownMenuItemsContainer>
+        {viewsOnCurrentObject.map((view) => (
+          <MenuItem
+            key={view.id}
+            iconButtons={[
+              view.key !== 'INDEX'
+                ? {
+                    Icon: IconPencil,
+                    onClick: (event: MouseEvent<HTMLButtonElement>) =>
+                      handleEditViewButtonClick(event, view.id),
+                  }
+                : {
+                    Icon: IconLock,
+                  },
+            ].filter(isDefined)}
+            isIconDisplayedOnHoverOnly={view.key !== 'INDEX'}
+            onClick={() => handleViewSelect(view.id)}
+            LeftIcon={getIcon(view.icon)}
+            text={view.name}
+          />
+        ))}
+      </DropdownMenuItemsContainer>
+      <DropdownMenuSeparator />
+      <StyledBoldDropdownMenuItemsContainer>
+        <MenuItem
+          onClick={handleAddViewButtonClick}
+          LeftIcon={IconPlus}
+          text="Add view"
+        />
+      </StyledBoldDropdownMenuItemsContainer>
+    </>
+  );
+};
diff --git a/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerDropdownId.ts b/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerDropdownId.ts
new file mode 100644
index 000000000000..a48d18a660e2
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerDropdownId.ts
@@ -0,0 +1 @@
+export const VIEW_PICKER_DROPDOWN_ID = 'view-picker';
diff --git a/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerKanbanFieldDropdownId.ts b/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerKanbanFieldDropdownId.ts
new file mode 100644
index 000000000000..4d8e5aaec390
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerKanbanFieldDropdownId.ts
@@ -0,0 +1 @@
+export const VIEW_PICKER_KANBAN_FIELD_DROPDOWN_ID = 'view-picker-kanban-field';
diff --git a/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerViewTypeDropdownId.ts b/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerViewTypeDropdownId.ts
new file mode 100644
index 000000000000..b5d83d47474c
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerViewTypeDropdownId.ts
@@ -0,0 +1 @@
+export const VIEW_PICKER_VIEW_TYPE_DROPDOWN_ID = 'view-picker-view-type';
diff --git a/packages/twenty-front/src/modules/views/view-picker/hooks/useCloseAndResetViewPicker.ts b/packages/twenty-front/src/modules/views/view-picker/hooks/useCloseAndResetViewPicker.ts
new file mode 100644
index 000000000000..dc6220b078cc
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/hooks/useCloseAndResetViewPicker.ts
@@ -0,0 +1,46 @@
+import { useCallback } from 'react';
+import { useSetRecoilState } from 'recoil';
+
+import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';
+import { VIEW_PICKER_KANBAN_FIELD_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerKanbanFieldDropdownId';
+import { VIEW_PICKER_VIEW_TYPE_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerViewTypeDropdownId';
+import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
+import { useViewPickerStates } from '@/views/view-picker/hooks/useViewPickerStates';
+
+export const useCloseAndResetViewPicker = () => {
+  const { setViewPickerMode } = useViewPickerMode();
+  const { viewPickerIsPersistingState } = useViewPickerStates();
+
+  const setViewPickerIsPersisting = useSetRecoilState(
+    viewPickerIsPersistingState,
+  );
+
+  const { closeDropdown: closeViewPickerDropdown } = useDropdown(
+    VIEW_PICKER_DROPDOWN_ID,
+  );
+
+  const { closeDropdown: closeKanbanFieldDropdown } = useDropdown(
+    VIEW_PICKER_KANBAN_FIELD_DROPDOWN_ID,
+  );
+
+  const { closeDropdown: closeTypeDropdown } = useDropdown(
+    VIEW_PICKER_VIEW_TYPE_DROPDOWN_ID,
+  );
+
+  const closeAndResetViewPicker = useCallback(() => {
+    setViewPickerIsPersisting(false);
+    setViewPickerMode('list');
+    closeKanbanFieldDropdown();
+    closeTypeDropdown();
+    closeViewPickerDropdown();
+  }, [
+    closeKanbanFieldDropdown,
+    closeTypeDropdown,
+    closeViewPickerDropdown,
+    setViewPickerIsPersisting,
+    setViewPickerMode,
+  ]);
+
+  return { closeAndResetViewPicker };
+};
diff --git a/packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForKanban.ts b/packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForKanban.ts
new file mode 100644
index 000000000000..21df6d23c257
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForKanban.ts
@@ -0,0 +1,34 @@
+import { useCallback } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { useRecoilValue } from 'recoil';
+
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { useViewStates } from '@/views/hooks/internal/useViewStates';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+export const useGetAvailableFieldsForKanban = () => {
+  const { viewObjectMetadataIdState } = useViewStates();
+
+  const viewObjectMetadataId = useRecoilValue(viewObjectMetadataIdState);
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
+
+  const objectMetadataItem = objectMetadataItems.find(
+    (objectMetadata) => objectMetadata.id === viewObjectMetadataId,
+  );
+
+  const availableFieldsForKanban =
+    objectMetadataItem?.fields.filter(
+      (field) => field.type === FieldMetadataType.Select,
+    ) ?? [];
+
+  const navigate = useNavigate();
+
+  const navigateToSelectSettings = useCallback(() => {
+    navigate(`/settings/objects/${objectMetadataItem?.namePlural}`);
+  }, [navigate, objectMetadataItem?.namePlural]);
+
+  return {
+    availableFieldsForKanban,
+    navigateToSelectSettings,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/view-picker/hooks/useViewPickerMode.ts b/packages/twenty-front/src/modules/views/view-picker/hooks/useViewPickerMode.ts
new file mode 100644
index 000000000000..d3ef5c01e7b0
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/hooks/useViewPickerMode.ts
@@ -0,0 +1,15 @@
+import { useRecoilState } from 'recoil';
+
+import { useViewPickerStates } from '@/views/view-picker/hooks/useViewPickerStates';
+
+export const useViewPickerMode = (viewBarComponentId?: string) => {
+  const { viewPickerModeState } = useViewPickerStates(viewBarComponentId);
+
+  const [viewPickerMode, setViewPickerMode] =
+    useRecoilState(viewPickerModeState);
+
+  return {
+    viewPickerMode,
+    setViewPickerMode,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/view-picker/hooks/useViewPickerPersistView.ts b/packages/twenty-front/src/modules/views/view-picker/hooks/useViewPickerPersistView.ts
new file mode 100644
index 000000000000..ba9c00398b2c
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/hooks/useViewPickerPersistView.ts
@@ -0,0 +1,132 @@
+import { useRecoilCallback } from 'recoil';
+import { v4 } from 'uuid';
+
+import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
+import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
+import { useHandleViews } from '@/views/hooks/useHandleViews';
+import { useCloseAndResetViewPicker } from '@/views/view-picker/hooks/useCloseAndResetViewPicker';
+import { useViewPickerStates } from '@/views/view-picker/hooks/useViewPickerStates';
+
+export const useViewPickerPersistView = () => {
+  const {
+    viewPickerInputNameState,
+    viewPickerSelectedIconState,
+    viewPickerIsPersistingState,
+    viewPickerReferenceViewIdState,
+    viewPickerKanbanFieldMetadataIdState,
+    viewPickerTypeState,
+    viewPickerIsDirtyState,
+  } = useViewPickerStates();
+
+  const { createView, selectView, removeView, updateView } = useHandleViews();
+
+  const { viewsOnCurrentObject } = useGetCurrentView();
+
+  const { closeAndResetViewPicker } = useCloseAndResetViewPicker();
+
+  const handleCreate = useRecoilCallback(
+    ({ snapshot, set }) =>
+      async () => {
+        const name = getSnapshotValue(snapshot, viewPickerInputNameState);
+        const iconKey = getSnapshotValue(snapshot, viewPickerSelectedIconState);
+        const type = getSnapshotValue(snapshot, viewPickerTypeState);
+        const kanbanFieldMetadataId = getSnapshotValue(
+          snapshot,
+          viewPickerKanbanFieldMetadataIdState,
+        );
+        const id = v4();
+        set(viewPickerIsPersistingState, true);
+        set(viewPickerIsDirtyState, false);
+        await createView({
+          id,
+          name,
+          icon: iconKey,
+          type,
+          kanbanFieldMetadataId,
+        });
+        closeAndResetViewPicker();
+        selectView(id);
+      },
+    [
+      closeAndResetViewPicker,
+      createView,
+      selectView,
+      viewPickerInputNameState,
+      viewPickerIsDirtyState,
+      viewPickerIsPersistingState,
+      viewPickerKanbanFieldMetadataIdState,
+      viewPickerSelectedIconState,
+      viewPickerTypeState,
+    ],
+  );
+
+  const handleDelete = useRecoilCallback(
+    ({ set, snapshot }) =>
+      async () => {
+        set(viewPickerIsPersistingState, true);
+        closeAndResetViewPicker();
+        set(viewPickerIsDirtyState, false);
+        const viewPickerReferenceViewId = getSnapshotValue(
+          snapshot,
+          viewPickerReferenceViewIdState,
+        );
+
+        selectView(
+          viewsOnCurrentObject.filter(
+            (view) => view.id !== viewPickerReferenceViewId,
+          )[0].id,
+        );
+        await removeView(viewPickerReferenceViewId);
+      },
+    [
+      closeAndResetViewPicker,
+      removeView,
+      selectView,
+      viewPickerIsDirtyState,
+      viewPickerIsPersistingState,
+      viewPickerReferenceViewIdState,
+      viewsOnCurrentObject,
+    ],
+  );
+
+  const handleUpdate = useRecoilCallback(
+    ({ set, snapshot }) =>
+      async () => {
+        set(viewPickerIsPersistingState, true);
+        set(viewPickerIsDirtyState, false);
+        closeAndResetViewPicker();
+
+        const viewPickerReferenceViewId = getSnapshotValue(
+          snapshot,
+          viewPickerReferenceViewIdState,
+        );
+        const viewPickerInputName = getSnapshotValue(
+          snapshot,
+          viewPickerInputNameState,
+        );
+        const viewPickerSelectedIcon = getSnapshotValue(
+          snapshot,
+          viewPickerSelectedIconState,
+        );
+
+        await updateView({
+          id: viewPickerReferenceViewId,
+          name: viewPickerInputName,
+          icon: viewPickerSelectedIcon,
+        });
+        selectView(viewPickerReferenceViewId);
+      },
+    [
+      viewPickerIsPersistingState,
+      viewPickerIsDirtyState,
+      closeAndResetViewPicker,
+      viewPickerReferenceViewIdState,
+      viewPickerInputNameState,
+      viewPickerSelectedIconState,
+      updateView,
+      selectView,
+    ],
+  );
+
+  return { handleCreate, handleDelete, handleUpdate };
+};
diff --git a/packages/twenty-front/src/modules/views/view-picker/hooks/useViewPickerStates.ts b/packages/twenty-front/src/modules/views/view-picker/hooks/useViewPickerStates.ts
new file mode 100644
index 000000000000..58bfd987cdde
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/hooks/useViewPickerStates.ts
@@ -0,0 +1,55 @@
+import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
+import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
+import { viewPickerInputNameComponentState } from '@/views/view-picker/states/viewPickerInputNameComponentState';
+import { viewPickerIsDirtyComponentState } from '@/views/view-picker/states/viewPickerIsDirtyComponentState';
+import { viewPickerIsPersistingComponentState } from '@/views/view-picker/states/viewPickerIsPersistingComponentState';
+import { viewPickerKanbanFieldMetadataIdComponentState } from '@/views/view-picker/states/viewPickerKanbanFieldMetadataIdComponentState';
+import { viewPickerModeComponentState } from '@/views/view-picker/states/viewPickerModeComponentState';
+import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState';
+import { viewPickerSelectedIconComponentState } from '@/views/view-picker/states/viewPickerSelectedIconComponentState';
+import { viewPickerTypeComponentState } from '@/views/view-picker/states/viewPickerTypeComponentState';
+
+import { ViewScopeInternalContext } from '../../scopes/scope-internal-context/ViewScopeInternalContext';
+
+export const useViewPickerStates = (viewComponentId?: string) => {
+  const componentId = useAvailableScopeIdOrThrow(
+    ViewScopeInternalContext,
+    viewComponentId,
+  );
+
+  return {
+    componentId,
+    viewPickerModeState: extractComponentState(
+      viewPickerModeComponentState,
+      componentId,
+    ),
+    viewPickerInputNameState: extractComponentState(
+      viewPickerInputNameComponentState,
+      componentId,
+    ),
+    viewPickerSelectedIconState: extractComponentState(
+      viewPickerSelectedIconComponentState,
+      componentId,
+    ),
+    viewPickerKanbanFieldMetadataIdState: extractComponentState(
+      viewPickerKanbanFieldMetadataIdComponentState,
+      componentId,
+    ),
+    viewPickerReferenceViewIdState: extractComponentState(
+      viewPickerReferenceViewIdComponentState,
+      componentId,
+    ),
+    viewPickerIsPersistingState: extractComponentState(
+      viewPickerIsPersistingComponentState,
+      componentId,
+    ),
+    viewPickerTypeState: extractComponentState(
+      viewPickerTypeComponentState,
+      componentId,
+    ),
+    viewPickerIsDirtyState: extractComponentState(
+      viewPickerIsDirtyComponentState,
+      componentId,
+    ),
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/view-picker/states/viewPickerInputNameComponentState.ts b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerInputNameComponentState.ts
new file mode 100644
index 000000000000..35ef6551f923
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerInputNameComponentState.ts
@@ -0,0 +1,6 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const viewPickerInputNameComponentState = createComponentState<string>({
+  key: 'viewPickerInputNameComponentState',
+  defaultValue: '',
+});
diff --git a/packages/twenty-front/src/modules/views/view-picker/states/viewPickerIsDirtyComponentState.ts b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerIsDirtyComponentState.ts
new file mode 100644
index 000000000000..a732ae062f6c
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerIsDirtyComponentState.ts
@@ -0,0 +1,6 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const viewPickerIsDirtyComponentState = createComponentState<boolean>({
+  key: 'viewPickerIsDirtyComponentState',
+  defaultValue: false,
+});
diff --git a/packages/twenty-front/src/modules/views/view-picker/states/viewPickerIsPersistingComponentState.ts b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerIsPersistingComponentState.ts
new file mode 100644
index 000000000000..e7e201f8190a
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerIsPersistingComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const viewPickerIsPersistingComponentState =
+  createComponentState<boolean>({
+    key: 'viewPickerIsPersistingComponentState',
+    defaultValue: false,
+  });
diff --git a/packages/twenty-front/src/modules/views/view-picker/states/viewPickerKanbanFieldMetadataIdComponentState.ts b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerKanbanFieldMetadataIdComponentState.ts
new file mode 100644
index 000000000000..2a7ad8117d06
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerKanbanFieldMetadataIdComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const viewPickerKanbanFieldMetadataIdComponentState =
+  createComponentState<string>({
+    key: 'viewPickerKanbanFieldMetadataIdComponentState',
+    defaultValue: '',
+  });
diff --git a/packages/twenty-front/src/modules/views/view-picker/states/viewPickerModeComponentState.ts b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerModeComponentState.ts
new file mode 100644
index 000000000000..b828f4a80214
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerModeComponentState.ts
@@ -0,0 +1,8 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const viewPickerModeComponentState = createComponentState<
+  'list' | 'edit' | 'create'
+>({
+  key: 'viewEditModeComponentState',
+  defaultValue: 'list',
+});
diff --git a/packages/twenty-front/src/modules/views/view-picker/states/viewPickerReferenceViewIdComponentState.ts b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerReferenceViewIdComponentState.ts
new file mode 100644
index 000000000000..33d17de9079c
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerReferenceViewIdComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const viewPickerReferenceViewIdComponentState =
+  createComponentState<string>({
+    key: 'viewPickerReferenceViewIdComponentState',
+    defaultValue: '',
+  });
diff --git a/packages/twenty-front/src/modules/views/view-picker/states/viewPickerSelectedIconComponentState.ts b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerSelectedIconComponentState.ts
new file mode 100644
index 000000000000..ae52733e8523
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerSelectedIconComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+
+export const viewPickerSelectedIconComponentState =
+  createComponentState<string>({
+    key: 'viewPickerSelectedIconComponentState',
+    defaultValue: '',
+  });
diff --git a/packages/twenty-front/src/modules/views/view-picker/states/viewPickerTypeComponentState.ts b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerTypeComponentState.ts
new file mode 100644
index 000000000000..b56193372a36
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerTypeComponentState.ts
@@ -0,0 +1,7 @@
+import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { ViewType } from '@/views/types/ViewType';
+
+export const viewPickerTypeComponentState = createComponentState<ViewType>({
+  key: 'viewPickerTypeComponentState',
+  defaultValue: ViewType.Table,
+});
diff --git a/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteLink.tsx b/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteLink.tsx
index 0a9e53f3a1b9..4d855daae040 100644
--- a/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteLink.tsx
+++ b/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteLink.tsx
@@ -1,7 +1,7 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconCopy, IconLink } from 'twenty-ui';
 
-import { IconCopy, IconLink } from '@/ui/display/icon';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { Button } from '@/ui/input/button/components/Button';
 import { TextInput } from '@/ui/input/components/TextInput';
diff --git a/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts b/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts
index ad15dba8d297..10c009f0c81b 100644
--- a/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts
+++ b/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts
@@ -2,4 +2,7 @@ export type FeatureFlagKey =
   | 'IS_BLOCKLIST_ENABLED'
   | 'IS_CALENDAR_ENABLED'
   | 'IS_QUICK_ACTIONS_ENABLED'
-  | 'IS_SELF_BILLING_ENABLED';
+  | 'IS_EVENT_OBJECT_ENABLED'
+  | 'IS_AIRTABLE_INTEGRATION_ENABLED'
+  | 'IS_POSTGRESQL_INTEGRATION_ENABLED'
+  | 'IS_MULTI_SELECT_ENABLED';
diff --git a/packages/twenty-front/src/nx-react.d.ts b/packages/twenty-front/src/nx-react.d.ts
new file mode 100644
index 000000000000..639a9eed3ad2
--- /dev/null
+++ b/packages/twenty-front/src/nx-react.d.ts
@@ -0,0 +1,3 @@
+/// <reference types="@nx/react/typings/cssmodule.d.ts" />
+/// <reference types="@nx/react/typings/image.d.ts" />
+/// <reference types="@nx/react/typings/styled-jsx.d.ts" />
diff --git a/packages/twenty-front/src/pages/auth/Authorize.tsx b/packages/twenty-front/src/pages/auth/Authorize.tsx
new file mode 100644
index 000000000000..be87ef44592b
--- /dev/null
+++ b/packages/twenty-front/src/pages/auth/Authorize.tsx
@@ -0,0 +1,128 @@
+import { useEffect, useState } from 'react';
+import { useNavigate, useSearchParams } from 'react-router-dom';
+import styled from '@emotion/styled';
+
+import { AppPath } from '@/types/AppPath';
+import { MainButton } from '@/ui/input/button/components/MainButton';
+import { useAuthorizeAppMutation } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
+
+type App = { id: string; name: string; logo: string };
+
+const StyledContainer = styled.div`
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  height: 100vh;
+  justify-content: center;
+  width: 100%;
+`;
+
+const StyledAppsContainer = styled.div`
+  align-items: center;
+  display: flex;
+  flex-direction: row;
+  gap: ${({ theme }) => theme.spacing(4)};
+  justify-content: center;
+`;
+
+const StyledText = styled.div`
+  color: ${({ theme }) => theme.font.color.primary};
+  font-family: 'Inter';
+  font-size: ${({ theme }) => theme.font.size.lg};
+  font-weight: ${({ theme }) => theme.font.weight.semiBold};
+  padding: ${({ theme }) => theme.spacing(6)} 0px;
+`;
+
+const StyledCardWrapper = styled.div`
+  display: flex;
+  background-color: ${({ theme }) => theme.background.primary};
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 400px;
+  padding: ${({ theme }) => theme.spacing(6)};
+  box-shadow: ${({ theme }) => theme.boxShadow.strong};
+  border-radius: ${({ theme }) => theme.border.radius.md};
+`;
+
+const StyledButtonContainer = styled.div`
+  display: flex;
+  flex-direction: row;
+  gap: 10px;
+  width: 100%;
+`;
+const Authorize = () => {
+  const navigate = useNavigate();
+  const [searchParam] = useSearchParams();
+  //TODO: Replace with db call for registered third party apps
+  const [apps] = useState<App[]>([
+    {
+      id: 'chrome',
+      name: 'Chrome Extension',
+      logo: 'images/integrations/chrome-icon.svg',
+    },
+  ]);
+  const [app, setApp] = useState<App>();
+  const clientId = searchParam.get('clientId');
+  const codeChallenge = searchParam.get('codeChallenge');
+
+  useEffect(() => {
+    const app = apps.find((app) => app.id === clientId);
+    if (!isDefined(app)) navigate(AppPath.NotFound);
+    else setApp(app);
+    //eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  const [authorizeApp] = useAuthorizeAppMutation();
+  const handleAuthorize = async () => {
+    if (isDefined(clientId) && isDefined(codeChallenge)) {
+      await authorizeApp({
+        variables: {
+          clientId,
+          codeChallenge,
+        },
+        onCompleted: (data) => {
+          window.location.href = data.authorizeApp.redirectUrl;
+        },
+        onError: (error) => {
+          throw Error(error.message);
+        },
+      });
+    }
+  };
+
+  return (
+    <StyledContainer>
+      <StyledCardWrapper>
+        <StyledAppsContainer>
+          <img
+            src="/images/integrations/twenty-logo.svg"
+            alt="twenty-icon"
+            height={40}
+            width={40}
+          />
+          <img
+            src="/images/integrations/link-apps.svg"
+            alt="link-icon"
+            height={60}
+            width={60}
+          />
+          <img src={app?.logo} alt="app-icon" height={40} width={40} />
+        </StyledAppsContainer>
+        <StyledText>{app?.name} wants to access your account</StyledText>
+        <StyledButtonContainer>
+          <MainButton
+            title="Cancel"
+            variant="secondary"
+            onClick={() => navigate(AppPath.Index)}
+            fullWidth
+          />
+          <MainButton title="Authorize" onClick={handleAuthorize} fullWidth />
+        </StyledButtonContainer>
+      </StyledCardWrapper>
+    </StyledContainer>
+  );
+};
+
+export default Authorize;
diff --git a/packages/twenty-front/src/pages/auth/ChooseYourPlan.tsx b/packages/twenty-front/src/pages/auth/ChooseYourPlan.tsx
index f5a8afdca266..6f12824d5f9b 100644
--- a/packages/twenty-front/src/pages/auth/ChooseYourPlan.tsx
+++ b/packages/twenty-front/src/pages/auth/ChooseYourPlan.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
 import styled from '@emotion/styled';
+import { isNonEmptyString, isNumber } from '@sniptt/guards';
 import { useRecoilValue } from 'recoil';
 
 import { SubTitle } from '@/auth/components/SubTitle.tsx';
@@ -9,14 +10,15 @@ import { SubscriptionCard } from '@/billing/components/SubscriptionCard.tsx';
 import { billingState } from '@/client-config/states/billingState.ts';
 import { AppPath } from '@/types/AppPath.ts';
 import { Loader } from '@/ui/feedback/loader/components/Loader.tsx';
-import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar.tsx';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar.ts';
 import { MainButton } from '@/ui/input/button/components/MainButton.tsx';
 import { CardPicker } from '@/ui/input/components/CardPicker.tsx';
 import {
   ProductPriceEntity,
-  useCheckoutMutation,
+  useCheckoutSessionMutation,
   useGetProductPricesQuery,
 } from '~/generated/graphql.tsx';
+import { isDefined } from '~/utils/isDefined';
 
 const StyledChoosePlanContainer = styled.div`
   display: flex;
@@ -53,11 +55,11 @@ export const ChooseYourPlan = () => {
     variables: { product: 'base-plan' },
   });
 
-  const [checkout] = useCheckoutMutation();
+  const [checkoutSession] = useCheckoutSessionMutation();
 
   const handlePlanChange = (type?: string) => {
     return () => {
-      if (type && planSelected !== type) {
+      if (isNonEmptyString(type) && planSelected !== type) {
         setPlanSelected(type);
       }
     };
@@ -73,7 +75,13 @@ export const ChooseYourPlan = () => {
     const monthPrice = prices.filter(
       (price) => price.recurringInterval === 'month',
     )?.[0];
-    if (monthPrice && monthPrice.unitAmount && price.unitAmount) {
+    if (
+      isDefined(monthPrice) &&
+      isNumber(monthPrice.unitAmount) &&
+      monthPrice.unitAmount > 0 &&
+      isNumber(price.unitAmount) &&
+      price.unitAmount > 0
+    ) {
       return `Save $${(12 * monthPrice.unitAmount - price.unitAmount) / 100}`;
     }
     return 'Cancel anytime';
@@ -81,14 +89,14 @@ export const ChooseYourPlan = () => {
 
   const handleButtonClick = async () => {
     setIsSubmitting(true);
-    const { data } = await checkout({
+    const { data } = await checkoutSession({
       variables: {
         recurringInterval: planSelected,
         successUrlPath: AppPath.PlanRequiredSuccess,
       },
     });
     setIsSubmitting(false);
-    if (!data?.checkout.url) {
+    if (!data?.checkoutSession.url) {
       enqueueSnackBar(
         'Checkout session error. Please retry or contact Twenty team',
         {
@@ -97,7 +105,7 @@ export const ChooseYourPlan = () => {
       );
       return;
     }
-    window.location.replace(data.checkout.url);
+    window.location.replace(data.checkoutSession.url);
   };
 
   return (
diff --git a/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx b/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx
index ff605c5e3d50..3313ace6b79f 100644
--- a/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx
+++ b/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx
@@ -3,12 +3,14 @@ import { Controller, SubmitHandler, useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
 import styled from '@emotion/styled';
 import { zodResolver } from '@hookform/resolvers/zod';
+import { useSetRecoilState } from 'recoil';
 import { Key } from 'ts-key-enum';
 import { z } from 'zod';
 
 import { SubTitle } from '@/auth/components/SubTitle';
 import { Title } from '@/auth/components/Title';
 import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus';
+import { isCurrentUserLoadedState } from '@/auth/states/isCurrentUserLoadingState';
 import { OnboardingStatus } from '@/auth/utils/getOnboardingStatus';
 import { FIND_MANY_OBJECT_METADATA_ITEMS } from '@/object-metadata/graphql/queries';
 import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient';
@@ -19,8 +21,8 @@ import { Loader } from '@/ui/feedback/loader/components/Loader.tsx';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { MainButton } from '@/ui/input/button/components/MainButton';
 import { TextInput } from '@/ui/input/components/TextInput';
-import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
 import { useActivateWorkspaceMutation } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
 
 const StyledContentContainer = styled.div`
   width: 100%;
@@ -51,6 +53,7 @@ export const CreateWorkspace = () => {
 
   const [activateWorkspace] = useActivateWorkspaceMutation();
   const apolloMetadataClient = useApolloMetadataClient();
+  const setIsCurrentUserLoaded = useSetRecoilState(isCurrentUserLoadedState);
 
   // Form
   const {
@@ -74,14 +77,14 @@ export const CreateWorkspace = () => {
               displayName: data.name,
             },
           },
-          refetchQueries: [GET_CURRENT_USER],
         });
+        setIsCurrentUserLoaded(false);
 
         await apolloMetadataClient?.refetchQueries({
           include: [FIND_MANY_OBJECT_METADATA_ITEMS],
         });
 
-        if (result.errors) {
+        if (isDefined(result.errors)) {
           throw result.errors ?? new Error('Unknown error');
         }
 
@@ -94,7 +97,13 @@ export const CreateWorkspace = () => {
         });
       }
     },
-    [enqueueSnackBar, navigate, apolloMetadataClient, activateWorkspace],
+    [
+      activateWorkspace,
+      setIsCurrentUserLoaded,
+      apolloMetadataClient,
+      navigate,
+      enqueueSnackBar,
+    ],
   );
 
   const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
diff --git a/packages/twenty-front/src/pages/auth/PasswordReset.tsx b/packages/twenty-front/src/pages/auth/PasswordReset.tsx
index f134c5befdc4..579537d62bf8 100644
--- a/packages/twenty-front/src/pages/auth/PasswordReset.tsx
+++ b/packages/twenty-front/src/pages/auth/PasswordReset.tsx
@@ -5,6 +5,7 @@ import { useNavigate, useParams } from 'react-router-dom';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { zodResolver } from '@hookform/resolvers/zod';
+import { isNonEmptyString } from '@sniptt/guards';
 import { motion } from 'framer-motion';
 import { z } from 'zod';
 
@@ -65,15 +66,6 @@ const StyledInputContainer = styled.div`
   margin-bottom: ${({ theme }) => theme.spacing(3)};
 `;
 
-const StyledFooterContainer = styled.div`
-  align-items: center;
-  color: ${({ theme }) => theme.font.color.tertiary};
-  display: flex;
-  font-size: ${({ theme }) => theme.font.size.sm};
-  text-align: center;
-  max-width: 280px;
-`;
-
 export const PasswordReset = () => {
   const { enqueueSnackBar } = useSnackBar();
 
@@ -106,13 +98,13 @@ export const PasswordReset = () => {
         variant: 'error',
       });
       if (!isLoggedIn) {
-        navigate(AppPath.SignIn);
+        navigate(AppPath.SignInUp);
       } else {
         navigate(AppPath.Index);
       }
     },
     onCompleted: (data) => {
-      if (data?.validatePasswordResetToken?.email) {
+      if (isNonEmptyString(data?.validatePasswordResetToken?.email)) {
         setEmail(data.validatePasswordResetToken.email);
       }
     },
@@ -252,10 +244,6 @@ export const PasswordReset = () => {
           </StyledForm>
         )}
       </StyledContentContainer>
-      <StyledFooterContainer>
-        By using Twenty, you agree to the Terms of Service and Data Processing
-        Agreement.
-      </StyledFooterContainer>
     </StyledMainContainer>
   );
 };
diff --git a/packages/twenty-front/src/pages/auth/PaymentSuccess.tsx b/packages/twenty-front/src/pages/auth/PaymentSuccess.tsx
index 48c65566f359..4ceda8b8d1a0 100644
--- a/packages/twenty-front/src/pages/auth/PaymentSuccess.tsx
+++ b/packages/twenty-front/src/pages/auth/PaymentSuccess.tsx
@@ -2,11 +2,11 @@ import React from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconCheck } from 'twenty-ui';
 
 import { SubTitle } from '@/auth/components/SubTitle.tsx';
 import { Title } from '@/auth/components/Title.tsx';
 import { AppPath } from '@/types/AppPath.ts';
-import { IconCheck } from '@/ui/display/icon';
 import { MainButton } from '@/ui/input/button/components/MainButton.tsx';
 import { RGBA } from '@/ui/theme/constants/Rgba.ts';
 import { AnimatedEaseIn } from '@/ui/utilities/animation/components/AnimatedEaseIn.tsx';
diff --git a/packages/twenty-front/src/pages/auth/PlanRequired.tsx b/packages/twenty-front/src/pages/auth/PlanRequired.tsx
deleted file mode 100644
index 8c8a18fb7679..000000000000
--- a/packages/twenty-front/src/pages/auth/PlanRequired.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import React from 'react';
-import styled from '@emotion/styled';
-import { useRecoilValue } from 'recoil';
-
-import { Logo } from '@/auth/components/Logo';
-import { SubTitle } from '@/auth/components/SubTitle';
-import { Title } from '@/auth/components/Title';
-import { billingState } from '@/client-config/states/billingState';
-import { PageHotkeyScope } from '@/types/PageHotkeyScope';
-import { MainButton } from '@/ui/input/button/components/MainButton.tsx';
-import { AnimatedEaseIn } from '@/ui/utilities/animation/components/AnimatedEaseIn';
-import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
-
-const StyledButtonContainer = styled.div`
-  margin-top: ${({ theme }) => theme.spacing(8)};
-`;
-
-export const PlanRequired = () => {
-  const billing = useRecoilValue(billingState);
-
-  const handleButtonClick = () => {
-    billing?.billingUrl && window.location.replace(billing.billingUrl);
-  };
-
-  useScopedHotkeys('enter', handleButtonClick, PageHotkeyScope.PlanRequired, [
-    handleButtonClick,
-  ]);
-
-  return (
-    <>
-      <AnimatedEaseIn>
-        <Logo />
-      </AnimatedEaseIn>
-      <Title>Plan required</Title>
-      <SubTitle>
-        Please select a subscription plan before proceeding to sign in.
-      </SubTitle>
-      <StyledButtonContainer>
-        <MainButton
-          title="Get started"
-          onClick={handleButtonClick}
-          width={200}
-        />
-      </StyledButtonContainer>
-    </>
-  );
-};
diff --git a/packages/twenty-front/src/pages/auth/__stories__/PasswordResert.stories.tsx b/packages/twenty-front/src/pages/auth/__stories__/PasswordReset.stories.tsx
similarity index 100%
rename from packages/twenty-front/src/pages/auth/__stories__/PasswordResert.stories.tsx
rename to packages/twenty-front/src/pages/auth/__stories__/PasswordReset.stories.tsx
diff --git a/packages/twenty-front/src/pages/auth/__stories__/PaymentSuccess.stories.tsx b/packages/twenty-front/src/pages/auth/__stories__/PaymentSuccess.stories.tsx
new file mode 100644
index 000000000000..dec1d3e81629
--- /dev/null
+++ b/packages/twenty-front/src/pages/auth/__stories__/PaymentSuccess.stories.tsx
@@ -0,0 +1,48 @@
+import { getOperationName } from '@apollo/client/utilities';
+import { Meta, StoryObj } from '@storybook/react';
+import { within } from '@storybook/testing-library';
+import { graphql, HttpResponse } from 'msw';
+
+import { AppPath } from '@/types/AppPath';
+import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
+import {
+  PageDecorator,
+  PageDecoratorArgs,
+} from '~/testing/decorators/PageDecorator';
+import { graphqlMocks } from '~/testing/graphqlMocks';
+import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
+
+import { PaymentSuccess } from '../PaymentSuccess';
+
+const meta: Meta<PageDecoratorArgs> = {
+  title: 'Pages/Auth/PaymentSuccess',
+  component: PaymentSuccess,
+  decorators: [PageDecorator],
+  args: { routePath: AppPath.PlanRequiredSuccess },
+  parameters: {
+    msw: {
+      handlers: [
+        graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
+          return HttpResponse.json({
+            data: {
+              currentUser: mockedOnboardingUsersData[0],
+            },
+          });
+        }),
+        graphqlMocks.handlers,
+      ],
+    },
+  },
+};
+
+export default meta;
+
+export type Story = StoryObj<typeof PaymentSuccess>;
+
+export const Default: Story = {
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    await canvas.findByText('Start');
+  },
+};
diff --git a/packages/twenty-front/src/pages/auth/__stories__/PlanRequired.stories.tsx b/packages/twenty-front/src/pages/auth/__stories__/PlanRequired.stories.tsx
deleted file mode 100644
index f325f824ca12..000000000000
--- a/packages/twenty-front/src/pages/auth/__stories__/PlanRequired.stories.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { getOperationName } from '@apollo/client/utilities';
-import { Meta, StoryObj } from '@storybook/react';
-import { within } from '@storybook/test';
-import { graphql, HttpResponse } from 'msw';
-
-import { AppPath } from '@/types/AppPath';
-import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
-import {
-  PageDecorator,
-  PageDecoratorArgs,
-} from '~/testing/decorators/PageDecorator';
-import { graphqlMocks } from '~/testing/graphqlMocks';
-import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
-
-import { PlanRequired } from '../PlanRequired';
-
-const meta: Meta<PageDecoratorArgs> = {
-  title: 'Pages/Auth/PlanRequired',
-  component: PlanRequired,
-  decorators: [PageDecorator],
-  args: { routePath: AppPath.PlanRequired },
-  parameters: {
-    msw: {
-      handlers: [
-        graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
-          return HttpResponse.json({
-            data: {
-              currentUser: {
-                ...mockedOnboardingUsersData[0],
-                defaultWorkspace: {
-                  ...mockedOnboardingUsersData[0].defaultWorkspace,
-                  subscriptionStatus: 'incomplete',
-                },
-              },
-            },
-          });
-        }),
-        graphqlMocks.handlers,
-      ],
-    },
-  },
-};
-
-export default meta;
-
-export type Story = StoryObj<typeof PlanRequired>;
-
-export const Default: Story = {
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-
-    await canvas.findByRole('button', { name: 'Get started' });
-  },
-};
diff --git a/packages/twenty-front/src/pages/auth/__stories__/SignInUp.stories.tsx b/packages/twenty-front/src/pages/auth/__stories__/SignInUp.stories.tsx
index 2c40e0359c71..9ff9f3035dd9 100644
--- a/packages/twenty-front/src/pages/auth/__stories__/SignInUp.stories.tsx
+++ b/packages/twenty-front/src/pages/auth/__stories__/SignInUp.stories.tsx
@@ -18,7 +18,7 @@ const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Auth/SignInUp',
   component: SignInUp,
   decorators: [PageDecorator],
-  args: { routePath: AppPath.SignIn },
+  args: { routePath: AppPath.SignInUp },
   parameters: {
     msw: {
       handlers: [
diff --git a/packages/twenty-front/src/pages/impersonate/ImpersonateEffect.tsx b/packages/twenty-front/src/pages/impersonate/ImpersonateEffect.tsx
index 4e0902acfa35..897ab095fc2f 100644
--- a/packages/twenty-front/src/pages/impersonate/ImpersonateEffect.tsx
+++ b/packages/twenty-front/src/pages/impersonate/ImpersonateEffect.tsx
@@ -8,6 +8,7 @@ import { currentUserState } from '@/auth/states/currentUserState';
 import { tokenPairState } from '@/auth/states/tokenPairState';
 import { AppPath } from '@/types/AppPath';
 import { useImpersonateMutation } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
 
 export const ImpersonateEffect = () => {
   const navigate = useNavigate();
@@ -29,7 +30,7 @@ export const ImpersonateEffect = () => {
       variables: { userId },
     });
 
-    if (impersonateResult.errors) {
+    if (isDefined(impersonateResult.errors)) {
       throw impersonateResult.errors;
     }
 
@@ -47,7 +48,11 @@ export const ImpersonateEffect = () => {
   }, [userId, impersonate, setCurrentUser, setTokenPair]);
 
   useEffect(() => {
-    if (isLogged && currentUser?.canImpersonate && isNonEmptyString(userId)) {
+    if (
+      isLogged &&
+      currentUser?.canImpersonate === true &&
+      isNonEmptyString(userId)
+    ) {
       handleImpersonate();
     } else {
       // User is not allowed to impersonate or not logged in
diff --git a/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx b/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx
index 61f719d43766..dbd2aacbad79 100644
--- a/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx
+++ b/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx
@@ -1,9 +1,9 @@
 import { useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
+import { v4 } from 'uuid';
 
-import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
-import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 import { RecordIndexContainer } from '@/object-record/record-index/components/RecordIndexContainer';
+import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
 import { DEFAULT_CELL_SCOPE } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell';
 import { useSelectedTableCellEditMode } from '@/object-record/record-table/record-table-cell/hooks/useSelectedTableCellEditMode';
 import { PageBody } from '@/ui/layout/page/PageBody';
@@ -20,14 +20,6 @@ const StyledIndexContainer = styled.div`
 export const RecordIndexPage = () => {
   const objectNamePlural = useParams().objectNamePlural ?? '';
 
-  const { objectNameSingular } = useObjectNameSingularFromPlural({
-    objectNamePlural,
-  });
-
-  const { createOneRecord: createOneObject } = useCreateOneRecord({
-    objectNameSingular,
-  });
-
   const recordIndexId = objectNamePlural ?? '';
   const setHotkeyScope = useSetHotkeyScope();
 
@@ -35,12 +27,14 @@ export const RecordIndexPage = () => {
     scopeId: recordIndexId,
   });
 
+  const { setPendingRecordId } = useRecordTable({
+    recordTableId: recordIndexId,
+  });
+
   const handleAddButtonClick = async () => {
-    await createOneObject?.({
-      position: 0,
-    });
+    setPendingRecordId(v4());
 
-    setSelectedTableCellEditMode(0, 0);
+    setSelectedTableCellEditMode(-1, 0);
     setHotkeyScope(DEFAULT_CELL_SCOPE.scope, DEFAULT_CELL_SCOPE.customScopes);
   };
 
diff --git a/packages/twenty-front/src/pages/object-record/RecordIndexPageHeader.tsx b/packages/twenty-front/src/pages/object-record/RecordIndexPageHeader.tsx
index fd24ab76f1b3..4ee949ff9736 100644
--- a/packages/twenty-front/src/pages/object-record/RecordIndexPageHeader.tsx
+++ b/packages/twenty-front/src/pages/object-record/RecordIndexPageHeader.tsx
@@ -1,7 +1,7 @@
 import { useParams } from 'react-router-dom';
 import { useRecoilValue } from 'recoil';
 
-import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { recordIndexViewTypeState } from '@/object-record/record-index/states/recordIndexViewTypeState';
 import { useIcons } from '@/ui/display/icon/hooks/useIcons';
 import { PageAddButton } from '@/ui/layout/page/PageAddButton';
@@ -20,7 +20,10 @@ export const RecordIndexPageHeader = ({
   const objectNamePlural = useParams().objectNamePlural ?? '';
 
   const { findObjectMetadataItemByNamePlural } =
-    useObjectMetadataItemForSettings();
+    useFilteredObjectMetadataItems();
+
+  const objectMetadataItem =
+    findObjectMetadataItemByNamePlural(objectNamePlural);
 
   const { getIcon } = useIcons();
   const Icon = getIcon(
@@ -29,12 +32,13 @@ export const RecordIndexPageHeader = ({
 
   const recordIndexViewType = useRecoilValue(recordIndexViewTypeState);
 
+  const canAddRecord =
+    recordIndexViewType === ViewType.Table && !objectMetadataItem?.isRemote;
+
   return (
     <PageHeader title={capitalize(objectNamePlural)} Icon={Icon}>
       <PageHotkeysEffect onAddButtonClick={createRecord} />
-      {recordIndexViewType === ViewType.Table && (
-        <PageAddButton onClick={createRecord} />
-      )}
+      {canAddRecord && <PageAddButton onClick={createRecord} />}
     </PageHeader>
   );
 };
diff --git a/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx b/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx
index 0e6e93c87a6b..f75b0b0aa3fb 100644
--- a/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx
+++ b/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx
@@ -3,11 +3,12 @@ import { useParams } from 'react-router-dom';
 import { useSetRecoilState } from 'recoil';
 
 import { useFavorites } from '@/favorites/hooks/useFavorites';
+import { useLabelIdentifierFieldMetadataItem } from '@/object-metadata/hooks/useLabelIdentifierFieldMetadataItem';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
 import { RecordShowContainer } from '@/object-record/record-show/components/RecordShowContainer';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
-import { IconBuildingSkyscraper } from '@/ui/display/icon';
+import { useIcons } from '@/ui/display/icon/hooks/useIcons';
 import { PageBody } from '@/ui/layout/page/PageBody';
 import { PageContainer } from '@/ui/layout/page/PageContainer';
 import { PageFavoriteButton } from '@/ui/layout/page/PageFavoriteButton';
@@ -16,7 +17,7 @@ import { ShowPageAddButton } from '@/ui/layout/show-page/components/ShowPageAddB
 import { ShowPageMoreButton } from '@/ui/layout/show-page/components/ShowPageMoreButton';
 import { PageTitle } from '@/ui/utilities/page-title/PageTitle';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
-import { isNonNullable } from '~/utils/isNonNullable';
+import { isDefined } from '~/utils/isDefined';
 
 export const RecordShowPage = () => {
   const { objectNameSingular, objectRecordId } = useParams<{
@@ -32,8 +33,14 @@ export const RecordShowPage = () => {
     throw new Error(`Record id is not defined`);
   }
 
-  const { labelIdentifierFieldMetadata, objectMetadataItem } =
-    useObjectMetadataItem({ objectNameSingular });
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { labelIdentifierFieldMetadataItem } =
+    useLabelIdentifierFieldMetadataItem({
+      objectNameSingular,
+    });
 
   const { favorites, createFavorite, deleteFavorite } = useFavorites();
 
@@ -41,6 +48,10 @@ export const RecordShowPage = () => {
     recordStoreFamilyState(objectRecordId),
   );
 
+  const { getIcon } = useIcons();
+
+  const headerIcon = getIcon(objectMetadataItem?.icon);
+
   const { record, loading } = useFindOneRecord({
     objectRecordId,
     objectNameSingular,
@@ -55,12 +66,12 @@ export const RecordShowPage = () => {
     (favorite) => favorite.recordId === objectRecordId,
   );
 
-  const isFavorite = isNonNullable(correspondingFavorite);
+  const isFavorite = isDefined(correspondingFavorite);
 
   const handleFavoriteButtonClick = async () => {
     if (!objectNameSingular || !record) return;
 
-    if (isFavorite && record) {
+    if (isFavorite && isDefined(record)) {
       deleteFavorite(correspondingFavorite.id);
     } else {
       createFavorite(record, objectNameSingular);
@@ -68,14 +79,19 @@ export const RecordShowPage = () => {
   };
 
   const labelIdentifierFieldValue =
-    record?.[labelIdentifierFieldMetadata?.name ?? ''];
+    record?.[labelIdentifierFieldMetadataItem?.name ?? ''];
   const pageName =
-    labelIdentifierFieldMetadata?.type === FieldMetadataType.FullName
+    labelIdentifierFieldMetadataItem?.type === FieldMetadataType.FullName
       ? [
           labelIdentifierFieldValue?.firstName,
           labelIdentifierFieldValue?.lastName,
         ].join(' ')
-      : labelIdentifierFieldValue;
+      : `${labelIdentifierFieldValue}`;
+
+  // Temporarily since we don't have relations for remote objects yet
+  if (objectMetadataItem.isRemote) {
+    return null;
+  }
 
   return (
     <PageContainer>
@@ -83,7 +99,7 @@ export const RecordShowPage = () => {
       <PageHeader
         title={pageName ?? ''}
         hasBackButton
-        Icon={IconBuildingSkyscraper}
+        Icon={headerIcon}
         loading={loading}
       >
         {record && (
diff --git a/packages/twenty-front/src/pages/object-record/__stories__/RecordShowPage.stories.tsx b/packages/twenty-front/src/pages/object-record/__stories__/RecordShowPage.stories.tsx
index 0c590a9844f4..5f1a03c5d158 100644
--- a/packages/twenty-front/src/pages/object-record/__stories__/RecordShowPage.stories.tsx
+++ b/packages/twenty-front/src/pages/object-record/__stories__/RecordShowPage.stories.tsx
@@ -26,7 +26,7 @@ const meta: Meta<PageDecoratorArgs> = {
   parameters: {
     msw: {
       handlers: [
-        graphql.query('FindOneperson', () => {
+        graphql.query('FindOnePerson', () => {
           return HttpResponse.json({
             data: {
               person: mockedPeopleData[0],
diff --git a/packages/twenty-front/src/pages/opportunities/Opportunities.tsx b/packages/twenty-front/src/pages/opportunities/Opportunities.tsx
deleted file mode 100644
index e091df565cc0..000000000000
--- a/packages/twenty-front/src/pages/opportunities/Opportunities.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import styled from '@emotion/styled';
-
-import { CompanyBoard } from '@/companies/board/components/CompanyBoard';
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { PipelineAddButton } from '@/pipeline/components/PipelineAddButton';
-import { usePipelineSteps } from '@/pipeline/hooks/usePipelineSteps';
-import { PipelineStep } from '@/pipeline/types/PipelineStep';
-import { IconTargetArrow } from '@/ui/display/icon';
-import { PageBody } from '@/ui/layout/page/PageBody';
-import { PageContainer } from '@/ui/layout/page/PageContainer';
-import { PageHeader } from '@/ui/layout/page/PageHeader';
-
-const StyledBoardContainer = styled.div`
-  display: flex;
-  height: 100%;
-  width: 100%;
-`;
-
-export const Opportunities = () => {
-  const { handlePipelineStepAdd, handlePipelineStepDelete } =
-    usePipelineSteps();
-
-  const { updateOneRecord: updateOnePipelineStep } =
-    useUpdateOneRecord<PipelineStep>({
-      objectNameSingular: CoreObjectNameSingular.PipelineStep,
-    });
-
-  const handleEditColumnTitle = ({
-    columnId,
-    title,
-    color,
-  }: {
-    columnId: string;
-    title: string;
-    color: string;
-  }) => {
-    updateOnePipelineStep?.({
-      idToUpdate: columnId,
-      updateOneRecordInput: { name: title, color },
-    });
-  };
-
-  return (
-    <PageContainer>
-      <PageHeader title="Opportunities" Icon={IconTargetArrow}>
-        <PipelineAddButton />
-      </PageHeader>
-      <PageBody>
-        <StyledBoardContainer>
-          <CompanyBoard
-            onColumnAdd={handlePipelineStepAdd}
-            onColumnDelete={handlePipelineStepDelete}
-            onEditColumnTitle={handleEditColumnTitle}
-          />
-        </StyledBoardContainer>
-      </PageBody>
-    </PageContainer>
-  );
-};
diff --git a/packages/twenty-front/src/pages/opportunities/__stories__/Opportunities.stories.tsx b/packages/twenty-front/src/pages/opportunities/__stories__/Opportunities.stories.tsx
deleted file mode 100644
index b0ac3886c6c0..000000000000
--- a/packages/twenty-front/src/pages/opportunities/__stories__/Opportunities.stories.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import { Meta, StoryObj } from '@storybook/react';
-import { userEvent, within } from '@storybook/test';
-
-import { ObjectMetadataItemsRelationPickerEffect } from '@/object-metadata/components/ObjectMetadataItemsRelationPickerEffect';
-import { AppPath } from '@/types/AppPath';
-import {
-  PageDecorator,
-  PageDecoratorArgs,
-} from '~/testing/decorators/PageDecorator';
-import { graphqlMocks } from '~/testing/graphqlMocks';
-
-import { Opportunities } from '../Opportunities';
-
-const meta: Meta<PageDecoratorArgs> = {
-  title: 'Pages/Opportunities/Default',
-  component: Opportunities,
-  decorators: [
-    (Story) => {
-      return (
-        <>
-          <ObjectMetadataItemsRelationPickerEffect />
-          <Story />
-        </>
-      );
-    },
-    PageDecorator,
-  ],
-  args: { routePath: AppPath.OpportunitiesPage },
-  parameters: {
-    msw: graphqlMocks,
-  },
-};
-
-export default meta;
-
-export type Story = StoryObj<typeof Opportunities>;
-
-export const Default: Story = {};
-
-export const AddCompanyFromHeader: Story = {
-  play: async ({ canvasElement, step }) => {
-    const canvas = within(canvasElement);
-
-    await step('Click on the add company button', async () => {
-      const button = await canvas.findByTestId('add-company-progress-button');
-
-      await userEvent.click(button);
-
-      await canvas.findByRole(
-        'listitem',
-        { name: (_, element) => !!element?.textContent?.includes('Algolia') },
-        { timeout: 1000 },
-      );
-    });
-
-    await step('Change pipeline stage', async () => {
-      const pipelineStepDropdownHeader = await canvas.findByRole(
-        'listitem',
-        { name: (_, element) => !!element?.textContent?.includes('New') },
-        { timeout: 1000 },
-      );
-
-      const pipelineStepDropdownUnfoldButton = within(
-        pipelineStepDropdownHeader,
-      ).getByRole('button');
-
-      await userEvent.click(pipelineStepDropdownUnfoldButton);
-
-      const menuItem1 = await canvas.findByRole(
-        'listitem',
-        { name: (_, element) => !!element?.textContent?.includes('Screening') },
-        { timeout: 1000 },
-      );
-
-      await userEvent.click(menuItem1);
-    });
-
-    // TODO: mock add company mutation and add step for company creation
-  },
-};
diff --git a/packages/twenty-front/src/pages/opportunities/constants/opportunityBoardFilterDefinitions.tsx b/packages/twenty-front/src/pages/opportunities/constants/opportunityBoardFilterDefinitions.tsx
deleted file mode 100644
index 2f81d1d12252..000000000000
--- a/packages/twenty-front/src/pages/opportunities/constants/opportunityBoardFilterDefinitions.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { FilterDefinitionByEntity } from '@/object-record/object-filter-dropdown/types/FilterDefinitionByEntity';
-import { Opportunity } from '@/pipeline/types/Opportunity';
-
-export const opportunityBoardFilterDefinitions: FilterDefinitionByEntity<Opportunity>[] =
-  [
-    {
-      fieldMetadataId: 'amount',
-      label: 'Amount',
-      iconName: 'IconCurrencyDollar',
-      type: 'NUMBER',
-    },
-    {
-      fieldMetadataId: 'closeDate',
-      label: 'Close date',
-      iconName: 'IconCalendarEvent',
-      type: 'DATE_TIME',
-    },
-    {
-      fieldMetadataId: 'companyId',
-      label: 'Company',
-      iconName: 'IconBuildingSkyscraper',
-      type: 'RELATION',
-    },
-    {
-      fieldMetadataId: 'pointOfContactId',
-      label: 'Point of contact',
-      iconName: 'IconUser',
-      type: 'RELATION',
-    },
-  ];
diff --git a/packages/twenty-front/src/pages/opportunities/constants/opportunityBoardSortDefinitions.tsx b/packages/twenty-front/src/pages/opportunities/constants/opportunityBoardSortDefinitions.tsx
deleted file mode 100644
index d099da721e1a..000000000000
--- a/packages/twenty-front/src/pages/opportunities/constants/opportunityBoardSortDefinitions.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
-
-export const opportunityBoardSortDefinitions: SortDefinition[] = [
-  {
-    fieldMetadataId: 'createdAt',
-    label: 'Creation',
-    iconName: 'IconCalendarEvent',
-  },
-  {
-    fieldMetadataId: 'amount',
-    label: 'Amount',
-    iconName: 'IconCurrencyDollar',
-  },
-  {
-    fieldMetadataId: 'closeDate',
-    label: 'Expected close date',
-    iconName: 'IconCalendarEvent',
-  },
-];
diff --git a/packages/twenty-front/src/pages/opportunities/opportunitiesBoardOptions.tsx b/packages/twenty-front/src/pages/opportunities/opportunitiesBoardOptions.tsx
deleted file mode 100644
index 679768ee83be..000000000000
--- a/packages/twenty-front/src/pages/opportunities/opportunitiesBoardOptions.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { CompanyBoardCard } from '@/companies/components/CompanyBoardCard';
-import { NewOpportunityButton } from '@/companies/components/NewOpportunityButton';
-import { BoardOptions } from '@/object-record/record-board-deprecated/types/BoardOptions';
-import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
-
-export const opportunitiesBoardOptions: BoardOptions = {
-  newCardComponent: (
-    <RecoilScope>
-      <NewOpportunityButton />
-    </RecoilScope>
-  ),
-  CardComponent: CompanyBoardCard,
-};
diff --git a/packages/twenty-front/src/pages/settings/SettingsAppearance.tsx b/packages/twenty-front/src/pages/settings/SettingsAppearance.tsx
index 02a1735aa67a..30db3ecf8dbc 100644
--- a/packages/twenty-front/src/pages/settings/SettingsAppearance.tsx
+++ b/packages/twenty-front/src/pages/settings/SettingsAppearance.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled';
+import { IconSettings } from 'twenty-ui';
 
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { IconSettings } from '@/ui/display/icon';
 import { H1Title } from '@/ui/display/typography/components/H1Title';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { ColorSchemePicker } from '@/ui/input/color-scheme/components/ColorSchemePicker';
diff --git a/packages/twenty-front/src/pages/settings/SettingsBilling.tsx b/packages/twenty-front/src/pages/settings/SettingsBilling.tsx
new file mode 100644
index 000000000000..7227da9900ff
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/SettingsBilling.tsx
@@ -0,0 +1,230 @@
+import React, { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import styled from '@emotion/styled';
+import { useRecoilValue, useSetRecoilState } from 'recoil';
+import {
+  IconCalendarEvent,
+  IconCircleX,
+  IconCreditCard,
+  IconCurrencyDollar,
+} from 'twenty-ui';
+
+import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus.ts';
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState.ts';
+import { OnboardingStatus } from '@/auth/utils/getOnboardingStatus.ts';
+import { SettingsBillingCoverImage } from '@/billing/components/SettingsBillingCoverImage';
+import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
+import { SupportChat } from '@/support/components/SupportChat';
+import { AppPath } from '@/types/AppPath.ts';
+import { Info } from '@/ui/display/info/components/Info';
+import { H1Title } from '@/ui/display/typography/components/H1Title';
+import { H2Title } from '@/ui/display/typography/components/H2Title';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { Button } from '@/ui/input/button/components/Button';
+import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
+import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
+import { Section } from '@/ui/layout/section/components/Section';
+import {
+  useBillingPortalSessionQuery,
+  useUpdateBillingSubscriptionMutation,
+} from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
+
+const StyledH1Title = styled(H1Title)`
+  margin-bottom: 0;
+`;
+
+const StyledInvisibleChat = styled.div`
+  display: none;
+`;
+
+type SwitchInfo = {
+  newInterval: string;
+  to: string;
+  from: string;
+  impact: string;
+};
+
+const MONTHLY_SWITCH_INFO: SwitchInfo = {
+  newInterval: 'year',
+  to: 'to yearly',
+  from: 'from monthly to yearly',
+  impact: 'You will be charged immediately for the full year.',
+};
+
+const YEARLY_SWITCH_INFO: SwitchInfo = {
+  newInterval: 'month',
+  to: 'to monthly',
+  from: 'from yearly to monthly',
+  impact: 'Your credit balance will be used to pay the monthly bills.',
+};
+
+const SWITCH_INFOS = {
+  year: YEARLY_SWITCH_INFO,
+  month: MONTHLY_SWITCH_INFO,
+};
+
+export const SettingsBilling = () => {
+  const navigate = useNavigate();
+  const { enqueueSnackBar } = useSnackBar();
+  const onboardingStatus = useOnboardingStatus();
+  const currentWorkspace = useRecoilValue(currentWorkspaceState);
+  const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
+  const switchingInfo =
+    currentWorkspace?.currentBillingSubscription?.interval === 'year'
+      ? SWITCH_INFOS.year
+      : SWITCH_INFOS.month;
+  const [isSwitchingIntervalModalOpen, setIsSwitchingIntervalModalOpen] =
+    useState(false);
+  const [updateBillingSubscription] = useUpdateBillingSubscriptionMutation();
+  const { data, loading } = useBillingPortalSessionQuery({
+    variables: {
+      returnUrlPath: '/settings/billing',
+    },
+  });
+
+  const billingPortalButtonDisabled =
+    loading || !isDefined(data) || !isDefined(data.billingPortalSession.url);
+
+  const displayPaymentFailInfo =
+    onboardingStatus === OnboardingStatus.PastDue ||
+    onboardingStatus === OnboardingStatus.Unpaid;
+
+  const displaySubscriptionCanceledInfo =
+    onboardingStatus === OnboardingStatus.Canceled;
+
+  const displaySubscribeInfo =
+    onboardingStatus === OnboardingStatus.CompletedWithoutSubscription;
+
+  const openBillingPortal = () => {
+    if (isDefined(data) && isDefined(data.billingPortalSession.url)) {
+      window.location.replace(data.billingPortalSession.url);
+    }
+  };
+
+  const openSwitchingIntervalModal = () => {
+    setIsSwitchingIntervalModalOpen(true);
+  };
+
+  const switchInterval = async () => {
+    try {
+      await updateBillingSubscription();
+      if (isDefined(currentWorkspace?.currentBillingSubscription)) {
+        const newCurrentWorkspace = {
+          ...currentWorkspace,
+          currentBillingSubscription: {
+            ...currentWorkspace?.currentBillingSubscription,
+            interval: switchingInfo.newInterval,
+          },
+        };
+        setCurrentWorkspace(newCurrentWorkspace);
+      }
+      enqueueSnackBar(`Subscription has been switched ${switchingInfo.to}`, {
+        variant: 'success',
+      });
+    } catch (error: any) {
+      enqueueSnackBar(
+        `Error while switching subscription ${switchingInfo.to}.`,
+        {
+          variant: 'error',
+        },
+      );
+    }
+  };
+
+  const redirectToSubscribePage = () => {
+    navigate(AppPath.PlanRequired);
+  };
+
+  return (
+    <SubMenuTopBarContainer Icon={IconCurrencyDollar} title="Billing">
+      <SettingsPageContainer>
+        <StyledH1Title title="Billing" />
+        <SettingsBillingCoverImage />
+        {displayPaymentFailInfo && (
+          <Info
+            text={'Last payment failed. Please update your billing details.'}
+            buttonTitle={'Update'}
+            accent={'danger'}
+            onClick={openBillingPortal}
+          />
+        )}
+        {displaySubscriptionCanceledInfo && (
+          <Info
+            text={'Subscription canceled. Please start a new one'}
+            buttonTitle={'Subscribe'}
+            accent={'danger'}
+            onClick={redirectToSubscribePage}
+          />
+        )}
+        {displaySubscribeInfo ? (
+          <Info
+            text={'Your workspace does not have an active subscription'}
+            buttonTitle={'Subscribe'}
+            accent={'danger'}
+            onClick={redirectToSubscribePage}
+          />
+        ) : (
+          <>
+            <Section>
+              <H2Title
+                title="Manage your subscription"
+                description="Edit payment method, see your invoices and more"
+              />
+              <Button
+                Icon={IconCreditCard}
+                title="View billing details"
+                variant="secondary"
+                onClick={openBillingPortal}
+              />
+            </Section>
+            <Section>
+              <H2Title
+                title="Edit billing interval"
+                description={`Switch ${switchingInfo.from}`}
+              />
+              <Button
+                Icon={IconCalendarEvent}
+                title={`Switch ${switchingInfo.to}`}
+                variant="secondary"
+                onClick={openSwitchingIntervalModal}
+                disabled={billingPortalButtonDisabled}
+              />
+            </Section>
+            <Section>
+              <H2Title
+                title="Cancel your subscription"
+                description="Your workspace will be disabled"
+              />
+              <Button
+                Icon={IconCircleX}
+                title="Cancel Plan"
+                variant="secondary"
+                accent="danger"
+                onClick={openBillingPortal}
+                disabled={billingPortalButtonDisabled}
+              />
+            </Section>
+          </>
+        )}
+      </SettingsPageContainer>
+      <StyledInvisibleChat>
+        <SupportChat />
+      </StyledInvisibleChat>
+      <ConfirmationModal
+        isOpen={isSwitchingIntervalModalOpen}
+        setIsOpen={setIsSwitchingIntervalModalOpen}
+        title={`Switch billing ${switchingInfo.to}`}
+        subtitle={
+          <>
+            {`Are you sure that you want to change your billing interval? 
+            ${switchingInfo.impact}`}
+          </>
+        }
+        onConfirmClick={switchInterval}
+        deleteButtonText={`Change ${switchingInfo.to}`}
+        confirmButtonAccent={'blue'}
+      />
+    </SubMenuTopBarContainer>
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/SettingsProfile.tsx b/packages/twenty-front/src/pages/settings/SettingsProfile.tsx
index bebda10dc967..ad846c6032e5 100644
--- a/packages/twenty-front/src/pages/settings/SettingsProfile.tsx
+++ b/packages/twenty-front/src/pages/settings/SettingsProfile.tsx
@@ -1,4 +1,5 @@
 import styled from '@emotion/styled';
+import { IconSettings } from 'twenty-ui';
 
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { ChangePassword } from '@/settings/profile/components/ChangePassword';
@@ -6,7 +7,6 @@ import { DeleteAccount } from '@/settings/profile/components/DeleteAccount';
 import { EmailField } from '@/settings/profile/components/EmailField';
 import { NameFields } from '@/settings/profile/components/NameFields';
 import { ProfilePictureUploader } from '@/settings/profile/components/ProfilePictureUploader';
-import { IconSettings } from '@/ui/display/icon';
 import { H1Title } from '@/ui/display/typography/components/H1Title';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
diff --git a/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx b/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx
index a9dd3f3e86ff..c52bf6e5e825 100644
--- a/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx
+++ b/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx
@@ -1,11 +1,11 @@
 import styled from '@emotion/styled';
+import { IconSettings } from 'twenty-ui';
 
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { DeleteWorkspace } from '@/settings/profile/components/DeleteWorkspace';
 import { NameField } from '@/settings/workspace/components/NameField';
 import { ToggleImpersonate } from '@/settings/workspace/components/ToggleImpersonate';
 import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader';
-import { IconSettings } from '@/ui/display/icon';
 import { H1Title } from '@/ui/display/typography/components/H1Title';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
diff --git a/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx b/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx
index bd63e8978ab5..6881feeb5c7f 100644
--- a/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx
+++ b/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx
@@ -1,6 +1,7 @@
 import { useState } from 'react';
 import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
+import { IconSettings, IconTrash } from 'twenty-ui';
 
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
@@ -8,7 +9,6 @@ import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSi
 import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { IconSettings, IconTrash } from '@/ui/display/icon';
 import { H1Title } from '@/ui/display/typography/components/H1Title';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { IconButton } from '@/ui/input/button/components/IconButton';
diff --git a/packages/twenty-front/src/pages/settings/__stories__/SettingsBilling.stories.tsx b/packages/twenty-front/src/pages/settings/__stories__/SettingsBilling.stories.tsx
new file mode 100644
index 000000000000..6c22deade5df
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/__stories__/SettingsBilling.stories.tsx
@@ -0,0 +1,27 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
+import { SettingsPath } from '@/types/SettingsPath';
+import {
+  PageDecorator,
+  PageDecoratorArgs,
+} from '~/testing/decorators/PageDecorator';
+import { graphqlMocks } from '~/testing/graphqlMocks';
+
+import { SettingsBilling } from '../SettingsBilling';
+
+const meta: Meta<PageDecoratorArgs> = {
+  title: 'Pages/Settings/SettingsBilling',
+  component: SettingsBilling,
+  decorators: [PageDecorator],
+  args: { routePath: getSettingsPagePath(SettingsPath.Billing) },
+  parameters: {
+    msw: graphqlMocks,
+  },
+};
+
+export default meta;
+
+export type Story = StoryObj<typeof SettingsBilling>;
+
+export const Default: Story = {};
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
index 72576db59f1f..c9a16292ed5e 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
@@ -1,17 +1,19 @@
 import { useRecoilValue } from 'recoil';
+import { IconSettings } from 'twenty-ui';
 
 import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { SettingsAccountsConnectedAccountsSection } from '@/settings/accounts/components/SettingsAccountsConnectedAccountsSection';
+import { SettingsAccountLoader } from '@/settings/accounts/components/SettingsAccountLoader';
+import { SettingsAccountsConnectedAccountsListCard } from '@/settings/accounts/components/SettingsAccountsConnectedAccountsListCard';
 import { SettingsAccountsEmailsBlocklistSection } from '@/settings/accounts/components/SettingsAccountsEmailsBlocklistSection';
 import { SettingsAccountsSettingsSection } from '@/settings/accounts/components/SettingsAccountsSettingsSection';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { IconSettings } from '@/ui/display/icon';
+import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
+import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { SettingsAccountLoader } from '~/pages/settings/accounts/SettingsAccountLoader';
 
 export const SettingsAccounts = () => {
   const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
@@ -42,7 +44,16 @@ export const SettingsAccounts = () => {
           <SettingsAccountLoader />
         ) : (
           <>
-            <SettingsAccountsConnectedAccountsSection accounts={accounts} />
+            <Section>
+              <H2Title
+                title="Connected accounts"
+                description="Manage your internet accounts."
+              />
+              <SettingsAccountsConnectedAccountsListCard
+                accounts={accounts}
+                loading={loading}
+              />
+            </Section>
             {isBlocklistEnabled && <SettingsAccountsEmailsBlocklistSection />}
             <SettingsAccountsSettingsSection />
           </>
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx
index 145ff310085c..1090c9880c33 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx
@@ -1,24 +1,31 @@
+import { addMinutes, endOfDay, min, startOfDay } from 'date-fns';
 import { useRecoilValue } from 'recoil';
+import { IconSettings } from 'twenty-ui';
 
+import { CalendarChannel } from '@/accounts/types/CalendarChannel';
 import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
+import { CalendarMonthCard } from '@/activities/calendar/components/CalendarMonthCard';
+import { CalendarContext } from '@/activities/calendar/contexts/CalendarContext';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { SettingsAccountsCalendarAccountsListCard } from '@/settings/accounts/components/SettingsAccountsCalendarAccountsListCard';
+import { SettingsAccountsCalendarChannelsListCard } from '@/settings/accounts/components/SettingsAccountsCalendarChannelsListCard';
 import { SettingsAccountsCalendarDisplaySettings } from '@/settings/accounts/components/SettingsAccountsCalendarDisplaySettings';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
-import { IconSettings } from '@/ui/display/icon';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
-import { mockedConnectedAccounts } from '~/testing/mock-data/accounts';
+import {
+  TimelineCalendarEvent,
+  TimelineCalendarEventVisibility,
+} from '~/generated-metadata/graphql';
 
 export const SettingsAccountsCalendars = () => {
   const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
-  const { records: _accounts } = useFindManyRecords<ConnectedAccount>({
+  const { records: accounts } = useFindManyRecords<ConnectedAccount>({
     objectNameSingular: CoreObjectNameSingular.ConnectedAccount,
     filter: {
       accountOwnerId: {
@@ -27,6 +34,52 @@ export const SettingsAccountsCalendars = () => {
     },
   });
 
+  const { records: calendarChannels } = useFindManyRecords<CalendarChannel>({
+    objectNameSingular: CoreObjectNameSingular.CalendarChannel,
+    filter: {
+      connectedAccountId: {
+        in: accounts.map((account) => account.id),
+      },
+    },
+  });
+
+  const exampleStartDate = new Date();
+  const exampleEndDate = min([
+    addMinutes(exampleStartDate, 30),
+    endOfDay(exampleStartDate),
+  ]);
+  const exampleDayTime = startOfDay(exampleStartDate).getTime();
+  const exampleCalendarEvent: TimelineCalendarEvent = {
+    id: '',
+    participants: [
+      {
+        firstName: currentWorkspaceMember?.name.firstName || '',
+        lastName: currentWorkspaceMember?.name.lastName || '',
+        displayName: currentWorkspaceMember
+          ? [
+              currentWorkspaceMember.name.firstName,
+              currentWorkspaceMember.name.lastName,
+            ].join(' ')
+          : '',
+        avatarUrl: currentWorkspaceMember?.avatarUrl || '',
+        handle: '',
+      },
+    ],
+    endsAt: exampleEndDate.toISOString(),
+    isFullDay: false,
+    startsAt: exampleStartDate.toISOString(),
+    conferenceSolution: '',
+    conferenceLink: {
+      label: '',
+      url: '',
+    },
+    description: '',
+    isCanceled: false,
+    location: '',
+    title: 'Onboarding call',
+    visibility: TimelineCalendarEventVisibility.ShareEverything,
+  };
+
   return (
     <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
       <SettingsPageContainer>
@@ -44,17 +97,36 @@ export const SettingsAccountsCalendars = () => {
             title="Calendar settings"
             description="Sync your calendars and set your preferences"
           />
-          <SettingsAccountsCalendarAccountsListCard />
+          <SettingsAccountsCalendarChannelsListCard />
         </Section>
-        {/* TODO: retrieve connected accounts data from back-end when the Calendar feature is ready. */}
-        {!!mockedConnectedAccounts.length && (
-          <Section>
-            <H2Title
-              title="Display"
-              description="Configure how we should display your events in your calendar"
-            />
-            <SettingsAccountsCalendarDisplaySettings />
-          </Section>
+        {!!calendarChannels.length && (
+          <>
+            <Section>
+              <H2Title
+                title="Display"
+                description="Configure how we should display your events in your calendar"
+              />
+              <SettingsAccountsCalendarDisplaySettings />
+            </Section>
+            <Section>
+              <H2Title
+                title="Color code"
+                description="Events you participated in are displayed in red."
+              />
+              <CalendarContext.Provider
+                value={{
+                  currentCalendarEvent: exampleCalendarEvent,
+                  calendarEventsByDayTime: {
+                    [exampleDayTime]: [exampleCalendarEvent],
+                  },
+                  getNextCalendarEvent: () => undefined,
+                  updateCurrentCalendarEvent: () => {},
+                }}
+              >
+                <CalendarMonthCard dayTimes={[exampleDayTime]} />
+              </CalendarContext.Provider>
+            </Section>
+          </>
         )}
       </SettingsPageContainer>
     </SubMenuTopBarContainer>
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendarsSettings.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendarsSettings.tsx
index 4d43b0ad21c2..ed0866e961d3 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendarsSettings.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendarsSettings.tsx
@@ -1,23 +1,27 @@
-import { useParams } from 'react-router-dom';
+import { useEffect } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconRefresh, IconSettings, IconUser } from 'twenty-ui';
 
 import {
-  EventSettingsVisibilityValue,
-  SettingsAccountsEventVisibilitySettingsCard,
-} from '@/settings/accounts/components/SettingsAccountsCalendarVisibilitySettingsCard';
+  CalendarChannel,
+  CalendarChannelVisibility,
+} from '@/accounts/types/CalendarChannel';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
+import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
+import { SettingsAccountsEventVisibilitySettingsCard } from '@/settings/accounts/components/SettingsAccountsCalendarVisibilitySettingsCard';
 import { SettingsAccountsCardMedia } from '@/settings/accounts/components/SettingsAccountsCardMedia';
-import { SettingsAccountsColorSettingCard } from '@/settings/accounts/components/SettingsAccountsColorSettingCard';
 import { SettingsAccountsToggleSettingCard } from '@/settings/accounts/components/SettingsAccountsToggleSettingCard';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
+import { AppPath } from '@/types/AppPath';
 import { SettingsPath } from '@/types/SettingsPath';
-import { IconRefresh, IconSettings, IconUser } from '@/ui/display/icon';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
-import { mockedConnectedAccounts } from '~/testing/mock-data/accounts';
 
 const StyledCardMedia = styled(SettingsAccountsCardMedia)`
   height: ${({ theme }) => theme.spacing(6)};
@@ -25,10 +29,52 @@ const StyledCardMedia = styled(SettingsAccountsCardMedia)`
 
 export const SettingsAccountsCalendarsSettings = () => {
   const theme = useTheme();
-  const { accountUuid = '' } = useParams();
-  const connectedAccount = mockedConnectedAccounts.find(
-    ({ id }) => id === accountUuid,
-  );
+  const navigate = useNavigate();
+
+  const { accountUuid: calendarChannelId = '' } = useParams();
+
+  const { record: calendarChannel, loading } =
+    useFindOneRecord<CalendarChannel>({
+      objectNameSingular: CoreObjectNameSingular.CalendarChannel,
+      objectRecordId: calendarChannelId,
+    });
+
+  const { updateOneRecord } = useUpdateOneRecord<CalendarChannel>({
+    objectNameSingular: CoreObjectNameSingular.CalendarChannel,
+  });
+
+  const handleVisibilityChange = (value: CalendarChannelVisibility) => {
+    updateOneRecord({
+      idToUpdate: calendarChannelId,
+      updateOneRecordInput: {
+        visibility: value,
+      },
+    });
+  };
+
+  const handleContactAutoCreationToggle = (value: boolean) => {
+    updateOneRecord({
+      idToUpdate: calendarChannelId,
+      updateOneRecordInput: {
+        isContactAutoCreationEnabled: value,
+      },
+    });
+  };
+
+  const handleSyncEventsToggle = (value: boolean) => {
+    updateOneRecord({
+      idToUpdate: calendarChannelId,
+      updateOneRecordInput: {
+        isSyncEnabled: value,
+      },
+    });
+  };
+
+  useEffect(() => {
+    if (!loading && !calendarChannel) navigate(AppPath.NotFound);
+  }, [loading, calendarChannel, navigate]);
+
+  if (!calendarChannel) return null;
 
   return (
     <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
@@ -43,27 +89,17 @@ export const SettingsAccountsCalendarsSettings = () => {
               children: 'Calendars',
               href: getSettingsPagePath(SettingsPath.AccountsCalendars),
             },
-            { children: connectedAccount?.handle || '' },
+            { children: calendarChannel?.handle || '' },
           ]}
         />
-        <Section>
-          <H2Title
-            title="Color"
-            description="Define the color associated with this calendar"
-          />
-          <SettingsAccountsColorSettingCard
-            value="blue"
-            onChange={(_colorName) => {}}
-          />
-        </Section>
         <Section>
           <H2Title
             title="Event visibility"
             description="Define what will be visible to other users in your workspace"
           />
           <SettingsAccountsEventVisibilitySettingsCard
-            value={EventSettingsVisibilityValue.Everything}
-            onChange={(_value) => {}}
+            value={calendarChannel.visibility}
+            onChange={handleVisibilityChange}
           />
         </Section>
         <Section>
@@ -81,8 +117,8 @@ export const SettingsAccountsCalendarsSettings = () => {
               </StyledCardMedia>
             }
             title="Auto-creation"
-            value={false}
-            onToggle={(_value) => {}}
+            value={!!calendarChannel.isContactAutoCreationEnabled}
+            onToggle={handleContactAutoCreationToggle}
           />
         </Section>
         <Section>
@@ -100,8 +136,8 @@ export const SettingsAccountsCalendarsSettings = () => {
               </StyledCardMedia>
             }
             title="Sync events"
-            value={false}
-            onToggle={(_value) => {}}
+            value={!!calendarChannel.isSyncEnabled}
+            onToggle={handleSyncEventsToggle}
           />
         </Section>
       </SettingsPageContainer>
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx
index 6aececd6a96b..c6ba3a5e35dd 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx
@@ -1,6 +1,7 @@
-import { SettingsAccountsEmailsAccountsListCard } from '@/settings/accounts/components/SettingsAccountsEmailsAccountsListCard';
+import { IconSettings } from 'twenty-ui';
+
+import { SettingsAccountsMessageChannelsListCard } from '@/settings/accounts/components/SettingsAccountsMessageChannelsListCard';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { IconSettings } from '@/ui/display/icon';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Section } from '@/ui/layout/section/components/Section';
@@ -20,7 +21,7 @@ export const SettingsAccountsEmails = () => (
           title="Emails sync"
           description="Sync your inboxes and set your privacy settings"
         />
-        <SettingsAccountsEmailsAccountsListCard />
+        <SettingsAccountsMessageChannelsListCard />
       </Section>
     </SettingsPageContainer>
   </SubMenuTopBarContainer>
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmailsInboxSettings.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmailsInboxSettings.tsx
index 00b3f87d2409..e7abe23c835d 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmailsInboxSettings.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmailsInboxSettings.tsx
@@ -1,6 +1,7 @@
 import { useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { useTheme } from '@emotion/react';
+import { IconSettings, IconUser } from 'twenty-ui';
 
 import { MessageChannel } from '@/accounts/types/MessageChannel';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
@@ -14,7 +15,6 @@ import {
 import { SettingsAccountsToggleSettingCard } from '@/settings/accounts/components/SettingsAccountsToggleSettingCard';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { AppPath } from '@/types/AppPath';
-import { IconSettings, IconUser } from '@/ui/display/icon';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Section } from '@/ui/layout/section/components/Section';
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsx
index 2371127b75d4..7c7a5d31b96a 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsx
@@ -1,6 +1,7 @@
+import { IconSettings } from 'twenty-ui';
+
 import { SettingsNewAccountSection } from '@/settings/accounts/components/SettingsNewAccountSection';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { IconSettings } from '@/ui/display/icon';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 
diff --git a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsEmailsInboxSettings.stories.tsx b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsEmailsInboxSettings.stories.tsx
index e3949377e45d..d508072ddba8 100644
--- a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsEmailsInboxSettings.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsEmailsInboxSettings.stories.tsx
@@ -21,7 +21,7 @@ const meta: Meta<PageDecoratorArgs> = {
     layout: 'fullscreen',
     msw: {
       handlers: [
-        graphql.query('FindOnemessageChannel', () => {
+        graphql.query('FindOneMessageChannel', () => {
           return HttpResponse.json({
             data: {
               messageChannel: {
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx
index 97b83f272421..118b489f73f5 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx
@@ -1,49 +1,60 @@
-import { useState } from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { IconSettings } from 'twenty-ui';
+import { z } from 'zod';
 
-import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
+import { useCreateOneObjectMetadataItem } from '@/object-metadata/hooks/useCreateOneObjectMetadataItem';
 import { getObjectSlug } from '@/object-metadata/utils/getObjectSlug';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { SettingsObjectFormSection } from '@/settings/data-model/components/SettingsObjectFormSection';
-import { IconSettings } from '@/ui/display/icon';
+import {
+  SettingsDataModelObjectAboutForm,
+  settingsDataModelObjectAboutFormSchema,
+} from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm';
+import { settingsCreateObjectInputSchema } from '@/settings/data-model/validation-schemas/settingsCreateObjectInputSchema';
+import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
+import { SettingsPath } from '@/types/SettingsPath';
+import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
+import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 
+const newObjectFormSchema = settingsDataModelObjectAboutFormSchema;
+
+type SettingsDataModelNewObjectFormValues = z.infer<typeof newObjectFormSchema>;
+
 export const SettingsNewObject = () => {
   const navigate = useNavigate();
   const { enqueueSnackBar } = useSnackBar();
 
-  const { createObjectMetadataItem: createObject } =
-    useObjectMetadataItemForSettings();
+  const { createOneObjectMetadataItem } = useCreateOneObjectMetadataItem();
+
+  const settingsObjectsPagePath = getSettingsPagePath(SettingsPath.Objects);
 
-  const [customFormValues, setCustomFormValues] = useState<{
-    description?: string;
-    icon: string;
-    labelPlural: string;
-    labelSingular: string;
-  }>({ icon: 'IconListNumbers', labelPlural: '', labelSingular: '' });
+  const formConfig = useForm<SettingsDataModelNewObjectFormValues>({
+    mode: 'onTouched',
+    resolver: zodResolver(newObjectFormSchema),
+  });
 
-  const canSave =
-    !!customFormValues.labelPlural && !!customFormValues.labelSingular;
+  const canSave = formConfig.formState.isValid;
 
   const handleSave = async () => {
+    const formValues = formConfig.getValues();
+
     try {
-      const createdObject = await createObject({
-        labelPlural: customFormValues.labelPlural,
-        labelSingular: customFormValues.labelSingular,
-        description: customFormValues.description,
-        icon: customFormValues.icon,
-      });
+      const { data: response } = await createOneObjectMetadataItem(
+        settingsCreateObjectInputSchema.parse(formValues),
+      );
 
       navigate(
-        createdObject.data?.createOneObject.isActive
-          ? `/settings/objects/${getObjectSlug(
-              createdObject.data.createOneObject,
+        response
+          ? `${settingsObjectsPagePath}/${getObjectSlug(
+              response.createOneObject,
             )}`
-          : '/settings/objects',
+          : settingsObjectsPagePath,
       );
     } catch (error) {
       enqueueSnackBar((error as Error).message, {
@@ -53,36 +64,35 @@ export const SettingsNewObject = () => {
   };
 
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
-      <SettingsPageContainer>
-        <SettingsHeaderContainer>
-          <Breadcrumb
-            links={[
-              { children: 'Objects', href: '/settings/objects' },
-              { children: 'New' },
-            ]}
-          />
-          <SaveAndCancelButtons
-            isSaveDisabled={!canSave}
-            onCancel={() => {
-              navigate('/settings/objects');
-            }}
-            onSave={handleSave}
-          />
-        </SettingsHeaderContainer>
-        <SettingsObjectFormSection
-          icon={customFormValues.icon}
-          singularName={customFormValues.labelSingular}
-          pluralName={customFormValues.labelPlural}
-          description={customFormValues.description}
-          onChange={(formValues) => {
-            setCustomFormValues((previousValues) => ({
-              ...previousValues,
-              ...formValues,
-            }));
-          }}
-        />
-      </SettingsPageContainer>
-    </SubMenuTopBarContainer>
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    <FormProvider {...formConfig}>
+      <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+        <SettingsPageContainer>
+          <SettingsHeaderContainer>
+            <Breadcrumb
+              links={[
+                {
+                  children: 'Objects',
+                  href: settingsObjectsPagePath,
+                },
+                { children: 'New' },
+              ]}
+            />
+            <SaveAndCancelButtons
+              isSaveDisabled={!canSave}
+              onCancel={() => navigate(settingsObjectsPagePath)}
+              onSave={handleSave}
+            />
+          </SettingsHeaderContainer>
+          <Section>
+            <H2Title
+              title="About"
+              description="Name in both singular (e.g., 'Invoice') and plural (e.g., 'Invoices') forms."
+            />
+            <SettingsDataModelObjectAboutForm />
+          </Section>
+        </SettingsPageContainer>
+      </SubMenuTopBarContainer>
+    </FormProvider>
   );
 };
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx
index e9b88b82cde4..668007c1b65a 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx
@@ -1,23 +1,29 @@
 import { useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
+import { IconPlus, IconSettings } from 'twenty-ui';
 
+import { LABEL_IDENTIFIER_FIELD_METADATA_TYPES } from '@/object-metadata/constants/LabelIdentifierFieldMetadataTypes';
 import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
-import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
+import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { getActiveFieldMetadataItems } from '@/object-metadata/utils/getActiveFieldMetadataItems';
+import { getDisabledFieldMetadataItems } from '@/object-metadata/utils/getDisabledFieldMetadataItems';
 import { getFieldSlug } from '@/object-metadata/utils/getFieldSlug';
 import { isLabelIdentifierField } from '@/object-metadata/utils/isLabelIdentifierField';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { SettingsAboutSection } from '@/settings/data-model/object-details/components/SettingsObjectAboutSection';
 import { SettingsObjectFieldActiveActionDropdown } from '@/settings/data-model/object-details/components/SettingsObjectFieldActiveActionDropdown';
-import { SettingsObjectFieldDisabledActionDropdown } from '@/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown';
+import { SettingsObjectFieldInactiveActionDropdown } from '@/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown';
 import {
   SettingsObjectFieldItemTableRow,
   StyledObjectFieldTableRow,
 } from '@/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow';
+import { SettingsObjectSummaryCard } from '@/settings/data-model/object-details/components/SettingsObjectSummaryCard';
 import { getFieldIdentifierType } from '@/settings/data-model/utils/getFieldIdentifierType';
+import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { AppPath } from '@/types/AppPath';
-import { IconPlus, IconSettings } from '@/ui/display/icon';
+import { SettingsPath } from '@/types/SettingsPath';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { Button } from '@/ui/input/button/components/Button';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
@@ -26,7 +32,6 @@ import { Table } from '@/ui/layout/table/components/Table';
 import { TableHeader } from '@/ui/layout/table/components/TableHeader';
 import { TableSection } from '@/ui/layout/table/components/TableSection';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
-import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 const StyledDiv = styled.div`
   display: flex;
@@ -38,11 +43,9 @@ export const SettingsObjectDetail = () => {
   const navigate = useNavigate();
 
   const { objectSlug = '' } = useParams();
-  const {
-    disableObjectMetadataItem,
-    editObjectMetadataItem,
-    findActiveObjectMetadataItemBySlug,
-  } = useObjectMetadataItemForSettings();
+  const { findActiveObjectMetadataItemBySlug } =
+    useFilteredObjectMetadataItems();
+  const { updateOneObjectMetadataItem } = useUpdateOneObjectMetadataItem();
 
   const activeObjectMetadataItem =
     findActiveObjectMetadataItemBySlug(objectSlug);
@@ -56,16 +59,19 @@ export const SettingsObjectDetail = () => {
 
   if (!activeObjectMetadataItem) return null;
 
-  const activeMetadataFields = activeObjectMetadataItem.fields.filter(
-    (metadataField) => metadataField.isActive && !metadataField.isSystem,
+  const activeMetadataFields = getActiveFieldMetadataItems(
+    activeObjectMetadataItem,
   );
-  const disabledMetadataFields = activeObjectMetadataItem.fields.filter(
-    (metadataField) => !metadataField.isActive && !metadataField.isSystem,
+  const disabledMetadataFields = getDisabledFieldMetadataItems(
+    activeObjectMetadataItem,
   );
 
   const handleDisableObject = async () => {
-    await disableObjectMetadataItem(activeObjectMetadataItem);
-    navigate('/settings/objects');
+    await updateOneObjectMetadataItem({
+      idToUpdate: activeObjectMetadataItem.id,
+      updatePayload: { isActive: false },
+    });
+    navigate(getSettingsPagePath(SettingsPath.Objects));
   };
 
   const handleDisableField = (activeFieldMetadatItem: FieldMetadataItem) => {
@@ -74,12 +80,13 @@ export const SettingsObjectDetail = () => {
 
   const handleSetLabelIdentifierField = (
     activeFieldMetadatItem: FieldMetadataItem,
-  ) => {
-    editObjectMetadataItem({
-      ...activeObjectMetadataItem,
-      labelIdentifierFieldMetadataId: activeFieldMetadatItem.id,
+  ) =>
+    updateOneObjectMetadataItem({
+      idToUpdate: activeObjectMetadataItem.id,
+      updatePayload: {
+        labelIdentifierFieldMetadataId: activeFieldMetadatItem.id,
+      },
     });
-  };
 
   return (
     <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
@@ -90,13 +97,16 @@ export const SettingsObjectDetail = () => {
             { children: activeObjectMetadataItem.labelPlural },
           ]}
         />
-        <SettingsAboutSection
-          iconKey={activeObjectMetadataItem.icon ?? undefined}
-          name={activeObjectMetadataItem.labelPlural || ''}
-          isCustom={activeObjectMetadataItem.isCustom}
-          onDisable={handleDisableObject}
-          onEdit={() => navigate('./edit')}
-        />
+        <Section>
+          <H2Title title="About" description="Manage your object" />
+          <SettingsObjectSummaryCard
+            iconKey={activeObjectMetadataItem.icon ?? undefined}
+            name={activeObjectMetadataItem.labelPlural || ''}
+            objectMetadataItem={activeObjectMetadataItem}
+            onDeactivate={handleDisableObject}
+            onEdit={() => navigate('./edit')}
+          />
+        </Section>
         <Section>
           <H2Title
             title="Fields"
@@ -123,7 +133,7 @@ export const SettingsObjectDetail = () => {
                   const canBeSetAsLabelIdentifier =
                     activeObjectMetadataItem.isCustom &&
                     !isLabelIdentifier &&
-                    [FieldMetadataType.Text, FieldMetadataType.Number].includes(
+                    LABEL_IDENTIFIER_FIELD_METADATA_TYPES.includes(
                       activeMetadataField.type,
                     );
 
@@ -140,6 +150,7 @@ export const SettingsObjectDetail = () => {
                           : 'field-type'
                       }
                       fieldMetadataItem={activeMetadataField}
+                      isRemoteObjectField={activeObjectMetadataItem.isRemote}
                       ActionIcon={
                         <SettingsObjectFieldActiveActionDropdown
                           isCustomField={!!activeMetadataField.isCustom}
@@ -155,7 +166,7 @@ export const SettingsObjectDetail = () => {
                                   )
                               : undefined
                           }
-                          onDisable={
+                          onDeactivate={
                             isLabelIdentifier
                               ? undefined
                               : () => handleDisableField(activeMetadataField)
@@ -168,7 +179,7 @@ export const SettingsObjectDetail = () => {
               </TableSection>
             )}
             {!!disabledMetadataFields.length && (
-              <TableSection isInitiallyExpanded={false} title="Disabled">
+              <TableSection isInitiallyExpanded={false} title="Inactive">
                 {disabledMetadataFields.map((disabledMetadataField) => (
                   <SettingsObjectFieldItemTableRow
                     key={disabledMetadataField.id}
@@ -179,8 +190,9 @@ export const SettingsObjectDetail = () => {
                     }
                     fieldMetadataItem={disabledMetadataField}
                     ActionIcon={
-                      <SettingsObjectFieldDisabledActionDropdown
+                      <SettingsObjectFieldInactiveActionDropdown
                         isCustomField={!!disabledMetadataField.isCustom}
+                        fieldType={disabledMetadataField.type}
                         scopeKey={disabledMetadataField.id}
                         onActivate={() =>
                           activateMetadataField(disabledMetadataField)
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx
index 3963c5774540..417b4e8f0f7d 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx
@@ -1,15 +1,27 @@
-import { useEffect, useState } from 'react';
+import { useEffect } from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
 import { useNavigate, useParams } from 'react-router-dom';
+import { zodResolver } from '@hookform/resolvers/zod';
+import pick from 'lodash.pick';
+import { IconArchive, IconSettings } from 'twenty-ui';
+import { z } from 'zod';
 
-import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
+import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';
 import { getObjectSlug } from '@/object-metadata/utils/getObjectSlug';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { SettingsObjectFormSection } from '@/settings/data-model/components/SettingsObjectFormSection';
+import {
+  SettingsDataModelObjectAboutForm,
+  settingsDataModelObjectAboutFormSchema,
+} from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm';
+import { settingsDataModelObjectIdentifiersFormSchema } from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm';
 import { SettingsDataModelObjectSettingsFormCard } from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard';
+import { settingsUpdateObjectInputSchema } from '@/settings/data-model/validation-schemas/settingsUpdateObjectInputSchema';
+import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { AppPath } from '@/types/AppPath';
-import { IconArchive, IconSettings } from '@/ui/display/icon';
+import { SettingsPath } from '@/types/SettingsPath';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { Button } from '@/ui/input/button/components/Button';
@@ -17,68 +29,58 @@ import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'
 import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 
+const objectEditFormSchema = z
+  .object({})
+  .merge(settingsDataModelObjectAboutFormSchema)
+  .merge(settingsDataModelObjectIdentifiersFormSchema);
+
+type SettingsDataModelObjectEditFormValues = z.infer<
+  typeof objectEditFormSchema
+>;
+
 export const SettingsObjectEdit = () => {
   const navigate = useNavigate();
   const { enqueueSnackBar } = useSnackBar();
 
   const { objectSlug = '' } = useParams();
-  const {
-    disableObjectMetadataItem,
-    editObjectMetadataItem,
-    findActiveObjectMetadataItemBySlug,
-  } = useObjectMetadataItemForSettings();
+  const { findActiveObjectMetadataItemBySlug } =
+    useFilteredObjectMetadataItems();
+  const { updateOneObjectMetadataItem } = useUpdateOneObjectMetadataItem();
 
   const activeObjectMetadataItem =
     findActiveObjectMetadataItemBySlug(objectSlug);
 
-  const [formValues, setFormValues] = useState<
-    Partial<{
-      icon: string;
-      labelSingular: string;
-      labelPlural: string;
-      description: string;
-    }>
-  >({});
+  const settingsObjectsPagePath = getSettingsPagePath(SettingsPath.Objects);
 
-  useEffect(() => {
-    if (!activeObjectMetadataItem) {
-      navigate(AppPath.NotFound);
-      return;
-    }
+  const formConfig = useForm<SettingsDataModelObjectEditFormValues>({
+    mode: 'onTouched',
+    resolver: zodResolver(objectEditFormSchema),
+  });
 
-    if (!Object.keys(formValues).length) {
-      setFormValues({
-        icon: activeObjectMetadataItem.icon ?? undefined,
-        labelSingular: activeObjectMetadataItem.labelSingular,
-        labelPlural: activeObjectMetadataItem.labelPlural,
-        description: activeObjectMetadataItem.description ?? undefined,
-      });
-    }
-  }, [activeObjectMetadataItem, formValues, navigate]);
+  useEffect(() => {
+    if (!activeObjectMetadataItem) navigate(AppPath.NotFound);
+  }, [activeObjectMetadataItem, navigate]);
 
   if (!activeObjectMetadataItem) return null;
 
-  const areRequiredFieldsFilled =
-    !!formValues.labelSingular && !!formValues.labelPlural;
-
-  const hasChanges =
-    formValues.description !== activeObjectMetadataItem.description ||
-    formValues.icon !== activeObjectMetadataItem.icon ||
-    formValues.labelPlural !== activeObjectMetadataItem.labelPlural ||
-    formValues.labelSingular !== activeObjectMetadataItem.labelSingular;
-
-  const canSave = areRequiredFieldsFilled && hasChanges;
+  const { isDirty, isValid } = formConfig.formState;
+  const canSave = isDirty && isValid;
 
   const handleSave = async () => {
-    const editedObjectMetadataItem = {
-      ...activeObjectMetadataItem,
-      ...formValues,
-    };
+    const formValues = formConfig.getValues();
+    const dirtyFieldKeys = Object.keys(
+      formConfig.formState.dirtyFields,
+    ) as (keyof SettingsDataModelObjectEditFormValues)[];
 
     try {
-      await editObjectMetadataItem(editedObjectMetadataItem);
+      await updateOneObjectMetadataItem({
+        idToUpdate: activeObjectMetadataItem.id,
+        updatePayload: settingsUpdateObjectInputSchema.parse(
+          pick(formValues, dirtyFieldKeys),
+        ),
+      });
 
-      navigate(`/settings/objects/${getObjectSlug(editedObjectMetadataItem)}`);
+      navigate(`${settingsObjectsPagePath}/${getObjectSlug(formValues)}`);
     } catch (error) {
       enqueueSnackBar((error as Error).message, {
         variant: 'error',
@@ -87,64 +89,72 @@ export const SettingsObjectEdit = () => {
   };
 
   const handleDisable = async () => {
-    await disableObjectMetadataItem(activeObjectMetadataItem);
-    navigate('/settings/objects');
+    await updateOneObjectMetadataItem({
+      idToUpdate: activeObjectMetadataItem.id,
+      updatePayload: { isActive: false },
+    });
+    navigate(settingsObjectsPagePath);
   };
 
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
-      <SettingsPageContainer>
-        <SettingsHeaderContainer>
-          <Breadcrumb
-            links={[
-              { children: 'Objects', href: '/settings/objects' },
-              {
-                children: activeObjectMetadataItem.labelPlural,
-                href: `/settings/objects/${objectSlug}`,
-              },
-              { children: 'Edit' },
-            ]}
-          />
-          {activeObjectMetadataItem.isCustom && (
-            <SaveAndCancelButtons
-              isSaveDisabled={!canSave}
-              onCancel={() => navigate(`/settings/objects/${objectSlug}`)}
-              onSave={handleSave}
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    <FormProvider {...formConfig}>
+      <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+        <SettingsPageContainer>
+          <SettingsHeaderContainer>
+            <Breadcrumb
+              links={[
+                {
+                  children: 'Objects',
+                  href: settingsObjectsPagePath,
+                },
+                {
+                  children: activeObjectMetadataItem.labelPlural,
+                  href: `${settingsObjectsPagePath}/${objectSlug}`,
+                },
+                { children: 'Edit' },
+              ]}
+            />
+            {activeObjectMetadataItem.isCustom && (
+              <SaveAndCancelButtons
+                isSaveDisabled={!canSave}
+                onCancel={() =>
+                  navigate(`${settingsObjectsPagePath}/${objectSlug}`)
+                }
+                onSave={handleSave}
+              />
+            )}
+          </SettingsHeaderContainer>
+          <Section>
+            <H2Title
+              title="About"
+              description="Name in both singular (e.g., 'Invoice') and plural (e.g., 'Invoices') forms."
+            />
+            <SettingsDataModelObjectAboutForm
+              disabled={!activeObjectMetadataItem.isCustom}
+              objectMetadataItem={activeObjectMetadataItem}
+            />
+          </Section>
+          <Section>
+            <H2Title
+              title="Settings"
+              description="Choose the fields that will identify your records"
+            />
+            <SettingsDataModelObjectSettingsFormCard
+              objectMetadataItem={activeObjectMetadataItem}
+            />
+          </Section>
+          <Section>
+            <H2Title title="Danger zone" description="Disable object" />
+            <Button
+              Icon={IconArchive}
+              title="Disable"
+              size="small"
+              onClick={handleDisable}
             />
-          )}
-        </SettingsHeaderContainer>
-        <SettingsObjectFormSection
-          disabled={!activeObjectMetadataItem.isCustom}
-          icon={formValues.icon}
-          singularName={formValues.labelSingular}
-          pluralName={formValues.labelPlural}
-          description={formValues.description}
-          onChange={(values) =>
-            setFormValues((previousFormValues) => ({
-              ...previousFormValues,
-              ...values,
-            }))
-          }
-        />
-        <Section>
-          <H2Title
-            title="Settings"
-            description="Choose the fields that will identify your records"
-          />
-          <SettingsDataModelObjectSettingsFormCard
-            objectMetadataItem={activeObjectMetadataItem}
-          />
-        </Section>
-        <Section>
-          <H2Title title="Danger zone" description="Disable object" />
-          <Button
-            Icon={IconArchive}
-            title="Disable"
-            size="small"
-            onClick={handleDisable}
-          />
-        </Section>
-      </SettingsPageContainer>
-    </SubMenuTopBarContainer>
+          </Section>
+        </SettingsPageContainer>
+      </SubMenuTopBarContainer>
+    </FormProvider>
   );
 };
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
index 766bf5df47a2..02328b3e7c2a 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
@@ -1,10 +1,12 @@
 import { useEffect, useMemo } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
+import { isNonEmptyString } from '@sniptt/guards';
+import { IconArchive, IconSettings } from 'twenty-ui';
 
 import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { useGetRelationMetadata } from '@/object-metadata/hooks/useGetRelationMetadata';
-import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { getFieldSlug } from '@/object-metadata/utils/getFieldSlug';
 import { isLabelIdentifierField } from '@/object-metadata/utils/isLabelIdentifierField';
@@ -16,8 +18,8 @@ import { SettingsObjectFieldFormSection } from '@/settings/data-model/components
 import { SettingsDataModelFieldSettingsFormCard } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard';
 import { SettingsDataModelFieldTypeSelect } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldTypeSelect';
 import { useFieldMetadataForm } from '@/settings/data-model/fields/forms/hooks/useFieldMetadataForm';
+import { isFieldTypeSupportedInSettings } from '@/settings/data-model/utils/isFieldTypeSupportedInSettings';
 import { AppPath } from '@/types/AppPath';
-import { IconArchive, IconSettings } from '@/ui/display/icon';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { Button } from '@/ui/input/button/components/Button';
@@ -40,7 +42,8 @@ const canPersistFieldMetadataItemUpdate = (
 ) => {
   return (
     fieldMetadataItem.isCustom ||
-    fieldMetadataItem.type === FieldMetadataType.Select
+    fieldMetadataItem.type === FieldMetadataType.Select ||
+    fieldMetadataItem.type === FieldMetadataType.MultiSelect
   );
 };
 
@@ -50,7 +53,7 @@ export const SettingsObjectFieldEdit = () => {
 
   const { objectSlug = '', fieldSlug = '' } = useParams();
   const { findActiveObjectMetadataItemBySlug } =
-    useObjectMetadataItemForSettings();
+    useFilteredObjectMetadataItems();
 
   const activeObjectMetadataItem =
     findActiveObjectMetadataItemBySlug(objectSlug);
@@ -81,9 +84,11 @@ export const SettingsObjectFieldEdit = () => {
     formValues,
     handleFormChange,
     hasFieldFormChanged,
+    hasDefaultValueChanged,
     hasFormChanged,
     hasRelationFormChanged,
     hasSelectFormChanged,
+    hasMultiSelectFormChanged,
     initForm,
     isInitialized,
     isValid,
@@ -105,17 +110,30 @@ export const SettingsObjectFieldEdit = () => {
 
     const selectOptions = activeMetadataField.options?.map((option) => ({
       ...option,
-      isDefault: defaultValue?.value === option.value,
+      isDefault: defaultValue === `'${option.value}'`,
     }));
     selectOptions?.sort(
       (optionA, optionB) => optionA.position - optionB.position,
     );
 
+    const multiSelectOptions = activeMetadataField.options?.map((option) => ({
+      ...option,
+      isDefault: defaultValue?.includes(`'${option.value}'`) || false,
+    }));
+    multiSelectOptions?.sort(
+      (optionA, optionB) => optionA.position - optionB.position,
+    );
+
+    const fieldType = activeMetadataField.type;
+    const isFieldTypeSupported = isFieldTypeSupportedInSettings(fieldType);
+
+    if (!isFieldTypeSupported) return;
+
     initForm({
       icon: activeMetadataField.icon ?? undefined,
       label: activeMetadataField.label,
       description: activeMetadataField.description ?? undefined,
-      type: activeMetadataField.type,
+      type: fieldType,
       ...(currencyDefaultValue ? { currency: currencyDefaultValue } : {}),
       relation: {
         field: {
@@ -125,7 +143,11 @@ export const SettingsObjectFieldEdit = () => {
         objectMetadataId: relationObjectMetadataItem?.id || '',
         type: relationType || RelationMetadataType.OneToMany,
       },
+      defaultValue: activeMetadataField.defaultValue,
       ...(selectOptions?.length ? { select: selectOptions } : {}),
+      ...(multiSelectOptions?.length
+        ? { multiSelect: multiSelectOptions }
+        : {}),
     });
   }, [
     activeMetadataField,
@@ -154,26 +176,35 @@ export const SettingsObjectFieldEdit = () => {
     try {
       if (
         validatedFormValues.type === FieldMetadataType.Relation &&
-        relationFieldMetadataItem?.id &&
+        isNonEmptyString(relationFieldMetadataItem?.id) &&
         hasRelationFormChanged
       ) {
         await editMetadataField({
           icon: validatedFormValues.relation.field.icon,
-          id: relationFieldMetadataItem.id,
+          id: relationFieldMetadataItem?.id,
           label: validatedFormValues.relation.field.label,
+          type: validatedFormValues.type,
         });
       }
-
-      if (hasFieldFormChanged || hasSelectFormChanged) {
+      if (
+        hasFieldFormChanged ||
+        hasSelectFormChanged ||
+        hasMultiSelectFormChanged ||
+        hasDefaultValueChanged
+      ) {
         await editMetadataField({
           description: validatedFormValues.description,
           icon: validatedFormValues.icon,
           id: activeMetadataField.id,
           label: validatedFormValues.label,
+          defaultValue: validatedFormValues.defaultValue,
+          type: validatedFormValues.type,
           options:
             validatedFormValues.type === FieldMetadataType.Select
               ? validatedFormValues.select
-              : undefined,
+              : validatedFormValues.type === FieldMetadataType.MultiSelect
+                ? validatedFormValues.multiSelect
+                : undefined,
         });
       }
 
@@ -248,6 +279,8 @@ export const SettingsObjectFieldEdit = () => {
               currency: formValues.currency,
               relation: formValues.relation,
               select: formValues.select,
+              multiSelect: formValues.multiSelect,
+              defaultValue: formValues.defaultValue,
             }}
           />
         </Section>
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep1.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep1.tsx
index 8852096755e8..4ccacc014b02 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep1.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep1.tsx
@@ -1,9 +1,10 @@
 import { useEffect, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
+import { IconMinus, IconPlus, IconSettings } from 'twenty-ui';
 
 import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
-import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { isLabelIdentifierField } from '@/object-metadata/utils/isLabelIdentifierField';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
@@ -13,7 +14,6 @@ import {
   StyledObjectFieldTableRow,
 } from '@/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow';
 import { AppPath } from '@/types/AppPath';
-import { IconMinus, IconPlus, IconSettings } from '@/ui/display/icon';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { Button } from '@/ui/input/button/components/Button';
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
@@ -39,7 +39,7 @@ export const SettingsObjectNewFieldStep1 = () => {
 
   const { objectSlug = '' } = useParams();
   const { findActiveObjectMetadataItemBySlug } =
-    useObjectMetadataItemForSettings();
+    useFilteredObjectMetadataItems();
 
   const activeObjectMetadataItem =
     findActiveObjectMetadataItemBySlug(objectSlug);
@@ -114,11 +114,13 @@ export const SettingsObjectNewFieldStep1 = () => {
               { children: 'New Field' },
             ]}
           />
-          <SaveAndCancelButtons
-            isSaveDisabled={!canSave}
-            onCancel={() => navigate(`/settings/objects/${objectSlug}`)}
-            onSave={handleSave}
-          />
+          {!activeObjectMetadataItem.isRemote && (
+            <SaveAndCancelButtons
+              isSaveDisabled={!canSave}
+              onCancel={() => navigate(`/settings/objects/${objectSlug}`)}
+              onSave={handleSave}
+            />
+          )}
         </SettingsHeaderContainer>
         <StyledSection>
           <H2Title
@@ -138,6 +140,7 @@ export const SettingsObjectNewFieldStep1 = () => {
                   <SettingsObjectFieldItemTableRow
                     key={activeMetadataField.id}
                     fieldMetadataItem={activeMetadataField}
+                    isRemoteObjectField={activeObjectMetadataItem.isRemote}
                     ActionIcon={
                       isLabelIdentifierField({
                         fieldMetadataItem: activeMetadataField,
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
index f14714862e80..99ec05470980 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
@@ -1,16 +1,17 @@
 import { useEffect, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
-import { Reference } from '@apollo/client';
+import { Reference, useApolloClient } from '@apollo/client';
 import styled from '@emotion/styled';
+import { IconSettings } from 'twenty-ui';
 
 import { CachedObjectRecordEdge } from '@/apollo/types/CachedObjectRecordEdge';
 import { useCreateOneRelationMetadataItem } from '@/object-metadata/hooks/useCreateOneRelationMetadataItem';
 import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { modifyRecordFromCache } from '@/object-record/cache/utils/modifyRecordFromCache';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -18,8 +19,8 @@ import { SettingsObjectFieldFormSection } from '@/settings/data-model/components
 import { SettingsDataModelFieldSettingsFormCard } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard';
 import { SettingsDataModelFieldTypeSelect } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldTypeSelect';
 import { useFieldMetadataForm } from '@/settings/data-model/fields/forms/hooks/useFieldMetadataForm';
+import { SettingsSupportedFieldType } from '@/settings/data-model/types/SettingsSupportedFieldType';
 import { AppPath } from '@/types/AppPath';
-import { IconSettings } from '@/ui/display/icon';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
@@ -27,7 +28,9 @@ import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 import { View } from '@/views/types/View';
 import { ViewType } from '@/views/types/ViewType';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled.ts';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 const StyledSettingsObjectFieldTypeSelect = styled(
   SettingsDataModelFieldTypeSelect,
@@ -39,16 +42,18 @@ export const SettingsObjectNewFieldStep2 = () => {
   const navigate = useNavigate();
   const { objectSlug = '' } = useParams();
   const { enqueueSnackBar } = useSnackBar();
+  const isMultiSelectEnabled = useIsFeatureEnabled('IS_MULTI_SELECT_ENABLED');
 
   const {
     findActiveObjectMetadataItemBySlug,
     findObjectMetadataItemById,
     findObjectMetadataItemByNamePlural,
-  } = useObjectMetadataItemForSettings();
+  } = useFilteredObjectMetadataItems();
 
   const activeObjectMetadataItem =
     findActiveObjectMetadataItemBySlug(objectSlug);
   const { createMetadataField } = useFieldMetadataItem();
+  const cache = useApolloClient().cache;
 
   const {
     formValues,
@@ -82,38 +87,34 @@ export const SettingsObjectNewFieldStep2 = () => {
   const [objectViews, setObjectViews] = useState<View[]>([]);
   const [relationObjectViews, setRelationObjectViews] = useState<View[]>([]);
 
-  const { modifyRecordFromCache: modifyViewFromCache } = useObjectMetadataItem({
+  const { objectMetadataItem: viewObjectMetadataItem } = useObjectMetadataItem({
     objectNameSingular: CoreObjectNameSingular.View,
   });
 
-  useFindManyRecords({
+  useFindManyRecords<View>({
     objectNameSingular: CoreObjectNameSingular.View,
     filter: {
       type: { eq: ViewType.Table },
       objectMetadataId: { eq: activeObjectMetadataItem?.id },
     },
-    onCompleted: async (data: ObjectRecordConnection<View>) => {
-      const views = data.edges;
+    onCompleted: async (views) => {
+      if (isUndefinedOrNull(views)) return;
 
-      if (!views) return;
-
-      setObjectViews(data.edges.map(({ node }) => node));
+      setObjectViews(views);
     },
   });
 
-  useFindManyRecords({
+  useFindManyRecords<View>({
     objectNameSingular: CoreObjectNameSingular.View,
     skip: !formValues.relation?.objectMetadataId,
     filter: {
       type: { eq: ViewType.Table },
       objectMetadataId: { eq: formValues.relation?.objectMetadataId },
     },
-    onCompleted: async (data: ObjectRecordConnection<View>) => {
-      const views = data.edges;
-
-      if (!views) return;
+    onCompleted: async (views) => {
+      if (isUndefinedOrNull(views)) return;
 
-      setRelationObjectViews(data.edges.map(({ node }) => node));
+      setRelationObjectViews(views);
     },
   });
 
@@ -133,12 +134,14 @@ export const SettingsObjectNewFieldStep2 = () => {
             description: validatedFormValues.description,
             icon: validatedFormValues.icon,
             label: validatedFormValues.label,
+            type: validatedFormValues.type,
           },
           objectMetadataId: activeObjectMetadataItem.id,
           connect: {
             field: {
               icon: validatedFormValues.relation.field.icon,
               label: validatedFormValues.relation.field.label,
+              type: validatedFormValues.relation.field.type,
             },
             objectMetadataId: validatedFormValues.relation.objectMetadataId,
           },
@@ -148,7 +151,7 @@ export const SettingsObjectNewFieldStep2 = () => {
           validatedFormValues.relation.objectMetadataId,
         );
 
-        objectViews.forEach(async (view) => {
+        objectViews.map(async (view) => {
           const viewFieldToCreate = {
             viewId: view.id,
             fieldMetadataId:
@@ -160,47 +163,58 @@ export const SettingsObjectNewFieldStep2 = () => {
             size: 100,
           };
 
-          modifyViewFromCache(view.id, {
-            viewFields: (viewFieldsRef, { readField }) => {
-              const edges = readField<{ node: Reference }[]>(
-                'edges',
-                viewFieldsRef,
-              );
-
-              if (!edges) return viewFieldsRef;
-
-              return {
-                ...viewFieldsRef,
-                edges: [...edges, { node: viewFieldToCreate }],
-              };
+          modifyRecordFromCache({
+            objectMetadataItem: viewObjectMetadataItem,
+            cache: cache,
+            fieldModifiers: {
+              viewFields: (viewFieldsRef, { readField }) => {
+                const edges = readField<{ node: Reference }[]>(
+                  'edges',
+                  viewFieldsRef,
+                );
+
+                if (!edges) return viewFieldsRef;
+
+                return {
+                  ...viewFieldsRef,
+                  edges: [...edges, { node: viewFieldToCreate }],
+                };
+              },
             },
+            recordId: view.id,
           });
-        });
-        relationObjectViews.forEach(async (view) => {
-          const viewFieldToCreate = {
-            viewId: view.id,
-            fieldMetadataId:
-              validatedFormValues.relation.type === 'MANY_TO_ONE'
-                ? createdRelation.data?.createOneRelation.fromFieldMetadataId
-                : createdRelation.data?.createOneRelation.toFieldMetadataId,
-            position: relationObjectMetadataItem?.fields.length,
-            isVisible: true,
-            size: 100,
-          };
-          modifyViewFromCache(view.id, {
-            viewFields: (viewFieldsRef, { readField }) => {
-              const edges = readField<{ node: Reference }[]>(
-                'edges',
-                viewFieldsRef,
-              );
-
-              if (!edges) return viewFieldsRef;
-
-              return {
-                ...viewFieldsRef,
-                edges: [...edges, { node: viewFieldToCreate }],
-              };
-            },
+
+          relationObjectViews.map(async (view) => {
+            const viewFieldToCreate = {
+              viewId: view.id,
+              fieldMetadataId:
+                validatedFormValues.relation.type === 'MANY_TO_ONE'
+                  ? createdRelation.data?.createOneRelation.fromFieldMetadataId
+                  : createdRelation.data?.createOneRelation.toFieldMetadataId,
+              position: relationObjectMetadataItem?.fields.length,
+              isVisible: true,
+              size: 100,
+            };
+            modifyRecordFromCache({
+              objectMetadataItem: viewObjectMetadataItem,
+              cache: cache,
+              fieldModifiers: {
+                viewFields: (viewFieldsRef, { readField }) => {
+                  const edges = readField<{ node: Reference }[]>(
+                    'edges',
+                    viewFieldsRef,
+                  );
+
+                  if (!edges) return viewFieldsRef;
+
+                  return {
+                    ...viewFieldsRef,
+                    edges: [...edges, { node: viewFieldToCreate }],
+                  };
+                },
+              },
+              recordId: view.id,
+            });
           });
         });
       } else {
@@ -211,7 +225,7 @@ export const SettingsObjectNewFieldStep2 = () => {
                   amountMicros: null,
                   currencyCode: validatedFormValues.currency.currencyCode,
                 }
-              : undefined,
+              : validatedFormValues.defaultValue,
           description: validatedFormValues.description,
           icon: validatedFormValues.icon,
           label: validatedFormValues.label ?? '',
@@ -220,10 +234,12 @@ export const SettingsObjectNewFieldStep2 = () => {
           options:
             validatedFormValues.type === FieldMetadataType.Select
               ? validatedFormValues.select
-              : undefined,
+              : validatedFormValues.type === FieldMetadataType.MultiSelect
+                ? validatedFormValues.multiSelect
+                : undefined,
         });
 
-        objectViews.forEach(async (view) => {
+        objectViews.map(async (view) => {
           const viewFieldToCreate = {
             viewId: view.id,
             fieldMetadataId: createdMetadataField.data?.createOneField.id,
@@ -232,20 +248,25 @@ export const SettingsObjectNewFieldStep2 = () => {
             size: 100,
           };
 
-          modifyViewFromCache(view.id, {
-            viewFields: (cachedViewFieldsConnection, { readField }) => {
-              const edges = readField<CachedObjectRecordEdge[]>(
-                'edges',
-                cachedViewFieldsConnection,
-              );
-
-              if (!edges) return cachedViewFieldsConnection;
-
-              return {
-                ...cachedViewFieldsConnection,
-                edges: [...edges, { node: viewFieldToCreate }],
-              };
+          modifyRecordFromCache({
+            objectMetadataItem: viewObjectMetadataItem,
+            cache: cache,
+            fieldModifiers: {
+              viewFields: (cachedViewFieldsConnection, { readField }) => {
+                const edges = readField<CachedObjectRecordEdge[]>(
+                  'edges',
+                  cachedViewFieldsConnection,
+                );
+
+                if (!edges) return cachedViewFieldsConnection;
+
+                return {
+                  ...cachedViewFieldsConnection,
+                  edges: [...edges, { node: viewFieldToCreate }],
+                };
+              },
             },
+            recordId: view.id,
           });
         });
       }
@@ -258,18 +279,20 @@ export const SettingsObjectNewFieldStep2 = () => {
     }
   };
 
-  const excludedFieldTypes = [
-    FieldMetadataType.Currency,
+  const excludedFieldTypes: SettingsSupportedFieldType[] = [
     FieldMetadataType.Email,
     FieldMetadataType.FullName,
     FieldMetadataType.Link,
-    FieldMetadataType.MultiSelect,
     FieldMetadataType.Numeric,
     FieldMetadataType.Phone,
     FieldMetadataType.Probability,
     FieldMetadataType.Uuid,
   ];
 
+  if (!isMultiSelectEnabled) {
+    excludedFieldTypes.push(FieldMetadataType.MultiSelect);
+  }
+
   return (
     <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
       <SettingsPageContainer>
@@ -284,11 +307,13 @@ export const SettingsObjectNewFieldStep2 = () => {
               { children: 'New Field' },
             ]}
           />
-          <SaveAndCancelButtons
-            isSaveDisabled={!canSave}
-            onCancel={() => navigate(`/settings/objects/${objectSlug}`)}
-            onSave={handleSave}
-          />
+          {!activeObjectMetadataItem.isRemote && (
+            <SaveAndCancelButtons
+              isSaveDisabled={!canSave}
+              onCancel={() => navigate(`/settings/objects/${objectSlug}`)}
+              onSave={handleSave}
+            />
+          )}
         </SettingsHeaderContainer>
         <SettingsObjectFieldFormSection
           iconKey={formValues.icon}
@@ -318,6 +343,8 @@ export const SettingsObjectNewFieldStep2 = () => {
               currency: formValues.currency,
               relation: formValues.relation,
               select: formValues.select,
+              multiSelect: formValues.multiSelect,
+              defaultValue: formValues.defaultValue,
             }}
           />
         </Section>
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
index 438d6886547b..fa239a0d6b9e 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
@@ -1,8 +1,11 @@
 import { useNavigate } from 'react-router-dom';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { IconChevronRight, IconPlus, IconSettings } from 'twenty-ui';
 
-import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
+import { useDeleteOneObjectMetadataItem } from '@/object-metadata/hooks/useDeleteOneObjectMetadataItem';
+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
+import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';
 import { getObjectSlug } from '@/object-metadata/utils/getObjectSlug';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -11,8 +14,9 @@ import {
   StyledObjectTableRow,
 } from '@/settings/data-model/object-details/components/SettingsObjectItemTableRow';
 import { SettingsObjectCoverImage } from '@/settings/data-model/objects/SettingsObjectCoverImage';
-import { SettingsObjectDisabledMenuDropDown } from '@/settings/data-model/objects/SettingsObjectDisabledMenuDropDown';
-import { IconChevronRight, IconPlus, IconSettings } from '@/ui/display/icon';
+import { SettingsObjectInactiveMenuDropDown } from '@/settings/data-model/objects/SettingsObjectInactiveMenuDropDown';
+import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
+import { SettingsPath } from '@/types/SettingsPath';
 import { H1Title } from '@/ui/display/typography/components/H1Title';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { Button } from '@/ui/input/button/components/Button';
@@ -34,12 +38,10 @@ export const SettingsObjects = () => {
   const theme = useTheme();
   const navigate = useNavigate();
 
-  const {
-    activateObjectMetadataItem,
-    activeObjectMetadataItems,
-    disabledObjectMetadataItems,
-    eraseObjectMetadataItem,
-  } = useObjectMetadataItemForSettings();
+  const { activeObjectMetadataItems, inactiveObjectMetadataItems } =
+    useFilteredObjectMetadataItems();
+  const { deleteOneObjectMetadataItem } = useDeleteOneObjectMetadataItem();
+  const { updateOneObjectMetadataItem } = useUpdateOneObjectMetadataItem();
 
   return (
     <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
@@ -51,7 +53,9 @@ export const SettingsObjects = () => {
             title="Add object"
             accent="blue"
             size="small"
-            onClick={() => navigate('/settings/objects/new')}
+            onClick={() =>
+              navigate(getSettingsPagePath(SettingsPath.NewObject))
+            }
           />
         </SettingsHeaderContainer>
         <div>
@@ -89,25 +93,26 @@ export const SettingsObjects = () => {
                   ))}
                 </TableSection>
               )}
-              {!!disabledObjectMetadataItems.length && (
-                <TableSection title="Disabled">
-                  {disabledObjectMetadataItems.map(
-                    (disabledObjectMetadataItem) => (
+              {!!inactiveObjectMetadataItems.length && (
+                <TableSection title="Inactive">
+                  {inactiveObjectMetadataItems.map(
+                    (inactiveObjectMetadataItem) => (
                       <SettingsObjectItemTableRow
-                        key={disabledObjectMetadataItem.namePlural}
-                        objectItem={disabledObjectMetadataItem}
+                        key={inactiveObjectMetadataItem.namePlural}
+                        objectItem={inactiveObjectMetadataItem}
                         action={
-                          <SettingsObjectDisabledMenuDropDown
-                            isCustomObject={disabledObjectMetadataItem.isCustom}
-                            scopeKey={disabledObjectMetadataItem.namePlural}
+                          <SettingsObjectInactiveMenuDropDown
+                            isCustomObject={inactiveObjectMetadataItem.isCustom}
+                            scopeKey={inactiveObjectMetadataItem.namePlural}
                             onActivate={() =>
-                              activateObjectMetadataItem(
-                                disabledObjectMetadataItem,
-                              )
+                              updateOneObjectMetadataItem({
+                                idToUpdate: inactiveObjectMetadataItem.id,
+                                updatePayload: { isActive: true },
+                              })
                             }
                             onErase={() =>
-                              eraseObjectMetadataItem(
-                                disabledObjectMetadataItem,
+                              deleteOneObjectMetadataItem(
+                                inactiveObjectMetadataItem.id,
                               )
                             }
                           />
diff --git a/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx b/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx
index d61ebb9b67fe..1e8b53e70935 100644
--- a/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx
@@ -1,23 +1,70 @@
+import { useNavigate } from 'react-router-dom';
+import styled from '@emotion/styled';
+import { IconPlus, IconSettings } from 'twenty-ui';
+
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { IconSettings } from '@/ui/display/icon';
+import { SettingsApiKeysTable } from '@/settings/developers/components/SettingsApiKeysTable';
+import { SettingsReadDocumentationButton } from '@/settings/developers/components/SettingsReadDocumentationButton';
+import { SettingsWebhooksTable } from '@/settings/developers/components/SettingsWebhooksTable';
+import { H2Title } from '@/ui/display/typography/components/H2Title';
+import { Button } from '@/ui/input/button/components/Button';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
+import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
-import { SettingsDevelopersApiKeys } from '~/pages/settings/developers/api-keys/SettingsDevelopersApiKeys';
-import { SettingsDevelopersWebhooks } from '~/pages/settings/developers/webhooks/SettingsDevelopersWebhooks';
 
-import { ReadDocumentationButton } from './components/ReadDocumentationButton';
+const StyledButtonContainer = styled.div`
+  display: flex;
+  justify-content: flex-end;
+  padding-top: ${({ theme }) => theme.spacing(2)};
+`;
 
 export const SettingsDevelopers = () => {
+  const navigate = useNavigate();
+
   return (
     <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
       <SettingsPageContainer>
         <SettingsHeaderContainer>
           <Breadcrumb links={[{ children: 'Developers' }]} />
-          <ReadDocumentationButton />
+          <SettingsReadDocumentationButton />
         </SettingsHeaderContainer>
-        <SettingsDevelopersApiKeys />
-        <SettingsDevelopersWebhooks />
+        <Section>
+          <H2Title
+            title="API keys"
+            description="Active APIs keys created by you or your team."
+          />
+          <SettingsApiKeysTable />
+          <StyledButtonContainer>
+            <Button
+              Icon={IconPlus}
+              title="Create API key"
+              size="small"
+              variant="secondary"
+              onClick={() => {
+                navigate('/settings/developers/api-keys/new');
+              }}
+            />
+          </StyledButtonContainer>
+        </Section>
+        <Section>
+          <H2Title
+            title="Webhooks"
+            description="Establish Webhook endpoints for notifications on asynchronous events."
+          />
+          <SettingsWebhooksTable />
+          <StyledButtonContainer>
+            <Button
+              Icon={IconPlus}
+              title="Create Webhook"
+              size="small"
+              variant="secondary"
+              onClick={() => {
+                navigate('/settings/developers/webhooks/new');
+              }}
+            />
+          </StyledButtonContainer>
+        </Section>
       </SettingsPageContainer>
     </SubMenuTopBarContainer>
   );
diff --git a/packages/twenty-front/src/pages/settings/developers/__stories__/SettingsDevelopersApiKeysDetail.stories.tsx b/packages/twenty-front/src/pages/settings/developers/__stories__/api-keys/SettingsDevelopersApiKeysDetail.stories.tsx
similarity index 97%
rename from packages/twenty-front/src/pages/settings/developers/__stories__/SettingsDevelopersApiKeysDetail.stories.tsx
rename to packages/twenty-front/src/pages/settings/developers/__stories__/api-keys/SettingsDevelopersApiKeysDetail.stories.tsx
index f53731221fcc..cb5902051781 100644
--- a/packages/twenty-front/src/pages/settings/developers/__stories__/SettingsDevelopersApiKeysDetail.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/__stories__/api-keys/SettingsDevelopersApiKeysDetail.stories.tsx
@@ -23,7 +23,7 @@ const meta: Meta<PageDecoratorArgs> = {
     msw: {
       handlers: [
         ...graphqlMocks.handlers,
-        graphql.query('FindOneapiKey', () => {
+        graphql.query('FindOneApiKey', () => {
           return HttpResponse.json({
             data: {
               apiKey: {
diff --git a/packages/twenty-front/src/pages/settings/developers/__stories__/SettingsDevelopersApiKeysNew.stories.tsx b/packages/twenty-front/src/pages/settings/developers/__stories__/api-keys/SettingsDevelopersApiKeysNew.stories.tsx
similarity index 100%
rename from packages/twenty-front/src/pages/settings/developers/__stories__/SettingsDevelopersApiKeysNew.stories.tsx
rename to packages/twenty-front/src/pages/settings/developers/__stories__/api-keys/SettingsDevelopersApiKeysNew.stories.tsx
diff --git a/packages/twenty-front/src/pages/settings/developers/__stories__/SettingsDevelopersWebhooksDetail.stories.tsx b/packages/twenty-front/src/pages/settings/developers/__stories__/webhooks/SettingsDevelopersWebhooksDetail.stories.tsx
similarity index 92%
rename from packages/twenty-front/src/pages/settings/developers/__stories__/SettingsDevelopersWebhooksDetail.stories.tsx
rename to packages/twenty-front/src/pages/settings/developers/__stories__/webhooks/SettingsDevelopersWebhooksDetail.stories.tsx
index 38516ed38e0c..b3b387a9224a 100644
--- a/packages/twenty-front/src/pages/settings/developers/__stories__/SettingsDevelopersWebhooksDetail.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/__stories__/webhooks/SettingsDevelopersWebhooksDetail.stories.tsx
@@ -10,7 +10,7 @@ import {
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
 const meta: Meta<PageDecoratorArgs> = {
-  title: 'Pages/Settings/Developers/SettingsDevelopersWebhooksDetail',
+  title: 'Pages/Settings/Developers/Webhooks/SettingsDevelopersWebhooksDetail',
   component: SettingsDevelopersWebhooksDetail,
   decorators: [PageDecorator],
   args: {
@@ -20,7 +20,7 @@ const meta: Meta<PageDecoratorArgs> = {
   parameters: {
     msw: {
       handlers: [
-        graphql.query('FindOnewebhook', () => {
+        graphql.query('FindOneWebhook', () => {
           return HttpResponse.json({
             data: {
               webhook: {
diff --git a/packages/twenty-front/src/pages/settings/developers/__stories__/SettingsDevelopersWebhooksNew.stories.tsx b/packages/twenty-front/src/pages/settings/developers/__stories__/webhooks/SettingsDevelopersWebhooksNew.stories.tsx
similarity index 92%
rename from packages/twenty-front/src/pages/settings/developers/__stories__/SettingsDevelopersWebhooksNew.stories.tsx
rename to packages/twenty-front/src/pages/settings/developers/__stories__/webhooks/SettingsDevelopersWebhooksNew.stories.tsx
index 651ae8985d81..dd4adfb71305 100644
--- a/packages/twenty-front/src/pages/settings/developers/__stories__/SettingsDevelopersWebhooksNew.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/__stories__/webhooks/SettingsDevelopersWebhooksNew.stories.tsx
@@ -9,7 +9,7 @@ import {
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
 const meta: Meta<PageDecoratorArgs> = {
-  title: 'Pages/Settings/Developers/SettingsDevelopersWebhooksNew',
+  title: 'Pages/Settings/Developers/Webhooks/SettingsDevelopersWebhooksNew',
   component: SettingsDevelopersWebhooksNew,
   decorators: [PageDecorator],
   args: { routePath: '/settings/developers' },
diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
index a94a27b37281..1e77bd571041 100644
--- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
@@ -1,8 +1,10 @@
 import { useEffect, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
+import { isNonEmptyString } from '@sniptt/guards';
 import { DateTime } from 'luxon';
 import { useRecoilState } from 'recoil';
+import { IconRepeat, IconSettings, IconTrash } from 'twenty-ui';
 
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
@@ -16,7 +18,6 @@ import { generatedApiKeyFamilyState } from '@/settings/developers/states/generat
 import { ApiKey } from '@/settings/developers/types/api-key/ApiKey';
 import { computeNewExpirationDate } from '@/settings/developers/utils/compute-new-expiration-date';
 import { formatExpiration } from '@/settings/developers/utils/format-expiration';
-import { IconRepeat, IconSettings, IconTrash } from '@/ui/display/icon';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { Button } from '@/ui/input/button/components/Button';
 import { TextInput } from '@/ui/input/components/TextInput';
@@ -25,6 +26,7 @@ import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'
 import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 import { useGenerateApiKeyTokenMutation } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
 
 const StyledInfo = styled.span`
   color: ${({ theme }) => theme.font.color.light};
@@ -101,15 +103,15 @@ export const SettingsDevelopersApiKeyDetail = () => {
   };
 
   const regenerateApiKey = async () => {
-    if (apiKeyData?.name) {
+    if (isNonEmptyString(apiKeyData?.name)) {
       const newExpiresAt = computeNewExpirationDate(
-        apiKeyData.expiresAt,
-        apiKeyData.createdAt,
+        apiKeyData?.expiresAt,
+        apiKeyData?.createdAt,
       );
-      const apiKey = await createIntegration(apiKeyData.name, newExpiresAt);
+      const apiKey = await createIntegration(apiKeyData?.name, newExpiresAt);
       await deleteIntegration(false);
 
-      if (apiKey && apiKey.token) {
+      if (isNonEmptyString(apiKey?.token)) {
         setGeneratedApi(apiKey.id, apiKey.token);
         navigate(`/settings/developers/api-keys/${apiKey.id}`);
       }
@@ -117,7 +119,7 @@ export const SettingsDevelopersApiKeyDetail = () => {
   };
 
   useEffect(() => {
-    if (apiKeyData) {
+    if (isDefined(apiKeyData)) {
       return () => {
         setGeneratedApi(apiKeyId, null);
       };
diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeys.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeys.tsx
deleted file mode 100644
index 5348d01f5b90..000000000000
--- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeys.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import { useNavigate } from 'react-router-dom';
-import styled from '@emotion/styled';
-
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { SettingsApiKeysFieldItemTableRow } from '@/settings/developers/components/SettingsApiKeysFieldItemTableRow';
-import { ApiFieldItem } from '@/settings/developers/types/api-key/ApiFieldItem';
-import { ApiKey } from '@/settings/developers/types/api-key/ApiKey';
-import { formatExpirations } from '@/settings/developers/utils/format-expiration';
-import { IconPlus } from '@/ui/display/icon';
-import { H2Title } from '@/ui/display/typography/components/H2Title';
-import { Button } from '@/ui/input/button/components/Button';
-import { Section } from '@/ui/layout/section/components/Section';
-import { Table } from '@/ui/layout/table/components/Table';
-import { TableBody } from '@/ui/layout/table/components/TableBody';
-import { TableHeader } from '@/ui/layout/table/components/TableHeader';
-import { TableRow } from '@/ui/layout/table/components/TableRow';
-
-const StyledDiv = styled.div`
-  display: flex;
-  justify-content: flex-end;
-  padding-top: ${({ theme }) => theme.spacing(2)};
-`;
-
-const StyledTableRow = styled(TableRow)`
-  grid-template-columns: 312px 132px 68px;
-`;
-
-const StyledTableBody = styled(TableBody)`
-  border-bottom: 1px solid ${({ theme }) => theme.border.color.light};
-`;
-
-export const SettingsDevelopersApiKeys = () => {
-  const navigate = useNavigate();
-
-  const { records: apiKeys } = useFindManyRecords({
-    objectNameSingular: CoreObjectNameSingular.ApiKey,
-    filter: { revokedAt: { is: 'NULL' } },
-  });
-
-  return (
-    <Section>
-      <H2Title
-        title="API keys"
-        description="Active APIs keys created by you or your team."
-      />
-      <Table>
-        <StyledTableRow>
-          <TableHeader>Name</TableHeader>
-          <TableHeader>Expiration</TableHeader>
-          <TableHeader></TableHeader>
-        </StyledTableRow>
-        {!!apiKeys.length && (
-          <StyledTableBody>
-            {formatExpirations(apiKeys as ApiKey[]).map((fieldItem) => (
-              <SettingsApiKeysFieldItemTableRow
-                key={fieldItem.id}
-                fieldItem={fieldItem as ApiFieldItem}
-                onClick={() => {
-                  navigate(`/settings/developers/api-keys/${fieldItem.id}`);
-                }}
-              />
-            ))}
-          </StyledTableBody>
-        )}
-      </Table>
-      <StyledDiv>
-        <Button
-          Icon={IconPlus}
-          title="Create API key"
-          size="small"
-          variant="secondary"
-          onClick={() => {
-            navigate('/settings/developers/api-keys/new');
-          }}
-        />
-      </StyledDiv>
-    </Section>
-  );
-};
diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
index 950e3bfc4528..fcf3542e2240 100644
--- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
@@ -1,6 +1,7 @@
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { DateTime } from 'luxon';
+import { IconSettings } from 'twenty-ui';
 
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
@@ -10,7 +11,6 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContain
 import { EXPIRATION_DATES } from '@/settings/developers/constants/ExpirationDates';
 import { useGeneratedApiKeys } from '@/settings/developers/hooks/useGeneratedApiKeys';
 import { ApiKey } from '@/settings/developers/types/api-key/ApiKey';
-import { IconSettings } from '@/ui/display/icon';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { Select } from '@/ui/input/components/Select';
 import { TextInput } from '@/ui/input/components/TextInput';
@@ -18,6 +18,7 @@ import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'
 import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 import { useGenerateApiKeyTokenMutation } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
 
 export const SettingsDevelopersApiKeysNew = () => {
   const [generateOneApiKeyToken] = useGenerateApiKeyTokenMutation();
@@ -54,7 +55,7 @@ export const SettingsDevelopersApiKeysNew = () => {
         expiresAt: expiresAt,
       },
     });
-    if (tokenData.data?.generateApiKeyToken) {
+    if (isDefined(tokenData.data?.generateApiKeyToken)) {
       setGeneratedApi(newApiKey.id, tokenData.data.generateApiKeyToken.token);
       navigate(`/settings/developers/api-keys/${newApiKey.id}`);
     }
diff --git a/packages/twenty-front/src/pages/settings/developers/components/ReadDocumentationButton.tsx b/packages/twenty-front/src/pages/settings/developers/components/ReadDocumentationButton.tsx
deleted file mode 100644
index 9edacf9cd608..000000000000
--- a/packages/twenty-front/src/pages/settings/developers/components/ReadDocumentationButton.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { IconBook2 } from '@/ui/display/icon';
-import { Button } from '@/ui/input/button/components/Button';
-
-export const ReadDocumentationButton = () => {
-  return (
-    <Button
-      title="Read documentation"
-      variant="primary"
-      accent="default"
-      size="small"
-      Icon={IconBook2}
-      onClick={() => {
-        window.open('https://docs.twenty.com');
-      }}
-    ></Button>
-  );
-};
diff --git a/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhookDetail.tsx b/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhookDetail.tsx
index d73deb628f8c..c9a613aeb113 100644
--- a/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhookDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhookDetail.tsx
@@ -1,12 +1,12 @@
 import { useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
+import { IconSettings, IconTrash } from 'twenty-ui';
 
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
 import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { IconSettings, IconTrash } from '@/ui/display/icon';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { Button } from '@/ui/input/button/components/Button';
 import { TextInput } from '@/ui/input/components/TextInput';
diff --git a/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhooks.tsx b/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhooks.tsx
deleted file mode 100644
index 2033bf551b43..000000000000
--- a/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhooks.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { useNavigate } from 'react-router-dom';
-import styled from '@emotion/styled';
-
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { SettingsDevelopersWebhookTableRow } from '@/settings/developers/components/SettingsDevelopersWebhookTableRow';
-import { WebhookFieldItem } from '@/settings/developers/types/webhook/WebhookFieldItem';
-import { IconPlus } from '@/ui/display/icon';
-import { H2Title } from '@/ui/display/typography/components/H2Title';
-import { Button } from '@/ui/input/button/components/Button';
-import { Section } from '@/ui/layout/section/components/Section';
-import { Table } from '@/ui/layout/table/components/Table';
-import { TableBody } from '@/ui/layout/table/components/TableBody';
-import { TableHeader } from '@/ui/layout/table/components/TableHeader';
-import { TableRow } from '@/ui/layout/table/components/TableRow';
-
-const StyledDiv = styled.div`
-  display: flex;
-  justify-content: flex-end;
-  padding-top: ${({ theme }) => theme.spacing(2)};
-`;
-
-const StyledTableRow = styled(TableRow)`
-  grid-template-columns: 444px 68px;
-`;
-
-const StyledTableBody = styled(TableBody)`
-  border-bottom: 1px solid ${({ theme }) => theme.border.color.light};
-`;
-
-export const SettingsDevelopersWebhooks = () => {
-  const navigate = useNavigate();
-
-  const { records: webhooks } = useFindManyRecords({
-    objectNameSingular: CoreObjectNameSingular.Webhook,
-  });
-
-  return (
-    <Section>
-      <H2Title
-        title="Webhooks"
-        description="Establish Webhook endpoints for notifications on asynchronous events."
-      />
-      <Table>
-        <StyledTableRow>
-          <TableHeader>Url</TableHeader>
-          <TableHeader></TableHeader>
-        </StyledTableRow>
-        {!!webhooks.length && (
-          <StyledTableBody>
-            {webhooks.map((fieldItem) => (
-              <SettingsDevelopersWebhookTableRow
-                key={fieldItem.id}
-                fieldItem={fieldItem as WebhookFieldItem}
-                onClick={() => {
-                  navigate(`/settings/developers/webhooks/${fieldItem.id}`);
-                }}
-              />
-            ))}
-          </StyledTableBody>
-        )}
-      </Table>
-      <StyledDiv>
-        <Button
-          Icon={IconPlus}
-          title="Create Webhook"
-          size="small"
-          variant="secondary"
-          onClick={() => {
-            navigate('/settings/developers/webhooks/new');
-          }}
-        />
-      </StyledDiv>
-    </Section>
-  );
-};
diff --git a/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhooksNew.tsx b/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhooksNew.tsx
index 8583f187b659..568831cec907 100644
--- a/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhooksNew.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhooksNew.tsx
@@ -1,5 +1,6 @@
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
+import { IconSettings } from 'twenty-ui';
 
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
@@ -7,7 +8,6 @@ import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { Webhook } from '@/settings/developers/types/webhook/Webhook';
-import { IconSettings } from '@/ui/display/icon';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationComponent.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationComponent.tsx
deleted file mode 100644
index af01e5b65dbd..000000000000
--- a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationComponent.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import styled from '@emotion/styled';
-
-import { IconArrowUpRight, IconBolt } from '@/ui/display/icon';
-import { Pill } from '@/ui/display/pill/components/Pill';
-import { Button } from '@/ui/input/button/components/Button';
-import { SettingsIntegration } from '~/pages/settings/integrations/types/SettingsIntegration';
-
-interface SettingsIntegrationComponentProps {
-  integration: SettingsIntegration;
-}
-
-const StyledContainer = styled.div`
-  align-items: center;
-  background: ${({ theme }) => theme.background.secondary};
-  border: 1px solid ${({ theme }) => theme.border.color.medium};
-  border-radius: ${({ theme }) => theme.border.radius.md};
-  font-size: ${({ theme }) => theme.font.size.md};
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  padding: ${({ theme }) => theme.spacing(3)};
-`;
-
-const StyledSection = styled.div`
-  align-items: center;
-  display: flex;
-  flex-direction: row;
-  gap: ${({ theme }) => theme.spacing(3)};
-`;
-
-const StyledIntegrationLogo = styled.div`
-  align-items: center;
-  display: flex;
-  flex-direction: row;
-  gap: ${({ theme }) => theme.spacing(2)};
-  color: ${({ theme }) => theme.border.color.strong};
-`;
-
-const StyledSoonPill = styled(Pill)`
-  padding: ${({ theme }) => theme.spacing(1)} ${({ theme }) => theme.spacing(2)};
-`;
-
-const StyledLogo = styled.img`
-  height: 24px;
-  width: 24px;
-`;
-
-export const SettingsIntegrationComponent = ({
-  integration,
-}: SettingsIntegrationComponentProps) => {
-  const openLinkInTab = (link: string) => {
-    window.open(link);
-  };
-
-  return (
-    <StyledContainer>
-      <StyledSection>
-        <StyledIntegrationLogo>
-          <StyledLogo src={integration.from.image} alt={integration.from.key} />
-          {integration.to ? (
-            <>
-              <div>→</div>
-              <StyledLogo src={integration.to.image} alt={integration.to.key} />
-            </>
-          ) : (
-            <></>
-          )}
-        </StyledIntegrationLogo>
-        {integration.text}
-      </StyledSection>
-      {integration.type === 'Soon' ? (
-        <StyledSoonPill label="Soon" />
-      ) : (
-        <Button
-          onClick={() => openLinkInTab(integration.link)}
-          Icon={integration.type === 'Goto' ? IconArrowUpRight : IconBolt}
-          title={integration.type === 'Goto' ? integration.linkText : 'Use'}
-          size="small"
-        />
-      )}
-    </StyledContainer>
-  );
-};
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabase.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabase.tsx
new file mode 100644
index 000000000000..efcf298c3b4f
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabase.tsx
@@ -0,0 +1,80 @@
+import { useEffect } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
+import { IconSettings } from 'twenty-ui';
+
+import { useGetDatabaseConnections } from '@/databases/hooks/useGetDatabaseConnections';
+import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
+import { SettingsIntegrationDatabaseConnectionsListCard } from '@/settings/integrations/components/SettingsIntegrationDatabaseConnectionsListCard';
+import { SettingsIntegrationPreview } from '@/settings/integrations/components/SettingsIntegrationPreview';
+import { useSettingsIntegrationCategories } from '@/settings/integrations/hooks/useSettingsIntegrationCategories';
+import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
+import { AppPath } from '@/types/AppPath';
+import { SettingsPath } from '@/types/SettingsPath';
+import { H2Title } from '@/ui/display/typography/components/H2Title';
+import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
+import { Section } from '@/ui/layout/section/components/Section';
+import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+
+export const SettingsIntegrationDatabase = () => {
+  const { databaseKey = '' } = useParams();
+  const navigate = useNavigate();
+
+  const [integrationCategoryAll] = useSettingsIntegrationCategories();
+  const integration = integrationCategoryAll.integrations.find(
+    ({ from: { key } }) => key === databaseKey,
+  );
+
+  const isAirtableIntegrationEnabled = useIsFeatureEnabled(
+    'IS_AIRTABLE_INTEGRATION_ENABLED',
+  );
+  const isPostgresqlIntegrationEnabled = useIsFeatureEnabled(
+    'IS_POSTGRESQL_INTEGRATION_ENABLED',
+  );
+  const isIntegrationAvailable =
+    !!integration &&
+    ((databaseKey === 'airtable' && isAirtableIntegrationEnabled) ||
+      (databaseKey === 'postgresql' && isPostgresqlIntegrationEnabled));
+
+  useEffect(() => {
+    if (!isIntegrationAvailable) {
+      navigate(AppPath.NotFound);
+    }
+  }, [integration, databaseKey, navigate, isIntegrationAvailable]);
+
+  const { connections } = useGetDatabaseConnections({
+    databaseKey,
+    skip: !isIntegrationAvailable,
+  });
+
+  if (!isIntegrationAvailable) return null;
+
+  return (
+    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+      <SettingsPageContainer>
+        <Breadcrumb
+          links={[
+            {
+              children: 'Integrations',
+              href: getSettingsPagePath(SettingsPath.Integrations),
+            },
+            { children: integration.text },
+          ]}
+        />
+        <SettingsIntegrationPreview
+          integrationLogoUrl={integration.from.image}
+        />
+        <Section>
+          <H2Title
+            title={`${integration.text} database`}
+            description={`Connect or access your ${integration.text} data`}
+          />
+          <SettingsIntegrationDatabaseConnectionsListCard
+            integration={integration}
+            connections={connections}
+          />
+        </Section>
+      </SettingsPageContainer>
+    </SubMenuTopBarContainer>
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabaseConnection.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabaseConnection.tsx
new file mode 100644
index 000000000000..df61c9f709d4
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabaseConnection.tsx
@@ -0,0 +1,124 @@
+import { useEffect } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
+import { IconSettings } from 'twenty-ui';
+
+import { useDeleteOneDatabaseConnection } from '@/databases/hooks/useDeleteOneDatabaseConnection';
+import { useGetDatabaseConnection } from '@/databases/hooks/useGetDatabaseConnection';
+import { useGetDatabaseConnectionTables } from '@/databases/hooks/useGetDatabaseConnectionTables';
+import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
+import { SettingsIntegrationDatabaseTablesListCard } from '@/settings/integrations/components/SettingsIntegrationDatabaseTablesListCard';
+import { useSettingsIntegrationCategories } from '@/settings/integrations/hooks/useSettingsIntegrationCategories';
+import { getConnectionDbName } from '@/settings/integrations/utils/getConnectionDbName';
+import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
+import { AppPath } from '@/types/AppPath';
+import { SettingsPath } from '@/types/SettingsPath';
+import { H2Title } from '@/ui/display/typography/components/H2Title';
+import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
+import { Section } from '@/ui/layout/section/components/Section';
+import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { SettingsIntegrationDatabaseConnectionSummaryCard } from '~/pages/settings/integrations/SettingsIntegrationDatabaseConnectionSummaryCard';
+
+export const SettingsIntegrationDatabaseConnection = () => {
+  const { databaseKey = '', connectionId = '' } = useParams();
+  const navigate = useNavigate();
+
+  const [integrationCategoryAll] = useSettingsIntegrationCategories();
+  const integration = integrationCategoryAll.integrations.find(
+    ({ from: { key } }) => key === databaseKey,
+  );
+
+  const isAirtableIntegrationEnabled = useIsFeatureEnabled(
+    'IS_AIRTABLE_INTEGRATION_ENABLED',
+  );
+  const isPostgresqlIntegrationEnabled = useIsFeatureEnabled(
+    'IS_POSTGRESQL_INTEGRATION_ENABLED',
+  );
+  const isIntegrationAvailable =
+    !!integration &&
+    ((databaseKey === 'airtable' && isAirtableIntegrationEnabled) ||
+      (databaseKey === 'postgresql' && isPostgresqlIntegrationEnabled));
+
+  const { connection, loading } = useGetDatabaseConnection({
+    databaseKey,
+    connectionId,
+    skip: !isIntegrationAvailable,
+  });
+
+  const { deleteOneDatabaseConnection } = useDeleteOneDatabaseConnection();
+
+  const deleteConnection = async () => {
+    if (!connection) return;
+
+    await deleteOneDatabaseConnection({ id: connection.id });
+
+    navigate(`${settingsIntegrationsPagePath}/${databaseKey}`);
+  };
+
+  useEffect(() => {
+    if (!isIntegrationAvailable || (!loading && !connection)) {
+      navigate(AppPath.NotFound);
+    }
+  }, [
+    integration,
+    databaseKey,
+    navigate,
+    isIntegrationAvailable,
+    connection,
+    loading,
+  ]);
+
+  const { tables } = useGetDatabaseConnectionTables({
+    connectionId,
+    skip: !isIntegrationAvailable || !connection,
+  });
+
+  if (!isIntegrationAvailable || !connection) return null;
+
+  const settingsIntegrationsPagePath = getSettingsPagePath(
+    SettingsPath.Integrations,
+  );
+
+  const connectionName = getConnectionDbName({ integration, connection });
+
+  return (
+    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+      <SettingsPageContainer>
+        <Breadcrumb
+          links={[
+            {
+              children: 'Integrations',
+              href: settingsIntegrationsPagePath,
+            },
+            {
+              children: integration.text,
+              href: `${settingsIntegrationsPagePath}/${databaseKey}`,
+            },
+            { children: connectionName },
+          ]}
+        />
+        <Section>
+          <H2Title title="About" description="About this remote object" />
+          <SettingsIntegrationDatabaseConnectionSummaryCard
+            databaseLogoUrl={integration.from.image}
+            connectionId={connectionId}
+            connectionName={connectionName}
+            onRemove={deleteConnection}
+          />
+        </Section>
+        <Section>
+          <H2Title
+            title="Tables"
+            description="Select the tables that should be tracked"
+          />
+          {!!tables.length && (
+            <SettingsIntegrationDatabaseTablesListCard
+              connectionId={connectionId}
+              tables={tables}
+            />
+          )}
+        </Section>
+      </SettingsPageContainer>
+    </SubMenuTopBarContainer>
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabaseConnectionSummaryCard.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabaseConnectionSummaryCard.tsx
new file mode 100644
index 000000000000..5c3bddb24f8c
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabaseConnectionSummaryCard.tsx
@@ -0,0 +1,77 @@
+import styled from '@emotion/styled';
+import { IconDotsVertical, IconTrash } from 'twenty-ui';
+
+import { SettingsSummaryCard } from '@/settings/components/SettingsSummaryCard';
+import { SettingsIntegrationDatabaseConnectionSyncStatus } from '@/settings/integrations/components/SettingsIntegrationDatabaseConnectionSyncStatus';
+import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
+
+type SettingsIntegrationDatabaseConnectionSummaryCardProps = {
+  databaseLogoUrl: string;
+  connectionId: string;
+  connectionName: string;
+  onRemove: () => void;
+};
+
+const StyledDatabaseLogoContainer = styled.div`
+  align-items: center;
+  display: flex;
+  height: ${({ theme }) => theme.spacing(4)};
+  justify-content: center;
+  width: ${({ theme }) => theme.spacing(4)};
+`;
+
+const StyledDatabaseLogo = styled.img`
+  height: 100%;
+`;
+
+export const SettingsIntegrationDatabaseConnectionSummaryCard = ({
+  databaseLogoUrl,
+  connectionId,
+  connectionName,
+  onRemove,
+}: SettingsIntegrationDatabaseConnectionSummaryCardProps) => {
+  const dropdownId =
+    'settings-integration-database-connection-summary-card-dropdown';
+
+  return (
+    <SettingsSummaryCard
+      title={
+        <>
+          <StyledDatabaseLogoContainer>
+            <StyledDatabaseLogo alt="" src={databaseLogoUrl} />
+          </StyledDatabaseLogoContainer>
+          {connectionName}
+        </>
+      }
+      rightComponent={
+        <>
+          <SettingsIntegrationDatabaseConnectionSyncStatus
+            connectionId={connectionId}
+          />
+          <Dropdown
+            dropdownId={dropdownId}
+            dropdownHotkeyScope={{ scope: dropdownId }}
+            clickableComponent={
+              <LightIconButton Icon={IconDotsVertical} accent="tertiary" />
+            }
+            dropdownComponents={
+              <DropdownMenu>
+                <DropdownMenuItemsContainer>
+                  <MenuItem
+                    LeftIcon={IconTrash}
+                    text="Remove"
+                    onClick={onRemove}
+                  />
+                </DropdownMenuItemsContainer>
+              </DropdownMenu>
+            }
+          />
+        </>
+      }
+    />
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationGroup.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationGroup.tsx
deleted file mode 100644
index 1ad1efa465bd..000000000000
--- a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationGroup.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import styled from '@emotion/styled';
-
-import { H2Title } from '@/ui/display/typography/components/H2Title';
-import { Section } from '@/ui/layout/section/components/Section';
-import { SettingsIntegrationComponent } from '~/pages/settings/integrations/SettingsIntegrationComponent';
-import { SettingsIntegrationCategory } from '~/pages/settings/integrations/types/SettingsIntegrationCategory';
-
-interface SettingsIntegrationGroupProps {
-  integrationGroup: SettingsIntegrationCategory;
-}
-
-const StyledIntegrationGroupHeader = styled.div`
-  align-items: start;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-`;
-
-const StyledGroupLink = styled.div`
-  align-items: start;
-  display: flex;
-  flex-direction: row;
-  font-size: ${({ theme }) => theme.font.size.md};
-  gap: ${({ theme }) => theme.spacing(1)};
-  cursor: pointer;
-`;
-
-const StyledIntegrationsSection = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: ${({ theme }) => theme.spacing(4)};
-`;
-
-export const SettingsIntegrationGroup = ({
-  integrationGroup,
-}: SettingsIntegrationGroupProps) => {
-  const openLinkInTab = (link: string) => {
-    window.open(link);
-  };
-  return (
-    <Section>
-      <StyledIntegrationGroupHeader>
-        <H2Title title={integrationGroup.title} />
-        {integrationGroup.hyperlink && (
-          <StyledGroupLink
-            onClick={() => openLinkInTab(integrationGroup.hyperlink ?? '')}
-          >
-            <div>{integrationGroup.hyperlinkText}</div>
-            <div>→</div>
-          </StyledGroupLink>
-        )}
-      </StyledIntegrationGroupHeader>
-      <StyledIntegrationsSection>
-        {integrationGroup.integrations.map((integration) => {
-          return <SettingsIntegrationComponent integration={integration} />;
-        })}
-      </StyledIntegrationsSection>
-    </Section>
-  );
-};
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection.tsx
new file mode 100644
index 000000000000..d8b27084d526
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection.tsx
@@ -0,0 +1,153 @@
+import { useEffect } from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
+import { useNavigate, useParams } from 'react-router-dom';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { IconSettings } from 'twenty-ui';
+import { z } from 'zod';
+
+import { useCreateOneDatabaseConnection } from '@/databases/hooks/useCreateOneDatabaseConnection';
+import { getForeignDataWrapperType } from '@/databases/utils/getForeignDataWrapperType';
+import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
+import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
+import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
+import {
+  SettingsIntegrationPostgreSQLConnectionForm,
+  settingsIntegrationPostgreSQLConnectionFormSchema,
+} from '@/settings/integrations/components/SettingsIntegrationDatabaseConnectionForm';
+import { useSettingsIntegrationCategories } from '@/settings/integrations/hooks/useSettingsIntegrationCategories';
+import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
+import { AppPath } from '@/types/AppPath';
+import { SettingsPath } from '@/types/SettingsPath';
+import { H2Title } from '@/ui/display/typography/components/H2Title';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
+import { Section } from '@/ui/layout/section/components/Section';
+import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { CreateRemoteServerInput } from '~/generated-metadata/graphql';
+
+const newConnectionSchema = settingsIntegrationPostgreSQLConnectionFormSchema;
+
+const createRemoteServerInputSchema = newConnectionSchema
+  .extend({
+    foreignDataWrapperType: z.string().min(1),
+  })
+  .transform<CreateRemoteServerInput>((values) => ({
+    foreignDataWrapperType: values.foreignDataWrapperType,
+    foreignDataWrapperOptions: {
+      dbname: values.dbname,
+      host: values.host,
+      port: values.port,
+    },
+    userMappingOptions: {
+      password: values.password,
+      username: values.username,
+    },
+  }));
+
+type SettingsIntegrationNewConnectionFormValues = z.infer<
+  typeof newConnectionSchema
+>;
+
+export const SettingsIntegrationNewDatabaseConnection = () => {
+  const { databaseKey = '' } = useParams();
+  const navigate = useNavigate();
+
+  const [integrationCategoryAll] = useSettingsIntegrationCategories();
+  const integration = integrationCategoryAll.integrations.find(
+    ({ from: { key } }) => key === databaseKey,
+  );
+
+  const { createOneDatabaseConnection } = useCreateOneDatabaseConnection();
+  const { enqueueSnackBar } = useSnackBar();
+
+  const isAirtableIntegrationEnabled = useIsFeatureEnabled(
+    'IS_AIRTABLE_INTEGRATION_ENABLED',
+  );
+  const isPostgresqlIntegrationEnabled = useIsFeatureEnabled(
+    'IS_POSTGRESQL_INTEGRATION_ENABLED',
+  );
+  const isIntegrationAvailable =
+    !!integration &&
+    ((databaseKey === 'airtable' && isAirtableIntegrationEnabled) ||
+      (databaseKey === 'postgresql' && isPostgresqlIntegrationEnabled));
+
+  useEffect(() => {
+    if (!isIntegrationAvailable) {
+      navigate(AppPath.NotFound);
+    }
+  }, [integration, databaseKey, navigate, isIntegrationAvailable]);
+
+  const formConfig = useForm<SettingsIntegrationNewConnectionFormValues>({
+    mode: 'onTouched',
+    resolver: zodResolver(newConnectionSchema),
+  });
+
+  if (!isIntegrationAvailable) return null;
+
+  const settingsIntegrationsPagePath = getSettingsPagePath(
+    SettingsPath.Integrations,
+  );
+
+  const canSave = formConfig.formState.isValid;
+
+  const handleSave = async () => {
+    const formValues = formConfig.getValues();
+
+    try {
+      await createOneDatabaseConnection(
+        createRemoteServerInputSchema.parse({
+          ...formValues,
+          foreignDataWrapperType: getForeignDataWrapperType(databaseKey),
+        }),
+      );
+
+      navigate(`${settingsIntegrationsPagePath}/${databaseKey}`);
+    } catch (error) {
+      enqueueSnackBar((error as Error).message, {
+        variant: 'error',
+      });
+    }
+  };
+
+  return (
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    <FormProvider {...formConfig}>
+      <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+        <SettingsPageContainer>
+          <SettingsHeaderContainer>
+            <Breadcrumb
+              links={[
+                {
+                  children: 'Integrations',
+                  href: settingsIntegrationsPagePath,
+                },
+                {
+                  children: integration.text,
+                  href: `${settingsIntegrationsPagePath}/${databaseKey}`,
+                },
+                { children: 'New' },
+              ]}
+            />
+            <SaveAndCancelButtons
+              isSaveDisabled={!canSave}
+              onCancel={() =>
+                navigate(`${settingsIntegrationsPagePath}/${databaseKey}`)
+              }
+              onSave={handleSave}
+            />
+          </SettingsHeaderContainer>
+          {databaseKey === 'postgresql' ? (
+            <Section>
+              <H2Title
+                title="Connect a new database"
+                description="Provide the information to connect your PostgreSQL database"
+              />
+              <SettingsIntegrationPostgreSQLConnectionForm />
+            </Section>
+          ) : null}
+        </SettingsPageContainer>
+      </SubMenuTopBarContainer>
+    </FormProvider>
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrations.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrations.tsx
index 616b2d19a348..9cbc824004d0 100644
--- a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrations.tsx
+++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrations.tsx
@@ -1,18 +1,21 @@
+import { IconSettings } from 'twenty-ui';
+
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { IconSettings } from '@/ui/display/icon';
+import { SettingsIntegrationGroup } from '@/settings/integrations/components/SettingsIntegrationGroup';
+import { useSettingsIntegrationCategories } from '@/settings/integrations/hooks/useSettingsIntegrationCategories';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
-import { SETTINGS_INTEGRATION_CATEGORIES } from '~/pages/settings/integrations/constants/SettingsIntegrationCategories';
-import { SettingsIntegrationGroup } from '~/pages/settings/integrations/SettingsIntegrationGroup';
 
 export const SettingsIntegrations = () => {
+  const integrationCategories = useSettingsIntegrationCategories();
+
   return (
     <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
       <SettingsPageContainer>
         <Breadcrumb links={[{ children: 'Integrations' }]} />
-        {SETTINGS_INTEGRATION_CATEGORIES.map((group) => {
-          return <SettingsIntegrationGroup integrationGroup={group} />;
-        })}
+        {integrationCategories.map((group) => (
+          <SettingsIntegrationGroup key={group.key} integrationGroup={group} />
+        ))}
       </SettingsPageContainer>
     </SubMenuTopBarContainer>
   );
diff --git a/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationDatabase.stories.tsx b/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationDatabase.stories.tsx
new file mode 100644
index 000000000000..1114e3c75c07
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationDatabase.stories.tsx
@@ -0,0 +1,29 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
+import { SettingsPath } from '@/types/SettingsPath';
+import { SettingsIntegrationDatabase } from '~/pages/settings/integrations/SettingsIntegrationDatabase';
+import {
+  PageDecorator,
+  PageDecoratorArgs,
+} from '~/testing/decorators/PageDecorator';
+import { graphqlMocks } from '~/testing/graphqlMocks';
+
+const meta: Meta<PageDecoratorArgs> = {
+  title: 'Pages/Settings/Integrations/SettingsIntegrationDatabase',
+  component: SettingsIntegrationDatabase,
+  decorators: [PageDecorator],
+  args: {
+    routePath: getSettingsPagePath(SettingsPath.IntegrationDatabase),
+    routeParams: { ':databaseKey': 'postgresql' },
+  },
+  parameters: {
+    msw: graphqlMocks,
+  },
+};
+
+export default meta;
+
+export type Story = StoryObj<typeof SettingsIntegrationDatabase>;
+
+export const Default: Story = {};
diff --git a/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationDatabaseConnection.stories.tsx b/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationDatabaseConnection.stories.tsx
new file mode 100644
index 000000000000..f5377534bed1
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationDatabaseConnection.stories.tsx
@@ -0,0 +1,32 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
+import { SettingsPath } from '@/types/SettingsPath';
+import { SettingsIntegrationDatabaseConnection } from '~/pages/settings/integrations/SettingsIntegrationDatabaseConnection';
+import {
+  PageDecorator,
+  PageDecoratorArgs,
+} from '~/testing/decorators/PageDecorator';
+import { graphqlMocks } from '~/testing/graphqlMocks';
+
+const meta: Meta<PageDecoratorArgs> = {
+  title: 'Pages/Settings/Integrations/SettingsIntegrationDatabaseConnection',
+  component: SettingsIntegrationDatabaseConnection,
+  decorators: [PageDecorator],
+  args: {
+    routePath: getSettingsPagePath(SettingsPath.IntegrationDatabaseConnection),
+    routeParams: {
+      ':databaseKey': 'postgresql',
+      ':connectionId': '67cbfd35-8dd4-4591-b9d4-c1906281a5da',
+    },
+  },
+  parameters: {
+    msw: graphqlMocks,
+  },
+};
+
+export default meta;
+
+export type Story = StoryObj<typeof SettingsIntegrationDatabaseConnection>;
+
+export const Default: Story = {};
diff --git a/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationNewDatabaseConnection.stories.tsx b/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationNewDatabaseConnection.stories.tsx
new file mode 100644
index 000000000000..aa98b1a9dde1
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationNewDatabaseConnection.stories.tsx
@@ -0,0 +1,27 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { SettingsIntegrationNewDatabaseConnection } from '~/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection';
+import {
+  PageDecorator,
+  PageDecoratorArgs,
+} from '~/testing/decorators/PageDecorator';
+import { graphqlMocks } from '~/testing/graphqlMocks';
+
+const meta: Meta<PageDecoratorArgs> = {
+  title: 'Pages/Settings/Integrations/SettingsIntegrationNewDatabaseConnection',
+  component: SettingsIntegrationNewDatabaseConnection,
+  decorators: [PageDecorator],
+  args: {
+    routePath: '/settings/integrations/:databaseKey/new',
+    routeParams: { ':databaseKey': 'postgresql' },
+  },
+  parameters: {
+    msw: graphqlMocks,
+  },
+};
+
+export default meta;
+
+export type Story = StoryObj<typeof SettingsIntegrationNewDatabaseConnection>;
+
+export const Default: Story = {};
diff --git a/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrations.stories.tsx b/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrations.stories.tsx
index a0032bbf618d..bc11b4f61940 100644
--- a/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrations.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrations.stories.tsx
@@ -1,6 +1,8 @@
 import { Meta, StoryObj } from '@storybook/react';
 import { within } from '@storybook/test';
 
+import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
+import { SettingsPath } from '@/types/SettingsPath';
 import { SettingsIntegrations } from '~/pages/settings/integrations/SettingsIntegrations';
 import {
   PageDecorator,
@@ -13,7 +15,7 @@ const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/Integrations/SettingsIntegrations',
   component: SettingsIntegrations,
   decorators: [PageDecorator],
-  args: { routePath: '/settings/integrations' },
+  args: { routePath: getSettingsPagePath(SettingsPath.Integrations) },
   parameters: {
     msw: graphqlMocks,
   },
diff --git a/packages/twenty-front/src/pages/settings/integrations/constants/SettingsIntegrationCategories.ts b/packages/twenty-front/src/pages/settings/integrations/constants/SettingsIntegrationCategories.ts
deleted file mode 100644
index c233445cb46f..000000000000
--- a/packages/twenty-front/src/pages/settings/integrations/constants/SettingsIntegrationCategories.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { SETTINGS_INTEGRATION_REQUEST_CATEGORY } from '~/pages/settings/integrations/constants/SettingsIntegrationRequest';
-import { SETTINGS_INTEGRATION_WINDMILL_CATEGORY } from '~/pages/settings/integrations/constants/SettingsIntegrationWindmill';
-import { SETTINGS_INTEGRATION_ZAPIER_CATEGORY } from '~/pages/settings/integrations/constants/SettingsIntegrationZapier';
-import { SettingsIntegrationCategory } from '~/pages/settings/integrations/types/SettingsIntegrationCategory';
-
-export const SETTINGS_INTEGRATION_CATEGORIES: SettingsIntegrationCategory[] = [
-  SETTINGS_INTEGRATION_ZAPIER_CATEGORY,
-  SETTINGS_INTEGRATION_WINDMILL_CATEGORY,
-  SETTINGS_INTEGRATION_REQUEST_CATEGORY,
-];
diff --git a/packages/twenty-front/src/pages/settings/integrations/types/SettingsIntegration.ts b/packages/twenty-front/src/pages/settings/integrations/types/SettingsIntegration.ts
deleted file mode 100644
index d132ce13aba1..000000000000
--- a/packages/twenty-front/src/pages/settings/integrations/types/SettingsIntegration.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export type SettingsIntegrationType = 'Use' | 'Goto' | 'Soon';
-
-export type SettingsIntegration = {
-  from: { key: string; image: string };
-  to: { key: string; image: string } | null;
-  type: SettingsIntegrationType;
-  linkText?: string;
-  link: string;
-  text: string;
-};
diff --git a/packages/twenty-front/src/pages/settings/integrations/types/SettingsIntegrationCategory.ts b/packages/twenty-front/src/pages/settings/integrations/types/SettingsIntegrationCategory.ts
deleted file mode 100644
index 661689679a2f..000000000000
--- a/packages/twenty-front/src/pages/settings/integrations/types/SettingsIntegrationCategory.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { SettingsIntegration } from '~/pages/settings/integrations/types/SettingsIntegration';
-
-export type SettingsIntegrationCategory = {
-  key: string;
-  title: string;
-  hyperlinkText?: string;
-  hyperlink: string | null;
-  integrations: SettingsIntegration[];
-};
diff --git a/packages/twenty-front/src/pages/tasks/Tasks.tsx b/packages/twenty-front/src/pages/tasks/Tasks.tsx
index 05aef6fa4b5f..446bd1aeda15 100644
--- a/packages/twenty-front/src/pages/tasks/Tasks.tsx
+++ b/packages/twenty-front/src/pages/tasks/Tasks.tsx
@@ -1,4 +1,5 @@
 import styled from '@emotion/styled';
+import { IconArchive, IconCheck, IconCheckbox } from 'twenty-ui';
 
 import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contexts/TasksRecoilScopeContext';
 import { PageAddTaskButton } from '@/activities/tasks/components/PageAddTaskButton';
@@ -6,7 +7,6 @@ import { TaskGroups } from '@/activities/tasks/components/TaskGroups';
 import { TASKS_TAB_LIST_COMPONENT_ID } from '@/activities/tasks/constants/TasksTabListComponentId';
 import { ObjectFilterDropdownButton } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton';
 import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
-import { IconArchive, IconCheck, IconCheckbox } from '@/ui/display/icon/index';
 import { PageBody } from '@/ui/layout/page/PageBody';
 import { PageContainer } from '@/ui/layout/page/PageContainer';
 import { PageHeader } from '@/ui/layout/page/PageHeader';
diff --git a/packages/twenty-front/src/pages/tasks/TasksEffect.tsx b/packages/twenty-front/src/pages/tasks/TasksEffect.tsx
index 7d164ddae83a..c3d5e2daf743 100644
--- a/packages/twenty-front/src/pages/tasks/TasksEffect.tsx
+++ b/packages/twenty-front/src/pages/tasks/TasksEffect.tsx
@@ -4,6 +4,7 @@ import { useRecoilValue } from 'recoil';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
+import { isDefined } from '~/utils/isDefined';
 
 import { tasksFilterDefinitions } from './tasks-filter-definitions';
 
@@ -26,7 +27,7 @@ export const TasksEffect = ({ filterDropdownId }: TasksEffectProps) => {
   }, [setAvailableFilterDefinitions]);
 
   useEffect(() => {
-    if (currentWorkspaceMember) {
+    if (isDefined(currentWorkspaceMember)) {
       setSelectedFilter({
         fieldMetadataId: 'assigneeId',
         value: JSON.stringify(currentWorkspaceMember.id),
diff --git a/packages/twenty-front/src/pages/tasks/tasks-filter-definitions.tsx b/packages/twenty-front/src/pages/tasks/tasks-filter-definitions.tsx
index 73356c26ee03..34839160cbb5 100644
--- a/packages/twenty-front/src/pages/tasks/tasks-filter-definitions.tsx
+++ b/packages/twenty-front/src/pages/tasks/tasks-filter-definitions.tsx
@@ -1,6 +1,7 @@
+import { IconUserCircle } from 'twenty-ui';
+
 import { Activity } from '@/activities/types/Activity';
 import { FilterDefinitionByEntity } from '@/object-record/object-filter-dropdown/types/FilterDefinitionByEntity';
-import { IconUserCircle } from '@/ui/display/icon';
 
 export const tasksFilterDefinitions: FilterDefinitionByEntity<Activity>[] = [
   {
diff --git a/packages/twenty-front/src/testing/ComponentStorybookLayout.tsx b/packages/twenty-front/src/testing/ComponentStorybookLayout.tsx
index 57fbe655403c..284182c4d884 100644
--- a/packages/twenty-front/src/testing/ComponentStorybookLayout.tsx
+++ b/packages/twenty-front/src/testing/ComponentStorybookLayout.tsx
@@ -1,8 +1,6 @@
 import styled from '@emotion/styled';
 
 const StyledLayout = styled.div<{ width?: number }>`
-  background: ${({ theme }) => theme.background.primary};
-  border: 1px solid ${({ theme }) => theme.border.color.light};
   border-radius: 5px;
 
   display: flex;
diff --git a/packages/twenty-front/src/testing/decorators/FormProviderDecorator.tsx b/packages/twenty-front/src/testing/decorators/FormProviderDecorator.tsx
new file mode 100644
index 000000000000..6d6db09e39a5
--- /dev/null
+++ b/packages/twenty-front/src/testing/decorators/FormProviderDecorator.tsx
@@ -0,0 +1,13 @@
+import { FormProvider, useForm } from 'react-hook-form';
+import { Decorator } from '@storybook/react';
+
+export const FormProviderDecorator: Decorator = (Story) => {
+  const formConfig = useForm();
+
+  return (
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    <FormProvider {...formConfig}>
+      <Story />
+    </FormProvider>
+  );
+};
diff --git a/packages/twenty-front/src/testing/decorators/ObjectMetadataItemsDecorator.tsx b/packages/twenty-front/src/testing/decorators/ObjectMetadataItemsDecorator.tsx
index a657c9953803..c54ff5dd136a 100644
--- a/packages/twenty-front/src/testing/decorators/ObjectMetadataItemsDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/ObjectMetadataItemsDecorator.tsx
@@ -2,9 +2,11 @@ import { useEffect } from 'react';
 import { Decorator } from '@storybook/react';
 import { useRecoilValue, useSetRecoilState } from 'recoil';
 
+import { currentUserState } from '@/auth/states/currentUserState';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { ObjectMetadataItemsLoadEffect } from '@/object-metadata/components/ObjectMetadataItemsLoadEffect';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { mockedUsersData } from '~/testing/mock-data/users';
 import { mockWorkspaceMembers } from '~/testing/mock-data/workspace-members';
 
 export const ObjectMetadataItemsDecorator: Decorator = (Story) => {
@@ -12,11 +14,12 @@ export const ObjectMetadataItemsDecorator: Decorator = (Story) => {
   const setCurrentWorkspaceMember = useSetRecoilState(
     currentWorkspaceMemberState,
   );
+  const setCurrentUser = useSetRecoilState(currentUserState);
 
-  useEffect(
-    () => setCurrentWorkspaceMember(mockWorkspaceMembers[0]),
-    [setCurrentWorkspaceMember],
-  );
+  useEffect(() => {
+    setCurrentWorkspaceMember(mockWorkspaceMembers[0]);
+    setCurrentUser(mockedUsersData[0]);
+  }, [setCurrentUser, setCurrentWorkspaceMember]);
 
   return (
     <>
diff --git a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
index c3df0d1fbec1..90a17d2dc19d 100644
--- a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
@@ -4,13 +4,13 @@ import { ApolloProvider } from '@apollo/client';
 import { Decorator } from '@storybook/react';
 import { RecoilRoot } from 'recoil';
 
-import { ApolloMetadataClientProvider } from '@/object-metadata/components/ApolloMetadataClientProvider';
 import { ObjectMetadataItemsProvider } from '@/object-metadata/components/ObjectMetadataItemsProvider';
+import { ApolloMetadataClientMockedProvider } from '@/object-metadata/hooks/__mocks__/ApolloMetadataClientProvider';
 import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
 import { ClientConfigProvider } from '~/modules/client-config/components/ClientConfigProvider';
 import { DefaultLayout } from '~/modules/ui/layout/page/DefaultLayout';
 import { UserProvider } from '~/modules/users/components/UserProvider';
-import { mockedClient } from '~/testing/mockedClient';
+import { mockedApolloClient } from '~/testing/mockedApolloClient';
 
 import { FullHeightStorybookLayout } from '../FullHeightStorybookLayout';
 
@@ -37,8 +37,8 @@ export const PageDecorator: Decorator<{
   routeParams: RouteParams;
 }> = (Story, { args }) => (
   <RecoilRoot>
-    <ApolloProvider client={mockedClient}>
-      <ApolloMetadataClientProvider>
+    <ApolloProvider client={mockedApolloClient}>
+      <ApolloMetadataClientMockedProvider>
         <UserProvider>
           <ClientConfigProvider>
             <MemoryRouter
@@ -50,11 +50,11 @@ export const PageDecorator: Decorator<{
                 <HelmetProvider>
                   <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
                     <ObjectMetadataItemsProvider>
-                      <DefaultLayout>
-                        <Routes>
+                      <Routes>
+                        <Route element={<DefaultLayout />}>
                           <Route path={args.routePath} element={<Story />} />
-                        </Routes>
-                      </DefaultLayout>
+                        </Route>
+                      </Routes>
                     </ObjectMetadataItemsProvider>
                   </SnackBarProviderScope>
                 </HelmetProvider>
@@ -62,7 +62,7 @@ export const PageDecorator: Decorator<{
             </MemoryRouter>
           </ClientConfigProvider>
         </UserProvider>
-      </ApolloMetadataClientProvider>
+      </ApolloMetadataClientMockedProvider>
     </ApolloProvider>
   </RecoilRoot>
 );
diff --git a/packages/twenty-front/src/testing/decorators/RootDecorator.tsx b/packages/twenty-front/src/testing/decorators/RootDecorator.tsx
index 123ce27f0452..9c2633037b5b 100644
--- a/packages/twenty-front/src/testing/decorators/RootDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/RootDecorator.tsx
@@ -2,18 +2,18 @@ import { ApolloProvider } from '@apollo/client';
 import { Decorator } from '@storybook/react';
 import { RecoilRoot } from 'recoil';
 
-import { ApolloMetadataClientProvider } from '@/object-metadata/components/ApolloMetadataClientProvider';
+import { ApolloMetadataClientMockedProvider } from '@/object-metadata/hooks/__mocks__/ApolloMetadataClientProvider';
 
 import { InitializeHotkeyStorybookHookEffect } from '../InitializeHotkeyStorybookHook';
-import { mockedClient } from '../mockedClient';
+import { mockedApolloClient } from '../mockedApolloClient';
 
 export const RootDecorator: Decorator = (Story) => (
   <RecoilRoot>
-    <ApolloProvider client={mockedClient}>
-      <ApolloMetadataClientProvider>
+    <ApolloProvider client={mockedApolloClient}>
+      <ApolloMetadataClientMockedProvider>
         <InitializeHotkeyStorybookHookEffect />
         <Story />
-      </ApolloMetadataClientProvider>
+      </ApolloMetadataClientMockedProvider>
     </ApolloProvider>
   </RecoilRoot>
 );
diff --git a/packages/twenty-front/src/testing/graphqlMocks.ts b/packages/twenty-front/src/testing/graphqlMocks.ts
index aa9b8aa9ab1a..763218b39008 100644
--- a/packages/twenty-front/src/testing/graphqlMocks.ts
+++ b/packages/twenty-front/src/testing/graphqlMocks.ts
@@ -1,7 +1,7 @@
 import { getOperationName } from '@apollo/client/utilities';
-import { graphql, HttpResponse } from 'msw';
+import { graphql, http, HttpResponse } from 'msw';
 
-import { CREATE_EVENT } from '@/analytics/graphql/queries/createEvent';
+import { TRACK } from '@/analytics/graphql/queries/track';
 import { GET_CLIENT_CONFIG } from '@/client-config/graphql/queries/getClientConfig';
 import { FIND_MANY_OBJECT_METADATA_ITEMS } from '@/object-metadata/graphql/queries';
 import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
@@ -12,7 +12,6 @@ import {
   mockedDuplicateCompanyData,
 } from '~/testing/mock-data/companies';
 import { mockedClientConfig } from '~/testing/mock-data/config';
-import { mockedPipelineSteps } from '~/testing/mock-data/pipeline-steps';
 import { mockedUsersData } from '~/testing/mock-data/users';
 import { mockWorkspaceMembers } from '~/testing/mock-data/workspace-members';
 
@@ -32,10 +31,10 @@ export const graphqlMocks = {
         },
       });
     }),
-    graphql.mutation(getOperationName(CREATE_EVENT) ?? '', () => {
+    graphql.mutation(getOperationName(TRACK) ?? '', () => {
       return HttpResponse.json({
         data: {
-          createEvent: { success: 1, __typename: 'Event' },
+          track: { success: 1, __typename: 'TRACK' },
         },
       });
     }),
@@ -249,29 +248,6 @@ export const graphqlMocks = {
         },
       });
     }),
-    graphql.query('FindManyPipelineSteps', () => {
-      return HttpResponse.json({
-        data: {
-          pipelineSteps: {
-            edges: mockedPipelineSteps.map((step) => ({
-              node: {
-                ...step,
-                opportunities: {
-                  edges: [],
-                },
-              },
-              cursor: null,
-            })),
-            pageInfo: {
-              hasNextPage: false,
-              hasPreviousPage: false,
-              startCursor: null,
-              endCursor: null,
-            },
-          },
-        },
-      });
-    }),
     graphql.query('FindManyOpportunities', () => {
       return HttpResponse.json({
         data: {
@@ -339,5 +315,15 @@ export const graphqlMocks = {
         },
       });
     }),
+    http.get('https://chat-assets.frontapp.com/v1/chat.bundle.js', () => {
+      return HttpResponse.text(
+        `
+          window.FrontChat = () => {};
+          console.log("This is a mocked script response.");
+          // Additional JavaScript code here
+        `,
+        { status: 200 },
+      );
+    }),
   ],
 };
diff --git a/packages/twenty-front/src/testing/mock-data/calendar.ts b/packages/twenty-front/src/testing/mock-data/calendar.ts
new file mode 100644
index 000000000000..a58f0074ec94
--- /dev/null
+++ b/packages/twenty-front/src/testing/mock-data/calendar.ts
@@ -0,0 +1,81 @@
+import { addDays, subHours, subMonths } from 'date-fns';
+
+import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
+
+export const mockedCalendarEvents: CalendarEvent[] = [
+  {
+    externalCreatedAt: new Date().toISOString(),
+    endsAt: addDays(new Date().setHours(11, 30), 1).toISOString(),
+    id: '9a6b35f1-6078-415b-9540-f62671bb81d0',
+    isFullDay: false,
+    startsAt: addDays(new Date().setHours(10, 0), 1).toISOString(),
+    visibility: 'METADATA',
+    calendarEventParticipants: [
+      {
+        id: '1',
+        handle: 'jdoe',
+        isOrganizer: false,
+        responseStatus: 'ACCEPTED',
+        displayName: 'John Doe',
+      },
+      {
+        id: '2',
+        handle: 'jadoe',
+        isOrganizer: false,
+        responseStatus: 'ACCEPTED',
+        displayName: 'Jane Doe',
+      },
+      {
+        id: '3',
+        handle: 'tapple',
+        isOrganizer: false,
+        responseStatus: 'ACCEPTED',
+        displayName: 'Tim Apple',
+      },
+    ],
+  },
+  {
+    externalCreatedAt: subHours(new Date(), 2).toISOString(),
+    id: '19b32878-a950-4968-9e3b-ce5da514ea41',
+    endsAt: new Date(new Date().setHours(18, 40)).toISOString(),
+    isCanceled: true,
+    isFullDay: false,
+    startsAt: new Date(new Date().setHours(18, 0)).toISOString(),
+    title: 'Bug solving',
+    visibility: 'SHARE_EVERYTHING',
+  },
+  {
+    externalCreatedAt: subHours(new Date(), 2).toISOString(),
+    id: '6ad1cbcb-2ac4-409e-aff0-48165556fc0c',
+    endsAt: new Date(new Date().setHours(16, 30)).toISOString(),
+    isFullDay: false,
+    startsAt: new Date(new Date().setHours(15, 15)).toISOString(),
+    title: 'Onboarding Follow-Up Call',
+    visibility: 'SHARE_EVERYTHING',
+  },
+  {
+    externalCreatedAt: subHours(new Date(), 2).toISOString(),
+    id: '52cc83e3-f3dc-4c25-8a7d-5ff857612142',
+    endsAt: new Date(new Date().setHours(10, 30)).toISOString(),
+    isFullDay: false,
+    startsAt: new Date(new Date().setHours(10, 0)).toISOString(),
+    title: 'Onboarding Call',
+    visibility: 'SHARE_EVERYTHING',
+  },
+  {
+    externalCreatedAt: subHours(new Date(), 2).toISOString(),
+    id: '5a792d11-259a-4099-af51-59eb85e15d83',
+    isFullDay: true,
+    startsAt: subMonths(new Date().setHours(8, 0), 1).toISOString(),
+    visibility: 'METADATA',
+  },
+  {
+    externalCreatedAt: subHours(new Date(), 2).toISOString(),
+    id: '89e2a1c7-3d3f-4e79-a492-aa5de3785fc5',
+    endsAt: subMonths(new Date().setHours(14, 30), 3).toISOString(),
+    isFullDay: false,
+    startsAt: subMonths(new Date().setHours(14, 0), 3).toISOString(),
+    title: 'Alan x Garry',
+    visibility: 'SHARE_EVERYTHING',
+  },
+];
diff --git a/packages/twenty-front/src/testing/mock-data/events.ts b/packages/twenty-front/src/testing/mock-data/events.ts
new file mode 100644
index 000000000000..2be81b414f8b
--- /dev/null
+++ b/packages/twenty-front/src/testing/mock-data/events.ts
@@ -0,0 +1,53 @@
+import { Event } from '@/activities/events/types/Event';
+
+export const mockedEvents: Array<Event> = [
+  {
+    properties: '{"diff": {"address": {"after": "TEST", "before": ""}}}',
+    updatedAt: '2023-04-26T10:12:42.33625+00:00',
+    id: '79f84835-b2f9-4ab5-8ab9-17dbcc45dda3',
+    personId: null,
+    companyId: 'ce40eca0-8f4b-4bba-ba91-5cbd870c64d0',
+    name: 'updated.company',
+    opportunityId: null,
+    createdAt: '2023-04-26T10:12:42.33625+00:00',
+    workspaceMember: {
+      __typename: 'WorkspaceMember',
+      id: '20202020-0687-4c41-b707-ed1bfca972a7',
+      avatarUrl: '',
+      locale: 'en',
+      name: {
+        __typename: 'FullName',
+        firstName: 'Tim',
+        lastName: 'Apple',
+      },
+      colorScheme: 'Light',
+    },
+    workspaceMemberId: '20202020-0687-4c41-b707-ed1bfca972a7',
+    deletedAt: null,
+  },
+  {
+    properties:
+      '{"after": {"id": "ce40eca0-8f4b-4bba-ba91-5cbd870c64d0", "name": "", "xLink": {"url": "", "label": ""}, "events": {"edges": [], "__typename": "eventConnection"}, "people": {"edges": [], "__typename": "personConnection"}, "address": "", "position": 0.5, "createdAt": "2024-03-24T21:33:45.765295", "employees": null, "favorites": {"edges": [], "__typename": "favoriteConnection"}, "updatedAt": "2024-03-24T21:33:45.765295", "__typename": "company", "domainName": "", "attachments": {"edges": [], "__typename": "attachmentConnection"}, "accountOwner": null, "linkedinLink": {"url": "", "label": ""}, "opportunities": {"edges": [], "__typename": "opportunityConnection"}, "accountOwnerId": null, "activityTargets": {"edges": [], "__typename": "activityTargetConnection"}, "idealCustomerProfile": false, "annualRecurringRevenue": {"amountMicros": null, "currencyCode": ""}}}',
+    updatedAt: new Date().toISOString(),
+    id: '1ad72a42-6ab4-4474-a62a-a57cae3c0298',
+    personId: null,
+    companyId: 'ce40eca0-8f4b-4bba-ba91-5cbd870c64d0',
+    name: 'created.company',
+    opportunityId: null,
+    createdAt: new Date().toISOString(),
+    workspaceMember: {
+      __typename: 'WorkspaceMember',
+      id: '20202020-0687-4c41-b707-ed1bfca972a7',
+      avatarUrl: '',
+      locale: 'en',
+      name: {
+        __typename: 'FullName',
+        firstName: 'Tim',
+        lastName: 'Apple',
+      },
+      colorScheme: 'Light',
+    },
+    workspaceMemberId: '20202020-0687-4c41-b707-ed1bfca972a7',
+    deletedAt: null,
+  },
+];
diff --git a/packages/twenty-front/src/testing/mock-data/index.ts b/packages/twenty-front/src/testing/mock-data/index.ts
index d6a930822f48..0d8eb19d10b9 100644
--- a/packages/twenty-front/src/testing/mock-data/index.ts
+++ b/packages/twenty-front/src/testing/mock-data/index.ts
@@ -1,7 +1,13 @@
-import { isObject, isString } from '@sniptt/guards';
+import {
+  isArray,
+  isNonEmptyString,
+  isNumber,
+  isObject,
+  isString,
+} from '@sniptt/guards';
 import { GraphQLVariables } from 'msw';
 
-import { isNonNullable } from '../../utils/isNonNullable';
+import { isDefined } from '../../utils/isDefined';
 
 type StringFilter = {
   equals?: string;
@@ -24,7 +30,7 @@ const filterData = <DataT>(
       if (!['OR', 'AND', 'NOT'].includes(key)) {
         const filterElement = where[key] as StringFilter & { is?: object };
 
-        if (filterElement.is) {
+        if (isDefined(filterElement.is)) {
           const nestedKey = Object.keys(filterElement.is)[0] as string;
           if (
             item[key as keyof typeof item] &&
@@ -41,22 +47,22 @@ const filterData = <DataT>(
             );
           }
         }
-        if (filterElement.equals) {
+        if (isNonEmptyString(filterElement.equals)) {
           return item[key as keyof typeof item] === filterElement.equals;
         }
-        if (filterElement.contains) {
+        if (isNonEmptyString(filterElement.contains)) {
           return (item[key as keyof typeof item] as string)
             .toLocaleLowerCase()
             .includes(
               filterElement.contains.replaceAll('%', '').toLocaleLowerCase(),
             );
         }
-        if (filterElement.in) {
+        if (isArray(filterElement.in)) {
           const itemValue = item[key as keyof typeof item] as string;
 
           return filterElement.in.includes(itemValue);
         }
-        if (filterElement.notIn) {
+        if (isArray(filterElement.notIn)) {
           const itemValue = item[key as keyof typeof item] as string;
 
           if (filterElement.notIn.length === 0) return true;
@@ -68,18 +74,18 @@ const filterData = <DataT>(
     });
 
     // { OR: [{ firstName: filter }, { lastName: filter }]
-    if (where.OR && Array.isArray(where.OR)) {
+    if (isArray(where.OR)) {
       isMatch =
         isMatch ||
-        where.OR.some((orFilter) =>
+        where.OR.some((orFilter: any) =>
           filterData<DataT>(data, orFilter).includes(item),
         );
     }
 
-    if (where.AND && Array.isArray(where.AND)) {
+    if (isArray(where.AND)) {
       isMatch =
         isMatch ||
-        where.AND.every((andFilter) =>
+        where.AND.every((andFilter: any) =>
           filterData<DataT>(data, andFilter).includes(item),
         );
     }
@@ -95,12 +101,12 @@ export const filterAndSortData = <DataT>(
 ): Array<DataT> => {
   let filteredData = data;
 
-  if (where) {
+  if (isDefined(where)) {
     filteredData = filterData<DataT>(data, where);
   }
 
-  if (Array.isArray(orderBy) && orderBy.length > 0 && orderBy[0]) {
-    const firstOrderBy = orderBy[0];
+  if (isArray(orderBy) && orderBy.length > 0 && isDefined(orderBy[0])) {
+    const firstOrderBy = orderBy?.[0];
 
     const key = Object.keys(firstOrderBy)[0];
 
@@ -122,7 +128,7 @@ export const filterAndSortData = <DataT>(
     });
   }
 
-  if (limit) {
+  if (isNumber(limit) && limit > 0) {
     filteredData = filteredData.slice(0, limit);
   }
 
@@ -133,7 +139,7 @@ export const fetchOneFromData = <DataT extends { id: string }>(
   data: Array<DataT>,
   id: string,
 ): DataT | undefined => {
-  if (!isNonNullable(id)) {
+  if (!isDefined(id)) {
     throw new Error(
       `id is not defined in updateOneFromData, check that you provided where.id if needed.`,
     );
@@ -147,7 +153,7 @@ export const updateOneFromData = <DataT extends { id: string }>(
   id: string | undefined,
   payload: GraphQLVariables,
 ): DataT | undefined => {
-  if (!isNonNullable(id)) {
+  if (!isDefined(id)) {
     throw new Error(
       `id is not defined in updateOneFromData, check that you provided where.id if needed.`,
     );
diff --git a/packages/twenty-front/src/testing/mock-data/metadata.ts b/packages/twenty-front/src/testing/mock-data/metadata.ts
index 5dc810bceba1..1d844d43a628 100644
--- a/packages/twenty-front/src/testing/mock-data/metadata.ts
+++ b/packages/twenty-front/src/testing/mock-data/metadata.ts
@@ -5,6 +5,7 @@ import {
 } from '~/generated-metadata/graphql';
 
 export const mockedPeopleMetadata = {
+  cursor: '',
   __typename: 'objectEdge',
   node: {
     __typename: 'object',
@@ -17,6 +18,7 @@ export const mockedPeopleMetadata = {
     description: 'A person',
     icon: 'IconUser',
     isCustom: false,
+    isRemote: false,
     isActive: true,
     isSystem: false,
     createdAt: '2023-12-15T15:29:39.070Z',
@@ -61,7 +63,7 @@ export const mockedPeopleMetadata = {
             icon: 'IconHeart',
             isCustom: false,
             isActive: true,
-            isSystem: false,
+            isSystem: true,
             isNullable: true,
             createdAt: '2023-12-15T15:29:39.070Z',
             updatedAt: '2023-12-15T15:29:39.070Z',
@@ -581,6 +583,7 @@ export const mockedPeopleMetadata = {
 
 export const mockedCompaniesMetadata = {
   __typename: 'objectEdge',
+  cursor: '',
   node: {
     __typename: 'object',
     id: '2a603764-1a2f-4043-bbfa-dea375391fad',
@@ -592,6 +595,7 @@ export const mockedCompaniesMetadata = {
     description: 'A company',
     icon: 'IconBuildingSkyscraper',
     isCustom: false,
+    isRemote: false,
     isActive: true,
     isSystem: false,
     createdAt: '2023-12-15T15:29:39.070Z',
@@ -685,7 +689,7 @@ export const mockedCompaniesMetadata = {
             icon: 'IconHeart',
             isCustom: false,
             isActive: true,
-            isSystem: false,
+            isSystem: true,
             isNullable: true,
             createdAt: '2023-12-15T15:29:39.070Z',
             updatedAt: '2023-12-15T15:29:39.070Z',
@@ -1182,219 +1186,482 @@ export const mockedCompaniesMetadata = {
   },
 } as ObjectEdge;
 
-export const mockedPipelineStepsMetadata = {
+const mockedCalendarEventsMetadata = {
   __typename: 'objectEdge',
   node: {
     __typename: 'object',
-    id: 'afa12866-0de4-4f97-97fa-cd8a7c953037',
-    dataSourceId: 'cabbcaa6-05d6-41f4-920f-9144172a4f08',
-    nameSingular: 'pipelineStep',
-    namePlural: 'pipelineSteps',
-    labelSingular: 'Pipeline Step',
-    labelPlural: 'Pipeline Steps',
-    description: 'A pipeline step',
-    icon: 'IconLayoutKanban',
+    id: 'dd77da2e-bc12-4443-b323-097656d720fc',
+    dataSourceId: 'fa94b810-e848-490c-a5f7-24a1ee5bfaa6',
+    nameSingular: 'calendarEvent',
+    namePlural: 'calendarEvents',
+    labelSingular: 'Calendar event',
+    labelPlural: 'Calendar events',
+    description: 'Calendar events',
+    icon: 'IconCalendar',
     isCustom: false,
     isActive: true,
     isSystem: true,
-    createdAt: '2023-12-15T15:29:39.070Z',
-    updatedAt: '2023-12-15T15:29:39.070Z',
+    createdAt: '2024-03-15T13:39:09.965Z',
+    updatedAt: '2024-03-15T13:39:09.965Z',
     labelIdentifierFieldMetadataId: null,
     imageIdentifierFieldMetadataId: null,
     fields: {
       __typename: 'ObjectFieldsConnection',
+      pageInfo: {
+        __typename: 'PageInfo',
+        hasNextPage: false,
+        hasPreviousPage: false,
+        startCursor: 'YXJyYXljb25uZWN0aW9uOjA=',
+        endCursor: 'YXJyYXljb25uZWN0aW9uOjE3',
+      },
       edges: [
         {
           __typename: 'fieldEdge',
           node: {
             __typename: 'field',
-            id: '202efca6-9820-4e4a-9a27-f362dc5b46ed',
-            type: FieldMetadataType.Uuid,
-            name: 'id',
-            label: 'Id',
-            description: null,
-            icon: null,
+            id: '6fee09b1-a964-4b34-b239-a38d91b137f1',
+            type: 'DATE_TIME',
+            name: 'endsAt',
+            label: 'End DateTime',
+            description: 'End DateTime',
+            icon: 'IconCalendarClock',
             isCustom: false,
             isActive: true,
             isSystem: true,
-            isNullable: false,
-            createdAt: '2023-12-15T15:29:39.070Z',
-            updatedAt: '2023-12-15T15:29:39.070Z',
+            isNullable: true,
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
+            defaultValue: null,
+            options: null,
             fromRelationMetadata: null,
             toRelationMetadata: null,
-            options: [],
+          },
+        },
+        {
+          __typename: 'fieldEdge',
+          node: {
+            __typename: 'field',
+            id: '071d3b2a-9168-45bb-9a83-e840eb707d14',
+            type: FieldMetadataType.Link,
+            name: 'conferenceLink',
+            label: 'Conference Link',
+            description: 'Conference Link',
+            icon: 'IconLink',
+            isCustom: false,
+            isActive: true,
+            isSystem: true,
+            isNullable: true,
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
             defaultValue: {
-              type: FieldMetadataType.Uuid,
+              label: 'https://zoom.us',
+              value: 'https://zoom.us',
             },
+            options: null,
+            fromRelationMetadata: null,
+            toRelationMetadata: null,
           },
         },
         {
           __typename: 'fieldEdge',
           node: {
             __typename: 'field',
-            id: 'c9b9d516-10d2-4eca-94ce-a872547f429f',
-            type: FieldMetadataType.Text,
-            name: 'color',
-            label: 'Color',
-            description: 'Pipeline Step color',
-            icon: 'IconColorSwatch',
+            id: 'dce09597-dde3-462b-8a8b-d0bae238df2b',
+            type: 'RELATION',
+            name: 'calendarChannelEventAssociations',
+            label: 'Calendar Channel Event Associations',
+            description: 'Calendar Channel Event Associations',
+            icon: 'IconCalendar',
             isCustom: false,
             isActive: true,
             isSystem: true,
             isNullable: true,
-            createdAt: '2023-12-15T15:29:39.070Z',
-            updatedAt: '2023-12-15T15:29:39.070Z',
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
+            defaultValue: null,
+            options: null,
+            toRelationMetadata: null,
+            fromRelationMetadata: {
+              __typename: 'relation',
+              id: 'f4950160-aabd-44a3-b369-37b03b8f9ac6',
+              relationType: 'ONE_TO_MANY',
+              toFieldMetadataId: '8b4cd1d9-cd30-40c5-a01c-0d468443a704',
+              toObjectMetadata: {
+                __typename: 'object',
+                id: '7dd1f608-7696-43d1-8b5e-c95ea78b1e7a',
+                dataSourceId: 'fa94b810-e848-490c-a5f7-24a1ee5bfaa6',
+                nameSingular: 'calendarChannelEventAssociation',
+                namePlural: 'calendarChannelEventAssociations',
+                isSystem: true,
+              },
+            },
+          },
+        },
+        {
+          __typename: 'fieldEdge',
+          node: {
+            __typename: 'field',
+            id: 'ad4c78c7-1353-4f31-b2bf-57d97c528d4a',
+            type: 'TEXT',
+            name: 'iCalUID',
+            label: 'iCal UID',
+            description: 'iCal UID',
+            icon: 'IconKey',
+            isCustom: false,
+            isActive: true,
+            isSystem: true,
+            isNullable: false,
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
+            defaultValue: {
+              value: '',
+            },
+            options: null,
             fromRelationMetadata: null,
             toRelationMetadata: null,
-            options: [],
+          },
+        },
+        {
+          __typename: 'fieldEdge',
+          node: {
+            __typename: 'field',
+            id: '65a99333-4cd9-44af-94cc-e19a479ecc1e',
+            type: 'TEXT',
+            name: 'title',
+            label: 'Title',
+            description: 'Title',
+            icon: 'IconH1',
+            isCustom: false,
+            isActive: true,
+            isSystem: true,
+            isNullable: false,
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
             defaultValue: {
               value: '',
             },
+            options: null,
+            fromRelationMetadata: null,
+            toRelationMetadata: null,
           },
         },
         {
           __typename: 'fieldEdge',
           node: {
             __typename: 'field',
-            id: '7928241f-6fe9-4ab2-84c6-7e84c5bea05f',
-            type: FieldMetadataType.DateTime,
-            name: 'updatedAt',
-            label: 'Update date',
-            description: null,
-            icon: 'IconCalendar',
+            id: 'd9cd21f2-7401-4873-b19c-3c9d7ed8bee2',
+            type: 'TEXT',
+            name: 'recurringEventExternalId',
+            label: 'Recurring Event ID',
+            description: 'Recurring Event ID',
+            icon: 'IconHistory',
             isCustom: false,
             isActive: true,
             isSystem: true,
             isNullable: false,
-            createdAt: '2023-12-15T15:29:39.070Z',
-            updatedAt: '2023-12-15T15:29:39.070Z',
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
+            defaultValue: {
+              value: '',
+            },
+            options: null,
             fromRelationMetadata: null,
             toRelationMetadata: null,
-            options: [],
+          },
+        },
+        {
+          __typename: 'fieldEdge',
+          node: {
+            __typename: 'field',
+            id: '38f3297b-fe2e-434f-867b-963ed2c75ee0',
+            type: 'DATE_TIME',
+            name: 'externalCreatedAt',
+            label: 'Creation DateTime',
+            description: 'Creation DateTime',
+            icon: 'IconCalendarPlus',
+            isCustom: false,
+            isActive: true,
+            isSystem: true,
+            isNullable: true,
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
+            defaultValue: null,
+            options: null,
+            fromRelationMetadata: null,
+            toRelationMetadata: null,
+          },
+        },
+        {
+          __typename: 'fieldEdge',
+          node: {
+            __typename: 'field',
+            id: '5232193e-6016-4f13-bdcd-95478dfe8e4a',
+            type: 'TEXT',
+            name: 'location',
+            label: 'Location',
+            description: 'Location',
+            icon: 'IconMapPin',
+            isCustom: false,
+            isActive: true,
+            isSystem: true,
+            isNullable: false,
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
             defaultValue: {
-              type: 'now',
+              value: '',
             },
+            options: null,
+            fromRelationMetadata: null,
+            toRelationMetadata: null,
           },
         },
         {
           __typename: 'fieldEdge',
           node: {
             __typename: 'field',
-            id: 'ad3e919f-4258-4e21-8caf-bf122f17ca5c',
-            type: FieldMetadataType.Relation,
-            name: 'opportunities',
-            label: 'Opportunities',
-            description: 'Opportunities linked to the step.',
-            icon: 'IconTargetArrow',
+            id: 'bb49e0cc-72e6-4bc5-8bae-75e7b4f6cd53',
+            type: 'DATE_TIME',
+            name: 'startsAt',
+            label: 'Start DateTime',
+            description: 'Start DateTime',
+            icon: 'IconCalendarClock',
             isCustom: false,
             isActive: true,
             isSystem: true,
             isNullable: true,
-            createdAt: '2023-12-15T15:29:39.070Z',
-            updatedAt: '2023-12-15T15:29:39.070Z',
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
+            defaultValue: null,
+            options: null,
+            fromRelationMetadata: null,
+            toRelationMetadata: null,
+          },
+        },
+        {
+          __typename: 'fieldEdge',
+          node: {
+            __typename: 'field',
+            id: '07880d2d-4f08-458f-be0b-876402d2a769',
+            type: 'RELATION',
+            name: 'calendarEventParticipants',
+            label: 'Event Participants',
+            description: 'Event Participants',
+            icon: 'IconUserCircle',
+            isCustom: false,
+            isActive: true,
+            isSystem: true,
+            isNullable: true,
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
+            defaultValue: null,
+            options: null,
+            toRelationMetadata: null,
             fromRelationMetadata: {
               __typename: 'relation',
-              id: '7b0474c4-d82d-4c1d-96de-c6728b53339a',
-              relationType: RelationMetadataType.OneToMany,
+              id: '6ca76ccc-bdb1-4357-809e-66149e54474b',
+              relationType: 'ONE_TO_MANY',
+              toFieldMetadataId: '2ad8bb23-68f5-4a77-b23f-cac8db34a5f0',
               toObjectMetadata: {
                 __typename: 'object',
-                id: '941ad274-2d26-4e90-94d9-5e446aa5b91e',
-                dataSourceId: 'cabbcaa6-05d6-41f4-920f-9144172a4f08',
-                nameSingular: 'opportunity',
-                namePlural: 'opportunities',
+                id: '4adb1b1a-9643-4d1c-a2a0-b1b02ae192ad',
+                dataSourceId: 'fa94b810-e848-490c-a5f7-24a1ee5bfaa6',
+                nameSingular: 'calendarEventParticipant',
+                namePlural: 'calendarEventParticipants',
                 isSystem: true,
               },
-              toFieldMetadataId: '4756a816-8a18-433a-9414-c756db4727e8',
             },
-            toRelationMetadata: null,
-            options: [],
-            defaultValue: null,
           },
         },
         {
           __typename: 'fieldEdge',
           node: {
             __typename: 'field',
-            id: 'c26ba58c-5629-4a6b-ae7f-5c06d3045a9b',
-            type: FieldMetadataType.DateTime,
-            name: 'createdAt',
-            label: 'Creation date',
-            description: null,
-            icon: 'IconCalendar',
+            id: '0d348548-f8a8-4669-872e-43ef01e3d93b',
+            type: 'DATE_TIME',
+            name: 'externalUpdatedAt',
+            label: 'Update DateTime',
+            description: 'Update DateTime',
+            icon: 'IconCalendarCog',
             isCustom: false,
             isActive: true,
             isSystem: true,
-            isNullable: false,
-            createdAt: '2023-12-15T15:29:39.070Z',
-            updatedAt: '2023-12-15T15:29:39.070Z',
+            isNullable: true,
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
+            defaultValue: null,
+            options: null,
             fromRelationMetadata: null,
             toRelationMetadata: null,
-            options: [],
+          },
+        },
+        {
+          __typename: 'fieldEdge',
+          node: {
+            __typename: 'field',
+            id: '37d357eb-fc04-4b5c-a633-345b677d2c87',
+            type: 'TEXT',
+            name: 'description',
+            label: 'Description',
+            description: 'Description',
+            icon: 'IconFileDescription',
+            isCustom: false,
+            isActive: true,
+            isSystem: true,
+            isNullable: false,
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
             defaultValue: {
-              type: 'now',
+              value: '',
             },
+            options: null,
+            fromRelationMetadata: null,
+            toRelationMetadata: null,
           },
         },
         {
           __typename: 'fieldEdge',
           node: {
             __typename: 'field',
-            id: '4f383c05-3f9b-433a-8617-20ed3861e490',
-            type: FieldMetadataType.Text,
-            name: 'name',
-            label: 'Name',
-            description: 'Pipeline Step name',
-            icon: 'IconCurrencyDollar',
+            id: '3d14da78-db95-403e-bb2f-06ed076574cb',
+            type: 'TEXT',
+            name: 'conferenceSolution',
+            label: 'Conference Solution',
+            description: 'Conference Solution',
+            icon: 'IconScreenShare',
             isCustom: false,
             isActive: true,
             isSystem: true,
-            isNullable: true,
-            createdAt: '2023-12-15T15:29:39.070Z',
-            updatedAt: '2023-12-15T15:29:39.070Z',
+            isNullable: false,
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
+            defaultValue: {
+              value: '',
+            },
+            options: null,
             fromRelationMetadata: null,
             toRelationMetadata: null,
-            options: [],
+          },
+        },
+        {
+          __typename: 'fieldEdge',
+          node: {
+            __typename: 'field',
+            id: '847a63f7-0614-4491-b445-c67269868c93',
+            type: 'UUID',
+            name: 'id',
+            label: 'Id',
+            description: 'Id',
+            icon: 'Icon123',
+            isCustom: false,
+            isActive: true,
+            isSystem: true,
+            isNullable: false,
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
             defaultValue: {
-              value: '',
+              type: 'uuid',
             },
+            options: null,
+            fromRelationMetadata: null,
+            toRelationMetadata: null,
           },
         },
         {
           __typename: 'fieldEdge',
           node: {
             __typename: 'field',
-            id: '8c712fbc-306f-4534-86c1-caae09b840a2',
-            type: FieldMetadataType.Number,
-            name: 'position',
-            label: 'Position',
-            description: 'Pipeline Step position',
-            icon: 'IconHierarchy2',
+            id: '1d7a9a99-b6ef-4fae-abcd-60bba4d4cf5b',
+            type: 'BOOLEAN',
+            name: 'isFullDay',
+            label: 'Is Full Day',
+            description: 'Is Full Day',
+            icon: 'Icon24Hours',
             isCustom: false,
             isActive: true,
             isSystem: true,
-            isNullable: true,
-            createdAt: '2023-12-15T15:29:39.070Z',
-            updatedAt: '2023-12-15T15:29:39.070Z',
+            isNullable: false,
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
+            defaultValue: null,
+            options: null,
             fromRelationMetadata: null,
             toRelationMetadata: null,
-            options: [],
+          },
+        },
+        {
+          __typename: 'fieldEdge',
+          node: {
+            __typename: 'field',
+            id: '91058295-2974-4924-937a-2e6dec4b3b01',
+            type: 'BOOLEAN',
+            name: 'isCanceled',
+            label: 'Is canceled',
+            description: 'Is canceled',
+            icon: 'IconCalendarCancel',
+            isCustom: false,
+            isActive: true,
+            isSystem: true,
+            isNullable: false,
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
+            defaultValue: null,
+            options: null,
+            fromRelationMetadata: null,
+            toRelationMetadata: null,
+          },
+        },
+        {
+          __typename: 'fieldEdge',
+          node: {
+            __typename: 'field',
+            id: 'b93abe19-6228-4971-9ef0-4e38ef5ed314',
+            type: 'DATE_TIME',
+            name: 'createdAt',
+            label: 'Creation date',
+            description: 'Creation date',
+            icon: 'IconCalendar',
+            isCustom: false,
+            isActive: true,
+            isSystem: true,
+            isNullable: false,
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
             defaultValue: {
-              value: 0,
+              type: 'now',
             },
+            options: null,
+            fromRelationMetadata: null,
+            toRelationMetadata: null,
+          },
+        },
+        {
+          __typename: 'fieldEdge',
+          node: {
+            __typename: 'field',
+            id: 'f8b1abe7-8d26-4502-ac15-6f49c5112bb0',
+            type: 'DATE_TIME',
+            name: 'updatedAt',
+            label: 'Update date',
+            description: 'Update date',
+            icon: 'IconCalendar',
+            isCustom: false,
+            isActive: true,
+            isSystem: true,
+            isNullable: false,
+            createdAt: '2024-03-15T13:39:09.965Z',
+            updatedAt: '2024-03-15T13:39:09.965Z',
+            defaultValue: {
+              type: 'now',
+            },
+            options: null,
+            fromRelationMetadata: null,
+            toRelationMetadata: null,
           },
         },
       ],
-      pageInfo: {
-        __typename: 'PageInfo',
-        hasNextPage: false,
-        hasPreviousPage: false,
-        startCursor: 'YXJyYXljb25uZWN0aW9uOjA=',
-        endCursor: 'YXJyYXljb25uZWN0aW9uOjY=',
-      },
-      totalCount: 7,
     },
   },
-};
+} as ObjectEdge;
 
 export const mockedActivityTargetsMetadata = {
   __typename: 'objectEdge',
@@ -4359,63 +4626,6 @@ export const mockedOpportunitiesMetadata = {
             defaultValue: null,
           },
         },
-        {
-          __typename: 'fieldEdge',
-          node: {
-            __typename: 'field',
-            id: '480e430d-ec7b-4297-93fd-0c6463b9fad3',
-            type: FieldMetadataType.Uuid,
-            name: 'pipelineStepId',
-            label: 'Pipeline Step id (foreign key)',
-            description: 'Opportunity pipeline step id foreign key',
-            icon: 'IconKanban',
-            isCustom: false,
-            isActive: true,
-            isSystem: true,
-            isNullable: true,
-            createdAt: '2023-12-15T15:29:39.070Z',
-            updatedAt: '2023-12-15T15:29:39.070Z',
-            fromRelationMetadata: null,
-            toRelationMetadata: null,
-            options: [],
-            defaultValue: null,
-          },
-        },
-        {
-          __typename: 'fieldEdge',
-          node: {
-            __typename: 'field',
-            id: '4756a816-8a18-433a-9414-c756db4727e8',
-            type: FieldMetadataType.Relation,
-            name: 'pipelineStep',
-            label: 'Pipeline Step',
-            description: 'Opportunity pipeline step',
-            icon: 'IconKanban',
-            isCustom: false,
-            isActive: true,
-            isSystem: false,
-            isNullable: true,
-            createdAt: '2023-12-15T15:29:39.070Z',
-            updatedAt: '2023-12-15T15:29:39.070Z',
-            fromRelationMetadata: null,
-            options: [],
-            toRelationMetadata: {
-              __typename: 'relation',
-              id: '7b0474c4-d82d-4c1d-96de-c6728b53339a',
-              relationType: RelationMetadataType.OneToMany,
-              fromObjectMetadata: {
-                __typename: 'object',
-                id: 'afa12866-0de4-4f97-97fa-cd8a7c953037',
-                dataSourceId: 'cabbcaa6-05d6-41f4-920f-9144172a4f08',
-                nameSingular: 'pipelineStep',
-                namePlural: 'pipelineSteps',
-                isSystem: true,
-              },
-              fromFieldMetadataId: 'ad3e919f-4258-4e21-8caf-bf122f17ca5c',
-            },
-            defaultValue: null,
-          },
-        },
         {
           __typename: 'fieldEdge',
           node: {
@@ -7023,7 +7233,6 @@ export const mockedObjectMetadataItems = {
     mockedWebhooksMetadata,
     mockedPeopleMetadata,
     mockedCompaniesMetadata,
-    mockedPipelineStepsMetadata,
     mockedActivityTargetsMetadata,
     mockedActivitiesMetadata,
     mockedFavoritesMetadata,
@@ -7033,6 +7242,7 @@ export const mockedObjectMetadataItems = {
     mockedConnectedAccountsMetadata,
     mockedMessageChannelsMetadata,
     mockedWebhooksMetadata,
+    mockedCalendarEventsMetadata,
     mockedAttachmentsMetadata,
     mockedMessageParticipantsMetadata,
     mockedCustomMetadata,
diff --git a/packages/twenty-front/src/testing/mock-data/objectMetadataItems.ts b/packages/twenty-front/src/testing/mock-data/objectMetadataItems.ts
index b18ef59afb31..8529aeda1a33 100644
--- a/packages/twenty-front/src/testing/mock-data/objectMetadataItems.ts
+++ b/packages/twenty-front/src/testing/mock-data/objectMetadataItems.ts
@@ -1,5 +1,8 @@
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { FieldMetadataType, RelationMetadataType } from '~/generated/graphql';
+import {
+  FieldMetadataType,
+  RelationMetadataType,
+} from '~/generated-metadata/graphql';
 
 export const mockObjectMetadataItem: ObjectMetadataItem = {
   __typename: 'object',
@@ -11,6 +14,7 @@ export const mockObjectMetadataItem: ObjectMetadataItem = {
   description: 'A company',
   icon: 'IconBuildingSkyscraper',
   isCustom: false,
+  isRemote: false,
   isActive: true,
   isSystem: false,
   createdAt: '2023-12-19T12:15:28.459Z',
@@ -362,7 +366,7 @@ export const mockObjectMetadataItem: ObjectMetadataItem = {
       icon: 'IconHeart',
       isCustom: false,
       isActive: true,
-      isSystem: false,
+      isSystem: true,
       isNullable: true,
       createdAt: '2023-12-19T12:15:28.459Z',
       updatedAt: '2023-12-19T12:15:28.459Z',
diff --git a/packages/twenty-front/src/testing/mock-data/pipeline-steps.ts b/packages/twenty-front/src/testing/mock-data/pipeline-steps.ts
deleted file mode 100644
index 341bde89b8b2..000000000000
--- a/packages/twenty-front/src/testing/mock-data/pipeline-steps.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { PipelineStep } from '@/pipeline/types/PipelineStep';
-
-const dates = {
-  updatedAt: '2021-06-01T10:23:42.33625+00:00',
-  createdAt: '2021-06-01T10:23:42.33625+00:00',
-};
-
-export const mockedPipelineSteps: Array<PipelineStep> = [
-  {
-    id: '6edf4ead-006a-46e1-9c6d-228f1d0143c9',
-    color: 'red',
-    name: 'New',
-    position: 0,
-    ...dates,
-  },
-  {
-    id: '30b14887-d592-427d-bd97-6e670158db02',
-    color: 'sky',
-    name: 'Meeting',
-    position: 2,
-    ...dates,
-  },
-  {
-    id: 'bea8bb7b-5467-48a6-9a8a-a8fa500123fe',
-
-    color: 'yellow',
-    name: 'Customer',
-    position: 4,
-    ...dates,
-  },
-  {
-    id: 'd8361722-03fb-4e65-bd4f-ec9e52e5ec0a',
-    color: 'purple',
-    name: 'Screening',
-    position: 1,
-    ...dates,
-  },
-  {
-    id: 'db5a6648-d80d-4020-af64-4817ab4a12e8',
-    color: 'turquoise',
-    name: 'Proposal',
-    position: 3,
-    ...dates,
-  },
-];
diff --git a/packages/twenty-front/src/testing/mock-data/remoteObjectDatabases.ts b/packages/twenty-front/src/testing/mock-data/remoteObjectDatabases.ts
new file mode 100644
index 000000000000..09c5bde31b5b
--- /dev/null
+++ b/packages/twenty-front/src/testing/mock-data/remoteObjectDatabases.ts
@@ -0,0 +1,26 @@
+import { RemoteTableStatus } from '~/generated-metadata/graphql';
+
+export const mockedRemoteObjectIntegrations = [
+  {
+    id: '5b717911-dc75-4876-bf33-dfdc994c88cd',
+    key: 'postgresql',
+    connections: [
+      {
+        id: '67cbfd35-8dd4-4591-b9d4-c1906281a5da',
+        name: 'Twenty_postgres',
+        tables: [
+          { name: 'Invoices', status: RemoteTableStatus.NotSynced },
+          { name: 'Quotes', status: RemoteTableStatus.Synced },
+          { name: 'Customers', status: RemoteTableStatus.NotSynced },
+          { name: 'Subscriptions', status: RemoteTableStatus.Synced },
+          { name: 'Payments', status: RemoteTableStatus.NotSynced },
+        ],
+      },
+      {
+        id: '3740cd85-7a1e-45b5-8b0d-47e1921d01f3',
+        name: 'Image_postgres',
+        tables: [],
+      },
+    ],
+  },
+];
diff --git a/packages/twenty-front/src/testing/mockedApolloClient.ts b/packages/twenty-front/src/testing/mockedApolloClient.ts
new file mode 100644
index 000000000000..cb8d4f0b7df3
--- /dev/null
+++ b/packages/twenty-front/src/testing/mockedApolloClient.ts
@@ -0,0 +1,6 @@
+import { ApolloClient, InMemoryCache } from '@apollo/client';
+
+export const mockedApolloClient = new ApolloClient({
+  uri: process.env.REACT_APP_SERVER_BASE_URL + '/graphql',
+  cache: new InMemoryCache(),
+});
diff --git a/packages/twenty-front/src/testing/mockedClient.ts b/packages/twenty-front/src/testing/mockedClient.ts
deleted file mode 100644
index acf40cb231f2..000000000000
--- a/packages/twenty-front/src/testing/mockedClient.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { ApolloClient, InMemoryCache } from '@apollo/client';
-
-export const mockedClient = new ApolloClient({
-  uri: process.env.REACT_APP_SERVER_BASE_URL + '/graphql',
-  cache: new InMemoryCache(),
-});
diff --git a/packages/twenty-front/src/testing/mockedMetadataApolloClient.ts b/packages/twenty-front/src/testing/mockedMetadataApolloClient.ts
new file mode 100644
index 000000000000..43c2107f011f
--- /dev/null
+++ b/packages/twenty-front/src/testing/mockedMetadataApolloClient.ts
@@ -0,0 +1,6 @@
+import { ApolloClient, InMemoryCache } from '@apollo/client';
+
+export const mockedMetadataApolloClient = new ApolloClient({
+  uri: process.env.REACT_APP_SERVER_BASE_URL + '/metadata',
+  cache: new InMemoryCache(),
+});
diff --git a/packages/twenty-front/src/utils/__tests__/isDefined.test.ts b/packages/twenty-front/src/utils/__tests__/isDefined.test.ts
new file mode 100644
index 000000000000..d5b0bae7dd1f
--- /dev/null
+++ b/packages/twenty-front/src/utils/__tests__/isDefined.test.ts
@@ -0,0 +1,15 @@
+import { isDefined } from '~/utils/isDefined';
+
+describe('isDefined', () => {
+  it('returns true if value is not undefined nor null', () => {
+    expect(isDefined('')).toBe(true);
+  });
+
+  it('returns false if value is null', () => {
+    expect(isDefined(null)).toBe(false);
+  });
+
+  it('returns false if value is undefined', () => {
+    expect(isDefined(undefined)).toBe(false);
+  });
+});
diff --git a/packages/twenty-front/src/utils/__tests__/isNonNullable.test.ts b/packages/twenty-front/src/utils/__tests__/isNonNullable.test.ts
deleted file mode 100644
index 9969b33be2b0..000000000000
--- a/packages/twenty-front/src/utils/__tests__/isNonNullable.test.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { isNonNullable } from '~/utils/isNonNullable';
-
-describe('isNonNullable', () => {
-  it('returns true if value is not undefined nor null', () => {
-    expect(isNonNullable('')).toBe(true);
-  });
-
-  it('returns false if value is null', () => {
-    expect(isNonNullable(null)).toBe(false);
-  });
-
-  it('returns false if value is undefined', () => {
-    expect(isNonNullable(undefined)).toBe(false);
-  });
-});
diff --git a/packages/twenty-front/src/utils/__tests__/title-utils.test.ts b/packages/twenty-front/src/utils/__tests__/title-utils.test.ts
index 9ed6cf524f67..1a4e53d3380f 100644
--- a/packages/twenty-front/src/utils/__tests__/title-utils.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/title-utils.test.ts
@@ -3,8 +3,9 @@ import { getPageTitleFromPath } from '../title-utils';
 describe('title-utils', () => {
   it('should return the correct title for a given path', () => {
     expect(getPageTitleFromPath('/verify')).toBe('Verify');
-    expect(getPageTitleFromPath('/sign-in')).toBe('Sign In');
-    expect(getPageTitleFromPath('/sign-up')).toBe('Sign Up');
+    expect(getPageTitleFromPath('/welcome')).toBe(
+      'Sign in or Create an account',
+    );
     expect(getPageTitleFromPath('/invite/:workspaceInviteHash')).toBe('Invite');
     expect(getPageTitleFromPath('/create/workspace')).toBe('Create Workspace');
     expect(getPageTitleFromPath('/create/profile')).toBe('Create Profile');
diff --git a/packages/twenty-front/src/utils/array/groupArrayItemsBy.ts b/packages/twenty-front/src/utils/array/groupArrayItemsBy.ts
index 37b1c9b70470..1aa3fac71062 100644
--- a/packages/twenty-front/src/utils/array/groupArrayItemsBy.ts
+++ b/packages/twenty-front/src/utils/array/groupArrayItemsBy.ts
@@ -17,10 +17,7 @@
  *   vegetable: [{ id: '2', type: 'vegetable' }],
  * }
  */
-export const groupArrayItemsBy = <
-  ArrayItem extends Record<string, unknown>,
-  Key extends string,
->(
+export const groupArrayItemsBy = <ArrayItem, Key extends string | number>(
   array: ArrayItem[],
   computeGroupKey: (item: ArrayItem) => Key,
 ) =>
diff --git a/packages/twenty-front/src/utils/cast-as-integer-or-null.ts b/packages/twenty-front/src/utils/cast-as-integer-or-null.ts
index 5cca0021dead..21aee430f28a 100644
--- a/packages/twenty-front/src/utils/cast-as-integer-or-null.ts
+++ b/packages/twenty-front/src/utils/cast-as-integer-or-null.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @nx/workspace-explicit-boolean-predicates-in-if */
 import { isNull, isNumber, isString } from '@sniptt/guards';
 
 import { logError } from './logError';
diff --git a/packages/twenty-front/src/utils/checkUrlType.ts b/packages/twenty-front/src/utils/checkUrlType.ts
index 25a39d179065..13f1499c2082 100644
--- a/packages/twenty-front/src/utils/checkUrlType.ts
+++ b/packages/twenty-front/src/utils/checkUrlType.ts
@@ -1,5 +1,7 @@
 import { LinkType } from '@/ui/navigation/link/components/SocialLink';
 
+import { isDefined } from './isDefined';
+
 export const checkUrlType = (url: string) => {
   if (
     /^(http|https):\/\/(?:www\.)?linkedin.com(\w+:{0,1}\w*@)?(\S+)(:([0-9])+)?(\/|\/([\w#!:.?+=&%@!\-/]))?/.test(
@@ -8,7 +10,9 @@ export const checkUrlType = (url: string) => {
   ) {
     return LinkType.LinkedIn;
   }
-  if (url.match(/^((http|https):\/\/)?(?:www\.)?twitter\.com\/(\w+)?/i)) {
+  if (
+    isDefined(/^((http|https):\/\/)?(?:www\.)?twitter\.com\/(\w+)?/i.exec(url))
+  ) {
     return LinkType.Twitter;
   }
 
diff --git a/packages/twenty-front/src/utils/date-utils.ts b/packages/twenty-front/src/utils/date-utils.ts
index acdaedc73ac6..e7678cf647c5 100644
--- a/packages/twenty-front/src/utils/date-utils.ts
+++ b/packages/twenty-front/src/utils/date-utils.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @nx/workspace-explicit-boolean-predicates-in-if */
 import { isDate, isNumber, isString } from '@sniptt/guards';
 import { differenceInCalendarDays, formatDistanceToNow } from 'date-fns';
 import { DateTime } from 'luxon';
@@ -115,7 +116,7 @@ export const hasDatePassed = (date: Date | string | number) => {
 export const beautifyDateDiff = (
   date: string,
   dateToCompareWith?: string,
-  short: boolean = false,
+  short = false,
 ) => {
   const dateDiff = DateTime.fromISO(date).diff(
     dateToCompareWith ? DateTime.fromISO(dateToCompareWith) : DateTime.now(),
diff --git a/packages/twenty-front/src/utils/format/__tests__/amountFormat.test.ts b/packages/twenty-front/src/utils/format/__tests__/amountFormat.test.ts
index 7dd44186e060..5feca078e856 100644
--- a/packages/twenty-front/src/utils/format/__tests__/amountFormat.test.ts
+++ b/packages/twenty-front/src/utils/format/__tests__/amountFormat.test.ts
@@ -1,28 +1,28 @@
-import { amountFormat } from '../amountFormat';
+import { formatAmount } from '../formatAmount';
 
 describe('amountFormat', () => {
   it('formats numbers less than 1000 correctly', () => {
-    expect(amountFormat(500)).toBe('500');
-    expect(amountFormat(123.456)).toBe('123.5');
+    expect(formatAmount(500)).toBe('500');
+    expect(formatAmount(123.456)).toBe('123.5');
   });
 
   it('formats numbers between 1000 and 999999 correctly', () => {
-    expect(amountFormat(1500)).toBe('1.5k');
-    expect(amountFormat(789456)).toBe('789.5k');
+    expect(formatAmount(1500)).toBe('1.5k');
+    expect(formatAmount(789456)).toBe('789.5k');
   });
 
   it('formats numbers between 1000000 and 999999999 correctly', () => {
-    expect(amountFormat(2000000)).toBe('2m');
-    expect(amountFormat(654987654)).toBe('655m');
+    expect(formatAmount(2000000)).toBe('2m');
+    expect(formatAmount(654987654)).toBe('655m');
   });
 
   it('formats numbers greater than or equal to 1000000000 correctly', () => {
-    expect(amountFormat(1200000000)).toBe('1.2b');
-    expect(amountFormat(987654321987)).toBe('987.7b');
+    expect(formatAmount(1200000000)).toBe('1.2b');
+    expect(formatAmount(987654321987)).toBe('987.7b');
   });
 
   it('handles numbers with decimal places correctly', () => {
-    expect(amountFormat(123.456)).toBe('123.5');
-    expect(amountFormat(789.0123)).toBe('789');
+    expect(formatAmount(123.456)).toBe('123.5');
+    expect(formatAmount(789.0123)).toBe('789');
   });
 });
diff --git a/packages/twenty-front/src/utils/format/amountFormat.ts b/packages/twenty-front/src/utils/format/amountFormat.ts
deleted file mode 100644
index b87d45515f1c..000000000000
--- a/packages/twenty-front/src/utils/format/amountFormat.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export const amountFormat = (number: number) => {
-  if (number < 1000) {
-    return number.toFixed(1).replace(/\.?0+$/, '');
-  } else if (number < 1000000) {
-    return (number / 1000).toFixed(1).replace(/\.?0+$/, '') + 'k';
-  } else if (number < 1000000000) {
-    return (number / 1000000).toFixed(1).replace(/\.?0+$/, '') + 'm';
-  } else {
-    return (number / 1000000000).toFixed(1).replace(/\.?0+$/, '') + 'b';
-  }
-};
diff --git a/packages/twenty-front/src/utils/format/formatAmount.ts b/packages/twenty-front/src/utils/format/formatAmount.ts
new file mode 100644
index 000000000000..f66d07225482
--- /dev/null
+++ b/packages/twenty-front/src/utils/format/formatAmount.ts
@@ -0,0 +1,11 @@
+export const formatAmount = (amount: number) => {
+  if (amount < 1000) {
+    return amount.toFixed(1).replace(/\.?0+$/, '');
+  } else if (amount < 1000000) {
+    return (amount / 1000).toFixed(1).replace(/\.?0+$/, '') + 'k';
+  } else if (amount < 1000000000) {
+    return (amount / 1000000).toFixed(1).replace(/\.?0+$/, '') + 'm';
+  } else {
+    return (amount / 1000000000).toFixed(1).replace(/\.?0+$/, '') + 'b';
+  }
+};
diff --git a/packages/twenty-front/src/utils/getDisplayValueByUrlType.ts b/packages/twenty-front/src/utils/getDisplayValueByUrlType.ts
index e92e28540b73..75cf16fa197d 100644
--- a/packages/twenty-front/src/utils/getDisplayValueByUrlType.ts
+++ b/packages/twenty-front/src/utils/getDisplayValueByUrlType.ts
@@ -1,5 +1,7 @@
 import { LinkType } from '@/ui/navigation/link/components/SocialLink';
 
+import { isDefined } from './isDefined';
+
 type getUrlDisplayValueByUrlTypeProps = {
   type: LinkType;
   href: string;
@@ -13,8 +15,8 @@ export const getDisplayValueByUrlType = ({
     const matches = href.match(
       /(?:https?:\/\/)?(?:www.)?linkedin.com\/(?:in|company|school)\/(.*)/,
     );
-    if (matches && matches[1]) {
-      return matches[1];
+    if (isDefined(matches?.[1])) {
+      return matches?.[1];
     } else {
       return 'LinkedIn';
     }
@@ -24,8 +26,8 @@ export const getDisplayValueByUrlType = ({
     const matches = href.match(
       /(?:https?:\/\/)?(?:www.)?twitter.com\/([-a-zA-Z0-9@:%_+.~#?&//=]*)/,
     );
-    if (matches && matches[1]) {
-      return `@${matches[1]}`;
+    if (isDefined(matches?.[1])) {
+      return `@${matches?.[1]}`;
     } else {
       return '@twitter';
     }
diff --git a/packages/twenty-front/src/utils/is-domain.ts b/packages/twenty-front/src/utils/is-domain.ts
index aaec620345da..7db9720748b0 100644
--- a/packages/twenty-front/src/utils/is-domain.ts
+++ b/packages/twenty-front/src/utils/is-domain.ts
@@ -1,7 +1,7 @@
-import { isNonNullable } from './isNonNullable';
+import { isDefined } from './isDefined';
 
 export const isDomain = (url: string | undefined | null) =>
-  isNonNullable(url) &&
+  isDefined(url) &&
   /^((?!-))(xn--)?[a-z0-9][a-z0-9-_]{0,61}[a-z0-9]{0,1}\.(xn--)?([a-z0-9-]{1,61}|[a-z0-9-]{1,30}\.[a-z]{2,})$/.test(
     url,
   );
diff --git a/packages/twenty-front/src/utils/is-url.ts b/packages/twenty-front/src/utils/is-url.ts
index 3572451c27bc..bb6e8f7ee613 100644
--- a/packages/twenty-front/src/utils/is-url.ts
+++ b/packages/twenty-front/src/utils/is-url.ts
@@ -1,7 +1,7 @@
-import { isNonNullable } from './isNonNullable';
+import { isDefined } from './isDefined';
 
 export const isURL = (url: string | undefined | null) =>
-  isNonNullable(url) &&
+  isDefined(url) &&
   url.match(
     /^(https?:\/\/)?(www.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-z]{2,63}\b([-a-zA-Z0-9@:%_+.~#?&//=]*)/i,
   );
diff --git a/packages/twenty-front/src/utils/isDefined.ts b/packages/twenty-front/src/utils/isDefined.ts
new file mode 100644
index 000000000000..81eb67203a03
--- /dev/null
+++ b/packages/twenty-front/src/utils/isDefined.ts
@@ -0,0 +1,4 @@
+import { isNull, isUndefined } from '@sniptt/guards';
+
+export const isDefined = <T>(value: T | null | undefined): value is T =>
+  !isUndefined(value) && !isNull(value);
diff --git a/packages/twenty-front/src/utils/isNonEmptyArray.ts b/packages/twenty-front/src/utils/isNonEmptyArray.ts
index 7be89344eaf0..210f4d590898 100644
--- a/packages/twenty-front/src/utils/isNonEmptyArray.ts
+++ b/packages/twenty-front/src/utils/isNonEmptyArray.ts
@@ -1,9 +1,11 @@
+import { isNumber } from '@sniptt/guards';
+
 export const isNonEmptyArray = <T>(
   probableArray: T[] | readonly T[] | undefined | null,
 ): probableArray is NonNullable<T[]> => {
   if (
     Array.isArray(probableArray) &&
-    probableArray.length &&
+    isNumber(probableArray.length) &&
     probableArray.length > 0
   ) {
     return true;
diff --git a/packages/twenty-front/src/utils/isNonNullable.ts b/packages/twenty-front/src/utils/isNonNullable.ts
deleted file mode 100644
index 6958554d091d..000000000000
--- a/packages/twenty-front/src/utils/isNonNullable.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { isNull, isUndefined } from '@sniptt/guards';
-
-export const isNonNullable = <T>(value: T): value is NonNullable<T> =>
-  !isUndefined(value) && !isNull(value);
diff --git a/packages/twenty-front/src/utils/isUndefinedOrNull.ts b/packages/twenty-front/src/utils/isUndefinedOrNull.ts
new file mode 100644
index 000000000000..176380e2b19a
--- /dev/null
+++ b/packages/twenty-front/src/utils/isUndefinedOrNull.ts
@@ -0,0 +1,4 @@
+import { isNull, isUndefined } from '@sniptt/guards';
+
+export const isUndefinedOrNull = (value: any): value is null | undefined =>
+  isUndefined(value) || isNull(value);
diff --git a/packages/twenty-front/src/utils/recoil-effects.ts b/packages/twenty-front/src/utils/recoil-effects.ts
index 909c5e941835..d7c0261b955f 100644
--- a/packages/twenty-front/src/utils/recoil-effects.ts
+++ b/packages/twenty-front/src/utils/recoil-effects.ts
@@ -2,6 +2,8 @@ import { AtomEffect } from 'recoil';
 
 import { cookieStorage } from '~/utils/cookie-storage';
 
+import { isDefined } from './isDefined';
+
 export const localStorageEffect =
   <T>(key: string): AtomEffect<T> =>
   ({ setSelf, onSet }) => {
@@ -21,7 +23,10 @@ export const cookieStorageEffect =
   <T>(key: string): AtomEffect<T | null> =>
   ({ setSelf, onSet }) => {
     const savedValue = cookieStorage.getItem(key);
-    if (savedValue != null && JSON.parse(savedValue)['accessToken']) {
+    if (
+      isDefined(savedValue) &&
+      isDefined(JSON.parse(savedValue)['accessToken'])
+    ) {
       setSelf(JSON.parse(savedValue));
     }
 
diff --git a/packages/twenty-front/src/utils/string/lowerAndCapitalize.ts b/packages/twenty-front/src/utils/string/lowerAndCapitalize.ts
new file mode 100644
index 000000000000..f51325a09d9f
--- /dev/null
+++ b/packages/twenty-front/src/utils/string/lowerAndCapitalize.ts
@@ -0,0 +1,9 @@
+import { isNonEmptyString } from '@sniptt/guards';
+
+export const lowerAndCapitalize = (stringToCapitalize: string) => {
+  if (!isNonEmptyString(stringToCapitalize)) return '';
+
+  const loweredString = stringToCapitalize.toLowerCase();
+
+  return loweredString[0].toUpperCase() + loweredString.slice(1);
+};
diff --git a/packages/twenty-front/src/utils/title-utils.ts b/packages/twenty-front/src/utils/title-utils.ts
index a3de0171c10b..8723e9aa51e5 100644
--- a/packages/twenty-front/src/utils/title-utils.ts
+++ b/packages/twenty-front/src/utils/title-utils.ts
@@ -6,10 +6,8 @@ export const getPageTitleFromPath = (pathname: string): string => {
   switch (pathname) {
     case AppPath.Verify:
       return 'Verify';
-    case AppPath.SignIn:
-      return 'Sign In';
-    case AppPath.SignUp:
-      return 'Sign Up';
+    case AppPath.SignInUp:
+      return 'Sign in or Create an account';
     case AppPath.Invite:
       return 'Invite';
     case AppPath.CreateWorkspace:
diff --git a/packages/twenty-front/src/utils/validation-schemas/__tests__/camelCaseStringSchema.test.ts b/packages/twenty-front/src/utils/validation-schemas/__tests__/camelCaseStringSchema.test.ts
new file mode 100644
index 000000000000..4eb0677c39db
--- /dev/null
+++ b/packages/twenty-front/src/utils/validation-schemas/__tests__/camelCaseStringSchema.test.ts
@@ -0,0 +1,22 @@
+import { SafeParseError } from 'zod';
+
+import { camelCaseStringSchema } from '../camelCaseStringSchema';
+
+describe('camelCaseStringSchema', () => {
+  it('validates a camel case string', () => {
+    const result = camelCaseStringSchema.safeParse('camelCaseString');
+    expect(result.success).toBe(true);
+  });
+
+  it('fails for non-camel case strings', () => {
+    const result = camelCaseStringSchema.safeParse('NotCamelCase');
+    expect(result.success).toBe(false);
+    expect((result as SafeParseError<string>).error.errors).toEqual([
+      {
+        code: 'custom',
+        message: 'String should be camel case',
+        path: [],
+      },
+    ]);
+  });
+});
diff --git a/packages/twenty-front/src/utils/validation-schemas/camelCaseStringSchema.ts b/packages/twenty-front/src/utils/validation-schemas/camelCaseStringSchema.ts
new file mode 100644
index 000000000000..0e96c167ca0a
--- /dev/null
+++ b/packages/twenty-front/src/utils/validation-schemas/camelCaseStringSchema.ts
@@ -0,0 +1,8 @@
+import camelCase from 'lodash.camelcase';
+import { z } from 'zod';
+
+export const camelCaseStringSchema = z
+  .string()
+  .refine((value) => camelCase(value) === value, {
+    message: 'String should be camel case',
+  });
diff --git a/packages/twenty-front/tsconfig.app.json b/packages/twenty-front/tsconfig.app.json
index 98eac967ee90..d5abf3c8781e 100644
--- a/packages/twenty-front/tsconfig.app.json
+++ b/packages/twenty-front/tsconfig.app.json
@@ -1,15 +1,17 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc"
+    "outDir": "../../dist/out-tsc",
+    "types": ["node"]
   },
   "exclude": [
+    "**/__mocks__/**/*",
     "**/*.spec.ts",
-    "**/*.test.ts",
     "**/*.spec.tsx",
-    "**/*.test.tsx",
-    "jest.config.ts",
-    "tsup.config.ts"
+    "**/*.stories.ts",
+    "**/*.stories.tsx",
+    "**/*.test.ts",
+    "**/*.test.tsx"
   ],
-  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
 }
diff --git a/packages/twenty-front/tsconfig.json b/packages/twenty-front/tsconfig.json
index 1b23f7601d7e..ae837c98fb07 100644
--- a/packages/twenty-front/tsconfig.json
+++ b/packages/twenty-front/tsconfig.json
@@ -7,13 +7,6 @@
     "skipLibCheck": true,
     "allowJs": true,
     "esModuleInterop": true,
-    "baseUrl": ".",
-    "paths": {
-      "@/*": ["src/modules/*"],
-      "~/*": ["src/*"]
-    },
-
-    /* Bundler mode */
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true,
     "allowImportingTsExtensions": true,
@@ -21,13 +14,16 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "react-jsx",
-
-    /* Linting */
     "strict": true,
     "noUnusedLocals": false,
     "noUnusedParameters": false,
     "noFallthroughCasesInSwitch": true,
-    "forceConsistentCasingInFileNames": true
+    "forceConsistentCasingInFileNames": true,
+    "paths": {
+      "@/*": ["packages/twenty-front/src/modules/*"],
+      "~/*": ["packages/twenty-front/src/*"],
+      "twenty-ui": ["packages/twenty-ui/src/index.ts"]
+    }
   },
   "files": [],
   "include": [],
@@ -38,5 +34,6 @@
     {
       "path": "./tsconfig.spec.json"
     }
-  ]
+  ],
+  "extends": "../../tsconfig.base.json"
 }
diff --git a/packages/twenty-front/tsconfig.spec.json b/packages/twenty-front/tsconfig.spec.json
index a7f834079e53..d7432bfc9eb3 100644
--- a/packages/twenty-front/tsconfig.spec.json
+++ b/packages/twenty-front/tsconfig.spec.json
@@ -5,13 +5,19 @@
     "types": ["jest", "node"]
   },
   "include": [
-    "vite.config.ts",
-    "jest.config.ts",
-    "**/*.test.ts",
-    "**/*.test.tsx",
-    "**/*.spec.ts",
-    "**/*.d.ts",
     ".storybook/**/*",
-    "**/*.stories.tsx"
+    "**/__mocks__/**/*",
+    "jest.config.ts",
+    "setupTests.ts",
+    "src/**/*.d.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.spec.tsx",
+    "src/**/*.stories.ts",
+    "src/**/*.stories.tsx",
+    "src/**/*.test.ts",
+    "src/**/*.test.tsx",
+    "tsup.config.ts",
+    "tsup.ui.index.tsx",
+    "vite.config.ts"
   ]
 }
diff --git a/packages/twenty-front/tsup.ui.index.tsx b/packages/twenty-front/tsup.ui.index.tsx
index 4c43d40a5619..e0e520ce6c5a 100644
--- a/packages/twenty-front/tsup.ui.index.tsx
+++ b/packages/twenty-front/tsup.ui.index.tsx
@@ -15,7 +15,6 @@ export * from './src/modules/ui/display/checkmark/components/AnimatedCheckmark'
 export * from './src/modules/ui/display/chip/components/Chip'
 export * from './src/modules/ui/display/chip/components/EntityChip'
 export * from './src/modules/ui/display/icon/components/IconAddressBook'
-export * from './src/modules/ui/display/pill/components/Pill'
 export * from './src/modules/ui/display/tag/components/Tag'
 export * from './src/modules/ui/display/tooltip/AppTooltip'
 export * from './src/modules/ui/display/tooltip/OverflowingTextWithTooltip'
@@ -28,7 +27,7 @@ export * from './src/modules/ui/input/button/components/FloatingButtonGroup'
 export * from './src/modules/ui/input/button/components/FloatingIconButton'
 export * from './src/modules/ui/input/button/components/FloatingIconButtonGroup'
 export * from './src/modules/ui/input/button/components/LightButton'
-export * from '@/ui/navigation/link/components/ActionLink.tsx'
+export * from './src/modules/ui/navigation/link/components/ActionLink.tsx'
 export * from './src/modules/ui/input/button/components/LightIconButton'
 export * from './src/modules/ui/input/button/components/MainButton'
 export * from './src/modules/ui/input/button/components/RoundedIconButton'
diff --git a/packages/twenty-front/vite.config.ts b/packages/twenty-front/vite.config.ts
index 50b965ed2ee9..c5b59b84c9ec 100644
--- a/packages/twenty-front/vite.config.ts
+++ b/packages/twenty-front/vite.config.ts
@@ -13,7 +13,7 @@ export default defineConfig(({ command, mode }) => {
   /*
     Using explicit env variables, there is no need to expose all of them (security).
   */
-  const { REACT_APP_SERVER_BASE_URL } = env;
+  const { REACT_APP_SERVER_BASE_URL, SENTRY_RELEASE, ENVIRONMENT } = env;
 
   const isBuildCommand = command === 'build';
 
@@ -31,27 +31,39 @@ export default defineConfig(({ command, mode }) => {
     };
   }
 
-  const plugins = [
-    react({ jsxImportSource: '@emotion/react' }),
-    tsconfigPaths(),
-    svgr(),
-    checker(checkers),
-  ];
-
   return {
-    // base: ,
-    envPrefix: 'REACT_APP_',
-    build: {
-      outDir: 'build',
-    },
-    plugins,
+    root: __dirname,
+    cacheDir: '../../node_modules/.vite/packages/twenty-front',
+
     server: {
-      // open: true,
       port: 3001,
+      host: 'localhost',
+    },
+
+    plugins: [
+      react({ jsxImportSource: '@emotion/react' }),
+      tsconfigPaths({
+        projects: [
+          'tsconfig.json',
+          // Include internal library aliases in development mode, so hot reload is enabled for libraries.
+          mode === 'development' ? '../twenty-ui/tsconfig.json' : undefined,
+        ].filter(Boolean) as string[],
+      }),
+      svgr(),
+      checker(checkers),
+    ],
+
+    build: {
+      outDir: 'build',
     },
+
+    envPrefix: 'REACT_APP_',
+
     define: {
       'process.env': {
         REACT_APP_SERVER_BASE_URL,
+        SENTRY_RELEASE,
+        ENVIRONMENT,
       },
     },
   };
diff --git a/packages/twenty-postgres/linux/Dockerfile b/packages/twenty-postgres/linux/Dockerfile
new file mode 100644
index 000000000000..c8996796c3c7
--- /dev/null
+++ b/packages/twenty-postgres/linux/Dockerfile
@@ -0,0 +1,12 @@
+ARG IMAGE_TAG='15.5.0-debian-11-r15'
+
+FROM bitnami/postgresql:${IMAGE_TAG}
+
+ARG PG_MAIN_VERSION=15
+ARG PG_GRAPHQL_VERSION=1.5.1
+ARG WRAPPERS_VERSION=0.2.0
+ARG TARGETARCH
+
+USER root
+
+CMD ["tail", "-f", "/dev/null"]
diff --git a/packages/twenty-postgres/linux/amd64/15/pg_graphql/1.5.1/pg_graphql--1.5.1.sql b/packages/twenty-postgres/linux/amd64/15/pg_graphql/1.5.1/pg_graphql--1.5.1.sql
new file mode 100644
index 000000000000..915d4c190a37
--- /dev/null
+++ b/packages/twenty-postgres/linux/amd64/15/pg_graphql/1.5.1/pg_graphql--1.5.1.sql
@@ -0,0 +1,116 @@
+/* 
+This file is auto generated by pgrx.
+
+The ordering of items is not stable, it is driven by a dependency graph.
+*/
+
+-- src/lib.rs:27
+-- pg_graphql::_internal_resolve
+CREATE  FUNCTION graphql."_internal_resolve"(
+	"query" TEXT, /* &str */
+	"variables" jsonb DEFAULT '{}', /* core::option::Option<pgrx::datum::json::JsonB> */
+	"operationName" TEXT DEFAULT null, /* core::option::Option<alloc::string::String> */
+	"extensions" jsonb DEFAULT null /* core::option::Option<pgrx::datum::json::JsonB> */
+) RETURNS jsonb /* pgrx::datum::json::JsonB */
+
+LANGUAGE c /* Rust */
+AS 'MODULE_PATHNAME', 'resolve_wrapper';
+
+-- src/lib.rs:23
+-- requires:
+--   resolve
+
+create or replace function graphql.resolve(
+      "query" text,
+      "variables" jsonb default '{}',
+      "operationName" text default null,
+      "extensions" jsonb default null
+)
+    returns jsonb
+    language plpgsql
+as $$
+declare
+    res jsonb;
+    message_text text;
+begin
+  begin
+    select graphql._internal_resolve("query" := "query",
+                                     "variables" := "variables",
+                                     "operationName" := "operationName",
+                                     "extensions" := "extensions") into res;
+    return res;
+  exception
+    when others then
+    get stacked diagnostics message_text = message_text;
+    return
+    jsonb_build_object('data', null,
+                       'errors', jsonb_build_array(jsonb_build_object('message', message_text)));
+  end;
+end;
+$$;
+
+
+-- src/lib.rs:22
+create or replace function graphql.exception(message text)
+    returns text
+    language plpgsql
+as $$
+begin
+    raise exception using errcode='22000', message=message;
+end;
+$$;
+
+
+-- src/lib.rs:20
+-- Is updated every time the schema changes
+create sequence if not exists graphql.seq_schema_version as int cycle;
+
+create or replace function graphql.increment_schema_version()
+    returns event_trigger
+    security definer
+    language plpgsql
+as $$
+begin
+    perform nextval('graphql.seq_schema_version');
+end;
+$$;
+
+create or replace function graphql.get_schema_version()
+    returns int
+    security definer
+    language sql
+as $$
+    select last_value from graphql.seq_schema_version;
+$$;
+
+-- On DDL event, increment the schema version number
+create event trigger graphql_watch_ddl
+    on ddl_command_end
+    execute procedure graphql.increment_schema_version();
+
+create event trigger graphql_watch_drop
+    on sql_drop
+    execute procedure graphql.increment_schema_version();
+
+
+-- src/lib.rs:21
+create function graphql.comment_directive(comment_ text)
+    returns jsonb
+    language sql
+    immutable
+as $$
+    /*
+    comment on column public.account.name is '@graphql.name: myField'
+    */
+    select
+        coalesce(
+            (
+                regexp_match(
+                    comment_,
+                    '@graphql\((.+?)\)'
+                )
+            )[1]::jsonb,
+            jsonb_build_object()
+        )
+$$;
+
diff --git a/packages/twenty-postgres/linux/amd64/15/pg_graphql/1.5.1/pg_graphql.control b/packages/twenty-postgres/linux/amd64/15/pg_graphql/1.5.1/pg_graphql.control
new file mode 100644
index 000000000000..172c6f114234
--- /dev/null
+++ b/packages/twenty-postgres/linux/amd64/15/pg_graphql/1.5.1/pg_graphql.control
@@ -0,0 +1,6 @@
+comment = 'pg_graphql: GraphQL support'
+default_version = '1.5.1'
+module_pathname = '$libdir/pg_graphql'
+relocatable = false
+superuser = true
+schema = 'graphql'
diff --git a/packages/twenty-postgres/linux/amd64/15/pg_graphql/1.5.1/pg_graphql.so b/packages/twenty-postgres/linux/amd64/15/pg_graphql/1.5.1/pg_graphql.so
new file mode 100755
index 000000000000..458e9ae82f19
Binary files /dev/null and b/packages/twenty-postgres/linux/amd64/15/pg_graphql/1.5.1/pg_graphql.so differ
diff --git a/packages/twenty-postgres/linux/arm64/15/pg_graphql/1.5.1/pg_graphql--1.5.1.sql b/packages/twenty-postgres/linux/arm64/15/pg_graphql/1.5.1/pg_graphql--1.5.1.sql
new file mode 100644
index 000000000000..05ad736a31cc
--- /dev/null
+++ b/packages/twenty-postgres/linux/arm64/15/pg_graphql/1.5.1/pg_graphql--1.5.1.sql
@@ -0,0 +1,116 @@
+/* 
+This file is auto generated by pgrx.
+
+The ordering of items is not stable, it is driven by a dependency graph.
+*/
+
+-- src/lib.rs:27
+-- pg_graphql::_internal_resolve
+CREATE  FUNCTION graphql."_internal_resolve"(
+	"query" TEXT, /* &str */
+	"variables" jsonb DEFAULT '{}', /* core::option::Option<pgrx::datum::json::JsonB> */
+	"operationName" TEXT DEFAULT null, /* core::option::Option<alloc::string::String> */
+	"extensions" jsonb DEFAULT null /* core::option::Option<pgrx::datum::json::JsonB> */
+) RETURNS jsonb /* pgrx::datum::json::JsonB */
+
+LANGUAGE c /* Rust */
+AS 'MODULE_PATHNAME', 'resolve_wrapper';
+
+-- src/lib.rs:21
+create function graphql.comment_directive(comment_ text)
+    returns jsonb
+    language sql
+    immutable
+as $$
+    /*
+    comment on column public.account.name is '@graphql.name: myField'
+    */
+    select
+        coalesce(
+            (
+                regexp_match(
+                    comment_,
+                    '@graphql\((.+?)\)'
+                )
+            )[1]::jsonb,
+            jsonb_build_object()
+        )
+$$;
+
+
+-- src/lib.rs:20
+-- Is updated every time the schema changes
+create sequence if not exists graphql.seq_schema_version as int cycle;
+
+create or replace function graphql.increment_schema_version()
+    returns event_trigger
+    security definer
+    language plpgsql
+as $$
+begin
+    perform nextval('graphql.seq_schema_version');
+end;
+$$;
+
+create or replace function graphql.get_schema_version()
+    returns int
+    security definer
+    language sql
+as $$
+    select last_value from graphql.seq_schema_version;
+$$;
+
+-- On DDL event, increment the schema version number
+create event trigger graphql_watch_ddl
+    on ddl_command_end
+    execute procedure graphql.increment_schema_version();
+
+create event trigger graphql_watch_drop
+    on sql_drop
+    execute procedure graphql.increment_schema_version();
+
+
+-- src/lib.rs:22
+create or replace function graphql.exception(message text)
+    returns text
+    language plpgsql
+as $$
+begin
+    raise exception using errcode='22000', message=message;
+end;
+$$;
+
+
+-- src/lib.rs:23
+-- requires:
+--   resolve
+
+create or replace function graphql.resolve(
+      "query" text,
+      "variables" jsonb default '{}',
+      "operationName" text default null,
+      "extensions" jsonb default null
+)
+    returns jsonb
+    language plpgsql
+as $$
+declare
+    res jsonb;
+    message_text text;
+begin
+  begin
+    select graphql._internal_resolve("query" := "query",
+                                     "variables" := "variables",
+                                     "operationName" := "operationName",
+                                     "extensions" := "extensions") into res;
+    return res;
+  exception
+    when others then
+    get stacked diagnostics message_text = message_text;
+    return
+    jsonb_build_object('data', null,
+                       'errors', jsonb_build_array(jsonb_build_object('message', message_text)));
+  end;
+end;
+$$;
+
diff --git a/packages/twenty-postgres/linux/arm64/15/pg_graphql/1.5.1/pg_graphql.control b/packages/twenty-postgres/linux/arm64/15/pg_graphql/1.5.1/pg_graphql.control
new file mode 100644
index 000000000000..172c6f114234
--- /dev/null
+++ b/packages/twenty-postgres/linux/arm64/15/pg_graphql/1.5.1/pg_graphql.control
@@ -0,0 +1,6 @@
+comment = 'pg_graphql: GraphQL support'
+default_version = '1.5.1'
+module_pathname = '$libdir/pg_graphql'
+relocatable = false
+superuser = true
+schema = 'graphql'
diff --git a/packages/twenty-postgres/linux/arm64/15/pg_graphql/1.5.1/pg_graphql.so b/packages/twenty-postgres/linux/arm64/15/pg_graphql/1.5.1/pg_graphql.so
new file mode 100755
index 000000000000..c655afcf7ebf
Binary files /dev/null and b/packages/twenty-postgres/linux/arm64/15/pg_graphql/1.5.1/pg_graphql.so differ
diff --git a/packages/twenty-postgres/linux/build-postgres-linux.sh b/packages/twenty-postgres/linux/build-postgres-linux.sh
index 301174cd0fb4..11744e774d7f 100755
--- a/packages/twenty-postgres/linux/build-postgres-linux.sh
+++ b/packages/twenty-postgres/linux/build-postgres-linux.sh
@@ -48,15 +48,15 @@ EOF
 echo_header $BLUE "                    DATABASE SETUP"
 
 PG_MAIN_VERSION=15
-PG_GRAPHQL_VERSION=1.4.2
-CARGO_PGRX_VERSION=0.10.2
+PG_GRAPHQL_VERSION=1.5.1
+CARGO_PGRX_VERSION=0.11.2
 TARGETARCH=$(dpkg --print-architecture)
 
 # Install PostgresSQL
 echo_header $GREEN "Step [1/4]: Installing PostgreSQL..."
 apt update -y || handle_error "Failed to update package list."
-apt install -y postgresql-$PG_MAIN_VERSION postgresql-contrib || handle_error "Failed to install PostgreSQL."su
 apt install -y curl || handle_error "Failed to install curl."
+apt install -y sudo || handle_error "Failed to install sudo."
 apt install build-essential -y || handle_error "Failed to install build-essential."
 apt install pkg-config -y || handle_error "Failed to install pkg-config."
 apt install libssl-dev -y || handle_error "Failed to install libssl-dev."
@@ -77,9 +77,9 @@ fi
 
 # To force a reinstall of cargo-pgrx, pass --force to the command below
 curl  https://sh.rustup.rs -sSf | sh
-source "$HOME/.cargo/env"
-cargo install --locked cargo-pgrx@$CARGO_PGRX_VERSION --force
-cargo pgrx init --pg$PG_MAIN_VERSION download
+source "$HOME/.cargo/env" || . "$HOME/.cargo/env"
+cargo install --locked cargo-pgrx@$CARGO_PGRX_VERSION --force || handle_error "Failed to install cargo"
+cargo pgrx init --pg$PG_MAIN_VERSION download || handle_error "Failed to init postgresql"
 
 # Create a temporary directory
 temp_dir=$(mktemp -d)
@@ -93,12 +93,13 @@ cd "pg_graphql-$PG_GRAPHQL_VERSION"
 
 # Apply patches to pg_graphql files
 echo "Applying patches to pg_graphql files..."
-for patch_file in "/patches/pg_graphql/"*.patch; do
+for patch_file in "/twenty/patches/pg_graphql/"*.patch; do
     echo "Applying patch: $patch_file"
     patch -p1 < "$patch_file"
 done
 
-cargo pgrx install --release --pg-config /opt/bitnami/postgresql/bin/pg_config
+echo_header $GREEN "Step [2/4]: Building PostgreSQL service..."
+cargo pgrx install --release --pg-config /opt/bitnami/postgresql/bin/pg_config || handle_error "Failed to build postgresql"
 
 
 # Clean up the temporary directory
diff --git a/packages/twenty-postgres/linux/build_postgres.md b/packages/twenty-postgres/linux/build_postgres.md
new file mode 100644
index 000000000000..20e7084aef44
--- /dev/null
+++ b/packages/twenty-postgres/linux/build_postgres.md
@@ -0,0 +1,22 @@
+
+This doc explains how to build postgresql for Twenty
+
+Build .control, .so and .pg_graphql--version.sql
+> docker buildx create --name mybuilder
+> docker buildx use mybuilder
+
+Do the same for <PLATFORM> in ['amd64', 'arm64'] ('amd64' builds faster)
+> cd packages/twenty-postgres
+> docker buildx build --platform linux/<PLATFORM> --load -t twenty-bitnami-postgres-<PLATFORM> linux
+> docker run --name twenty-bitnami-<PLATFORM>  -v ~/Desktop/twenty/packages/twenty-postgres:/twenty <IMAGE_TAG>
+
+In another terminal
+> docker exec -it <CONTAINER_TAG> sh
+> sh twenty/linux/build-postgres-linux.sh
+> cp opt/bitnami/postgresql/lib/pg_graphql.so twenty/linux/<PLATFORM>/15/pg_graphql/<PG_GRAPHQL_VERSION>
+> cp opt/bitnami/postgresql/share/extension/pg_graphql.control twenty/linux/<PLATFORM>/15/pg_graphql/<PG_GRAPHQL_VERSION>
+> cp opt/bitnami/postgresql/share/extension/pg_graphql--<PG_GRAPHQL_VERSION>.sql twenty/linux/<PLATFORM>/15/pg_graphql/<PG_GRAPHQL_VERSION>
+
+Then
+> prod-server-build
+> prod-server-run
diff --git a/packages/twenty-postgres/linux/provision-postgres-linux.sh b/packages/twenty-postgres/linux/provision-postgres-linux.sh
index 39b77f57d409..651224284e05 100755
--- a/packages/twenty-postgres/linux/provision-postgres-linux.sh
+++ b/packages/twenty-postgres/linux/provision-postgres-linux.sh
@@ -48,7 +48,7 @@ EOF
 echo_header $BLUE "                    DATABASE SETUP"
 
 PG_MAIN_VERSION=15
-PG_GRAPHQL_VERSION=1.3.0
+PG_GRAPHQL_VERSION=1.5.1
 TARGETARCH=$(dpkg --print-architecture)
 
 # Install PostgresSQL
@@ -56,7 +56,7 @@ echo_header $GREEN "Step [1/4]: Installing PostgreSQL..."
 sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
 wget -qO- https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo tee /etc/apt/trusted.gpg.d/pgdg.asc &>/dev/null
 sudo apt update -y || handle_error "Failed to update package list."
-sudo apt install -y postgresql-$PG_MAIN_VERSION postgresql-contrib || handle_error "Failed to install PostgreSQL."su
+sudo apt install -y postgresql-$PG_MAIN_VERSION postgresql-contrib-$PG_MAIN_VERSION || handle_error "Failed to install PostgreSQL."su
 sudo apt install -y curl || handle_error "Failed to install curl."
 
 # Install pg_graphql extensions
diff --git a/packages/twenty-postgres/macos/arm/15/pg_graphql/1.5.1/pg_graphql--1.5.1.sql b/packages/twenty-postgres/macos/arm/15/pg_graphql/1.5.1/pg_graphql--1.5.1.sql
new file mode 100644
index 000000000000..81b2d5c4cb21
--- /dev/null
+++ b/packages/twenty-postgres/macos/arm/15/pg_graphql/1.5.1/pg_graphql--1.5.1.sql
@@ -0,0 +1,116 @@
+/* 
+This file is auto generated by pgrx.
+
+The ordering of items is not stable, it is driven by a dependency graph.
+*/
+
+-- src/lib.rs:27
+-- pg_graphql::_internal_resolve
+CREATE  FUNCTION graphql."_internal_resolve"(
+	"query" TEXT, /* &str */
+	"variables" jsonb DEFAULT '{}', /* core::option::Option<pgrx::datum::json::JsonB> */
+	"operationName" TEXT DEFAULT null, /* core::option::Option<alloc::string::String> */
+	"extensions" jsonb DEFAULT null /* core::option::Option<pgrx::datum::json::JsonB> */
+) RETURNS jsonb /* pgrx::datum::json::JsonB */
+
+LANGUAGE c /* Rust */
+AS 'MODULE_PATHNAME', 'resolve_wrapper';
+
+-- src/lib.rs:21
+create function graphql.comment_directive(comment_ text)
+    returns jsonb
+    language sql
+    immutable
+as $$
+    /*
+    comment on column public.account.name is '@graphql.name: myField'
+    */
+    select
+        coalesce(
+            (
+                regexp_match(
+                    comment_,
+                    '@graphql\((.+?)\)'
+                )
+            )[1]::jsonb,
+            jsonb_build_object()
+        )
+$$;
+
+
+-- src/lib.rs:22
+create or replace function graphql.exception(message text)
+    returns text
+    language plpgsql
+as $$
+begin
+    raise exception using errcode='22000', message=message;
+end;
+$$;
+
+
+-- src/lib.rs:23
+-- requires:
+--   resolve
+
+create or replace function graphql.resolve(
+      "query" text,
+      "variables" jsonb default '{}',
+      "operationName" text default null,
+      "extensions" jsonb default null
+)
+    returns jsonb
+    language plpgsql
+as $$
+declare
+    res jsonb;
+    message_text text;
+begin
+  begin
+    select graphql._internal_resolve("query" := "query",
+                                     "variables" := "variables",
+                                     "operationName" := "operationName",
+                                     "extensions" := "extensions") into res;
+    return res;
+  exception
+    when others then
+    get stacked diagnostics message_text = message_text;
+    return
+    jsonb_build_object('data', null,
+                       'errors', jsonb_build_array(jsonb_build_object('message', message_text)));
+  end;
+end;
+$$;
+
+
+-- src/lib.rs:20
+-- Is updated every time the schema changes
+create sequence if not exists graphql.seq_schema_version as int cycle;
+
+create or replace function graphql.increment_schema_version()
+    returns event_trigger
+    security definer
+    language plpgsql
+as $$
+begin
+    perform nextval('graphql.seq_schema_version');
+end;
+$$;
+
+create or replace function graphql.get_schema_version()
+    returns int
+    security definer
+    language sql
+as $$
+    select last_value from graphql.seq_schema_version;
+$$;
+
+-- On DDL event, increment the schema version number
+create event trigger graphql_watch_ddl
+    on ddl_command_end
+    execute procedure graphql.increment_schema_version();
+
+create event trigger graphql_watch_drop
+    on sql_drop
+    execute procedure graphql.increment_schema_version();
+
diff --git a/packages/twenty-postgres/macos/arm/15/pg_graphql/1.5.1/pg_graphql.control b/packages/twenty-postgres/macos/arm/15/pg_graphql/1.5.1/pg_graphql.control
new file mode 100644
index 000000000000..172c6f114234
--- /dev/null
+++ b/packages/twenty-postgres/macos/arm/15/pg_graphql/1.5.1/pg_graphql.control
@@ -0,0 +1,6 @@
+comment = 'pg_graphql: GraphQL support'
+default_version = '1.5.1'
+module_pathname = '$libdir/pg_graphql'
+relocatable = false
+superuser = true
+schema = 'graphql'
diff --git a/packages/twenty-postgres/macos/arm/15/pg_graphql/1.5.1/pg_graphql.so b/packages/twenty-postgres/macos/arm/15/pg_graphql/1.5.1/pg_graphql.so
new file mode 100755
index 000000000000..96ffdaf0d354
Binary files /dev/null and b/packages/twenty-postgres/macos/arm/15/pg_graphql/1.5.1/pg_graphql.so differ
diff --git a/packages/twenty-postgres/macos/arm/build-postgres-macos-arm.sh b/packages/twenty-postgres/macos/arm/build-postgres-macos-arm.sh
index 5bfbb399489d..a2738797f821 100755
--- a/packages/twenty-postgres/macos/arm/build-postgres-macos-arm.sh
+++ b/packages/twenty-postgres/macos/arm/build-postgres-macos-arm.sh
@@ -48,8 +48,8 @@ EOF
 echo_header $BLUE "                    DATABASE SETUP"
 
 PG_MAIN_VERSION=15
-PG_GRAPHQL_VERSION=1.4.2
-CARGO_PGRX_VERSION=0.10.2
+PG_GRAPHQL_VERSION=1.5.1
+CARGO_PGRX_VERSION=0.11.2
 
 current_directory=$(pwd)
 script_directory="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
diff --git a/packages/twenty-postgres/macos/arm/provision-postgres-macos-arm.sh b/packages/twenty-postgres/macos/arm/provision-postgres-macos-arm.sh
index ea82926be12d..24e98760867b 100755
--- a/packages/twenty-postgres/macos/arm/provision-postgres-macos-arm.sh
+++ b/packages/twenty-postgres/macos/arm/provision-postgres-macos-arm.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PG_MAIN_VERSION=15
-PG_GRAPHQL_VERSION=1.4.2
+PG_GRAPHQL_VERSION=1.5.1
 
 current_directory=$(pwd)
 
diff --git a/packages/twenty-postgres/macos/intel/15/pg_graphql/1.5.1/pg_graphql--1.5.1.sql b/packages/twenty-postgres/macos/intel/15/pg_graphql/1.5.1/pg_graphql--1.5.1.sql
new file mode 100644
index 000000000000..ef7ef9aca271
--- /dev/null
+++ b/packages/twenty-postgres/macos/intel/15/pg_graphql/1.5.1/pg_graphql--1.5.1.sql
@@ -0,0 +1,116 @@
+/* 
+This file is auto generated by pgrx.
+
+The ordering of items is not stable, it is driven by a dependency graph.
+*/
+
+-- src/lib.rs:27
+-- pg_graphql::_internal_resolve
+CREATE  FUNCTION graphql."_internal_resolve"(
+	"query" TEXT, /* &str */
+	"variables" jsonb DEFAULT '{}', /* core::option::Option<pgrx::datum::json::JsonB> */
+	"operationName" TEXT DEFAULT null, /* core::option::Option<alloc::string::String> */
+	"extensions" jsonb DEFAULT null /* core::option::Option<pgrx::datum::json::JsonB> */
+) RETURNS jsonb /* pgrx::datum::json::JsonB */
+
+LANGUAGE c /* Rust */
+AS 'MODULE_PATHNAME', 'resolve_wrapper';
+
+-- src/lib.rs:23
+-- requires:
+--   resolve
+
+create or replace function graphql.resolve(
+      "query" text,
+      "variables" jsonb default '{}',
+      "operationName" text default null,
+      "extensions" jsonb default null
+)
+    returns jsonb
+    language plpgsql
+as $$
+declare
+    res jsonb;
+    message_text text;
+begin
+  begin
+    select graphql._internal_resolve("query" := "query",
+                                     "variables" := "variables",
+                                     "operationName" := "operationName",
+                                     "extensions" := "extensions") into res;
+    return res;
+  exception
+    when others then
+    get stacked diagnostics message_text = message_text;
+    return
+    jsonb_build_object('data', null,
+                       'errors', jsonb_build_array(jsonb_build_object('message', message_text)));
+  end;
+end;
+$$;
+
+
+-- src/lib.rs:22
+create or replace function graphql.exception(message text)
+    returns text
+    language plpgsql
+as $$
+begin
+    raise exception using errcode='22000', message=message;
+end;
+$$;
+
+
+-- src/lib.rs:21
+create function graphql.comment_directive(comment_ text)
+    returns jsonb
+    language sql
+    immutable
+as $$
+    /*
+    comment on column public.account.name is '@graphql.name: myField'
+    */
+    select
+        coalesce(
+            (
+                regexp_match(
+                    comment_,
+                    '@graphql\((.+?)\)'
+                )
+            )[1]::jsonb,
+            jsonb_build_object()
+        )
+$$;
+
+
+-- src/lib.rs:20
+-- Is updated every time the schema changes
+create sequence if not exists graphql.seq_schema_version as int cycle;
+
+create or replace function graphql.increment_schema_version()
+    returns event_trigger
+    security definer
+    language plpgsql
+as $$
+begin
+    perform nextval('graphql.seq_schema_version');
+end;
+$$;
+
+create or replace function graphql.get_schema_version()
+    returns int
+    security definer
+    language sql
+as $$
+    select last_value from graphql.seq_schema_version;
+$$;
+
+-- On DDL event, increment the schema version number
+create event trigger graphql_watch_ddl
+    on ddl_command_end
+    execute procedure graphql.increment_schema_version();
+
+create event trigger graphql_watch_drop
+    on sql_drop
+    execute procedure graphql.increment_schema_version();
+
diff --git a/packages/twenty-postgres/macos/intel/15/pg_graphql/1.5.1/pg_graphql.control b/packages/twenty-postgres/macos/intel/15/pg_graphql/1.5.1/pg_graphql.control
new file mode 100644
index 000000000000..172c6f114234
--- /dev/null
+++ b/packages/twenty-postgres/macos/intel/15/pg_graphql/1.5.1/pg_graphql.control
@@ -0,0 +1,6 @@
+comment = 'pg_graphql: GraphQL support'
+default_version = '1.5.1'
+module_pathname = '$libdir/pg_graphql'
+relocatable = false
+superuser = true
+schema = 'graphql'
diff --git a/packages/twenty-postgres/macos/intel/15/pg_graphql/1.5.1/pg_graphql.so b/packages/twenty-postgres/macos/intel/15/pg_graphql/1.5.1/pg_graphql.so
new file mode 100644
index 000000000000..61eda3333e0b
Binary files /dev/null and b/packages/twenty-postgres/macos/intel/15/pg_graphql/1.5.1/pg_graphql.so differ
diff --git a/packages/twenty-postgres/macos/intel/build-postgres-macos-intel.sh b/packages/twenty-postgres/macos/intel/build-postgres-macos-intel.sh
index 743f812ca989..a5636eac08d2 100755
--- a/packages/twenty-postgres/macos/intel/build-postgres-macos-intel.sh
+++ b/packages/twenty-postgres/macos/intel/build-postgres-macos-intel.sh
@@ -48,8 +48,8 @@ EOF
 echo_header $BLUE "                    DATABASE SETUP"
 
 PG_MAIN_VERSION=15
-PG_GRAPHQL_VERSION=1.4.2
-CARGO_PGRX_VERSION=0.10.2
+PG_GRAPHQL_VERSION=1.5.1
+CARGO_PGRX_VERSION=0.11.2
 
 current_directory=$(pwd)
 script_directory="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
diff --git a/packages/twenty-postgres/macos/intel/provision-postgres-macos-intel.sh b/packages/twenty-postgres/macos/intel/provision-postgres-macos-intel.sh
index 5d6438fdb8d3..c6a49fa430e7 100755
--- a/packages/twenty-postgres/macos/intel/provision-postgres-macos-intel.sh
+++ b/packages/twenty-postgres/macos/intel/provision-postgres-macos-intel.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PG_MAIN_VERSION=15
-PG_GRAPHQL_VERSION=1.3.0
+PG_GRAPHQL_VERSION=1.5.1
 
 current_directory=$(pwd)
 
diff --git a/packages/twenty-server/.env.example b/packages/twenty-server/.env.example
index dc7e64593d24..1c3bf3eada54 100644
--- a/packages/twenty-server/.env.example
+++ b/packages/twenty-server/.env.example
@@ -4,28 +4,33 @@ PG_DATABASE_URL=postgres://twenty:twenty@localhost:5432/default
 # PG_DATABASE_URL=postgres://twenty:twenty@postgres:5432/default
 
 FRONT_BASE_URL=http://localhost:3001
+
 ACCESS_TOKEN_SECRET=replace_me_with_a_random_string_access
 LOGIN_TOKEN_SECRET=replace_me_with_a_random_string_login
 REFRESH_TOKEN_SECRET=replace_me_with_a_random_string_refresh
+FILE_TOKEN_SECRET=replace_me_with_a_random_string_refresh
 SIGN_IN_PREFILLED=true
 
 # ———————— Optional ————————
 # PORT=3000
 # DEBUG_MODE=true
+# DEBUG_PORT=9000
 # ACCESS_TOKEN_EXPIRES_IN=30m
 # LOGIN_TOKEN_EXPIRES_IN=15m
 # API_TOKEN_EXPIRES_IN=1000y
-# REFRESH_TOKEN_EXPIRES_IN=90d 
-# FRONT_AUTH_CALLBACK_URL=http://localhost:3001/verify 
+# REFRESH_TOKEN_EXPIRES_IN=90d
+# FILE_TOKEN_EXPIRES_IN=1d
+# FRONT_AUTH_CALLBACK_URL=http://localhost:3001/verify
 # AUTH_GOOGLE_ENABLED=false
 # MESSAGING_PROVIDER_GMAIL_ENABLED=false
+# CALENDAR_PROVIDER_GOOGLE_ENABLED=false
 # IS_BILLING_ENABLED=false
 # BILLING_PLAN_REQUIRED_LINK=https://twenty.com/stripe-redirection
 # IS_SIGN_UP_DISABLED=false
 # AUTH_GOOGLE_CLIENT_ID=replace_me_with_google_client_id
 # AUTH_GOOGLE_CLIENT_SECRET=replace_me_with_google_client_secret
 # AUTH_GOOGLE_CALLBACK_URL=http://localhost:3000/auth/google/redirect
-# MESSAGING_PROVIDER_GMAIL_CALLBACK_URL=http://localhost:3000/auth/google-gmail/get-access-token
+# AUTH_GOOGLE_APIS_CALLBACK_URL=http://localhost:3000/auth/google-apis/get-access-token
 # STORAGE_TYPE=local
 # STORAGE_LOCAL_PATH=.local-storage
 # SUPPORT_DRIVER=front
@@ -34,7 +39,10 @@ SIGN_IN_PREFILLED=true
 # LOGGER_DRIVER=console
 # LOGGER_IS_BUFFER_ENABLED=true
 # EXCEPTION_HANDLER_DRIVER=sentry
+# SENTRY_ENVIRONMENT=main
+# SENTRY_RELEASE=latest
 # SENTRY_DSN=https://xxx@xxx.ingest.sentry.io/xxx
+# SENTRY_FRONT_DSN=https://xxx@xxx.ingest.sentry.io/xxx
 # LOG_LEVELS=error,warn
 # MESSAGE_QUEUE_TYPE=pg-boss
 # REDIS_HOST=127.0.0.1
@@ -56,3 +64,4 @@ SIGN_IN_PREFILLED=true
 # API_RATE_LIMITING_TTL=
 # API_RATE_LIMITING_LIMIT=
 # MUTATION_MAXIMUM_RECORD_AFFECTED=100
+# CHROME_EXTENSION_REDIRECT_URL=https://bggmipldbceihilonnbpgoeclgbkblkp.chromiumapps.com
diff --git a/packages/twenty-server/.env.test b/packages/twenty-server/.env.test
index 5e090b245f64..20bd13ac8ba3 100644
--- a/packages/twenty-server/.env.test
+++ b/packages/twenty-server/.env.test
@@ -9,14 +9,16 @@ FRONT_BASE_URL=http://localhost:3001
 ACCESS_TOKEN_SECRET=secret_jwt
 LOGIN_TOKEN_SECRET=secret_login_tokens
 REFRESH_TOKEN_SECRET=secret_refresh_token
+FILE_TOKEN_SECRET=secret_file_token
 
 # ———————— Optional ————————
 # DEBUG_MODE=false
 # SIGN_IN_PREFILLED=false
 # ACCESS_TOKEN_EXPIRES_IN=30m
 # LOGIN_TOKEN_EXPIRES_IN=15m
-# REFRESH_TOKEN_EXPIRES_IN=90d 
-# FRONT_AUTH_CALLBACK_URL=http://localhost:3001/verify 
+# REFRESH_TOKEN_EXPIRES_IN=90d
+# FILE_TOKEN_EXPIRES_IN=1d
+# FRONT_AUTH_CALLBACK_URL=http://localhost:3001/verify
 # AUTH_GOOGLE_ENABLED=false
 # MESSAGING_PROVIDER_GMAIL_ENABLED=false
 # STORAGE_TYPE=local
diff --git a/packages/twenty-server/@types/common.d.ts b/packages/twenty-server/@types/common.d.ts
index c4fc63d673c1..fb78d4d60f48 100644
--- a/packages/twenty-server/@types/common.d.ts
+++ b/packages/twenty-server/@types/common.d.ts
@@ -3,3 +3,6 @@ type DeepPartial<T> = {
     ? Array<DeepPartial<R>>
     : DeepPartial<T[K]>;
 };
+
+// eslint-disable-next-line @typescript-eslint/ban-types
+type ExcludeFunctions<T> = T extends Function ? never : T;
diff --git a/packages/twenty-server/@types/express.d.ts b/packages/twenty-server/@types/express.d.ts
new file mode 100644
index 000000000000..9f5ffd96da42
--- /dev/null
+++ b/packages/twenty-server/@types/express.d.ts
@@ -0,0 +1,10 @@
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+
+declare module 'express-serve-static-core' {
+  interface Request {
+    user?: User;
+    workspace?: Workspace;
+    cacheVersion?: string | null;
+  }
+}
diff --git a/packages/twenty-server/jest.config.ts b/packages/twenty-server/jest.config.ts
index 59b1f41e82ff..2a5ea0df6323 100644
--- a/packages/twenty-server/jest.config.ts
+++ b/packages/twenty-server/jest.config.ts
@@ -1,8 +1,10 @@
 module.exports = {
+  // to enable logs, comment out the following line
+  silent: true,
   clearMocks: true,
   preset: 'ts-jest',
   testEnvironment: 'node',
-
+  modulePathIgnorePatterns: ['<rootDir>/dist'],
   moduleFileExtensions: ['js', 'json', 'ts'],
   moduleNameMapper: {
     '^src/(.*)': '<rootDir>/src/$1',
diff --git a/packages/twenty-server/package.json b/packages/twenty-server/package.json
index 267c88d4433b..8474b3d7ab27 100644
--- a/packages/twenty-server/package.json
+++ b/packages/twenty-server/package.json
@@ -1,55 +1,52 @@
 {
   "name": "twenty-server",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "",
   "author": "",
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {
     "nx": "NX_DEFAULT_PROJECT=twenty-server node ../../node_modules/nx/bin/nx.js",
-    "prebuild": "rimraf dist",
-    "build": "npx nx prebuild && nest build --path ./tsconfig.build.json",
-    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "start": "NODE_ENV=development && nest start",
-    "start:dev": "npx nx start --watch",
-    "start:debug": "npx nx start:dev --debug",
     "start:prod": "node dist/src/main",
-    "lint": "eslint \"src/**/*.ts\" --fix",
-    "test": "jest",
-    "test:watch": "npx nx test --watch",
-    "test:cov": "npx nx test --coverage",
-    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "test:e2e": "./scripts/run-integration.sh",
-    "typeorm": "npx ts-node ../../node_modules/typeorm/cli.js",
-    "database:init": "npx nx database:setup && npx nx database:seed:dev",
-    "database:setup": "npx ts-node ./scripts/setup-db.ts && npx nx database:migrate",
-    "database:truncate": "npx ts-node ./scripts/truncate-db.ts",
-    "database:migrate": "npx nx typeorm -- migration:run -d src/database/typeorm/metadata/metadata.datasource && npx nx typeorm -- migration:run -d src/database/typeorm/core/core.datasource",
-    "database:seed:dev": "npx nx command -- workspace:seed:dev",
-    "database:seed:demo": "npx nx command -- workspace:seed:demo",
-    "database:reset": "npx nx database:truncate && npx nx database:init",
-    "queue:work": "node dist/src/queue-worker"
+    "command:prod": "node dist/src/command/command",
+    "worker:prod": "node dist/src/queue-worker/queue-worker",
+    "database:init:prod": "npx ts-node ./scripts/setup-db.ts && yarn database:migrate:prod",
+    "database:migrate:prod": "npx -y typeorm migration:run -d dist/src/database/typeorm/metadata/metadata.datasource && npx -y typeorm migration:run -d dist/src/database/typeorm/core/core.datasource"
   },
   "dependencies": {
     "@graphql-yoga/nestjs": "patch:@graphql-yoga/nestjs@2.1.0#./patches/@graphql-yoga+nestjs+2.1.0.patch",
-    "@nestjs/graphql": "patch:@nestjs/graphql@12.0.8#./patches/@nestjs+graphql+12.0.8.patch",
+    "@nestjs/cache-manager": "^2.2.1",
+    "@nestjs/devtools-integration": "^0.1.6",
+    "@nestjs/graphql": "patch:@nestjs/graphql@12.1.1#./patches/@nestjs+graphql+12.1.1.patch",
     "@ptc-org/nestjs-query-graphql": "patch:@ptc-org/nestjs-query-graphql@4.2.0#./patches/@ptc-org+nestjs-query-graphql+4.2.0.patch",
+    "cache-manager": "^5.4.0",
+    "cache-manager-redis-yet": "^4.1.2",
     "class-validator": "patch:class-validator@0.14.0#./patches/class-validator+0.14.0.patch",
     "graphql-middleware": "^6.1.35",
-    "passport": "^0.7.0"
+    "jsdom": "~22.1.0",
+    "jwt-decode": "^4.0.0",
+    "lodash.differencewith": "^4.5.0",
+    "lodash.uniq": "^4.5.0",
+    "lodash.uniqby": "^4.7.0",
+    "passport": "^0.7.0",
+    "psl": "^1.9.0",
+    "tsconfig-paths": "^4.2.0"
   },
   "devDependencies": {
     "@nestjs/cli": "10.3.0",
-    "@nx/js": "17.2.8",
+    "@nx/js": "18.1.3",
+    "@types/lodash.differencewith": "^4.5.9",
     "@types/lodash.isempty": "^4.4.7",
     "@types/lodash.isequal": "^4.5.8",
     "@types/lodash.isobject": "^3.0.7",
     "@types/lodash.omit": "^4.5.9",
     "@types/lodash.snakecase": "^4.1.7",
+    "@types/lodash.uniq": "^4.5.9",
+    "@types/lodash.uniqby": "^4.7.9",
     "@types/lodash.upperfirst": "^4.3.7",
     "@types/react": "^18.2.39",
     "rimraf": "^5.0.5",
-    "typescript": "^5.3.3"
+    "typescript": "5.3.3"
   },
   "engines": {
     "node": "^18.17.1",
diff --git a/packages/twenty-server/patches/@nestjs+graphql+12.0.8.patch b/packages/twenty-server/patches/@nestjs+graphql+12.0.8.patch
deleted file mode 100644
index c69764b78837..000000000000
--- a/packages/twenty-server/patches/@nestjs+graphql+12.0.8.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/dist/schema-builder/graphql-schema.factory.js b/dist/schema-builder/graphql-schema.factory.js
-index 787bcbc..1c825bd 100644
---- a/dist/schema-builder/graphql-schema.factory.js
-+++ b/dist/schema-builder/graphql-schema.factory.js
-@@ -32,6 +32,7 @@ let GraphQLSchemaFactory = exports.GraphQLSchemaFactory = GraphQLSchemaFactory_1
-         else {
-             options = scalarsOrOptions;
-         }
-+        this.typeDefinitionsGenerator.clearTypeDefinitionStorage();
-         lazy_metadata_storage_1.LazyMetadataStorage.load(resolvers);
-         type_metadata_storage_1.TypeMetadataStorage.compile(options.orphanedTypes);
-         this.typeDefinitionsGenerator.generate(options);
-diff --git a/dist/schema-builder/storages/type-definitions.storage.js b/dist/schema-builder/storages/type-definitions.storage.js
-index d100444..158c592 100644
---- a/dist/schema-builder/storages/type-definitions.storage.js
-+++ b/dist/schema-builder/storages/type-definitions.storage.js
-@@ -81,6 +81,10 @@ let TypeDefinitionsStorage = exports.TypeDefinitionsStorage = class TypeDefiniti
-         }
-         return;
-     }
-+    clear() {
-+        this.inputTypeDefinitionsLinks = null;
-+        this.outputTypeDefinitionsLinks = null;
-+    }
- };
- exports.TypeDefinitionsStorage = TypeDefinitionsStorage = tslib_1.__decorate([
-     (0, common_1.Injectable)()
-diff --git a/dist/schema-builder/type-definitions.generator.js b/dist/schema-builder/type-definitions.generator.js
-index eb6bcfd..4fbc1ae 100644
---- a/dist/schema-builder/type-definitions.generator.js
-+++ b/dist/schema-builder/type-definitions.generator.js
-@@ -26,6 +26,9 @@ let TypeDefinitionsGenerator = exports.TypeDefinitionsGenerator = class TypeDefi
-         this.generateObjectTypeDefs(options);
-         this.generateInputTypeDefs(options);
-     }
-+    clearTypeDefinitionStorage() {
-+        this.typeDefinitionsStorage.clear();
-+    }
-     generateInputTypeDefs(options) {
-         const metadata = type_metadata_storage_1.TypeMetadataStorage.getInputTypesMetadata();
-         const inputTypeDefs = metadata.map((metadata) => this.inputTypeDefinitionFactory.create(metadata, options));
diff --git a/packages/twenty-server/patches/@nestjs+graphql+12.1.1.patch b/packages/twenty-server/patches/@nestjs+graphql+12.1.1.patch
new file mode 100644
index 000000000000..47643c5b6fb3
--- /dev/null
+++ b/packages/twenty-server/patches/@nestjs+graphql+12.1.1.patch
@@ -0,0 +1,41 @@
+diff --git a/dist/schema-builder/graphql-schema.factory.js b/dist/schema-builder/graphql-schema.factory.js
+index f349a6e..425815c 100644
+--- a/dist/schema-builder/graphql-schema.factory.js
++++ b/dist/schema-builder/graphql-schema.factory.js
+@@ -32,6 +32,7 @@ let GraphQLSchemaFactory = GraphQLSchemaFactory_1 = class GraphQLSchemaFactory {
+         else {
+             options = scalarsOrOptions;
+         }
++        this.typeDefinitionsGenerator.clearTypeDefinitionStorage();
+         lazy_metadata_storage_1.LazyMetadataStorage.load(resolvers);
+         type_metadata_storage_1.TypeMetadataStorage.compile(options.orphanedTypes);
+         this.typeDefinitionsGenerator.generate(options);
+diff --git a/dist/schema-builder/storages/type-definitions.storage.js b/dist/schema-builder/storages/type-definitions.storage.js
+index a19dee7..466ee86 100644
+--- a/dist/schema-builder/storages/type-definitions.storage.js
++++ b/dist/schema-builder/storages/type-definitions.storage.js
+@@ -81,6 +81,10 @@ let TypeDefinitionsStorage = class TypeDefinitionsStorage {
+         }
+         return;
+     }
++    clear() {
++        this.inputTypeDefinitionsLinks = null;
++        this.outputTypeDefinitionsLinks = null;
++    }
+ };
+ exports.TypeDefinitionsStorage = TypeDefinitionsStorage;
+ exports.TypeDefinitionsStorage = TypeDefinitionsStorage = tslib_1.__decorate([
+diff --git a/dist/schema-builder/type-definitions.generator.js b/dist/schema-builder/type-definitions.generator.js
+index d5423f1..701a3b2 100644
+--- a/dist/schema-builder/type-definitions.generator.js
++++ b/dist/schema-builder/type-definitions.generator.js
+@@ -26,6 +26,9 @@ let TypeDefinitionsGenerator = class TypeDefinitionsGenerator {
+         this.generateObjectTypeDefs(options);
+         this.generateInputTypeDefs(options);
+     }
++    clearTypeDefinitionStorage() {
++        this.typeDefinitionsStorage.clear();
++    }
+     generateInputTypeDefs(options) {
+         const metadata = type_metadata_storage_1.TypeMetadataStorage.getInputTypesMetadata();
+         const inputTypeDefs = metadata.map((metadata) => this.inputTypeDefinitionFactory.create(metadata, options));
diff --git a/packages/twenty-server/project.json b/packages/twenty-server/project.json
index c3e44979982a..95da95eec12b 100644
--- a/packages/twenty-server/project.json
+++ b/packages/twenty-server/project.json
@@ -1,34 +1,155 @@
 {
-    "name": "twenty-server",
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "projectType": "application",
-    "targets": {
-        "build:packageJson": {
-            "executor": "@nx/js:tsc",
-            "dependsOn": [
-                "prebuild"
-            ],
-            "options": {
-                "main": "packages/twenty-server/dist/src/main.js",
-                "tsConfig": "packages/twenty-server/tsconfig.json",
-                "outputPath": "packages/twenty-server/dist",
-                "updateBuildableProjectDepsInPackageJson": true
-            }
-        },
-        "command": {
-            "executor": "nx:run-commands",
-            "dependsOn": [
-                "build"
-            ],
-            "options": {
-                "cwd": "packages/twenty-server",
-                "command": "node dist/src/command.js"
-            }
-        },
-        "test:debug": {
-            "dependsOn": [
-                "^build"
-            ]
-        }
+  "name": "twenty-server",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "application",
+  "targets": {
+    "build": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "packages/twenty-server",
+        "commands": ["rimraf dist", "nest build --path ./tsconfig.build.json"]
+      }
+    },
+    "build:packageJson": {
+      "executor": "@nx/js:tsc",
+      "options": {
+        "main": "packages/twenty-server/dist/src/main.js",
+        "tsConfig": "packages/twenty-server/tsconfig.json",
+        "outputPath": "packages/twenty-server/dist",
+        "updateBuildableProjectDepsInPackageJson": true
+      }
+    },
+    "start": {
+      "executor": "nx:run-commands",
+      "dependsOn": ["build"],
+      "options": {
+        "cwd": "packages/twenty-server",
+        "command": "NODE_ENV=development && nest start --watch"
+      }
+    },
+    "start:debug": {
+      "executor": "nx:run-commands",
+      "dependsOn": ["build"],
+      "options": {
+        "cwd": "packages/twenty-server",
+        "command": "nx start --debug"
+      }
+    },
+    "command": {
+      "executor": "nx:run-commands",
+      "dependsOn": ["build"],
+      "options": {
+        "cwd": "packages/twenty-server",
+        "command": "node dist/src/command/command.js"
+      }
+    },
+    "command-no-deps": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "packages/twenty-server",
+        "command": "node dist/src/command/command.js"
+      }
+    },
+    "worker": {
+      "executor": "nx:run-commands",
+      "dependsOn": ["build"],
+      "options": {
+        "cwd": "packages/twenty-server",
+        "command": "node dist/src/queue-worker/queue-worker.js"
+      }
+    },
+    "typeorm": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "packages/twenty-server",
+        "command": "ts-node ../../node_modules/typeorm/cli.js"
+      }
+    },
+    "ts-node": {
+      "executor": "nx:run-commands",
+      "dependsOn": ["build"],
+      "options": {
+        "cwd": "packages/twenty-server",
+        "command": "ts-node"
+      }
+    },
+    "ts-node-no-deps": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "packages/twenty-server",
+        "command": "ts-node"
+      }
+    },
+    "lint": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "packages/twenty-server",
+        "command": "eslint \"src/**/*.ts\" --fix"
+      }
+    },
+    "test:unit": {
+      "executor": "nx:run-commands",
+      "dependsOn": ["build"],
+      "options": {
+        "cwd": "packages/twenty-server",
+        "command": "jest"
+      }
+    },
+    "test:unit:watch": {
+      "executor": "nx:run-commands",
+      "dependsOn": ["build"],
+      "options": {
+        "cwd": "packages/twenty-server",
+        "command": "jest --watch"
+      }
+    },
+    "test:unit:coverage": {
+      "executor": "nx:run-commands",
+      "dependsOn": ["build"],
+      "options": {
+        "cwd": "packages/twenty-server",
+        "command": "jest --coverage"
+      }
+    },
+    "test:unit:debug": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "packages/twenty-server",
+        "command": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register ../../node_modules/.bin/jest --runInBand"
+      }
+    },
+    "test:e2e": {
+      "executor": "nx:run-commands",
+      "dependsOn": ["build"],
+      "options": {
+        "cwd": "packages/twenty-server",
+        "command": "./scripts/run-integration.sh"
+      }
+    },
+    "database:migrate": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "packages/twenty-server",
+        "commands": [
+          "nx typeorm -- migration:run -d src/database/typeorm/metadata/metadata.datasource",
+          "nx typeorm -- migration:run -d src/database/typeorm/core/core.datasource"
+        ],
+        "parallel": false
+      }
+    },
+    "database:reset": {
+      "executor": "nx:run-commands",
+      "dependsOn": ["build"],
+      "options": {
+        "cwd": "packages/twenty-server",
+        "commands": [
+          "nx ts-node-no-deps -- ./scripts/truncate-db.ts",
+          "nx ts-node-no-deps -- ./scripts/setup-db.ts",
+          "nx database:migrate",
+          "nx command-no-deps -- workspace:seed:dev"
+        ],
+        "parallel": false
+      }
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/packages/twenty-server/scripts/render-run.sh b/packages/twenty-server/scripts/render-run.sh
index 09758bfe6b67..056a3c919e96 100755
--- a/packages/twenty-server/scripts/render-run.sh
+++ b/packages/twenty-server/scripts/render-run.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 export PG_DATABASE_URL=postgres://twenty:twenty@$PG_DATABASE_HOST:$PG_DATABASE_PORT/default
-yarn database:setup
+yarn database:init:prod
 node dist/src/main
diff --git a/packages/twenty-server/scripts/run-integration.sh b/packages/twenty-server/scripts/run-integration.sh
index 3673ab813f23..8f48e2178f1c 100755
--- a/packages/twenty-server/scripts/run-integration.sh
+++ b/packages/twenty-server/scripts/run-integration.sh
@@ -4,5 +4,5 @@
 DIR="$(cd "$(dirname "$0")" && pwd)"
 source $DIR/set-env-test.sh
 
-yarn database:init
-yarn jest --config ./test/jest-e2e.json
+yarn nx database:reset
+yarn nx jest --config ./test/jest-e2e.json
diff --git a/packages/twenty-server/scripts/utils.ts b/packages/twenty-server/scripts/utils.ts
index f944c423102a..99dbd4b50892 100644
--- a/packages/twenty-server/scripts/utils.ts
+++ b/packages/twenty-server/scripts/utils.ts
@@ -1,17 +1,11 @@
-import { ConfigService } from '@nestjs/config';
-
 import console from 'console';
 
-import { config } from 'dotenv';
 import { DataSource } from 'typeorm';
 
-config();
-const configService = new ConfigService();
-
 export const connectionSource = new DataSource({
   type: 'postgres',
   logging: false,
-  url: configService.get<string>('PG_DATABASE_URL'),
+  url: process.env.PG_DATABASE_URL,
 });
 
 export const camelToSnakeCase = (str) =>
diff --git a/packages/twenty-server/src/app.module.ts b/packages/twenty-server/src/app.module.ts
index f83638dd1a75..c7af6a6450c9 100644
--- a/packages/twenty-server/src/app.module.ts
+++ b/packages/twenty-server/src/app.module.ts
@@ -1,31 +1,89 @@
-import { Module } from '@nestjs/common';
-import { GraphQLModule } from '@nestjs/graphql';
+import {
+  DynamicModule,
+  MiddlewareConsumer,
+  Module,
+  RequestMethod,
+} from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
+import { ServeStaticModule } from '@nestjs/serve-static';
+import { GraphQLModule } from '@nestjs/graphql';
+import { DevtoolsModule } from '@nestjs/devtools-integration';
 
-import { YogaDriver, YogaDriverConfig } from '@graphql-yoga/nestjs';
+import { existsSync } from 'fs';
+import { join } from 'path';
 
-import { GraphQLConfigService } from 'src/graphql-config/graphql-config.service';
+import { YogaDriverConfig, YogaDriver } from '@graphql-yoga/nestjs';
 
-import { CoreModule } from './core/core.module';
-import { IntegrationsModule } from './integrations/integrations.module';
-import { HealthModule } from './health/health.module';
-import { WorkspaceModule } from './workspace/workspace.module';
-import { GraphQLConfigModule } from './graphql-config/graphql-config.module';
+import { ApiRestModule } from 'src/engine/api/rest/api-rest.module';
+import { ModulesModule } from 'src/modules/modules.module';
+import { CoreGraphQLApiModule } from 'src/engine/api/graphql/core-graphql-api.module';
+import { MetadataGraphQLApiModule } from 'src/engine/api/graphql/metadata-graphql-api.module';
+import { GraphQLConfigModule } from 'src/engine/api/graphql/graphql-config/graphql-config.module';
+import { GraphQLConfigService } from 'src/engine/api/graphql/graphql-config/graphql-config.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { UserWorkspaceMiddleware } from 'src/engine/middlewares/user-workspace.middleware';
+import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+
+import { CoreEngineModule } from './engine/core-modules/core-engine.module';
+import { IntegrationsModule } from './engine/integrations/integrations.module';
 
 @Module({
   imports: [
+    // Nest.js devtools, use devtools.nestjs.com to debug
+    DevtoolsModule.registerAsync({
+      useFactory: (environmentService: EnvironmentService) => ({
+        http: environmentService.get('DEBUG_MODE'),
+        port: environmentService.get('DEBUG_PORT'),
+      }),
+      inject: [EnvironmentService],
+    }),
     ConfigModule.forRoot({
       isGlobal: true,
     }),
     GraphQLModule.forRootAsync<YogaDriverConfig>({
       driver: YogaDriver,
-      imports: [CoreModule, GraphQLConfigModule],
+      imports: [CoreEngineModule, GraphQLConfigModule],
       useClass: GraphQLConfigService,
     }),
-    HealthModule,
+    // Integrations module, contains all the integrations with other services
     IntegrationsModule,
-    CoreModule,
-    WorkspaceModule,
+    // Core engine module, contains all the core modules
+    CoreEngineModule,
+    // Modules module, contains all business logic modules
+    ModulesModule,
+    // Needed for the user workspace middleware
+    WorkspaceCacheVersionModule,
+    // Api modules
+    CoreGraphQLApiModule,
+    MetadataGraphQLApiModule,
+    ApiRestModule,
+    // Conditional modules
+    ...AppModule.getConditionalModules(),
   ],
 })
-export class AppModule {}
+export class AppModule {
+  private static getConditionalModules(): DynamicModule[] {
+    const modules: DynamicModule[] = [];
+    const frontPath = join(__dirname, '..', 'front');
+
+    if (existsSync(frontPath)) {
+      modules.push(
+        ServeStaticModule.forRoot({
+          rootPath: frontPath,
+        }),
+      );
+    }
+
+    return modules;
+  }
+
+  configure(consumer: MiddlewareConsumer) {
+    consumer
+      .apply(UserWorkspaceMiddleware)
+      .forRoutes({ path: 'graphql', method: RequestMethod.ALL });
+
+    consumer
+      .apply(UserWorkspaceMiddleware)
+      .forRoutes({ path: 'metadata', method: RequestMethod.ALL });
+  }
+}
diff --git a/packages/twenty-server/src/app.service.ts b/packages/twenty-server/src/app.service.ts
deleted file mode 100644
index 2849c691283e..000000000000
--- a/packages/twenty-server/src/app.service.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-@Injectable()
-export class AppService {
-  health(): string {
-    return 'Healthy!';
-  }
-}
diff --git a/packages/twenty-server/src/command.module.ts b/packages/twenty-server/src/command.module.ts
deleted file mode 100644
index 99cf3256af2b..000000000000
--- a/packages/twenty-server/src/command.module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { DatabaseCommandModule } from 'src/database/commands/database-command.module';
-import { FetchWorkspaceMessagesCommandsModule } from 'src/workspace/messaging/commands/fetch-workspace-messages-commands.module';
-import { WorkspaceHealthCommandModule } from 'src/workspace/workspace-health/commands/workspace-health-command.module';
-import { WorkspaceCleanerModule } from 'src/workspace/workspace-cleaner/workspace-cleaner.module';
-
-import { AppModule } from './app.module';
-
-import { WorkspaceSyncMetadataCommandsModule } from './workspace/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module';
-import { WorkspaceMigrationRunnerCommandsModule } from './workspace/workspace-migration-runner/commands/workspace-sync-metadata-commands.module';
-
-@Module({
-  imports: [
-    AppModule,
-    WorkspaceSyncMetadataCommandsModule,
-    DatabaseCommandModule,
-    FetchWorkspaceMessagesCommandsModule,
-    WorkspaceCleanerModule,
-    WorkspaceHealthCommandModule,
-    WorkspaceMigrationRunnerCommandsModule,
-  ],
-})
-export class CommandModule {}
diff --git a/packages/twenty-server/src/command.ts b/packages/twenty-server/src/command.ts
deleted file mode 100644
index f811c92be8fa..000000000000
--- a/packages/twenty-server/src/command.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { CommandFactory } from 'nest-commander';
-
-import { CommandModule } from './command.module';
-
-import { LoggerService } from './integrations/logger/logger.service';
-import { ExceptionHandlerService } from './integrations/exception-handler/exception-handler.service';
-import { filterException } from './filters/utils/global-exception-handler.util';
-
-async function bootstrap() {
-  const errorHandler = (err: Error) => {
-    loggerService.error(err?.message, err?.name);
-
-    if (filterException(err)) {
-      return;
-    }
-
-    exceptionHandlerService.captureExceptions([err]);
-  };
-
-  const app = await CommandFactory.createWithoutRunning(CommandModule, {
-    bufferLogs: process.env.LOGGER_IS_BUFFER_ENABLED === 'true',
-    errorHandler,
-    serviceErrorHandler: errorHandler,
-  });
-  const loggerService = app.get(LoggerService);
-  const exceptionHandlerService = app.get(ExceptionHandlerService);
-
-  // Inject our logger
-  app.useLogger(loggerService);
-
-  await CommandFactory.runApplication(app);
-
-  app.close();
-}
-bootstrap();
diff --git a/packages/twenty-server/src/commands/command-logger.ts b/packages/twenty-server/src/command/command-logger.ts
similarity index 77%
rename from packages/twenty-server/src/commands/command-logger.ts
rename to packages/twenty-server/src/command/command-logger.ts
index fa1b3939087f..b78d3b66d7bb 100644
--- a/packages/twenty-server/src/commands/command-logger.ts
+++ b/packages/twenty-server/src/command/command-logger.ts
@@ -9,6 +9,16 @@ import { kebabCase } from 'src/utils/kebab-case';
 export class CommandLogger {
   constructor(private readonly className: string) {}
 
+  async createSubDirectory(subDirectory: string): Promise<void> {
+    const path = `./logs/${kebabCase(this.className)}/${subDirectory}`;
+
+    if (existsSync(path) === false) {
+      await fs.mkdir(path, { recursive: true });
+    }
+
+    return;
+  }
+
   async writeLog(
     fileName: string,
     data: unknown,
diff --git a/packages/twenty-server/src/command/command.module.ts b/packages/twenty-server/src/command/command.module.ts
new file mode 100644
index 000000000000..406a3023052e
--- /dev/null
+++ b/packages/twenty-server/src/command/command.module.ts
@@ -0,0 +1,24 @@
+import { Module } from '@nestjs/common';
+
+import { DatabaseCommandModule } from 'src/database/commands/database-command.module';
+import { MessagingCommandModule } from 'src/modules/messaging/commands/messaging-command.module';
+import { WorkspaceHealthCommandModule } from 'src/engine/workspace-manager/workspace-health/commands/workspace-health-command.module';
+import { WorkspaceCleanerModule } from 'src/engine/workspace-manager/workspace-cleaner/workspace-cleaner.module';
+import { WorkspaceCalendarSyncCommandsModule } from 'src/modules/calendar/commands/workspace-calendar-sync-commands.module';
+import { AppModule } from 'src/app.module';
+import { WorkspaceMigrationRunnerCommandsModule } from 'src/engine/workspace-manager/workspace-migration-runner/commands/workspace-sync-metadata-commands.module';
+import { WorkspaceSyncMetadataCommandsModule } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module';
+
+@Module({
+  imports: [
+    AppModule,
+    WorkspaceSyncMetadataCommandsModule,
+    DatabaseCommandModule,
+    MessagingCommandModule,
+    WorkspaceCalendarSyncCommandsModule,
+    WorkspaceCleanerModule,
+    WorkspaceHealthCommandModule,
+    WorkspaceMigrationRunnerCommandsModule,
+  ],
+})
+export class CommandModule {}
diff --git a/packages/twenty-server/src/command/command.ts b/packages/twenty-server/src/command/command.ts
new file mode 100644
index 000000000000..a099c5943a39
--- /dev/null
+++ b/packages/twenty-server/src/command/command.ts
@@ -0,0 +1,35 @@
+import { CommandFactory } from 'nest-commander';
+
+import { filterException } from 'src/engine/utils/global-exception-handler.util';
+import { ExceptionHandlerService } from 'src/engine/integrations/exception-handler/exception-handler.service';
+import { LoggerService } from 'src/engine/integrations/logger/logger.service';
+
+import { CommandModule } from './command.module';
+
+async function bootstrap() {
+  const errorHandler = (err: Error) => {
+    loggerService.error(err?.message, err?.name);
+
+    if (filterException(err)) {
+      return;
+    }
+
+    exceptionHandlerService.captureExceptions([err]);
+  };
+
+  const app = await CommandFactory.createWithoutRunning(CommandModule, {
+    bufferLogs: process.env.LOGGER_IS_BUFFER_ENABLED === 'true',
+    errorHandler,
+    serviceErrorHandler: errorHandler,
+  });
+  const loggerService = app.get(LoggerService);
+  const exceptionHandlerService = app.get(ExceptionHandlerService);
+
+  // Inject our logger
+  app.useLogger(loggerService);
+
+  await CommandFactory.runApplication(app);
+
+  app.close();
+}
+bootstrap();
diff --git a/packages/twenty-server/src/constants/settings/index.ts b/packages/twenty-server/src/constants/settings/index.ts
deleted file mode 100644
index f3004a280723..000000000000
--- a/packages/twenty-server/src/constants/settings/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Settings } from './interfaces/settings.interface';
-
-export const settings: Settings = {
-  storage: {
-    imageCropSizes: {
-      'profile-picture': ['original'],
-      'workspace-logo': ['original'],
-      'person-picture': ['original'],
-    },
-    maxFileSize: '10MB',
-  },
-};
diff --git a/packages/twenty-server/src/constants/settings/interfaces/settings.interface.ts b/packages/twenty-server/src/constants/settings/interfaces/settings.interface.ts
deleted file mode 100644
index 472c3b3b55af..000000000000
--- a/packages/twenty-server/src/constants/settings/interfaces/settings.interface.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { FileFolder } from 'src/core/file/interfaces/file-folder.interface';
-
-import { ShortCropSize } from 'src/utils/image';
-
-type ValueOfFileFolder = `${FileFolder}`;
-
-export interface Settings {
-  storage: {
-    imageCropSizes: {
-      [key in ValueOfFileFolder]?: ShortCropSize[];
-    };
-    maxFileSize: `${number}MB`;
-  };
-}
diff --git a/packages/twenty-server/src/core/analytics/analytics.resolver.ts b/packages/twenty-server/src/core/analytics/analytics.resolver.ts
deleted file mode 100644
index 880708b3c18a..000000000000
--- a/packages/twenty-server/src/core/analytics/analytics.resolver.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Resolver, Mutation, Args } from '@nestjs/graphql';
-import { UseGuards } from '@nestjs/common';
-
-import { OptionalJwtAuthGuard } from 'src/guards/optional-jwt.auth.guard';
-import { AuthWorkspace } from 'src/decorators/auth/auth-workspace.decorator';
-import { AuthUser } from 'src/decorators/auth/auth-user.decorator';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { User } from 'src/core/user/user.entity';
-
-import { AnalyticsService } from './analytics.service';
-import { Analytics } from './analytics.entity';
-
-import { CreateAnalyticsInput } from './dto/create-analytics.input';
-
-@UseGuards(OptionalJwtAuthGuard)
-@Resolver(() => Analytics)
-export class AnalyticsResolver {
-  constructor(private readonly analyticsService: AnalyticsService) {}
-
-  @Mutation(() => Analytics)
-  createEvent(
-    @Args() createEventInput: CreateAnalyticsInput,
-    @AuthWorkspace() workspace: Workspace | undefined,
-    @AuthUser({ allowUndefined: true }) user: User | undefined,
-  ) {
-    return this.analyticsService.create(createEventInput, user, workspace);
-  }
-}
diff --git a/packages/twenty-server/src/core/analytics/analytics.service.ts b/packages/twenty-server/src/core/analytics/analytics.service.ts
deleted file mode 100644
index 7b6ffb92d360..000000000000
--- a/packages/twenty-server/src/core/analytics/analytics.service.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { HttpService } from '@nestjs/axios';
-
-import { anonymize } from 'src/utils/anonymize';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { User } from 'src/core/user/user.entity';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-
-import { CreateAnalyticsInput } from './dto/create-analytics.input';
-
-@Injectable()
-export class AnalyticsService {
-  constructor(
-    private readonly environmentService: EnvironmentService,
-    private readonly httpService: HttpService,
-  ) {}
-
-  async create(
-    createEventInput: CreateAnalyticsInput,
-    user: User | undefined,
-    workspace: Workspace | undefined,
-  ) {
-    if (!this.environmentService.isTelemetryEnabled()) {
-      return { success: true };
-    }
-
-    const anonymizationEnabled =
-      this.environmentService.isTelemetryAnonymizationEnabled();
-
-    const data = {
-      type: createEventInput.type,
-      data: {
-        userUUID: user
-          ? anonymizationEnabled
-            ? anonymize(user.id)
-            : user.id
-          : undefined,
-        workspaceUUID: workspace
-          ? anonymizationEnabled
-            ? anonymize(workspace.id)
-            : workspace.id
-          : undefined,
-        workspaceDomain: workspace ? workspace.domainName : undefined,
-        ...createEventInput.data,
-      },
-    };
-
-    try {
-      await this.httpService.post('/event?noToken', data);
-    } catch {}
-
-    return { success: true };
-  }
-}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/api-rest-query-builder.factory.spec.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/api-rest-query-builder.factory.spec.ts
deleted file mode 100644
index 2a27133b648c..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/api-rest-query-builder.factory.spec.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-
-import { ApiRestQueryBuilderFactory } from 'src/core/api-rest/api-rest-query-builder/api-rest-query-builder.factory';
-import { DeleteQueryFactory } from 'src/core/api-rest/api-rest-query-builder/factories/delete-query.factory';
-import { CreateQueryFactory } from 'src/core/api-rest/api-rest-query-builder/factories/create-query.factory';
-import { UpdateQueryFactory } from 'src/core/api-rest/api-rest-query-builder/factories/update-query.factory';
-import { FindOneQueryFactory } from 'src/core/api-rest/api-rest-query-builder/factories/find-one-query.factory';
-import { FindManyQueryFactory } from 'src/core/api-rest/api-rest-query-builder/factories/find-many-query.factory';
-import { DeleteVariablesFactory } from 'src/core/api-rest/api-rest-query-builder/factories/delete-variables.factory';
-import { CreateVariablesFactory } from 'src/core/api-rest/api-rest-query-builder/factories/create-variables.factory';
-import { UpdateVariablesFactory } from 'src/core/api-rest/api-rest-query-builder/factories/update-variables.factory';
-import { GetVariablesFactory } from 'src/core/api-rest/api-rest-query-builder/factories/get-variables.factory';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
-import { TokenService } from 'src/core/auth/services/token.service';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-
-describe('ApiRestQueryBuilderFactory', () => {
-  let service: ApiRestQueryBuilderFactory;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        ApiRestQueryBuilderFactory,
-        { provide: DeleteQueryFactory, useValue: {} },
-        { provide: CreateQueryFactory, useValue: {} },
-        { provide: UpdateQueryFactory, useValue: {} },
-        { provide: FindOneQueryFactory, useValue: {} },
-        { provide: FindManyQueryFactory, useValue: {} },
-        { provide: DeleteVariablesFactory, useValue: {} },
-        { provide: CreateVariablesFactory, useValue: {} },
-        { provide: UpdateVariablesFactory, useValue: {} },
-        { provide: GetVariablesFactory, useValue: {} },
-        { provide: ObjectMetadataService, useValue: {} },
-        { provide: TokenService, useValue: {} },
-        { provide: EnvironmentService, useValue: {} },
-      ],
-    }).compile();
-
-    service = module.get<ApiRestQueryBuilderFactory>(
-      ApiRestQueryBuilderFactory,
-    );
-  });
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/api-rest-query-builder.factory.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/api-rest-query-builder.factory.ts
deleted file mode 100644
index 2fa25abfe1e1..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/api-rest-query-builder.factory.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { BadRequestException, Injectable } from '@nestjs/common';
-
-import { Request } from 'express';
-
-import { DeleteQueryFactory } from 'src/core/api-rest/api-rest-query-builder/factories/delete-query.factory';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
-import { TokenService } from 'src/core/auth/services/token.service';
-import { CreateQueryFactory } from 'src/core/api-rest/api-rest-query-builder/factories/create-query.factory';
-import { UpdateQueryFactory } from 'src/core/api-rest/api-rest-query-builder/factories/update-query.factory';
-import { FindOneQueryFactory } from 'src/core/api-rest/api-rest-query-builder/factories/find-one-query.factory';
-import { FindManyQueryFactory } from 'src/core/api-rest/api-rest-query-builder/factories/find-many-query.factory';
-import { DeleteVariablesFactory } from 'src/core/api-rest/api-rest-query-builder/factories/delete-variables.factory';
-import { CreateVariablesFactory } from 'src/core/api-rest/api-rest-query-builder/factories/create-variables.factory';
-import { UpdateVariablesFactory } from 'src/core/api-rest/api-rest-query-builder/factories/update-variables.factory';
-import { GetVariablesFactory } from 'src/core/api-rest/api-rest-query-builder/factories/get-variables.factory';
-import { parsePath } from 'src/core/api-rest/api-rest-query-builder/utils/parse-path.utils';
-import { computeDepth } from 'src/core/api-rest/api-rest-query-builder/utils/compute-depth.utils';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { ApiRestQuery } from 'src/core/api-rest/types/api-rest-query.type';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-
-@Injectable()
-export class ApiRestQueryBuilderFactory {
-  constructor(
-    private readonly deleteQueryFactory: DeleteQueryFactory,
-    private readonly createQueryFactory: CreateQueryFactory,
-    private readonly updateQueryFactory: UpdateQueryFactory,
-    private readonly findOneQueryFactory: FindOneQueryFactory,
-    private readonly findManyQueryFactory: FindManyQueryFactory,
-    private readonly deleteVariablesFactory: DeleteVariablesFactory,
-    private readonly createVariablesFactory: CreateVariablesFactory,
-    private readonly updateVariablesFactory: UpdateVariablesFactory,
-    private readonly getVariablesFactory: GetVariablesFactory,
-    private readonly objectMetadataService: ObjectMetadataService,
-    private readonly tokenService: TokenService,
-    private readonly environmentService: EnvironmentService,
-  ) {}
-
-  async getObjectMetadata(request: Request): Promise<{
-    objectMetadataItems: ObjectMetadataEntity[];
-    objectMetadataItem: ObjectMetadataEntity;
-  }> {
-    const { workspace } = await this.tokenService.validateToken(request);
-
-    const objectMetadataItems =
-      await this.objectMetadataService.findManyWithinWorkspace(workspace.id);
-
-    if (!objectMetadataItems.length) {
-      throw new BadRequestException(
-        `No object was found for the workspace associated with this API key. You may generate a new one here ${this.environmentService.getFrontBaseUrl()}/settings/developers`,
-      );
-    }
-
-    const { object: parsedObject } = parsePath(request);
-
-    const [objectMetadata] = objectMetadataItems.filter(
-      (object) => object.namePlural === parsedObject,
-    );
-
-    if (!objectMetadata) {
-      const [wrongObjectMetadata] = objectMetadataItems.filter(
-        (object) => object.nameSingular === parsedObject,
-      );
-
-      let hint = 'eg: companies';
-
-      if (wrongObjectMetadata) {
-        hint = `Did you mean '${wrongObjectMetadata.namePlural}'?`;
-      }
-
-      throw new BadRequestException(
-        `object '${parsedObject}' not found. ${hint}`,
-      );
-    }
-
-    return {
-      objectMetadataItems,
-      objectMetadataItem: objectMetadata,
-    };
-  }
-
-  async delete(request: Request): Promise<ApiRestQuery> {
-    const objectMetadata = await this.getObjectMetadata(request);
-
-    const { id } = parsePath(request);
-
-    if (!id) {
-      throw new BadRequestException(
-        `delete ${objectMetadata.objectMetadataItem.nameSingular} query invalid. Id missing. eg: /rest/${objectMetadata.objectMetadataItem.namePlural}/0d4389ef-ea9c-4ae8-ada1-1cddc440fb56`,
-      );
-    }
-
-    return {
-      query: this.deleteQueryFactory.create(objectMetadata.objectMetadataItem),
-      variables: this.deleteVariablesFactory.create(id),
-    };
-  }
-
-  async create(request): Promise<ApiRestQuery> {
-    const objectMetadata = await this.getObjectMetadata(request);
-
-    const depth = computeDepth(request);
-
-    return {
-      query: this.createQueryFactory.create(objectMetadata, depth),
-      variables: this.createVariablesFactory.create(request),
-    };
-  }
-
-  async update(request): Promise<ApiRestQuery> {
-    const objectMetadata = await this.getObjectMetadata(request);
-
-    const depth = computeDepth(request);
-
-    const { id } = parsePath(request);
-
-    if (!id) {
-      throw new BadRequestException(
-        `update ${objectMetadata.objectMetadataItem.nameSingular} query invalid. Id missing. eg: /rest/${objectMetadata.objectMetadataItem.namePlural}/0d4389ef-ea9c-4ae8-ada1-1cddc440fb56`,
-      );
-    }
-
-    return {
-      query: this.updateQueryFactory.create(objectMetadata, depth),
-      variables: this.updateVariablesFactory.create(id, request),
-    };
-  }
-
-  async get(request): Promise<ApiRestQuery> {
-    const objectMetadata = await this.getObjectMetadata(request);
-
-    const depth = computeDepth(request);
-
-    const { id } = parsePath(request);
-
-    return {
-      query: id
-        ? this.findOneQueryFactory.create(objectMetadata, depth)
-        : this.findManyQueryFactory.create(objectMetadata, depth),
-      variables: this.getVariablesFactory.create(id, request, objectMetadata),
-    };
-  }
-}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/api-rest-query-builder.module.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/api-rest-query-builder.module.ts
deleted file mode 100644
index 1c73c483894f..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/api-rest-query-builder.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { ApiRestQueryBuilderFactory } from 'src/core/api-rest/api-rest-query-builder/api-rest-query-builder.factory';
-import { apiRestQueryBuilderFactories } from 'src/core/api-rest/api-rest-query-builder/factories/factories';
-import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
-import { AuthModule } from 'src/core/auth/auth.module';
-
-@Module({
-  imports: [ObjectMetadataModule, AuthModule],
-  providers: [...apiRestQueryBuilderFactories, ApiRestQueryBuilderFactory],
-  exports: [ApiRestQueryBuilderFactory],
-})
-export class ApiRestQueryBuilderModule {}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/create-variables.factory.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/create-variables.factory.ts
deleted file mode 100644
index 981e1df2ae62..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/create-variables.factory.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { ApiRestQueryVariables } from 'src/core/api-rest/types/api-rest-query-variables.type';
-
-@Injectable()
-export class CreateVariablesFactory {
-  create(request: Request): ApiRestQueryVariables {
-    return {
-      data: request.body,
-    };
-  }
-}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/delete-variables.factory.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/delete-variables.factory.ts
deleted file mode 100644
index eef62953fe9d..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/delete-variables.factory.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { ApiRestQueryVariables } from 'src/core/api-rest/types/api-rest-query-variables.type';
-
-@Injectable()
-export class DeleteVariablesFactory {
-  create(id: string): ApiRestQueryVariables {
-    return {
-      id: id,
-    };
-  }
-}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/factories.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/factories.ts
deleted file mode 100644
index 3f948058de35..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/factories.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { DeleteQueryFactory } from 'src/core/api-rest/api-rest-query-builder/factories/delete-query.factory';
-import { CreateQueryFactory } from 'src/core/api-rest/api-rest-query-builder/factories/create-query.factory';
-import { UpdateQueryFactory } from 'src/core/api-rest/api-rest-query-builder/factories/update-query.factory';
-import { FindOneQueryFactory } from 'src/core/api-rest/api-rest-query-builder/factories/find-one-query.factory';
-import { FindManyQueryFactory } from 'src/core/api-rest/api-rest-query-builder/factories/find-many-query.factory';
-import { DeleteVariablesFactory } from 'src/core/api-rest/api-rest-query-builder/factories/delete-variables.factory';
-import { CreateVariablesFactory } from 'src/core/api-rest/api-rest-query-builder/factories/create-variables.factory';
-import { UpdateVariablesFactory } from 'src/core/api-rest/api-rest-query-builder/factories/update-variables.factory';
-import { GetVariablesFactory } from 'src/core/api-rest/api-rest-query-builder/factories/get-variables.factory';
-import { LastCursorInputFactory } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/last-cursor-input.factory';
-import { LimitInputFactory } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/limit-input.factory';
-import { OrderByInputFactory } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/order-by-input.factory';
-import { FilterInputFactory } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-input.factory';
-
-export const apiRestQueryBuilderFactories = [
-  DeleteQueryFactory,
-  CreateQueryFactory,
-  UpdateQueryFactory,
-  FindOneQueryFactory,
-  FindManyQueryFactory,
-  DeleteVariablesFactory,
-  CreateVariablesFactory,
-  UpdateVariablesFactory,
-  GetVariablesFactory,
-  LastCursorInputFactory,
-  LimitInputFactory,
-  OrderByInputFactory,
-  FilterInputFactory,
-];
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/find-many-query.factory.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/find-many-query.factory.ts
deleted file mode 100644
index 5c343772164c..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/find-many-query.factory.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { capitalize } from 'src/utils/capitalize';
-import { mapFieldMetadataToGraphqlQuery } from 'src/core/api-rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils';
-
-@Injectable()
-export class FindManyQueryFactory {
-  create(objectMetadata, depth?: number): string {
-    const objectNameSingular = capitalize(
-      objectMetadata.objectMetadataItem.nameSingular,
-    );
-    const objectNamePlural = objectMetadata.objectMetadataItem.namePlural;
-
-    return `
-      query FindMany${capitalize(objectNamePlural)}(
-        $filter: ${objectNameSingular}FilterInput,
-        $orderBy: ${objectNameSingular}OrderByInput,
-        $lastCursor: String,
-        $limit: Float = 60
-        ) {
-        ${objectNamePlural}(
-        filter: $filter, orderBy: $orderBy, first: $limit, after: $lastCursor
-        ) {
-          edges {
-            node {
-              id
-              ${objectMetadata.objectMetadataItem.fields
-                .map((field) =>
-                  mapFieldMetadataToGraphqlQuery(
-                    objectMetadata.objectMetadataItems,
-                    field,
-                    depth,
-                  ),
-                )
-                .join('\n')}
-              }
-            cursor
-          }
-          pageInfo {
-            hasNextPage
-            startCursor
-            endCursor
-          }
-        }
-      }
-    `;
-  }
-}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/find-one-query.factory.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/find-one-query.factory.ts
deleted file mode 100644
index 677bfd76037d..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/find-one-query.factory.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { capitalize } from 'src/utils/capitalize';
-import { mapFieldMetadataToGraphqlQuery } from 'src/core/api-rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils';
-
-@Injectable()
-export class FindOneQueryFactory {
-  create(objectMetadata, depth?: number): string {
-    const objectNameSingular = objectMetadata.objectMetadataItem.nameSingular;
-
-    return `
-      query FindOne${capitalize(objectNameSingular)}(
-        $filter: ${capitalize(objectNameSingular)}FilterInput!,
-        ) {
-        ${objectNameSingular}(filter: $filter) {
-          id
-          ${objectMetadata.objectMetadataItem.fields
-            .map((field) =>
-              mapFieldMetadataToGraphqlQuery(
-                objectMetadata.objectMetadataItems,
-                field,
-                depth,
-              ),
-            )
-            .join('\n')}
-        }
-      }
-    `;
-  }
-}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/get-variables.factory.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/get-variables.factory.ts
deleted file mode 100644
index 12dd51741272..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/get-variables.factory.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { Request } from 'express';
-
-import { LastCursorInputFactory } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/last-cursor-input.factory';
-import { LimitInputFactory } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/limit-input.factory';
-import { OrderByInputFactory } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/order-by-input.factory';
-import { FilterInputFactory } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-input.factory';
-import { ApiRestQueryVariables } from 'src/core/api-rest/types/api-rest-query-variables.type';
-
-@Injectable()
-export class GetVariablesFactory {
-  constructor(
-    private readonly lastCursorInputFactory: LastCursorInputFactory,
-    private readonly limitInputFactory: LimitInputFactory,
-    private readonly orderByInputFactory: OrderByInputFactory,
-    private readonly filterInputFactory: FilterInputFactory,
-  ) {}
-
-  create(
-    id: string | undefined,
-    request: Request,
-    objectMetadata,
-  ): ApiRestQueryVariables {
-    if (id) {
-      return { filter: { id: { eq: id } } };
-    }
-
-    return {
-      filter: this.filterInputFactory.create(request, objectMetadata),
-      orderBy: this.orderByInputFactory.create(request, objectMetadata),
-      limit: this.limitInputFactory.create(request),
-      lastCursor: this.lastCursorInputFactory.create(request),
-    };
-  }
-}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-input.factory.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-input.factory.ts
deleted file mode 100644
index 3a6499ffd82a..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-input.factory.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { Request } from 'express';
-
-import { addDefaultConjunctionIfMissing } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils';
-import { checkFilterQuery } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/check-filter-query.utils';
-import { parseFilter } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils';
-import { FieldValue } from 'src/core/api-rest/types/api-rest-field-value.type';
-
-@Injectable()
-export class FilterInputFactory {
-  create(request: Request, objectMetadata): Record<string, FieldValue> {
-    let filterQuery = request.query.filter;
-
-    if (typeof filterQuery !== 'string') {
-      return {};
-    }
-
-    checkFilterQuery(filterQuery);
-
-    filterQuery = addDefaultConjunctionIfMissing(filterQuery);
-
-    return parseFilter(filterQuery, objectMetadata.objectMetadataItem);
-  }
-}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/add-default-conjunction.utils.spec.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/add-default-conjunction.utils.spec.ts
deleted file mode 100644
index 0b3f0caa8799..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/add-default-conjunction.utils.spec.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { addDefaultConjunctionIfMissing } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils';
-
-describe('addDefaultConjunctionIfMissing', () => {
-  it('should add default conjunction if missing', () => {
-    expect(addDefaultConjunctionIfMissing('field[eq]:1')).toEqual(
-      'and(field[eq]:1)',
-    );
-  });
-
-  it('should not add default conjunction if not missing', () => {
-    expect(addDefaultConjunctionIfMissing('and(field[eq]:1)')).toEqual(
-      'and(field[eq]:1)',
-    );
-  });
-});
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils.ts
deleted file mode 100644
index d1197ad485c3..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Conjunctions } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils';
-
-export const DEFAULT_CONJUNCTION = Conjunctions.and;
-
-export const addDefaultConjunctionIfMissing = (filterQuery: string): string => {
-  if (!(filterQuery.includes('(') && filterQuery.includes(')'))) {
-    return `${DEFAULT_CONJUNCTION}(${filterQuery})`;
-  }
-
-  return filterQuery;
-};
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils.ts
deleted file mode 100644
index 34ac831aa6ed..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { BadRequestException } from '@nestjs/common';
-
-import { parseFilterContent } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter-content.utils';
-import { parseBaseFilter } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-base-filter.utils';
-import {
-  checkFields,
-  getFieldType,
-} from 'src/core/api-rest/api-rest-query-builder/utils/fields.utils';
-import { formatFieldValue } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/format-field-values.utils';
-import { FieldValue } from 'src/core/api-rest/types/api-rest-field-value.type';
-
-export enum Conjunctions {
-  or = 'or',
-  and = 'and',
-  not = 'not',
-}
-
-export const parseFilter = (
-  filterQuery: string,
-  objectMetadataItem,
-): Record<string, FieldValue> => {
-  const result = {};
-  const match = filterQuery.match(
-    `^(${Object.values(Conjunctions).join('|')})((.+))$`,
-  );
-
-  if (match) {
-    const conjunction = match?.[1];
-
-    if (!conjunction) {
-      throw new BadRequestException(
-        'Error while matching filter query. Conjunction not found',
-      );
-    }
-    const subResult = parseFilterContent(filterQuery).map((elem) =>
-      parseFilter(elem, objectMetadataItem),
-    );
-
-    if (conjunction === Conjunctions.not) {
-      if (subResult.length > 1) {
-        throw new BadRequestException(
-          `'filter' invalid. 'not' conjunction should contain only 1 condition. eg: not(field[eq]:1)`,
-        );
-      }
-      result[conjunction] = subResult[0];
-    } else {
-      result[conjunction] = subResult;
-    }
-
-    return result;
-  }
-  const { fields, comparator, value } = parseBaseFilter(filterQuery);
-
-  checkFields(objectMetadataItem, fields);
-  const fieldType = getFieldType(objectMetadataItem, fields[0]);
-  const formattedValue = formatFieldValue(value, fieldType, comparator);
-
-  return fields.reverse().reduce(
-    (acc, currentValue) => {
-      return { [currentValue]: acc };
-    },
-    { [comparator]: formattedValue },
-  );
-};
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/update-variables.factory.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/update-variables.factory.ts
deleted file mode 100644
index 298bdc9eebb4..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/update-variables.factory.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { ApiRestQueryVariables } from 'src/core/api-rest/types/api-rest-query-variables.type';
-
-@Injectable()
-export class UpdateVariablesFactory {
-  create(id: string, request: Request): ApiRestQueryVariables {
-    return {
-      id,
-      data: request.body,
-    };
-  }
-}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/__tests__/fields.utils.spec.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/__tests__/fields.utils.spec.ts
deleted file mode 100644
index 37f344c4d495..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/__tests__/fields.utils.spec.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { objectMetadataItem } from 'src/utils/utils-test/object-metadata-item';
-import {
-  checkFields,
-  getFieldType,
-} from 'src/core/api-rest/api-rest-query-builder/utils/fields.utils';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-describe('FieldUtils', () => {
-  describe('getFieldType', () => {
-    it('should get field type', () => {
-      expect(getFieldType(objectMetadataItem, 'fieldNumber')).toEqual(
-        FieldMetadataType.NUMBER,
-      );
-    });
-  });
-
-  describe('checkFields', () => {
-    it('should check field types', () => {
-      expect(() =>
-        checkFields(objectMetadataItem, ['fieldNumber']),
-      ).not.toThrow();
-
-      expect(() => checkFields(objectMetadataItem, ['wrongField'])).toThrow();
-
-      expect(() =>
-        checkFields(objectMetadataItem, ['fieldNumber', 'wrongField']),
-      ).toThrow();
-    });
-  });
-});
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/__tests__/map-field-metadata-to-graphql-query.utils.spec.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/__tests__/map-field-metadata-to-graphql-query.utils.spec.ts
deleted file mode 100644
index cdd88db4c125..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/__tests__/map-field-metadata-to-graphql-query.utils.spec.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import {
-  fieldCurrency,
-  fieldLink,
-  fieldNumber,
-  fieldString,
-  objectMetadataItem,
-} from 'src/utils/utils-test/object-metadata-item';
-import { mapFieldMetadataToGraphqlQuery } from 'src/core/api-rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils';
-
-describe('mapFieldMetadataToGraphqlQuery', () => {
-  it('should map properly', () => {
-    expect(
-      mapFieldMetadataToGraphqlQuery(objectMetadataItem, fieldNumber),
-    ).toEqual('fieldNumber');
-    expect(
-      mapFieldMetadataToGraphqlQuery(objectMetadataItem, fieldString),
-    ).toEqual('fieldString');
-    expect(mapFieldMetadataToGraphqlQuery(objectMetadataItem, fieldLink))
-      .toEqual(`
-      fieldLink
-      {
-        label
-        url
-      }
-    `);
-    expect(mapFieldMetadataToGraphqlQuery(objectMetadataItem, fieldCurrency))
-      .toEqual(`
-      fieldCurrency
-      {
-        amountMicros
-        currencyCode
-      }
-    `);
-  });
-});
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/fields.utils.ts b/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/fields.utils.ts
deleted file mode 100644
index d5871a5ae842..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/fields.utils.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { BadRequestException } from '@nestjs/common';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-
-export const getFieldType = (
-  objectMetadataItem,
-  fieldName,
-): FieldMetadataType | undefined => {
-  for (const itemField of objectMetadataItem.fields) {
-    if (fieldName === itemField.name) {
-      return itemField.type;
-    }
-  }
-};
-
-export const checkFields = (objectMetadataItem, fieldNames): void => {
-  for (const fieldName of fieldNames) {
-    if (
-      !objectMetadataItem.fields
-        .reduce(
-          (acc, itemField) => [
-            ...acc,
-            itemField.name,
-            ...Object.keys(itemField.targetColumnMap),
-          ],
-          [],
-        )
-        .includes(fieldName)
-    ) {
-      throw new BadRequestException(
-        `field '${fieldName}' does not exist in '${computeObjectTargetTable(
-          objectMetadataItem,
-        )}' object`,
-      );
-    }
-  }
-};
diff --git a/packages/twenty-server/src/core/api-rest/api-rest.module.ts b/packages/twenty-server/src/core/api-rest/api-rest.module.ts
deleted file mode 100644
index bfa91e0eb2b9..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest.module.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Module } from '@nestjs/common';
-import { HttpModule } from '@nestjs/axios';
-
-import { ApiRestController } from 'src/core/api-rest/api-rest.controller';
-import { ApiRestService } from 'src/core/api-rest/api-rest.service';
-import { ApiRestQueryBuilderModule } from 'src/core/api-rest/api-rest-query-builder/api-rest-query-builder.module';
-import { AuthModule } from 'src/core/auth/auth.module';
-import { ApiRestMetadataController } from 'src/core/api-rest/metadata-rest.controller';
-import { ApiRestMetadataService } from 'src/core/api-rest/metadata-rest.service';
-
-@Module({
-  imports: [ApiRestQueryBuilderModule, AuthModule, HttpModule],
-  controllers: [ApiRestMetadataController, ApiRestController],
-  providers: [ApiRestMetadataService, ApiRestService],
-})
-export class ApiRestModule {}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest.service.spec.ts b/packages/twenty-server/src/core/api-rest/api-rest.service.spec.ts
deleted file mode 100644
index 51458d0502b9..000000000000
--- a/packages/twenty-server/src/core/api-rest/api-rest.service.spec.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { HttpService } from '@nestjs/axios';
-
-import { ApiRestService } from 'src/core/api-rest/api-rest.service';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { TokenService } from 'src/core/auth/services/token.service';
-import { ApiRestQueryBuilderFactory } from 'src/core/api-rest/api-rest-query-builder/api-rest-query-builder.factory';
-
-describe('ApiRestService', () => {
-  let service: ApiRestService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        ApiRestService,
-        {
-          provide: ApiRestQueryBuilderFactory,
-          useValue: {},
-        },
-        {
-          provide: EnvironmentService,
-          useValue: {},
-        },
-        {
-          provide: TokenService,
-          useValue: {},
-        },
-        {
-          provide: HttpService,
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    service = module.get<ApiRestService>(ApiRestService);
-  });
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/core/auth/auth.module.ts b/packages/twenty-server/src/core/auth/auth.module.ts
deleted file mode 100644
index c13769645c79..000000000000
--- a/packages/twenty-server/src/core/auth/auth.module.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/* eslint-disable no-restricted-imports */
-import { Module } from '@nestjs/common';
-import { JwtModule } from '@nestjs/jwt';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { HttpModule } from '@nestjs/axios';
-
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { FileModule } from 'src/core/file/file.module';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { User } from 'src/core/user/user.entity';
-import { RefreshToken } from 'src/core/refresh-token/refresh-token.entity';
-import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
-import { UserModule } from 'src/core/user/user.module';
-import { WorkspaceManagerModule } from 'src/workspace/workspace-manager/workspace-manager.module';
-import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { GoogleAuthController } from 'src/core/auth/controllers/google-auth.controller';
-import { GoogleGmailAuthController } from 'src/core/auth/controllers/google-gmail-auth.controller';
-import { VerifyAuthController } from 'src/core/auth/controllers/verify-auth.controller';
-import { TokenService } from 'src/core/auth/services/token.service';
-import { GoogleGmailService } from 'src/core/auth/services/google-gmail.service';
-import { UserWorkspaceModule } from 'src/core/user-workspace/user-workspace.module';
-import { SignUpService } from 'src/core/auth/services/sign-up.service';
-
-import { AuthResolver } from './auth.resolver';
-
-import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';
-import { AuthService } from './services/auth.service';
-const jwtModule = JwtModule.registerAsync({
-  useFactory: async (environmentService: EnvironmentService) => {
-    return {
-      secret: environmentService.getAccessTokenSecret(),
-      signOptions: {
-        expiresIn: environmentService.getAccessTokenExpiresIn(),
-      },
-    };
-  },
-  inject: [EnvironmentService],
-});
-
-@Module({
-  imports: [
-    jwtModule,
-    FileModule,
-    DataSourceModule,
-    UserModule,
-    WorkspaceManagerModule,
-    TypeORMModule,
-    TypeOrmModule.forFeature([Workspace, User, RefreshToken], 'core'),
-    HttpModule,
-    UserWorkspaceModule,
-  ],
-  controllers: [
-    GoogleAuthController,
-    GoogleGmailAuthController,
-    VerifyAuthController,
-  ],
-  providers: [
-    SignUpService,
-    AuthService,
-    TokenService,
-    JwtAuthStrategy,
-    AuthResolver,
-    GoogleGmailService,
-  ],
-  exports: [jwtModule, TokenService],
-})
-export class AuthModule {}
diff --git a/packages/twenty-server/src/core/auth/auth.resolver.spec.ts b/packages/twenty-server/src/core/auth/auth.resolver.spec.ts
deleted file mode 100644
index 6472cd1f0edd..000000000000
--- a/packages/twenty-server/src/core/auth/auth.resolver.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { getRepositoryToken } from '@nestjs/typeorm';
-
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { UserService } from 'src/core/user/services/user.service';
-
-import { AuthResolver } from './auth.resolver';
-
-import { TokenService } from './services/token.service';
-import { AuthService } from './services/auth.service';
-
-describe('AuthResolver', () => {
-  let resolver: AuthResolver;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        AuthResolver,
-        {
-          provide: getRepositoryToken(Workspace, 'core'),
-          useValue: {},
-        },
-        {
-          provide: AuthService,
-          useValue: {},
-        },
-        {
-          provide: TokenService,
-          useValue: {},
-        },
-        {
-          provide: UserService,
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    resolver = module.get<AuthResolver>(AuthResolver);
-  });
-
-  it('should be defined', () => {
-    expect(resolver).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/core/auth/auth.resolver.ts b/packages/twenty-server/src/core/auth/auth.resolver.ts
deleted file mode 100644
index 686fcee98cb6..000000000000
--- a/packages/twenty-server/src/core/auth/auth.resolver.ts
+++ /dev/null
@@ -1,211 +0,0 @@
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-import {
-  BadRequestException,
-  ForbiddenException,
-  InternalServerErrorException,
-  NotFoundException,
-  UseGuards,
-} from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Repository } from 'typeorm';
-
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-import { AuthUser } from 'src/decorators/auth/auth-user.decorator';
-import { assert } from 'src/utils/assert';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { AuthWorkspace } from 'src/decorators/auth/auth-workspace.decorator';
-import { User } from 'src/core/user/user.entity';
-import { ApiKeyTokenInput } from 'src/core/auth/dto/api-key-token.input';
-import { ValidatePasswordResetToken } from 'src/core/auth/dto/validate-password-reset-token.entity';
-import { TransientToken } from 'src/core/auth/dto/transient-token.entity';
-import { UserService } from 'src/core/user/services/user.service';
-import { ValidatePasswordResetTokenInput } from 'src/core/auth/dto/validate-password-reset-token.input';
-import { UpdatePasswordViaResetTokenInput } from 'src/core/auth/dto/update-password-via-reset-token.input';
-import { EmailPasswordResetLink } from 'src/core/auth/dto/email-password-reset-link.entity';
-import { InvalidatePassword } from 'src/core/auth/dto/invalidate-password.entity';
-import { EmailPasswordResetLinkInput } from 'src/core/auth/dto/email-password-reset-link.input';
-
-import { ApiKeyToken, AuthTokens } from './dto/token.entity';
-import { TokenService } from './services/token.service';
-import { RefreshTokenInput } from './dto/refresh-token.input';
-import { Verify } from './dto/verify.entity';
-import { VerifyInput } from './dto/verify.input';
-import { AuthService } from './services/auth.service';
-import { LoginToken } from './dto/login-token.entity';
-import { ChallengeInput } from './dto/challenge.input';
-import { UserExists } from './dto/user-exists.entity';
-import { CheckUserExistsInput } from './dto/user-exists.input';
-import { WorkspaceInviteHashValid } from './dto/workspace-invite-hash-valid.entity';
-import { WorkspaceInviteHashValidInput } from './dto/workspace-invite-hash.input';
-import { SignUpInput } from './dto/sign-up.input';
-import { ImpersonateInput } from './dto/impersonate.input';
-
-@Resolver()
-export class AuthResolver {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    private readonly workspaceRepository: Repository<Workspace>,
-    private authService: AuthService,
-    private tokenService: TokenService,
-    private userService: UserService,
-  ) {}
-
-  @Query(() => UserExists)
-  async checkUserExists(
-    @Args() checkUserExistsInput: CheckUserExistsInput,
-  ): Promise<UserExists> {
-    const { exists } = await this.authService.checkUserExists(
-      checkUserExistsInput.email,
-    );
-
-    return { exists };
-  }
-
-  @Query(() => WorkspaceInviteHashValid)
-  async checkWorkspaceInviteHashIsValid(
-    @Args() workspaceInviteHashValidInput: WorkspaceInviteHashValidInput,
-  ): Promise<WorkspaceInviteHashValid> {
-    return await this.authService.checkWorkspaceInviteHashIsValid(
-      workspaceInviteHashValidInput.inviteHash,
-    );
-  }
-
-  @Query(() => Workspace)
-  async findWorkspaceFromInviteHash(
-    @Args() workspaceInviteHashValidInput: WorkspaceInviteHashValidInput,
-  ) {
-    return await this.workspaceRepository.findOneBy({
-      inviteHash: workspaceInviteHashValidInput.inviteHash,
-    });
-  }
-
-  @Mutation(() => LoginToken)
-  async challenge(@Args() challengeInput: ChallengeInput): Promise<LoginToken> {
-    const user = await this.authService.challenge(challengeInput);
-    const loginToken = await this.tokenService.generateLoginToken(user.email);
-
-    return { loginToken };
-  }
-
-  @Mutation(() => LoginToken)
-  async signUp(@Args() signUpInput: SignUpInput): Promise<LoginToken> {
-    const user = await this.authService.signUp(signUpInput);
-
-    const loginToken = await this.tokenService.generateLoginToken(user.email);
-
-    return { loginToken };
-  }
-
-  @Mutation(() => TransientToken)
-  @UseGuards(JwtAuthGuard)
-  async generateTransientToken(
-    @AuthUser() user: User,
-  ): Promise<TransientToken | void> {
-    const workspaceMember = await this.userService.loadWorkspaceMember(user);
-
-    if (!workspaceMember) {
-      return;
-    }
-    const transientToken = await this.tokenService.generateTransientToken(
-      workspaceMember.id,
-      user.defaultWorkspace.id,
-    );
-
-    return { transientToken };
-  }
-
-  @Mutation(() => Verify)
-  async verify(@Args() verifyInput: VerifyInput): Promise<Verify> {
-    const email = await this.tokenService.verifyLoginToken(
-      verifyInput.loginToken,
-    );
-
-    assert(email, 'Invalid token', ForbiddenException);
-
-    const result = await this.authService.verify(email);
-
-    return result;
-  }
-
-  @Mutation(() => AuthTokens)
-  async renewToken(@Args() args: RefreshTokenInput): Promise<AuthTokens> {
-    if (!args.refreshToken) {
-      throw new BadRequestException('Refresh token is mendatory');
-    }
-
-    const tokens = await this.tokenService.generateTokensFromRefreshToken(
-      args.refreshToken,
-    );
-
-    return { tokens: tokens };
-  }
-
-  @UseGuards(JwtAuthGuard)
-  @Mutation(() => Verify)
-  async impersonate(
-    @Args() impersonateInput: ImpersonateInput,
-    @AuthUser() user: User,
-  ): Promise<Verify> {
-    // Check if user can impersonate
-    assert(user.canImpersonate, 'User cannot impersonate', ForbiddenException);
-
-    return this.authService.impersonate(impersonateInput.userId);
-  }
-
-  @UseGuards(JwtAuthGuard)
-  @Mutation(() => ApiKeyToken)
-  async generateApiKeyToken(
-    @Args() args: ApiKeyTokenInput,
-    @AuthWorkspace() { id: workspaceId }: Workspace,
-  ): Promise<ApiKeyToken | undefined> {
-    return await this.tokenService.generateApiKeyToken(
-      workspaceId,
-      args.apiKeyId,
-      args.expiresAt,
-    );
-  }
-
-  @Mutation(() => EmailPasswordResetLink)
-  async emailPasswordResetLink(
-    @Args() emailPasswordResetInput: EmailPasswordResetLinkInput,
-  ): Promise<EmailPasswordResetLink> {
-    const resetToken = await this.tokenService.generatePasswordResetToken(
-      emailPasswordResetInput.email,
-    );
-
-    return await this.tokenService.sendEmailPasswordResetLink(
-      resetToken,
-      emailPasswordResetInput.email,
-    );
-  }
-
-  @Mutation(() => InvalidatePassword)
-  async updatePasswordViaResetToken(
-    @Args() args: UpdatePasswordViaResetTokenInput,
-  ): Promise<InvalidatePassword> {
-    const { id } = await this.tokenService.validatePasswordResetToken(
-      args.passwordResetToken,
-    );
-
-    assert(id, 'User not found', NotFoundException);
-
-    const { success } = await this.authService.updatePassword(
-      id,
-      args.newPassword,
-    );
-
-    assert(success, 'Password update failed', InternalServerErrorException);
-
-    return await this.tokenService.invalidatePasswordResetToken(id);
-  }
-
-  @Query(() => ValidatePasswordResetToken)
-  async validatePasswordResetToken(
-    @Args() args: ValidatePasswordResetTokenInput,
-  ): Promise<ValidatePasswordResetToken> {
-    return this.tokenService.validatePasswordResetToken(
-      args.passwordResetToken,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/core/auth/auth.util.ts b/packages/twenty-server/src/core/auth/auth.util.ts
deleted file mode 100644
index 6fe8a920b0c5..000000000000
--- a/packages/twenty-server/src/core/auth/auth.util.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import * as bcrypt from 'bcrypt';
-
-export const PASSWORD_REGEX = /^.{8,}$/;
-
-const saltRounds = 10;
-
-export const hashPassword = async (password: string) => {
-  const hash = await bcrypt.hash(password, saltRounds);
-
-  return hash;
-};
-
-export const compareHash = async (password: string, passwordHash: string) => {
-  return bcrypt.compare(password, passwordHash);
-};
diff --git a/packages/twenty-server/src/core/auth/controllers/google-auth.controller.ts b/packages/twenty-server/src/core/auth/controllers/google-auth.controller.ts
deleted file mode 100644
index 396c43ef0286..000000000000
--- a/packages/twenty-server/src/core/auth/controllers/google-auth.controller.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Controller, Get, Req, Res, UseGuards } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Response } from 'express';
-import { Repository } from 'typeorm';
-
-import { GoogleRequest } from 'src/core/auth/strategies/google.auth.strategy';
-import { TokenService } from 'src/core/auth/services/token.service';
-import { GoogleProviderEnabledGuard } from 'src/core/auth/guards/google-provider-enabled.guard';
-import { GoogleOauthGuard } from 'src/core/auth/guards/google-oauth.guard';
-import { User } from 'src/core/user/user.entity';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { AuthService } from 'src/core/auth/services/auth.service';
-import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-
-@Controller('auth/google')
-export class GoogleAuthController {
-  constructor(
-    private readonly tokenService: TokenService,
-    private readonly environmentService: EnvironmentService,
-    private readonly typeORMService: TypeORMService,
-    private readonly authService: AuthService,
-    @InjectRepository(Workspace, 'core')
-    @InjectRepository(User, 'core')
-    private readonly userRepository: Repository<User>,
-  ) {}
-
-  @Get()
-  @UseGuards(GoogleProviderEnabledGuard, GoogleOauthGuard)
-  async googleAuth() {
-    // As this method is protected by Google Auth guard, it will trigger Google SSO flow
-    return;
-  }
-
-  @Get('redirect')
-  @UseGuards(GoogleProviderEnabledGuard, GoogleOauthGuard)
-  async googleAuthRedirect(@Req() req: GoogleRequest, @Res() res: Response) {
-    const { firstName, lastName, email, picture, workspaceInviteHash } =
-      req.user;
-
-    const mainDataSource = this.typeORMService.getMainDataSource();
-
-    const existingUser = await mainDataSource
-      .getRepository(User)
-      .findOneBy({ email: email });
-
-    if (existingUser) {
-      const loginToken = await this.tokenService.generateLoginToken(
-        existingUser.email,
-      );
-
-      return res.redirect(
-        this.tokenService.computeRedirectURI(loginToken.token),
-      );
-    }
-
-    const user = await this.authService.signUp({
-      email,
-      firstName,
-      lastName,
-      picture,
-      workspaceInviteHash,
-    });
-
-    const loginToken = await this.tokenService.generateLoginToken(user.email);
-
-    return res.redirect(this.tokenService.computeRedirectURI(loginToken.token));
-  }
-}
diff --git a/packages/twenty-server/src/core/auth/controllers/google-gmail-auth.controller.ts b/packages/twenty-server/src/core/auth/controllers/google-gmail-auth.controller.ts
deleted file mode 100644
index 7fcfde1a709f..000000000000
--- a/packages/twenty-server/src/core/auth/controllers/google-gmail-auth.controller.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Controller, Get, Req, Res, UseGuards } from '@nestjs/common';
-
-import { Response } from 'express';
-
-import { GoogleGmailProviderEnabledGuard } from 'src/core/auth/guards/google-gmail-provider-enabled.guard';
-import { GoogleGmailOauthGuard } from 'src/core/auth/guards/google-gmail-oauth.guard';
-import { GoogleGmailRequest } from 'src/core/auth/strategies/google-gmail.auth.strategy';
-import { GoogleGmailService } from 'src/core/auth/services/google-gmail.service';
-import { TokenService } from 'src/core/auth/services/token.service';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-
-@Controller('auth/google-gmail')
-export class GoogleGmailAuthController {
-  constructor(
-    private readonly googleGmailService: GoogleGmailService,
-    private readonly tokenService: TokenService,
-    private readonly environmentService: EnvironmentService,
-  ) {}
-
-  @Get()
-  @UseGuards(GoogleGmailProviderEnabledGuard, GoogleGmailOauthGuard)
-  async googleAuth() {
-    // As this method is protected by Google Auth guard, it will trigger Google SSO flow
-    return;
-  }
-
-  @Get('get-access-token')
-  @UseGuards(GoogleGmailProviderEnabledGuard, GoogleGmailOauthGuard)
-  async googleAuthGetAccessToken(
-    @Req() req: GoogleGmailRequest,
-    @Res() res: Response,
-  ) {
-    const { user } = req;
-
-    const { email, accessToken, refreshToken, transientToken } = user;
-
-    const { workspaceMemberId, workspaceId } =
-      await this.tokenService.verifyTransientToken(transientToken);
-
-    const demoWorkspaceIds = this.environmentService.getDemoWorkspaceIds();
-
-    if (demoWorkspaceIds.includes(workspaceId)) {
-      throw new Error('Cannot connect Gmail account to demo workspace');
-    }
-
-    if (!workspaceId) {
-      throw new Error('Workspace not found');
-    }
-
-    if (workspaceId)
-      await this.googleGmailService.saveConnectedAccount({
-        handle: email,
-        workspaceMemberId: workspaceMemberId,
-        workspaceId: workspaceId,
-        provider: 'gmail',
-        accessToken,
-        refreshToken,
-      });
-
-    return res.redirect(
-      `${this.environmentService.getFrontBaseUrl()}/settings/accounts`,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/core/auth/controllers/verify-auth.controller.ts b/packages/twenty-server/src/core/auth/controllers/verify-auth.controller.ts
deleted file mode 100644
index b427ad9744a9..000000000000
--- a/packages/twenty-server/src/core/auth/controllers/verify-auth.controller.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Body, Controller, Post } from '@nestjs/common';
-
-import { AuthService } from 'src/core/auth/services/auth.service';
-import { VerifyInput } from 'src/core/auth/dto/verify.input';
-import { Verify } from 'src/core/auth/dto/verify.entity';
-import { TokenService } from 'src/core/auth/services/token.service';
-
-@Controller('auth/verify')
-export class VerifyAuthController {
-  constructor(
-    private readonly authService: AuthService,
-    private readonly tokenService: TokenService,
-  ) {}
-
-  @Post()
-  async verify(@Body() verifyInput: VerifyInput): Promise<Verify> {
-    const email = await this.tokenService.verifyLoginToken(
-      verifyInput.loginToken,
-    );
-    const result = await this.authService.verify(email);
-
-    return result;
-  }
-}
diff --git a/packages/twenty-server/src/core/auth/dto/refresh-token.input.ts b/packages/twenty-server/src/core/auth/dto/refresh-token.input.ts
deleted file mode 100644
index efc69d2b2e08..000000000000
--- a/packages/twenty-server/src/core/auth/dto/refresh-token.input.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { ArgsType, Field } from '@nestjs/graphql';
-
-import { IsNotEmpty, IsString } from 'class-validator';
-
-@ArgsType()
-export class RefreshTokenInput {
-  @Field(() => String)
-  @IsNotEmpty()
-  @IsString()
-  refreshToken: string;
-}
diff --git a/packages/twenty-server/src/core/auth/dto/save-connected-account.ts b/packages/twenty-server/src/core/auth/dto/save-connected-account.ts
deleted file mode 100644
index f4f5f389affc..000000000000
--- a/packages/twenty-server/src/core/auth/dto/save-connected-account.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { ArgsType, Field } from '@nestjs/graphql';
-
-import { IsNotEmpty, IsString } from 'class-validator';
-
-@ArgsType()
-export class SaveConnectedAccountInput {
-  @Field(() => String)
-  @IsNotEmpty()
-  @IsString()
-  handle: string;
-
-  @Field(() => String)
-  @IsNotEmpty()
-  @IsString()
-  workspaceMemberId: string;
-
-  @Field(() => String)
-  @IsNotEmpty()
-  @IsString()
-  workspaceId: string;
-
-  @Field(() => String)
-  @IsNotEmpty()
-  @IsString()
-  provider: string;
-
-  @Field(() => String)
-  @IsNotEmpty()
-  @IsString()
-  accessToken: string;
-
-  @Field(() => String)
-  @IsNotEmpty()
-  @IsString()
-  refreshToken: string;
-}
diff --git a/packages/twenty-server/src/core/auth/guards/google-gmail-oauth.guard.ts b/packages/twenty-server/src/core/auth/guards/google-gmail-oauth.guard.ts
deleted file mode 100644
index c35120523e33..000000000000
--- a/packages/twenty-server/src/core/auth/guards/google-gmail-oauth.guard.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { ExecutionContext, Injectable } from '@nestjs/common';
-import { AuthGuard } from '@nestjs/passport';
-
-@Injectable()
-export class GoogleGmailOauthGuard extends AuthGuard('google-gmail') {
-  constructor() {
-    super({
-      prompt: 'select_account',
-    });
-  }
-
-  async canActivate(context: ExecutionContext) {
-    try {
-      const request = context.switchToHttp().getRequest();
-      const transientToken = request.query.transientToken;
-
-      if (transientToken && typeof transientToken === 'string') {
-        request.params.transientToken = transientToken;
-      }
-      const activate = (await super.canActivate(context)) as boolean;
-
-      return activate;
-    } catch (ex) {
-      throw ex;
-    }
-  }
-}
diff --git a/packages/twenty-server/src/core/auth/guards/google-gmail-provider-enabled.guard.ts b/packages/twenty-server/src/core/auth/guards/google-gmail-provider-enabled.guard.ts
deleted file mode 100644
index d5ea0e292de8..000000000000
--- a/packages/twenty-server/src/core/auth/guards/google-gmail-provider-enabled.guard.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Injectable, CanActivate, NotFoundException } from '@nestjs/common';
-
-import { Observable } from 'rxjs';
-
-import { GoogleGmailStrategy } from 'src/core/auth/strategies/google-gmail.auth.strategy';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-
-@Injectable()
-export class GoogleGmailProviderEnabledGuard implements CanActivate {
-  constructor(private readonly environmentService: EnvironmentService) {}
-
-  canActivate(): boolean | Promise<boolean> | Observable<boolean> {
-    if (!this.environmentService.isMessagingProviderGmailEnabled()) {
-      throw new NotFoundException('Gmail auth is not enabled');
-    }
-
-    new GoogleGmailStrategy(this.environmentService);
-
-    return true;
-  }
-}
diff --git a/packages/twenty-server/src/core/auth/guards/google-provider-enabled.guard.ts b/packages/twenty-server/src/core/auth/guards/google-provider-enabled.guard.ts
deleted file mode 100644
index b6095fc95ebd..000000000000
--- a/packages/twenty-server/src/core/auth/guards/google-provider-enabled.guard.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Injectable, CanActivate, NotFoundException } from '@nestjs/common';
-
-import { Observable } from 'rxjs';
-
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { GoogleStrategy } from 'src/core/auth/strategies/google.auth.strategy';
-
-@Injectable()
-export class GoogleProviderEnabledGuard implements CanActivate {
-  constructor(private readonly environmentService: EnvironmentService) {}
-
-  canActivate(): boolean | Promise<boolean> | Observable<boolean> {
-    if (!this.environmentService.isAuthGoogleEnabled()) {
-      throw new NotFoundException('Google auth is not enabled');
-    }
-
-    new GoogleStrategy(this.environmentService);
-
-    return true;
-  }
-}
diff --git a/packages/twenty-server/src/core/auth/services/auth.service.spec.ts b/packages/twenty-server/src/core/auth/services/auth.service.spec.ts
deleted file mode 100644
index 696dae69014d..000000000000
--- a/packages/twenty-server/src/core/auth/services/auth.service.spec.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { getRepositoryToken } from '@nestjs/typeorm';
-
-import { UserService } from 'src/core/user/services/user.service';
-import { WorkspaceManagerService } from 'src/workspace/workspace-manager/workspace-manager.service';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { User } from 'src/core/user/user.entity';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { EmailService } from 'src/integrations/email/email.service';
-import { SignUpService } from 'src/core/auth/services/sign-up.service';
-
-import { AuthService } from './auth.service';
-import { TokenService } from './token.service';
-
-describe('AuthService', () => {
-  let service: AuthService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        AuthService,
-        {
-          provide: TokenService,
-          useValue: {},
-        },
-        {
-          provide: UserService,
-          useValue: {},
-        },
-        {
-          provide: SignUpService,
-          useValue: {},
-        },
-        {
-          provide: WorkspaceManagerService,
-          useValue: {},
-        },
-        {
-          provide: getRepositoryToken(Workspace, 'core'),
-          useValue: {},
-        },
-        {
-          provide: getRepositoryToken(User, 'core'),
-          useValue: {},
-        },
-        {
-          provide: EnvironmentService,
-          useValue: {},
-        },
-        {
-          provide: EmailService,
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    service = module.get<AuthService>(AuthService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/core/auth/services/auth.service.ts b/packages/twenty-server/src/core/auth/services/auth.service.ts
deleted file mode 100644
index 18ac914fb5cd..000000000000
--- a/packages/twenty-server/src/core/auth/services/auth.service.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-import {
-  BadRequestException,
-  ForbiddenException,
-  Injectable,
-  NotFoundException,
-} from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Repository } from 'typeorm';
-import { render } from '@react-email/components';
-import { PasswordUpdateNotifyEmail } from 'twenty-emails';
-
-import { ChallengeInput } from 'src/core/auth/dto/challenge.input';
-import { assert } from 'src/utils/assert';
-import {
-  PASSWORD_REGEX,
-  compareHash,
-  hashPassword,
-} from 'src/core/auth/auth.util';
-import { Verify } from 'src/core/auth/dto/verify.entity';
-import { UserExists } from 'src/core/auth/dto/user-exists.entity';
-import { WorkspaceInviteHashValid } from 'src/core/auth/dto/workspace-invite-hash-valid.entity';
-import { User } from 'src/core/user/user.entity';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { UserService } from 'src/core/user/services/user.service';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { EmailService } from 'src/integrations/email/email.service';
-import { UpdatePassword } from 'src/core/auth/dto/update-password.entity';
-import { SignUpService } from 'src/core/auth/services/sign-up.service';
-
-import { TokenService } from './token.service';
-
-export type UserPayload = {
-  firstName: string;
-  lastName: string;
-  email: string;
-};
-
-@Injectable()
-export class AuthService {
-  constructor(
-    private readonly tokenService: TokenService,
-    private readonly userService: UserService,
-    private readonly signUpService: SignUpService,
-    @InjectRepository(Workspace, 'core')
-    private readonly workspaceRepository: Repository<Workspace>,
-    @InjectRepository(User, 'core')
-    private readonly userRepository: Repository<User>,
-    private readonly environmentService: EnvironmentService,
-    private readonly emailService: EmailService,
-  ) {}
-
-  async challenge(challengeInput: ChallengeInput) {
-    const user = await this.userRepository.findOneBy({
-      email: challengeInput.email,
-    });
-
-    assert(user, "This user doesn't exist", NotFoundException);
-    assert(user.passwordHash, 'Incorrect login method', ForbiddenException);
-
-    const isValid = await compareHash(
-      challengeInput.password,
-      user.passwordHash,
-    );
-
-    assert(isValid, 'Wrong password', ForbiddenException);
-
-    return user;
-  }
-
-  async signUp({
-    email,
-    password,
-    workspaceInviteHash,
-    firstName,
-    lastName,
-    picture,
-  }: {
-    email: string;
-    password?: string;
-    firstName?: string | null;
-    lastName?: string | null;
-    workspaceInviteHash?: string | null;
-    picture?: string | null;
-  }) {
-    return await this.signUpService.signUp({
-      email,
-      password,
-      firstName,
-      lastName,
-      workspaceInviteHash,
-      picture,
-    });
-  }
-
-  async verify(email: string): Promise<Verify> {
-    const user = await this.userRepository.findOne({
-      where: {
-        email,
-      },
-      relations: ['defaultWorkspace'],
-    });
-
-    assert(user, "This user doesn't exist", NotFoundException);
-
-    assert(
-      user.defaultWorkspace,
-      'User has no default workspace',
-      NotFoundException,
-    );
-
-    // passwordHash is hidden for security reasons
-    user.passwordHash = '';
-    const workspaceMember = await this.userService.loadWorkspaceMember(user);
-
-    if (workspaceMember) {
-      user.workspaceMember = workspaceMember;
-    }
-
-    const accessToken = await this.tokenService.generateAccessToken(user.id);
-    const refreshToken = await this.tokenService.generateRefreshToken(user.id);
-
-    return {
-      user,
-      tokens: {
-        accessToken,
-        refreshToken,
-      },
-    };
-  }
-
-  async checkUserExists(email: string): Promise<UserExists> {
-    const user = await this.userRepository.findOneBy({
-      email,
-    });
-
-    return { exists: !!user };
-  }
-
-  async checkWorkspaceInviteHashIsValid(
-    inviteHash: string,
-  ): Promise<WorkspaceInviteHashValid> {
-    const workspace = await this.workspaceRepository.findOneBy({
-      inviteHash,
-    });
-
-    return { isValid: !!workspace };
-  }
-
-  async impersonate(userId: string) {
-    const user = await this.userRepository.findOne({
-      where: {
-        id: userId,
-      },
-      relations: ['defaultWorkspace'],
-    });
-
-    assert(user, "This user doesn't exist", NotFoundException);
-
-    if (!user.defaultWorkspace.allowImpersonation) {
-      throw new ForbiddenException('Impersonation not allowed');
-    }
-
-    const accessToken = await this.tokenService.generateAccessToken(user.id);
-    const refreshToken = await this.tokenService.generateRefreshToken(user.id);
-
-    return {
-      user,
-      tokens: {
-        accessToken,
-        refreshToken,
-      },
-    };
-  }
-
-  async updatePassword(
-    userId: string,
-    newPassword: string,
-  ): Promise<UpdatePassword> {
-    const user = await this.userRepository.findOneBy({ id: userId });
-
-    assert(user, 'User not found', NotFoundException);
-
-    const isPasswordValid = PASSWORD_REGEX.test(newPassword);
-
-    assert(isPasswordValid, 'Password too weak', BadRequestException);
-
-    const newPasswordHash = await hashPassword(newPassword);
-
-    await this.userRepository.update(userId, {
-      passwordHash: newPasswordHash,
-    });
-
-    const emailTemplate = PasswordUpdateNotifyEmail({
-      userName: `${user.firstName} ${user.lastName}`,
-      email: user.email,
-      link: this.environmentService.getFrontBaseUrl(),
-    });
-
-    const html = render(emailTemplate, {
-      pretty: true,
-    });
-    const text = render(emailTemplate, {
-      plainText: true,
-    });
-
-    this.emailService.send({
-      from: `${this.environmentService.getEmailFromName()} <${this.environmentService.getEmailFromAddress()}>`,
-      to: user.email,
-      subject: 'Your Password Has Been Successfully Changed',
-      text,
-      html,
-    });
-
-    return { success: true };
-  }
-}
diff --git a/packages/twenty-server/src/core/auth/services/google-gmail.service.ts b/packages/twenty-server/src/core/auth/services/google-gmail.service.ts
deleted file mode 100644
index 25e33c208e7a..000000000000
--- a/packages/twenty-server/src/core/auth/services/google-gmail.service.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { ConflictException, Inject, Injectable } from '@nestjs/common';
-
-import { v4 } from 'uuid';
-
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
-import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { SaveConnectedAccountInput } from 'src/core/auth/dto/save-connected-account';
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import {
-  GmailFullSyncJob,
-  GmailFullSyncJobData,
-} from 'src/workspace/messaging/jobs/gmail-full-sync.job';
-
-@Injectable()
-export class GoogleGmailService {
-  constructor(
-    private readonly dataSourceService: DataSourceService,
-    private readonly typeORMService: TypeORMService,
-    @Inject(MessageQueue.messagingQueue)
-    private readonly messageQueueService: MessageQueueService,
-  ) {}
-
-  providerName = 'google';
-
-  async saveConnectedAccount(
-    saveConnectedAccountInput: SaveConnectedAccountInput,
-  ) {
-    const {
-      handle,
-      workspaceId,
-      accessToken,
-      refreshToken,
-      workspaceMemberId,
-    } = saveConnectedAccountInput;
-
-    const dataSourceMetadata =
-      await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
-        workspaceId,
-      );
-
-    const workspaceDataSource =
-      await this.typeORMService.connectToDataSource(dataSourceMetadata);
-
-    const connectedAccount = await workspaceDataSource?.query(
-      `SELECT * FROM ${dataSourceMetadata.schema}."connectedAccount" WHERE "handle" = $1 AND "provider" = $2 AND "accountOwnerId" = $3`,
-      [handle, this.providerName, workspaceMemberId],
-    );
-
-    if (connectedAccount.length > 0) {
-      throw new ConflictException('Connected account already exists');
-    }
-
-    const connectedAccountId = v4();
-
-    await workspaceDataSource?.transaction(async (manager) => {
-      await manager.query(
-        `INSERT INTO ${dataSourceMetadata.schema}."connectedAccount" ("id", "handle", "provider", "accessToken", "refreshToken", "accountOwnerId") VALUES ($1, $2, $3, $4, $5, $6)`,
-        [
-          connectedAccountId,
-          handle,
-          this.providerName,
-          accessToken,
-          refreshToken,
-          workspaceMemberId,
-        ],
-      );
-
-      await manager.query(
-        `INSERT INTO ${dataSourceMetadata.schema}."messageChannel" ("visibility", "handle", "connectedAccountId", "type") VALUES ($1, $2, $3, $4)`,
-        ['share_everything', handle, connectedAccountId, 'email'],
-      );
-    });
-
-    await this.messageQueueService.add<GmailFullSyncJobData>(
-      GmailFullSyncJob.name,
-      {
-        workspaceId,
-        connectedAccountId,
-      },
-      {
-        id: connectedAccountId,
-        retryLimit: 2,
-      },
-    );
-
-    return;
-  }
-}
diff --git a/packages/twenty-server/src/core/auth/services/sign-up.service.spec.ts b/packages/twenty-server/src/core/auth/services/sign-up.service.spec.ts
deleted file mode 100644
index a4423a7fb9a6..000000000000
--- a/packages/twenty-server/src/core/auth/services/sign-up.service.spec.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { getRepositoryToken } from '@nestjs/typeorm';
-import { HttpService } from '@nestjs/axios';
-
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { User } from 'src/core/user/user.entity';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { SignUpService } from 'src/core/auth/services/sign-up.service';
-import { FileUploadService } from 'src/core/file/services/file-upload.service';
-import { UserWorkspaceService } from 'src/core/user-workspace/user-workspace.service';
-
-describe('SignUpService', () => {
-  let service: SignUpService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        SignUpService,
-        {
-          provide: FileUploadService,
-          useValue: {},
-        },
-        {
-          provide: UserWorkspaceService,
-          useValue: {},
-        },
-        {
-          provide: getRepositoryToken(Workspace, 'core'),
-          useValue: {},
-        },
-        {
-          provide: getRepositoryToken(User, 'core'),
-          useValue: {},
-        },
-        {
-          provide: EnvironmentService,
-          useValue: {},
-        },
-        {
-          provide: HttpService,
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    service = module.get<SignUpService>(SignUpService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/core/auth/services/token.service.spec.ts b/packages/twenty-server/src/core/auth/services/token.service.spec.ts
deleted file mode 100644
index 709799bcfe32..000000000000
--- a/packages/twenty-server/src/core/auth/services/token.service.spec.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { JwtService } from '@nestjs/jwt';
-import { getRepositoryToken } from '@nestjs/typeorm';
-
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { RefreshToken } from 'src/core/refresh-token/refresh-token.entity';
-import { User } from 'src/core/user/user.entity';
-import { JwtAuthStrategy } from 'src/core/auth/strategies/jwt.auth.strategy';
-import { EmailService } from 'src/integrations/email/email.service';
-
-import { TokenService } from './token.service';
-
-describe('TokenService', () => {
-  let service: TokenService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        TokenService,
-        {
-          provide: JwtService,
-          useValue: {},
-        },
-        {
-          provide: JwtAuthStrategy,
-          useValue: {},
-        },
-        {
-          provide: EnvironmentService,
-          useValue: {},
-        },
-        {
-          provide: EmailService,
-          useValue: {},
-        },
-        {
-          provide: getRepositoryToken(User, 'core'),
-          useValue: {},
-        },
-        {
-          provide: getRepositoryToken(RefreshToken, 'core'),
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    service = module.get<TokenService>(TokenService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/core/auth/services/token.service.ts b/packages/twenty-server/src/core/auth/services/token.service.ts
deleted file mode 100644
index 0c27dc043371..000000000000
--- a/packages/twenty-server/src/core/auth/services/token.service.ts
+++ /dev/null
@@ -1,474 +0,0 @@
-import {
-  BadRequestException,
-  ForbiddenException,
-  Injectable,
-  InternalServerErrorException,
-  NotFoundException,
-  UnauthorizedException,
-  UnprocessableEntityException,
-} from '@nestjs/common';
-import { JwtService } from '@nestjs/jwt';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import crypto from 'crypto';
-
-import { addMilliseconds, differenceInMilliseconds, isFuture } from 'date-fns';
-import ms from 'ms';
-import { JsonWebTokenError, TokenExpiredError } from 'jsonwebtoken';
-import { Repository } from 'typeorm';
-import { Request } from 'express';
-import { ExtractJwt } from 'passport-jwt';
-import { render } from '@react-email/render';
-import { PasswordResetLinkEmail } from 'twenty-emails';
-
-import {
-  JwtAuthStrategy,
-  JwtPayload,
-} from 'src/core/auth/strategies/jwt.auth.strategy';
-import { assert } from 'src/utils/assert';
-import {
-  ApiKeyToken,
-  AuthToken,
-  PasswordResetToken,
-} from 'src/core/auth/dto/token.entity';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { User } from 'src/core/user/user.entity';
-import { RefreshToken } from 'src/core/refresh-token/refresh-token.entity';
-import { ValidatePasswordResetToken } from 'src/core/auth/dto/validate-password-reset-token.entity';
-import { EmailService } from 'src/integrations/email/email.service';
-import { InvalidatePassword } from 'src/core/auth/dto/invalidate-password.entity';
-import { EmailPasswordResetLink } from 'src/core/auth/dto/email-password-reset-link.entity';
-import { JwtData } from 'src/core/auth/types/jwt-data.type';
-
-@Injectable()
-export class TokenService {
-  constructor(
-    private readonly jwtService: JwtService,
-    private readonly jwtStrategy: JwtAuthStrategy,
-    private readonly environmentService: EnvironmentService,
-    @InjectRepository(User, 'core')
-    private readonly userRepository: Repository<User>,
-    @InjectRepository(RefreshToken, 'core')
-    private readonly refreshTokenRepository: Repository<RefreshToken>,
-    private readonly emailService: EmailService,
-  ) {}
-
-  async generateAccessToken(userId: string): Promise<AuthToken> {
-    const expiresIn = this.environmentService.getAccessTokenExpiresIn();
-
-    assert(expiresIn, '', InternalServerErrorException);
-    const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
-
-    const user = await this.userRepository.findOne({
-      where: { id: userId },
-      relations: ['defaultWorkspace'],
-    });
-
-    if (!user) {
-      throw new NotFoundException('User is not found');
-    }
-
-    if (!user.defaultWorkspace) {
-      throw new NotFoundException('User does not have a default workspace');
-    }
-
-    const jwtPayload: JwtPayload = {
-      sub: user.id,
-      workspaceId: user.defaultWorkspace.id,
-    };
-
-    return {
-      token: this.jwtService.sign(jwtPayload),
-      expiresAt,
-    };
-  }
-
-  async generateRefreshToken(userId: string): Promise<AuthToken> {
-    const secret = this.environmentService.getRefreshTokenSecret();
-    const expiresIn = this.environmentService.getRefreshTokenExpiresIn();
-
-    assert(expiresIn, '', InternalServerErrorException);
-    const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
-
-    const refreshTokenPayload = {
-      userId,
-      expiresAt,
-    };
-    const jwtPayload = {
-      sub: userId,
-    };
-
-    const refreshToken =
-      this.refreshTokenRepository.create(refreshTokenPayload);
-
-    await this.refreshTokenRepository.save(refreshToken);
-
-    return {
-      token: this.jwtService.sign(jwtPayload, {
-        secret,
-        expiresIn,
-        // Jwtid will be used to link RefreshToken entity to this token
-        jwtid: refreshToken.id,
-      }),
-      expiresAt,
-    };
-  }
-
-  async generateLoginToken(email: string): Promise<AuthToken> {
-    const secret = this.environmentService.getLoginTokenSecret();
-    const expiresIn = this.environmentService.getLoginTokenExpiresIn();
-
-    assert(expiresIn, '', InternalServerErrorException);
-    const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
-    const jwtPayload = {
-      sub: email,
-    };
-
-    return {
-      token: this.jwtService.sign(jwtPayload, {
-        secret,
-        expiresIn,
-      }),
-      expiresAt,
-    };
-  }
-
-  async generateTransientToken(
-    workspaceMemberId: string,
-    workspaceId: string,
-  ): Promise<AuthToken> {
-    const secret = this.environmentService.getLoginTokenSecret();
-    const expiresIn = this.environmentService.getTransientTokenExpiresIn();
-
-    assert(expiresIn, '', InternalServerErrorException);
-    const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
-    const jwtPayload = {
-      sub: workspaceMemberId,
-      workspaceId,
-    };
-
-    return {
-      token: this.jwtService.sign(jwtPayload, {
-        secret,
-        expiresIn,
-      }),
-      expiresAt,
-    };
-  }
-
-  async generateApiKeyToken(
-    workspaceId: string,
-    apiKeyId?: string,
-    expiresAt?: Date | string,
-  ): Promise<Pick<ApiKeyToken, 'token'> | undefined> {
-    if (!apiKeyId) {
-      return;
-    }
-    const jwtPayload = {
-      sub: workspaceId,
-    };
-    const secret = this.environmentService.getAccessTokenSecret();
-    let expiresIn: string | number;
-
-    if (expiresAt) {
-      expiresIn = Math.floor(
-        (new Date(expiresAt).getTime() - new Date().getTime()) / 1000,
-      );
-    } else {
-      expiresIn = this.environmentService.getApiTokenExpiresIn();
-    }
-    const token = this.jwtService.sign(jwtPayload, {
-      secret,
-      expiresIn,
-      jwtid: apiKeyId,
-    });
-
-    return { token };
-  }
-
-  isTokenPresent(request: Request): boolean {
-    const token = ExtractJwt.fromAuthHeaderAsBearerToken()(request);
-
-    return !!token;
-  }
-
-  async validateToken(request: Request): Promise<JwtData> {
-    const token = ExtractJwt.fromAuthHeaderAsBearerToken()(request);
-
-    if (!token) {
-      throw new UnauthorizedException('missing authentication token');
-    }
-    const decoded = await this.verifyJwt(
-      token,
-      this.environmentService.getAccessTokenSecret(),
-    );
-
-    const { user, workspace } = await this.jwtStrategy.validate(
-      decoded as JwtPayload,
-    );
-
-    return { user, workspace };
-  }
-
-  async verifyLoginToken(loginToken: string): Promise<string> {
-    const loginTokenSecret = this.environmentService.getLoginTokenSecret();
-
-    const payload = await this.verifyJwt(loginToken, loginTokenSecret);
-
-    return payload.sub;
-  }
-
-  async verifyTransientToken(transientToken: string): Promise<{
-    workspaceMemberId: string;
-    workspaceId: string;
-  }> {
-    const transientTokenSecret = this.environmentService.getLoginTokenSecret();
-
-    const payload = await this.verifyJwt(transientToken, transientTokenSecret);
-
-    return {
-      workspaceMemberId: payload.sub,
-      workspaceId: payload.workspaceId,
-    };
-  }
-
-  async verifyRefreshToken(refreshToken: string) {
-    const secret = this.environmentService.getRefreshTokenSecret();
-    const coolDown = this.environmentService.getRefreshTokenCoolDown();
-    const jwtPayload = await this.verifyJwt(refreshToken, secret);
-
-    assert(
-      jwtPayload.jti && jwtPayload.sub,
-      'This refresh token is malformed',
-      UnprocessableEntityException,
-    );
-
-    const token = await this.refreshTokenRepository.findOneBy({
-      id: jwtPayload.jti,
-    });
-
-    assert(token, "This refresh token doesn't exist", NotFoundException);
-
-    const user = await this.userRepository.findOneBy({
-      id: jwtPayload.sub,
-    });
-
-    assert(user, 'User not found', NotFoundException);
-
-    // Check if revokedAt is less than coolDown
-    if (
-      token.revokedAt &&
-      token.revokedAt.getTime() <= Date.now() - ms(coolDown)
-    ) {
-      // Revoke all user refresh tokens
-      await Promise.all(
-        user.refreshTokens.map(
-          async ({ id }) =>
-            await this.refreshTokenRepository.update(
-              { id },
-              {
-                revokedAt: new Date(),
-              },
-            ),
-        ),
-      );
-
-      throw new ForbiddenException(
-        'Suspicious activity detected, this refresh token has been revoked. All tokens has been revoked.',
-      );
-    }
-
-    return { user, token };
-  }
-
-  async generateTokensFromRefreshToken(token: string): Promise<{
-    accessToken: AuthToken;
-    refreshToken: AuthToken;
-  }> {
-    const {
-      user,
-      token: { id },
-    } = await this.verifyRefreshToken(token);
-
-    // Revoke old refresh token
-    await this.refreshTokenRepository.update(
-      {
-        id,
-      },
-      {
-        revokedAt: new Date(),
-      },
-    );
-
-    const accessToken = await this.generateAccessToken(user.id);
-    const refreshToken = await this.generateRefreshToken(user.id);
-
-    return {
-      accessToken,
-      refreshToken,
-    };
-  }
-
-  computeRedirectURI(loginToken: string): string {
-    return `${this.environmentService.getFrontAuthCallbackUrl()}?loginToken=${loginToken}`;
-  }
-
-  async verifyJwt(token: string, secret?: string) {
-    try {
-      return this.jwtService.verify(token, secret ? { secret } : undefined);
-    } catch (error) {
-      if (error instanceof TokenExpiredError) {
-        throw new UnauthorizedException('Token has expired.');
-      } else if (error instanceof JsonWebTokenError) {
-        throw new UnauthorizedException('Token invalid.');
-      } else {
-        throw new UnprocessableEntityException();
-      }
-    }
-  }
-
-  async generatePasswordResetToken(email: string): Promise<PasswordResetToken> {
-    const user = await this.userRepository.findOneBy({
-      email,
-    });
-
-    assert(user, 'User not found', NotFoundException);
-
-    const expiresIn = this.environmentService.getPasswordResetTokenExpiresIn();
-
-    assert(
-      expiresIn,
-      'PASSWORD_RESET_TOKEN_EXPIRES_IN constant value not found',
-      InternalServerErrorException,
-    );
-
-    if (
-      user.passwordResetToken &&
-      user.passwordResetTokenExpiresAt &&
-      isFuture(user.passwordResetTokenExpiresAt)
-    ) {
-      assert(
-        false,
-        `Token has been already generated. Please wait for ${ms(
-          differenceInMilliseconds(
-            user.passwordResetTokenExpiresAt,
-            new Date(),
-          ),
-          {
-            long: true,
-          },
-        )} to generate again.`,
-        BadRequestException,
-      );
-    }
-
-    const plainResetToken = crypto.randomBytes(32).toString('hex');
-    const hashedResetToken = crypto
-      .createHash('sha256')
-      .update(plainResetToken)
-      .digest('hex');
-
-    const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
-
-    await this.userRepository.update(user.id, {
-      passwordResetToken: hashedResetToken,
-      passwordResetTokenExpiresAt: expiresAt,
-    });
-
-    return {
-      passwordResetToken: plainResetToken,
-      passwordResetTokenExpiresAt: expiresAt,
-    };
-  }
-
-  async sendEmailPasswordResetLink(
-    resetToken: PasswordResetToken,
-    email: string,
-  ): Promise<EmailPasswordResetLink> {
-    const user = await this.userRepository.findOneBy({
-      email,
-    });
-
-    assert(user, 'User not found', NotFoundException);
-
-    const frontBaseURL = this.environmentService.getFrontBaseUrl();
-    const resetLink = `${frontBaseURL}/reset-password/${resetToken.passwordResetToken}`;
-
-    const emailData = {
-      link: resetLink,
-      duration: ms(
-        differenceInMilliseconds(
-          resetToken.passwordResetTokenExpiresAt,
-          new Date(),
-        ),
-        {
-          long: true,
-        },
-      ),
-    };
-
-    const emailTemplate = PasswordResetLinkEmail(emailData);
-    const html = render(emailTemplate, {
-      pretty: true,
-    });
-
-    const text = render(emailTemplate, {
-      plainText: true,
-    });
-
-    this.emailService.send({
-      from: `${this.environmentService.getEmailFromName()} <${this.environmentService.getEmailFromAddress()}>`,
-      to: email,
-      subject: 'Action Needed to Reset Password',
-      text,
-      html,
-    });
-
-    return { success: true };
-  }
-
-  async validatePasswordResetToken(
-    resetToken: string,
-  ): Promise<ValidatePasswordResetToken> {
-    const hashedResetToken = crypto
-      .createHash('sha256')
-      .update(resetToken)
-      .digest('hex');
-
-    const user = await this.userRepository.findOneBy({
-      passwordResetToken: hashedResetToken,
-    });
-
-    assert(user, 'Token is invalid', NotFoundException);
-
-    const tokenExpiresAt = user.passwordResetTokenExpiresAt;
-
-    assert(
-      tokenExpiresAt && isFuture(tokenExpiresAt),
-      'Token has expired. Please regenerate',
-      NotFoundException,
-    );
-
-    return {
-      id: user.id,
-      email: user.email,
-    };
-  }
-
-  async invalidatePasswordResetToken(
-    userId: string,
-  ): Promise<InvalidatePassword> {
-    const user = await this.userRepository.findOneBy({
-      id: userId,
-    });
-
-    assert(user, 'User not found', NotFoundException);
-
-    await this.userRepository.update(user.id, {
-      passwordResetToken: '',
-      passwordResetTokenExpiresAt: undefined,
-    });
-
-    return { success: true };
-  }
-}
diff --git a/packages/twenty-server/src/core/auth/strategies/google-gmail.auth.strategy.ts b/packages/twenty-server/src/core/auth/strategies/google-gmail.auth.strategy.ts
deleted file mode 100644
index 09e8545334dd..000000000000
--- a/packages/twenty-server/src/core/auth/strategies/google-gmail.auth.strategy.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { PassportStrategy } from '@nestjs/passport';
-import { Injectable } from '@nestjs/common';
-
-import { Strategy, VerifyCallback } from 'passport-google-oauth20';
-import { Request } from 'express';
-
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-
-export type GoogleGmailRequest = Request & {
-  user: {
-    firstName?: string | null;
-    lastName?: string | null;
-    email: string;
-    picture: string | null;
-    workspaceInviteHash?: string;
-    accessToken: string;
-    refreshToken: string;
-    transientToken: string;
-  };
-};
-
-@Injectable()
-export class GoogleGmailStrategy extends PassportStrategy(
-  Strategy,
-  'google-gmail',
-) {
-  constructor(environmentService: EnvironmentService) {
-    super({
-      clientID: environmentService.getAuthGoogleClientId(),
-      clientSecret: environmentService.getAuthGoogleClientSecret(),
-      callbackURL: environmentService.getMessagingProviderGmailCallbackUrl(),
-      scope: [
-        'email',
-        'profile',
-        'https://www.googleapis.com/auth/gmail.readonly',
-      ],
-      passReqToCallback: true,
-    });
-  }
-
-  authenticate(req: any, options: any) {
-    options = {
-      ...options,
-      accessType: 'offline',
-      prompt: 'consent',
-      state: JSON.stringify({
-        transientToken: req.params.transientToken,
-      }),
-    };
-
-    return super.authenticate(req, options);
-  }
-
-  async validate(
-    request: GoogleGmailRequest,
-    accessToken: string,
-    refreshToken: string,
-    profile: any,
-    done: VerifyCallback,
-  ): Promise<void> {
-    const { name, emails, photos } = profile;
-
-    const state =
-      typeof request.query.state === 'string'
-        ? JSON.parse(request.query.state)
-        : undefined;
-
-    const user: GoogleGmailRequest['user'] = {
-      email: emails[0].value,
-      firstName: name.givenName,
-      lastName: name.familyName,
-      picture: photos?.[0]?.value,
-      accessToken,
-      refreshToken,
-      transientToken: state.transientToken,
-    };
-
-    done(null, user);
-  }
-}
diff --git a/packages/twenty-server/src/core/auth/types/jwt-data.type.ts b/packages/twenty-server/src/core/auth/types/jwt-data.type.ts
deleted file mode 100644
index c93ee8d9df35..000000000000
--- a/packages/twenty-server/src/core/auth/types/jwt-data.type.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { User } from 'src/core/user/user.entity';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-
-export type JwtData = {
-  user?: User | undefined;
-  workspace: Workspace;
-};
diff --git a/packages/twenty-server/src/core/billing/billing.controller.ts b/packages/twenty-server/src/core/billing/billing.controller.ts
deleted file mode 100644
index e49533b84612..000000000000
--- a/packages/twenty-server/src/core/billing/billing.controller.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import {
-  Controller,
-  Headers,
-  Req,
-  RawBodyRequest,
-  Logger,
-  Post,
-  Res,
-} from '@nestjs/common';
-
-import { Response } from 'express';
-
-import { BillingService, WebhookEvent } from 'src/core/billing/billing.service';
-import { StripeService } from 'src/core/billing/stripe/stripe.service';
-
-@Controller('billing')
-export class BillingController {
-  protected readonly logger = new Logger(BillingController.name);
-
-  constructor(
-    private readonly stripeService: StripeService,
-    private readonly billingService: BillingService,
-  ) {}
-
-  @Post('/webhooks')
-  async handleWebhooks(
-    @Headers('stripe-signature') signature: string,
-    @Req() req: RawBodyRequest<Request>,
-    @Res() res: Response,
-  ) {
-    if (!req.rawBody) {
-      res.status(400).end();
-
-      return;
-    }
-    const event = this.stripeService.constructEventFromPayload(
-      signature,
-      req.rawBody,
-    );
-
-    if (
-      event.type === WebhookEvent.CUSTOMER_SUBSCRIPTION_CREATED ||
-      event.type === WebhookEvent.CUSTOMER_SUBSCRIPTION_UPDATED
-    ) {
-      const workspaceId = event.data.object.metadata?.workspaceId;
-
-      if (!workspaceId) {
-        res.status(404).end();
-
-        return;
-      }
-
-      await this.billingService.upsertBillingSubscription(
-        workspaceId,
-        event.data,
-      );
-    }
-    res.status(200).end();
-  }
-}
diff --git a/packages/twenty-server/src/core/billing/billing.module.ts b/packages/twenty-server/src/core/billing/billing.module.ts
deleted file mode 100644
index 25e63d966eca..000000000000
--- a/packages/twenty-server/src/core/billing/billing.module.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { BillingController } from 'src/core/billing/billing.controller';
-import { BillingService } from 'src/core/billing/billing.service';
-import { StripeModule } from 'src/core/billing/stripe/stripe.module';
-import { BillingSubscription } from 'src/core/billing/entities/billing-subscription.entity';
-import { BillingSubscriptionItem } from 'src/core/billing/entities/billing-subscription-item.entity';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { BillingResolver } from 'src/core/billing/billing.resolver';
-import { FeatureFlagEntity } from 'src/core/feature-flag/feature-flag.entity';
-import { BillingWorkspaceMemberListener } from 'src/core/billing/listeners/billing-workspace-member.listener';
-
-@Module({
-  imports: [
-    StripeModule,
-    TypeOrmModule.forFeature(
-      [
-        BillingSubscription,
-        BillingSubscriptionItem,
-        Workspace,
-        FeatureFlagEntity,
-      ],
-      'core',
-    ),
-  ],
-  controllers: [BillingController],
-  providers: [BillingService, BillingResolver, BillingWorkspaceMemberListener],
-  exports: [BillingService],
-})
-export class BillingModule {}
diff --git a/packages/twenty-server/src/core/billing/billing.resolver.ts b/packages/twenty-server/src/core/billing/billing.resolver.ts
deleted file mode 100644
index 7f8d0d90ecdb..000000000000
--- a/packages/twenty-server/src/core/billing/billing.resolver.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-import { UseGuards } from '@nestjs/common';
-
-import {
-  AvailableProduct,
-  BillingService,
-} from 'src/core/billing/billing.service';
-import { ProductInput } from 'src/core/billing/dto/product.input';
-import { assert } from 'src/utils/assert';
-import { ProductPricesEntity } from 'src/core/billing/dto/product-prices.entity';
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-import { AuthUser } from 'src/decorators/auth/auth-user.decorator';
-import { User } from 'src/core/user/user.entity';
-import { CheckoutInput } from 'src/core/billing/dto/checkout.input';
-import { CheckoutEntity } from 'src/core/billing/dto/checkout.entity';
-
-@Resolver()
-export class BillingResolver {
-  constructor(private readonly billingService: BillingService) {}
-
-  @Query(() => ProductPricesEntity)
-  async getProductPrices(@Args() { product }: ProductInput) {
-    const stripeProductId = this.billingService.getProductStripeId(product);
-
-    assert(
-      stripeProductId,
-      `Product '${product}' not found, available products are ['${Object.values(
-        AvailableProduct,
-      ).join("','")}']`,
-    );
-
-    const productPrices =
-      await this.billingService.getProductPrices(stripeProductId);
-
-    return {
-      totalNumberOfPrices: productPrices.length,
-      productPrices: productPrices,
-    };
-  }
-
-  @Mutation(() => CheckoutEntity)
-  @UseGuards(JwtAuthGuard)
-  async checkout(
-    @AuthUser() user: User,
-    @Args() { recurringInterval, successUrlPath }: CheckoutInput,
-  ) {
-    const stripeProductId = this.billingService.getProductStripeId(
-      AvailableProduct.BasePlan,
-    );
-
-    assert(
-      stripeProductId,
-      'BasePlan productId not found, please check your BILLING_STRIPE_BASE_PLAN_PRODUCT_ID env variable',
-    );
-
-    const productPrices =
-      await this.billingService.getProductPrices(stripeProductId);
-
-    const stripePriceId = productPrices.filter(
-      (price) => price.recurringInterval === recurringInterval,
-    )?.[0]?.stripePriceId;
-
-    assert(
-      stripePriceId,
-      `BasePlan priceId not found, please check body.recurringInterval and product '${AvailableProduct.BasePlan}' prices`,
-    );
-
-    return {
-      url: await this.billingService.checkout(
-        user,
-        stripePriceId,
-        successUrlPath,
-      ),
-    };
-  }
-}
diff --git a/packages/twenty-server/src/core/billing/billing.service.ts b/packages/twenty-server/src/core/billing/billing.service.ts
deleted file mode 100644
index e888be1b1fad..000000000000
--- a/packages/twenty-server/src/core/billing/billing.service.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import Stripe from 'stripe';
-import { Repository } from 'typeorm';
-
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { StripeService } from 'src/core/billing/stripe/stripe.service';
-import { BillingSubscription } from 'src/core/billing/entities/billing-subscription.entity';
-import { BillingSubscriptionItem } from 'src/core/billing/entities/billing-subscription-item.entity';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { ProductPriceEntity } from 'src/core/billing/dto/product-price.entity';
-import { User } from 'src/core/user/user.entity';
-
-export enum AvailableProduct {
-  BasePlan = 'base-plan',
-}
-
-export enum WebhookEvent {
-  CUSTOMER_SUBSCRIPTION_CREATED = 'customer.subscription.created',
-  CUSTOMER_SUBSCRIPTION_UPDATED = 'customer.subscription.updated',
-}
-
-@Injectable()
-export class BillingService {
-  protected readonly logger = new Logger(BillingService.name);
-  constructor(
-    private readonly stripeService: StripeService,
-    private readonly environmentService: EnvironmentService,
-    @InjectRepository(BillingSubscription, 'core')
-    private readonly billingSubscriptionRepository: Repository<BillingSubscription>,
-    @InjectRepository(BillingSubscriptionItem, 'core')
-    private readonly billingSubscriptionItemRepository: Repository<BillingSubscriptionItem>,
-    @InjectRepository(Workspace, 'core')
-    private readonly workspaceRepository: Repository<Workspace>,
-  ) {}
-
-  getProductStripeId(product: AvailableProduct) {
-    if (product === AvailableProduct.BasePlan) {
-      return this.environmentService.getBillingStripeBasePlanProductId();
-    }
-  }
-
-  async getProductPrices(stripeProductId: string) {
-    const productPrices =
-      await this.stripeService.getProductPrices(stripeProductId);
-
-    return this.formatProductPrices(productPrices.data);
-  }
-
-  formatProductPrices(prices: Stripe.Price[]) {
-    const result: Record<string, ProductPriceEntity> = {};
-
-    prices.forEach((item) => {
-      const interval = item.recurring?.interval;
-
-      if (!interval || !item.unit_amount) {
-        return;
-      }
-      if (
-        !result[interval] ||
-        item.created > (result[interval]?.created || 0)
-      ) {
-        result[interval] = {
-          unitAmount: item.unit_amount,
-          recurringInterval: interval,
-          created: item.created,
-          stripePriceId: item.id,
-        };
-      }
-    });
-
-    return Object.values(result).sort((a, b) => a.unitAmount - b.unitAmount);
-  }
-
-  async getBillingSubscription(workspaceId: string) {
-    return await this.billingSubscriptionRepository.findOneOrFail({
-      where: { workspaceId },
-      relations: ['billingSubscriptionItems'],
-    });
-  }
-
-  async getBillingSubscriptionItem(
-    workspaceId: string,
-    stripeProductId = this.environmentService.getBillingStripeBasePlanProductId(),
-  ) {
-    const billingSubscription = await this.getBillingSubscription(workspaceId);
-
-    const billingSubscriptionItem =
-      billingSubscription.billingSubscriptionItems.filter(
-        (billingSubscriptionItem) =>
-          billingSubscriptionItem.stripeProductId === stripeProductId,
-      )?.[0];
-
-    if (!billingSubscriptionItem) {
-      throw new Error(
-        `Cannot find billingSubscriptionItem for product ${stripeProductId} for workspace ${workspaceId}`,
-      );
-    }
-
-    return billingSubscriptionItem;
-  }
-
-  async checkout(user: User, priceId: string, successUrlPath?: string) {
-    const frontBaseUrl = this.environmentService.getFrontBaseUrl();
-    const successUrl = successUrlPath
-      ? frontBaseUrl + successUrlPath
-      : frontBaseUrl;
-
-    return await this.stripeService.createCheckoutSession(
-      user,
-      priceId,
-      successUrl,
-      frontBaseUrl,
-    );
-  }
-
-  async deleteSubscription(workspaceId: string) {
-    const subscriptionToCancel =
-      await this.billingSubscriptionRepository.findOneBy({
-        workspaceId,
-      });
-
-    if (subscriptionToCancel) {
-      await this.stripeService.cancelSubscription(
-        subscriptionToCancel.stripeSubscriptionId,
-      );
-      await this.billingSubscriptionRepository.delete(subscriptionToCancel.id);
-    }
-  }
-
-  async upsertBillingSubscription(
-    workspaceId: string,
-    data:
-      | Stripe.CustomerSubscriptionUpdatedEvent.Data
-      | Stripe.CustomerSubscriptionCreatedEvent.Data,
-  ) {
-    await this.billingSubscriptionRepository.upsert(
-      {
-        workspaceId: workspaceId,
-        stripeCustomerId: data.object.customer as string,
-        stripeSubscriptionId: data.object.id,
-        status: data.object.status,
-      },
-      {
-        conflictPaths: ['stripeSubscriptionId'],
-        skipUpdateIfNoValuesChanged: true,
-      },
-    );
-
-    await this.workspaceRepository.update(workspaceId, {
-      subscriptionStatus: data.object.status,
-    });
-
-    const billingSubscription = await this.getBillingSubscription(workspaceId);
-
-    await this.billingSubscriptionItemRepository.upsert(
-      data.object.items.data.map((item) => {
-        return {
-          billingSubscriptionId: billingSubscription.id,
-          stripeProductId: item.price.product as string,
-          stripePriceId: item.price.id,
-          stripeSubscriptionItemId: item.id,
-          quantity: item.quantity,
-        };
-      }),
-      {
-        conflictPaths: ['stripeSubscriptionItemId', 'billingSubscriptionId'],
-        skipUpdateIfNoValuesChanged: true,
-      },
-    );
-  }
-}
diff --git a/packages/twenty-server/src/core/billing/dto/checkout.entity.ts b/packages/twenty-server/src/core/billing/dto/checkout.entity.ts
deleted file mode 100644
index 83e50281d967..000000000000
--- a/packages/twenty-server/src/core/billing/dto/checkout.entity.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Field, ObjectType } from '@nestjs/graphql';
-
-@ObjectType()
-export class CheckoutEntity {
-  @Field(() => String)
-  url: string;
-}
diff --git a/packages/twenty-server/src/core/billing/dto/checkout.input.ts b/packages/twenty-server/src/core/billing/dto/checkout.input.ts
deleted file mode 100644
index e3858cb2cb67..000000000000
--- a/packages/twenty-server/src/core/billing/dto/checkout.input.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ArgsType, Field } from '@nestjs/graphql';
-
-import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
-import Stripe from 'stripe';
-
-@ArgsType()
-export class CheckoutInput {
-  @Field(() => String)
-  @IsString()
-  @IsNotEmpty()
-  recurringInterval: Stripe.Price.Recurring.Interval;
-
-  @Field(() => String, { nullable: true })
-  @IsString()
-  @IsOptional()
-  successUrlPath?: string;
-}
diff --git a/packages/twenty-server/src/core/billing/dto/product-prices.entity.ts b/packages/twenty-server/src/core/billing/dto/product-prices.entity.ts
deleted file mode 100644
index 9b00588201fe..000000000000
--- a/packages/twenty-server/src/core/billing/dto/product-prices.entity.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Field, Int, ObjectType } from '@nestjs/graphql';
-
-import { ProductPriceEntity } from 'src/core/billing/dto/product-price.entity';
-
-@ObjectType()
-export class ProductPricesEntity {
-  @Field(() => Int)
-  totalNumberOfPrices: number;
-
-  @Field(() => [ProductPriceEntity])
-  productPrices: ProductPriceEntity[];
-}
diff --git a/packages/twenty-server/src/core/billing/dto/product.input.ts b/packages/twenty-server/src/core/billing/dto/product.input.ts
deleted file mode 100644
index 4b68eb183323..000000000000
--- a/packages/twenty-server/src/core/billing/dto/product.input.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ArgsType, Field } from '@nestjs/graphql';
-
-import { IsNotEmpty, IsString } from 'class-validator';
-
-import { AvailableProduct } from 'src/core/billing/billing.service';
-
-@ArgsType()
-export class ProductInput {
-  @Field(() => String)
-  @IsString()
-  @IsNotEmpty()
-  product: AvailableProduct;
-}
diff --git a/packages/twenty-server/src/core/billing/entities/billing-subscription.entity.ts b/packages/twenty-server/src/core/billing/entities/billing-subscription.entity.ts
deleted file mode 100644
index 704c238543fa..000000000000
--- a/packages/twenty-server/src/core/billing/entities/billing-subscription.entity.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  JoinColumn,
-  OneToMany,
-  OneToOne,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn,
-} from 'typeorm';
-import Stripe from 'stripe';
-
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { BillingSubscriptionItem } from 'src/core/billing/entities/billing-subscription-item.entity';
-
-@Entity({ name: 'billingSubscription', schema: 'core' })
-export class BillingSubscription {
-  @PrimaryGeneratedColumn('uuid')
-  id: string;
-
-  @Column({ nullable: true })
-  deletedAt?: Date;
-
-  @CreateDateColumn({ type: 'timestamp with time zone' })
-  createdAt: Date;
-
-  @UpdateDateColumn({ type: 'timestamp with time zone' })
-  updatedAt: Date;
-
-  @OneToOne(() => Workspace, (workspace) => workspace.billingSubscription, {
-    onDelete: 'CASCADE',
-  })
-  @JoinColumn()
-  workspace: Workspace;
-
-  @Column({ nullable: false, type: 'uuid' })
-  workspaceId: string;
-
-  @Column({ unique: true, nullable: false })
-  stripeCustomerId: string;
-
-  @Column({ unique: true, nullable: false })
-  stripeSubscriptionId: string;
-
-  @Column({ nullable: false })
-  status: Stripe.Subscription.Status;
-
-  @OneToMany(
-    () => BillingSubscriptionItem,
-    (billingSubscriptionItem) => billingSubscriptionItem.billingSubscription,
-  )
-  billingSubscriptionItems: BillingSubscriptionItem[];
-}
diff --git a/packages/twenty-server/src/core/billing/jobs/update-subscription.job.ts b/packages/twenty-server/src/core/billing/jobs/update-subscription.job.ts
deleted file mode 100644
index 876944a97bb9..000000000000
--- a/packages/twenty-server/src/core/billing/jobs/update-subscription.job.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Repository } from 'typeorm';
-
-import { MessageQueueJob } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
-
-import { BillingService } from 'src/core/billing/billing.service';
-import { UserWorkspaceService } from 'src/core/user-workspace/user-workspace.service';
-import {
-  FeatureFlagEntity,
-  FeatureFlagKeys,
-} from 'src/core/feature-flag/feature-flag.entity';
-import { StripeService } from 'src/core/billing/stripe/stripe.service';
-export type UpdateSubscriptionJobData = { workspaceId: string };
-@Injectable()
-export class UpdateSubscriptionJob
-  implements MessageQueueJob<UpdateSubscriptionJobData>
-{
-  protected readonly logger = new Logger(UpdateSubscriptionJob.name);
-  constructor(
-    private readonly billingService: BillingService,
-    private readonly userWorkspaceService: UserWorkspaceService,
-    private readonly stripeService: StripeService,
-    @InjectRepository(FeatureFlagEntity, 'core')
-    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
-  ) {}
-
-  async handle(data: UpdateSubscriptionJobData): Promise<void> {
-    const isSelfBillingEnabled = await this.featureFlagRepository.findOneBy({
-      workspaceId: data.workspaceId,
-      key: FeatureFlagKeys.IsSelfBillingEnabled,
-      value: true,
-    });
-
-    if (!isSelfBillingEnabled) {
-      return;
-    }
-
-    const workspaceMembersCount =
-      await this.userWorkspaceService.getWorkspaceMemberCount(data.workspaceId);
-
-    if (workspaceMembersCount <= 0) {
-      return;
-    }
-
-    const billingSubscriptionItem =
-      await this.billingService.getBillingSubscriptionItem(data.workspaceId);
-
-    await this.stripeService.updateSubscriptionItem(
-      billingSubscriptionItem.stripeSubscriptionItemId,
-      workspaceMembersCount,
-    );
-
-    this.logger.log(
-      `Updating workspace ${data.workspaceId} subscription quantity to ${workspaceMembersCount} members`,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/core/billing/listeners/billing-workspace-member.listener.ts b/packages/twenty-server/src/core/billing/listeners/billing-workspace-member.listener.ts
deleted file mode 100644
index 1cb1db606b79..000000000000
--- a/packages/twenty-server/src/core/billing/listeners/billing-workspace-member.listener.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { OnEvent } from '@nestjs/event-emitter';
-
-import { Repository } from 'typeorm';
-
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import {
-  FeatureFlagEntity,
-  FeatureFlagKeys,
-} from 'src/core/feature-flag/feature-flag.entity';
-import { ObjectRecordCreateEvent } from 'src/integrations/event-emitter/types/object-record-create.event';
-import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
-import {
-  UpdateSubscriptionJob,
-  UpdateSubscriptionJobData,
-} from 'src/core/billing/jobs/update-subscription.job';
-
-@Injectable()
-export class BillingWorkspaceMemberListener {
-  constructor(
-    @Inject(MessageQueue.billingQueue)
-    private readonly messageQueueService: MessageQueueService,
-    @InjectRepository(FeatureFlagEntity, 'core')
-    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
-  ) {}
-
-  @OnEvent('workspaceMember.created')
-  @OnEvent('workspaceMember.deleted')
-  async handleCreateOrDeleteEvent(
-    payload: ObjectRecordCreateEvent<WorkspaceMemberObjectMetadata>,
-  ) {
-    const isSelfBillingFeatureFlag = await this.featureFlagRepository.findOneBy(
-      {
-        key: FeatureFlagKeys.IsSelfBillingEnabled,
-        value: true,
-        workspaceId: payload.workspaceId,
-      },
-    );
-
-    if (!isSelfBillingFeatureFlag) {
-      return;
-    }
-    await this.messageQueueService.add<UpdateSubscriptionJobData>(
-      UpdateSubscriptionJob.name,
-      { workspaceId: payload.workspaceId },
-    );
-  }
-}
diff --git a/packages/twenty-server/src/core/billing/stripe/stripe.module.ts b/packages/twenty-server/src/core/billing/stripe/stripe.module.ts
deleted file mode 100644
index e5cc9df34c37..000000000000
--- a/packages/twenty-server/src/core/billing/stripe/stripe.module.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { StripeService } from 'src/core/billing/stripe/stripe.service';
-
-@Module({
-  providers: [StripeService],
-  exports: [StripeService],
-})
-export class StripeModule {}
diff --git a/packages/twenty-server/src/core/billing/stripe/stripe.service.ts b/packages/twenty-server/src/core/billing/stripe/stripe.service.ts
deleted file mode 100644
index 74835770f2d4..000000000000
--- a/packages/twenty-server/src/core/billing/stripe/stripe.service.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import Stripe from 'stripe';
-
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { User } from 'src/core/user/user.entity';
-import { assert } from 'src/utils/assert';
-
-@Injectable()
-export class StripeService {
-  protected readonly logger = new Logger(StripeService.name);
-  private readonly stripe: Stripe;
-
-  constructor(private readonly environmentService: EnvironmentService) {
-    this.stripe = new Stripe(
-      this.environmentService.getBillingStripeApiKey(),
-      {},
-    );
-  }
-
-  constructEventFromPayload(signature: string, payload: Buffer) {
-    const webhookSecret =
-      this.environmentService.getBillingStripeWebhookSecret();
-
-    return this.stripe.webhooks.constructEvent(
-      payload,
-      signature,
-      webhookSecret,
-    );
-  }
-
-  async getProductPrices(stripeProductId: string) {
-    return this.stripe.prices.search({
-      query: `product: '${stripeProductId}'`,
-    });
-  }
-
-  async updateSubscriptionItem(stripeItemId: string, quantity: number) {
-    await this.stripe.subscriptionItems.update(stripeItemId, { quantity });
-  }
-
-  async cancelSubscription(stripeSubscriptionId: string) {
-    await this.stripe.subscriptions.cancel(stripeSubscriptionId);
-  }
-
-  async createCheckoutSession(
-    user: User,
-    priceId: string,
-    successUrl?: string,
-    cancelUrl?: string,
-  ) {
-    const session = await this.stripe.checkout.sessions.create({
-      line_items: [
-        {
-          price: priceId,
-          quantity: 1,
-        },
-      ],
-      mode: 'subscription',
-      subscription_data: {
-        metadata: {
-          workspaceId: user.defaultWorkspace.id,
-        },
-        trial_period_days:
-          this.environmentService.getBillingFreeTrialDurationInDays(),
-      },
-      automatic_tax: { enabled: true },
-      tax_id_collection: { enabled: true },
-      customer_email: user.email,
-      success_url: successUrl,
-      cancel_url: cancelUrl,
-    });
-
-    assert(session.url, 'Error: missing checkout.session.url');
-
-    this.logger.log(`Stripe Checkout Session Url Redirection: ${session.url}`);
-
-    return session.url;
-  }
-}
diff --git a/packages/twenty-server/src/core/client-config/client-config.resolver.ts b/packages/twenty-server/src/core/client-config/client-config.resolver.ts
deleted file mode 100644
index 7ee9d292a776..000000000000
--- a/packages/twenty-server/src/core/client-config/client-config.resolver.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Resolver, Query } from '@nestjs/graphql';
-
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-
-import { ClientConfig } from './client-config.entity';
-
-@Resolver()
-export class ClientConfigResolver {
-  constructor(private environmentService: EnvironmentService) {}
-
-  @Query(() => ClientConfig)
-  async clientConfig(): Promise<ClientConfig> {
-    const clientConfig: ClientConfig = {
-      authProviders: {
-        google: this.environmentService.isAuthGoogleEnabled(),
-        magicLink: false,
-        password: true,
-      },
-      telemetry: {
-        enabled: this.environmentService.isTelemetryEnabled(),
-        anonymizationEnabled:
-          this.environmentService.isTelemetryAnonymizationEnabled(),
-      },
-      billing: {
-        isBillingEnabled: this.environmentService.isBillingEnabled(),
-        billingUrl: this.environmentService.getBillingUrl(),
-        billingFreeTrialDurationInDays:
-          this.environmentService.getBillingFreeTrialDurationInDays(),
-      },
-      signInPrefilled: this.environmentService.isSignInPrefilled(),
-      signUpDisabled: this.environmentService.isSignUpDisabled(),
-      debugMode: this.environmentService.isDebugMode(),
-      support: {
-        supportDriver: this.environmentService.getSupportDriver(),
-        supportFrontChatId: this.environmentService.getSupportFrontChatId(),
-      },
-      sentry: {
-        dsn: this.environmentService.getSentryDSN(),
-      },
-    };
-
-    return Promise.resolve(clientConfig);
-  }
-}
diff --git a/packages/twenty-server/src/core/core.module.ts b/packages/twenty-server/src/core/core.module.ts
deleted file mode 100644
index 9e6959110e49..000000000000
--- a/packages/twenty-server/src/core/core.module.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { WorkspaceModule } from 'src/core/workspace/workspace.module';
-import { UserModule } from 'src/core/user/user.module';
-import { RefreshTokenModule } from 'src/core/refresh-token/refresh-token.module';
-import { AuthModule } from 'src/core/auth/auth.module';
-import { ApiRestModule } from 'src/core/api-rest/api-rest.module';
-import { FeatureFlagModule } from 'src/core/feature-flag/feature-flag.module';
-import { OpenApiModule } from 'src/core/open-api/open-api.module';
-import { TimelineMessagingModule } from 'src/core/messaging/timeline-messaging.module';
-import { BillingModule } from 'src/core/billing/billing.module';
-
-import { AnalyticsModule } from './analytics/analytics.module';
-import { FileModule } from './file/file.module';
-import { ClientConfigModule } from './client-config/client-config.module';
-
-@Module({
-  imports: [
-    AnalyticsModule,
-    ApiRestModule,
-    AuthModule,
-    BillingModule,
-    ClientConfigModule,
-    FeatureFlagModule,
-    FileModule,
-    OpenApiModule,
-    RefreshTokenModule,
-    TimelineMessagingModule,
-    UserModule,
-    WorkspaceModule,
-  ],
-  exports: [
-    AnalyticsModule,
-    AuthModule,
-    FeatureFlagModule,
-    TimelineMessagingModule,
-    UserModule,
-    WorkspaceModule,
-  ],
-})
-export class CoreModule {}
diff --git a/packages/twenty-server/src/core/feature-flag/feature-flag.entity.ts b/packages/twenty-server/src/core/feature-flag/feature-flag.entity.ts
deleted file mode 100644
index ac0eeee18453..000000000000
--- a/packages/twenty-server/src/core/feature-flag/feature-flag.entity.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Field, ID, ObjectType } from '@nestjs/graphql';
-
-import {
-  Entity,
-  Unique,
-  PrimaryGeneratedColumn,
-  Column,
-  CreateDateColumn,
-  UpdateDateColumn,
-  ManyToOne,
-} from 'typeorm';
-import { IDField } from '@ptc-org/nestjs-query-graphql';
-
-import { Workspace } from 'src/core/workspace/workspace.entity';
-
-export enum FeatureFlagKeys {
-  IsBlocklistEnabled = 'IS_BLOCKLIST_ENABLED',
-  IsCalendarEnabled = 'IS_CALENDAR_ENABLED',
-  IsSelfBillingEnabled = 'IS_SELF_BILLING_ENABLED',
-}
-
-@Entity({ name: 'featureFlag', schema: 'core' })
-@ObjectType('FeatureFlag')
-@Unique('IndexOnKeyAndWorkspaceIdUnique', ['key', 'workspaceId'])
-export class FeatureFlagEntity {
-  @IDField(() => ID)
-  @PrimaryGeneratedColumn('uuid')
-  id: string;
-
-  @Field()
-  @Column({ nullable: false, type: 'text' })
-  key: FeatureFlagKeys;
-
-  @Field()
-  @Column({ nullable: false, type: 'uuid' })
-  workspaceId: string;
-
-  @ManyToOne(() => Workspace, (workspace) => workspace.featureFlags, {
-    onDelete: 'CASCADE',
-  })
-  workspace: Workspace;
-
-  @Field()
-  @Column({ nullable: false })
-  value: boolean;
-
-  @CreateDateColumn()
-  createdAt: Date;
-
-  @UpdateDateColumn()
-  updatedAt: Date;
-}
diff --git a/packages/twenty-server/src/core/feature-flag/interfaces/feature-flag-map.interface.ts b/packages/twenty-server/src/core/feature-flag/interfaces/feature-flag-map.interface.ts
deleted file mode 100644
index 9ec6c9b73e3f..000000000000
--- a/packages/twenty-server/src/core/feature-flag/interfaces/feature-flag-map.interface.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { FeatureFlagKeys } from 'src/core/feature-flag/feature-flag.entity';
-
-export type FeatureFlagMap = Record<`${FeatureFlagKeys}`, boolean>;
diff --git a/packages/twenty-server/src/core/file/controllers/file.controller.spec.ts b/packages/twenty-server/src/core/file/controllers/file.controller.spec.ts
deleted file mode 100644
index b177d22b69ae..000000000000
--- a/packages/twenty-server/src/core/file/controllers/file.controller.spec.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-
-import { FileService } from 'src/core/file/services/file.service';
-
-import { FileController } from './file.controller';
-
-describe('FileController', () => {
-  let controller: FileController;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      controllers: [FileController],
-      providers: [
-        {
-          provide: FileService,
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    controller = module.get<FileController>(FileController);
-  });
-
-  it('should be defined', () => {
-    expect(controller).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/core/file/controllers/file.controller.ts b/packages/twenty-server/src/core/file/controllers/file.controller.ts
deleted file mode 100644
index e237af76342b..000000000000
--- a/packages/twenty-server/src/core/file/controllers/file.controller.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Controller, Get, Param, Res } from '@nestjs/common';
-
-import { Response } from 'express';
-
-import { checkFilePath, checkFilename } from 'src/core/file/file.utils';
-import { FileService } from 'src/core/file/services/file.service';
-
-// TODO: Add cookie authentication
-@Controller('files')
-export class FileController {
-  constructor(private readonly fileService: FileService) {}
-
-  /**
-   * Serve files from local storage
-   * We recommend using an s3 bucket for production
-   */
-  @Get('*/:filename')
-  async getFile(@Param() params: string[], @Res() res: Response) {
-    const folderPath = checkFilePath(params[0]);
-    const filename = checkFilename(params['filename']);
-    const fileStream = await this.fileService.getFileStream(
-      folderPath,
-      filename,
-    );
-
-    fileStream.on('error', () => {
-      res.status(404).send({ error: 'File not found' });
-    });
-
-    fileStream.pipe(res);
-  }
-}
diff --git a/packages/twenty-server/src/core/file/file.module.ts b/packages/twenty-server/src/core/file/file.module.ts
deleted file mode 100644
index 7d68ad3ceb7d..000000000000
--- a/packages/twenty-server/src/core/file/file.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { FileService } from './services/file.service';
-import { FileUploadService } from './services/file-upload.service';
-import { FileUploadResolver } from './resolvers/file-upload.resolver';
-import { FileController } from './controllers/file.controller';
-
-@Module({
-  providers: [FileService, FileUploadService, FileUploadResolver],
-  exports: [FileService, FileUploadService],
-  controllers: [FileController],
-})
-export class FileModule {}
diff --git a/packages/twenty-server/src/core/file/resolvers/file-upload.resolver.spec.ts b/packages/twenty-server/src/core/file/resolvers/file-upload.resolver.spec.ts
deleted file mode 100644
index 78c6f55a0b0e..000000000000
--- a/packages/twenty-server/src/core/file/resolvers/file-upload.resolver.spec.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-
-import { FileUploadService } from 'src/core/file/services/file-upload.service';
-
-import { FileUploadResolver } from './file-upload.resolver';
-
-describe('FileUploadResolver', () => {
-  let resolver: FileUploadResolver;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        FileUploadResolver,
-        {
-          provide: FileUploadService,
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    resolver = module.get<FileUploadResolver>(FileUploadResolver);
-  });
-
-  it('should be defined', () => {
-    expect(resolver).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/core/file/resolvers/file-upload.resolver.ts b/packages/twenty-server/src/core/file/resolvers/file-upload.resolver.ts
deleted file mode 100644
index 5b320c046375..000000000000
--- a/packages/twenty-server/src/core/file/resolvers/file-upload.resolver.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
-import { UseGuards } from '@nestjs/common';
-
-import { GraphQLUpload, FileUpload } from 'graphql-upload';
-
-import { FileFolder } from 'src/core/file/interfaces/file-folder.interface';
-
-import { FileUploadService } from 'src/core/file/services/file-upload.service';
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-import { streamToBuffer } from 'src/utils/stream-to-buffer';
-
-@UseGuards(JwtAuthGuard)
-@Resolver()
-export class FileUploadResolver {
-  constructor(private readonly fileUploadService: FileUploadService) {}
-
-  @Mutation(() => String)
-  async uploadFile(
-    @Args({ name: 'file', type: () => GraphQLUpload })
-    { createReadStream, filename, mimetype }: FileUpload,
-    @Args('fileFolder', { type: () => FileFolder, nullable: true })
-    fileFolder: FileFolder,
-  ): Promise<string> {
-    const stream = createReadStream();
-    const buffer = await streamToBuffer(stream);
-
-    const { path } = await this.fileUploadService.uploadFile({
-      file: buffer,
-      filename,
-      mimeType: mimetype,
-      fileFolder,
-    });
-
-    return path;
-  }
-
-  @Mutation(() => String)
-  async uploadImage(
-    @Args({ name: 'file', type: () => GraphQLUpload })
-    { createReadStream, filename, mimetype }: FileUpload,
-    @Args('fileFolder', { type: () => FileFolder, nullable: true })
-    fileFolder: FileFolder,
-  ): Promise<string> {
-    const stream = createReadStream();
-    const buffer = await streamToBuffer(stream);
-
-    const { paths } = await this.fileUploadService.uploadImage({
-      file: buffer,
-      filename,
-      mimeType: mimetype,
-      fileFolder,
-    });
-
-    return paths[0];
-  }
-}
diff --git a/packages/twenty-server/src/core/messaging/dtos/timeline-thread-participant.dto.ts b/packages/twenty-server/src/core/messaging/dtos/timeline-thread-participant.dto.ts
deleted file mode 100644
index 7d675d968a33..000000000000
--- a/packages/twenty-server/src/core/messaging/dtos/timeline-thread-participant.dto.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ObjectType, Field, ID } from '@nestjs/graphql';
-
-@ObjectType('TimelineThreadParticipant')
-export class TimelineThreadParticipant {
-  @Field(() => ID, { nullable: true })
-  personId: string;
-
-  @Field(() => ID, { nullable: true })
-  workspaceMemberId: string;
-
-  @Field()
-  firstName: string;
-
-  @Field()
-  lastName: string;
-
-  @Field()
-  displayName: string;
-
-  @Field()
-  avatarUrl: string;
-
-  @Field()
-  handle: string;
-}
diff --git a/packages/twenty-server/src/core/messaging/dtos/timeline-thread.dto.ts b/packages/twenty-server/src/core/messaging/dtos/timeline-thread.dto.ts
deleted file mode 100644
index 32402d314147..000000000000
--- a/packages/twenty-server/src/core/messaging/dtos/timeline-thread.dto.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { ObjectType, Field, ID } from '@nestjs/graphql';
-
-import { IDField } from '@ptc-org/nestjs-query-graphql';
-
-import { TimelineThreadParticipant } from 'src/core/messaging/dtos/timeline-thread-participant.dto';
-
-@ObjectType('TimelineThread')
-export class TimelineThread {
-  @IDField(() => ID)
-  id: string;
-
-  @Field()
-  read: boolean;
-
-  @Field()
-  visibility: string;
-
-  @Field()
-  firstParticipant: TimelineThreadParticipant;
-
-  @Field(() => [TimelineThreadParticipant])
-  lastTwoParticipants: TimelineThreadParticipant[];
-
-  @Field()
-  lastMessageReceivedAt: Date;
-
-  @Field()
-  lastMessageBody: string;
-
-  @Field()
-  subject: string;
-
-  @Field()
-  numberOfMessagesInThread: number;
-
-  @Field()
-  participantCount: number;
-}
diff --git a/packages/twenty-server/src/core/messaging/dtos/timeline-threads-with-total.dto.ts b/packages/twenty-server/src/core/messaging/dtos/timeline-threads-with-total.dto.ts
deleted file mode 100644
index 03470f75edfc..000000000000
--- a/packages/twenty-server/src/core/messaging/dtos/timeline-threads-with-total.dto.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Field, Int, ObjectType } from '@nestjs/graphql';
-
-import { TimelineThread } from 'src/core/messaging/dtos/timeline-thread.dto';
-
-@ObjectType('TimelineThreadsWithTotal')
-export class TimelineThreadsWithTotal {
-  @Field(() => Int)
-  totalNumberOfThreads: number;
-
-  @Field(() => [TimelineThread])
-  timelineThreads: TimelineThread[];
-}
diff --git a/packages/twenty-server/src/core/messaging/timeline-messaging.module.ts b/packages/twenty-server/src/core/messaging/timeline-messaging.module.ts
deleted file mode 100644
index 1eb1f0dccbba..000000000000
--- a/packages/twenty-server/src/core/messaging/timeline-messaging.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { TimelineMessagingResolver } from 'src/core/messaging/timeline-messaging.resolver';
-import { TimelineMessagingService } from 'src/core/messaging/timeline-messaging.service';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-import { UserModule } from 'src/core/user/user.module';
-@Module({
-  imports: [WorkspaceDataSourceModule, UserModule],
-  exports: [],
-  providers: [TimelineMessagingResolver, TimelineMessagingService],
-})
-export class TimelineMessagingModule {}
diff --git a/packages/twenty-server/src/core/messaging/timeline-messaging.resolver.ts b/packages/twenty-server/src/core/messaging/timeline-messaging.resolver.ts
deleted file mode 100644
index 5509d0be4385..000000000000
--- a/packages/twenty-server/src/core/messaging/timeline-messaging.resolver.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import {
-  Args,
-  Query,
-  Resolver,
-  Int,
-  ArgsType,
-  Field,
-  ID,
-} from '@nestjs/graphql';
-import { UseGuards } from '@nestjs/common';
-
-import { Max } from 'class-validator';
-
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { AuthWorkspace } from 'src/decorators/auth/auth-workspace.decorator';
-import { TimelineMessagingService } from 'src/core/messaging/timeline-messaging.service';
-import { TIMELINE_THREADS_MAX_PAGE_SIZE } from 'src/core/messaging/constants/messaging.constants';
-import { TimelineThreadsWithTotal } from 'src/core/messaging/dtos/timeline-threads-with-total.dto';
-import { AuthUser } from 'src/decorators/auth/auth-user.decorator';
-import { UserService } from 'src/core/user/services/user.service';
-import { User } from 'src/core/user/user.entity';
-
-@ArgsType()
-class GetTimelineThreadsFromPersonIdArgs {
-  @Field(() => ID)
-  personId: string;
-
-  @Field(() => Int)
-  page: number;
-
-  @Field(() => Int)
-  @Max(TIMELINE_THREADS_MAX_PAGE_SIZE)
-  pageSize: number;
-}
-
-@ArgsType()
-class GetTimelineThreadsFromCompanyIdArgs {
-  @Field(() => ID)
-  companyId: string;
-
-  @Field(() => Int)
-  page: number;
-
-  @Field(() => Int)
-  @Max(TIMELINE_THREADS_MAX_PAGE_SIZE)
-  pageSize: number;
-}
-
-@UseGuards(JwtAuthGuard)
-@Resolver(() => TimelineThreadsWithTotal)
-export class TimelineMessagingResolver {
-  constructor(
-    private readonly timelineMessagingService: TimelineMessagingService,
-    private readonly userService: UserService,
-  ) {}
-
-  @Query(() => TimelineThreadsWithTotal)
-  async getTimelineThreadsFromPersonId(
-    @AuthWorkspace() { id: workspaceId }: Workspace,
-    @AuthUser() user: User,
-    @Args() { personId, page, pageSize }: GetTimelineThreadsFromPersonIdArgs,
-  ) {
-    const workspaceMember = await this.userService.loadWorkspaceMember(user);
-
-    if (!workspaceMember) {
-      return;
-    }
-
-    const timelineThreads =
-      await this.timelineMessagingService.getMessagesFromPersonIds(
-        workspaceMember.id,
-        workspaceId,
-        [personId],
-        page,
-        pageSize,
-      );
-
-    return timelineThreads;
-  }
-
-  @Query(() => TimelineThreadsWithTotal)
-  async getTimelineThreadsFromCompanyId(
-    @AuthWorkspace() { id: workspaceId }: Workspace,
-    @AuthUser() user: User,
-    @Args() { companyId, page, pageSize }: GetTimelineThreadsFromCompanyIdArgs,
-  ) {
-    const workspaceMember = await this.userService.loadWorkspaceMember(user);
-
-    if (!workspaceMember) {
-      return;
-    }
-
-    const timelineThreads =
-      await this.timelineMessagingService.getMessagesFromCompanyId(
-        workspaceMember.id,
-        workspaceId,
-        companyId,
-        page,
-        pageSize,
-      );
-
-    return timelineThreads;
-  }
-}
diff --git a/packages/twenty-server/src/core/open-api/open-api.module.ts b/packages/twenty-server/src/core/open-api/open-api.module.ts
deleted file mode 100644
index eb9425e65e0c..000000000000
--- a/packages/twenty-server/src/core/open-api/open-api.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { OpenApiController } from 'src/core/open-api/open-api.controller';
-import { OpenApiService } from 'src/core/open-api/open-api.service';
-import { AuthModule } from 'src/core/auth/auth.module';
-import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
-
-@Module({
-  imports: [ObjectMetadataModule, AuthModule],
-  controllers: [OpenApiController],
-  providers: [OpenApiService],
-})
-export class OpenApiModule {}
diff --git a/packages/twenty-server/src/core/open-api/open-api.service.spec.ts b/packages/twenty-server/src/core/open-api/open-api.service.spec.ts
deleted file mode 100644
index b4e37478dc4f..000000000000
--- a/packages/twenty-server/src/core/open-api/open-api.service.spec.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-
-import { OpenApiService } from 'src/core/open-api/open-api.service';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
-import { TokenService } from 'src/core/auth/services/token.service';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-
-describe('OpenApiService', () => {
-  let service: OpenApiService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        OpenApiService,
-        {
-          provide: TokenService,
-          useValue: {},
-        },
-        {
-          provide: ObjectMetadataService,
-          useValue: {},
-        },
-        {
-          provide: EnvironmentService,
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    service = module.get<OpenApiService>(OpenApiService);
-  });
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/core/open-api/open-api.service.ts b/packages/twenty-server/src/core/open-api/open-api.service.ts
deleted file mode 100644
index 55f8271b1ee4..000000000000
--- a/packages/twenty-server/src/core/open-api/open-api.service.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { Request } from 'express';
-import { OpenAPIV3_1 } from 'openapi-types';
-
-import { TokenService } from 'src/core/auth/services/token.service';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
-import { baseSchema } from 'src/core/open-api/utils/base-schema.utils';
-import {
-  computeManyResultPath,
-  computeSingleResultPath,
-} from 'src/core/open-api/utils/path.utils';
-import { getErrorResponses } from 'src/core/open-api/utils/get-error-responses.utils';
-import {
-  computeParameterComponents,
-  computeSchemaComponents,
-} from 'src/core/open-api/utils/components.utils';
-import { computeSchemaTags } from 'src/core/open-api/utils/compute-schema-tags.utils';
-import { computeWebhooks } from 'src/core/open-api/utils/computeWebhooks.utils';
-
-@Injectable()
-export class OpenApiService {
-  constructor(
-    private readonly tokenService: TokenService,
-    private readonly objectMetadataService: ObjectMetadataService,
-  ) {}
-
-  async generateCoreSchema(request: Request): Promise<OpenAPIV3_1.Document> {
-    const schema = baseSchema();
-
-    let objectMetadataItems;
-
-    try {
-      const { workspace } = await this.tokenService.validateToken(request);
-
-      objectMetadataItems =
-        await this.objectMetadataService.findManyWithinWorkspace(workspace.id);
-    } catch (err) {
-      return schema;
-    }
-
-    if (!objectMetadataItems.length) {
-      return schema;
-    }
-    schema.paths = objectMetadataItems.reduce((paths, item) => {
-      paths[`/${item.namePlural}`] = computeManyResultPath(item);
-      paths[`/${item.namePlural}/{id}`] = computeSingleResultPath(item);
-
-      return paths;
-    }, schema.paths as OpenAPIV3_1.PathsObject);
-
-    schema.webhooks = objectMetadataItems.reduce(
-      (paths, item) => {
-        paths[`Create ${item.nameSingular}`] = computeWebhooks('create', item);
-        paths[`Update ${item.nameSingular}`] = computeWebhooks('update', item);
-        paths[`Delete ${item.nameSingular}`] = computeWebhooks('delete', item);
-
-        return paths;
-      },
-      {} as Record<
-        string,
-        OpenAPIV3_1.PathItemObject | OpenAPIV3_1.ReferenceObject
-      >,
-    );
-
-    schema.tags = computeSchemaTags(objectMetadataItems);
-
-    schema.components = {
-      ...schema.components, // components.securitySchemes is defined in base Schema
-      schemas: computeSchemaComponents(objectMetadataItems),
-      parameters: computeParameterComponents(),
-      responses: {
-        '400': getErrorResponses('Invalid request'),
-        '401': getErrorResponses('Unauthorized'),
-      },
-    };
-
-    return schema;
-  }
-
-  async generateMetaDataSchema(): Promise<OpenAPIV3_1.Document> {
-    //TODO Add once Rest MetaData api is ready
-    const schema = baseSchema();
-
-    schema.tags = [{ name: 'placeholder' }];
-
-    return schema;
-  }
-}
diff --git a/packages/twenty-server/src/core/open-api/utils/__tests__/components.utils.spec.ts b/packages/twenty-server/src/core/open-api/utils/__tests__/components.utils.spec.ts
deleted file mode 100644
index d6f9c4733faf..000000000000
--- a/packages/twenty-server/src/core/open-api/utils/__tests__/components.utils.spec.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { computeSchemaComponents } from 'src/core/open-api/utils/components.utils';
-import { objectMetadataItem } from 'src/utils/utils-test/object-metadata-item';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-
-describe('computeSchemaComponents', () => {
-  it('should compute schema components', () => {
-    expect(
-      computeSchemaComponents([objectMetadataItem] as ObjectMetadataEntity[]),
-    ).toEqual({
-      ObjectName: {
-        type: 'object',
-        required: ['fieldNumber'],
-        example: { fieldNumber: '' },
-        properties: {
-          fieldCurrency: {
-            properties: {
-              amountMicros: { type: 'string' },
-              currencyCode: { type: 'string' },
-            },
-            type: 'object',
-          },
-          fieldLink: {
-            properties: {
-              label: { type: 'string' },
-              url: { type: 'string' },
-            },
-            type: 'object',
-          },
-          fieldNumber: {
-            type: 'number',
-          },
-          fieldString: {
-            type: 'string',
-          },
-        },
-      },
-    });
-  });
-});
diff --git a/packages/twenty-server/src/core/open-api/utils/components.utils.ts b/packages/twenty-server/src/core/open-api/utils/components.utils.ts
deleted file mode 100644
index 16a572fc6c0f..000000000000
--- a/packages/twenty-server/src/core/open-api/utils/components.utils.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-import { OpenAPIV3_1 } from 'openapi-types';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { capitalize } from 'src/utils/capitalize';
-import {
-  computeDepthParameters,
-  computeFilterParameters,
-  computeIdPathParameter,
-  computeLastCursorParameters,
-  computeLimitParameters,
-  computeOrderByParameters,
-} from 'src/core/open-api/utils/parameters.utils';
-
-type Property = OpenAPIV3_1.SchemaObject;
-
-type Properties = {
-  [name: string]: Property;
-};
-
-const getSchemaComponentsProperties = (
-  item: ObjectMetadataEntity,
-): Properties => {
-  return item.fields.reduce((node, field) => {
-    let itemProperty = {} as Property;
-
-    switch (field.type) {
-      case FieldMetadataType.UUID:
-      case FieldMetadataType.TEXT:
-      case FieldMetadataType.PHONE:
-      case FieldMetadataType.EMAIL:
-      case FieldMetadataType.DATE_TIME:
-        itemProperty.type = 'string';
-        break;
-      case FieldMetadataType.NUMBER:
-      case FieldMetadataType.NUMERIC:
-      case FieldMetadataType.PROBABILITY:
-      case FieldMetadataType.RATING:
-        itemProperty.type = 'number';
-        break;
-      case FieldMetadataType.BOOLEAN:
-        itemProperty.type = 'boolean';
-        break;
-      case FieldMetadataType.RELATION:
-        if (field.fromRelationMetadata?.toObjectMetadata.nameSingular) {
-          itemProperty = {
-            type: 'array',
-            items: {
-              $ref: `#/components/schemas/${capitalize(
-                field.fromRelationMetadata?.toObjectMetadata.nameSingular || '',
-              )}`,
-            },
-          };
-        }
-        break;
-      case FieldMetadataType.LINK:
-      case FieldMetadataType.CURRENCY:
-      case FieldMetadataType.FULL_NAME:
-        itemProperty = {
-          type: 'object',
-          properties: Object.keys(field.targetColumnMap).reduce(
-            (properties, key) => {
-              properties[key] = { type: 'string' };
-
-              return properties;
-            },
-            {} as Properties,
-          ),
-        };
-        break;
-      default:
-        itemProperty.type = 'string';
-        break;
-    }
-
-    if (field.description) {
-      itemProperty.description = field.description;
-    }
-
-    if (Object.keys(itemProperty).length) {
-      node[field.name] = itemProperty;
-    }
-
-    return node;
-  }, {} as Properties);
-};
-
-const getRequiredFields = (item: ObjectMetadataEntity): string[] => {
-  return item.fields.reduce((required, field) => {
-    if (!field.isNullable && field.defaultValue === null) {
-      required.push(field.name);
-
-      return required;
-    }
-
-    return required;
-  }, [] as string[]);
-};
-
-const computeSchemaComponent = (
-  item: ObjectMetadataEntity,
-): OpenAPIV3_1.SchemaObject => {
-  const result = {
-    type: 'object',
-    description: item.description,
-    properties: getSchemaComponentsProperties(item),
-    example: {},
-  } as OpenAPIV3_1.SchemaObject;
-
-  const requiredFields = getRequiredFields(item);
-
-  if (requiredFields?.length) {
-    result.required = requiredFields;
-    result.example = requiredFields.reduce(
-      (example, requiredField) => {
-        example[requiredField] = '';
-
-        return example;
-      },
-      {} as Record<string, string>,
-    );
-  }
-
-  return result;
-};
-
-export const computeSchemaComponents = (
-  objectMetadataItems: ObjectMetadataEntity[],
-): Record<string, OpenAPIV3_1.SchemaObject> => {
-  return objectMetadataItems.reduce(
-    (schemas, item) => {
-      schemas[capitalize(item.nameSingular)] = computeSchemaComponent(item);
-
-      return schemas;
-    },
-    {} as Record<string, OpenAPIV3_1.SchemaObject>,
-  );
-};
-
-export const computeParameterComponents = (): Record<
-  string,
-  OpenAPIV3_1.ParameterObject
-> => {
-  return {
-    idPath: computeIdPathParameter(),
-    lastCursor: computeLastCursorParameters(),
-    filter: computeFilterParameters(),
-    depth: computeDepthParameters(),
-    orderBy: computeOrderByParameters(),
-    limit: computeLimitParameters(),
-  };
-};
diff --git a/packages/twenty-server/src/core/open-api/utils/request-body.utils.ts b/packages/twenty-server/src/core/open-api/utils/request-body.utils.ts
deleted file mode 100644
index d79e8c609697..000000000000
--- a/packages/twenty-server/src/core/open-api/utils/request-body.utils.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { capitalize } from 'src/utils/capitalize';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-
-export const getRequestBody = (item: ObjectMetadataEntity) => {
-  return {
-    description: 'body',
-    required: true,
-    content: {
-      'application/json': {
-        schema: {
-          $ref: `#/components/schemas/${capitalize(item.nameSingular)}`,
-        },
-      },
-    },
-  };
-};
diff --git a/packages/twenty-server/src/core/open-api/utils/responses.utils.ts b/packages/twenty-server/src/core/open-api/utils/responses.utils.ts
deleted file mode 100644
index 3dd683cf1407..000000000000
--- a/packages/twenty-server/src/core/open-api/utils/responses.utils.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { capitalize } from 'src/utils/capitalize';
-
-export const getManyResultResponse200 = (item: ObjectMetadataEntity) => {
-  return {
-    description: 'Successful operation',
-    content: {
-      'application/json': {
-        schema: {
-          type: 'object',
-          properties: {
-            data: {
-              type: 'object',
-              properties: {
-                [item.namePlural]: {
-                  type: 'array',
-                  items: {
-                    $ref: `#/components/schemas/${capitalize(
-                      item.nameSingular,
-                    )}`,
-                  },
-                },
-              },
-            },
-          },
-          example: {
-            data: {
-              [item.namePlural]: [
-                `${capitalize(item.nameSingular)}Object`,
-                '...',
-              ],
-            },
-          },
-        },
-      },
-    },
-  };
-};
-
-export const getSingleResultSuccessResponse = (item: ObjectMetadataEntity) => {
-  return {
-    description: 'Successful operation',
-    content: {
-      'application/json': {
-        schema: {
-          type: 'object',
-          properties: {
-            data: {
-              type: 'object',
-              properties: {
-                [item.nameSingular]: {
-                  $ref: `#/components/schemas/${capitalize(item.nameSingular)}`,
-                },
-              },
-            },
-          },
-        },
-      },
-    },
-  };
-};
-
-export const getDeleteResponse200 = (item) => {
-  return {
-    description: 'Successful operation',
-    content: {
-      'application/json': {
-        schema: {
-          type: 'object',
-          properties: {
-            data: {
-              type: 'object',
-              properties: {
-                [item.nameSingular]: {
-                  type: 'object',
-                  properties: {
-                    id: {
-                      type: 'string',
-                      format: 'uuid',
-                    },
-                  },
-                },
-              },
-            },
-          },
-        },
-      },
-    },
-  };
-};
-
-export const getJsonResponse = () => {
-  return {
-    description: 'Successful operation',
-    content: {
-      'application/json': {
-        schema: {
-          type: 'object',
-        },
-      },
-    },
-  };
-};
diff --git a/packages/twenty-server/src/core/quick-actions/quick-actions.module.ts b/packages/twenty-server/src/core/quick-actions/quick-actions.module.ts
deleted file mode 100644
index 20065c53ce46..000000000000
--- a/packages/twenty-server/src/core/quick-actions/quick-actions.module.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Module } from '@nestjs/common';
-import { HttpModule } from '@nestjs/axios';
-
-import { IntelligenceService } from 'src/core/quick-actions/intelligence.service';
-import { QuickActionsService } from 'src/core/quick-actions/quick-actions.service';
-import { WorkspaceQueryRunnerModule } from 'src/workspace/workspace-query-runner/workspace-query-runner.module';
-
-@Module({
-  imports: [WorkspaceQueryRunnerModule, HttpModule],
-  controllers: [],
-  providers: [QuickActionsService, IntelligenceService],
-  exports: [QuickActionsService, IntelligenceService],
-})
-export class QuickActionsModule {}
diff --git a/packages/twenty-server/src/core/refresh-token/dtos/create-refresh-token.input.ts b/packages/twenty-server/src/core/refresh-token/dtos/create-refresh-token.input.ts
deleted file mode 100644
index a31883037abf..000000000000
--- a/packages/twenty-server/src/core/refresh-token/dtos/create-refresh-token.input.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Field, InputType } from '@nestjs/graphql';
-
-import { IsDate, IsNotEmpty } from 'class-validator';
-
-@InputType()
-export class CreateRefreshTokenInput {
-  @IsDate()
-  @IsNotEmpty()
-  @Field()
-  expiresAt: Date;
-}
diff --git a/packages/twenty-server/src/core/refresh-token/hooks/before-create-one-refresh-token.hook.ts b/packages/twenty-server/src/core/refresh-token/hooks/before-create-one-refresh-token.hook.ts
deleted file mode 100644
index 7399e402f65b..000000000000
--- a/packages/twenty-server/src/core/refresh-token/hooks/before-create-one-refresh-token.hook.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {
-  BeforeCreateOneHook,
-  CreateOneInputType,
-} from '@ptc-org/nestjs-query-graphql';
-import { v4 as uuidv4 } from 'uuid';
-
-import { RefreshToken } from 'src/core/refresh-token/refresh-token.entity';
-
-export class BeforeCreateOneRefreshToken<T extends RefreshToken>
-  implements BeforeCreateOneHook<T, any>
-{
-  async run(
-    instance: CreateOneInputType<T>,
-    context: any,
-  ): Promise<CreateOneInputType<T>> {
-    const userId = context?.req?.user?.user?.id;
-
-    instance.input.userId = userId;
-    // FIXME: These fields should be autogenerated, we need to run a migration for this
-    instance.input.id = uuidv4();
-    instance.input.updatedAt = new Date();
-
-    return instance;
-  }
-}
diff --git a/packages/twenty-server/src/core/refresh-token/refresh-token.auto-resolver-opts.ts b/packages/twenty-server/src/core/refresh-token/refresh-token.auto-resolver-opts.ts
deleted file mode 100644
index 5b19f5eb2b95..000000000000
--- a/packages/twenty-server/src/core/refresh-token/refresh-token.auto-resolver-opts.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import {
-  AutoResolverOpts,
-  PagingStrategies,
-  ReadResolverOpts,
-} from '@ptc-org/nestjs-query-graphql';
-
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-
-import { RefreshToken } from './refresh-token.entity';
-
-import { CreateRefreshTokenInput } from './dtos/create-refresh-token.input';
-
-export const refreshTokenAutoResolverOpts: AutoResolverOpts<
-  any,
-  any,
-  unknown,
-  unknown,
-  ReadResolverOpts<any>,
-  PagingStrategies
->[] = [
-  {
-    EntityClass: RefreshToken,
-    DTOClass: RefreshToken,
-    CreateDTOClass: CreateRefreshTokenInput,
-    enableTotalCount: true,
-    pagingStrategy: PagingStrategies.CURSOR,
-    read: {
-      many: { disabled: true },
-      one: { disabled: true },
-    },
-    create: {
-      many: { disabled: true },
-    },
-    update: {
-      many: { disabled: true },
-      one: { disabled: true },
-    },
-    delete: { many: { disabled: true }, one: { disabled: true } },
-    guards: [JwtAuthGuard],
-  },
-];
diff --git a/packages/twenty-server/src/core/refresh-token/refresh-token.entity.ts b/packages/twenty-server/src/core/refresh-token/refresh-token.entity.ts
deleted file mode 100644
index 4ed595798450..000000000000
--- a/packages/twenty-server/src/core/refresh-token/refresh-token.entity.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Field, ID, ObjectType } from '@nestjs/graphql';
-
-import {
-  Entity,
-  Column,
-  PrimaryGeneratedColumn,
-  ManyToOne,
-  JoinColumn,
-  CreateDateColumn,
-  UpdateDateColumn,
-} from 'typeorm';
-import { BeforeCreateOne, IDField } from '@ptc-org/nestjs-query-graphql';
-
-import { User } from 'src/core/user/user.entity';
-
-import { BeforeCreateOneRefreshToken } from './hooks/before-create-one-refresh-token.hook';
-
-@Entity({ name: 'refreshToken', schema: 'core' })
-@ObjectType('RefreshToken')
-@BeforeCreateOne(BeforeCreateOneRefreshToken)
-export class RefreshToken {
-  @IDField(() => ID)
-  @PrimaryGeneratedColumn('uuid')
-  id: string;
-
-  @ManyToOne(() => User, (user) => user.refreshTokens, {
-    onDelete: 'CASCADE',
-  })
-  @JoinColumn({ name: 'userId' })
-  user: User;
-
-  @Column()
-  userId: string;
-
-  @Field()
-  @Column('timestamp with time zone')
-  expiresAt: Date;
-
-  @Column('timestamp with time zone', { nullable: true })
-  deletedAt: Date | null;
-
-  @Column('timestamp with time zone', { nullable: true })
-  revokedAt: Date | null;
-
-  @Field()
-  @CreateDateColumn({ type: 'timestamp with time zone' })
-  createdAt: Date;
-
-  @Field()
-  @UpdateDateColumn({ type: 'timestamp with time zone' })
-  updatedAt: Date;
-}
diff --git a/packages/twenty-server/src/core/refresh-token/refresh-token.module.ts b/packages/twenty-server/src/core/refresh-token/refresh-token.module.ts
deleted file mode 100644
index 0e23218955ba..000000000000
--- a/packages/twenty-server/src/core/refresh-token/refresh-token.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { NestjsQueryGraphQLModule } from '@ptc-org/nestjs-query-graphql';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-
-import { RefreshToken } from './refresh-token.entity';
-import { refreshTokenAutoResolverOpts } from './refresh-token.auto-resolver-opts';
-
-import { RefreshTokenService } from './services/refresh-token.service';
-
-@Module({
-  imports: [
-    NestjsQueryGraphQLModule.forFeature({
-      imports: [NestjsQueryTypeOrmModule.forFeature([RefreshToken], 'core')],
-      services: [RefreshTokenService],
-      resolvers: refreshTokenAutoResolverOpts,
-    }),
-  ],
-})
-export class RefreshTokenModule {}
diff --git a/packages/twenty-server/src/core/refresh-token/services/refresh-token.service.spec.ts b/packages/twenty-server/src/core/refresh-token/services/refresh-token.service.spec.ts
deleted file mode 100644
index b563ca5504c8..000000000000
--- a/packages/twenty-server/src/core/refresh-token/services/refresh-token.service.spec.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { getRepositoryToken } from '@nestjs/typeorm';
-
-import { RefreshToken } from 'src/core/refresh-token/refresh-token.entity';
-
-import { RefreshTokenService } from './refresh-token.service';
-
-describe('RefreshTokenService', () => {
-  let service: RefreshTokenService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        RefreshTokenService,
-        {
-          provide: getRepositoryToken(RefreshToken),
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    service = module.get<RefreshTokenService>(RefreshTokenService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/core/refresh-token/services/refresh-token.service.ts b/packages/twenty-server/src/core/refresh-token/services/refresh-token.service.ts
deleted file mode 100644
index faa99c3cbd33..000000000000
--- a/packages/twenty-server/src/core/refresh-token/services/refresh-token.service.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
-
-import { RefreshToken } from 'src/core/refresh-token/refresh-token.entity';
-
-export class RefreshTokenService extends TypeOrmQueryService<RefreshToken> {}
diff --git a/packages/twenty-server/src/core/user-workspace/user-workspace.entity.ts b/packages/twenty-server/src/core/user-workspace/user-workspace.entity.ts
deleted file mode 100644
index b6e4bf08b34f..000000000000
--- a/packages/twenty-server/src/core/user-workspace/user-workspace.entity.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Field, ID, ObjectType } from '@nestjs/graphql';
-
-import { IDField } from '@ptc-org/nestjs-query-graphql';
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  JoinColumn,
-  PrimaryGeneratedColumn,
-  Unique,
-  UpdateDateColumn,
-} from 'typeorm';
-
-import { User } from 'src/core/user/user.entity';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-
-@Entity({ name: 'userWorkspace', schema: 'core' })
-@ObjectType('UserWorkspace')
-@Unique('IndexOnUserIdAndWorkspaceIdUnique', ['userId', 'workspaceId'])
-export class UserWorkspace {
-  @IDField(() => ID)
-  @PrimaryGeneratedColumn('uuid')
-  id: string;
-
-  @JoinColumn({ name: 'userId' })
-  user: User;
-
-  @Column()
-  userId: string;
-
-  @JoinColumn({ name: 'workspaceId' })
-  workspace: Workspace;
-
-  @Column()
-  workspaceId: string;
-
-  @Field()
-  @CreateDateColumn({ type: 'timestamp with time zone' })
-  createdAt: Date;
-
-  @Field()
-  @UpdateDateColumn({ type: 'timestamp with time zone' })
-  updatedAt: Date;
-
-  @Field({ nullable: true })
-  @Column('timestamp with time zone', { nullable: true })
-  deletedAt: Date;
-}
diff --git a/packages/twenty-server/src/core/user-workspace/user-workspace.module.ts b/packages/twenty-server/src/core/user-workspace/user-workspace.module.ts
deleted file mode 100644
index 836e83c51765..000000000000
--- a/packages/twenty-server/src/core/user-workspace/user-workspace.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { NestjsQueryGraphQLModule } from '@ptc-org/nestjs-query-graphql';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-
-import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { UserWorkspace } from 'src/core/user-workspace/user-workspace.entity';
-import { UserWorkspaceService } from 'src/core/user-workspace/user-workspace.service';
-import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-
-@Module({
-  imports: [
-    NestjsQueryGraphQLModule.forFeature({
-      imports: [
-        NestjsQueryTypeOrmModule.forFeature([UserWorkspace], 'core'),
-        TypeORMModule,
-        DataSourceModule,
-        WorkspaceDataSourceModule,
-      ],
-      services: [UserWorkspaceService],
-    }),
-  ],
-  exports: [UserWorkspaceService],
-  providers: [UserWorkspaceService],
-})
-export class UserWorkspaceModule {}
diff --git a/packages/twenty-server/src/core/user/dtos/workspace-member.dto.ts b/packages/twenty-server/src/core/user/dtos/workspace-member.dto.ts
deleted file mode 100644
index a3c069c72452..000000000000
--- a/packages/twenty-server/src/core/user/dtos/workspace-member.dto.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Field, ID, ObjectType } from '@nestjs/graphql';
-
-import { IDField } from '@ptc-org/nestjs-query-graphql';
-
-@ObjectType('FullName')
-export class FullName {
-  @Field({ nullable: false })
-  firstName: string;
-
-  @Field({ nullable: false })
-  lastName: string;
-}
-
-@ObjectType('WorkspaceMember')
-export class WorkspaceMember {
-  @IDField(() => ID)
-  id: string;
-
-  @Field(() => FullName)
-  name: FullName;
-
-  @Field({ nullable: false })
-  colorScheme: string;
-
-  @Field({ nullable: true })
-  avatarUrl: string;
-
-  @Field({ nullable: false })
-  locale: string;
-}
diff --git a/packages/twenty-server/src/core/user/services/user.service.spec.ts b/packages/twenty-server/src/core/user/services/user.service.spec.ts
deleted file mode 100644
index fd59dc7d2067..000000000000
--- a/packages/twenty-server/src/core/user/services/user.service.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { getRepositoryToken } from '@nestjs/typeorm';
-
-import { User } from 'src/core/user/user.entity';
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
-import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-
-import { UserService } from './user.service';
-
-describe('UserService', () => {
-  let service: UserService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        UserService,
-        {
-          provide: getRepositoryToken(User, 'core'),
-          useValue: {},
-        },
-        {
-          provide: DataSourceService,
-          useValue: {},
-        },
-        {
-          provide: TypeORMService,
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    service = module.get<UserService>(UserService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/core/user/services/user.service.ts b/packages/twenty-server/src/core/user/services/user.service.ts
deleted file mode 100644
index 3ffbf816ab9b..000000000000
--- a/packages/twenty-server/src/core/user/services/user.service.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
-import { Repository } from 'typeorm';
-
-import { assert } from 'src/utils/assert';
-import { User } from 'src/core/user/user.entity';
-import { WorkspaceMember } from 'src/core/user/dtos/workspace-member.dto';
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
-import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { DataSourceEntity } from 'src/metadata/data-source/data-source.entity';
-
-export class UserService extends TypeOrmQueryService<User> {
-  constructor(
-    @InjectRepository(User, 'core')
-    private readonly userRepository: Repository<User>,
-    private readonly dataSourceService: DataSourceService,
-    private readonly typeORMService: TypeORMService,
-  ) {
-    super(userRepository);
-  }
-
-  async loadWorkspaceMember(user: User) {
-    const dataSourcesMetadata =
-      await this.dataSourceService.getDataSourcesMetadataFromWorkspaceId(
-        user.defaultWorkspace.id,
-      );
-
-    if (!dataSourcesMetadata.length) {
-      return;
-    }
-
-    if (dataSourcesMetadata.length > 1) {
-      throw new Error(
-        `user '${user.id}' default workspace '${user.defaultWorkspace.id}' has multiple data source metadata`,
-      );
-    }
-
-    const dataSourceMetadata = dataSourcesMetadata[0];
-
-    const workspaceDataSource =
-      await this.typeORMService.connectToDataSource(dataSourceMetadata);
-
-    const workspaceMembers = await workspaceDataSource?.query(
-      `SELECT * FROM ${dataSourceMetadata.schema}."workspaceMember" WHERE "userId" = '${user.id}'`,
-    );
-
-    if (!workspaceMembers.length) {
-      return;
-    }
-
-    assert(
-      workspaceMembers.length === 1,
-      'WorkspaceMember not found or too many found',
-    );
-
-    const userWorkspaceMember = new WorkspaceMember();
-
-    userWorkspaceMember.id = workspaceMembers[0].id;
-    userWorkspaceMember.colorScheme = workspaceMembers[0].colorScheme;
-    userWorkspaceMember.locale = workspaceMembers[0].locale;
-    userWorkspaceMember.avatarUrl = workspaceMembers[0].avatarUrl;
-    userWorkspaceMember.name = {
-      firstName: workspaceMembers[0].nameFirstName,
-      lastName: workspaceMembers[0].nameLastName,
-    };
-
-    return userWorkspaceMember;
-  }
-
-  async loadWorkspaceMembers(dataSource: DataSourceEntity) {
-    const workspaceDataSource =
-      await this.typeORMService.connectToDataSource(dataSource);
-
-    return await workspaceDataSource?.query(
-      `
-      SELECT * 
-      FROM ${dataSource.schema}."workspaceMember" AS s 
-      INNER JOIN core.user AS u 
-      ON s."userId" = u.id
-    `,
-    );
-  }
-
-  async deleteUser(userId: string): Promise<User> {
-    const user = await this.userRepository.findOneBy({
-      id: userId,
-    });
-
-    assert(user, 'User not found');
-
-    await this.userRepository.delete(user.id);
-
-    return user;
-  }
-}
diff --git a/packages/twenty-server/src/core/user/user.entity.ts b/packages/twenty-server/src/core/user/user.entity.ts
deleted file mode 100644
index 903938c133e9..000000000000
--- a/packages/twenty-server/src/core/user/user.entity.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { ID, Field, ObjectType } from '@nestjs/graphql';
-
-import {
-  Entity,
-  Column,
-  PrimaryGeneratedColumn,
-  CreateDateColumn,
-  UpdateDateColumn,
-  OneToMany,
-  ManyToOne,
-} from 'typeorm';
-import { IDField } from '@ptc-org/nestjs-query-graphql';
-
-import { RefreshToken } from 'src/core/refresh-token/refresh-token.entity';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { WorkspaceMember } from 'src/core/user/dtos/workspace-member.dto';
-
-@Entity({ name: 'user', schema: 'core' })
-@ObjectType('User')
-export class User {
-  @IDField(() => ID)
-  @PrimaryGeneratedColumn('uuid')
-  id: string;
-
-  @Field()
-  @Column({ default: '' })
-  firstName: string;
-
-  @Field()
-  @Column({ default: '' })
-  lastName: string;
-
-  @Field()
-  @Column()
-  email: string;
-
-  @Field({ nullable: true })
-  @Column({ nullable: true })
-  defaultAvatarUrl: string;
-
-  @Field()
-  @Column({ default: false })
-  emailVerified: boolean;
-
-  @Field({ nullable: true })
-  @Column({ default: false })
-  disabled: boolean;
-
-  @Field({ nullable: true })
-  @Column({ nullable: true })
-  passwordHash: string;
-
-  @Field()
-  @Column({ default: false })
-  canImpersonate: boolean;
-
-  @Field()
-  @CreateDateColumn({ type: 'timestamp with time zone' })
-  createdAt: Date;
-
-  @Field()
-  @UpdateDateColumn({ type: 'timestamp with time zone' })
-  updatedAt: Date;
-
-  @Field({ nullable: true })
-  @Column({ nullable: true })
-  deletedAt: Date;
-
-  @Field(() => Workspace, { nullable: false })
-  @ManyToOne(() => Workspace, (workspace) => workspace.users, {
-    onDelete: 'SET NULL',
-  })
-  defaultWorkspace: Workspace;
-
-  @Field({ nullable: true })
-  @Column({ nullable: true })
-  passwordResetToken: string;
-
-  @Field({ nullable: true })
-  @Column({ nullable: true })
-  passwordResetTokenExpiresAt: Date;
-
-  @OneToMany(() => RefreshToken, (refreshToken) => refreshToken.user, {
-    cascade: true,
-  })
-  refreshTokens: RefreshToken[];
-
-  @Field(() => WorkspaceMember, { nullable: true })
-  workspaceMember: WorkspaceMember;
-}
diff --git a/packages/twenty-server/src/core/user/user.module.ts b/packages/twenty-server/src/core/user/user.module.ts
deleted file mode 100644
index ea98ff03e089..000000000000
--- a/packages/twenty-server/src/core/user/user.module.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/* eslint-disable no-restricted-imports */
-import { Module } from '@nestjs/common';
-
-import { NestjsQueryGraphQLModule } from '@ptc-org/nestjs-query-graphql';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-
-import { FileModule } from 'src/core/file/file.module';
-import { User } from 'src/core/user/user.entity';
-import { UserResolver } from 'src/core/user/user.resolver';
-import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
-import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-
-import { userAutoResolverOpts } from './user.auto-resolver-opts';
-
-import { UserService } from './services/user.service';
-
-@Module({
-  imports: [
-    NestjsQueryGraphQLModule.forFeature({
-      imports: [
-        NestjsQueryTypeOrmModule.forFeature([User], 'core'),
-        TypeORMModule,
-      ],
-      resolvers: userAutoResolverOpts,
-    }),
-    DataSourceModule,
-    FileModule,
-  ],
-  exports: [UserService],
-  providers: [UserService, UserResolver, TypeORMService],
-})
-export class UserModule {}
diff --git a/packages/twenty-server/src/core/user/user.resolver.ts b/packages/twenty-server/src/core/user/user.resolver.ts
deleted file mode 100644
index d936d68d671d..000000000000
--- a/packages/twenty-server/src/core/user/user.resolver.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import {
-  Resolver,
-  Query,
-  Args,
-  Parent,
-  ResolveField,
-  Mutation,
-} from '@nestjs/graphql';
-import { ForbiddenException, UseGuards } from '@nestjs/common';
-
-import crypto from 'crypto';
-
-import { FileUpload, GraphQLUpload } from 'graphql-upload';
-
-import { SupportDriver } from 'src/integrations/environment/interfaces/support.interface';
-import { FileFolder } from 'src/core/file/interfaces/file-folder.interface';
-
-import { AuthUser } from 'src/decorators/auth/auth-user.decorator';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { streamToBuffer } from 'src/utils/stream-to-buffer';
-import { FileUploadService } from 'src/core/file/services/file-upload.service';
-import { assert } from 'src/utils/assert';
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-import { User } from 'src/core/user/user.entity';
-import { WorkspaceMember } from 'src/core/user/dtos/workspace-member.dto';
-
-import { UserService } from './services/user.service';
-
-const getHMACKey = (email?: string, key?: string | null) => {
-  if (!email || !key) return null;
-
-  const hmac = crypto.createHmac('sha256', key);
-
-  return hmac.update(email).digest('hex');
-};
-
-@UseGuards(JwtAuthGuard)
-@Resolver(() => User)
-export class UserResolver {
-  constructor(
-    private readonly userService: UserService,
-    private readonly environmentService: EnvironmentService,
-    private readonly fileUploadService: FileUploadService,
-  ) {}
-
-  @Query(() => User)
-  async currentUser(@AuthUser() { id }: User) {
-    const user = await this.userService.findById(id, {
-      relations: [{ name: 'defaultWorkspace', query: {} }],
-    });
-
-    assert(user, 'User not found');
-
-    return user;
-  }
-
-  @ResolveField(() => WorkspaceMember, {
-    nullable: true,
-  })
-  async workspaceMember(
-    @Parent() user: User,
-  ): Promise<WorkspaceMember | undefined> {
-    return this.userService.loadWorkspaceMember(user);
-  }
-
-  @ResolveField(() => String, {
-    nullable: true,
-  })
-  supportUserHash(@Parent() parent: User): string | null {
-    if (this.environmentService.getSupportDriver() !== SupportDriver.Front) {
-      return null;
-    }
-    const key = this.environmentService.getSupportFrontHMACKey();
-
-    return getHMACKey(parent.email, key);
-  }
-
-  @Mutation(() => String)
-  async uploadProfilePicture(
-    @AuthUser() { id }: User,
-    @Args({ name: 'file', type: () => GraphQLUpload })
-    { createReadStream, filename, mimetype }: FileUpload,
-  ): Promise<string> {
-    if (!id) {
-      throw new Error('User not found');
-    }
-
-    const stream = createReadStream();
-    const buffer = await streamToBuffer(stream);
-    const fileFolder = FileFolder.ProfilePicture;
-
-    const { paths } = await this.fileUploadService.uploadImage({
-      file: buffer,
-      filename,
-      mimeType: mimetype,
-      fileFolder,
-    });
-
-    return paths[0];
-  }
-
-  @Mutation(() => User)
-  async deleteUser(@AuthUser() { id: userId, defaultWorkspace }: User) {
-    // Get the list of demo workspace IDs
-    const demoWorkspaceIds = this.environmentService.getDemoWorkspaceIds();
-
-    const currentUserWorkspaceId = defaultWorkspace.id;
-
-    // Check if the user's default workspace ID is in the list of demo workspace IDs
-    if (demoWorkspaceIds.includes(currentUserWorkspaceId)) {
-      throw new ForbiddenException(
-        'Deletion of users with a default demo workspace is not allowed.',
-      );
-    }
-
-    // Proceed with user deletion
-    return this.userService.deleteUser(userId);
-  }
-}
diff --git a/packages/twenty-server/src/core/workspace/services/workspace.service.spec.ts b/packages/twenty-server/src/core/workspace/services/workspace.service.spec.ts
deleted file mode 100644
index 35894c9fef34..000000000000
--- a/packages/twenty-server/src/core/workspace/services/workspace.service.spec.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { getRepositoryToken } from '@nestjs/typeorm';
-
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { WorkspaceManagerService } from 'src/workspace/workspace-manager/workspace-manager.service';
-import { BillingService } from 'src/core/billing/billing.service';
-import { UserWorkspaceService } from 'src/core/user-workspace/user-workspace.service';
-
-import { WorkspaceService } from './workspace.service';
-
-describe('WorkspaceService', () => {
-  let service: WorkspaceService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        WorkspaceService,
-        {
-          provide: getRepositoryToken(Workspace, 'core'),
-          useValue: {},
-        },
-        {
-          provide: WorkspaceManagerService,
-          useValue: {},
-        },
-        {
-          provide: UserWorkspaceService,
-          useValue: {},
-        },
-        {
-          provide: BillingService,
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    service = module.get<WorkspaceService>(WorkspaceService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/core/workspace/services/workspace.service.ts b/packages/twenty-server/src/core/workspace/services/workspace.service.ts
deleted file mode 100644
index ea5bd61636f7..000000000000
--- a/packages/twenty-server/src/core/workspace/services/workspace.service.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-import { BadRequestException } from '@nestjs/common';
-
-import assert from 'assert';
-
-import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
-import { Repository } from 'typeorm';
-
-import { WorkspaceManagerService } from 'src/workspace/workspace-manager/workspace-manager.service';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { User } from 'src/core/user/user.entity';
-import { ActivateWorkspaceInput } from 'src/core/workspace/dtos/activate-workspace-input';
-import { UserWorkspaceService } from 'src/core/user-workspace/user-workspace.service';
-import { BillingService } from 'src/core/billing/billing.service';
-
-export class WorkspaceService extends TypeOrmQueryService<Workspace> {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    private readonly workspaceRepository: Repository<Workspace>,
-    private readonly workspaceManagerService: WorkspaceManagerService,
-    private readonly userWorkspaceService: UserWorkspaceService,
-    private readonly billingService: BillingService,
-  ) {
-    super(workspaceRepository);
-  }
-
-  async activateWorkspace(user: User, data: ActivateWorkspaceInput) {
-    if (!data.displayName || !data.displayName.length) {
-      throw new BadRequestException("'displayName' not provided");
-    }
-    await this.workspaceRepository.update(user.defaultWorkspace.id, {
-      displayName: data.displayName,
-    });
-    await this.workspaceManagerService.init(user.defaultWorkspace.id);
-    await this.userWorkspaceService.createWorkspaceMember(
-      user.defaultWorkspace.id,
-      user,
-    );
-
-    return user.defaultWorkspace;
-  }
-
-  async isWorkspaceActivated(id: string): Promise<boolean> {
-    return await this.workspaceManagerService.doesDataSourceExist(id);
-  }
-
-  async deleteWorkspace(id: string, shouldDeleteCoreWorkspace = true) {
-    const workspace = await this.workspaceRepository.findOneBy({ id });
-
-    assert(workspace, 'Workspace not found');
-
-    await this.billingService.deleteSubscription(workspace.id);
-
-    await this.workspaceManagerService.delete(id);
-    if (shouldDeleteCoreWorkspace) {
-      await this.workspaceRepository.delete(id);
-    }
-
-    return workspace;
-  }
-}
diff --git a/packages/twenty-server/src/core/workspace/workspace.entity.ts b/packages/twenty-server/src/core/workspace/workspace.entity.ts
deleted file mode 100644
index d3efe36d3077..000000000000
--- a/packages/twenty-server/src/core/workspace/workspace.entity.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Field, ID, ObjectType } from '@nestjs/graphql';
-
-import { IDField, UnPagedRelation } from '@ptc-org/nestjs-query-graphql';
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  OneToMany,
-  OneToOne,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn,
-} from 'typeorm';
-import Stripe from 'stripe';
-
-import { User } from 'src/core/user/user.entity';
-import { FeatureFlagEntity } from 'src/core/feature-flag/feature-flag.entity';
-import { BillingSubscription } from 'src/core/billing/entities/billing-subscription.entity';
-
-@Entity({ name: 'workspace', schema: 'core' })
-@ObjectType('Workspace')
-@UnPagedRelation('featureFlags', () => FeatureFlagEntity, { nullable: true })
-export class Workspace {
-  @IDField(() => ID)
-  @PrimaryGeneratedColumn('uuid')
-  id: string;
-
-  @Field({ nullable: true })
-  @Column({ nullable: true })
-  domainName?: string;
-
-  @Field({ nullable: true })
-  @Column({ nullable: true })
-  displayName?: string;
-
-  @Field({ nullable: true })
-  @Column({ nullable: true })
-  logo?: string;
-
-  @Field({ nullable: true })
-  @Column({ nullable: true })
-  inviteHash?: string;
-
-  @Field({ nullable: true })
-  @Column({ nullable: true })
-  deletedAt?: Date;
-
-  @Field()
-  @CreateDateColumn({ type: 'timestamp with time zone' })
-  createdAt: Date;
-
-  @Field()
-  @UpdateDateColumn({ type: 'timestamp with time zone' })
-  updatedAt: Date;
-
-  @OneToMany(() => User, (user) => user.defaultWorkspace)
-  users: User[];
-
-  @Field()
-  @Column({ default: true })
-  allowImpersonation: boolean;
-
-  @OneToMany(() => FeatureFlagEntity, (featureFlag) => featureFlag.workspace)
-  featureFlags: FeatureFlagEntity[];
-
-  @Field()
-  @Column({ default: 'incomplete' })
-  subscriptionStatus: Stripe.Subscription.Status;
-
-  @Field()
-  activationStatus: 'active' | 'inactive';
-
-  @OneToOne(
-    () => BillingSubscription,
-    (billingSubscription) => billingSubscription.workspace,
-  )
-  billingSubscription: BillingSubscription;
-}
diff --git a/packages/twenty-server/src/core/workspace/workspace.module.ts b/packages/twenty-server/src/core/workspace/workspace.module.ts
deleted file mode 100644
index 6b2759f35ec5..000000000000
--- a/packages/twenty-server/src/core/workspace/workspace.module.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { NestjsQueryGraphQLModule } from '@ptc-org/nestjs-query-graphql';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-
-import { FileModule } from 'src/core/file/file.module';
-import { WorkspaceManagerModule } from 'src/workspace/workspace-manager/workspace-manager.module';
-import { WorkspaceResolver } from 'src/core/workspace/workspace.resolver';
-import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { FeatureFlagEntity } from 'src/core/feature-flag/feature-flag.entity';
-import { UserWorkspaceModule } from 'src/core/user-workspace/user-workspace.module';
-import { BillingModule } from 'src/core/billing/billing.module';
-
-import { Workspace } from './workspace.entity';
-import { workspaceAutoResolverOpts } from './workspace.auto-resolver-opts';
-
-import { WorkspaceService } from './services/workspace.service';
-
-@Module({
-  imports: [
-    TypeORMModule,
-    NestjsQueryGraphQLModule.forFeature({
-      imports: [
-        BillingModule,
-        FileModule,
-        NestjsQueryTypeOrmModule.forFeature(
-          [Workspace, FeatureFlagEntity],
-          'core',
-        ),
-        UserWorkspaceModule,
-        WorkspaceManagerModule,
-      ],
-      services: [WorkspaceService],
-      resolvers: workspaceAutoResolverOpts,
-    }),
-  ],
-  exports: [WorkspaceService],
-  providers: [WorkspaceResolver, WorkspaceService],
-})
-export class WorkspaceModule {}
diff --git a/packages/twenty-server/src/core/workspace/workspace.resolver.ts b/packages/twenty-server/src/core/workspace/workspace.resolver.ts
deleted file mode 100644
index 58085cbbceaa..000000000000
--- a/packages/twenty-server/src/core/workspace/workspace.resolver.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import {
-  Resolver,
-  Query,
-  Args,
-  Mutation,
-  ResolveField,
-  Parent,
-} from '@nestjs/graphql';
-import { ForbiddenException, UseGuards } from '@nestjs/common';
-
-import { FileUpload, GraphQLUpload } from 'graphql-upload';
-
-import { FileFolder } from 'src/core/file/interfaces/file-folder.interface';
-
-import { streamToBuffer } from 'src/utils/stream-to-buffer';
-import { FileUploadService } from 'src/core/file/services/file-upload.service';
-import { AuthWorkspace } from 'src/decorators/auth/auth-workspace.decorator';
-import { assert } from 'src/utils/assert';
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-import { UpdateWorkspaceInput } from 'src/core/workspace/dtos/update-workspace-input';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { User } from 'src/core/user/user.entity';
-import { AuthUser } from 'src/decorators/auth/auth-user.decorator';
-import { ActivateWorkspaceInput } from 'src/core/workspace/dtos/activate-workspace-input';
-
-import { Workspace } from './workspace.entity';
-
-import { WorkspaceService } from './services/workspace.service';
-
-@UseGuards(JwtAuthGuard)
-@Resolver(() => Workspace)
-export class WorkspaceResolver {
-  constructor(
-    private readonly workspaceService: WorkspaceService,
-    private readonly fileUploadService: FileUploadService,
-    private readonly environmentService: EnvironmentService,
-  ) {}
-
-  @Query(() => Workspace)
-  async currentWorkspace(@AuthWorkspace() { id }: Workspace) {
-    const workspace = await this.workspaceService.findById(id);
-
-    assert(workspace, 'User not found');
-
-    return workspace;
-  }
-
-  @Mutation(() => Workspace)
-  @UseGuards(JwtAuthGuard)
-  async activateWorkspace(
-    @Args('data') data: ActivateWorkspaceInput,
-    @AuthUser() user: User,
-  ) {
-    return await this.workspaceService.activateWorkspace(user, data);
-  }
-
-  @Mutation(() => Workspace)
-  async updateWorkspace(
-    @Args('data') data: UpdateWorkspaceInput,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
-    return this.workspaceService.updateOne(workspace.id, data);
-  }
-
-  @Mutation(() => String)
-  async uploadWorkspaceLogo(
-    @AuthWorkspace() { id }: Workspace,
-    @Args({ name: 'file', type: () => GraphQLUpload })
-    { createReadStream, filename, mimetype }: FileUpload,
-  ): Promise<string> {
-    const stream = createReadStream();
-    const buffer = await streamToBuffer(stream);
-    const fileFolder = FileFolder.WorkspaceLogo;
-
-    const { paths } = await this.fileUploadService.uploadImage({
-      file: buffer,
-      filename,
-      mimeType: mimetype,
-      fileFolder,
-    });
-
-    await this.workspaceService.updateOne(id, {
-      logo: paths[0],
-    });
-
-    return paths[0];
-  }
-
-  @Mutation(() => Workspace)
-  async deleteCurrentWorkspace(@AuthWorkspace() { id }: Workspace) {
-    const demoWorkspaceIds = this.environmentService.getDemoWorkspaceIds();
-
-    // Check if the id is in the list of demo workspaceIds
-    if (demoWorkspaceIds.includes(id)) {
-      throw new ForbiddenException('Demo workspaces cannot be deleted.');
-    }
-
-    return this.workspaceService.deleteWorkspace(id);
-  }
-
-  @ResolveField(() => String)
-  async activationStatus(
-    @Parent() workspace: Workspace,
-  ): Promise<'active' | 'inactive'> {
-    if (await this.workspaceService.isWorkspaceActivated(workspace.id)) {
-      return 'active';
-    }
-
-    return 'inactive';
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/data-seed-demo-workspace/crons/data-seed-demo-workspace.cron.command.ts b/packages/twenty-server/src/database/commands/data-seed-demo-workspace/crons/data-seed-demo-workspace.cron.command.ts
deleted file mode 100644
index 51d8cb100d2a..000000000000
--- a/packages/twenty-server/src/database/commands/data-seed-demo-workspace/crons/data-seed-demo-workspace.cron.command.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Inject } from '@nestjs/common';
-
-import { Command, CommandRunner } from 'nest-commander';
-
-import { dataSeedDemoWorkspaceCronPattern } from 'src/database/commands/data-seed-demo-workspace/crons/data-seed-demo-workspace-cron-pattern';
-import { DataSeedDemoWorkspaceJob } from 'src/database/commands/data-seed-demo-workspace/jobs/data-seed-demo-workspace.job';
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-
-@Command({
-  name: 'workspace:cron:seed:demo',
-  description: 'Seed workspace with demo data.',
-})
-export class DataSeedDemoWorkspaceCronCommand extends CommandRunner {
-  constructor(
-    @Inject(MessageQueue.cronQueue)
-    private readonly messageQueueService: MessageQueueService,
-  ) {
-    super();
-  }
-
-  async run(): Promise<void> {
-    await this.messageQueueService.addCron<undefined>(
-      DataSeedDemoWorkspaceJob.name,
-      undefined,
-      dataSeedDemoWorkspaceCronPattern,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/data-seed-demo-workspace/crons/start-data-seed-demo-workspace.cron.command.ts b/packages/twenty-server/src/database/commands/data-seed-demo-workspace/crons/start-data-seed-demo-workspace.cron.command.ts
new file mode 100644
index 000000000000..e9a8df6d35f2
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/data-seed-demo-workspace/crons/start-data-seed-demo-workspace.cron.command.ts
@@ -0,0 +1,33 @@
+import { Inject } from '@nestjs/common';
+
+import { Command, CommandRunner } from 'nest-commander';
+
+import { dataSeedDemoWorkspaceCronPattern } from 'src/database/commands/data-seed-demo-workspace/crons/data-seed-demo-workspace-cron-pattern';
+import { DataSeedDemoWorkspaceJob } from 'src/database/commands/data-seed-demo-workspace/jobs/data-seed-demo-workspace.job';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+
+@Command({
+  name: 'workspace-seed-demo:cron:start',
+  description: 'Start cron to seed workspace with demo data.',
+})
+export class StartDataSeedDemoWorkspaceCronCommand extends CommandRunner {
+  constructor(
+    @Inject(MessageQueue.cronQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {
+    super();
+  }
+
+  async run(): Promise<void> {
+    await this.messageQueueService.addCron<undefined>(
+      DataSeedDemoWorkspaceJob.name,
+      undefined,
+      {
+        repeat: {
+          pattern: dataSeedDemoWorkspaceCronPattern,
+        },
+      },
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/commands/data-seed-demo-workspace/crons/stop-data-seed-demo-workspace.cron.command.ts b/packages/twenty-server/src/database/commands/data-seed-demo-workspace/crons/stop-data-seed-demo-workspace.cron.command.ts
new file mode 100644
index 000000000000..84cd4a28df16
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/data-seed-demo-workspace/crons/stop-data-seed-demo-workspace.cron.command.ts
@@ -0,0 +1,28 @@
+import { Inject } from '@nestjs/common';
+
+import { Command, CommandRunner } from 'nest-commander';
+
+import { dataSeedDemoWorkspaceCronPattern } from 'src/database/commands/data-seed-demo-workspace/crons/data-seed-demo-workspace-cron-pattern';
+import { DataSeedDemoWorkspaceJob } from 'src/database/commands/data-seed-demo-workspace/jobs/data-seed-demo-workspace.job';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+
+@Command({
+  name: 'workspace-seed-demo:cron:stop',
+  description: 'Stop cron to seed workspace with demo data.',
+})
+export class StopDataSeedDemoWorkspaceCronCommand extends CommandRunner {
+  constructor(
+    @Inject(MessageQueue.cronQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {
+    super();
+  }
+
+  async run(): Promise<void> {
+    await this.messageQueueService.removeCron(
+      DataSeedDemoWorkspaceJob.name,
+      dataSeedDemoWorkspaceCronPattern,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace.module.ts b/packages/twenty-server/src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace.module.ts
index 62d2a5477483..10d644c03f44 100644
--- a/packages/twenty-server/src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace.module.ts
+++ b/packages/twenty-server/src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace.module.ts
@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 
-import { EnvironmentModule } from 'src/integrations/environment/environment.module';
-import { WorkspaceManagerModule } from 'src/workspace/workspace-manager/workspace-manager.module';
+import { EnvironmentModule } from 'src/engine/integrations/environment/environment.module';
+import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
 import { DataSeedDemoWorkspaceService } from 'src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service';
 
 @Module({
diff --git a/packages/twenty-server/src/database/commands/data-seed-demo-workspace/jobs/data-seed-demo-workspace.job.ts b/packages/twenty-server/src/database/commands/data-seed-demo-workspace/jobs/data-seed-demo-workspace.job.ts
index f4e33fa20ed1..e7b963d62008 100644
--- a/packages/twenty-server/src/database/commands/data-seed-demo-workspace/jobs/data-seed-demo-workspace.job.ts
+++ b/packages/twenty-server/src/database/commands/data-seed-demo-workspace/jobs/data-seed-demo-workspace.job.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
-import { MessageQueueJob } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
 
 import { DataSeedDemoWorkspaceService } from 'src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service';
 
diff --git a/packages/twenty-server/src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service.ts b/packages/twenty-server/src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service.ts
index d6553bc950ed..adc84e677898 100644
--- a/packages/twenty-server/src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service.ts
+++ b/packages/twenty-server/src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service.ts
@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
 
 import { DataSource } from 'typeorm';
 
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { WorkspaceManagerService } from 'src/workspace/workspace-manager/workspace-manager.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { WorkspaceManagerService } from 'src/engine/workspace-manager/workspace-manager.service';
 import {
   deleteCoreSchema,
   seedCoreSchema,
@@ -19,14 +19,15 @@ export class DataSeedDemoWorkspaceService {
   async seedDemo(): Promise<void> {
     try {
       const dataSource = new DataSource({
-        url: this.environmentService.getPGDatabaseUrl(),
+        url: this.environmentService.get('PG_DATABASE_URL'),
         type: 'postgres',
         logging: true,
         schema: 'public',
       });
 
       await dataSource.initialize();
-      const demoWorkspaceIds = this.environmentService.getDemoWorkspaceIds();
+      const demoWorkspaceIds =
+        this.environmentService.get('DEMO_WORKSPACE_IDS');
 
       if (demoWorkspaceIds.length === 0) {
         throw new Error(
diff --git a/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts b/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts
index b2aa57ecd580..7ecc6bbbcea3 100644
--- a/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts
+++ b/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts
@@ -1,19 +1,29 @@
 import { Command, CommandRunner } from 'nest-commander';
-import { DataSource } from 'typeorm';
+import { DataSource, EntityManager } from 'typeorm';
 
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { seedCompanies } from 'src/database/typeorm-seeds/workspace/companies';
-import { seedViews } from 'src/database/typeorm-seeds/workspace/views';
 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { seedOpportunity } from 'src/database/typeorm-seeds/workspace/opportunity';
-import { seedPipelineStep } from 'src/database/typeorm-seeds/workspace/pipeline-step';
-import { seedWorkspaceMember } from 'src/database/typeorm-seeds/workspace/workspaceMember';
+import { seedOpportunity } from 'src/database/typeorm-seeds/workspace/opportunities';
+import { seedWorkspaceMember } from 'src/database/typeorm-seeds/workspace/workspace-members';
 import { seedPeople } from 'src/database/typeorm-seeds/workspace/people';
 import { seedCoreSchema } from 'src/database/typeorm-seeds/core';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { WorkspaceSyncMetadataService } from 'src/workspace/workspace-sync-metadata/workspace-sync-metadata.service';
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { WorkspaceSyncMetadataService } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service';
+import { seedCalendarEvents } from 'src/database/typeorm-seeds/workspace/calendar-events';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import {
+  SEED_APPLE_WORKSPACE_ID,
+  SEED_TWENTY_WORKSPACE_ID,
+} from 'src/database/typeorm-seeds/core/workspaces';
+import { seedConnectedAccount } from 'src/database/typeorm-seeds/workspace/connected-account';
+import { seedMessage } from 'src/database/typeorm-seeds/workspace/messages';
+import { seedMessageChannel } from 'src/database/typeorm-seeds/workspace/message-channels';
+import { seedMessageChannelMessageAssociation } from 'src/database/typeorm-seeds/workspace/message-channel-message-associations';
+import { seedMessageParticipant } from 'src/database/typeorm-seeds/workspace/message-participants';
+import { seedMessageThread } from 'src/database/typeorm-seeds/workspace/message-threads';
+import { viewPrefillData } from 'src/engine/workspace-manager/standard-objects-prefill-data/view';
 
 // TODO: implement dry-run
 @Command({
@@ -22,7 +32,7 @@ import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metad
     'Seed workspace with initial data. This command is intended for development only.',
 })
 export class DataSeedWorkspaceCommand extends CommandRunner {
-  workspaceId = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+  workspaceIds = [SEED_APPLE_WORKSPACE_ID, SEED_TWENTY_WORKSPACE_ID];
 
   constructor(
     private readonly environmentService: EnvironmentService,
@@ -38,86 +48,120 @@ export class DataSeedWorkspaceCommand extends CommandRunner {
   async run(): Promise<void> {
     try {
       const dataSource = new DataSource({
-        url: this.environmentService.getPGDatabaseUrl(),
+        url: this.environmentService.get('PG_DATABASE_URL'),
         type: 'postgres',
         logging: true,
         schema: 'core',
       });
 
-      await dataSource.initialize();
+      for (const workspaceId of this.workspaceIds) {
+        await dataSource.initialize();
 
-      await seedCoreSchema(dataSource, this.workspaceId);
+        await seedCoreSchema(dataSource, workspaceId);
 
-      await dataSource.destroy();
+        await dataSource.destroy();
 
-      const schemaName =
-        await this.workspaceDataSourceService.createWorkspaceDBSchema(
-          this.workspaceId,
-        );
+        const schemaName =
+          await this.workspaceDataSourceService.createWorkspaceDBSchema(
+            workspaceId,
+          );
 
-      const dataSourceMetadata =
-        await this.dataSourceService.createDataSourceMetadata(
-          this.workspaceId,
-          schemaName,
-        );
+        const dataSourceMetadata =
+          await this.dataSourceService.createDataSourceMetadata(
+            workspaceId,
+            schemaName,
+          );
 
-      await this.workspaceSyncMetadataService.syncStandardObjectsAndFieldsMetadata(
-        {
-          workspaceId: this.workspaceId,
+        await this.workspaceSyncMetadataService.synchronize({
+          workspaceId: workspaceId,
           dataSourceId: dataSourceMetadata.id,
-        },
-      );
+        });
+      }
     } catch (error) {
       console.error(error);
 
       return;
     }
 
-    const dataSourceMetadata =
-      await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
-        this.workspaceId,
-      );
+    for (const workspaceId of this.workspaceIds) {
+      const dataSourceMetadata =
+        await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
+          workspaceId,
+        );
 
-    const workspaceDataSource =
-      await this.typeORMService.connectToDataSource(dataSourceMetadata);
+      const workspaceDataSource =
+        await this.typeORMService.connectToDataSource(dataSourceMetadata);
+
+      if (!workspaceDataSource) {
+        throw new Error('Could not connect to workspace data source');
+      }
+
+      try {
+        const objectMetadata =
+          await this.objectMetadataService.findManyWithinWorkspace(workspaceId);
+        const objectMetadataMap = objectMetadata.reduce((acc, object) => {
+          acc[object.standardId ?? ''] = {
+            id: object.id,
+            fields: object.fields.reduce((acc, field) => {
+              acc[field.standardId ?? ''] = field.id;
+
+              return acc;
+            }, {}),
+          };
+
+          return acc;
+        }, {});
+
+        await workspaceDataSource.transaction(
+          async (entityManager: EntityManager) => {
+            await seedCompanies(entityManager, dataSourceMetadata.schema);
+            await seedPeople(entityManager, dataSourceMetadata.schema);
+            await seedOpportunity(entityManager, dataSourceMetadata.schema);
+            await seedCalendarEvents(entityManager, dataSourceMetadata.schema);
+            await seedWorkspaceMember(
+              entityManager,
+              dataSourceMetadata.schema,
+              workspaceId,
+            );
+
+            if (workspaceId === SEED_APPLE_WORKSPACE_ID) {
+              await seedMessageThread(entityManager, dataSourceMetadata.schema);
+              await seedConnectedAccount(
+                entityManager,
+                dataSourceMetadata.schema,
+              );
+              await seedMessage(entityManager, dataSourceMetadata.schema);
+              await seedMessageChannel(
+                entityManager,
+                dataSourceMetadata.schema,
+              );
+              await seedMessageChannelMessageAssociation(
+                entityManager,
+                dataSourceMetadata.schema,
+              );
+              await seedMessageParticipant(
+                entityManager,
+                dataSourceMetadata.schema,
+              );
+            }
+
+            await viewPrefillData(
+              entityManager,
+              dataSourceMetadata.schema,
+              objectMetadataMap,
+            );
+          },
+        );
+      } catch (error) {
+        console.error(error);
+      }
 
-    if (!workspaceDataSource) {
-      throw new Error('Could not connect to workspace data source');
-    }
+      try {
+      } catch (error) {
+        console.error(error);
+      }
 
-    try {
-      const objectMetadata =
-        await this.objectMetadataService.findManyWithinWorkspace(
-          this.workspaceId,
-        );
-      const objectMetadataMap = objectMetadata.reduce((acc, object) => {
-        acc[object.nameSingular] = {
-          id: object.id,
-          fields: object.fields.reduce((acc, field) => {
-            acc[field.name] = field.id;
-
-            return acc;
-          }, {}),
-        };
-
-        return acc;
-      }, {});
-
-      await seedCompanies(workspaceDataSource, dataSourceMetadata.schema);
-      await seedPeople(workspaceDataSource, dataSourceMetadata.schema);
-      await seedPipelineStep(workspaceDataSource, dataSourceMetadata.schema);
-      await seedOpportunity(workspaceDataSource, dataSourceMetadata.schema);
-
-      await seedViews(
-        workspaceDataSource,
-        dataSourceMetadata.schema,
-        objectMetadataMap,
-      );
-      await seedWorkspaceMember(workspaceDataSource, dataSourceMetadata.schema);
-    } catch (error) {
-      console.error(error);
+      await this.typeORMService.disconnectFromDataSource(dataSourceMetadata.id);
     }
-
-    await this.typeORMService.disconnectFromDataSource(dataSourceMetadata.id);
   }
 }
diff --git a/packages/twenty-server/src/database/commands/database-command.module.ts b/packages/twenty-server/src/database/commands/database-command.module.ts
index 47b9794d1603..1e85f0309a86 100644
--- a/packages/twenty-server/src/database/commands/database-command.module.ts
+++ b/packages/twenty-server/src/database/commands/database-command.module.ts
@@ -1,15 +1,16 @@
 import { Module } from '@nestjs/common';
 
 import { ConfirmationQuestion } from 'src/database/commands/questions/confirmation.question';
-import { WorkspaceManagerModule } from 'src/workspace/workspace-manager/workspace-manager.module';
-import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
+import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
 import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { WorkspaceModule } from 'src/core/workspace/workspace.module';
+import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.module';
 import { DataSeedWorkspaceCommand } from 'src/database/commands/data-seed-dev-workspace.command';
-import { DataSeedDemoWorkspaceCronCommand } from 'src/database/commands/data-seed-demo-workspace/crons/data-seed-demo-workspace.cron.command';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-import { WorkspaceSyncMetadataModule } from 'src/workspace/workspace-sync-metadata/workspace-sync-metadata.module';
-import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module';
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
+import { StartDataSeedDemoWorkspaceCronCommand } from 'src/database/commands/data-seed-demo-workspace/crons/start-data-seed-demo-workspace.cron.command';
+import { StopDataSeedDemoWorkspaceCronCommand } from 'src/database/commands/data-seed-demo-workspace/crons/stop-data-seed-demo-workspace.cron.command';
 import { WorkspaceAddTotalCountCommand } from 'src/database/commands/workspace-add-total-count.command';
 import { DataSeedDemoWorkspaceCommand } from 'src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace-command';
 import { DataSeedDemoWorkspaceModule } from 'src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace.module';
@@ -28,9 +29,10 @@ import { DataSeedDemoWorkspaceModule } from 'src/database/commands/data-seed-dem
   providers: [
     DataSeedWorkspaceCommand,
     DataSeedDemoWorkspaceCommand,
-    DataSeedDemoWorkspaceCronCommand,
     WorkspaceAddTotalCountCommand,
     ConfirmationQuestion,
+    StartDataSeedDemoWorkspaceCronCommand,
+    StopDataSeedDemoWorkspaceCronCommand,
   ],
 })
 export class DatabaseCommandModule {}
diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/demo/index.ts b/packages/twenty-server/src/database/typeorm-seeds/core/demo/index.ts
index b99c71bea22b..8eebbc3edff3 100644
--- a/packages/twenty-server/src/database/typeorm-seeds/core/demo/index.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/core/demo/index.ts
@@ -9,6 +9,10 @@ import {
   deleteWorkspaces,
 } from 'src/database/typeorm-seeds/core/demo/workspaces';
 import { deleteFeatureFlags } from 'src/database/typeorm-seeds/core/demo/feature-flags';
+import {
+  deleteUserWorkspaces,
+  seedUserWorkspaces,
+} from 'src/database/typeorm-seeds/core/demo/user-workspaces';
 
 export const seedCoreSchema = async (
   workspaceDataSource: DataSource,
@@ -18,6 +22,7 @@ export const seedCoreSchema = async (
 
   await seedWorkspaces(workspaceDataSource, schemaName, workspaceId);
   await seedUsers(workspaceDataSource, schemaName, workspaceId);
+  await seedUserWorkspaces(workspaceDataSource, schemaName, workspaceId);
 };
 
 export const deleteCoreSchema = async (
@@ -26,6 +31,7 @@ export const deleteCoreSchema = async (
 ) => {
   const schemaName = 'core';
 
+  await deleteUserWorkspaces(workspaceDataSource, schemaName, workspaceId);
   await deleteUsersByWorkspace(workspaceDataSource, schemaName, workspaceId);
   await deleteFeatureFlags(workspaceDataSource, schemaName, workspaceId);
   // deleteWorkspaces should be last
diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/demo/user-workspaces.ts b/packages/twenty-server/src/database/typeorm-seeds/core/demo/user-workspaces.ts
new file mode 100644
index 000000000000..92ec82344db7
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm-seeds/core/demo/user-workspaces.ts
@@ -0,0 +1,47 @@
+import { DataSource } from 'typeorm';
+
+import { DEMO_SEED_USER_IDS } from 'src/database/typeorm-seeds/core/demo/users';
+
+const tableName = 'userWorkspace';
+
+export const seedUserWorkspaces = async (
+  workspaceDataSource: DataSource,
+  schemaName: string,
+  workspaceId: string,
+) => {
+  await workspaceDataSource
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.${tableName}`, ['userId', 'workspaceId'])
+    .orIgnore()
+    .values([
+      {
+        userId: DEMO_SEED_USER_IDS.NOAH,
+        workspaceId: workspaceId,
+      },
+      {
+        userId: DEMO_SEED_USER_IDS.HUGO,
+        workspaceId: workspaceId,
+      },
+      {
+        userId: DEMO_SEED_USER_IDS.JULIA,
+        workspaceId: workspaceId,
+      },
+    ])
+    .execute();
+};
+
+export const deleteUserWorkspaces = async (
+  workspaceDataSource: DataSource,
+  schemaName: string,
+  workspaceId: string,
+) => {
+  await workspaceDataSource
+    .createQueryBuilder()
+    .delete()
+    .from(`${schemaName}.${tableName}`)
+    .where(`"${tableName}"."workspaceId" = :workspaceId`, {
+      workspaceId,
+    })
+    .execute();
+};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/demo/users.ts b/packages/twenty-server/src/database/typeorm-seeds/core/demo/users.ts
index dabc820dc389..2a809eb191cc 100644
--- a/packages/twenty-server/src/database/typeorm-seeds/core/demo/users.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/core/demo/users.ts
@@ -4,11 +4,11 @@ import { DataSource } from 'typeorm';
 
 const tableName = 'user';
 
-export enum DemoSeedUserIds {
-  Noah = '20202020-9e3b-46d4-a556-88b9ddc2b035',
-  Hugo = '20202020-3957-4908-9c36-2929a23f8358',
-  Julia = '20202020-7169-42cf-bc47-1cfef15264b9',
-}
+export const DEMO_SEED_USER_IDS = {
+  NOAH: '20202020-9e3b-46d4-a556-88b9ddc2b035',
+  HUGO: '20202020-3957-4908-9c36-2929a23f8358',
+  JULIA: '20202020-7169-42cf-bc47-1cfef15264b9',
+};
 
 export const seedUsers = async (
   workspaceDataSource: DataSource,
@@ -29,7 +29,7 @@ export const seedUsers = async (
     .orIgnore()
     .values([
       {
-        id: DemoSeedUserIds.Noah,
+        id: DEMO_SEED_USER_IDS.NOAH,
         firstName: 'Noah',
         lastName: 'A',
         email: 'noah@demo.dev',
@@ -38,7 +38,7 @@ export const seedUsers = async (
         defaultWorkspaceId: workspaceId,
       },
       {
-        id: DemoSeedUserIds.Hugo,
+        id: DEMO_SEED_USER_IDS.HUGO,
         firstName: 'Hugo',
         lastName: 'I',
         email: 'hugo@demo.dev',
@@ -48,7 +48,7 @@ export const seedUsers = async (
       },
       ,
       {
-        id: DemoSeedUserIds.Julia,
+        id: DEMO_SEED_USER_IDS.JULIA,
         firstName: 'Julia',
         lastName: 'S',
         email: 'julia.s@demo.dev',
diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts b/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts
index 80a6ce941e03..a8b6a89be0dd 100644
--- a/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts
@@ -1,6 +1,6 @@
 import { DataSource } from 'typeorm';
 
-import { FeatureFlagKeys } from 'src/core/feature-flag/feature-flag.entity';
+import { FeatureFlagKeys } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 
 const tableName = 'featureFlag';
 
@@ -15,13 +15,33 @@ export const seedFeatureFlags = async (
     .into(`${schemaName}.${tableName}`, ['key', 'workspaceId', 'value'])
     .orIgnore()
     .values([
+      {
+        key: FeatureFlagKeys.IsBlocklistEnabled,
+        workspaceId: workspaceId,
+        value: true,
+      },
       {
         key: FeatureFlagKeys.IsCalendarEnabled,
         workspaceId: workspaceId,
         value: true,
       },
       {
-        key: FeatureFlagKeys.IsBlocklistEnabled,
+        key: FeatureFlagKeys.IsAirtableIntegrationEnabled,
+        workspaceId: workspaceId,
+        value: true,
+      },
+      {
+        key: FeatureFlagKeys.IsPostgreSQLIntegrationEnabled,
+        workspaceId: workspaceId,
+        value: true,
+      },
+      {
+        key: FeatureFlagKeys.IsEventObjectEnabled,
+        workspaceId: workspaceId,
+        value: true,
+      },
+      {
+        key: FeatureFlagKeys.IsMultiSelectEnabled,
         workspaceId: workspaceId,
         value: true,
       },
diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/index.ts b/packages/twenty-server/src/database/typeorm-seeds/core/index.ts
index b33dce403da6..6e5c9921e68d 100644
--- a/packages/twenty-server/src/database/typeorm-seeds/core/index.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/core/index.ts
@@ -12,6 +12,10 @@ import {
   seedFeatureFlags,
   deleteFeatureFlags,
 } from 'src/database/typeorm-seeds/core/feature-flags';
+import {
+  deleteUserWorkspaces,
+  seedUserWorkspaces,
+} from 'src/database/typeorm-seeds/core/userWorkspaces';
 
 export const seedCoreSchema = async (
   workspaceDataSource: DataSource,
@@ -21,6 +25,7 @@ export const seedCoreSchema = async (
 
   await seedWorkspaces(workspaceDataSource, schemaName, workspaceId);
   await seedUsers(workspaceDataSource, schemaName, workspaceId);
+  await seedUserWorkspaces(workspaceDataSource, schemaName, workspaceId);
   await seedFeatureFlags(workspaceDataSource, schemaName, workspaceId);
 };
 
@@ -30,6 +35,7 @@ export const deleteCoreSchema = async (
 ) => {
   const schemaName = 'core';
 
+  await deleteUserWorkspaces(workspaceDataSource, schemaName, workspaceId);
   await deleteUsersByWorkspace(workspaceDataSource, schemaName, workspaceId);
   await deleteFeatureFlags(workspaceDataSource, schemaName, workspaceId);
   // deleteWorkspaces should be last
diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/userWorkspaces.ts b/packages/twenty-server/src/database/typeorm-seeds/core/userWorkspaces.ts
new file mode 100644
index 000000000000..e5e621d045c3
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm-seeds/core/userWorkspaces.ts
@@ -0,0 +1,66 @@
+import { DataSource } from 'typeorm';
+
+import {
+  SEED_APPLE_WORKSPACE_ID,
+  SEED_TWENTY_WORKSPACE_ID,
+} from 'src/database/typeorm-seeds/core/workspaces';
+import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { DEV_SEED_USER_IDS } from 'src/database/typeorm-seeds/core/users';
+
+const tableName = 'userWorkspace';
+
+export const seedUserWorkspaces = async (
+  workspaceDataSource: DataSource,
+  schemaName: string,
+  workspaceId: string,
+) => {
+  let userWorkspaces: Pick<UserWorkspace, 'userId' | 'workspaceId'>[] = [];
+
+  if (workspaceId === SEED_APPLE_WORKSPACE_ID) {
+    userWorkspaces = [
+      {
+        userId: DEV_SEED_USER_IDS.TIM,
+        workspaceId,
+      },
+      {
+        userId: DEV_SEED_USER_IDS.JONY,
+        workspaceId,
+      },
+      {
+        userId: DEV_SEED_USER_IDS.PHIL,
+        workspaceId,
+      },
+    ];
+  }
+
+  if (workspaceId === SEED_TWENTY_WORKSPACE_ID) {
+    userWorkspaces = [
+      {
+        userId: DEV_SEED_USER_IDS.TIM,
+        workspaceId,
+      },
+    ];
+  }
+  await workspaceDataSource
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.${tableName}`, ['userId', 'workspaceId'])
+    .orIgnore()
+    .values(userWorkspaces)
+    .execute();
+};
+
+export const deleteUserWorkspaces = async (
+  workspaceDataSource: DataSource,
+  schemaName: string,
+  workspaceId: string,
+) => {
+  await workspaceDataSource
+    .createQueryBuilder()
+    .delete()
+    .from(`${schemaName}.${tableName}`)
+    .where(`"${tableName}"."workspaceId" = :workspaceId`, {
+      workspaceId,
+    })
+    .execute();
+};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/users.ts b/packages/twenty-server/src/database/typeorm-seeds/core/users.ts
index 4a885a93917b..b0121ab18b91 100644
--- a/packages/twenty-server/src/database/typeorm-seeds/core/users.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/core/users.ts
@@ -4,11 +4,11 @@ import { DataSource } from 'typeorm';
 
 const tableName = 'user';
 
-export enum SeedUserIds {
-  Tim = '20202020-9e3b-46d4-a556-88b9ddc2b034',
-  Jony = '20202020-3957-4908-9c36-2929a23f8357',
-  Phil = '20202020-7169-42cf-bc47-1cfef15264b8',
-}
+export const DEV_SEED_USER_IDS = {
+  TIM: '20202020-9e3b-46d4-a556-88b9ddc2b034',
+  JONY: '20202020-3957-4908-9c36-2929a23f8357',
+  PHIL: '20202020-7169-42cf-bc47-1cfef15264b8',
+};
 
 export const seedUsers = async (
   workspaceDataSource: DataSource,
@@ -29,7 +29,7 @@ export const seedUsers = async (
     .orIgnore()
     .values([
       {
-        id: SeedUserIds.Tim,
+        id: DEV_SEED_USER_IDS.TIM,
         firstName: 'Tim',
         lastName: 'Apple',
         email: 'tim@apple.dev',
@@ -38,7 +38,7 @@ export const seedUsers = async (
         defaultWorkspaceId: workspaceId,
       },
       {
-        id: SeedUserIds.Jony,
+        id: DEV_SEED_USER_IDS.JONY,
         firstName: 'Jony',
         lastName: 'Ive',
         email: 'jony.ive@apple.dev',
@@ -46,9 +46,8 @@ export const seedUsers = async (
           '$2b$10$66d.6DuQExxnrfI9rMqOg.U1XIYpagr6Lv05uoWLYbYmtK0HDIvS6', // Applecar2025
         defaultWorkspaceId: workspaceId,
       },
-      ,
       {
-        id: SeedUserIds.Phil,
+        id: DEV_SEED_USER_IDS.PHIL,
         firstName: 'Phil',
         lastName: 'Schiler',
         email: 'phil.schiler@apple.dev',
diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/workspaces.ts b/packages/twenty-server/src/database/typeorm-seeds/core/workspaces.ts
index 0cef73330157..1ebe78147c16 100644
--- a/packages/twenty-server/src/database/typeorm-seeds/core/workspaces.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/core/workspaces.ts
@@ -1,14 +1,46 @@
 import { DataSource } from 'typeorm';
 
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+
 const tableName = 'workspace';
 
-export const SeedWorkspaceId = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+export const SEED_APPLE_WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+export const SEED_TWENTY_WORKSPACE_ID = '3b8e6458-5fc1-4e63-8563-008ccddaa6db';
 
 export const seedWorkspaces = async (
   workspaceDataSource: DataSource,
   schemaName: string,
   workspaceId: string,
 ) => {
+  const workspaces: {
+    [key: string]: Pick<
+      Workspace,
+      | 'id'
+      | 'displayName'
+      | 'domainName'
+      | 'inviteHash'
+      | 'logo'
+      | 'subscriptionStatus'
+    >;
+  } = {
+    [SEED_APPLE_WORKSPACE_ID]: {
+      id: workspaceId,
+      displayName: 'Apple',
+      domainName: 'apple.dev',
+      inviteHash: 'apple.dev-invite-hash',
+      logo: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAAELpJREFUeF7tnXnwr3MVx1+WS5Hthoss1R0lNSTUKGQdt6EscVVCKVPKUqmUKcu0WJI2ppJUt0kNwmRN0dBCtolKpqIVIdl3qXnX8xs/1+937/d5vp/lnOc5n3++/zyfzznnfc77+zyf7ZxFiBYIBALTIrBIYBMIBALTIxAEiegIBBaAQBAkwiMQCIJEDIyJgP5IlwRmAreOOZar7vEGceWuYsrOBg4E5gKzgMlxMqiYGZSxxcLLnyDFwU7AF4A1FqL+osB//JnYTeMgSDfc+tLrhcBZwHotDFoMeLLF864fDYK4dl9n5XcBTm3mFW0HWRz4d9tOXp8Pgnj1XDe9d2+Ioc+kri3eIF2Ri35mEdgAuLzjG2N+o2IOYtbNoVhbBGYA1wPrtO24gOcH9dUxKGMTBomHofYE5iVWVKtX43yeJVYn/3BBkPwY15BwXcuVqVF1fBB4zqgP9+G5IEgfvPiUDSsAdwBaacrRrgY2zjGw1TGDIFY9016vjYCr2ndr1eMQ4NhWPZw/HARx7sBG/Z2BMwuY8nzgLwXkmBERBDHjis6KaG/je517t+s4uHgZnMHt4sH809sCFxXS8l5g+UKyzIgJgphxRWtFdI7qpta9unc4Ejiie3efPYMgPv2muxmPFFZdy7ta5h1UC4L4dPcDwNIFVX8YWKqgPDOigiBmXDGyIhcAc0Z+Os2D+wFfSTOUr1GCIL78tTXw4woqD+qA4mR8gyAVoq2jSAVpjXsY2l95Y0ed3XcLgvhx4S+BV1ZQdwng8QpyTYgMgphww0KVeDFw40KfSv/AD4Ad0w/rZ8QgiA9fPQQ8u4Kqg7o9OBW+QZAKUddSpLKNKLFC6XYocFRpodbkBUGseeSZ+uj7P9fx9ems1yZkjTeWOW8EQcy55GkKab9D+x6l2+rALaWFWpQXBLHolad0Kr1jLsknAAfYhqWcdkGQcli3lbQKcFvbTmM+fxew4phj9Kp7EMSuOy8Btiys3qD3PKbCOghSOAJbiCud//alwA0t9BvEo0EQm25+GfDrgqrtC5xcUJ4bUUEQm666ENiukGrK6P6+QrLciQmC2HTZE4B2sXO305saILnluB0/CGLPdSKGCJK7nQu8PrcQ7+MHQex5cENACdpytu8Cb8kpoC9jB0HsefI44OCMaul8lc5ZRRsBgSDICCAVfuQ3gJZcczQVzqlx8DGHLUXGDIIUgbmVEGUOSZ0gQSXTdL6q9M58K8MtPhwEsecVBXNKvyjTuwrolN54tIdsB41SOqKD+OgyBQIpA/kNwDmBcncEgiDdscvVMwVBzmuWcFOMlctOF+MGQey5aZyg/hWwGaBj8tESIBAESQBi4iG6EOQ0YO8K6UgTm25vuCCIPZ+MMkkXiZQGSBebcm8q2kOooEZBkIJgjyhKV11nNitZIoI+l/4O/Aw4A7gCeHTEscZ5TLExcRdeeihpXZe32zg6VO87ZILoctDzgPWbZdC1gdWAZRqv3An8Dris+bfWHkLfAkQEWA94E7A9oJIKz1pIVAoDJXX4M/DTZuNRNdhVP6R3bSgEUSAor+37m0ls1404ff4ogdvnmqpO3ibDKpugNKIfbXbrU/tfxPkRcHTzphNerltqgCyBMQs4vjnOnSttjv5N9S8q4l1ryfhJumgHXee7di10hH4yDDoVINnHACqh4K71jSAigv69dAGoxH2K+R3+W+Cdzb9nzWBYFfgqsEPiXflxbBJZDgJO8fSp2heCKCBUFmDdcTyYuO9PgL2aCXbioaccTnOHTzVBWOPPoY2Nyvk7t9BiQxu9nvGsd4JoUq3a4Pq12rT6oznLYRk+M0QEvbH0GaMSad6aVua2sUwUrwTRZPPKZgXGU1BoUi+iKDlb15ICqhOiVSeRbmVPxi9A1283b1tz5ngkyKebVRhzYLZUSGTRP/9nRzgaoiXpPZv5VV8Tu2nBQyuN+jQ10zwRRP+WWnvvY1JlBYdWwU5s5lLaU9ClKS02KLu7CDKUphMCm1iZyHshyOFDrNE9FEZMYafmbWtZSKBtnSDS7w/A7AEHy5BNf3OzIVsNA8sEWRZQMuVcm3zVQA/BrRComtjOKkFq1eRr5bl4uBgC1SrtWiTIps3xjWLohyAXCFQpKGqNIFtYW+ZzETrDUfIbwD4lzbVEkI2aXfGS9ocsfwh8oNkkLaK5FYLoXoYuBUULBEZBQH+m14zy4LjPWCCINsF0j8CCLuPiGf3LIaDDmdlvVloIyvudHrQrFwohaSoE7m6uJmdFpzZBdERd52+iBQJtECh2bqsmQXYEzm6DSjwbCDQ5ArTaWSQ/QC2CzAAeC3cHAi0R0N2Ri1v2GevxWgS5qcmgMZby0XkwCNwDKMdA8T/VGgSZA1wwGNeGoeMioDeG3hxVWg2CjJI5sAoYIdQcAp8EPl5Tq9IE+Vpzh7qmzSHbBwLKNTyvtqolCaINwewbO7UBDflJEFByO53grd5KEuRSYPPqFocC1hHYAzjVipKlCKJjAS4z61lx1ED00HxD8w4zrRRBLgS2M2N1KGIRgfObBNqmdCtBEOVx0iX8aIHAdAgUOVfVBf4SBImMJF08M6w+SgRYfBNwFIhLEOSJSomkR7E/nqmPwM6Wz+TlJojS9fyxvg9CA6MI3Gw9pVNugig58WuMOifUqo+AsmTqspzZlpsgRY4km0U3FFsQAqoT8g7rEOUkyDpNjT/rGIR+dRDQ6qb5P9CcBDnX4rp2nVgIqfMhoOpX7/aASk6CxOqVhwioo6PSybrYG8tFkDiYWCfwPEi9vim97UHXbKl2VDzyHBcIhJKlEVDe5d+XFtpVXq43iG6BbdVVqejXWwQ0Kdfk3E3LRRCtbev4QLRAYDICKq/m6o8zF0HML99F3FZBYGPg6iqSOwrNQZBlgPs66hPd+o2Ai72PyS7IQZAtgUv67eewrgMCOq3r7rM7B0FU2vjgDgBGl34j8HNAxZFctRwE0Tfmhq5QCGVLILB/U+a6hKxkMnIQRFnwlkumYQzUFwRe1FQsdmVPDoLoCIGrtW5XHvOrbJF6HqnhyUGQWOJN7aV+jJcj1rIjk0PpIEh2t7kUkCPWsgORWunFAJ3ijRYITEbA3RGTCeVTE0Tr3KavUEbcVkFACcv15+mupSZI7KK7C4EiCuurQkWT3LXUBFkJuMMdCqFwbgSCIA3CqwK35kY7xneHQHxiNS5bDbjFnftC4dwIxCS9QXgV4LbcaMf4LhFI/TlfBITUSsccpIjbXApxd9RdKKcmyLLAvS7dF0rnRsB8FsWpAEhNkCiUkzvM/I7vKlnDBMypCRI76X4DOLfm7wG+nFtI6vFTE0TjaUkvWiAwPwKXAa/1Bktqgsj+OKzoLQrK6KsKx/oEd9VyEERvkBzjugI2lJ0SAXcrWTkCOXJiBTumQ2Bdbxn/cxBEO+naUY8WCMyPwBnAbp5gyUGQSDvqKQLK6qrr2Mrs7qblIMhhwJFuEAhFSyOg0xb/LC20q7wcBNkcuLSrQtGv9wicDaiyrYuWgyDLAyoMHy0QmA6BHHGXBe0cisZmYRZX9WrQvYF5HizKQRDZHXshHrxfT0c3NwxzEUR3QnQ3JFogMB0CmodoPmK65SLIyR5qYJv2TP+Vc3ENNxdBYiWr/wGewsKjgENTDJRrjFwEifxYuTzWv3GXAh62alYugsjeONVr1eu29Lrd8nw1J0H+BqxuyxehjVEEjrB6+iInQQ4HZHi0QGAUBEzWD8lJkEgiN0pYxDMTCOiTXHPXxy1BkpMgMQ+x5Gkfumiyrkm7mZabIP8AZpmxNhTxgIA2mc3cJ8pNkA8Cn/HgldDRFAI3A7MtaJSbIJFIzoKXfeqgVdA1a6uemyCyL4p61vayX/m6NvHcmntqJQhyEbCtXx+F5pUR0Mlf3TF6sIYeJQjyEuCGGsaFzF4h8Grg8tIWlSBILPeW9mp/5emU+L4lzStFkGuBDUoaFrJ6i8ADzeS9yLXuUgTZCLiqty4Lw2ogcBLwrtyCSxEkPrNye3KY4+t4ylxACemytJIEUXbvzbJYEYMOHQGd3xJRkl/hLUmQFwDaIY0WCORCQG8UbU5rnpKklSSIFI5NwyRui0GmQSB5tpTSBDkOODjcGwhkQuD41PFVmiBLACqkEi0QyIFA8kKhpQkiUP4KrJEDnRhz0AhoX2RmagRqEOQVwDWpDYnxBo/ALsBZqVGoQRDZoMmUKuJGCwRSIZAllrMMOoLFHwaOGeG5eCQQGAWBC4HXjfJg22dqESQywLf1VDy/IARWAO7JAVEtgsiW07zVq8vhgBhzbAT+1VyqGnugqQaoSZBY8s3i0sENmvWeSE2CyJO/ADYZnEvD4FQIJN85n1+x2gRZOuW5mVSoxzhuEHgr8J2c2tYmiGy7Gtgwp5Exdi8R0MHERXNbZoEg8RbJ7eV+jr8/cGJu0ywQRDaqbLSK7kQLBEZBoMjbQ4pYIcgM4LFRkIlnAoGmvN8pJZCwQhDZKoPfXsLokOEagewrV5PRsUQQ6RVVqVzHbhHltwYuKSLJ0CfWhL17Ad8qZXzIcYdA1l3zqdCw9gaRjvcBy7hzXShcAgGVRVB5hGLNIkGiMlUx97sSpM8qfV4VbRYJIgB08WWnokiEMOsI6P7Qk6WVtEoQ4RAZUEpHg115ewCn1lDPMkEiXWmNiLAns2pJNssEkasuBray57PQqCACKuqp4p5VmnWCCJS4v14lNEwIPQA4oaYmHggSKUtrRkg92UoPtVY98f+X7IEg0lOVclUxN9pwEND5PH09VG1eCCKQ7gBWqopWCC+FwBbNCe9S8qaV44kgceK3ergUUeB8YPsikkYQ4okgMkf313WPPVo/EdBqlVatzDRvBBFw3wT2NoNgKJISgeWas3gpxxxrLI8EkcG3AyuPZXl0tobA7k2uNFN6eSWIzuWo7JZX/U0FgQFlTM07JuPhOcBif8RAZCdQQSlDlTrUZPNMEAGquYjmJNF8IqAbpEs2XwMmLfBOEIGqG4i6iRjNHwKzrRd27QNBFBbXAev5i49Ba7wr8H3rCPSFIML5TmBF64CHfv9D4CjgUA9Y9IkgskX1sU1tNHkIgsI6ng7MLSyzs7g+EUQgKFfrQ83ErzMo0TEbAlXulY9jTd8IMkGS++NNMk5YZOn7Q2BOlpEzDtpHgggu2XUrsEpG7HIMraQE+kzUfEqnlx9shCwLzGpOM6sWuDe/nQzsmwOw3GN6A7otHio3rbLTFpvyf50JnARcCzzaUkltru0AvBfYuEQpgJb6TTx+EPDFjn2rd+s7QQTw5wE5qXbT2+Ec4CPAjRmU0YabNk4/Yeic2vrA9RlsLTbkEAgiMF8FXFEM1acLOq/5vCiZEVCLFfs0fw6qv1K6/QlYu0ndVFp2UnlDIYhAU9Dok+vlSRGcerC7AJUHU/3u2k2fYvOaz7HcuujoyG4eNgBHBWJIBJnARK/9ywFNdlM23Z/+UrMB9kjKgROOtQ3wdWDNhGNODHUscEiGcasOOUSCTAC+aTMnWH4MD2hirYD7GHD3GOOU7iq/K8/tcc0Rna5xoIWG/WplPSwBWldgSuhWSoZ23j8EHAjMXIhQXQm9DDi+qVFRPetGIpA0T9EexdsA1R3XZ9lUsaFN2Csb+y+wkHUkkf3TDhMEeSY0izcBoqDRypM2HfVPqVzBQ2yKkcEWNgqCDDHkw+aREQiCjAxVPDhEBIIgQ/R62DwyAkGQkaGKB4eIwH8BiW3y2J/F45oAAAAASUVORK5CYII=',
+      subscriptionStatus: 'incomplete',
+    },
+    [SEED_TWENTY_WORKSPACE_ID]: {
+      id: workspaceId,
+      displayName: 'Twenty',
+      domainName: 'twenty.dev',
+      inviteHash: 'twenty.dev-invite-hash',
+      logo: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAA7EAAAOxAGVKw4bAAACb0lEQVR4nO2VO4taQRTHr3AblbjxEVlwCwVhg7BoqqCIjy/gAyyFWNlYBOxsfH0KuxgQGwXRUkGuL2S7i1barGAgiwbdW93SnGOc4BonPiKahf3DwXFmuP/fPM4ZlvmlTxAhCBdzHnEQWYiv7Mr4C3NeuVYhQYDPzOUUQgDLBQGcLHNhvQK8DACPx8PTxiqVyvISG43GbyaT6Qfpn06n0m63e/tPAPF4vJ1MJu8kEsnWTCkWi1yr1RKGw+GDRqPBOTfr44vFQvD7/Q/lcpmaaVQAr9fLp1IpO22c47hGOBz+MB6PH+Vy+VYDAL8qlUoGtVotzOfzq4MAgsHgE/6KojiQyWR/bKVSqbSszHFM8Pl8z1YK48JsNltCOBwOnrYLO+8AAIjb+nHbycoTiUQfDJ7tFq4YAHiVSmXBxcD41u8flQU8z7fhzO0r83atVns3Go3u9Xr9x0O/RQXo9/tsIBBg6vX606a52Wz+bZ7P5/WwG29gxSJzhKgA6XTaDoFNF+krFAocmC//4yWEcSf2wTm7mCO19xFgSsKOLI16vV7b7XY7mRNoLwA0JymJ5uQIzgIAuX5PzDElT2m+E8BqtQ4ymcx7Yq7T6a6ZE4sKgOadTucaCwkxp1UzlEKh0GDxIXOwDWHAdi6Xe3swQDQa/Q7mywoolUpvsaptymazDWKxmBHTlWXZm405BFZoNpuGgwEmk4mE2SGtVivii4f1AO7J3ZopkQCQj7Ar1FeRChCJRJzVapX6DKNIfSc1Ax+wtQWQ55h6bH8FWDfYV4fO3wlwDr0C/BcADYiTPCxHqIEA2QsCZAkAKnRGkMbKN/sTX5YHPQ1e7SkAAAAASUVORK5CYII=',
+      subscriptionStatus: 'incomplete',
+    },
+  };
+
   await workspaceDataSource
     .createQueryBuilder()
     .insert()
@@ -21,16 +53,7 @@ export const seedWorkspaces = async (
       'subscriptionStatus',
     ])
     .orIgnore()
-    .values([
-      {
-        id: workspaceId,
-        displayName: 'Apple',
-        domainName: 'apple.dev',
-        inviteHash: 'apple.dev-invite-hash',
-        logo: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAAELpJREFUeF7tnXnwr3MVx1+WS5Hthoss1R0lNSTUKGQdt6EscVVCKVPKUqmUKcu0WJI2ppJUt0kNwmRN0dBCtolKpqIVIdl3qXnX8xs/1+937/d5vp/lnOc5n3++/zyfzznnfc77+zyf7ZxFiBYIBALTIrBIYBMIBALTIxAEiegIBBaAQBAkwiMQCIJEDIyJgP5IlwRmAreOOZar7vEGceWuYsrOBg4E5gKzgMlxMqiYGZSxxcLLnyDFwU7AF4A1FqL+osB//JnYTeMgSDfc+tLrhcBZwHotDFoMeLLF864fDYK4dl9n5XcBTm3mFW0HWRz4d9tOXp8Pgnj1XDe9d2+Ioc+kri3eIF2Ri35mEdgAuLzjG2N+o2IOYtbNoVhbBGYA1wPrtO24gOcH9dUxKGMTBomHofYE5iVWVKtX43yeJVYn/3BBkPwY15BwXcuVqVF1fBB4zqgP9+G5IEgfvPiUDSsAdwBaacrRrgY2zjGw1TGDIFY9016vjYCr2ndr1eMQ4NhWPZw/HARx7sBG/Z2BMwuY8nzgLwXkmBERBDHjis6KaG/je517t+s4uHgZnMHt4sH809sCFxXS8l5g+UKyzIgJgphxRWtFdI7qpta9unc4Ejiie3efPYMgPv2muxmPFFZdy7ta5h1UC4L4dPcDwNIFVX8YWKqgPDOigiBmXDGyIhcAc0Z+Os2D+wFfSTOUr1GCIL78tTXw4woqD+qA4mR8gyAVoq2jSAVpjXsY2l95Y0ed3XcLgvhx4S+BV1ZQdwng8QpyTYgMgphww0KVeDFw40KfSv/AD4Ad0w/rZ8QgiA9fPQQ8u4Kqg7o9OBW+QZAKUddSpLKNKLFC6XYocFRpodbkBUGseeSZ+uj7P9fx9ems1yZkjTeWOW8EQcy55GkKab9D+x6l2+rALaWFWpQXBLHolad0Kr1jLsknAAfYhqWcdkGQcli3lbQKcFvbTmM+fxew4phj9Kp7EMSuOy8Btiys3qD3PKbCOghSOAJbiCud//alwA0t9BvEo0EQm25+GfDrgqrtC5xcUJ4bUUEQm666ENiukGrK6P6+QrLciQmC2HTZE4B2sXO305saILnluB0/CGLPdSKGCJK7nQu8PrcQ7+MHQex5cENACdpytu8Cb8kpoC9jB0HsefI44OCMaul8lc5ZRRsBgSDICCAVfuQ3gJZcczQVzqlx8DGHLUXGDIIUgbmVEGUOSZ0gQSXTdL6q9M58K8MtPhwEsecVBXNKvyjTuwrolN54tIdsB41SOqKD+OgyBQIpA/kNwDmBcncEgiDdscvVMwVBzmuWcFOMlctOF+MGQey5aZyg/hWwGaBj8tESIBAESQBi4iG6EOQ0YO8K6UgTm25vuCCIPZ+MMkkXiZQGSBebcm8q2kOooEZBkIJgjyhKV11nNitZIoI+l/4O/Aw4A7gCeHTEscZ5TLExcRdeeihpXZe32zg6VO87ZILoctDzgPWbZdC1gdWAZRqv3An8Dris+bfWHkLfAkQEWA94E7A9oJIKz1pIVAoDJXX4M/DTZuNRNdhVP6R3bSgEUSAor+37m0ls1404ff4ogdvnmqpO3ibDKpugNKIfbXbrU/tfxPkRcHTzphNerltqgCyBMQs4vjnOnSttjv5N9S8q4l1ryfhJumgHXee7di10hH4yDDoVINnHACqh4K71jSAigv69dAGoxH2K+R3+W+Cdzb9nzWBYFfgqsEPiXflxbBJZDgJO8fSp2heCKCBUFmDdcTyYuO9PgL2aCXbioaccTnOHTzVBWOPPoY2Nyvk7t9BiQxu9nvGsd4JoUq3a4Pq12rT6oznLYRk+M0QEvbH0GaMSad6aVua2sUwUrwTRZPPKZgXGU1BoUi+iKDlb15ICqhOiVSeRbmVPxi9A1283b1tz5ngkyKebVRhzYLZUSGTRP/9nRzgaoiXpPZv5VV8Tu2nBQyuN+jQ10zwRRP+WWnvvY1JlBYdWwU5s5lLaU9ClKS02KLu7CDKUphMCm1iZyHshyOFDrNE9FEZMYafmbWtZSKBtnSDS7w/A7AEHy5BNf3OzIVsNA8sEWRZQMuVcm3zVQA/BrRComtjOKkFq1eRr5bl4uBgC1SrtWiTIps3xjWLohyAXCFQpKGqNIFtYW+ZzETrDUfIbwD4lzbVEkI2aXfGS9ocsfwh8oNkkLaK5FYLoXoYuBUULBEZBQH+m14zy4LjPWCCINsF0j8CCLuPiGf3LIaDDmdlvVloIyvudHrQrFwohaSoE7m6uJmdFpzZBdERd52+iBQJtECh2bqsmQXYEzm6DSjwbCDQ5ArTaWSQ/QC2CzAAeC3cHAi0R0N2Ri1v2GevxWgS5qcmgMZby0XkwCNwDKMdA8T/VGgSZA1wwGNeGoeMioDeG3hxVWg2CjJI5sAoYIdQcAp8EPl5Tq9IE+Vpzh7qmzSHbBwLKNTyvtqolCaINwewbO7UBDflJEFByO53grd5KEuRSYPPqFocC1hHYAzjVipKlCKJjAS4z61lx1ED00HxD8w4zrRRBLgS2M2N1KGIRgfObBNqmdCtBEOVx0iX8aIHAdAgUOVfVBf4SBImMJF08M6w+SgRYfBNwFIhLEOSJSomkR7E/nqmPwM6Wz+TlJojS9fyxvg9CA6MI3Gw9pVNugig58WuMOifUqo+AsmTqspzZlpsgRY4km0U3FFsQAqoT8g7rEOUkyDpNjT/rGIR+dRDQ6qb5P9CcBDnX4rp2nVgIqfMhoOpX7/aASk6CxOqVhwioo6PSybrYG8tFkDiYWCfwPEi9vim97UHXbKl2VDzyHBcIhJKlEVDe5d+XFtpVXq43iG6BbdVVqejXWwQ0Kdfk3E3LRRCtbev4QLRAYDICKq/m6o8zF0HML99F3FZBYGPg6iqSOwrNQZBlgPs66hPd+o2Ai72PyS7IQZAtgUv67eewrgMCOq3r7rM7B0FU2vjgDgBGl34j8HNAxZFctRwE0Tfmhq5QCGVLILB/U+a6hKxkMnIQRFnwlkumYQzUFwRe1FQsdmVPDoLoCIGrtW5XHvOrbJF6HqnhyUGQWOJN7aV+jJcj1rIjk0PpIEh2t7kUkCPWsgORWunFAJ3ijRYITEbA3RGTCeVTE0Tr3KavUEbcVkFACcv15+mupSZI7KK7C4EiCuurQkWT3LXUBFkJuMMdCqFwbgSCIA3CqwK35kY7xneHQHxiNS5bDbjFnftC4dwIxCS9QXgV4LbcaMf4LhFI/TlfBITUSsccpIjbXApxd9RdKKcmyLLAvS7dF0rnRsB8FsWpAEhNkCiUkzvM/I7vKlnDBMypCRI76X4DOLfm7wG+nFtI6vFTE0TjaUkvWiAwPwKXAa/1Bktqgsj+OKzoLQrK6KsKx/oEd9VyEERvkBzjugI2lJ0SAXcrWTkCOXJiBTumQ2Bdbxn/cxBEO+naUY8WCMyPwBnAbp5gyUGQSDvqKQLK6qrr2Mrs7qblIMhhwJFuEAhFSyOg0xb/LC20q7wcBNkcuLSrQtGv9wicDaiyrYuWgyDLAyoMHy0QmA6BHHGXBe0cisZmYRZX9WrQvYF5HizKQRDZHXshHrxfT0c3NwxzEUR3QnQ3JFogMB0CmodoPmK65SLIyR5qYJv2TP+Vc3ENNxdBYiWr/wGewsKjgENTDJRrjFwEifxYuTzWv3GXAh62alYugsjeONVr1eu29Lrd8nw1J0H+BqxuyxehjVEEjrB6+iInQQ4HZHi0QGAUBEzWD8lJkEgiN0pYxDMTCOiTXHPXxy1BkpMgMQ+x5Gkfumiyrkm7mZabIP8AZpmxNhTxgIA2mc3cJ8pNkA8Cn/HgldDRFAI3A7MtaJSbIJFIzoKXfeqgVdA1a6uemyCyL4p61vayX/m6NvHcmntqJQhyEbCtXx+F5pUR0Mlf3TF6sIYeJQjyEuCGGsaFzF4h8Grg8tIWlSBILPeW9mp/5emU+L4lzStFkGuBDUoaFrJ6i8ADzeS9yLXuUgTZCLiqty4Lw2ogcBLwrtyCSxEkPrNye3KY4+t4ylxACemytJIEUXbvzbJYEYMOHQGd3xJRkl/hLUmQFwDaIY0WCORCQG8UbU5rnpKklSSIFI5NwyRui0GmQSB5tpTSBDkOODjcGwhkQuD41PFVmiBLACqkEi0QyIFA8kKhpQkiUP4KrJEDnRhz0AhoX2RmagRqEOQVwDWpDYnxBo/ALsBZqVGoQRDZoMmUKuJGCwRSIZAllrMMOoLFHwaOGeG5eCQQGAWBC4HXjfJg22dqESQywLf1VDy/IARWAO7JAVEtgsiW07zVq8vhgBhzbAT+1VyqGnugqQaoSZBY8s3i0sENmvWeSE2CyJO/ADYZnEvD4FQIJN85n1+x2gRZOuW5mVSoxzhuEHgr8J2c2tYmiGy7Gtgwp5Exdi8R0MHERXNbZoEg8RbJ7eV+jr8/cGJu0ywQRDaqbLSK7kQLBEZBoMjbQ4pYIcgM4LFRkIlnAoGmvN8pJZCwQhDZKoPfXsLokOEagewrV5PRsUQQ6RVVqVzHbhHltwYuKSLJ0CfWhL17Ad8qZXzIcYdA1l3zqdCw9gaRjvcBy7hzXShcAgGVRVB5hGLNIkGiMlUx97sSpM8qfV4VbRYJIgB08WWnokiEMOsI6P7Qk6WVtEoQ4RAZUEpHg115ewCn1lDPMkEiXWmNiLAns2pJNssEkasuBray57PQqCACKuqp4p5VmnWCCJS4v14lNEwIPQA4oaYmHggSKUtrRkg92UoPtVY98f+X7IEg0lOVclUxN9pwEND5PH09VG1eCCKQ7gBWqopWCC+FwBbNCe9S8qaV44kgceK3ergUUeB8YPsikkYQ4okgMkf313WPPVo/EdBqlVatzDRvBBFw3wT2NoNgKJISgeWas3gpxxxrLI8EkcG3AyuPZXl0tobA7k2uNFN6eSWIzuWo7JZX/U0FgQFlTM07JuPhOcBif8RAZCdQQSlDlTrUZPNMEAGquYjmJNF8IqAbpEs2XwMmLfBOEIGqG4i6iRjNHwKzrRd27QNBFBbXAev5i49Ba7wr8H3rCPSFIML5TmBF64CHfv9D4CjgUA9Y9IkgskX1sU1tNHkIgsI6ng7MLSyzs7g+EUQgKFfrQ83ErzMo0TEbAlXulY9jTd8IMkGS++NNMk5YZOn7Q2BOlpEzDtpHgggu2XUrsEpG7HIMraQE+kzUfEqnlx9shCwLzGpOM6sWuDe/nQzsmwOw3GN6A7otHio3rbLTFpvyf50JnARcCzzaUkltru0AvBfYuEQpgJb6TTx+EPDFjn2rd+s7QQTw5wE5qXbT2+Ec4CPAjRmU0YabNk4/Yeic2vrA9RlsLTbkEAgiMF8FXFEM1acLOq/5vCiZEVCLFfs0fw6qv1K6/QlYu0ndVFp2UnlDIYhAU9Dok+vlSRGcerC7AJUHU/3u2k2fYvOaz7HcuujoyG4eNgBHBWJIBJnARK/9ywFNdlM23Z/+UrMB9kjKgROOtQ3wdWDNhGNODHUscEiGcasOOUSCTAC+aTMnWH4MD2hirYD7GHD3GOOU7iq/K8/tcc0Rna5xoIWG/WplPSwBWldgSuhWSoZ23j8EHAjMXIhQXQm9DDi+qVFRPetGIpA0T9EexdsA1R3XZ9lUsaFN2Csb+y+wkHUkkf3TDhMEeSY0izcBoqDRypM2HfVPqVzBQ2yKkcEWNgqCDDHkw+aREQiCjAxVPDhEBIIgQ/R62DwyAkGQkaGKB4eIwH8BiW3y2J/F45oAAAAASUVORK5CYII=',
-        subscriptionStatus: 'incomplete',
-      },
-    ])
+    .values(workspaces[workspaceId])
     .execute();
 };
 
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/calendar-events.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/calendar-events.ts
new file mode 100644
index 000000000000..85f3f4e790f4
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/calendar-events.ts
@@ -0,0 +1,50 @@
+import { EntityManager } from 'typeorm';
+
+const tableName = 'calendarEvent';
+
+export const seedCalendarEvents = async (
+  entityManager: EntityManager,
+  schemaName: string,
+) => {
+  await entityManager
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.${tableName}`, [
+      'id',
+      'title',
+      'isCanceled',
+      'isFullDay',
+      'startsAt',
+      'endsAt',
+      'externalCreatedAt',
+      'externalUpdatedAt',
+      'description',
+      'location',
+      'iCalUID',
+      'conferenceSolution',
+      'conferenceLinkLabel',
+      'conferenceLinkUrl',
+      'recurringEventExternalId',
+    ])
+    .orIgnore()
+    .values([
+      {
+        id: '86083141-1c0e-494c-a1b6-85b1c6fefaa5',
+        title: 'Meeting with Christoph',
+        isCanceled: false,
+        isFullDay: false,
+        startsAt: new Date(new Date().setHours(10, 0)).toISOString(),
+        endsAt: new Date(new Date().setHours(11, 0)).toISOString(),
+        externalCreatedAt: new Date().toISOString(),
+        externalUpdatedAt: new Date().toISOString(),
+        description: 'Discuss project progress',
+        location: 'Seattle',
+        iCalUID: 'event1@calendar.com',
+        conferenceSolution: 'Zoom',
+        conferenceLinkLabel: 'https://zoom.us/j/1234567890',
+        conferenceLinkUrl: 'https://zoom.us/j/1234567890',
+        recurringEventExternalId: 'recurring1',
+      },
+    ])
+    .execute();
+};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/companies.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/companies.ts
index f7f3e2011884..2762a29777c3 100644
--- a/packages/twenty-server/src/database/typeorm-seeds/workspace/companies.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/companies.ts
@@ -1,12 +1,28 @@
-import { DataSource } from 'typeorm';
+import { EntityManager } from 'typeorm';
 
 const tableName = 'company';
 
+export const DEV_SEED_COMPANY_IDS = {
+  LINKEDIN: '20202020-3ec3-4fe3-8997-b76aa0bfa408',
+  FACEBOOK: '20202020-5d81-46d6-bf83-f7fd33ea6102',
+  QONTO: '20202020-0713-40a5-8216-82802401d33e',
+  MICROSOFT: '20202020-ed89-413a-b31a-962986e67bb4',
+  AIRBNB: '20202020-171e-4bcc-9cf7-43448d6fb278',
+  GOOGLE: '20202020-c21e-4ec2-873b-de4264d89025',
+  NETFLIX: '20202020-707e-44dc-a1d2-30030bf1a944',
+  LIBEO: '20202020-3f74-492d-a101-2a70f50a1645',
+  CLAAP: '20202020-cfbf-4156-a790-e39854dcd4eb',
+  HASURA: '20202020-f86b-419f-b794-02319abe8637',
+  WEWORK: '20202020-5518-4553-9433-42d8eb82834b',
+  SAMSUNG: '20202020-f79e-40dd-bd06-c36e6abb4678',
+  ALGOLIA: '20202020-1455-4c57-afaf-dd5dc086361d',
+};
+
 export const seedCompanies = async (
-  workspaceDataSource: DataSource,
+  entityManager: EntityManager,
   schemaName: string,
 ) => {
-  await workspaceDataSource
+  await entityManager
     .createQueryBuilder()
     .insert()
     .into(`${schemaName}.${tableName}`, [
@@ -19,91 +35,91 @@ export const seedCompanies = async (
     .orIgnore()
     .values([
       {
-        id: 'fe256b39-3ec3-4fe3-8997-b76aa0bfa408',
+        id: DEV_SEED_COMPANY_IDS.LINKEDIN,
         name: 'Linkedin',
         domainName: 'linkedin.com',
         address: '',
         position: 1,
       },
       {
-        id: '118995f3-5d81-46d6-bf83-f7fd33ea6102',
+        id: DEV_SEED_COMPANY_IDS.FACEBOOK,
         name: 'Facebook',
         domainName: 'facebook.com',
         address: '',
         position: 2,
       },
       {
-        id: '04b2e9f5-0713-40a5-8216-82802401d33e',
+        id: DEV_SEED_COMPANY_IDS.QONTO,
         name: 'Qonto',
         domainName: 'qonto.com',
         address: '',
         position: 3,
       },
       {
-        id: '460b6fb1-ed89-413a-b31a-962986e67bb4',
+        id: DEV_SEED_COMPANY_IDS.MICROSOFT,
         name: 'Microsoft',
         domainName: 'microsoft.com',
         address: '',
         position: 4,
       },
       {
-        id: '89bb825c-171e-4bcc-9cf7-43448d6fb278',
+        id: DEV_SEED_COMPANY_IDS.AIRBNB,
         name: 'Airbnb',
         domainName: 'airbnb.com',
         address: '',
         position: 5,
       },
       {
-        id: '0d940997-c21e-4ec2-873b-de4264d89025',
+        id: DEV_SEED_COMPANY_IDS.GOOGLE,
         name: 'Google',
         domainName: 'google.com',
         address: '',
         position: 6,
       },
       {
-        id: '1d3a1c6e-707e-44dc-a1d2-30030bf1a944',
+        id: DEV_SEED_COMPANY_IDS.NETFLIX,
         name: 'Netflix',
         domainName: 'netflix.com',
         address: '',
         position: 7,
       },
       {
-        id: '7a93d1e5-3f74-492d-a101-2a70f50a1645',
+        id: DEV_SEED_COMPANY_IDS.LIBEO,
         name: 'Libeo',
         domainName: 'libeo.io',
         address: '',
         position: 8,
       },
       {
-        id: '9d162de6-cfbf-4156-a790-e39854dcd4eb',
+        id: DEV_SEED_COMPANY_IDS.CLAAP,
         name: 'Claap',
         domainName: 'claap.io',
         address: '',
         position: 9,
       },
       {
-        id: 'aaffcfbd-f86b-419f-b794-02319abe8637',
+        id: DEV_SEED_COMPANY_IDS.HASURA,
         name: 'Hasura',
         domainName: 'hasura.io',
         address: '',
         position: 10,
       },
       {
-        id: 'f33dc242-5518-4553-9433-42d8eb82834b',
+        id: DEV_SEED_COMPANY_IDS.WEWORK,
         name: 'Wework',
         domainName: 'wework.com',
         address: '',
         position: 11,
       },
       {
-        id: 'a7bc68d5-f79e-40dd-bd06-c36e6abb4678',
+        id: DEV_SEED_COMPANY_IDS.SAMSUNG,
         name: 'Samsung',
         domainName: 'samsung.com',
         address: '',
         position: 12,
       },
       {
-        id: 'a674fa6c-1455-4c57-afaf-dd5dc086361d',
+        id: DEV_SEED_COMPANY_IDS.ALGOLIA,
         name: 'Algolia',
         domainName: 'algolia.com',
         address: '',
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/connected-account.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/connected-account.ts
new file mode 100644
index 000000000000..375d0301379c
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/connected-account.ts
@@ -0,0 +1,72 @@
+import { EntityManager } from 'typeorm';
+
+import { DEV_SEED_WORKSPACE_MEMBER_IDS } from 'src/database/typeorm-seeds/workspace/workspace-members';
+
+const tableName = 'connectedAccount';
+
+export const DEV_SEED_CONNECTED_ACCOUNT_IDS = {
+  TIM: '20202020-9ac0-4390-9a1a-ab4d2c4e1bb7',
+  JONY: '20202020-0cc8-4d60-a3a4-803245698908',
+  PHIL: '20202020-cafc-4323-908d-e5b42ad69fdf',
+};
+
+export const seedConnectedAccount = async (
+  entityManager: EntityManager,
+  schemaName: string,
+) => {
+  await entityManager
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.${tableName}`, [
+      'id',
+      'createdAt',
+      'updatedAt',
+      'deletedAt',
+      'lastSyncHistoryId',
+      'accountOwnerId',
+      'refreshToken',
+      'accessToken',
+      'provider',
+      'handle',
+    ])
+    .orIgnore()
+    .values([
+      {
+        id: DEV_SEED_CONNECTED_ACCOUNT_IDS.TIM,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        lastSyncHistoryId: 'exampleLastSyncHistory',
+        accountOwnerId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        refreshToken: 'exampleRefreshToken',
+        accessToken: 'exampleAccessToken',
+        provider: 'google',
+        handle: 'incoming',
+      },
+      {
+        id: DEV_SEED_CONNECTED_ACCOUNT_IDS.JONY,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        lastSyncHistoryId: 'exampleLastSyncHistory',
+        accountOwnerId: DEV_SEED_WORKSPACE_MEMBER_IDS.JONY,
+        refreshToken: 'exampleRefreshToken',
+        accessToken: 'exampleAccessToken',
+        provider: 'google',
+        handle: 'incoming',
+      },
+      {
+        id: DEV_SEED_CONNECTED_ACCOUNT_IDS.PHIL,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        lastSyncHistoryId: 'exampleLastSyncHistory',
+        accountOwnerId: DEV_SEED_WORKSPACE_MEMBER_IDS.PHIL,
+        refreshToken: 'exampleRefreshToken',
+        accessToken: 'exampleAccessToken',
+        provider: 'google',
+        handle: 'incoming',
+      },
+    ])
+    .execute();
+};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/message-channel-message-associations.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/message-channel-message-associations.ts
new file mode 100644
index 000000000000..26f2b67c2201
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/message-channel-message-associations.ts
@@ -0,0 +1,70 @@
+import { EntityManager } from 'typeorm';
+
+import { DEV_SEED_MESSAGE_CHANNEL_IDS } from 'src/database/typeorm-seeds/workspace/message-channels';
+import { DEV_SEED_MESSAGE_IDS } from 'src/database/typeorm-seeds/workspace/messages';
+import { DEV_SEED_MESSAGE_THREAD_IDS } from 'src/database/typeorm-seeds/workspace/message-threads';
+
+const tableName = 'messageChannelMessageAssociation';
+
+export const DEV_SEED_MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_IDS = {
+  MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_1: '20202020-cc69-44ef-a82c-600c0dbf39ba',
+  MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_2: '20202020-d80e-4a13-b10b-72ba09082668',
+  MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_3: '20202020-e6ec-4c8a-b431-0901eaf395a9',
+};
+
+export const seedMessageChannelMessageAssociation = async (
+  entityManager: EntityManager,
+  schemaName: string,
+) => {
+  await entityManager
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.${tableName}`, [
+      'id',
+      'createdAt',
+      'updatedAt',
+      'deletedAt',
+      'messageThreadExternalId',
+      'messageThreadId',
+      'messageExternalId',
+      'messageId',
+      'messageChannelId',
+    ])
+    .orIgnore()
+    .values([
+      {
+        id: DEV_SEED_MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_IDS.MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_1,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        messageThreadExternalId: null,
+        messageThreadId: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_1,
+        messageExternalId: null,
+        messageId: DEV_SEED_MESSAGE_IDS.MESSAGE_1,
+        messageChannelId: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM_INCOMING,
+      },
+      {
+        id: DEV_SEED_MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_IDS.MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_2,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        messageThreadExternalId: null,
+        messageThreadId: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_2,
+        messageExternalId: null,
+        messageId: DEV_SEED_MESSAGE_IDS.MESSAGE_2,
+        messageChannelId: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM_INCOMING,
+      },
+      {
+        id: DEV_SEED_MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_IDS.MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_3,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        messageThreadExternalId: null,
+        messageThreadId: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_1,
+        messageExternalId: null,
+        messageId: DEV_SEED_MESSAGE_IDS.MESSAGE_3,
+        messageChannelId: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM_INCOMING,
+      },
+    ])
+    .execute();
+};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/message-channels.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/message-channels.ts
new file mode 100644
index 000000000000..0db6e84b8e08
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/message-channels.ts
@@ -0,0 +1,104 @@
+import { EntityManager } from 'typeorm';
+
+import { DEV_SEED_CONNECTED_ACCOUNT_IDS } from 'src/database/typeorm-seeds/workspace/connected-account';
+
+const tableName = 'messageChannel';
+
+export const DEV_SEED_MESSAGE_CHANNEL_IDS = {
+  TIM_INCOMING: '20202020-9b80-4c2c-a597-383db48de1d6',
+  TIM_OUTGOING: '20202020-09ed-4eb9-8b23-62aa4fd81d83',
+  JONY_INCOMING: '20202020-5ffe-4b32-814a-983d5e4911cd',
+  JONY_OUTGOING: '20202020-9dad-4329-8180-62647a2d7510',
+  PHIL_INCOMING: '20202020-e2f1-49b5-85d2-5d3a3386990c',
+  PHIL_OUTGOING: '20202020-fdff-438f-9132-7d5f216dfc4d',
+};
+
+export const seedMessageChannel = async (
+  entityManager: EntityManager,
+  schemaName: string,
+) => {
+  await entityManager
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.${tableName}`, [
+      'id',
+      'createdAt',
+      'updatedAt',
+      'deletedAt',
+      'isContactAutoCreationEnabled',
+      'type',
+      'connectedAccountId',
+      'handle',
+      'visibility',
+    ])
+    .orIgnore()
+    .values([
+      {
+        id: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM_INCOMING,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        isContactAutoCreationEnabled: true,
+        type: 'email',
+        connectedAccountId: DEV_SEED_CONNECTED_ACCOUNT_IDS.TIM,
+        handle: 'outgoing',
+        visibility: 'share_everything',
+      },
+      {
+        id: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM_OUTGOING,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        isContactAutoCreationEnabled: true,
+        type: 'email',
+        connectedAccountId: DEV_SEED_CONNECTED_ACCOUNT_IDS.TIM,
+        handle: 'incoming',
+        visibility: 'share_everything',
+      },
+      {
+        id: DEV_SEED_MESSAGE_CHANNEL_IDS.JONY_INCOMING,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        isContactAutoCreationEnabled: true,
+        type: 'email',
+        connectedAccountId: DEV_SEED_CONNECTED_ACCOUNT_IDS.JONY,
+        handle: 'outgoing',
+        visibility: 'share_everything',
+      },
+      {
+        id: DEV_SEED_MESSAGE_CHANNEL_IDS.JONY_OUTGOING,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        isContactAutoCreationEnabled: true,
+        type: 'email',
+        connectedAccountId: DEV_SEED_CONNECTED_ACCOUNT_IDS.JONY,
+        handle: 'incoming',
+        visibility: 'share_everything',
+      },
+      {
+        id: DEV_SEED_MESSAGE_CHANNEL_IDS.PHIL_INCOMING,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        isContactAutoCreationEnabled: true,
+        type: 'email',
+        connectedAccountId: DEV_SEED_CONNECTED_ACCOUNT_IDS.PHIL,
+        handle: 'outgoing',
+        visibility: 'share_everything',
+      },
+      {
+        id: DEV_SEED_MESSAGE_CHANNEL_IDS.PHIL_OUTGOING,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        isContactAutoCreationEnabled: true,
+        type: 'email',
+        connectedAccountId: DEV_SEED_CONNECTED_ACCOUNT_IDS.PHIL,
+        handle: 'incoming',
+        visibility: 'share_everything',
+      },
+    ])
+    .execute();
+};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/message-participants.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/message-participants.ts
new file mode 100644
index 000000000000..1718661c5e08
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/message-participants.ts
@@ -0,0 +1,113 @@
+import { EntityManager } from 'typeorm';
+
+import { DEV_SEED_WORKSPACE_MEMBER_IDS } from 'src/database/typeorm-seeds/workspace/workspace-members';
+import { DEV_SEED_PERSON_IDS } from 'src/database/typeorm-seeds/workspace/people';
+import { DEV_SEED_MESSAGE_IDS } from 'src/database/typeorm-seeds/workspace/messages';
+
+const tableName = 'messageParticipant';
+
+export const DEV_SEED_MESSAGE_PARTICIPANT_IDS = {
+  MESSAGE_PARTICIPANT_1: '20202020-0f2a-49d8-8aa2-ec8786153a0b',
+  MESSAGE_PARTICIPANT_2: '20202020-4e83-41ec-93e2-fd70ff09f68c',
+  MESSAGE_PARTICIPANT_3: '20202020-e716-4dd5-ac61-3315bc559e2d',
+  MESSAGE_PARTICIPANT_4: '20202020-fc7d-4ad8-9aea-b78bcbf79cdd',
+  MESSAGE_PARTICIPANT_5: '20202020-564c-4a3c-abbf-e942e8c3f9c9',
+  MESSAGE_PARTICIPANT_6: '20202020-7e4a-489a-ba6b-1ae6b7d721ac',
+};
+
+export const seedMessageParticipant = async (
+  entityManager: EntityManager,
+  schemaName: string,
+) => {
+  await entityManager
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.${tableName}`, [
+      'id',
+      'createdAt',
+      'updatedAt',
+      'deletedAt',
+      'workspaceMemberId',
+      'personId',
+      'displayName',
+      'handle',
+      'role',
+      'messageId',
+    ])
+    .orIgnore()
+    .values([
+      {
+        id: DEV_SEED_MESSAGE_PARTICIPANT_IDS.MESSAGE_PARTICIPANT_1,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        workspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        personId: DEV_SEED_PERSON_IDS.CHRISTOPH,
+        displayName: 'Christoph',
+        handle: 'outgoing',
+        role: 'from',
+        messageId: DEV_SEED_MESSAGE_IDS.MESSAGE_1,
+      },
+      {
+        id: DEV_SEED_MESSAGE_PARTICIPANT_IDS.MESSAGE_PARTICIPANT_2,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        workspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        personId: DEV_SEED_PERSON_IDS.SYLVIE,
+        displayName: 'Sylvie',
+        handle: 'incoming',
+        role: 'to',
+        messageId: DEV_SEED_MESSAGE_IDS.MESSAGE_1,
+      },
+      {
+        id: DEV_SEED_MESSAGE_PARTICIPANT_IDS.MESSAGE_PARTICIPANT_3,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        workspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        personId: DEV_SEED_PERSON_IDS.CHRISTOPHER_G,
+        displayName: 'Christopher',
+        handle: 'incoming',
+        role: 'to',
+        messageId: DEV_SEED_MESSAGE_IDS.MESSAGE_1,
+      },
+      {
+        id: DEV_SEED_MESSAGE_PARTICIPANT_IDS.MESSAGE_PARTICIPANT_4,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        workspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        personId: DEV_SEED_PERSON_IDS.CHRISTOPH,
+        displayName: 'Christoph',
+        handle: 'outgoing',
+        role: 'from',
+        messageId: DEV_SEED_MESSAGE_IDS.MESSAGE_2,
+      },
+      {
+        id: DEV_SEED_MESSAGE_PARTICIPANT_IDS.MESSAGE_PARTICIPANT_5,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        workspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        personId: DEV_SEED_PERSON_IDS.SYLVIE,
+        displayName: 'Sylvie',
+        handle: 'incoming',
+        role: 'to',
+        messageId: DEV_SEED_MESSAGE_IDS.MESSAGE_2,
+      },
+      {
+        id: DEV_SEED_MESSAGE_PARTICIPANT_IDS.MESSAGE_PARTICIPANT_6,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        workspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        personId: DEV_SEED_PERSON_IDS.CHRISTOPHER_G,
+        displayName: 'Christopher',
+        handle: 'incoming',
+        role: 'to',
+        messageId: DEV_SEED_MESSAGE_IDS.MESSAGE_2,
+      },
+    ])
+    .execute();
+};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/message-threads.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/message-threads.ts
new file mode 100644
index 000000000000..42a2f14fcf65
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/message-threads.ts
@@ -0,0 +1,53 @@
+import { EntityManager } from 'typeorm';
+
+const tableName = 'messageThread';
+
+export const DEV_SEED_MESSAGE_THREAD_IDS = {
+  MESSAGE_THREAD_1: '20202020-8bfa-453b-b99b-bc435a7d4da8',
+  MESSAGE_THREAD_2: '20202020-634a-4fde-aa7c-28a0eaf203ca',
+  MESSAGE_THREAD_3: '20202020-1b56-4f10-a2fa-2ccaddf81f6c',
+  MESSAGE_THREAD_4: '20202020-d51c-485a-b1b6-ed7c63e05d72',
+};
+
+export const seedMessageThread = async (
+  entityManager: EntityManager,
+  schemaName: string,
+) => {
+  await entityManager
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.${tableName}`, [
+      'id',
+      'createdAt',
+      'updatedAt',
+      'deletedAt',
+    ])
+    .orIgnore()
+    .values([
+      {
+        id: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_1,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+      },
+      {
+        id: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_2,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+      },
+      {
+        id: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_3,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+      },
+      {
+        id: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_4,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+      },
+    ])
+    .execute();
+};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/messages.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/messages.ts
new file mode 100644
index 000000000000..231eb23c85f6
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/messages.ts
@@ -0,0 +1,72 @@
+import { EntityManager } from 'typeorm';
+
+import { DEV_SEED_MESSAGE_THREAD_IDS } from 'src/database/typeorm-seeds/workspace/message-threads';
+
+const tableName = 'message';
+
+export const DEV_SEED_MESSAGE_IDS = {
+  MESSAGE_1: '20202020-2b8a-405d-8f42-e820ca921421',
+  MESSAGE_2: '20202020-04c8-4f24-93f2-764948e95014',
+  MESSAGE_3: '20202020-ac6b-4f86-87a2-5f5f9d1b6481',
+};
+
+export const seedMessage = async (
+  entityManager: EntityManager,
+  schemaName: string,
+) => {
+  await entityManager
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.${tableName}`, [
+      'id',
+      'createdAt',
+      'updatedAt',
+      'deletedAt',
+      'receivedAt',
+      'text',
+      'subject',
+      'direction',
+      'messageThreadId',
+      'headerMessageId',
+    ])
+    .orIgnore()
+    .values([
+      {
+        id: DEV_SEED_MESSAGE_IDS.MESSAGE_1,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        receivedAt: new Date(),
+        text: 'Hello, \n I hope this email finds you well. I am writing to request a meeting. I believe it would be beneficial for both parties to collaborate and explore potential opportunities. Would you be available for a meeting sometime next week? Please let me know your availability, and I will arrange a suitable time. \n Looking forward to your response.\n Best regards',
+        subject: 'Meeting Request',
+        direction: 'outgoing',
+        messageThreadId: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_1,
+        headerMessageId: '99ef24a8-2b8a-405d-8f42-e820ca921421',
+      },
+      {
+        id: DEV_SEED_MESSAGE_IDS.MESSAGE_2,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        receivedAt: new Date(),
+        text: 'Good Morning,\n I am writing to inquire about information. Could you please provide me with details regarding this topic? \n Your assistance in this matter would be greatly appreciated. Thank you in advance for your prompt response. \n Best regards,Tim',
+        subject: 'Inquiry Regarding Topic',
+        direction: 'outgoing',
+        messageThreadId: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_2,
+        headerMessageId: '8f804a9a-04c8-4f24-93f2-764948e95014',
+      },
+      {
+        id: DEV_SEED_MESSAGE_IDS.MESSAGE_3,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        deletedAt: null,
+        receivedAt: new Date(),
+        text: 'Good Evening,\nI wanted to extend my sincere gratitude for taking the time to meet with me earlier today. It was a pleasure discussing with you, and I am excited about the potential opportunities for collaboration. \n Please feel free to reach out if you have any further questions or require additional information. I look forward to our continued communication. Best regards.',
+        subject: 'Thank You for the Meeting',
+        direction: 'incoming',
+        messageThreadId: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_1,
+        headerMessageId: '3939d68a-ac6b-4f86-87a2-5f5f9d1b6481',
+      },
+    ])
+    .execute();
+};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/opportunities.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/opportunities.ts
new file mode 100644
index 000000000000..b314205ef7bb
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/opportunities.ts
@@ -0,0 +1,86 @@
+import { EntityManager } from 'typeorm';
+
+import { DEV_SEED_PERSON_IDS } from 'src/database/typeorm-seeds/workspace/people';
+import { DEV_SEED_COMPANY_IDS } from 'src/database/typeorm-seeds/workspace/companies';
+
+const tableName = 'opportunity';
+
+export const DEV_SEED_OPPORTUNITY_IDS = {
+  OPPORTUNITY_1: '20202020-be10-412b-a663-16bd3c2228e1',
+  OPPORTUNITY_2: '20202020-0543-4cc2-9f96-95cc699960f2',
+  OPPORTUNITY_3: '20202020-2f89-406f-90ea-180f433b2445',
+  OPPORTUNITY_4: '20202020-35b1-4045-9cde-42f715148954',
+};
+
+export const seedOpportunity = async (
+  entityManager: EntityManager,
+  schemaName: string,
+) => {
+  await entityManager
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.${tableName}`, [
+      'id',
+      'name',
+      'amountAmountMicros',
+      'amountCurrencyCode',
+      'closeDate',
+      'probability',
+      'stage',
+      'position',
+      'pointOfContactId',
+      'companyId',
+    ])
+    .orIgnore()
+    .values([
+      {
+        id: DEV_SEED_OPPORTUNITY_IDS.OPPORTUNITY_1,
+        name: 'Opportunity 1',
+        amountAmountMicros: 100000,
+        amountCurrencyCode: 'USD',
+        closeDate: new Date(),
+        probability: 0.5,
+        stage: 'NEW',
+        position: 1,
+        pointOfContactId: DEV_SEED_PERSON_IDS.CHRISTOPH,
+        companyId: DEV_SEED_COMPANY_IDS.LINKEDIN,
+      },
+      {
+        id: DEV_SEED_OPPORTUNITY_IDS.OPPORTUNITY_2,
+        name: 'Opportunity 2',
+        amountAmountMicros: 2000000,
+        amountCurrencyCode: 'USD',
+        closeDate: new Date(),
+        probability: 0.5,
+        stage: 'MEETING',
+        position: 2,
+        pointOfContactId: DEV_SEED_PERSON_IDS.CHRISTOPHER_G,
+        companyId: DEV_SEED_COMPANY_IDS.FACEBOOK,
+      },
+      {
+        id: DEV_SEED_OPPORTUNITY_IDS.OPPORTUNITY_3,
+        name: 'Opportunity 3',
+        amountAmountMicros: 300000,
+        amountCurrencyCode: 'USD',
+        closeDate: new Date(),
+        probability: 0.5,
+        stage: 'PROPOSAL',
+        position: 3,
+        pointOfContactId: DEV_SEED_PERSON_IDS.NICHOLAS,
+        companyId: DEV_SEED_COMPANY_IDS.MICROSOFT,
+      },
+      {
+        id: DEV_SEED_OPPORTUNITY_IDS.OPPORTUNITY_4,
+        name: 'Opportunity 4',
+        amountAmountMicros: 4000000,
+        amountCurrencyCode: 'USD',
+        closeDate: new Date(),
+        probability: 0.5,
+        stage: 'PROPOSAL',
+        position: 4,
+        pointOfContactId: DEV_SEED_PERSON_IDS.MATTHEW,
+        companyId: DEV_SEED_COMPANY_IDS.MICROSOFT,
+      },
+    ])
+    .execute();
+};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/opportunity.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/opportunity.ts
deleted file mode 100644
index 49f76de5ea30..000000000000
--- a/packages/twenty-server/src/database/typeorm-seeds/workspace/opportunity.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { DataSource } from 'typeorm';
-
-const tableName = 'opportunity';
-
-export const seedOpportunity = async (
-  workspaceDataSource: DataSource,
-  schemaName: string,
-) => {
-  await workspaceDataSource
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.${tableName}`, [
-      'id',
-      'name',
-      'amountAmountMicros',
-      'amountCurrencyCode',
-      'closeDate',
-      'probability',
-      'stage',
-      'position',
-      'pipelineStepId',
-      'pointOfContactId',
-      'companyId',
-    ])
-    .orIgnore()
-    .values([
-      {
-        id: '7c887ee3-be10-412b-a663-16bd3c2228e1',
-        name: 'Opportunity 1',
-        amountAmountMicros: 100000,
-        amountCurrencyCode: 'USD',
-        closeDate: new Date(),
-        probability: 0.5,
-        stage: 'NEW',
-        position: 1,
-        pipelineStepId: '6edf4ead-006a-46e1-9c6d-228f1d0143c9',
-        pointOfContactId: '86083141-1c0e-494c-a1b6-85b1c6fefaa5',
-        companyId: 'fe256b39-3ec3-4fe3-8997-b76aa0bfa408',
-      },
-      {
-        id: '53f66647-0543-4cc2-9f96-95cc699960f2',
-        name: 'Opportunity 2',
-        amountAmountMicros: 2000000,
-        amountCurrencyCode: 'USD',
-        closeDate: new Date(),
-        probability: 0.5,
-        stage: 'MEETING',
-        position: 2,
-        pipelineStepId: 'd8361722-03fb-4e65-bd4f-ec9e52e5ec0a',
-        pointOfContactId: '93c72d2e-f517-42fd-80ae-14173b3b70ae',
-        companyId: '118995f3-5d81-46d6-bf83-f7fd33ea6102',
-      },
-      {
-        id: '81ab695d-2f89-406f-90ea-180f433b2445',
-        name: 'Opportunity 3',
-        amountAmountMicros: 300000,
-        amountCurrencyCode: 'USD',
-        closeDate: new Date(),
-        probability: 0.5,
-        stage: 'PROPOSAL',
-        position: 3,
-        pipelineStepId: '30b14887-d592-427d-bd97-6e670158db02',
-        pointOfContactId: '9b324a88-6784-4449-afdf-dc62cb8702f2',
-        companyId: '460b6fb1-ed89-413a-b31a-962986e67bb4',
-      },
-      {
-        id: '9b059852-35b1-4045-9cde-42f715148954',
-        name: 'Opportunity 4',
-        amountAmountMicros: 4000000,
-        amountCurrencyCode: 'USD',
-        closeDate: new Date(),
-        probability: 0.5,
-        stage: 'PROPOSAL',
-        position: 4,
-        pipelineStepId: '30b14887-d592-427d-bd97-6e670158db02',
-        pointOfContactId: '98406e26-80f1-4dff-b570-a74942528de3',
-        companyId: '460b6fb1-ed89-413a-b31a-962986e67bb4',
-      },
-    ])
-    .execute();
-};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/people.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/people.ts
index c621af6accf7..32dc66ffb1cf 100644
--- a/packages/twenty-server/src/database/typeorm-seeds/workspace/people.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/people.ts
@@ -1,12 +1,32 @@
-import { DataSource } from 'typeorm';
+import { EntityManager } from 'typeorm';
+
+import { DEV_SEED_COMPANY_IDS } from 'src/database/typeorm-seeds/workspace/companies';
 
 const tableName = 'person';
 
+export const DEV_SEED_PERSON_IDS = {
+  CHRISTOPH: '20202020-1c0e-494c-a1b6-85b1c6fefaa5',
+  SYLVIE: '20202020-ac73-4797-824e-87a1f5aea9e0',
+  CHRISTOPHER_G: '20202020-f517-42fd-80ae-14173b3b70ae',
+  ASHLEY: '20202020-eee1-4690-ad2c-8619e5b56a2e',
+  NICHOLAS: '20202020-6784-4449-afdf-dc62cb8702f2',
+  ISABELLA: '20202020-490f-4466-8391-733cfd66a0c8',
+  MATTHEW: '20202020-80f1-4dff-b570-a74942528de3',
+  ELIZABETH: '20202020-338b-46df-8811-fa08c7d19d35',
+  CHRISTOPHER_N: '20202020-64ad-4b0e-bbfd-e9fd795b7016',
+  AVERY: '20202020-5d54-41b7-ba36-f0d20e1417ae',
+  ETHAN: '20202020-623d-41fe-92e7-dd45b7c568e1',
+  MADISON: '20202020-2d40-4e49-8df4-9c6a049190ef',
+  BERTRAND: '20202020-2d40-4e49-8df4-9c6a049190df',
+  LOUIS: '20202020-2d40-4e49-8df4-9c6a049191de',
+  LORIE: '20202020-2d40-4e49-8df4-9c6a049191df',
+};
+
 export const seedPeople = async (
-  workspaceDataSource: DataSource,
+  entityManager: EntityManager,
   schemaName: string,
 ) => {
-  await workspaceDataSource
+  await entityManager
     .createQueryBuilder()
     .insert()
     .into(`${schemaName}.${tableName}`, [
@@ -22,154 +42,154 @@ export const seedPeople = async (
     .orIgnore()
     .values([
       {
-        id: '86083141-1c0e-494c-a1b6-85b1c6fefaa5',
+        id: DEV_SEED_PERSON_IDS.CHRISTOPH,
         nameFirstName: 'Christoph',
         nameLastName: 'Callisto',
         phone: '+33789012345',
         city: 'Seattle',
-        companyId: 'fe256b39-3ec3-4fe3-8997-b76aa0bfa408',
+        companyId: DEV_SEED_COMPANY_IDS.LINKEDIN,
         email: 'christoph.calisto@linkedin.com',
-        position: 0,
+        position: 1,
       },
       {
-        id: '0aa00beb-ac73-4797-824e-87a1f5aea9e0',
+        id: DEV_SEED_PERSON_IDS.SYLVIE,
         nameFirstName: 'Sylvie',
         nameLastName: 'Palmer',
         phone: '+33780123456',
         city: 'Los Angeles',
-        companyId: 'fe256b39-3ec3-4fe3-8997-b76aa0bfa408',
+        companyId: DEV_SEED_COMPANY_IDS.LINKEDIN,
         email: 'sylvie.palmer@linkedin.com',
-        position: 1,
+        position: 2,
       },
       {
-        id: '93c72d2e-f517-42fd-80ae-14173b3b70ae',
+        id: DEV_SEED_PERSON_IDS.CHRISTOPHER_G,
         nameFirstName: 'Christopher',
         nameLastName: 'Gonzalez',
         phone: '+33789012345',
         city: 'Seattle',
-        companyId: '118995f3-5d81-46d6-bf83-f7fd33ea6102',
+        companyId: DEV_SEED_COMPANY_IDS.QONTO,
         email: 'christopher.gonzalez@qonto.com',
-        position: 2,
+        position: 3,
       },
       {
-        id: 'eeeacacf-eee1-4690-ad2c-8619e5b56a2e',
+        id: DEV_SEED_PERSON_IDS.ASHLEY,
         nameFirstName: 'Ashley',
         nameLastName: 'Parker',
         phone: '+33780123456',
         city: 'Los Angeles',
-        companyId: '118995f3-5d81-46d6-bf83-f7fd33ea6102',
+        companyId: DEV_SEED_COMPANY_IDS.QONTO,
         email: 'ashley.parker@qonto.com',
-        position: 3,
+        position: 4,
       },
       {
-        id: '9b324a88-6784-4449-afdf-dc62cb8702f2',
+        id: DEV_SEED_PERSON_IDS.NICHOLAS,
         nameFirstName: 'Nicholas',
         nameLastName: 'Wright',
         phone: '+33781234567',
         city: 'Seattle',
-        companyId: '460b6fb1-ed89-413a-b31a-962986e67bb4',
+        companyId: DEV_SEED_COMPANY_IDS.MICROSOFT,
         email: 'nicholas.wright@microsoft.com',
-        position: 4,
+        position: 5,
       },
       {
-        id: '1d151852-490f-4466-8391-733cfd66a0c8',
+        id: DEV_SEED_PERSON_IDS.ISABELLA,
         nameFirstName: 'Isabella',
         nameLastName: 'Scott',
         phone: '+33782345678',
         city: 'New York',
-        companyId: '460b6fb1-ed89-413a-b31a-962986e67bb4',
+        companyId: DEV_SEED_COMPANY_IDS.MICROSOFT,
         email: 'isabella.scott@microsoft.com',
-        position: 5,
+        position: 6,
       },
       {
-        id: '98406e26-80f1-4dff-b570-a74942528de3',
+        id: DEV_SEED_PERSON_IDS.MATTHEW,
         nameFirstName: 'Matthew',
         nameLastName: 'Green',
         phone: '+33783456789',
         city: 'Seattle',
-        companyId: '460b6fb1-ed89-413a-b31a-962986e67bb4',
+        companyId: DEV_SEED_COMPANY_IDS.MICROSOFT,
         email: 'matthew.green@microsoft.com',
-        position: 6,
+        position: 7,
       },
       {
-        id: 'a2e78a5f-338b-46df-8811-fa08c7d19d35',
+        id: DEV_SEED_PERSON_IDS.ELIZABETH,
         nameFirstName: 'Elizabeth',
         nameLastName: 'Baker',
         phone: '+33784567890',
         city: 'New York',
-        companyId: '0d940997-c21e-4ec2-873b-de4264d89025',
+        companyId: DEV_SEED_COMPANY_IDS.AIRBNB,
         email: 'elizabeth.baker@airbnb.com',
-        position: 7,
+        position: 8,
       },
       {
-        id: 'ca1f5bf3-64ad-4b0e-bbfd-e9fd795b7016',
+        id: DEV_SEED_PERSON_IDS.CHRISTOPHER_N,
         nameFirstName: 'Christopher',
         nameLastName: 'Nelson',
         phone: '+33785678901',
         city: 'San Francisco',
-        companyId: '0d940997-c21e-4ec2-873b-de4264d89025',
+        companyId: DEV_SEED_COMPANY_IDS.AIRBNB,
         email: 'christopher.nelson@airbnb.com',
-        position: 8,
+        position: 9,
       },
       {
-        id: '56955422-5d54-41b7-ba36-f0d20e1417ae',
+        id: DEV_SEED_PERSON_IDS.AVERY,
         nameFirstName: 'Avery',
         nameLastName: 'Carter',
         phone: '+33786789012',
         city: 'New York',
-        companyId: '0d940997-c21e-4ec2-873b-de4264d89025',
+        companyId: DEV_SEED_COMPANY_IDS.AIRBNB,
         email: 'avery.carter@airbnb.com',
-        position: 9,
+        position: 10,
       },
       {
-        id: '755035db-623d-41fe-92e7-dd45b7c568e1',
+        id: DEV_SEED_PERSON_IDS.ETHAN,
         nameFirstName: 'Ethan',
         nameLastName: 'Mitchell',
         phone: '+33787890123',
         city: 'Los Angeles',
-        companyId: '0d940997-c21e-4ec2-873b-de4264d89025',
+        companyId: DEV_SEED_COMPANY_IDS.GOOGLE,
         email: 'ethan.mitchell@google.com',
-        position: 10,
+        position: 11,
       },
       {
-        id: '240da2ec-2d40-4e49-8df4-9c6a049190ef',
+        id: DEV_SEED_PERSON_IDS.MADISON,
         nameFirstName: 'Madison',
         nameLastName: 'Perez',
         phone: '+33788901234',
         city: 'Seattle',
-        companyId: '0d940997-c21e-4ec2-873b-de4264d89025',
+        companyId: DEV_SEED_COMPANY_IDS.GOOGLE,
         email: 'madison.perez@google.com',
-        position: 11,
+        position: 12,
       },
       {
-        id: '240da2ec-2d40-4e49-8df4-9c6a049190df',
+        id: DEV_SEED_PERSON_IDS.BERTRAND,
         nameFirstName: 'Bertrand',
         nameLastName: 'Voulzy',
         phone: '+33788901234',
         city: 'Seattle',
-        companyId: '0d940997-c21e-4ec2-873b-de4264d89025',
+        companyId: DEV_SEED_COMPANY_IDS.GOOGLE,
         email: 'bertrand.voulzy@google.com',
-        position: 12,
+        position: 13,
       },
       {
-        id: '240da2ec-2d40-4e49-8df4-9c6a049191de',
+        id: DEV_SEED_PERSON_IDS.LOUIS,
         nameFirstName: 'Louis',
         nameLastName: 'Duss',
         phone: '+33788901234',
         city: 'Seattle',
-        companyId: 'a7bc68d5-f79e-40dd-bd06-c36e6abb4678',
+        companyId: DEV_SEED_COMPANY_IDS.GOOGLE,
         email: 'louis.duss@google.com',
-        position: 13,
+        position: 14,
       },
       {
-        id: '240da2ec-2d40-4e49-8df4-9c6a049191df',
+        id: DEV_SEED_PERSON_IDS.LORIE,
         nameFirstName: 'Lorie',
         nameLastName: 'Vladim',
         phone: '+33788901235',
         city: 'Seattle',
-        companyId: 'a674fa6c-1455-4c57-afaf-dd5dc086361d',
+        companyId: DEV_SEED_COMPANY_IDS.GOOGLE,
         email: 'lorie.vladim@google.com',
-        position: 14,
+        position: 15,
       },
     ])
     .execute();
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/pipeline-step.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/pipeline-step.ts
deleted file mode 100644
index 4a9b25e4808d..000000000000
--- a/packages/twenty-server/src/database/typeorm-seeds/workspace/pipeline-step.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { DataSource } from 'typeorm';
-
-const tableName = 'pipelineStep';
-
-export const seedPipelineStep = async (
-  workspaceDataSource: DataSource,
-  schemaName: string,
-) => {
-  await workspaceDataSource
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.${tableName}`, ['id', 'name', 'color', 'position'])
-    .orIgnore()
-    .values([
-      {
-        id: '6edf4ead-006a-46e1-9c6d-228f1d0143c9',
-        name: 'NEW',
-        color: 'red',
-        position: 0,
-      },
-      {
-        id: 'd8361722-03fb-4e65-bd4f-ec9e52e5ec0a',
-        name: 'SCREENING',
-        color: 'purple',
-        position: 1,
-      },
-      {
-        id: '30b14887-d592-427d-bd97-6e670158db02',
-        name: 'MEETING',
-        color: 'sky',
-        position: 2,
-      },
-      {
-        id: 'db5a6648-d80d-4020-af64-4817ab4a12e8',
-        name: 'PROPOSAL',
-        color: 'turquoise',
-        position: 3,
-      },
-      {
-        id: 'bea8bb7b-5467-48a6-9a8a-a8fa500123fe',
-        name: 'CUSTOMER',
-        color: 'yellow',
-        position: 4,
-      },
-    ])
-    .execute();
-};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/views.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/views.ts
deleted file mode 100644
index eaa2471087c0..000000000000
--- a/packages/twenty-server/src/database/typeorm-seeds/workspace/views.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-import { DataSource } from 'typeorm';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-
-export const seedViews = async (
-  workspaceDataSource: DataSource,
-  schemaName: string,
-  objectMetadataMap: Record<string, ObjectMetadataEntity>,
-) => {
-  const createdViews = await workspaceDataSource
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.view`, ['name', 'objectMetadataId', 'type'])
-    .values([
-      {
-        name: 'All Companies',
-        objectMetadataId: objectMetadataMap['company'].id,
-        type: 'table',
-      },
-      {
-        name: 'All People',
-        objectMetadataId: objectMetadataMap['person'].id,
-        type: 'table',
-      },
-      {
-        name: 'All Opportunities',
-        objectMetadataId: objectMetadataMap['opportunity'].id,
-        type: 'kanban',
-      },
-    ])
-    .returning('*')
-    .execute();
-
-  const viewIdMap = createdViews.raw.reduce((acc, view) => {
-    acc[view.name] = view.id;
-
-    return acc;
-  }, {});
-
-  await workspaceDataSource
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.viewField`, [
-      'fieldMetadataId',
-      'viewId',
-      'position',
-      'isVisible',
-      'size',
-    ])
-    .values([
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['name'],
-        viewId: viewIdMap['All Companies'],
-        position: 0,
-        isVisible: true,
-        size: 180,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['domainName'],
-        viewId: viewIdMap['All Companies'],
-        position: 1,
-        isVisible: true,
-        size: 100,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['accountOwner'],
-        viewId: viewIdMap['All Companies'],
-        position: 2,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['createdAt'],
-        viewId: viewIdMap['All Companies'],
-        position: 3,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['employees'],
-        viewId: viewIdMap['All Companies'],
-        position: 4,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['linkedinLink'],
-        viewId: viewIdMap['All Companies'],
-        position: 5,
-        isVisible: true,
-        size: 170,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['address'],
-        viewId: viewIdMap['All Companies'],
-        position: 6,
-        isVisible: true,
-        size: 170,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['name'],
-        viewId: viewIdMap['All People'],
-        position: 0,
-        isVisible: true,
-        size: 210,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['email'],
-        viewId: viewIdMap['All People'],
-        position: 1,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['company'],
-        viewId: viewIdMap['All People'],
-        position: 2,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['phone'],
-        viewId: viewIdMap['All People'],
-        position: 3,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['createdAt'],
-        viewId: viewIdMap['All People'],
-        position: 4,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['city'],
-        viewId: viewIdMap['All People'],
-        position: 5,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['jobTitle'],
-        viewId: viewIdMap['All People'],
-        position: 6,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['linkedinLink'],
-        viewId: viewIdMap['All People'],
-        position: 7,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['xLink'],
-        viewId: viewIdMap['All People'],
-        position: 8,
-        isVisible: true,
-        size: 150,
-      },
-
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['amount'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 0,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['closeDate'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 1,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['probability'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 2,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId:
-          objectMetadataMap['opportunity'].fields['pointOfContact'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 3,
-        isVisible: true,
-        size: 150,
-      },
-    ])
-    .execute();
-};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/workspace-members.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/workspace-members.ts
new file mode 100644
index 000000000000..dfe07736ad4e
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/workspace-members.ts
@@ -0,0 +1,95 @@
+import { EntityManager } from 'typeorm';
+
+import {
+  SEED_APPLE_WORKSPACE_ID,
+  SEED_TWENTY_WORKSPACE_ID,
+} from 'src/database/typeorm-seeds/core/workspaces';
+import { WorkspaceMember } from 'src/engine/core-modules/user/dtos/workspace-member.dto';
+import { DEV_SEED_USER_IDS } from 'src/database/typeorm-seeds/core/users';
+
+const tableName = 'workspaceMember';
+
+export const DEV_SEED_WORKSPACE_MEMBER_IDS = {
+  TIM: '20202020-0687-4c41-b707-ed1bfca972a7',
+  JONY: '20202020-77d5-4cb6-b60a-f4a835a85d61',
+  PHIL: '20202020-1553-45c6-a028-5a9064cce07f',
+};
+
+type WorkspaceMembers = Pick<
+  WorkspaceMember,
+  'id' | 'locale' | 'colorScheme'
+> & {
+  nameFirstName: string;
+  nameLastName: string;
+  userEmail: string;
+  userId: string;
+};
+
+export const seedWorkspaceMember = async (
+  entityManager: EntityManager,
+  schemaName: string,
+  workspaceId: string,
+) => {
+  let workspaceMembers: WorkspaceMembers[] = [];
+
+  if (workspaceId === SEED_APPLE_WORKSPACE_ID) {
+    workspaceMembers = [
+      {
+        id: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        nameFirstName: 'Tim',
+        nameLastName: 'Apple',
+        locale: 'en',
+        colorScheme: 'Light',
+        userEmail: 'tim@apple.dev',
+        userId: DEV_SEED_USER_IDS.TIM,
+      },
+      {
+        id: DEV_SEED_WORKSPACE_MEMBER_IDS.JONY,
+        nameFirstName: 'Jony',
+        nameLastName: 'Ive',
+        locale: 'en',
+        colorScheme: 'Light',
+        userEmail: 'jony.ive@apple.dev',
+        userId: DEV_SEED_USER_IDS.JONY,
+      },
+      {
+        id: DEV_SEED_WORKSPACE_MEMBER_IDS.PHIL,
+        nameFirstName: 'Phil',
+        nameLastName: 'Shiler',
+        locale: 'en',
+        colorScheme: 'Light',
+        userEmail: 'phil.schiler@apple.dev',
+        userId: DEV_SEED_USER_IDS.PHIL,
+      },
+    ];
+  }
+
+  if (workspaceId === SEED_TWENTY_WORKSPACE_ID) {
+    workspaceMembers = [
+      {
+        id: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        nameFirstName: 'Tim',
+        nameLastName: 'Apple',
+        locale: 'en',
+        colorScheme: 'Light',
+        userEmail: 'tim@apple.dev',
+        userId: DEV_SEED_USER_IDS.TIM,
+      },
+    ];
+  }
+  await entityManager
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.${tableName}`, [
+      'id',
+      'nameFirstName',
+      'nameLastName',
+      'locale',
+      'colorScheme',
+      'userEmail',
+      'userId',
+    ])
+    .orIgnore()
+    .values(workspaceMembers)
+    .execute();
+};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/workspaceMember.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/workspaceMember.ts
deleted file mode 100644
index 2f0054e87a04..000000000000
--- a/packages/twenty-server/src/database/typeorm-seeds/workspace/workspaceMember.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { DataSource } from 'typeorm';
-
-import { SeedUserIds } from 'src/database/typeorm-seeds/core/users';
-
-const tableName = 'workspaceMember';
-
-const WorkspaceMemberIds = {
-  Tim: '20202020-0687-4c41-b707-ed1bfca972a7',
-  Jony: '20202020-77d5-4cb6-b60a-f4a835a85d61',
-  Phil: '20202020-1553-45c6-a028-5a9064cce07f',
-};
-
-export const seedWorkspaceMember = async (
-  workspaceDataSource: DataSource,
-  schemaName: string,
-) => {
-  await workspaceDataSource
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.${tableName}`, [
-      'id',
-      'nameFirstName',
-      'nameLastName',
-      'locale',
-      'colorScheme',
-      'userEmail',
-      'userId',
-    ])
-    .orIgnore()
-    .values([
-      {
-        id: WorkspaceMemberIds.Tim,
-        nameFirstName: 'Tim',
-        nameLastName: 'Apple',
-        locale: 'en',
-        colorScheme: 'Light',
-        userEmail: 'tim@apple.dev',
-        userId: SeedUserIds.Tim,
-      },
-      {
-        id: WorkspaceMemberIds.Jony,
-        nameFirstName: 'Jony',
-        nameLastName: 'Ive',
-        locale: 'en',
-        colorScheme: 'Light',
-        userEmail: 'jony.ive@apple.dev',
-        userId: SeedUserIds.Jony,
-      },
-      {
-        id: WorkspaceMemberIds.Phil,
-        nameFirstName: 'Phil',
-        nameLastName: 'Shiler',
-        locale: 'en',
-        colorScheme: 'Light',
-        userEmail: 'phil.schiler@apple.dev',
-        userId: SeedUserIds.Phil,
-      },
-    ])
-    .execute();
-};
diff --git a/packages/twenty-server/src/database/typeorm/core/core.datasource.ts b/packages/twenty-server/src/database/typeorm/core/core.datasource.ts
index 7125558e43b4..64f3e2394a9e 100644
--- a/packages/twenty-server/src/database/typeorm/core/core.datasource.ts
+++ b/packages/twenty-server/src/database/typeorm/core/core.datasource.ts
@@ -1,17 +1,15 @@
-import { ConfigService } from '@nestjs/config';
 import { TypeOrmModuleOptions } from '@nestjs/typeorm';
 
 import { DataSource, DataSourceOptions } from 'typeorm';
 import { config } from 'dotenv';
 config();
-const configService = new ConfigService();
 
 export const typeORMCoreModuleOptions: TypeOrmModuleOptions = {
-  url: configService.get<string>('PG_DATABASE_URL'),
+  url: process.env.PG_DATABASE_URL,
   type: 'postgres',
   logging: ['error'],
   schema: 'core',
-  entities: ['dist/src/core/**/*.entity{.ts,.js}'],
+  entities: ['dist/src/engine/core-modules/**/*.entity{.ts,.js}'],
   synchronize: false,
   migrationsRun: false,
   migrationsTableName: '_typeorm_migrations',
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/1707778127558-addUserWorkspaces.ts b/packages/twenty-server/src/database/typeorm/core/migrations/1707778127558-addUserWorkspaces.ts
index e0e0b2013b3f..b509cbca5790 100644
--- a/packages/twenty-server/src/database/typeorm/core/migrations/1707778127558-addUserWorkspaces.ts
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/1707778127558-addUserWorkspaces.ts
@@ -14,10 +14,6 @@ export class AddUserWorkspaces1707778127558 implements MigrationInterface {
                 "deletedAt" TIMESTAMP
             )`,
     );
-
-    await queryRunner.query(
-      `ALTER TABLE "core"."user" DROP CONSTRAINT "FK_2ec910029395fa7655621c88908"`,
-    );
   }
 
   public async down(): Promise<void> {}
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/1709314035408-updateUserWorkspace.ts b/packages/twenty-server/src/database/typeorm/core/migrations/1709314035408-updateUserWorkspace.ts
new file mode 100644
index 000000000000..b3bd23110bdd
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/1709314035408-updateUserWorkspace.ts
@@ -0,0 +1,28 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UpdateUserWorkspace1709314035408 implements MigrationInterface {
+  name = 'UpdateUserWorkspace1709314035408';
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE "core"."userWorkspace" 
+      ADD CONSTRAINT "FK_37fdc7357af701e595c5c3a9bd6" 
+      FOREIGN KEY ("workspaceId") REFERENCES "core"."workspace"("id") 
+      ON DELETE CASCADE ON UPDATE NO ACTION
+    `);
+    await queryRunner.query(`
+      ALTER TABLE "core"."userWorkspace" 
+      ADD CONSTRAINT "FK_cb488f32c6a0827b938edadf221" 
+      FOREIGN KEY ("userId") REFERENCES "core"."user"("id") 
+      ON DELETE CASCADE ON UPDATE NO ACTION
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" DROP CONSTRAINT "FK_cb488f32c6a0827b938edadf221"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" DROP CONSTRAINT "FK_37fdc7357af701e595c5c3a9bd6"`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/1709680520888-updateUserWorkspaceColumnConstraints.ts b/packages/twenty-server/src/database/typeorm/core/migrations/1709680520888-updateUserWorkspaceColumnConstraints.ts
new file mode 100644
index 000000000000..abaab0034311
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/1709680520888-updateUserWorkspaceColumnConstraints.ts
@@ -0,0 +1,44 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class updateUserWorkspaceColumnConstraints1709680520888
+  implements MigrationInterface
+{
+  name = 'updateUserWorkspaceColumnConstraints1709680520888';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // ----------------- WARNING ------------------------
+    // Dropping constraints and adding them back is NOT a recommended and should be AVOIDED,
+    // since it can affect data integrity and cause downtime and unintentional data loss.
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" DROP CONSTRAINT "userWorkspace_userId_fkey"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" DROP CONSTRAINT "userWorkspace_workspaceId_fkey"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" DROP CONSTRAINT "FK_cb488f32c6a0827b938edadf221"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" DROP CONSTRAINT "FK_37fdc7357af701e595c5c3a9bd6"`,
+    );
+
+    await queryRunner.query(`
+            ALTER TABLE "core"."userWorkspace" 
+            ADD CONSTRAINT "FK_37fdc7357af701e595c5c3a9bd6" 
+            FOREIGN KEY ("workspaceId") REFERENCES "core"."workspace"("id") 
+            ON DELETE CASCADE ON UPDATE NO ACTION
+        `);
+
+    await queryRunner.query(`
+            ALTER TABLE "core"."userWorkspace" 
+            ADD CONSTRAINT "FK_cb488f32c6a0827b938edadf221" 
+            FOREIGN KEY ("userId") REFERENCES "core"."user"("id") 
+            ON DELETE CASCADE ON UPDATE NO ACTION
+        `);
+  }
+
+  public async down(): Promise<void> {}
+}
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/1709914564361-updateBillingSubscription.ts b/packages/twenty-server/src/database/typeorm/core/migrations/1709914564361-updateBillingSubscription.ts
new file mode 100644
index 000000000000..0505b688b94d
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/1709914564361-updateBillingSubscription.ts
@@ -0,0 +1,37 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UpdateBillingSubscription1709914564361
+  implements MigrationInterface
+{
+  name = 'UpdateBillingSubscription1709914564361';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" DROP CONSTRAINT "FK_4abfb70314c18da69e1bee1954d"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" DROP CONSTRAINT "REL_4abfb70314c18da69e1bee1954"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" DROP CONSTRAINT "UQ_9120b7586c3471463480b58d20a"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ADD CONSTRAINT "FK_4abfb70314c18da69e1bee1954d" FOREIGN KEY ("workspaceId") REFERENCES "core"."workspace"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" DROP CONSTRAINT "FK_4abfb70314c18da69e1bee1954d"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ADD CONSTRAINT "UQ_9120b7586c3471463480b58d20a" UNIQUE ("stripeCustomerId")`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ADD CONSTRAINT "REL_4abfb70314c18da69e1bee1954" UNIQUE ("workspaceId")`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ADD CONSTRAINT "FK_4abfb70314c18da69e1bee1954d" FOREIGN KEY ("workspaceId") REFERENCES "core"."workspace"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/1710926613773-addIntervalToBillingSubscription.ts b/packages/twenty-server/src/database/typeorm/core/migrations/1710926613773-addIntervalToBillingSubscription.ts
new file mode 100644
index 000000000000..441cf54d0785
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/1710926613773-addIntervalToBillingSubscription.ts
@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddIntervalToBillingSubscription1710926613773
+  implements MigrationInterface
+{
+  name = 'AddIntervalToBillingSubscription1710926613773';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ADD "interval" character varying`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" DROP COLUMN "interval"`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/1711557405330-addMissingMigration.ts b/packages/twenty-server/src/database/typeorm/core/migrations/1711557405330-addMissingMigration.ts
new file mode 100644
index 000000000000..4cbc77a4d9bc
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/1711557405330-addMissingMigration.ts
@@ -0,0 +1,102 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddMissingMigration1711557405330 implements MigrationInterface {
+  name = 'AddMissingMigration1711557405330';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" DROP CONSTRAINT "FK_37fdc7357af701e595c5c3a9bd6"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" DROP CONSTRAINT "FK_cb488f32c6a0827b938edadf221"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE USING "createdAt"::TIMESTAMP WITH TIME ZONE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ALTER COLUMN "createdAt" SET DEFAULT now()`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ALTER COLUMN "createdAt" SET NOT NULL;`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE USING "updatedAt"::TIMESTAMP WITH TIME ZONE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ALTER COLUMN "updatedAt" SET DEFAULT now()`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ALTER COLUMN "updatedAt" SET NOT NULL;`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ALTER COLUMN "deletedAt" TYPE TIMESTAMP WITH TIME ZONE USING "deletedAt"::TIMESTAMP WITH TIME ZONE`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" DROP CONSTRAINT "FK_2ec910029395fa7655621c88908"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" ALTER COLUMN "defaultWorkspaceId" SET NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ADD CONSTRAINT "IndexOnUserIdAndWorkspaceIdUnique" UNIQUE ("userId", "workspaceId")`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ADD CONSTRAINT "FK_a2da2ea7d6cd1e5a4c5cb1791f8" FOREIGN KEY ("userId") REFERENCES "core"."user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ADD CONSTRAINT "FK_22f5e76f493c3fb20237cfc48b0" FOREIGN KEY ("workspaceId") REFERENCES "core"."workspace"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" ADD CONSTRAINT "FK_2ec910029395fa7655621c88908" FOREIGN KEY ("defaultWorkspaceId") REFERENCES "core"."workspace"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" DROP CONSTRAINT "FK_2ec910029395fa7655621c88908"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" DROP CONSTRAINT "FK_22f5e76f493c3fb20237cfc48b0"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" DROP CONSTRAINT "FK_a2da2ea7d6cd1e5a4c5cb1791f8"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" DROP CONSTRAINT "IndexOnUserIdAndWorkspaceIdUnique"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" ALTER COLUMN "defaultWorkspaceId" DROP NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" ADD CONSTRAINT "FK_2ec910029395fa7655621c88908" FOREIGN KEY ("defaultWorkspaceId") REFERENCES "core"."workspace"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" DROP COLUMN "deletedAt"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ADD "deletedAt" TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" DROP COLUMN "updatedAt"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ADD "updatedAt" TIMESTAMP NOT NULL DEFAULT now()`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" DROP COLUMN "createdAt"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ADD "createdAt" TIMESTAMP NOT NULL DEFAULT now()`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ADD CONSTRAINT "FK_cb488f32c6a0827b938edadf221" FOREIGN KEY ("userId") REFERENCES "core"."user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ADD CONSTRAINT "FK_37fdc7357af701e595c5c3a9bd6" FOREIGN KEY ("workspaceId") REFERENCES "core"."workspace"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/1711624086253-updateRefreshTokenTable.ts b/packages/twenty-server/src/database/typeorm/core/migrations/1711624086253-updateRefreshTokenTable.ts
new file mode 100644
index 000000000000..5ea12b91fa60
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/1711624086253-updateRefreshTokenTable.ts
@@ -0,0 +1,51 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UpdateRefreshTokenTable1711624086253
+  implements MigrationInterface
+{
+  name = 'UpdateRefreshTokenTable1711624086253';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."refreshToken" RENAME TO "appToken"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."appToken" ADD "workspaceId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."appToken" ADD "type" text NOT NULL DEFAULT 'REFRESH_TOKEN'`,
+    );
+    await queryRunner.query(`ALTER TABLE "core"."appToken" ADD "value" text`);
+    await queryRunner.query(
+      `ALTER TABLE "core"."appToken" ADD CONSTRAINT "FK_d6ae19a7aa2bbd4919053257772" FOREIGN KEY ("workspaceId") REFERENCES "core"."workspace"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."appToken" DROP CONSTRAINT "FK_7008a2b0fb083127f60b5f4448e"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."appToken" ADD CONSTRAINT "FK_8cd4819144baf069777b5729136" FOREIGN KEY ("userId") REFERENCES "core"."user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."appToken" ADD CONSTRAINT "FK_7008a2b0fb083127f60b5f4448e" FOREIGN KEY ("userId") REFERENCES "core"."user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."appToken" DROP CONSTRAINT "FK_8cd4819144baf069777b5729136"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."appToken" DROP CONSTRAINT "FK_d6ae19a7aa2bbd4919053257772"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."appToken" DROP COLUMN "value"`,
+    );
+    await queryRunner.query(`ALTER TABLE "core"."appToken" DROP COLUMN "type"`);
+    await queryRunner.query(
+      `ALTER TABLE "core"."appToken" DROP COLUMN "workspaceId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."appToken" RENAME TO "refreshToken"`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/1711633823798-useTimestampWithTZ.ts b/packages/twenty-server/src/database/typeorm/core/migrations/1711633823798-useTimestampWithTZ.ts
new file mode 100644
index 000000000000..d2937d222f78
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/1711633823798-useTimestampWithTZ.ts
@@ -0,0 +1,71 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UseTimestampWithTZ1711633823798 implements MigrationInterface {
+  name = 'UseTimestampWithTZ1711633823798';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."featureFlag" ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE USING "createdAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."featureFlag" ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE USING "updatedAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscriptionItem" ALTER COLUMN "deletedAt" TYPE TIMESTAMP WITH TIME ZONE USING "deletedAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ALTER COLUMN "deletedAt" TYPE TIMESTAMP WITH TIME ZONE USING "deletedAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "deletedAt" TYPE TIMESTAMP WITH TIME ZONE USING "deletedAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" ALTER COLUMN "deletedAt" TYPE TIMESTAMP WITH TIME ZONE USING "deletedAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" ALTER COLUMN "passwordResetTokenExpiresAt" TYPE TIMESTAMP WITH TIME ZONE USING "passwordResetTokenExpiresAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE USING "createdAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE USING "updatedAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ALTER COLUMN "deletedAt" TYPE TIMESTAMP WITH TIME ZONE USING "deletedAt" AT TIME ZONE 'UTC'`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."featureFlag" ALTER COLUMN "createdAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."featureFlag" ALTER COLUMN "updatedAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscriptionItem" ALTER COLUMN "deletedAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ALTER COLUMN "deletedAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "deletedAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" ALTER COLUMN "deletedAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" ALTER COLUMN "passwordResetTokenExpiresAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ALTER COLUMN "createdAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ALTER COLUMN "updatedAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."userWorkspace" ALTER COLUMN "deletedAt" TYPE TIMESTAMP`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/metadata/metadata.datasource.ts b/packages/twenty-server/src/database/typeorm/metadata/metadata.datasource.ts
index 92a75a8738e5..7fbe5e599dd9 100644
--- a/packages/twenty-server/src/database/typeorm/metadata/metadata.datasource.ts
+++ b/packages/twenty-server/src/database/typeorm/metadata/metadata.datasource.ts
@@ -1,17 +1,15 @@
-import { ConfigService } from '@nestjs/config';
 import { TypeOrmModuleOptions } from '@nestjs/typeorm';
 
 import { DataSource, DataSourceOptions } from 'typeorm';
 import { config } from 'dotenv';
 config();
-const configService = new ConfigService();
 
 export const typeORMMetadataModuleOptions: TypeOrmModuleOptions = {
-  url: configService.get<string>('PG_DATABASE_URL'),
+  url: process.env.PG_DATABASE_URL,
   type: 'postgres',
   logging: ['error'],
   schema: 'metadata',
-  entities: ['dist/src/metadata/**/*.entity{.ts,.js}'],
+  entities: ['dist/src/engine/metadata-modules/**/*.entity{.ts,.js}'],
   synchronize: false,
   migrationsRun: false,
   migrationsTableName: '_typeorm_migrations',
diff --git a/packages/twenty-server/src/database/typeorm/metadata/migrations/1709894431938-addStandardId.ts b/packages/twenty-server/src/database/typeorm/metadata/migrations/1709894431938-addStandardId.ts
new file mode 100644
index 000000000000..e02e1b321278
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/metadata/migrations/1709894431938-addStandardId.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddStandardId1709894431938 implements MigrationInterface {
+  name = 'AddStandardId1709894431938';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."objectMetadata" ADD "standardId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" ADD "standardId" uuid`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" DROP COLUMN "standardId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."objectMetadata" DROP COLUMN "standardId"`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/metadata/migrations/1711374137222-addRemoteServerTable.ts b/packages/twenty-server/src/database/typeorm/metadata/migrations/1711374137222-addRemoteServerTable.ts
new file mode 100644
index 000000000000..29cc5870c4b6
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/metadata/migrations/1711374137222-addRemoteServerTable.ts
@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddRemoteServerTable1711374137222 implements MigrationInterface {
+  name = 'AddRemoteServerTable1711374137222';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "metadata"."remoteServer" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "foreignDataWrapperId" uuid NOT NULL DEFAULT uuid_generate_v4(), "foreignDataWrapperType" character varying, "foreignDataWrapperOptions" jsonb, "userMappingOptions" jsonb, "workspaceId" uuid NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_8e5d208498fa2c9710bb934023a" PRIMARY KEY ("id"))`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE "metadata"."remoteServer"`);
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/metadata/migrations/1711459912762-dropTargetColumnMap.ts b/packages/twenty-server/src/database/typeorm/metadata/migrations/1711459912762-dropTargetColumnMap.ts
new file mode 100644
index 000000000000..0c10d53399e5
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/metadata/migrations/1711459912762-dropTargetColumnMap.ts
@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class DropTargetColumnMap1711459912762 implements MigrationInterface {
+  name = 'DropTargetColumnMap1711459912762';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" DROP COLUMN "targetColumnMap"`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" ADD "targetColumnMap" jsonb NOT NULL`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/metadata/migrations/1711466822763-addIsRemoteField.ts b/packages/twenty-server/src/database/typeorm/metadata/migrations/1711466822763-addIsRemoteField.ts
new file mode 100644
index 000000000000..77b814324a02
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/metadata/migrations/1711466822763-addIsRemoteField.ts
@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddIsRemoteField1711466822763 implements MigrationInterface {
+  name = 'AddIsRemoteField1711466822763';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."objectMetadata" ADD "isRemote" boolean NOT NULL DEFAULT false`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."objectMetadata" DROP COLUMN "isRemote"`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/metadata/migrations/1711619086385-useTimestampWithTZ.ts b/packages/twenty-server/src/database/typeorm/metadata/migrations/1711619086385-useTimestampWithTZ.ts
new file mode 100644
index 000000000000..29ebffb78ba5
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/metadata/migrations/1711619086385-useTimestampWithTZ.ts
@@ -0,0 +1,95 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UseTimestampWithTZ1711619086385 implements MigrationInterface {
+  name = 'UseTimestampWithTZ1711619086385';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."workspaceMigration" ALTER COLUMN "appliedAt" TYPE TIMESTAMP WITH TIME ZONE USING "appliedAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."workspaceMigration" ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE USING "createdAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."workspaceCacheVersion" ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE USING "createdAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."workspaceCacheVersion" ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE USING "updatedAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."remoteServer" ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE USING "createdAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."remoteServer" ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE USING "updatedAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."dataSource" ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE USING "createdAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."dataSource" ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE USING "updatedAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."objectMetadata" ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE USING "createdAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."objectMetadata" ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE USING "updatedAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE USING "createdAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE USING "updatedAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."relationMetadata" ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE USING "createdAt" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."relationMetadata" ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE USING "updatedAt" AT TIME ZONE 'UTC'`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."workspaceMigration" ALTER COLUMN "appliedAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."workspaceMigration" ALTER COLUMN "createdAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."workspaceCacheVersion" ALTER COLUMN "createdAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."workspaceCacheVersion" ALTER COLUMN "updatedAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."remoteServer" ALTER COLUMN "createdAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."remoteServer" ALTER COLUMN "updatedAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."dataSource" ALTER COLUMN "createdAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."dataSource" ALTER COLUMN "updatedAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."objectMetadata" ALTER COLUMN "createdAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."objectMetadata" ALTER COLUMN "updatedAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" ALTER COLUMN "createdAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" ALTER COLUMN "updatedAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."relationMetadata" ALTER COLUMN "createdAt" TYPE TIMESTAMP`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."relationMetadata" ALTER COLUMN "updatedAt" TYPE TIMESTAMP`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/typeorm.module.ts b/packages/twenty-server/src/database/typeorm/typeorm.module.ts
index 6866a6d4a0d7..b24fe05bad94 100644
--- a/packages/twenty-server/src/database/typeorm/typeorm.module.ts
+++ b/packages/twenty-server/src/database/typeorm/typeorm.module.ts
@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule, TypeOrmModuleOptions } from '@nestjs/typeorm';
 
 import { typeORMCoreModuleOptions } from 'src/database/typeorm/core/core.datasource';
-import { EnvironmentModule } from 'src/integrations/environment/environment.module';
+import { EnvironmentModule } from 'src/engine/integrations/environment/environment.module';
 
 import { TypeORMService } from './typeorm.service';
 
diff --git a/packages/twenty-server/src/database/typeorm/typeorm.service.ts b/packages/twenty-server/src/database/typeorm/typeorm.service.ts
index 837bacef6964..cc542d60ba16 100644
--- a/packages/twenty-server/src/database/typeorm/typeorm.service.ts
+++ b/packages/twenty-server/src/database/typeorm/typeorm.service.ts
@@ -2,14 +2,15 @@ import { Injectable, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
 
 import { DataSource } from 'typeorm';
 
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { DataSourceEntity } from 'src/metadata/data-source/data-source.entity';
-import { User } from 'src/core/user/user.entity';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { RefreshToken } from 'src/core/refresh-token/refresh-token.entity';
-import { FeatureFlagEntity } from 'src/core/feature-flag/feature-flag.entity';
-import { BillingSubscription } from 'src/core/billing/entities/billing-subscription.entity';
-import { BillingSubscriptionItem } from 'src/core/billing/entities/billing-subscription-item.entity';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
+import { BillingSubscriptionItem } from 'src/engine/core-modules/billing/entities/billing-subscription-item.entity';
+import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 
 @Injectable()
 export class TypeORMService implements OnModuleInit, OnModuleDestroy {
@@ -19,14 +20,15 @@ export class TypeORMService implements OnModuleInit, OnModuleDestroy {
 
   constructor(private readonly environmentService: EnvironmentService) {
     this.mainDataSource = new DataSource({
-      url: environmentService.getPGDatabaseUrl(),
+      url: environmentService.get('PG_DATABASE_URL'),
       type: 'postgres',
       logging: false,
       schema: 'core',
       entities: [
         User,
         Workspace,
-        RefreshToken,
+        UserWorkspace,
+        AppToken,
         FeatureFlagEntity,
         BillingSubscription,
         BillingSubscriptionItem,
@@ -38,11 +40,6 @@ export class TypeORMService implements OnModuleInit, OnModuleDestroy {
     return this.mainDataSource;
   }
 
-  /**
-   * Connects to a data source using metadata. Returns a cached connection if it exists.
-   * @param dataSource DataSourceEntity
-   * @returns Promise<DataSource | undefined>
-   */
   public async connectToDataSource(
     dataSource: DataSourceEntity,
   ): Promise<DataSource | undefined> {
@@ -81,9 +78,9 @@ export class TypeORMService implements OnModuleInit, OnModuleDestroy {
     const schema = dataSource.schema;
 
     const workspaceDataSource = new DataSource({
-      url: dataSource.url ?? this.environmentService.getPGDatabaseUrl(),
+      url: dataSource.url ?? this.environmentService.get('PG_DATABASE_URL'),
       type: 'postgres',
-      logging: this.environmentService.isDebugMode()
+      logging: this.environmentService.get('DEBUG_MODE')
         ? ['query', 'error']
         : ['error'],
       schema,
@@ -94,12 +91,6 @@ export class TypeORMService implements OnModuleInit, OnModuleDestroy {
     return workspaceDataSource;
   }
 
-  /**
-   * Disconnects from a workspace data source.
-   * @param dataSourceId
-   * @returns Promise<void>
-   *
-   */
   public async disconnectFromDataSource(dataSourceId: string) {
     if (!this.dataSources.has(dataSourceId)) {
       return;
@@ -112,11 +103,6 @@ export class TypeORMService implements OnModuleInit, OnModuleDestroy {
     this.dataSources.delete(dataSourceId);
   }
 
-  /**
-   * Creates a new schema
-   * @param workspaceId
-   * @returns Promise<void>
-   */
   public async createSchema(schemaName: string): Promise<string> {
     const queryRunner = this.mainDataSource.createQueryRunner();
 
diff --git a/packages/twenty-server/src/engine/api/__mocks__/object-metadata-item.mock.ts b/packages/twenty-server/src/engine/api/__mocks__/object-metadata-item.mock.ts
new file mode 100644
index 000000000000..a3368ae6a9c4
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/__mocks__/object-metadata-item.mock.ts
@@ -0,0 +1,66 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+
+export const fieldNumberMock = {
+  name: 'fieldNumber',
+  type: FieldMetadataType.NUMBER,
+  isNullable: false,
+  defaultValue: null,
+};
+
+export const fieldStringMock = {
+  name: 'fieldString',
+  type: FieldMetadataType.TEXT,
+  isNullable: true,
+  defaultValue: null,
+};
+
+export const fieldLinkMock = {
+  name: 'fieldLink',
+  type: FieldMetadataType.LINK,
+  isNullable: false,
+  defaultValue: { label: '', url: '' },
+};
+
+export const fieldCurrencyMock = {
+  name: 'fieldCurrency',
+  type: FieldMetadataType.CURRENCY,
+  isNullable: true,
+  defaultValue: { amountMicros: null, currencyCode: "''" },
+};
+
+export const fieldSelectMock = {
+  name: 'fieldSelect',
+  type: FieldMetadataType.SELECT,
+  isNullable: true,
+  defaultValue: 'OPTION_1',
+  options: [
+    {
+      id: '9a519a86-422b-4598-88ae-78751353f683',
+      color: 'red',
+      label: 'Opt 1',
+      value: 'OPTION_1',
+      position: 0,
+    },
+    {
+      id: '33f28d51-bc82-4e1d-ae4b-d9e4c0ed0ab4',
+      color: 'purple',
+      label: 'Opt 2',
+      value: 'OPTION_2',
+      position: 1,
+    },
+  ],
+};
+
+export const objectMetadataItemMock = {
+  targetTableName: 'testingObject',
+  nameSingular: 'objectName',
+  namePlural: 'objectsName',
+  fields: [
+    fieldNumberMock,
+    fieldStringMock,
+    fieldLinkMock,
+    fieldCurrencyMock,
+    fieldSelectMock,
+  ],
+} as ObjectMetadataEntity;
diff --git a/packages/twenty-server/src/engine/api/graphql/__tests__/workspace.factory.spec.ts b/packages/twenty-server/src/engine/api/graphql/__tests__/workspace.factory.spec.ts
new file mode 100644
index 000000000000..29fde8f18e39
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/__tests__/workspace.factory.spec.ts
@@ -0,0 +1,51 @@
+import { Test, TestingModule } from '@nestjs/testing';
+
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { WorkspaceSchemaStorageService } from 'src/engine/api/graphql/workspace-schema-storage/workspace-schema-storage.service';
+import { ScalarsExplorerService } from 'src/engine/api/graphql/services/scalars-explorer.service';
+import { WorkspaceResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory';
+import { WorkspaceGraphQLSchemaFactory } from 'src/engine/api/graphql/workspace-schema-builder/workspace-graphql-schema.factory';
+import { WorkspaceSchemaFactory } from 'src/engine/api/graphql/workspace-schema.factory';
+
+describe('WorkspaceSchemaFactory', () => {
+  let service: WorkspaceSchemaFactory;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        WorkspaceSchemaFactory,
+        {
+          provide: DataSourceService,
+          useValue: {},
+        },
+        {
+          provide: ObjectMetadataService,
+          useValue: {},
+        },
+        {
+          provide: ScalarsExplorerService,
+          useValue: {},
+        },
+        {
+          provide: WorkspaceGraphQLSchemaFactory,
+          useValue: {},
+        },
+        {
+          provide: WorkspaceResolverFactory,
+          useValue: {},
+        },
+        {
+          provide: WorkspaceSchemaStorageService,
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    service = module.get<WorkspaceSchemaFactory>(WorkspaceSchemaFactory);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/engine/api/graphql/core-graphql-api.module.ts b/packages/twenty-server/src/engine/api/graphql/core-graphql-api.module.ts
new file mode 100644
index 000000000000..0ea069944d22
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/core-graphql-api.module.ts
@@ -0,0 +1,28 @@
+import { Module } from '@nestjs/common';
+
+import { WorkspaceSchemaStorageModule } from 'src/engine/api/graphql/workspace-schema-storage/workspace-schema-storage.module';
+import { ScalarsExplorerService } from 'src/engine/api/graphql/services/scalars-explorer.service';
+import { WorkspaceSchemaBuilderModule } from 'src/engine/api/graphql/workspace-schema-builder/workspace-schema-builder.module';
+import { WorkspaceResolverBuilderModule } from 'src/engine/api/graphql/workspace-resolver-builder/workspace-resolver-builder.module';
+import { MetadataEngineModule } from 'src/engine/metadata-modules/metadata-engine.module';
+
+import { WorkspaceSchemaFactory } from './workspace-schema.factory';
+
+@Module({
+  imports: [
+    // TODO: Seems like it's breaking /metadata query and mutation arguments
+    // we should investigate this issue
+    // GraphQLModule.forRootAsync<YogaDriverConfig>({
+    //   driver: YogaDriver,
+    //   imports: [CoreEngineModule, GraphQLConfigModule],
+    //   useClass: GraphQLConfigService,
+    // }),
+    MetadataEngineModule,
+    WorkspaceSchemaBuilderModule,
+    WorkspaceResolverBuilderModule,
+    WorkspaceSchemaStorageModule,
+  ],
+  providers: [WorkspaceSchemaFactory, ScalarsExplorerService],
+  exports: [WorkspaceSchemaFactory],
+})
+export class CoreGraphQLApiModule {}
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-config/graphql-config.module.ts b/packages/twenty-server/src/engine/api/graphql/graphql-config/graphql-config.module.ts
new file mode 100644
index 000000000000..dbfb77932d4c
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-config/graphql-config.module.ts
@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+
+import { CoreEngineModule } from 'src/engine/core-modules/core-engine.module';
+
+@Module({
+  imports: [CoreEngineModule],
+  providers: [],
+  exports: [],
+})
+export class GraphQLConfigModule {}
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-config/graphql-config.service.ts b/packages/twenty-server/src/engine/api/graphql/graphql-config/graphql-config.service.ts
new file mode 100644
index 000000000000..b71ff69d4dd8
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-config/graphql-config.service.ts
@@ -0,0 +1,161 @@
+import { Injectable, UnauthorizedException } from '@nestjs/common';
+import { ContextIdFactory, ModuleRef } from '@nestjs/core';
+import { GqlOptionsFactory } from '@nestjs/graphql';
+
+import {
+  YogaDriverConfig,
+  YogaDriverServerContext,
+} from '@graphql-yoga/nestjs';
+import { GraphQLSchema, GraphQLError } from 'graphql';
+import GraphQLJSON from 'graphql-type-json';
+import { JsonWebTokenError, TokenExpiredError } from 'jsonwebtoken';
+import { GraphQLSchemaWithContext, YogaInitialContext } from 'graphql-yoga';
+import * as Sentry from '@sentry/node';
+
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+import { CoreEngineModule } from 'src/engine/core-modules/core-engine.module';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { WorkspaceSchemaFactory } from 'src/engine/api/graphql/workspace-schema.factory';
+import { ExceptionHandlerService } from 'src/engine/integrations/exception-handler/exception-handler.service';
+import { handleExceptionAndConvertToGraphQLError } from 'src/engine/utils/global-exception-handler.util';
+import { renderApolloPlayground } from 'src/engine/utils/render-apollo-playground.util';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { useExceptionHandler } from 'src/engine/integrations/exception-handler/hooks/use-exception-handler.hook';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { useThrottler } from 'src/engine/api/graphql/graphql-config/hooks/use-throttler';
+import { JwtData } from 'src/engine/core-modules/auth/types/jwt-data.type';
+import { useSentryTracing } from 'src/engine/integrations/exception-handler/hooks/use-sentry-tracing';
+
+export interface GraphQLContext extends YogaDriverServerContext<'express'> {
+  user?: User;
+  workspace?: Workspace;
+}
+
+@Injectable()
+export class GraphQLConfigService
+  implements GqlOptionsFactory<YogaDriverConfig<'express'>>
+{
+  constructor(
+    private readonly tokenService: TokenService,
+    private readonly exceptionHandlerService: ExceptionHandlerService,
+    private readonly environmentService: EnvironmentService,
+    private readonly moduleRef: ModuleRef,
+  ) {}
+
+  createGqlOptions(): YogaDriverConfig {
+    const isDebugMode = this.environmentService.get('DEBUG_MODE');
+    const plugins = [
+      useThrottler({
+        ttl: this.environmentService.get('API_RATE_LIMITING_TTL'),
+        limit: this.environmentService.get('API_RATE_LIMITING_LIMIT'),
+        identifyFn: (context) => {
+          return context.req.user?.id ?? context.req.ip ?? 'anonymous';
+        },
+      }),
+      useExceptionHandler({
+        exceptionHandlerService: this.exceptionHandlerService,
+      }),
+    ];
+
+    if (Sentry.isInitialized()) {
+      plugins.push(useSentryTracing());
+    }
+
+    const config: YogaDriverConfig = {
+      autoSchemaFile: true,
+      include: [CoreEngineModule],
+      conditionalSchema: async (context) => {
+        let user: User | undefined;
+        let workspace: Workspace | undefined;
+
+        try {
+          if (!this.tokenService.isTokenPresent(context.req)) {
+            return new GraphQLSchema({});
+          }
+
+          const data = await this.tokenService.validateToken(context.req);
+
+          user = data.user;
+          workspace = data.workspace;
+
+          return await this.createSchema(context, data);
+        } catch (error) {
+          if (error instanceof UnauthorizedException) {
+            throw new GraphQLError('Unauthenticated', {
+              extensions: {
+                code: 'UNAUTHENTICATED',
+              },
+            });
+          }
+
+          if (error instanceof JsonWebTokenError) {
+            //mockedUserJWT
+            throw new GraphQLError('Unauthenticated', {
+              extensions: {
+                code: 'UNAUTHENTICATED',
+              },
+            });
+          }
+
+          if (error instanceof TokenExpiredError) {
+            throw new GraphQLError('Unauthenticated', {
+              extensions: {
+                code: 'UNAUTHENTICATED',
+              },
+            });
+          }
+
+          throw handleExceptionAndConvertToGraphQLError(
+            error,
+            this.exceptionHandlerService,
+            user
+              ? {
+                  id: user.id,
+                  email: user.email,
+                  firstName: user.firstName,
+                  lastName: user.lastName,
+                  workspaceId: workspace?.id,
+                  workspaceDisplayName: workspace?.displayName,
+                }
+              : undefined,
+          );
+        }
+      },
+      resolvers: { JSON: GraphQLJSON },
+      plugins: plugins,
+    };
+
+    if (isDebugMode) {
+      config.renderGraphiQL = () => {
+        return renderApolloPlayground();
+      };
+    }
+
+    return config;
+  }
+
+  async createSchema(
+    context: YogaDriverServerContext<'express'> & YogaInitialContext,
+    data: JwtData,
+  ): Promise<GraphQLSchemaWithContext<YogaDriverServerContext<'express'>>> {
+    // Create a new contextId for each request
+    const contextId = ContextIdFactory.create();
+
+    // Register the request in the contextId
+    this.moduleRef.registerRequestByContextId(context.req, contextId);
+
+    // Resolve the WorkspaceSchemaFactory for the contextId
+    const workspaceFactory = await this.moduleRef.resolve(
+      WorkspaceSchemaFactory,
+      contextId,
+      {
+        strict: false,
+      },
+    );
+
+    return await workspaceFactory.createGraphQLSchema(
+      data.workspace.id,
+      data.user?.id,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/integrations/throttler/hooks/use-throttler.ts b/packages/twenty-server/src/engine/api/graphql/graphql-config/hooks/use-throttler.ts
similarity index 96%
rename from packages/twenty-server/src/integrations/throttler/hooks/use-throttler.ts
rename to packages/twenty-server/src/engine/api/graphql/graphql-config/hooks/use-throttler.ts
index 6c549d532abd..6959ef8f2b3b 100644
--- a/packages/twenty-server/src/integrations/throttler/hooks/use-throttler.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-config/hooks/use-throttler.ts
@@ -3,7 +3,7 @@ import { getGraphQLRateLimiter } from 'graphql-rate-limit';
 import { Plugin } from '@envelop/core';
 import { useOnResolve } from '@envelop/on-resolve';
 
-import { GraphQLContext } from 'src/graphql-config/graphql-config.service';
+import { GraphQLContext } from 'src/engine/api/graphql/graphql-config/graphql-config.service';
 
 export class UnauthenticatedError extends Error {}
 
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-config/interfaces/graphql-context.interface.ts b/packages/twenty-server/src/engine/api/graphql/graphql-config/interfaces/graphql-context.interface.ts
new file mode 100644
index 000000000000..fcfd7aae5ae4
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-config/interfaces/graphql-context.interface.ts
@@ -0,0 +1,9 @@
+import { YogaDriverServerContext } from '@graphql-yoga/nestjs';
+
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+
+export interface GraphQLContext extends YogaDriverServerContext<'express'> {
+  user?: User;
+  workspace?: Workspace;
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/metadata-graphql-api.module.ts b/packages/twenty-server/src/engine/api/graphql/metadata-graphql-api.module.ts
new file mode 100644
index 000000000000..cc305f99cff6
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/metadata-graphql-api.module.ts
@@ -0,0 +1,29 @@
+import { Module } from '@nestjs/common';
+import { GraphQLModule } from '@nestjs/graphql';
+
+import { YogaDriverConfig, YogaDriver } from '@graphql-yoga/nestjs';
+
+import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
+import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
+import { MetadataEngineModule } from 'src/engine/metadata-modules/metadata-engine.module';
+import { GraphQLConfigModule } from 'src/engine/api/graphql/graphql-config/graphql-config.module';
+import { metadataModuleFactory } from 'src/engine/api/graphql/metadata.module-factory';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { ExceptionHandlerService } from 'src/engine/integrations/exception-handler/exception-handler.service';
+import { DataloaderModule } from 'src/engine/dataloaders/dataloader.module';
+import { DataloaderService } from 'src/engine/dataloaders/dataloader.service';
+
+@Module({
+  imports: [
+    GraphQLModule.forRootAsync<YogaDriverConfig>({
+      driver: YogaDriver,
+      useFactory: metadataModuleFactory,
+      imports: [GraphQLConfigModule, DataloaderModule],
+      inject: [EnvironmentService, ExceptionHandlerService, DataloaderService],
+    }),
+    MetadataEngineModule,
+    WorkspaceMigrationRunnerModule,
+    WorkspaceMigrationModule,
+  ],
+})
+export class MetadataGraphQLApiModule {}
diff --git a/packages/twenty-server/src/engine/api/graphql/metadata.module-factory.ts b/packages/twenty-server/src/engine/api/graphql/metadata.module-factory.ts
new file mode 100644
index 000000000000..b58c3ac3b54e
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/metadata.module-factory.ts
@@ -0,0 +1,49 @@
+import { YogaDriverConfig } from '@graphql-yoga/nestjs';
+import GraphQLJSON from 'graphql-type-json';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { ExceptionHandlerService } from 'src/engine/integrations/exception-handler/exception-handler.service';
+import { useExceptionHandler } from 'src/engine/integrations/exception-handler/hooks/use-exception-handler.hook';
+import { useThrottler } from 'src/engine/api/graphql/graphql-config/hooks/use-throttler';
+import { MetadataGraphQLApiModule } from 'src/engine/api/graphql/metadata-graphql-api.module';
+import { renderApolloPlayground } from 'src/engine/utils/render-apollo-playground.util';
+import { DataloaderService } from 'src/engine/dataloaders/dataloader.service';
+
+export const metadataModuleFactory = async (
+  environmentService: EnvironmentService,
+  exceptionHandlerService: ExceptionHandlerService,
+  dataloaderService: DataloaderService,
+): Promise<YogaDriverConfig> => {
+  const config: YogaDriverConfig = {
+    autoSchemaFile: true,
+    include: [MetadataGraphQLApiModule],
+    renderGraphiQL() {
+      return renderApolloPlayground({ path: 'metadata' });
+    },
+    resolvers: { JSON: GraphQLJSON },
+    plugins: [
+      useThrottler({
+        ttl: environmentService.get('API_RATE_LIMITING_TTL'),
+        limit: environmentService.get('API_RATE_LIMITING_LIMIT'),
+        identifyFn: (context) => {
+          return context.req.user?.id ?? context.req.ip ?? 'anonymous';
+        },
+      }),
+      useExceptionHandler({
+        exceptionHandlerService,
+      }),
+    ],
+    path: '/metadata',
+    context: () => ({
+      loaders: dataloaderService.createLoaders(),
+    }),
+  };
+
+  if (environmentService.get('DEBUG_MODE')) {
+    config.renderGraphiQL = () => {
+      return renderApolloPlayground({ path: 'metadata' });
+    };
+  }
+
+  return config;
+};
diff --git a/packages/twenty-server/src/workspace/services/scalars-explorer.service.ts b/packages/twenty-server/src/engine/api/graphql/services/scalars-explorer.service.ts
similarity index 93%
rename from packages/twenty-server/src/workspace/services/scalars-explorer.service.ts
rename to packages/twenty-server/src/engine/api/graphql/services/scalars-explorer.service.ts
index a3576ed80805..84460fe5d7bd 100644
--- a/packages/twenty-server/src/workspace/services/scalars-explorer.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/services/scalars-explorer.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 import { GraphQLScalarType, GraphQLSchema, isScalarType } from 'graphql';
 
-import { scalars } from 'src/workspace/workspace-schema-builder/graphql-types/scalars';
+import { scalars } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 
 @Injectable()
 export class ScalarsExplorerService {
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/__mocks__/workspace-query-builder-options.mock.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/__mocks__/workspace-query-builder-options.mock.ts
new file mode 100644
index 000000000000..98ec7e5d4290
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/__mocks__/workspace-query-builder-options.mock.ts
@@ -0,0 +1,13 @@
+import { GraphQLResolveInfo } from 'graphql';
+
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
+
+import { objectMetadataItemMock } from 'src/engine/api/__mocks__/object-metadata-item.mock';
+
+export const workspaceQueryBuilderOptionsMock: WorkspaceQueryBuilderOptions = {
+  fieldMetadataCollection: [],
+  info: {} as GraphQLResolveInfo,
+  objectMetadataCollection: [],
+  objectMetadataItem: objectMetadataItemMock as ObjectMetadataInterface,
+};
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/__tests__/args-string.factory.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/__tests__/args-string.factory.spec.ts
new file mode 100644
index 000000000000..4cc9394e1adb
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/__tests__/args-string.factory.spec.ts
@@ -0,0 +1,122 @@
+import { TestingModule, Test } from '@nestjs/testing';
+
+import { ArgsAliasFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/args-alias.factory';
+import { ArgsStringFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/args-string.factory';
+
+describe('ArgsStringFactory', () => {
+  let service: ArgsStringFactory;
+  const argsAliasCreate = jest.fn();
+
+  beforeEach(async () => {
+    jest.resetAllMocks();
+
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        ArgsStringFactory,
+        {
+          provide: ArgsAliasFactory,
+          useValue: {
+            create: argsAliasCreate,
+          },
+        },
+      ],
+    }).compile();
+
+    service = module.get<ArgsStringFactory>(ArgsStringFactory);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+
+  describe('create', () => {
+    it('should return null when args are missing', () => {
+      const args = undefined;
+
+      const result = service.create(args, []);
+
+      expect(result).toBeNull();
+    });
+
+    it('should return a string with the args when args are present', () => {
+      const args = {
+        id: '1',
+        name: 'field_name',
+      };
+
+      argsAliasCreate.mockReturnValue(args);
+
+      const result = service.create(args, []);
+
+      expect(result).toEqual('id: "1", name: "field_name"');
+    });
+
+    it('should return a string with the args when args are present and the value is an object', () => {
+      const args = {
+        id: '1',
+        name: {
+          firstName: 'test',
+        },
+      };
+
+      argsAliasCreate.mockReturnValue(args);
+
+      const result = service.create(args, []);
+
+      expect(result).toEqual('id: "1", name: {firstName:"test"}');
+    });
+
+    it('when orderBy is present, should return an array of objects', () => {
+      const args = {
+        orderBy: {
+          id: 'AscNullsFirst',
+          name: 'AscNullsFirst',
+        },
+      };
+
+      argsAliasCreate.mockReturnValue(args);
+
+      const result = service.create(args, []);
+
+      expect(result).toEqual(
+        'orderBy: [{id: AscNullsFirst}, {name: AscNullsFirst}]',
+      );
+    });
+
+    it('when orderBy is present with position criteria, should return position at the end of the list', () => {
+      const args = {
+        orderBy: {
+          position: 'AscNullsFirst',
+          id: 'AscNullsFirst',
+          name: 'AscNullsFirst',
+        },
+      };
+
+      argsAliasCreate.mockReturnValue(args);
+
+      const result = service.create(args, []);
+
+      expect(result).toEqual(
+        'orderBy: [{id: AscNullsFirst}, {name: AscNullsFirst}, {position: AscNullsFirst}]',
+      );
+    });
+
+    it('when orderBy is present with position in the middle, should return position at the end of the list', () => {
+      const args = {
+        orderBy: {
+          id: 'AscNullsFirst',
+          position: 'AscNullsFirst',
+          name: 'AscNullsFirst',
+        },
+      };
+
+      argsAliasCreate.mockReturnValue(args);
+
+      const result = service.create(args, []);
+
+      expect(result).toEqual(
+        'orderBy: [{id: AscNullsFirst}, {name: AscNullsFirst}, {position: AscNullsFirst}]',
+      );
+    });
+  });
+});
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/__tests__/find-duplicates-query.factory.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/__tests__/find-duplicates-query.factory.spec.ts
new file mode 100644
index 000000000000..27610b802f99
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/__tests__/find-duplicates-query.factory.spec.ts
@@ -0,0 +1,206 @@
+import { Test, TestingModule } from '@nestjs/testing';
+
+import { RecordFilter } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
+import { FindDuplicatesResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+
+import { ArgsAliasFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/args-alias.factory';
+import { FieldsStringFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/fields-string.factory';
+import { FindDuplicatesQueryFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/find-duplicates-query.factory';
+import { workspaceQueryBuilderOptionsMock } from 'src/engine/api/graphql/workspace-query-builder/__mocks__/workspace-query-builder-options.mock';
+
+describe('FindDuplicatesQueryFactory', () => {
+  let service: FindDuplicatesQueryFactory;
+  const argAliasCreate = jest.fn();
+
+  beforeEach(async () => {
+    jest.resetAllMocks();
+
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        FindDuplicatesQueryFactory,
+        {
+          provide: FieldsStringFactory,
+          useValue: {
+            create: jest.fn().mockResolvedValue('fieldsString'),
+            // Mock implementation of FieldsStringFactory methods if needed
+          },
+        },
+        {
+          provide: ArgsAliasFactory,
+          useValue: {
+            create: argAliasCreate,
+            // Mock implementation of ArgsAliasFactory methods if needed
+          },
+        },
+      ],
+    }).compile();
+
+    service = module.get<FindDuplicatesQueryFactory>(
+      FindDuplicatesQueryFactory,
+    );
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+
+  describe('create', () => {
+    it('should return (first: 0) as a filter when args are missing', async () => {
+      const args: FindDuplicatesResolverArgs<RecordFilter> = {};
+
+      const query = await service.create(
+        args,
+        workspaceQueryBuilderOptionsMock,
+      );
+
+      expect(query.trim()).toEqual(`query {
+        objectNameCollection(first: 0) {
+          fieldsString
+        }
+      }`);
+    });
+
+    it('should use firstName and lastName as a filter when both args are present', async () => {
+      argAliasCreate.mockReturnValue({
+        nameFirstName: 'John',
+        nameLastName: 'Doe',
+      });
+
+      const args: FindDuplicatesResolverArgs<RecordFilter> = {
+        data: {
+          name: {
+            firstName: 'John',
+            lastName: 'Doe',
+          },
+        } as unknown as RecordFilter,
+      };
+
+      const query = await service.create(args, {
+        ...workspaceQueryBuilderOptionsMock,
+        objectMetadataItem: {
+          ...workspaceQueryBuilderOptionsMock.objectMetadataItem,
+          nameSingular: 'person',
+        },
+      });
+
+      expect(query.trim()).toEqual(`query {
+        personCollection(filter: {or:[{nameFirstName:{eq:\"John\"},nameLastName:{eq:\"Doe\"}}]}) {
+          fieldsString
+        }
+      }`);
+    });
+
+    it('should ignore an argument if the string length is less than 3', async () => {
+      argAliasCreate.mockReturnValue({
+        linkedinLinkUrl: 'ab',
+        email: 'test@test.com',
+      });
+
+      const args: FindDuplicatesResolverArgs<RecordFilter> = {
+        data: {
+          linkedinLinkUrl: 'ab',
+          email: 'test@test.com',
+        } as unknown as RecordFilter,
+      };
+
+      const query = await service.create(args, {
+        ...workspaceQueryBuilderOptionsMock,
+        objectMetadataItem: {
+          ...workspaceQueryBuilderOptionsMock.objectMetadataItem,
+          nameSingular: 'person',
+        },
+      });
+
+      expect(query.trim()).toEqual(`query {
+        personCollection(filter: {or:[{email:{eq:"test@test.com"}}]}) {
+          fieldsString
+        }
+      }`);
+    });
+
+    it('should return (first: 0) as a filter when only firstName is present', async () => {
+      argAliasCreate.mockReturnValue({
+        nameFirstName: 'John',
+      });
+
+      const args: FindDuplicatesResolverArgs<RecordFilter> = {
+        data: {
+          name: {
+            firstName: 'John',
+          },
+        } as unknown as RecordFilter,
+      };
+
+      const query = await service.create(args, {
+        ...workspaceQueryBuilderOptionsMock,
+        objectMetadataItem: {
+          ...workspaceQueryBuilderOptionsMock.objectMetadataItem,
+          nameSingular: 'person',
+        },
+      });
+
+      expect(query.trim()).toEqual(`query {
+        personCollection(first: 0) {
+          fieldsString
+        }
+      }`);
+    });
+
+    it('should use "currentRecord" as query args when its present', async () => {
+      argAliasCreate.mockReturnValue({
+        nameFirstName: 'John',
+      });
+
+      const args: FindDuplicatesResolverArgs<RecordFilter> = {
+        id: 'uuid',
+      };
+
+      const query = await service.create(
+        args,
+        {
+          ...workspaceQueryBuilderOptionsMock,
+          objectMetadataItem: {
+            ...workspaceQueryBuilderOptionsMock.objectMetadataItem,
+            nameSingular: 'person',
+          },
+        },
+        {
+          nameFirstName: 'Peter',
+          nameLastName: 'Parker',
+        },
+      );
+
+      expect(query.trim()).toEqual(`query {
+        personCollection(filter: {id:{neq:\"uuid\"},or:[{nameFirstName:{eq:\"Peter\"},nameLastName:{eq:\"Parker\"}}]}) {
+          fieldsString
+        }
+      }`);
+    });
+  });
+
+  describe('buildQueryForExistingRecord', () => {
+    it(`should include all the fields that exist for person inside "duplicateCriteriaCollection" constant`, async () => {
+      const query = service.buildQueryForExistingRecord('uuid', {
+        ...workspaceQueryBuilderOptionsMock,
+        objectMetadataItem: {
+          ...workspaceQueryBuilderOptionsMock.objectMetadataItem,
+          nameSingular: 'person',
+        },
+      });
+
+      expect(query.trim()).toEqual(`query {
+        personCollection(filter: { id: { eq: \"uuid\" }}){
+          edges {
+            node {
+              __typename
+              nameFirstName
+nameLastName
+linkedinLinkUrl
+email
+            }
+          }
+        }
+      }`);
+    });
+  });
+});
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/__tests__/record-position-query.factory.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/__tests__/record-position-query.factory.spec.ts
new file mode 100644
index 000000000000..455e5186425c
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/__tests__/record-position-query.factory.spec.ts
@@ -0,0 +1,89 @@
+import {
+  RecordPositionQueryFactory,
+  RecordPositionQueryType,
+} from 'src/engine/api/graphql/workspace-query-builder/factories/record-position-query.factory';
+
+describe('RecordPositionQueryFactory', () => {
+  const objectMetadataItem = {
+    isCustom: false,
+    nameSingular: 'company',
+  };
+  const dataSourceSchema = 'workspace_test';
+  const factory: RecordPositionQueryFactory = new RecordPositionQueryFactory();
+
+  it('should be defined', () => {
+    expect(factory).toBeDefined();
+  });
+
+  describe('create', () => {
+    describe('createForGet', () => {
+      it('should return a string with the position when positionValue is first', async () => {
+        const positionValue = 'first';
+
+        const result = await factory.create(
+          RecordPositionQueryType.GET,
+          positionValue,
+          objectMetadataItem,
+          dataSourceSchema,
+        );
+
+        expect(result).toEqual(
+          `SELECT position FROM workspace_test."company"
+            WHERE "position" IS NOT NULL ORDER BY "position" ASC LIMIT 1`,
+        );
+      });
+
+      it('should return a string with the position when positionValue is last', async () => {
+        const positionValue = 'last';
+
+        const result = await factory.create(
+          RecordPositionQueryType.GET,
+          positionValue,
+          objectMetadataItem,
+          dataSourceSchema,
+        );
+
+        expect(result).toEqual(
+          `SELECT position FROM workspace_test."company"
+            WHERE "position" IS NOT NULL ORDER BY "position" DESC LIMIT 1`,
+        );
+      });
+    });
+
+    it('should return a string with the position when positionValue is a number', async () => {
+      const positionValue = 1;
+
+      try {
+        await factory.create(
+          RecordPositionQueryType.GET,
+          positionValue,
+          objectMetadataItem,
+          dataSourceSchema,
+        );
+      } catch (error) {
+        expect(error.message).toEqual(
+          'RecordPositionQueryType.GET requires positionValue to be a number',
+        );
+      }
+    });
+  });
+
+  describe('createForUpdate', () => {
+    it('should return a string when RecordPositionQueryType is UPDATE', async () => {
+      const positionValue = 1;
+
+      const result = await factory.create(
+        RecordPositionQueryType.UPDATE,
+        positionValue,
+        objectMetadataItem,
+        dataSourceSchema,
+      );
+
+      expect(result).toEqual(
+        `UPDATE workspace_test."company"
+            SET "position" = $1
+            WHERE "id" = $2`,
+      );
+    });
+  });
+});
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/args-alias.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/args-alias.factory.ts
new file mode 100644
index 000000000000..5703a9747035
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/args-alias.factory.ts
@@ -0,0 +1,92 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+
+import { compositeTypeDefintions } from 'src/engine/metadata-modules/field-metadata/composite-types';
+import { computeCompositeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
+import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
+
+@Injectable()
+export class ArgsAliasFactory {
+  private readonly logger = new Logger(ArgsAliasFactory.name);
+
+  create(
+    args: Record<string, any>,
+    fieldMetadataCollection: FieldMetadataInterface[],
+  ): Record<string, any> {
+    const fieldMetadataMap = new Map(
+      fieldMetadataCollection.map((fieldMetadata) => [
+        fieldMetadata.name,
+        fieldMetadata,
+      ]),
+    );
+
+    return this.createArgsObjectRecursive(args, fieldMetadataMap);
+  }
+
+  private createArgsObjectRecursive(
+    args: Record<string, any>,
+    fieldMetadataMap: Map<string, FieldMetadataInterface>,
+  ) {
+    // If it's not an object, we don't need to do anything
+    if (typeof args !== 'object' || args === null) {
+      return args;
+    }
+
+    // If it's an array, we need to map all items
+    if (Array.isArray(args)) {
+      return args.map((arg) =>
+        this.createArgsObjectRecursive(arg, fieldMetadataMap),
+      );
+    }
+
+    const newArgs = {};
+
+    for (const [key, value] of Object.entries(args)) {
+      const fieldMetadata = fieldMetadataMap.get(key);
+
+      // If it's a composite type, we need to transform args to properly map column name
+      if (
+        fieldMetadata &&
+        value !== null &&
+        isCompositeFieldMetadataType(fieldMetadata.type)
+      ) {
+        // Get composite type definition
+        const compositeType = compositeTypeDefintions.get(fieldMetadata.type);
+
+        if (!compositeType) {
+          this.logger.error(
+            `Composite type definition not found for type: ${fieldMetadata.type}`,
+          );
+          throw new Error(
+            `Composite type definition not found for type: ${fieldMetadata.type}`,
+          );
+        }
+
+        // Loop through sub values and map them to composite property
+        for (const [subKey, subValue] of Object.entries(value)) {
+          // Find composite property
+          const compositeProperty = compositeType.properties.find(
+            (property) => property.name === subKey,
+          );
+
+          if (compositeProperty) {
+            const columnName = computeCompositeColumnName(
+              fieldMetadata,
+              compositeProperty,
+            );
+
+            newArgs[columnName] = subValue;
+          }
+        }
+      } else if (fieldMetadata) {
+        newArgs[key] = value;
+      } else {
+        // Recurse if value is a nested object, otherwise append field or alias
+        newArgs[key] = this.createArgsObjectRecursive(value, fieldMetadataMap);
+      }
+    }
+
+    return newArgs;
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/args-string.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/args-string.factory.ts
similarity index 84%
rename from packages/twenty-server/src/workspace/workspace-query-builder/factories/args-string.factory.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/args-string.factory.ts
index cb80f5b6778d..d28c124868a3 100644
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/args-string.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/args-string.factory.ts
@@ -1,8 +1,8 @@
 import { Injectable } from '@nestjs/common';
 
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 
-import { stringifyWithoutKeyQuote } from 'src/workspace/workspace-query-builder/utils/stringify-without-key-quote.util';
+import { stringifyWithoutKeyQuote } from 'src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util';
 
 import { ArgsAliasFactory } from './args-alias.factory';
 
@@ -62,6 +62,9 @@ export class ArgsStringFactory {
     // PgGraphql is expecting the orderBy argument to be an array of objects
     if (key === 'orderBy') {
       const orderByString = Object.keys(obj)
+        .sort((_, b) => {
+          return b === 'position' ? -1 : 0;
+        })
         .map((orderByKey) => `{${orderByKey}: ${obj[orderByKey]}}`)
         .join(', ');
 
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/create-many-query.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/create-many-query.factory.ts
new file mode 100644
index 000000000000..b667472a3d3e
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/create-many-query.factory.ts
@@ -0,0 +1,56 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { v4 as uuidv4 } from 'uuid';
+
+import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
+import { Record as IRecord } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
+import { CreateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+
+import { stringifyWithoutKeyQuote } from 'src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+
+import { FieldsStringFactory } from './fields-string.factory';
+import { ArgsAliasFactory } from './args-alias.factory';
+
+@Injectable()
+export class CreateManyQueryFactory {
+  private readonly logger = new Logger(CreateManyQueryFactory.name);
+
+  constructor(
+    private readonly fieldsStringFactory: FieldsStringFactory,
+    private readonly argsAliasFactory: ArgsAliasFactory,
+  ) {}
+
+  async create<Record extends IRecord = IRecord>(
+    args: CreateManyResolverArgs<Record>,
+    options: WorkspaceQueryBuilderOptions,
+  ) {
+    const fieldsString = await this.fieldsStringFactory.create(
+      options.info,
+      options.fieldMetadataCollection,
+      options.objectMetadataCollection,
+    );
+    const computedArgs = this.argsAliasFactory.create(
+      args,
+      options.fieldMetadataCollection,
+    );
+
+    return `
+      mutation {
+        insertInto${computeObjectTargetTable(
+          options.objectMetadataItem,
+        )}Collection(objects: ${stringifyWithoutKeyQuote(
+          computedArgs.data.map((datum) => ({
+            id: uuidv4(),
+            ...datum,
+          })),
+        )}) {
+          affectedCount
+          records {
+            ${fieldsString}
+          }
+        }
+      }
+    `;
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/delete-many-query.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/delete-many-query.factory.ts
new file mode 100644
index 000000000000..f24090c66540
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/delete-many-query.factory.ts
@@ -0,0 +1,45 @@
+import { Injectable } from '@nestjs/common';
+
+import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
+import { DeleteManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+
+import { stringifyWithoutKeyQuote } from 'src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+
+import { FieldsStringFactory } from './fields-string.factory';
+
+export interface DeleteManyQueryFactoryOptions
+  extends WorkspaceQueryBuilderOptions {
+  atMost?: number;
+}
+
+@Injectable()
+export class DeleteManyQueryFactory {
+  constructor(private readonly fieldsStringFactory: FieldsStringFactory) {}
+
+  async create(
+    args: DeleteManyResolverArgs,
+    options: DeleteManyQueryFactoryOptions,
+  ) {
+    const fieldsString = await this.fieldsStringFactory.create(
+      options.info,
+      options.fieldMetadataCollection,
+      options.objectMetadataCollection,
+    );
+
+    return `
+      mutation {
+        deleteFrom${computeObjectTargetTable(
+          options.objectMetadataItem,
+        )}Collection(filter: ${stringifyWithoutKeyQuote(
+          args.filter,
+        )}, atMost: ${options.atMost ?? 1}) {
+          affectedCount
+          records {
+            ${fieldsString}
+          }
+        }
+      }
+    `;
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/delete-one-query.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/delete-one-query.factory.ts
new file mode 100644
index 000000000000..690621b78ac6
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/delete-one-query.factory.ts
@@ -0,0 +1,39 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
+import { DeleteOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+
+import { FieldsStringFactory } from './fields-string.factory';
+
+@Injectable()
+export class DeleteOneQueryFactory {
+  private readonly logger = new Logger(DeleteOneQueryFactory.name);
+
+  constructor(private readonly fieldsStringFactory: FieldsStringFactory) {}
+
+  async create(
+    args: DeleteOneResolverArgs,
+    options: WorkspaceQueryBuilderOptions,
+  ) {
+    const fieldsString = await this.fieldsStringFactory.create(
+      options.info,
+      options.fieldMetadataCollection,
+      options.objectMetadataCollection,
+    );
+
+    return `
+      mutation {
+        deleteFrom${computeObjectTargetTable(
+          options.objectMetadataItem,
+        )}Collection(filter: { id: { eq: "${args.id}" } }) {
+          affectedCount
+          records {
+            ${fieldsString}
+          }
+        }
+      }
+    `;
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/factories.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/factories.ts
new file mode 100644
index 000000000000..db1255540ef1
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/factories.ts
@@ -0,0 +1,34 @@
+import { ForeignDataWrapperQueryFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/foreign-data-wrapper-query.factory';
+
+import { ArgsAliasFactory } from './args-alias.factory';
+import { ArgsStringFactory } from './args-string.factory';
+import { RelationFieldAliasFactory } from './relation-field-alias.factory';
+import { CreateManyQueryFactory } from './create-many-query.factory';
+import { DeleteOneQueryFactory } from './delete-one-query.factory';
+import { FieldAliasFactory } from './field-alias.factory';
+import { FieldsStringFactory } from './fields-string.factory';
+import { FindManyQueryFactory } from './find-many-query.factory';
+import { FindOneQueryFactory } from './find-one-query.factory';
+import { UpdateOneQueryFactory } from './update-one-query.factory';
+import { UpdateManyQueryFactory } from './update-many-query.factory';
+import { DeleteManyQueryFactory } from './delete-many-query.factory';
+import { FindDuplicatesQueryFactory } from './find-duplicates-query.factory';
+import { RecordPositionQueryFactory } from './record-position-query.factory';
+
+export const workspaceQueryBuilderFactories = [
+  ArgsAliasFactory,
+  ArgsStringFactory,
+  RelationFieldAliasFactory,
+  CreateManyQueryFactory,
+  DeleteOneQueryFactory,
+  FieldAliasFactory,
+  FieldsStringFactory,
+  FindManyQueryFactory,
+  FindOneQueryFactory,
+  FindDuplicatesQueryFactory,
+  RecordPositionQueryFactory,
+  UpdateOneQueryFactory,
+  UpdateManyQueryFactory,
+  DeleteManyQueryFactory,
+  ForeignDataWrapperQueryFactory,
+];
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/field-alias.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/field-alias.factory.ts
new file mode 100644
index 000000000000..67a22534f875
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/field-alias.factory.ts
@@ -0,0 +1,50 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+
+import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
+import { compositeTypeDefintions } from 'src/engine/metadata-modules/field-metadata/composite-types';
+import { createCompositeFieldKey } from 'src/engine/api/graphql/workspace-query-builder/utils/composite-field-metadata.util';
+import {
+  computeColumnName,
+  computeCompositeColumnName,
+} from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
+
+@Injectable()
+export class FieldAliasFactory {
+  private readonly logger = new Logger(FieldAliasFactory.name);
+
+  create(fieldKey: string, fieldMetadata: FieldMetadataInterface) {
+    // If it's not a composite field, we can just return the alias
+    if (!isCompositeFieldMetadataType(fieldMetadata.type)) {
+      const alias = computeColumnName(fieldMetadata);
+
+      return `${fieldKey}: ${alias}`;
+    }
+
+    // If it's a composite field, we need to get the definition
+    const compositeType = compositeTypeDefintions.get(fieldMetadata.type);
+
+    if (!compositeType) {
+      this.logger.error(
+        `Composite type not found for field metadata type: ${fieldMetadata.type}`,
+      );
+      throw new Error(
+        `Composite type not found for field metadata type: ${fieldMetadata.type}`,
+      );
+    }
+
+    return compositeType.properties
+      .map((property) => {
+        // Generate a prefixed key for the composite field, this will be computed when the query has ran
+        const compositeKey = createCompositeFieldKey(
+          fieldMetadata.name,
+          property.name,
+        );
+        const alias = computeCompositeColumnName(fieldMetadata, property);
+
+        return `${compositeKey}: ${alias}`;
+      })
+      .join('\n');
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/fields-string.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/fields-string.factory.ts
similarity index 89%
rename from packages/twenty-server/src/workspace/workspace-query-builder/factories/fields-string.factory.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/fields-string.factory.ts
index 1358a48dd54b..e3ae2dfde33f 100644
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/fields-string.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/fields-string.factory.ts
@@ -4,10 +4,10 @@ import { GraphQLResolveInfo } from 'graphql';
 import graphqlFields from 'graphql-fields';
 import isEmpty from 'lodash.isempty';
 
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
-import { isRelationFieldMetadataType } from 'src/workspace/utils/is-relation-field-metadata-type.util';
+import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
 
 import { FieldAliasFactory } from './field-alias.factory';
 import { RelationFieldAliasFactory } from './relation-field-alias.factory';
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-duplicates-query.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-duplicates-query.factory.ts
new file mode 100644
index 000000000000..5da08ed1a910
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-duplicates-query.factory.ts
@@ -0,0 +1,153 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import isEmpty from 'lodash.isempty';
+
+import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
+import { RecordFilter } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
+import { FindDuplicatesResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+import { stringifyWithoutKeyQuote } from 'src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util';
+import { ArgsAliasFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/args-alias.factory';
+import { duplicateCriteriaCollection } from 'src/engine/api/graphql/workspace-resolver-builder/constants/duplicate-criteria.constants';
+import { settings } from 'src/engine/constants/settings';
+
+import { FieldsStringFactory } from './fields-string.factory';
+
+@Injectable()
+export class FindDuplicatesQueryFactory {
+  private readonly logger = new Logger(FindDuplicatesQueryFactory.name);
+
+  constructor(
+    private readonly fieldsStringFactory: FieldsStringFactory,
+    private readonly argsAliasFactory: ArgsAliasFactory,
+  ) {}
+
+  async create<Filter extends RecordFilter = RecordFilter>(
+    args: FindDuplicatesResolverArgs<Filter>,
+    options: WorkspaceQueryBuilderOptions,
+    currentRecord?: Record<string, unknown>,
+  ) {
+    const fieldsString = await this.fieldsStringFactory.create(
+      options.info,
+      options.fieldMetadataCollection,
+      options.objectMetadataCollection,
+    );
+
+    const argsData = this.getFindDuplicateBy<Filter>(
+      args,
+      options,
+      currentRecord,
+    );
+
+    const duplicateCondition = this.buildDuplicateCondition(
+      options.objectMetadataItem,
+      argsData,
+      args.id,
+    );
+
+    const filters = stringifyWithoutKeyQuote(duplicateCondition);
+
+    return `
+      query {
+        ${computeObjectTargetTable(options.objectMetadataItem)}Collection${
+          isEmpty(duplicateCondition?.or)
+            ? '(first: 0)'
+            : `(filter: ${filters})`
+        } {
+          ${fieldsString}
+        }
+      }
+    `;
+  }
+
+  getFindDuplicateBy<Filter extends RecordFilter = RecordFilter>(
+    args: FindDuplicatesResolverArgs<Filter>,
+    options: WorkspaceQueryBuilderOptions,
+    currentRecord?: Record<string, unknown>,
+  ) {
+    if (currentRecord) {
+      return currentRecord;
+    }
+
+    return this.argsAliasFactory.create(
+      args.data ?? {},
+      options.fieldMetadataCollection,
+    );
+  }
+
+  buildQueryForExistingRecord(
+    id: string,
+    options: WorkspaceQueryBuilderOptions,
+  ) {
+    return `
+      query {
+        ${computeObjectTargetTable(
+          options.objectMetadataItem,
+        )}Collection(filter: { id: { eq: "${id}" }}){
+          edges {
+            node {
+              __typename
+              ${this.getApplicableDuplicateCriteriaCollection(
+                options.objectMetadataItem,
+              )
+                .flatMap((dc) => dc.columnNames)
+                .join('\n')}
+            }
+          }
+        }
+      }
+    `;
+  }
+
+  private buildDuplicateCondition(
+    objectMetadataItem: ObjectMetadataInterface,
+    argsData?: Record<string, unknown>,
+    filteringByExistingRecordId?: string,
+  ) {
+    if (!argsData) {
+      return;
+    }
+
+    const criteriaCollection =
+      this.getApplicableDuplicateCriteriaCollection(objectMetadataItem);
+
+    const criteriaWithMatchingArgs = criteriaCollection.filter((criteria) =>
+      criteria.columnNames.every((columnName) => {
+        const value = argsData[columnName] as string | undefined;
+
+        return (
+          !!value && value.length >= settings.minLengthOfStringForDuplicateCheck
+        );
+      }),
+    );
+
+    const filterCriteria = criteriaWithMatchingArgs.map((criteria) =>
+      Object.fromEntries(
+        criteria.columnNames.map((columnName) => [
+          columnName,
+          { eq: argsData[columnName] },
+        ]),
+      ),
+    );
+
+    return {
+      // when filtering by an existing record, we need to filter that explicit record out
+      ...(filteringByExistingRecordId && {
+        id: { neq: filteringByExistingRecordId },
+      }),
+      // keep condition as "or" to get results by more duplicate criteria
+      or: filterCriteria,
+    };
+  }
+
+  private getApplicableDuplicateCriteriaCollection(
+    objectMetadataItem: ObjectMetadataInterface,
+  ) {
+    return duplicateCriteriaCollection.filter(
+      (duplicateCriteria) =>
+        duplicateCriteria.objectName === objectMetadataItem.nameSingular,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-many-query.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-many-query.factory.ts
new file mode 100644
index 000000000000..ec8420abb439
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-many-query.factory.ts
@@ -0,0 +1,51 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
+import {
+  RecordFilter,
+  RecordOrderBy,
+} from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
+import { FindManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+
+import { ArgsStringFactory } from './args-string.factory';
+import { FieldsStringFactory } from './fields-string.factory';
+
+@Injectable()
+export class FindManyQueryFactory {
+  private readonly logger = new Logger(FindManyQueryFactory.name);
+
+  constructor(
+    private readonly fieldsStringFactory: FieldsStringFactory,
+    private readonly argsStringFactory: ArgsStringFactory,
+  ) {}
+
+  async create<
+    Filter extends RecordFilter = RecordFilter,
+    OrderBy extends RecordOrderBy = RecordOrderBy,
+  >(
+    args: FindManyResolverArgs<Filter, OrderBy>,
+    options: WorkspaceQueryBuilderOptions,
+  ) {
+    const fieldsString = await this.fieldsStringFactory.create(
+      options.info,
+      options.fieldMetadataCollection,
+      options.objectMetadataCollection,
+    );
+    const argsString = this.argsStringFactory.create(
+      args,
+      options.fieldMetadataCollection,
+    );
+
+    return `
+      query {
+        ${computeObjectTargetTable(options.objectMetadataItem)}Collection${
+          argsString ? `(${argsString})` : ''
+        } {
+          ${fieldsString}
+        }
+      }
+    `;
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-one-query.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-one-query.factory.ts
new file mode 100644
index 000000000000..80bbf3c9eea0
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-one-query.factory.ts
@@ -0,0 +1,49 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
+import { RecordFilter } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
+import { FindOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+
+import { ArgsStringFactory } from './args-string.factory';
+import { FieldsStringFactory } from './fields-string.factory';
+
+@Injectable()
+export class FindOneQueryFactory {
+  private readonly logger = new Logger(FindOneQueryFactory.name);
+
+  constructor(
+    private readonly fieldsStringFactory: FieldsStringFactory,
+    private readonly argsStringFactory: ArgsStringFactory,
+  ) {}
+
+  async create<Filter extends RecordFilter = RecordFilter>(
+    args: FindOneResolverArgs<Filter>,
+    options: WorkspaceQueryBuilderOptions,
+  ) {
+    const fieldsString = await this.fieldsStringFactory.create(
+      options.info,
+      options.fieldMetadataCollection,
+      options.objectMetadataCollection,
+    );
+    const argsString = this.argsStringFactory.create(
+      args,
+      options.fieldMetadataCollection,
+    );
+
+    return `
+      query {
+        ${computeObjectTargetTable(options.objectMetadataItem)}Collection${
+          argsString ? `(${argsString})` : ''
+        } {
+          edges {
+            node {
+              ${fieldsString}
+            }
+          }
+        }
+      }
+    `;
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/foreign-data-wrapper-query.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/foreign-data-wrapper-query.factory.ts
new file mode 100644
index 000000000000..b1fed90bdd96
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/foreign-data-wrapper-query.factory.ts
@@ -0,0 +1,49 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  ForeignDataWrapperOptions,
+  RemoteServerType,
+  UserMappingOptions,
+} from 'src/engine/metadata-modules/remote-server/remote-server.entity';
+
+@Injectable()
+export class ForeignDataWrapperQueryFactory {
+  createForeignDataWrapper(
+    foreignDataWrapperId: string,
+    foreignDataWrapperType: RemoteServerType,
+    foreignDataWrapperOptions: ForeignDataWrapperOptions<RemoteServerType>,
+  ) {
+    const [name, options] = this.buildNameAndOptionsFromType(
+      foreignDataWrapperType,
+      foreignDataWrapperOptions,
+    );
+
+    return `CREATE SERVER "${foreignDataWrapperId}" FOREIGN DATA WRAPPER ${name} OPTIONS (${options})`;
+  }
+
+  createUserMapping(
+    foreignDataWrapperId: string,
+    userMappingOptions: UserMappingOptions,
+  ) {
+    // CURRENT_USER works for now since we are using only one user. But if we switch to a user per workspace, we need to change this.
+    return `CREATE USER MAPPING IF NOT EXISTS FOR CURRENT_USER SERVER "${foreignDataWrapperId}" OPTIONS (user '${userMappingOptions.username}', password '${userMappingOptions.password}')`;
+  }
+
+  private buildNameAndOptionsFromType(
+    type: RemoteServerType,
+    options: ForeignDataWrapperOptions<RemoteServerType>,
+  ) {
+    switch (type) {
+      case RemoteServerType.POSTGRES_FDW:
+        return ['postgres_fdw', this.buildPostgresFDWQueryOptions(options)];
+      default:
+        throw new Error('Foreign data wrapper type not supported');
+    }
+  }
+
+  private buildPostgresFDWQueryOptions(
+    foreignDataWrapperOptions: ForeignDataWrapperOptions<RemoteServerType>,
+  ) {
+    return `dbname '${foreignDataWrapperOptions.dbname}', host '${foreignDataWrapperOptions.host}', port '${foreignDataWrapperOptions.port}'`;
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/record-position-query.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/record-position-query.factory.ts
new file mode 100644
index 000000000000..a9201d426c70
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/record-position-query.factory.ts
@@ -0,0 +1,54 @@
+import { Injectable } from '@nestjs/common';
+
+export enum RecordPositionQueryType {
+  GET = 'GET',
+  UPDATE = 'UPDATE',
+}
+
+@Injectable()
+export class RecordPositionQueryFactory {
+  async create(
+    recordPositionQueryType: RecordPositionQueryType,
+    positionValue: 'first' | 'last' | number,
+    objectMetadata: { isCustom: boolean; nameSingular: string },
+    dataSourceSchema: string,
+  ): Promise<string> {
+    const name =
+      (objectMetadata.isCustom ? '_' : '') + objectMetadata.nameSingular;
+
+    switch (recordPositionQueryType) {
+      case RecordPositionQueryType.GET:
+        if (typeof positionValue === 'number') {
+          throw new Error(
+            'RecordPositionQueryType.GET requires positionValue to be a number',
+          );
+        }
+
+        return this.createForGet(positionValue, name, dataSourceSchema);
+      case RecordPositionQueryType.UPDATE:
+        return this.createForUpdate(name, dataSourceSchema);
+      default:
+        throw new Error('Invalid RecordPositionQueryType');
+    }
+  }
+
+  private async createForGet(
+    positionValue: 'first' | 'last',
+    name: string,
+    dataSourceSchema: string,
+  ): Promise<string> {
+    const orderByDirection = positionValue === 'first' ? 'ASC' : 'DESC';
+
+    return `SELECT position FROM ${dataSourceSchema}."${name}"
+            WHERE "position" IS NOT NULL ORDER BY "position" ${orderByDirection} LIMIT 1`;
+  }
+
+  private async createForUpdate(
+    name: string,
+    dataSourceSchema: string,
+  ): Promise<string> {
+    return `UPDATE ${dataSourceSchema}."${name}"
+            SET "position" = $1
+            WHERE "id" = $2`;
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/relation-field-alias.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/relation-field-alias.factory.ts
similarity index 80%
rename from packages/twenty-server/src/workspace/workspace-query-builder/factories/relation-field-alias.factory.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/relation-field-alias.factory.ts
index 383db4e53094..862c439acf75 100644
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/relation-field-alias.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/relation-field-alias.factory.ts
@@ -2,18 +2,19 @@ import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
 
 import { GraphQLResolveInfo } from 'graphql';
 
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
-import { isRelationFieldMetadataType } from 'src/workspace/utils/is-relation-field-metadata-type.util';
-import { RelationMetadataType } from 'src/metadata/relation-metadata/relation-metadata.entity';
+import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import {
   deduceRelationDirection,
   RelationDirection,
-} from 'src/workspace/utils/deduce-relation-direction.util';
-import { getFieldArgumentsByKey } from 'src/workspace/workspace-query-builder/utils/get-field-arguments-by-key.util';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
+} from 'src/engine/utils/deduce-relation-direction.util';
+import { getFieldArgumentsByKey } from 'src/engine/api/graphql/workspace-query-builder/utils/get-field-arguments-by-key.util';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+import { computeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
 
 import { FieldsStringFactory } from './fields-string.factory';
 import { ArgsStringFactory } from './args-string.factory';
@@ -118,9 +119,7 @@ export class RelationFieldAliasFactory {
       `;
     }
 
-    let relationAlias = fieldMetadata.isCustom
-      ? `${fieldKey}: _${fieldMetadata.name}`
-      : fieldKey;
+    let relationAlias = `${fieldKey}: ${computeColumnName(fieldMetadata)}`;
 
     // For one to one relations, pg_graphql use the target TableName on the side that is not storing the foreign key
     // so we need to alias it to the field key
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/update-many-query.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/update-many-query.factory.ts
new file mode 100644
index 000000000000..936013110d3d
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/update-many-query.factory.ts
@@ -0,0 +1,64 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  Record as IRecord,
+  RecordFilter,
+} from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
+import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
+import { UpdateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+
+import { stringifyWithoutKeyQuote } from 'src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util';
+import { FieldsStringFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/fields-string.factory';
+import { ArgsAliasFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/args-alias.factory';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+
+export interface UpdateManyQueryFactoryOptions
+  extends WorkspaceQueryBuilderOptions {
+  atMost?: number;
+}
+
+@Injectable()
+export class UpdateManyQueryFactory {
+  constructor(
+    private readonly fieldsStringFactory: FieldsStringFactory,
+    private readonly argsAliasFactory: ArgsAliasFactory,
+  ) {}
+
+  async create<
+    Record extends IRecord = IRecord,
+    Filter extends RecordFilter = RecordFilter,
+  >(
+    args: UpdateManyResolverArgs<Record, Filter>,
+    options: UpdateManyQueryFactoryOptions,
+  ) {
+    const fieldsString = await this.fieldsStringFactory.create(
+      options.info,
+      options.fieldMetadataCollection,
+      options.objectMetadataCollection,
+    );
+
+    const computedArgs = this.argsAliasFactory.create(
+      args,
+      options.fieldMetadataCollection,
+    );
+
+    const argsData = {
+      ...computedArgs.data,
+      updatedAt: new Date().toISOString(),
+    };
+
+    return `
+    mutation {
+      update${computeObjectTargetTable(options.objectMetadataItem)}Collection(
+        set: ${stringifyWithoutKeyQuote(argsData)},
+        filter: ${stringifyWithoutKeyQuote(args.filter)},
+        atMost: ${options.atMost ?? 1},
+      ) {
+        affectedCount
+        records {
+          ${fieldsString}
+        }
+      }
+    }`;
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/update-one-query.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/update-one-query.factory.ts
new file mode 100644
index 000000000000..ba86a60fcdb7
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/update-one-query.factory.ts
@@ -0,0 +1,56 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
+import { Record as IRecord } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
+import { UpdateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+
+import { stringifyWithoutKeyQuote } from 'src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+
+import { FieldsStringFactory } from './fields-string.factory';
+import { ArgsAliasFactory } from './args-alias.factory';
+
+@Injectable()
+export class UpdateOneQueryFactory {
+  private readonly logger = new Logger(UpdateOneQueryFactory.name);
+
+  constructor(
+    private readonly fieldsStringFactory: FieldsStringFactory,
+    private readonly argsAliasFactory: ArgsAliasFactory,
+  ) {}
+
+  async create<Record extends IRecord = IRecord>(
+    args: UpdateOneResolverArgs<Record>,
+    options: WorkspaceQueryBuilderOptions,
+  ) {
+    const fieldsString = await this.fieldsStringFactory.create(
+      options.info,
+      options.fieldMetadataCollection,
+      options.objectMetadataCollection,
+    );
+    const computedArgs = this.argsAliasFactory.create(
+      args,
+      options.fieldMetadataCollection,
+    );
+
+    const argsData = {
+      ...computedArgs.data,
+      updatedAt: new Date().toISOString(),
+    };
+
+    return `
+      mutation {
+        update${computeObjectTargetTable(
+          options.objectMetadataItem,
+        )}Collection(set: ${stringifyWithoutKeyQuote(
+          argsData,
+        )}, filter: { id: { eq: "${computedArgs.id}" } }) {
+          affectedCount
+          records {
+            ${fieldsString}
+          }
+        }
+      }
+    `;
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/interfaces/record.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/interfaces/record.interface.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-query-builder/interfaces/record.interface.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-query-builder/interfaces/record.interface.ts
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface.ts
new file mode 100644
index 000000000000..4f1ace4a8013
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface.ts
@@ -0,0 +1,11 @@
+import { GraphQLResolveInfo } from 'graphql';
+
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+export interface WorkspaceQueryBuilderOptions {
+  objectMetadataItem: ObjectMetadataInterface;
+  info: GraphQLResolveInfo;
+  fieldMetadataCollection: FieldMetadataInterface[];
+  objectMetadataCollection: ObjectMetadataInterface[];
+}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/utils/__tests__/stringify-without-key-quote.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/utils/__tests__/stringify-without-key-quote.spec.ts
similarity index 92%
rename from packages/twenty-server/src/workspace/workspace-query-builder/utils/__tests__/stringify-without-key-quote.spec.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-query-builder/utils/__tests__/stringify-without-key-quote.spec.ts
index 0bfad157440e..ec52852ea502 100644
--- a/packages/twenty-server/src/workspace/workspace-query-builder/utils/__tests__/stringify-without-key-quote.spec.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/utils/__tests__/stringify-without-key-quote.spec.ts
@@ -1,4 +1,4 @@
-import { stringifyWithoutKeyQuote } from 'src/workspace/workspace-query-builder/utils/stringify-without-key-quote.util';
+import { stringifyWithoutKeyQuote } from 'src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util';
 
 describe('stringifyWithoutKeyQuote', () => {
   test('should stringify object correctly without quotes around keys', () => {
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/utils/composite-field-metadata.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/utils/composite-field-metadata.util.ts
new file mode 100644
index 000000000000..4dc21dd6fd33
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/utils/composite-field-metadata.util.ts
@@ -0,0 +1,38 @@
+/**
+ * Composite key are structured as follows:
+ * COMPOSITE___{parentFieldName}_{childFieldName}
+ * This util are here to pre-process and post-process the composite keys before and after querying the database
+ */
+
+export const compositeFieldPrefix = 'COMPOSITE___';
+
+export const createCompositeFieldKey = (
+  fieldName: string,
+  propertyName: string,
+): string => {
+  return `${compositeFieldPrefix}${fieldName}_${propertyName}`;
+};
+
+export const isPrefixedCompositeField = (key: string): boolean => {
+  return key.startsWith(compositeFieldPrefix);
+};
+
+export const parseCompositeFieldKey = (
+  key: string,
+): {
+  parentFieldName: string;
+  childFieldName: string;
+} | null => {
+  const [parentFieldName, childFieldName] = key
+    .replace(compositeFieldPrefix, '')
+    .split('_');
+
+  if (!parentFieldName || !childFieldName) {
+    return null;
+  }
+
+  return {
+    parentFieldName,
+    childFieldName,
+  };
+};
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/utils/get-field-arguments-by-key.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/utils/get-field-arguments-by-key.util.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-query-builder/utils/get-field-arguments-by-key.util.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-query-builder/utils/get-field-arguments-by-key.util.ts
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/utils/stringify-without-key-quote.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-query-builder/utils/stringify-without-key-quote.util.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util.ts
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/workspace-query-builder.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/workspace-query-builder.factory.ts
similarity index 92%
rename from packages/twenty-server/src/workspace/workspace-query-builder/workspace-query-builder.factory.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-query-builder/workspace-query-builder.factory.ts
index a1e1a4e0b4b3..451821dc8b4c 100644
--- a/packages/twenty-server/src/workspace/workspace-query-builder/workspace-query-builder.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/workspace-query-builder.factory.ts
@@ -1,11 +1,11 @@
 import { Injectable, Logger } from '@nestjs/common';
 
-import { WorkspaceQueryBuilderOptions } from 'src/workspace/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
+import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
 import {
   Record as IRecord,
   RecordFilter,
   RecordOrderBy,
-} from 'src/workspace/workspace-query-builder/interfaces/record.interface';
+} from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
 import {
   FindManyResolverArgs,
   FindOneResolverArgs,
@@ -15,7 +15,7 @@ import {
   UpdateManyResolverArgs,
   DeleteManyResolverArgs,
   FindDuplicatesResolverArgs,
-} from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+} from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { FindManyQueryFactory } from './factories/find-many-query.factory';
 import { FindOneQueryFactory } from './factories/find-one-query.factory';
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/workspace-query-builder.module.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/workspace-query-builder.module.ts
new file mode 100644
index 000000000000..46367dd98e71
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/workspace-query-builder.module.ts
@@ -0,0 +1,20 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
+import { FieldsStringFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/fields-string.factory';
+import { RecordPositionQueryFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/record-position-query.factory';
+
+import { WorkspaceQueryBuilderFactory } from './workspace-query-builder.factory';
+
+import { workspaceQueryBuilderFactories } from './factories/factories';
+
+@Module({
+  imports: [ObjectMetadataModule],
+  providers: [...workspaceQueryBuilderFactories, WorkspaceQueryBuilderFactory],
+  exports: [
+    WorkspaceQueryBuilderFactory,
+    FieldsStringFactory,
+    RecordPositionQueryFactory,
+  ],
+})
+export class WorkspaceQueryBuilderModule {}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/__tests__/query-runner-args.factory.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/__tests__/query-runner-args.factory.spec.ts
new file mode 100644
index 000000000000..7569a35728e8
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/__tests__/query-runner-args.factory.spec.ts
@@ -0,0 +1,63 @@
+import { Test, TestingModule } from '@nestjs/testing';
+
+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+
+import { QueryRunnerArgsFactory } from 'src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { RecordPositionFactory } from 'src/engine/api/graphql/workspace-query-runner/factories/record-position.factory';
+
+describe('QueryRunnerArgsFactory', () => {
+  const recordPositionFactory = {
+    create: jest.fn().mockResolvedValue(2),
+  };
+  const options = {
+    fieldMetadataCollection: [
+      { name: 'position', type: FieldMetadataType.POSITION },
+    ] as FieldMetadataInterface[],
+    objectMetadataItem: { isCustom: true, nameSingular: 'test' },
+  } as WorkspaceQueryRunnerOptions;
+
+  let factory: QueryRunnerArgsFactory;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        QueryRunnerArgsFactory,
+        {
+          provide: RecordPositionFactory,
+          useValue: {
+            create: recordPositionFactory.create,
+          },
+        },
+      ],
+    }).compile();
+
+    factory = module.get<QueryRunnerArgsFactory>(QueryRunnerArgsFactory);
+  });
+
+  it('should be defined', () => {
+    expect(factory).toBeDefined();
+  });
+
+  describe('create', () => {
+    it('should simply return the args when data is an empty array', async () => {
+      const args = {
+        data: [],
+      };
+      const result = await factory.create(args, options);
+
+      expect(result).toEqual(args);
+    });
+
+    it('should override args when of type array', async () => {
+      const args = { data: [{ id: 1 }, { position: 'last' }] };
+
+      const result = await factory.create(args, options);
+
+      expect(result).toEqual({
+        data: [{ id: 1 }, { position: 2 }],
+      });
+    });
+  });
+});
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/__tests__/record-position.factory.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/__tests__/record-position.factory.spec.ts
new file mode 100644
index 000000000000..e556e1514d34
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/__tests__/record-position.factory.spec.ts
@@ -0,0 +1,64 @@
+import { TestingModule, Test } from '@nestjs/testing';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { RecordPositionQueryFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/record-position-query.factory';
+import { RecordPositionFactory } from 'src/engine/api/graphql/workspace-query-runner/factories/record-position.factory';
+
+describe('RecordPositionFactory', () => {
+  const recordPositionQueryFactory = {
+    create: jest.fn().mockResolvedValue('query'),
+  };
+
+  const workspaceDataSourceService = {
+    getSchemaName: jest.fn().mockReturnValue('schemaName'),
+    executeRawQuery: jest.fn().mockResolvedValue([{ position: 1 }]),
+  };
+
+  let factory: RecordPositionFactory;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        RecordPositionFactory,
+        {
+          provide: RecordPositionQueryFactory,
+          useValue: recordPositionQueryFactory,
+        },
+        {
+          provide: WorkspaceDataSourceService,
+          useValue: workspaceDataSourceService,
+        },
+      ],
+    }).compile();
+
+    factory = module.get<RecordPositionFactory>(RecordPositionFactory);
+  });
+
+  it('should be defined', () => {
+    expect(factory).toBeDefined();
+  });
+
+  describe('create', () => {
+    const objectMetadata = { isCustom: false, nameSingular: 'company' };
+    const workspaceId = 'workspaceId';
+
+    it('should return the value when value is a number', async () => {
+      const value = 1;
+      const result = await factory.create(value, objectMetadata, workspaceId);
+
+      expect(result).toEqual(value);
+    });
+    it('should return the existing position / 2 when value is first', async () => {
+      const value = 'first';
+      const result = await factory.create(value, objectMetadata, workspaceId);
+
+      expect(result).toEqual(0.5);
+    });
+    it('should return the existing position + 1 when value is last', async () => {
+      const value = 'last';
+      const result = await factory.create(value, objectMetadata, workspaceId);
+
+      expect(result).toEqual(2);
+    });
+  });
+});
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/index.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/index.ts
new file mode 100644
index 000000000000..d1e72fb1621c
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/index.ts
@@ -0,0 +1,9 @@
+import { QueryResultGettersFactory } from './query-result-getters.factory';
+import { RecordPositionFactory } from './record-position.factory';
+import { QueryRunnerArgsFactory } from './query-runner-args.factory';
+
+export const workspaceQueryRunnerFactories = [
+  QueryRunnerArgsFactory,
+  RecordPositionFactory,
+  QueryResultGettersFactory,
+];
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-result-getters.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-result-getters.factory.ts
new file mode 100644
index 000000000000..5c61aeb099d5
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-result-getters.factory.ts
@@ -0,0 +1,75 @@
+import { Injectable } from '@nestjs/common';
+
+import { addMilliseconds } from 'date-fns';
+import ms from 'ms';
+
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+
+@Injectable()
+export class QueryResultGettersFactory {
+  constructor(
+    private readonly tokenService: TokenService,
+    private readonly environmentService: EnvironmentService,
+  ) {}
+
+  async create<Result>(
+    result: Result,
+    objectMetadataItem: ObjectMetadataInterface,
+  ): Promise<Result> {
+    // TODO: look for file type once implemented
+    switch (objectMetadataItem.nameSingular) {
+      case 'attachment':
+        return this.applyAttachmentGetters(result);
+      default:
+        return result;
+    }
+  }
+
+  private async applyAttachmentGetters<Result>(
+    attachments: any,
+  ): Promise<Result> {
+    if (!attachments || !attachments.edges) {
+      return attachments;
+    }
+
+    const fileTokenExpiresIn = this.environmentService.get(
+      'FILE_TOKEN_EXPIRES_IN',
+    );
+    const secret = this.environmentService.get('FILE_TOKEN_SECRET');
+
+    const mappedEdges = await Promise.all(
+      attachments.edges.map(async (attachment: any) => {
+        if (!attachment.node.id || !attachment?.node?.fullPath) {
+          return attachment;
+        }
+
+        const expirationDate = addMilliseconds(
+          new Date(),
+          ms(fileTokenExpiresIn),
+        );
+
+        const signedPayload = await this.tokenService.encodePayload(
+          {
+            expiration_date: expirationDate,
+            attachment_id: attachment.node.id,
+          },
+          {
+            secret,
+          },
+        );
+
+        attachment.node.fullPath = `${attachment.node.fullPath}?token=${signedPayload}`;
+
+        return attachment;
+      }),
+    );
+
+    return {
+      ...attachments,
+      edges: mappedEdges,
+    } as Result;
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts
new file mode 100644
index 000000000000..f5c2d80c272b
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts
@@ -0,0 +1,72 @@
+import { Injectable } from '@nestjs/common';
+
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+import { RecordPositionFactory } from './record-position.factory';
+
+@Injectable()
+export class QueryRunnerArgsFactory {
+  constructor(private readonly recordPositionFactory: RecordPositionFactory) {}
+
+  async create(
+    args: Record<string, any>,
+    options: WorkspaceQueryRunnerOptions,
+  ) {
+    const fieldMetadataCollection = options.fieldMetadataCollection;
+
+    const fieldMetadataMap = new Map(
+      fieldMetadataCollection.map((fieldMetadata) => [
+        fieldMetadata.name,
+        fieldMetadata,
+      ]),
+    );
+
+    return {
+      data: await Promise.all(
+        args.data.map((arg) =>
+          this.overrideArgByFieldMetadata(arg, options, fieldMetadataMap),
+        ),
+      ),
+    };
+  }
+
+  private async overrideArgByFieldMetadata(
+    arg: Record<string, any>,
+    options: WorkspaceQueryRunnerOptions,
+    fieldMetadataMap: Map<string, FieldMetadataInterface>,
+  ) {
+    const createArgPromiseByArgKey = Object.entries(arg).map(
+      async ([key, value]) => {
+        const fieldMetadata = fieldMetadataMap.get(key);
+
+        if (!fieldMetadata) {
+          return [key, await Promise.resolve(value)];
+        }
+
+        switch (fieldMetadata.type) {
+          case FieldMetadataType.POSITION:
+            return [
+              key,
+              await this.recordPositionFactory.create(
+                value,
+                {
+                  isCustom: options.objectMetadataItem.isCustom,
+                  nameSingular: options.objectMetadataItem.nameSingular,
+                },
+                options.workspaceId,
+              ),
+            ];
+          default:
+            return [key, await Promise.resolve(value)];
+        }
+      },
+    );
+
+    const newArgEntries = await Promise.all(createArgPromiseByArgKey);
+
+    return Object.fromEntries(newArgEntries);
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/record-position.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/record-position.factory.ts
new file mode 100644
index 000000000000..1548977144e7
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/record-position.factory.ts
@@ -0,0 +1,48 @@
+import { Injectable } from '@nestjs/common';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import {
+  RecordPositionQueryFactory,
+  RecordPositionQueryType,
+} from 'src/engine/api/graphql/workspace-query-builder/factories/record-position-query.factory';
+
+@Injectable()
+export class RecordPositionFactory {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+    private readonly recordPositionQueryFactory: RecordPositionQueryFactory,
+  ) {}
+
+  async create(
+    value: number | 'first' | 'last',
+    objectMetadata: { isCustom: boolean; nameSingular: string },
+    workspaceId: string,
+  ): Promise<number> {
+    if (typeof value === 'number') {
+      return value;
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const query = await this.recordPositionQueryFactory.create(
+      RecordPositionQueryType.GET,
+      value,
+      objectMetadata,
+      dataSourceSchema,
+    );
+
+    const records = await this.workspaceDataSourceService.executeRawQuery(
+      query,
+      [],
+      workspaceId,
+      undefined,
+    );
+
+    return (
+      (value === 'first'
+        ? records[0]?.position / 2
+        : records[0]?.position + 1) || 1
+    );
+  }
+}
diff --git a/packages/twenty-server/src/utils/pagination/interfaces/connection.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/interfaces/connection.interface.ts
similarity index 100%
rename from packages/twenty-server/src/utils/pagination/interfaces/connection.interface.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-query-runner/interfaces/connection.interface.ts
index 95fa6d5db86d..9f5ae3b9ed72 100644
--- a/packages/twenty-server/src/utils/pagination/interfaces/connection.interface.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/interfaces/connection.interface.ts
@@ -1,5 +1,5 @@
-import { IEdge } from './edge.interface';
 import { IPageInfo } from './page-info.interface';
+import { IEdge } from './edge.interface';
 
 export interface IConnection<T, CustomEdge extends IEdge<T> = IEdge<T>> {
   edges: Array<CustomEdge>;
diff --git a/packages/twenty-server/src/utils/pagination/interfaces/edge.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/interfaces/edge.interface.ts
similarity index 100%
rename from packages/twenty-server/src/utils/pagination/interfaces/edge.interface.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-query-runner/interfaces/edge.interface.ts
diff --git a/packages/twenty-server/src/utils/pagination/interfaces/page-info.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/interfaces/page-info.interface.ts
similarity index 100%
rename from packages/twenty-server/src/utils/pagination/interfaces/page-info.interface.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-query-runner/interfaces/page-info.interface.ts
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/interfaces/pg-graphql.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/interfaces/pg-graphql.interface.ts
new file mode 100644
index 000000000000..c015f34a3b86
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/interfaces/pg-graphql.interface.ts
@@ -0,0 +1,15 @@
+import { Record as IRecord } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
+
+export interface PGGraphQLResponse<Data = any> {
+  resolve: {
+    data: Data;
+    errors: any[];
+  };
+}
+
+export type PGGraphQLResult<Data = any> = [PGGraphQLResponse<Data>];
+
+export interface PGGraphQLMutation<Record = IRecord> {
+  affectedRows: number;
+  records: Record[];
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface.ts
new file mode 100644
index 000000000000..13b462a04cbe
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface.ts
@@ -0,0 +1,13 @@
+import { GraphQLResolveInfo } from 'graphql';
+
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+export interface WorkspaceQueryRunnerOptions {
+  workspaceId: string;
+  userId: string | undefined;
+  info: GraphQLResolveInfo;
+  objectMetadataItem: ObjectMetadataInterface;
+  fieldMetadataCollection: FieldMetadataInterface[];
+  objectMetadataCollection: ObjectMetadataInterface[];
+}
diff --git a/packages/twenty-server/src/workspace/workspace-query-runner/jobs/call-webhook-jobs.job.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/jobs/call-webhook-jobs.job.ts
similarity index 75%
rename from packages/twenty-server/src/workspace/workspace-query-runner/jobs/call-webhook-jobs.job.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-query-runner/jobs/call-webhook-jobs.job.ts
index 844e073c3d34..46b4eed29df3 100644
--- a/packages/twenty-server/src/workspace/workspace-query-runner/jobs/call-webhook-jobs.job.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/jobs/call-webhook-jobs.job.ts
@@ -1,17 +1,17 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
 
-import { MessageQueueJob } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import {
   CallWebhookJob,
   CallWebhookJobData,
-} from 'src/workspace/workspace-query-runner/jobs/call-webhook.job';
+} from 'src/engine/api/graphql/workspace-query-runner/jobs/call-webhook.job';
 
 export enum CallWebhookJobsJobOperation {
   create = 'create',
diff --git a/packages/twenty-server/src/workspace/workspace-query-runner/jobs/call-webhook.job.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/jobs/call-webhook.job.ts
similarity index 89%
rename from packages/twenty-server/src/workspace/workspace-query-runner/jobs/call-webhook.job.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-query-runner/jobs/call-webhook.job.ts
index 5945b68c198c..5ce75b717f4b 100644
--- a/packages/twenty-server/src/workspace/workspace-query-runner/jobs/call-webhook.job.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/jobs/call-webhook.job.ts
@@ -1,7 +1,7 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { HttpService } from '@nestjs/axios';
 
-import { MessageQueueJob } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
 
 export type CallWebhookJobData = {
   targetUrl: string;
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/jobs/record-position-backfill.job.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/jobs/record-position-backfill.job.ts
new file mode 100644
index 000000000000..bbd777e35dc2
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/jobs/record-position-backfill.job.ts
@@ -0,0 +1,28 @@
+import { Injectable } from '@nestjs/common';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { RecordPositionBackfillService } from 'src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-service';
+
+export type RecordPositionBackfillJobData = {
+  workspaceId: string;
+  objectMetadata: { nameSingular: string; isCustom: boolean };
+  recordId: string;
+};
+
+@Injectable()
+export class RecordPositionBackfillJob
+  implements MessageQueueJob<RecordPositionBackfillJobData>
+{
+  constructor(
+    private readonly recordPositionBackfillService: RecordPositionBackfillService,
+  ) {}
+
+  async handle(data: RecordPositionBackfillJobData): Promise<void> {
+    this.recordPositionBackfillService.backfill(
+      data.workspaceId,
+      data.objectMetadata,
+      data.recordId,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/jobs/save-event-to-db.job.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/jobs/save-event-to-db.job.ts
new file mode 100644
index 000000000000..7810ae2f8fcb
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/jobs/save-event-to-db.job.ts
@@ -0,0 +1,58 @@
+import { Injectable } from '@nestjs/common';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { EventRepository } from 'src/modules/event/repositiories/event.repository';
+import { EventObjectMetadata } from 'src/modules/event/standard-objects/event.object-metadata';
+import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+export type SaveEventToDbJobData = {
+  workspaceId: string;
+  recordId: string;
+  userId: string | undefined;
+  objectName: string;
+  operation: string;
+  details: any;
+};
+
+@Injectable()
+export class SaveEventToDbJob implements MessageQueueJob<SaveEventToDbJobData> {
+  constructor(
+    @InjectObjectMetadataRepository(WorkspaceMemberObjectMetadata)
+    private readonly workspaceMemberService: WorkspaceMemberRepository,
+    @InjectObjectMetadataRepository(EventObjectMetadata)
+    private readonly eventService: EventRepository,
+  ) {}
+
+  // TODO: need to support objects others than "person", "company", "opportunity"
+  async handle(data: SaveEventToDbJobData): Promise<void> {
+    let workspaceMemberId: string | null = null;
+
+    if (data.userId) {
+      const workspaceMember = await this.workspaceMemberService.getByIdOrFail(
+        data.userId,
+        data.workspaceId,
+      );
+
+      workspaceMemberId = workspaceMember.id;
+    }
+
+    if (data.details.diff) {
+      // we remove "before" and "after" property for a cleaner/slimmer event payload
+      data.details = {
+        diff: data.details.diff,
+      };
+    }
+
+    await this.eventService.insert(
+      `${data.operation}.${data.objectName}`,
+      data.details,
+      workspaceMemberId,
+      data.objectName,
+      data.recordId,
+      data.workspaceId,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
new file mode 100644
index 000000000000..8288a94d4d90
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
@@ -0,0 +1,79 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/types/object-record-create.event';
+import {
+  SaveEventToDbJobData,
+  SaveEventToDbJob,
+} from 'src/engine/api/graphql/workspace-query-runner/jobs/save-event-to-db.job';
+import {
+  FeatureFlagEntity,
+  FeatureFlagKeys,
+} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { objectRecordChangedValues } from 'src/engine/integrations/event-emitter/utils/object-record-changed-values';
+import { ObjectRecordUpdateEvent } from 'src/engine/integrations/event-emitter/types/object-record-update.event';
+
+@Injectable()
+export class EntityEventsToDbListener {
+  constructor(
+    @Inject(MessageQueue.entityEventsToDbQueue)
+    private readonly messageQueueService: MessageQueueService,
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+  ) {}
+
+  @OnEvent('*.created')
+  async handleCreate(payload: ObjectRecordCreateEvent<any>) {
+    return this.handle(payload, 'created');
+  }
+
+  @OnEvent('*.updated')
+  async handleUpdate(payload: ObjectRecordUpdateEvent<any>) {
+    payload.details.diff = objectRecordChangedValues(
+      payload.details.before,
+      payload.details.after,
+    );
+
+    return this.handle(payload, 'updated');
+  }
+
+  // @OnEvent('*.deleted') - TODO: implement when we have soft deleted
+  // ....
+
+  private async handle(
+    payload: ObjectRecordCreateEvent<any>,
+    operation: string,
+  ) {
+    if (payload.objectMetadata.isSystem) {
+      return;
+    }
+
+    const isEventObjectEnabledFeatureFlag =
+      await this.featureFlagRepository.findOneBy({
+        workspaceId: payload.workspaceId,
+        key: FeatureFlagKeys.IsEventObjectEnabled,
+        value: true,
+      });
+
+    if (
+      !isEventObjectEnabledFeatureFlag ||
+      !isEventObjectEnabledFeatureFlag.value
+    ) {
+      return;
+    }
+
+    this.messageQueueService.add<SaveEventToDbJobData>(SaveEventToDbJob.name, {
+      workspaceId: payload.workspaceId,
+      userId: payload.userId,
+      recordId: payload.recordId,
+      objectName: payload.objectMetadata.nameSingular,
+      operation: operation,
+      details: payload.details,
+    });
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/record-position.listener.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/record-position.listener.ts
new file mode 100644
index 000000000000..9d9ea3803f33
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/record-position.listener.ts
@@ -0,0 +1,59 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/types/object-record-create.event';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import {
+  RecordPositionBackfillJob,
+  RecordPositionBackfillJobData,
+} from 'src/engine/api/graphql/workspace-query-runner/jobs/record-position-backfill.job';
+
+@Injectable()
+export class RecordPositionListener {
+  constructor(
+    @Inject(MessageQueue.recordPositionBackfillQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {}
+
+  @OnEvent('*.created')
+  async handleAllCreate(payload: ObjectRecordCreateEvent<any>) {
+    if (!hasPositionField(payload.objectMetadata)) {
+      return;
+    }
+
+    if (hasPositionSet(payload.details.after)) {
+      return;
+    }
+
+    this.messageQueueService.add<RecordPositionBackfillJobData>(
+      RecordPositionBackfillJob.name,
+      {
+        workspaceId: payload.workspaceId,
+        recordId: payload.recordId,
+        objectMetadata: {
+          nameSingular: payload.objectMetadata.nameSingular,
+          isCustom: payload.objectMetadata.isCustom,
+        },
+      },
+    );
+  }
+}
+
+// TODO: use objectMetadata instead of hardcoded standard objects name
+const hasPositionField = (
+  createdObjectMetadata: ObjectMetadataInterface,
+): boolean => {
+  return (
+    createdObjectMetadata.isCustom ||
+    ['opportunity', 'company', 'people'].includes(
+      createdObjectMetadata.nameSingular,
+    )
+  );
+};
+
+const hasPositionSet = (createdRecord: any): boolean => {
+  return !!createdRecord?.position;
+};
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-module.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-module.ts
new file mode 100644
index 000000000000..1a058a46ed35
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-module.ts
@@ -0,0 +1,17 @@
+import { Module } from '@nestjs/common';
+
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { RecordPositionQueryFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/record-position-query.factory';
+import { RecordPositionFactory } from 'src/engine/api/graphql/workspace-query-runner/factories/record-position.factory';
+import { RecordPositionBackfillService } from 'src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-service';
+
+@Module({
+  imports: [WorkspaceDataSourceModule],
+  providers: [
+    RecordPositionFactory,
+    RecordPositionQueryFactory,
+    RecordPositionBackfillService,
+  ],
+  exports: [RecordPositionBackfillService],
+})
+export class RecordPositionBackfillModule {}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-service.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-service.ts
new file mode 100644
index 000000000000..42242d086730
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-service.ts
@@ -0,0 +1,48 @@
+import { Injectable } from '@nestjs/common';
+
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import {
+  RecordPositionQueryFactory,
+  RecordPositionQueryType,
+} from 'src/engine/api/graphql/workspace-query-builder/factories/record-position-query.factory';
+import { RecordPositionFactory } from 'src/engine/api/graphql/workspace-query-runner/factories/record-position.factory';
+
+@Injectable()
+export class RecordPositionBackfillService {
+  constructor(
+    private readonly recordPositionFactory: RecordPositionFactory,
+    private readonly recordPositionQueryFactory: RecordPositionQueryFactory,
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  async backfill(
+    workspaceId: string,
+    objectMetadata: { nameSingular: string; isCustom: boolean },
+    recordId: string,
+  ) {
+    const position = await this.recordPositionFactory.create(
+      'last',
+      objectMetadata as ObjectMetadataInterface,
+      workspaceId,
+    );
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const query = await this.recordPositionQueryFactory.create(
+      RecordPositionQueryType.UPDATE,
+      position,
+      objectMetadata as ObjectMetadataInterface,
+      dataSourceSchema,
+    );
+
+    this.workspaceDataSourceService.executeRawQuery(
+      query,
+      [position, recordId],
+      workspaceId,
+      undefined,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/__tests__/parse-result.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/__tests__/parse-result.spec.ts
new file mode 100644
index 000000000000..462b45ace776
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/__tests__/parse-result.spec.ts
@@ -0,0 +1,107 @@
+import { createCompositeFieldKey } from 'src/engine/api/graphql/workspace-query-builder/utils/composite-field-metadata.util';
+import {
+  handleCompositeKey,
+  parseResult,
+} from 'src/engine/api/graphql/workspace-query-runner/utils/parse-result.util';
+
+describe('handleSpecialKey', () => {
+  let result;
+
+  beforeEach(() => {
+    result = {};
+  });
+
+  test('should correctly process a composite key and add it to the result object', () => {
+    handleCompositeKey(
+      result,
+      createCompositeFieldKey('complexField', 'link'),
+      'value1',
+    );
+    expect(result).toEqual({
+      complexField: {
+        link: 'value1',
+      },
+    });
+  });
+
+  test('should add values under the same newKey if called multiple times', () => {
+    handleCompositeKey(
+      result,
+      createCompositeFieldKey('complexField', 'link'),
+      'value1',
+    );
+    handleCompositeKey(
+      result,
+      createCompositeFieldKey('complexField', 'text'),
+      'value2',
+    );
+    expect(result).toEqual({
+      complexField: {
+        link: 'value1',
+        text: 'value2',
+      },
+    });
+  });
+
+  test('should not create a new field if the composite key is not correctly formed', () => {
+    handleCompositeKey(result, 'COMPOSITE___complexField', 'value1');
+    expect(result).toEqual({});
+  });
+});
+
+describe('parseResult', () => {
+  test('should recursively parse an object and handle special keys', () => {
+    const obj = {
+      normalField: 'value1',
+      COMPOSITE___specialField_part1: 'value2',
+      nested: {
+        COMPOSITE___specialFieldNested_part2: 'value3',
+      },
+    };
+
+    const expectedResult = {
+      normalField: 'value1',
+      specialField: {
+        part1: 'value2',
+      },
+      nested: {
+        specialFieldNested: {
+          part2: 'value3',
+        },
+      },
+    };
+
+    expect(parseResult(obj)).toEqual(expectedResult);
+  });
+
+  test('should handle arrays and parse each element', () => {
+    const objArray = [
+      {
+        COMPOSITE___specialField_part1: 'value1',
+      },
+      {
+        COMPOSITE___specialField_part2: 'value2',
+      },
+    ];
+
+    const expectedResult = [
+      {
+        specialField: {
+          part1: 'value1',
+        },
+      },
+      {
+        specialField: {
+          part2: 'value2',
+        },
+      },
+    ];
+
+    expect(parseResult(objArray)).toEqual(expectedResult);
+  });
+
+  test('should return the original value if it is not an object or array', () => {
+    expect(parseResult('stringValue')).toBe('stringValue');
+    expect(parseResult(12345)).toBe(12345);
+  });
+});
diff --git a/packages/twenty-server/src/workspace/workspace-query-runner/utils/compute-pg-graphql-error.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/compute-pg-graphql-error.util.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-query-runner/utils/compute-pg-graphql-error.util.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/compute-pg-graphql-error.util.ts
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/parse-result.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/parse-result.util.ts
new file mode 100644
index 000000000000..b8ad1383e1d7
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/parse-result.util.ts
@@ -0,0 +1,51 @@
+import {
+  isPrefixedCompositeField,
+  parseCompositeFieldKey,
+} from 'src/engine/api/graphql/workspace-query-builder/utils/composite-field-metadata.util';
+
+export const handleCompositeKey = (
+  result: any,
+  key: string,
+  value: any,
+): void => {
+  const parsedFieldKey = parseCompositeFieldKey(key);
+
+  // If composite field key can't be parsed, return
+  if (!parsedFieldKey) {
+    return;
+  }
+
+  if (!result[parsedFieldKey.parentFieldName]) {
+    result[parsedFieldKey.parentFieldName] = {};
+  }
+
+  result[parsedFieldKey.parentFieldName][parsedFieldKey.childFieldName] = value;
+};
+
+export const parseResult = (obj: any): any => {
+  if (obj === null || typeof obj !== 'object' || typeof obj === 'function') {
+    return obj;
+  }
+
+  if (Array.isArray(obj)) {
+    return obj.map((item) => parseResult(item));
+  }
+
+  const result: any = {};
+
+  for (const key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      if (typeof obj[key] === 'object' && obj[key] !== null) {
+        result[key] = parseResult(obj[key]);
+      } else if (key === '__typename') {
+        result[key] = obj[key].replace(/^_*/, '');
+      } else if (isPrefixedCompositeField(key)) {
+        handleCompositeKey(result, key, obj[key]);
+      } else {
+        result[key] = obj[key];
+      }
+    }
+  }
+
+  return result;
+};
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface.ts
new file mode 100644
index 000000000000..60a782e8c443
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface.ts
@@ -0,0 +1,9 @@
+import { ResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+
+export interface WorkspacePreQueryHook {
+  execute(
+    userId: string | undefined,
+    workspaceId: string,
+    payload: ResolverArgs,
+  ): Promise<void>;
+}
diff --git a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-pre-query-hook/types/workspace-query-hook.type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/types/workspace-query-hook.type.ts
similarity index 92%
rename from packages/twenty-server/src/workspace/workspace-query-runner/workspace-pre-query-hook/types/workspace-query-hook.type.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/types/workspace-query-hook.type.ts
index 9cc680bdf3ae..84d75b1358b9 100644
--- a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-pre-query-hook/types/workspace-query-hook.type.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/types/workspace-query-hook.type.ts
@@ -8,7 +8,7 @@ import {
   FindOneResolverArgs,
   UpdateManyResolverArgs,
   UpdateOneResolverArgs,
-} from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+} from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 export type ExecutePreHookMethod =
   | 'createMany'
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.config.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.config.ts
new file mode 100644
index 000000000000..72361faed6e7
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.config.ts
@@ -0,0 +1,17 @@
+import { MessageFindManyPreQueryHook } from 'src/modules/messaging/query-hooks/message/message-find-many.pre-query.hook';
+import { MessageFindOnePreQueryHook } from 'src/modules/messaging/query-hooks/message/message-find-one.pre-query-hook';
+import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/types/workspace-query-hook.type';
+import { CalendarEventFindManyPreQueryHook } from 'src/modules/calendar/query-hooks/calendar-event/calendar-event-find-many.pre-query.hook';
+import { CalendarEventFindOnePreQueryHook } from 'src/modules/calendar/query-hooks/calendar-event/calendar-event-find-one.pre-query-hook';
+
+// TODO: move to a decorator
+export const workspacePreQueryHooks: WorkspaceQueryHook = {
+  message: {
+    findOne: [MessageFindOnePreQueryHook.name],
+    findMany: [MessageFindManyPreQueryHook.name],
+  },
+  calendarEvent: {
+    findOne: [CalendarEventFindOnePreQueryHook.name],
+    findMany: [CalendarEventFindManyPreQueryHook.name],
+  },
+};
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.module.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.module.ts
new file mode 100644
index 000000000000..90f841b62a4f
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.module.ts
@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+
+import { MessagingQueryHookModule } from 'src/modules/messaging/query-hooks/messaging-query-hook.module';
+import { WorkspacePreQueryHookService } from 'src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.service';
+import { CalendarQueryHookModule } from 'src/modules/calendar/query-hooks/calendar-query-hook.module';
+
+@Module({
+  imports: [MessagingQueryHookModule, CalendarQueryHookModule],
+  providers: [WorkspacePreQueryHookService],
+  exports: [WorkspacePreQueryHookService],
+})
+export class WorkspacePreQueryHookModule {}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.service.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.service.ts
new file mode 100644
index 000000000000..28681e0b965b
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.service.ts
@@ -0,0 +1,34 @@
+import { Injectable } from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
+
+import { WorkspacePreQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface';
+
+import {
+  ExecutePreHookMethod,
+  WorkspacePreQueryHookPayload,
+} from 'src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/types/workspace-query-hook.type';
+import { workspacePreQueryHooks } from 'src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.config';
+
+@Injectable()
+export class WorkspacePreQueryHookService {
+  constructor(private readonly workspaceQueryHookModuleRef: ModuleRef) {}
+
+  public async executePreHooks<T extends ExecutePreHookMethod>(
+    userId: string | undefined,
+    workspaceId: string,
+    objectName: string,
+    method: T,
+    payload: WorkspacePreQueryHookPayload<T>,
+  ): Promise<void> {
+    const hooks = workspacePreQueryHooks[objectName] || [];
+
+    for (const hookName of Object.values(hooks[method] ?? [])) {
+      const hook: WorkspacePreQueryHook =
+        await this.workspaceQueryHookModuleRef.get(hookName, {
+          strict: false,
+        });
+
+      await hook.execute(userId, workspaceId, payload);
+    }
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts
new file mode 100644
index 000000000000..9b4efe05b090
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts
@@ -0,0 +1,40 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { WorkspaceQueryBuilderModule } from 'src/engine/api/graphql/workspace-query-builder/workspace-query-builder.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { WorkspacePreQueryHookModule } from 'src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.module';
+import { workspaceQueryRunnerFactories } from 'src/engine/api/graphql/workspace-query-runner/factories';
+import { RecordPositionListener } from 'src/engine/api/graphql/workspace-query-runner/listeners/record-position.listener';
+import { AuthModule } from 'src/engine/core-modules/auth/auth.module';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { EventObjectMetadata } from 'src/modules/event/standard-objects/event.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+
+import { WorkspaceQueryRunnerService } from './workspace-query-runner.service';
+
+import { EntityEventsToDbListener } from './listeners/entity-events-to-db.listener';
+
+@Module({
+  imports: [
+    AuthModule,
+    WorkspaceQueryBuilderModule,
+    WorkspaceDataSourceModule,
+    WorkspacePreQueryHookModule,
+    TypeOrmModule.forFeature([Workspace, FeatureFlagEntity], 'core'),
+    ObjectMetadataRepositoryModule.forFeature([
+      WorkspaceMemberObjectMetadata,
+      EventObjectMetadata,
+    ]),
+  ],
+  providers: [
+    WorkspaceQueryRunnerService,
+    ...workspaceQueryRunnerFactories,
+    RecordPositionListener,
+    EntityEventsToDbListener,
+  ],
+  exports: [WorkspaceQueryRunnerService],
+})
+export class WorkspaceQueryRunnerModule {}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
new file mode 100644
index 000000000000..712372e4411b
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
@@ -0,0 +1,614 @@
+import {
+  BadRequestException,
+  Inject,
+  Injectable,
+  Logger,
+} from '@nestjs/common';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+
+import isEmpty from 'lodash.isempty';
+
+import { IConnection } from 'src/engine/api/graphql/workspace-query-runner/interfaces/connection.interface';
+import {
+  Record as IRecord,
+  RecordFilter,
+  RecordOrderBy,
+} from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
+import {
+  CreateManyResolverArgs,
+  CreateOneResolverArgs,
+  DeleteManyResolverArgs,
+  DeleteOneResolverArgs,
+  FindDuplicatesResolverArgs,
+  FindManyResolverArgs,
+  FindOneResolverArgs,
+  UpdateManyResolverArgs,
+  UpdateOneResolverArgs,
+} from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import { WorkspaceQueryBuilderFactory } from 'src/engine/api/graphql/workspace-query-builder/workspace-query-builder.factory';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import {
+  CallWebhookJobsJob,
+  CallWebhookJobsJobData,
+  CallWebhookJobsJobOperation,
+} from 'src/engine/api/graphql/workspace-query-runner/jobs/call-webhook-jobs.job';
+import { parseResult } from 'src/engine/api/graphql/workspace-query-runner/utils/parse-result.util';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+import { ObjectRecordDeleteEvent } from 'src/engine/integrations/event-emitter/types/object-record-delete.event';
+import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/types/object-record-create.event';
+import { ObjectRecordUpdateEvent } from 'src/engine/integrations/event-emitter/types/object-record-update.event';
+import { WorkspacePreQueryHookService } from 'src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { NotFoundError } from 'src/engine/utils/graphql-errors.util';
+import { QueryRunnerArgsFactory } from 'src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory';
+import { QueryResultGettersFactory } from 'src/engine/api/graphql/workspace-query-runner/factories/query-result-getters.factory';
+import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';
+
+import { WorkspaceQueryRunnerOptions } from './interfaces/query-runner-option.interface';
+import {
+  PGGraphQLMutation,
+  PGGraphQLResult,
+} from './interfaces/pg-graphql.interface';
+import { computePgGraphQLError } from './utils/compute-pg-graphql-error.util';
+
+@Injectable()
+export class WorkspaceQueryRunnerService {
+  private readonly logger = new Logger(WorkspaceQueryRunnerService.name);
+
+  constructor(
+    private readonly workspaceQueryBuilderFactory: WorkspaceQueryBuilderFactory,
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+    private readonly queryRunnerArgsFactory: QueryRunnerArgsFactory,
+    private readonly queryResultGettersFactory: QueryResultGettersFactory,
+    @Inject(MessageQueue.webhookQueue)
+    private readonly messageQueueService: MessageQueueService,
+    private readonly eventEmitter: EventEmitter2,
+    private readonly workspacePreQueryHookService: WorkspacePreQueryHookService,
+    private readonly environmentService: EnvironmentService,
+  ) {}
+
+  async findMany<
+    Record extends IRecord = IRecord,
+    Filter extends RecordFilter = RecordFilter,
+    OrderBy extends RecordOrderBy = RecordOrderBy,
+  >(
+    args: FindManyResolverArgs<Filter, OrderBy>,
+    options: WorkspaceQueryRunnerOptions,
+  ): Promise<IConnection<Record> | undefined> {
+    const { workspaceId, userId, objectMetadataItem } = options;
+    const start = performance.now();
+
+    const query = await this.workspaceQueryBuilderFactory.findMany(
+      args,
+      options,
+    );
+
+    await this.workspacePreQueryHookService.executePreHooks(
+      userId,
+      workspaceId,
+      objectMetadataItem.nameSingular,
+      'findMany',
+      args,
+    );
+
+    const result = await this.execute(query, workspaceId);
+    const end = performance.now();
+
+    this.logger.log(
+      `query time: ${end - start} ms on query ${
+        options.objectMetadataItem.nameSingular
+      }`,
+    );
+
+    return this.parseResult<IConnection<Record>>(
+      result,
+      objectMetadataItem,
+      '',
+    );
+  }
+
+  async findOne<
+    Record extends IRecord = IRecord,
+    Filter extends RecordFilter = RecordFilter,
+  >(
+    args: FindOneResolverArgs<Filter>,
+    options: WorkspaceQueryRunnerOptions,
+  ): Promise<Record | undefined> {
+    if (!args.filter || Object.keys(args.filter).length === 0) {
+      throw new BadRequestException('Missing filter argument');
+    }
+    const { workspaceId, userId, objectMetadataItem } = options;
+    const query = await this.workspaceQueryBuilderFactory.findOne(
+      args,
+      options,
+    );
+
+    await this.workspacePreQueryHookService.executePreHooks(
+      userId,
+      workspaceId,
+      objectMetadataItem.nameSingular,
+      'findOne',
+      args,
+    );
+
+    const result = await this.execute(query, workspaceId);
+    const parsedResult = await this.parseResult<IConnection<Record>>(
+      result,
+      objectMetadataItem,
+      '',
+    );
+
+    return parsedResult?.edges?.[0]?.node;
+  }
+
+  async findDuplicates<TRecord extends IRecord = IRecord>(
+    args: FindDuplicatesResolverArgs<TRecord>,
+    options: WorkspaceQueryRunnerOptions,
+  ): Promise<IConnection<TRecord> | undefined> {
+    if (!args.data && !args.id) {
+      throw new BadRequestException(
+        'You have to provide either "data" or "id" argument',
+      );
+    }
+
+    if (!args.id && isEmpty(args.data)) {
+      throw new BadRequestException(
+        'The "data" condition can not be empty when ID input not provided',
+      );
+    }
+
+    const { workspaceId, userId, objectMetadataItem } = options;
+
+    let existingRecord: Record<string, unknown> | undefined;
+
+    if (args.id) {
+      const existingRecordQuery =
+        this.workspaceQueryBuilderFactory.findDuplicatesExistingRecord(
+          args.id,
+          options,
+        );
+
+      const existingRecordResult = await this.execute(
+        existingRecordQuery,
+        workspaceId,
+      );
+
+      const parsedResult = await this.parseResult<Record<string, unknown>>(
+        existingRecordResult,
+        objectMetadataItem,
+        '',
+      );
+
+      existingRecord = parsedResult?.edges?.[0]?.node;
+
+      if (!existingRecord) {
+        throw new NotFoundError(`Object with id ${args.id} not found`);
+      }
+    }
+
+    const query = await this.workspaceQueryBuilderFactory.findDuplicates(
+      args,
+      options,
+      existingRecord,
+    );
+
+    await this.workspacePreQueryHookService.executePreHooks(
+      userId,
+      workspaceId,
+      objectMetadataItem.nameSingular,
+      'findDuplicates',
+      args,
+    );
+
+    const result = await this.execute(query, workspaceId);
+
+    return this.parseResult<IConnection<TRecord>>(
+      result,
+      objectMetadataItem,
+      '',
+    );
+  }
+
+  async createMany<Record extends IRecord = IRecord>(
+    args: CreateManyResolverArgs<Record>,
+    options: WorkspaceQueryRunnerOptions,
+  ): Promise<Record[] | undefined> {
+    const { workspaceId, userId, objectMetadataItem } = options;
+
+    assertMutationNotOnRemoteObject(objectMetadataItem);
+
+    const computedArgs = await this.queryRunnerArgsFactory.create(
+      args,
+      options,
+    );
+
+    const query = await this.workspaceQueryBuilderFactory.createMany(
+      computedArgs,
+      options,
+    );
+
+    const result = await this.execute(query, workspaceId);
+
+    const parsedResults = (
+      await this.parseResult<PGGraphQLMutation<Record>>(
+        result,
+        objectMetadataItem,
+        'insertInto',
+      )
+    )?.records;
+
+    await this.triggerWebhooks<Record>(
+      parsedResults,
+      CallWebhookJobsJobOperation.create,
+      options,
+    );
+
+    parsedResults.forEach((record) => {
+      this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.created`, {
+        workspaceId,
+        userId,
+        recordId: record.id,
+        objectMetadata: objectMetadataItem,
+        details: {
+          after: record,
+        },
+      } satisfies ObjectRecordCreateEvent<any>);
+    });
+
+    return parsedResults;
+  }
+
+  async createOne<Record extends IRecord = IRecord>(
+    args: CreateOneResolverArgs<Record>,
+    options: WorkspaceQueryRunnerOptions,
+  ): Promise<Record | undefined> {
+    const results = await this.createMany({ data: [args.data] }, options);
+
+    return results?.[0];
+  }
+
+  async updateOne<Record extends IRecord = IRecord>(
+    args: UpdateOneResolverArgs<Record>,
+    options: WorkspaceQueryRunnerOptions,
+  ): Promise<Record | undefined> {
+    const { workspaceId, userId, objectMetadataItem } = options;
+
+    assertMutationNotOnRemoteObject(objectMetadataItem);
+
+    const existingRecord = await this.findOne(
+      { filter: { id: { eq: args.id } } } as FindOneResolverArgs,
+      options,
+    );
+
+    const query = await this.workspaceQueryBuilderFactory.updateOne(
+      args,
+      options,
+    );
+
+    const result = await this.execute(query, workspaceId);
+
+    const parsedResults = (
+      await this.parseResult<PGGraphQLMutation<Record>>(
+        result,
+        objectMetadataItem,
+        'update',
+      )
+    )?.records;
+
+    await this.triggerWebhooks<Record>(
+      parsedResults,
+      CallWebhookJobsJobOperation.update,
+      options,
+    );
+
+    this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.updated`, {
+      workspaceId,
+      userId,
+      recordId: (existingRecord as Record).id,
+      objectMetadata: objectMetadataItem,
+      details: {
+        before: this.removeNestedProperties(existingRecord as Record),
+        after: this.removeNestedProperties(parsedResults?.[0]),
+      },
+    } satisfies ObjectRecordUpdateEvent<any>);
+
+    return parsedResults?.[0];
+  }
+
+  async updateMany<Record extends IRecord = IRecord>(
+    args: UpdateManyResolverArgs<Record>,
+    options: WorkspaceQueryRunnerOptions,
+  ): Promise<Record[] | undefined> {
+    const { workspaceId, objectMetadataItem } = options;
+
+    assertMutationNotOnRemoteObject(objectMetadataItem);
+
+    const maximumRecordAffected = this.environmentService.get(
+      'MUTATION_MAXIMUM_RECORD_AFFECTED',
+    );
+    const query = await this.workspaceQueryBuilderFactory.updateMany(args, {
+      ...options,
+      atMost: maximumRecordAffected,
+    });
+
+    const result = await this.execute(query, workspaceId);
+
+    const parsedResults = (
+      await this.parseResult<PGGraphQLMutation<Record>>(
+        result,
+        objectMetadataItem,
+        'update',
+      )
+    )?.records;
+
+    await this.triggerWebhooks<Record>(
+      parsedResults,
+      CallWebhookJobsJobOperation.update,
+      options,
+    );
+
+    // TODO: check - NO EVENT SENT?
+    // OK I spent 2 hours trying to implement before/after diff and
+    // figured out why it hasn't been implement
+    // Doing a findMany in that context is very hard as long as we don't
+    // have a proper ORM. Let's come back to this once we do (target end of April 24?)
+
+    return parsedResults;
+  }
+
+  async deleteMany<
+    Record extends IRecord = IRecord,
+    Filter extends RecordFilter = RecordFilter,
+  >(
+    args: DeleteManyResolverArgs<Filter>,
+    options: WorkspaceQueryRunnerOptions,
+  ): Promise<Record[] | undefined> {
+    const { workspaceId, userId, objectMetadataItem } = options;
+
+    assertMutationNotOnRemoteObject(objectMetadataItem);
+
+    const maximumRecordAffected = this.environmentService.get(
+      'MUTATION_MAXIMUM_RECORD_AFFECTED',
+    );
+    const query = await this.workspaceQueryBuilderFactory.deleteMany(args, {
+      ...options,
+      atMost: maximumRecordAffected,
+    });
+
+    const result = await this.execute(query, workspaceId);
+
+    const parsedResults = (
+      await this.parseResult<PGGraphQLMutation<Record>>(
+        result,
+        objectMetadataItem,
+        'deleteFrom',
+      )
+    )?.records;
+
+    await this.triggerWebhooks<Record>(
+      parsedResults,
+      CallWebhookJobsJobOperation.delete,
+      options,
+    );
+
+    parsedResults.forEach((record) => {
+      this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.deleted`, {
+        workspaceId,
+        userId,
+        recordId: record.id,
+        objectMetadata: objectMetadataItem,
+        details: {
+          before: [this.removeNestedProperties(record)],
+        },
+      } satisfies ObjectRecordDeleteEvent<any>);
+    });
+
+    return parsedResults;
+  }
+
+  async deleteOne<Record extends IRecord = IRecord>(
+    args: DeleteOneResolverArgs,
+    options: WorkspaceQueryRunnerOptions,
+  ): Promise<Record | undefined> {
+    const { workspaceId, userId, objectMetadataItem } = options;
+
+    assertMutationNotOnRemoteObject(objectMetadataItem);
+
+    const query = await this.workspaceQueryBuilderFactory.deleteOne(
+      args,
+      options,
+    );
+
+    // TODO START: remove this awful patch and use our upcoming custom ORM is developed
+    const deletedWorkspaceMember = await this.handleDeleteWorkspaceMember(
+      args.id,
+      workspaceId,
+      objectMetadataItem,
+    );
+    // TODO END
+
+    const result = await this.execute(query, workspaceId);
+
+    const parsedResults = (
+      await this.parseResult<PGGraphQLMutation<Record>>(
+        result,
+        objectMetadataItem,
+        'deleteFrom',
+      )
+    )?.records;
+
+    await this.triggerWebhooks<Record>(
+      parsedResults,
+      CallWebhookJobsJobOperation.delete,
+      options,
+    );
+
+    this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.deleted`, {
+      workspaceId,
+      userId,
+      recordId: args.id,
+      objectMetadata: objectMetadataItem,
+      details: {
+        before: {
+          ...(deletedWorkspaceMember ?? {}),
+          ...this.removeNestedProperties(parsedResults?.[0]),
+        },
+      },
+    } satisfies ObjectRecordDeleteEvent<any>);
+
+    return parsedResults?.[0];
+  }
+
+  private removeNestedProperties<Record extends IRecord = IRecord>(
+    record: Record,
+  ) {
+    if (!record) {
+      return;
+    }
+    const sanitizedRecord = {};
+
+    for (const [key, value] of Object.entries(record)) {
+      if (value && typeof value === 'object' && value['edges']) {
+        continue;
+      }
+
+      sanitizedRecord[key] = value;
+    }
+
+    return sanitizedRecord;
+  }
+
+  async execute(
+    query: string,
+    workspaceId: string,
+  ): Promise<PGGraphQLResult | undefined> {
+    const workspaceDataSource =
+      await this.workspaceDataSourceService.connectToWorkspaceDataSource(
+        workspaceId,
+      );
+
+    await workspaceDataSource?.query(`
+        SET search_path TO ${this.workspaceDataSourceService.getSchemaName(
+          workspaceId,
+        )};
+      `);
+
+    const results = await workspaceDataSource?.query<PGGraphQLResult>(`
+        SELECT graphql.resolve($$
+          ${query}
+        $$);
+      `);
+
+    return results;
+  }
+
+  private async parseResult<Result>(
+    graphqlResult: PGGraphQLResult | undefined,
+    objectMetadataItem: ObjectMetadataInterface,
+    command: string,
+  ): Promise<Result> {
+    const entityKey = `${command}${computeObjectTargetTable(
+      objectMetadataItem,
+    )}Collection`;
+    const result = graphqlResult?.[0]?.resolve?.data?.[entityKey];
+    const errors = graphqlResult?.[0]?.resolve?.errors;
+
+    if (!result) {
+      this.logger.log(
+        `No result found for ${entityKey}, graphqlResult: ` +
+          JSON.stringify(graphqlResult, null, 3),
+      );
+    }
+
+    if (
+      result &&
+      ['update', 'deleteFrom'].includes(command) &&
+      !result.affectedCount
+    ) {
+      throw new BadRequestException('No rows were affected.');
+    }
+
+    if (errors && errors.length > 0) {
+      const error = computePgGraphQLError(
+        command,
+        objectMetadataItem.nameSingular,
+        errors,
+      );
+
+      throw error;
+    }
+
+    const resultWithGetters = await this.queryResultGettersFactory.create(
+      result,
+      objectMetadataItem,
+    );
+
+    return parseResult(resultWithGetters);
+  }
+
+  async executeAndParse<Result>(
+    query: string,
+    objectMetadataItem: ObjectMetadataInterface,
+    command: string,
+    workspaceId: string,
+  ): Promise<Result> {
+    const result = await this.execute(query, workspaceId);
+
+    return this.parseResult(result, objectMetadataItem, command);
+  }
+
+  async triggerWebhooks<Record>(
+    jobsData: Record[] | undefined,
+    operation: CallWebhookJobsJobOperation,
+    options: WorkspaceQueryRunnerOptions,
+  ) {
+    if (!Array.isArray(jobsData)) {
+      return;
+    }
+    jobsData.forEach((jobData) => {
+      this.messageQueueService.add<CallWebhookJobsJobData>(
+        CallWebhookJobsJob.name,
+        {
+          record: jobData,
+          workspaceId: options.workspaceId,
+          operation,
+          objectMetadataItem: options.objectMetadataItem,
+        },
+        { retryLimit: 3 },
+      );
+    });
+  }
+
+  async handleDeleteWorkspaceMember(
+    id: string,
+    workspaceId: string,
+    objectMetadataItem: ObjectMetadataInterface,
+  ) {
+    if (objectMetadataItem.nameSingular !== 'workspaceMember') {
+      return;
+    }
+
+    const workspaceMemberResult = await this.executeAndParse<IRecord>(
+      `
+      query {
+        workspaceMemberCollection(filter: {id: {eq: "${id}"}}) {
+          edges {
+            node {
+              userId: userId
+            }
+          }
+        }
+      }
+      `,
+      objectMetadataItem,
+      '',
+      workspaceId,
+    );
+
+    return workspaceMemberResult.edges?.[0]?.node;
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/constants/duplicate-criteria.constants.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/constants/duplicate-criteria.constants.ts
similarity index 87%
rename from packages/twenty-server/src/workspace/workspace-resolver-builder/constants/duplicate-criteria.constants.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/constants/duplicate-criteria.constants.ts
index e9abb45b14a2..1ca7d55dcce2 100644
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/constants/duplicate-criteria.constants.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/constants/duplicate-criteria.constants.ts
@@ -1,4 +1,4 @@
-import { RecordDuplicateCriteria } from 'src/workspace/workspace-query-builder/interfaces/record.interface';
+import { RecordDuplicateCriteria } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
 
 /**
  * objectName: directly reference the name of the object from the metadata tables.
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-many-resolver.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-many-resolver.factory.ts
new file mode 100644
index 000000000000..dc1942eccc19
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-many-resolver.factory.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  CreateManyResolverArgs,
+  Resolver,
+} from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
+import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
+
+import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+
+@Injectable()
+export class CreateManyResolverFactory
+  implements WorkspaceResolverBuilderFactoryInterface
+{
+  public static methodName = 'createMany' as const;
+
+  constructor(
+    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+  ) {}
+
+  create(
+    context: WorkspaceSchemaBuilderContext,
+  ): Resolver<CreateManyResolverArgs> {
+    const internalContext = context;
+
+    return (_source, args, context, info) => {
+      return this.workspaceQueryRunnerService.createMany(args, {
+        objectMetadataItem: internalContext.objectMetadataItem,
+        workspaceId: internalContext.workspaceId,
+        userId: internalContext.userId,
+        info,
+        fieldMetadataCollection: internalContext.fieldMetadataCollection,
+        objectMetadataCollection: internalContext.objectMetadataCollection,
+      });
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-one-resolver.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-one-resolver.factory.ts
new file mode 100644
index 000000000000..01583f0de9bd
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-one-resolver.factory.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  CreateOneResolverArgs,
+  Resolver,
+} from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
+import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
+
+import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+
+@Injectable()
+export class CreateOneResolverFactory
+  implements WorkspaceResolverBuilderFactoryInterface
+{
+  public static methodName = 'createOne' as const;
+
+  constructor(
+    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+  ) {}
+
+  create(
+    context: WorkspaceSchemaBuilderContext,
+  ): Resolver<CreateOneResolverArgs> {
+    const internalContext = context;
+
+    return (_source, args, context, info) => {
+      return this.workspaceQueryRunnerService.createOne(args, {
+        objectMetadataItem: internalContext.objectMetadataItem,
+        workspaceId: internalContext.workspaceId,
+        userId: internalContext.userId,
+        info,
+        fieldMetadataCollection: internalContext.fieldMetadataCollection,
+        objectMetadataCollection: internalContext.objectMetadataCollection,
+      });
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-many-resolver.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-many-resolver.factory.ts
new file mode 100644
index 000000000000..e74685bb12d7
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-many-resolver.factory.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  DeleteManyResolverArgs,
+  Resolver,
+} from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
+import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
+
+import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+
+@Injectable()
+export class DeleteManyResolverFactory
+  implements WorkspaceResolverBuilderFactoryInterface
+{
+  public static methodName = 'deleteMany' as const;
+
+  constructor(
+    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+  ) {}
+
+  create(
+    context: WorkspaceSchemaBuilderContext,
+  ): Resolver<DeleteManyResolverArgs> {
+    const internalContext = context;
+
+    return (_source, args, context, info) => {
+      return this.workspaceQueryRunnerService.deleteMany(args, {
+        objectMetadataItem: internalContext.objectMetadataItem,
+        workspaceId: internalContext.workspaceId,
+        userId: internalContext.userId,
+        info,
+        fieldMetadataCollection: internalContext.fieldMetadataCollection,
+        objectMetadataCollection: internalContext.objectMetadataCollection,
+      });
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-one-resolver.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-one-resolver.factory.ts
new file mode 100644
index 000000000000..f02676182915
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-one-resolver.factory.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  DeleteOneResolverArgs,
+  Resolver,
+} from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
+import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
+
+import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+
+@Injectable()
+export class DeleteOneResolverFactory
+  implements WorkspaceResolverBuilderFactoryInterface
+{
+  public static methodName = 'deleteOne' as const;
+
+  constructor(
+    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+  ) {}
+
+  create(
+    context: WorkspaceSchemaBuilderContext,
+  ): Resolver<DeleteOneResolverArgs> {
+    const internalContext = context;
+
+    return (_source, args, context, info) => {
+      return this.workspaceQueryRunnerService.deleteOne(args, {
+        objectMetadataItem: internalContext.objectMetadataItem,
+        workspaceId: internalContext.workspaceId,
+        userId: internalContext.userId,
+        info,
+        fieldMetadataCollection: internalContext.fieldMetadataCollection,
+        objectMetadataCollection: internalContext.objectMetadataCollection,
+      });
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/execute-quick-action-on-one-resolver.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/execute-quick-action-on-one-resolver.factory.ts
new file mode 100644
index 000000000000..3968ed760b3a
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/execute-quick-action-on-one-resolver.factory.ts
@@ -0,0 +1,76 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  Resolver,
+  FindOneResolverArgs,
+  ExecuteQuickActionOnOneResolverArgs,
+  DeleteOneResolverArgs,
+} from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { Record as IRecord } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
+import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
+import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
+
+import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+import { QuickActionsService } from 'src/engine/core-modules/quick-actions/quick-actions.service';
+
+@Injectable()
+export class ExecuteQuickActionOnOneResolverFactory
+  implements WorkspaceResolverBuilderFactoryInterface
+{
+  public static methodName = 'executeQuickActionOnOne' as const;
+
+  constructor(
+    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+    private readonly quickActionsService: QuickActionsService,
+  ) {}
+
+  create(
+    context: WorkspaceSchemaBuilderContext,
+  ): Resolver<ExecuteQuickActionOnOneResolverArgs> {
+    const internalContext = context;
+
+    return (_source, args, context, info) => {
+      return this.executeQuickActionOnOne(args, {
+        objectMetadataItem: internalContext.objectMetadataItem,
+        userId: internalContext.userId,
+        workspaceId: internalContext.workspaceId,
+        info,
+        fieldMetadataCollection: internalContext.fieldMetadataCollection,
+        objectMetadataCollection: internalContext.objectMetadataCollection,
+      });
+    };
+  }
+
+  private async executeQuickActionOnOne<Record extends IRecord = IRecord>(
+    args: DeleteOneResolverArgs,
+    options: WorkspaceQueryRunnerOptions,
+  ): Promise<Record | undefined> {
+    switch (options.objectMetadataItem.nameSingular) {
+      case 'company': {
+        await this.quickActionsService.executeQuickActionOnCompany(
+          args.id,
+          options.workspaceId,
+          options.objectMetadataItem,
+        );
+        break;
+      }
+      case 'person': {
+        await this.quickActionsService.createCompanyFromPerson(
+          args.id,
+          options.workspaceId,
+          options.objectMetadataCollection,
+        );
+        break;
+      }
+      default:
+        // TODO: different quick actions per object on frontend
+        break;
+    }
+
+    return this.workspaceQueryRunnerService.findOne(
+      { filter: { id: { eq: args.id } } } as FindOneResolverArgs,
+      options,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/factories.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/factories.ts
new file mode 100644
index 000000000000..9bd0f4432e7c
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/factories.ts
@@ -0,0 +1,41 @@
+import { UpdateManyResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/update-many-resolver.factory';
+
+import { FindDuplicatesResolverFactory } from './find-duplicates-resolver.factory';
+import { FindManyResolverFactory } from './find-many-resolver.factory';
+import { FindOneResolverFactory } from './find-one-resolver.factory';
+import { CreateManyResolverFactory } from './create-many-resolver.factory';
+import { CreateOneResolverFactory } from './create-one-resolver.factory';
+import { UpdateOneResolverFactory } from './update-one-resolver.factory';
+import { DeleteOneResolverFactory } from './delete-one-resolver.factory';
+import { DeleteManyResolverFactory } from './delete-many-resolver.factory';
+import { ExecuteQuickActionOnOneResolverFactory } from './execute-quick-action-on-one-resolver.factory';
+
+export const workspaceResolverBuilderFactories = [
+  FindManyResolverFactory,
+  FindOneResolverFactory,
+  FindDuplicatesResolverFactory,
+  CreateManyResolverFactory,
+  CreateOneResolverFactory,
+  UpdateOneResolverFactory,
+  DeleteOneResolverFactory,
+  ExecuteQuickActionOnOneResolverFactory,
+  UpdateManyResolverFactory,
+  DeleteManyResolverFactory,
+];
+
+export const workspaceResolverBuilderMethodNames = {
+  queries: [
+    FindManyResolverFactory.methodName,
+    FindOneResolverFactory.methodName,
+    FindDuplicatesResolverFactory.methodName,
+  ],
+  mutations: [
+    CreateManyResolverFactory.methodName,
+    CreateOneResolverFactory.methodName,
+    UpdateOneResolverFactory.methodName,
+    DeleteOneResolverFactory.methodName,
+    ExecuteQuickActionOnOneResolverFactory.methodName,
+    UpdateManyResolverFactory.methodName,
+    DeleteManyResolverFactory.methodName,
+  ],
+} as const;
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-duplicates-resolver.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-duplicates-resolver.factory.ts
new file mode 100644
index 000000000000..ee288c708efa
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-duplicates-resolver.factory.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  FindDuplicatesResolverArgs,
+  Resolver,
+} from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
+import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
+
+import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+
+@Injectable()
+export class FindDuplicatesResolverFactory
+  implements WorkspaceResolverBuilderFactoryInterface
+{
+  public static methodName = 'findDuplicates' as const;
+
+  constructor(
+    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+  ) {}
+
+  create(
+    context: WorkspaceSchemaBuilderContext,
+  ): Resolver<FindDuplicatesResolverArgs> {
+    const internalContext = context;
+
+    return (_source, args, context, info) => {
+      return this.workspaceQueryRunnerService.findDuplicates(args, {
+        objectMetadataItem: internalContext.objectMetadataItem,
+        workspaceId: internalContext.workspaceId,
+        userId: internalContext.userId,
+        info,
+        fieldMetadataCollection: internalContext.fieldMetadataCollection,
+        objectMetadataCollection: internalContext.objectMetadataCollection,
+      });
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-many-resolver.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-many-resolver.factory.ts
new file mode 100644
index 000000000000..deead28be2e0
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-many-resolver.factory.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  FindManyResolverArgs,
+  Resolver,
+} from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
+import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
+
+import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+
+@Injectable()
+export class FindManyResolverFactory
+  implements WorkspaceResolverBuilderFactoryInterface
+{
+  public static methodName = 'findMany' as const;
+
+  constructor(
+    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+  ) {}
+
+  create(
+    context: WorkspaceSchemaBuilderContext,
+  ): Resolver<FindManyResolverArgs> {
+    const internalContext = context;
+
+    return (_source, args, context, info) => {
+      return this.workspaceQueryRunnerService.findMany(args, {
+        objectMetadataItem: internalContext.objectMetadataItem,
+        workspaceId: internalContext.workspaceId,
+        userId: internalContext.userId,
+        info,
+        fieldMetadataCollection: internalContext.fieldMetadataCollection,
+        objectMetadataCollection: internalContext.objectMetadataCollection,
+      });
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-one-resolver.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-one-resolver.factory.ts
new file mode 100644
index 000000000000..1e8ce6d52da1
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-one-resolver.factory.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  FindOneResolverArgs,
+  Resolver,
+} from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
+import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
+
+import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+
+@Injectable()
+export class FindOneResolverFactory
+  implements WorkspaceResolverBuilderFactoryInterface
+{
+  public static methodName = 'findOne' as const;
+
+  constructor(
+    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+  ) {}
+
+  create(
+    context: WorkspaceSchemaBuilderContext,
+  ): Resolver<FindOneResolverArgs> {
+    const internalContext = context;
+
+    return (_source, args, context, info) => {
+      return this.workspaceQueryRunnerService.findOne(args, {
+        objectMetadataItem: internalContext.objectMetadataItem,
+        workspaceId: internalContext.workspaceId,
+        userId: internalContext.userId,
+        info,
+        fieldMetadataCollection: internalContext.fieldMetadataCollection,
+        objectMetadataCollection: internalContext.objectMetadataCollection,
+      });
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/update-many-resolver.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/update-many-resolver.factory.ts
new file mode 100644
index 000000000000..470f4e793531
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/update-many-resolver.factory.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  Resolver,
+  UpdateManyResolverArgs,
+} from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
+import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
+
+import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+
+@Injectable()
+export class UpdateManyResolverFactory
+  implements WorkspaceResolverBuilderFactoryInterface
+{
+  public static methodName = 'updateMany' as const;
+
+  constructor(
+    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+  ) {}
+
+  create(
+    context: WorkspaceSchemaBuilderContext,
+  ): Resolver<UpdateManyResolverArgs> {
+    const internalContext = context;
+
+    return (_source, args, context, info) => {
+      return this.workspaceQueryRunnerService.updateMany(args, {
+        objectMetadataItem: internalContext.objectMetadataItem,
+        workspaceId: internalContext.workspaceId,
+        userId: internalContext.userId,
+        info,
+        fieldMetadataCollection: internalContext.fieldMetadataCollection,
+        objectMetadataCollection: internalContext.objectMetadataCollection,
+      });
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/update-one-resolver.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/update-one-resolver.factory.ts
new file mode 100644
index 000000000000..0851c54c8007
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/update-one-resolver.factory.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  Resolver,
+  UpdateOneResolverArgs,
+} from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
+import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
+
+import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+
+@Injectable()
+export class UpdateOneResolverFactory
+  implements WorkspaceResolverBuilderFactoryInterface
+{
+  public static methodName = 'updateOne' as const;
+
+  constructor(
+    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+  ) {}
+
+  create(
+    context: WorkspaceSchemaBuilderContext,
+  ): Resolver<UpdateOneResolverArgs> {
+    const internalContext = context;
+
+    return (_source, args, context, info) => {
+      return this.workspaceQueryRunnerService.updateOne(args, {
+        objectMetadataItem: internalContext.objectMetadataItem,
+        workspaceId: internalContext.workspaceId,
+        userId: internalContext.userId,
+        info,
+        fieldMetadataCollection: internalContext.fieldMetadataCollection,
+        objectMetadataCollection: internalContext.objectMetadataCollection,
+      });
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/pg-graphql.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/pg-graphql.interface.ts
new file mode 100644
index 000000000000..4a3f3e13fa13
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/pg-graphql.interface.ts
@@ -0,0 +1,14 @@
+import { Record as IRecord } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
+
+export interface PGGraphQLResponse<Data = any> {
+  resolve: {
+    data: Data;
+  };
+}
+
+export type PGGraphQLResult<Data = any> = [PGGraphQLResponse<Data>];
+
+export interface PGGraphQLMutation<Record = IRecord> {
+  affectedRows: number;
+  records: Record[];
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface.ts
new file mode 100644
index 000000000000..709e99ff76b7
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface.ts
@@ -0,0 +1,7 @@
+import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
+
+import { Resolver } from './workspace-resolvers-builder.interface';
+
+export interface WorkspaceResolverBuilderFactoryInterface {
+  create(context: WorkspaceSchemaBuilderContext): Resolver;
+}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts
similarity index 90%
rename from packages/twenty-server/src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts
index 66675ee6b1d5..20cae32749e8 100644
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts
@@ -4,9 +4,9 @@ import {
   Record,
   RecordFilter,
   RecordOrderBy,
-} from 'src/workspace/workspace-query-builder/interfaces/record.interface';
+} from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
 
-import { workspaceResolverBuilderMethodNames } from 'src/workspace/workspace-resolver-builder/factories/factories';
+import { workspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/factories/factories';
 
 export type Resolver<Args = any> = GraphQLFieldResolver<any, any, Args>;
 
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/workspace-resolver-builder.module.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/workspace-resolver-builder.module.ts
new file mode 100644
index 000000000000..85a84f17a647
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/workspace-resolver-builder.module.ts
@@ -0,0 +1,15 @@
+import { Module } from '@nestjs/common';
+
+import { WorkspaceQueryRunnerModule } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module';
+import { QuickActionsModule } from 'src/engine/core-modules/quick-actions/quick-actions.module';
+
+import { WorkspaceResolverFactory } from './workspace-resolver.factory';
+
+import { workspaceResolverBuilderFactories } from './factories/factories';
+
+@Module({
+  imports: [WorkspaceQueryRunnerModule, QuickActionsModule],
+  providers: [...workspaceResolverBuilderFactories, WorkspaceResolverFactory],
+  exports: [WorkspaceResolverFactory],
+})
+export class WorkspaceResolverBuilderModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/workspace-resolver.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory.ts
similarity index 88%
rename from packages/twenty-server/src/workspace/workspace-resolver-builder/workspace-resolver.factory.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory.ts
index ff955425e2ad..a0071bea7bbc 100644
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/workspace-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory.ts
@@ -2,12 +2,12 @@ import { Injectable, Logger } from '@nestjs/common';
 
 import { IResolvers } from '@graphql-tools/utils';
 
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
-import { getResolverName } from 'src/workspace/utils/get-resolver-name.util';
-import { UpdateManyResolverFactory } from 'src/workspace/workspace-resolver-builder/factories/update-many-resolver.factory';
-import { DeleteManyResolverFactory } from 'src/workspace/workspace-resolver-builder/factories/delete-many-resolver.factory';
-import { ExecuteQuickActionOnOneResolverFactory } from 'src/workspace/workspace-resolver-builder/factories/execute-quick-action-on-one-resolver.factory';
+import { getResolverName } from 'src/engine/utils/get-resolver-name.util';
+import { UpdateManyResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/update-many-resolver.factory';
+import { DeleteManyResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/delete-many-resolver.factory';
+import { ExecuteQuickActionOnOneResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/execute-quick-action-on-one-resolver.factory';
 
 import { FindDuplicatesResolverFactory } from './factories/find-duplicates-resolver.factory';
 import { FindManyResolverFactory } from './factories/find-many-resolver.factory';
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/args.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/args.factory.ts
similarity index 82%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/factories/args.factory.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/args.factory.ts
index 646f31ce0730..7f316119cc21 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/args.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/args.factory.ts
@@ -2,11 +2,11 @@ import { Injectable, Logger } from '@nestjs/common';
 
 import { GraphQLFieldConfigArgumentMap } from 'graphql';
 
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { ArgsMetadata } from 'src/workspace/workspace-schema-builder/interfaces/param-metadata.interface';
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+import { ArgsMetadata } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/param-metadata.interface';
 
-import { TypeDefinitionsStorage } from 'src/workspace/workspace-schema-builder/storages/type-definitions.storage';
-import { TypeMapperService } from 'src/workspace/workspace-schema-builder/services/type-mapper.service';
+import { TypeDefinitionsStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage';
+import { TypeMapperService } from 'src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service';
 
 @Injectable()
 export class ArgsFactory {
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-input-type-definition.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-input-type-definition.factory.ts
new file mode 100644
index 000000000000..c12124007133
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-input-type-definition.factory.ts
@@ -0,0 +1,84 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { GraphQLInputFieldConfigMap, GraphQLInputObjectType } from 'graphql';
+
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+
+import { pascalCase } from 'src/utils/pascal-case';
+import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  InputTypeDefinition,
+  InputTypeDefinitionKind,
+} from 'src/engine/api/graphql/workspace-schema-builder/factories/input-type-definition.factory';
+
+import { InputTypeFactory } from './input-type.factory';
+
+@Injectable()
+export class CompositeInputTypeDefinitionFactory {
+  private readonly logger = new Logger(
+    CompositeInputTypeDefinitionFactory.name,
+  );
+  constructor(private readonly inputTypeFactory: InputTypeFactory) {}
+
+  public create(
+    compositeType: CompositeType,
+    kind: InputTypeDefinitionKind,
+    options: WorkspaceBuildSchemaOptions,
+  ): InputTypeDefinition {
+    const name = pascalCase(compositeType.type.toString().toLowerCase());
+
+    return {
+      target: compositeType.type.toString(),
+      kind,
+      type: new GraphQLInputObjectType({
+        name: `${pascalCase(name)}${kind.toString()}Input`,
+        fields: this.generateFields(compositeType, kind, options),
+      }),
+    };
+  }
+
+  private generateFields(
+    compositeType: CompositeType,
+    kind: InputTypeDefinitionKind,
+    options: WorkspaceBuildSchemaOptions,
+  ): GraphQLInputFieldConfigMap {
+    const fields: GraphQLInputFieldConfigMap = {};
+
+    for (const property of compositeType.properties) {
+      // Relation fields are not supported in composite types
+      if (isRelationFieldMetadataType(property.type)) {
+        this.logger.error(
+          'Relation fields are not supported in composite types',
+          { compositeType, property },
+        );
+
+        throw new Error('Relation fields are not supported in composite types');
+      }
+
+      // Skip hidden fields
+      if (property.hidden === true || property.hidden === 'input') {
+        continue;
+      }
+
+      const type = this.inputTypeFactory.create(
+        property.name,
+        property.type,
+        kind,
+        options,
+        {
+          nullable: !property.isRequired,
+          isArray: property.type === FieldMetadataType.MULTI_SELECT,
+        },
+      );
+
+      fields[property.name] = {
+        type,
+        description: property.description,
+      };
+    }
+
+    return fields;
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-object-type-definition.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-object-type-definition.factory.ts
new file mode 100644
index 000000000000..e39da0ae3435
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-object-type-definition.factory.ts
@@ -0,0 +1,84 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { GraphQLFieldConfigMap, GraphQLObjectType } from 'graphql';
+
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+
+import { pascalCase } from 'src/utils/pascal-case';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { OutputTypeFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/output-type.factory';
+import {
+  ObjectTypeDefinition,
+  ObjectTypeDefinitionKind,
+} from 'src/engine/api/graphql/workspace-schema-builder/factories/object-type-definition.factory';
+import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
+
+@Injectable()
+export class CompositeObjectTypeDefinitionFactory {
+  private readonly logger = new Logger(
+    CompositeObjectTypeDefinitionFactory.name,
+  );
+
+  constructor(private readonly outputTypeFactory: OutputTypeFactory) {}
+
+  public create(
+    compositeType: CompositeType,
+    options: WorkspaceBuildSchemaOptions,
+  ): ObjectTypeDefinition {
+    const name = pascalCase(compositeType.type.toString().toLowerCase());
+    const kind = ObjectTypeDefinitionKind.Plain;
+
+    return {
+      target: compositeType.type.toString(),
+      kind,
+      type: new GraphQLObjectType({
+        name: `${name}${kind.toString()}`,
+        fields: this.generateFields(compositeType, kind, options),
+      }),
+    };
+  }
+
+  private generateFields(
+    compositeType: CompositeType,
+    kind: ObjectTypeDefinitionKind,
+    options: WorkspaceBuildSchemaOptions,
+  ): GraphQLFieldConfigMap<any, any> {
+    const fields: GraphQLFieldConfigMap<any, any> = {};
+
+    for (const property of compositeType.properties) {
+      // Relation fields are not supported in composite types
+      if (isRelationFieldMetadataType(property.type)) {
+        this.logger.error(
+          'Relation fields are not supported in composite types',
+          { compositeType, property },
+        );
+
+        throw new Error('Relation fields are not supported in composite types');
+      }
+
+      // Skip hidden fields
+      if (property.hidden === true || property.hidden === 'output') {
+        continue;
+      }
+
+      const type = this.outputTypeFactory.create(
+        property.name,
+        property.type,
+        kind,
+        options,
+        {
+          nullable: !property.isRequired,
+          isArray: property.type === FieldMetadataType.MULTI_SELECT,
+        },
+      );
+
+      fields[property.name] = {
+        type,
+        description: property.description,
+      };
+    }
+
+    return fields;
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/connection-type-definition.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/connection-type-definition.factory.ts
similarity index 88%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/factories/connection-type-definition.factory.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/connection-type-definition.factory.ts
index 5d40ca1dbb2c..e309d4c38421 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/connection-type-definition.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/connection-type-definition.factory.ts
@@ -2,8 +2,8 @@ import { Injectable, Logger } from '@nestjs/common';
 
 import { GraphQLFieldConfigMap, GraphQLInt, GraphQLObjectType } from 'graphql';
 
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
 import { pascalCase } from 'src/utils/pascal-case';
 
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/connection-type.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/connection-type.factory.ts
new file mode 100644
index 000000000000..d6400e7cb0d8
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/connection-type.factory.ts
@@ -0,0 +1,58 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { GraphQLOutputType } from 'graphql';
+
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import {
+  TypeMapperService,
+  TypeOptions,
+} from 'src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service';
+import { TypeDefinitionsStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage';
+import { PageInfoType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/object';
+
+import { ConnectionTypeDefinitionKind } from './connection-type-definition.factory';
+import { ObjectTypeDefinitionKind } from './object-type-definition.factory';
+
+@Injectable()
+export class ConnectionTypeFactory {
+  private readonly logger = new Logger(ConnectionTypeFactory.name);
+
+  constructor(
+    private readonly typeMapperService: TypeMapperService,
+    private readonly typeDefinitionsStorage: TypeDefinitionsStorage,
+  ) {}
+
+  public create(
+    objectMetadata: ObjectMetadataInterface,
+    kind: ConnectionTypeDefinitionKind,
+    buildOtions: WorkspaceBuildSchemaOptions,
+    typeOptions: TypeOptions,
+  ): GraphQLOutputType {
+    if (kind === ConnectionTypeDefinitionKind.PageInfo) {
+      return this.typeMapperService.mapToGqlType(PageInfoType, typeOptions);
+    }
+
+    const edgeType = this.typeDefinitionsStorage.getObjectTypeByKey(
+      objectMetadata.id,
+      kind as unknown as ObjectTypeDefinitionKind,
+    );
+
+    if (!edgeType) {
+      this.logger.error(
+        `Edge type for ${objectMetadata.nameSingular} was not found. Please, check if you have defined it.`,
+        {
+          objectMetadata,
+          buildOtions,
+        },
+      );
+
+      throw new Error(
+        `Edge type for ${objectMetadata.nameSingular} was not found. Please, check if you have defined it.`,
+      );
+    }
+
+    return this.typeMapperService.mapToGqlType(edgeType, typeOptions);
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/edge-type-definition.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/edge-type-definition.factory.ts
similarity index 86%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/factories/edge-type-definition.factory.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/edge-type-definition.factory.ts
index 5cecd9320b10..154684e97a34 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/edge-type-definition.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/edge-type-definition.factory.ts
@@ -2,8 +2,8 @@ import { Injectable, Logger } from '@nestjs/common';
 
 import { GraphQLFieldConfigMap, GraphQLObjectType } from 'graphql';
 
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
 import { pascalCase } from 'src/utils/pascal-case';
 
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/edge-type.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/edge-type.factory.ts
new file mode 100644
index 000000000000..30ddfd0166a9
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/edge-type.factory.ts
@@ -0,0 +1,58 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { GraphQLOutputType } from 'graphql';
+
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import {
+  TypeMapperService,
+  TypeOptions,
+} from 'src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service';
+import { TypeDefinitionsStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage';
+import { CursorScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+import { ObjectTypeDefinitionKind } from './object-type-definition.factory';
+import { EdgeTypeDefinitionKind } from './edge-type-definition.factory';
+
+@Injectable()
+export class EdgeTypeFactory {
+  private readonly logger = new Logger(EdgeTypeFactory.name);
+
+  constructor(
+    private readonly typeMapperService: TypeMapperService,
+    private readonly typeDefinitionsStorage: TypeDefinitionsStorage,
+  ) {}
+
+  public create(
+    objectMetadata: ObjectMetadataInterface,
+    kind: EdgeTypeDefinitionKind,
+    buildOtions: WorkspaceBuildSchemaOptions,
+    typeOptions: TypeOptions,
+  ): GraphQLOutputType {
+    if (kind === EdgeTypeDefinitionKind.Cursor) {
+      return this.typeMapperService.mapToGqlType(CursorScalarType, typeOptions);
+    }
+
+    const objectType = this.typeDefinitionsStorage.getObjectTypeByKey(
+      objectMetadata.id,
+      ObjectTypeDefinitionKind.Plain,
+    );
+
+    if (!objectType) {
+      this.logger.error(
+        `Node type for ${objectMetadata.nameSingular} was not found. Please, check if you have defined it.`,
+        {
+          objectMetadata,
+          buildOtions,
+        },
+      );
+
+      throw new Error(
+        `Node type for ${objectMetadata.nameSingular} was not found. Please, check if you have defined it.`,
+      );
+    }
+
+    return this.typeMapperService.mapToGqlType(objectType, typeOptions);
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/enum-type-definition.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/enum-type-definition.factory.ts
similarity index 79%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/factories/enum-type-definition.factory.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/enum-type-definition.factory.ts
index 778a5f74e6a4..de77733d6151 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/enum-type-definition.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/enum-type-definition.factory.ts
@@ -2,16 +2,16 @@ import { Injectable, Logger } from '@nestjs/common';
 
 import { GraphQLEnumType } from 'graphql';
 
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 
 import { pascalCase } from 'src/utils/pascal-case';
 import {
   FieldMetadataComplexOption,
   FieldMetadataDefaultOption,
-} from 'src/metadata/field-metadata/dtos/options.input';
-import { isEnumFieldMetadataType } from 'src/metadata/field-metadata/utils/is-enum-field-metadata-type.util';
+} from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
+import { isEnumFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util';
 
 export interface EnumTypeDefinition {
   target: string;
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/extend-object-type-definition.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/extend-object-type-definition.factory.ts
similarity index 82%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/factories/extend-object-type-definition.factory.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/extend-object-type-definition.factory.ts
index f288a74b3e97..1e2b9c5634e7 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/extend-object-type-definition.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/extend-object-type-definition.factory.ts
@@ -6,18 +6,18 @@ import {
   GraphQLObjectType,
 } from 'graphql';
 
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
-import { TypeDefinitionsStorage } from 'src/workspace/workspace-schema-builder/storages/type-definitions.storage';
-import { objectContainsRelationField } from 'src/workspace/workspace-schema-builder/utils/object-contains-relation-field';
-import { getResolverArgs } from 'src/workspace/workspace-schema-builder/utils/get-resolver-args.util';
-import { isRelationFieldMetadataType } from 'src/workspace/utils/is-relation-field-metadata-type.util';
+import { TypeDefinitionsStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage';
+import { objectContainsRelationField } from 'src/engine/api/graphql/workspace-schema-builder/utils/object-contains-relation-field';
+import { getResolverArgs } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util';
+import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
 import {
   RelationDirection,
   deduceRelationDirection,
-} from 'src/workspace/utils/deduce-relation-direction.util';
-import { RelationMetadataType } from 'src/metadata/relation-metadata/relation-metadata.entity';
+} from 'src/engine/utils/deduce-relation-direction.util';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 
 import { RelationTypeFactory } from './relation-type.factory';
 import { ArgsFactory } from './args.factory';
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/factories.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/factories.ts
new file mode 100644
index 000000000000..eed7d7d43aa9
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/factories.ts
@@ -0,0 +1,40 @@
+import { EnumTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/enum-type-definition.factory';
+import { CompositeObjectTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/composite-object-type-definition.factory';
+import { CompositeInputTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/composite-input-type-definition.factory';
+
+import { ArgsFactory } from './args.factory';
+import { InputTypeFactory } from './input-type.factory';
+import { InputTypeDefinitionFactory } from './input-type-definition.factory';
+import { ObjectTypeDefinitionFactory } from './object-type-definition.factory';
+import { OutputTypeFactory } from './output-type.factory';
+import { QueryTypeFactory } from './query-type.factory';
+import { RootTypeFactory } from './root-type.factory';
+import { ConnectionTypeFactory } from './connection-type.factory';
+import { ConnectionTypeDefinitionFactory } from './connection-type-definition.factory';
+import { EdgeTypeFactory } from './edge-type.factory';
+import { EdgeTypeDefinitionFactory } from './edge-type-definition.factory';
+import { MutationTypeFactory } from './mutation-type.factory';
+import { RelationTypeFactory } from './relation-type.factory';
+import { ExtendObjectTypeDefinitionFactory } from './extend-object-type-definition.factory';
+import { OrphanedTypesFactory } from './orphaned-types.factory';
+
+export const workspaceSchemaBuilderFactories = [
+  ArgsFactory,
+  InputTypeFactory,
+  InputTypeDefinitionFactory,
+  CompositeInputTypeDefinitionFactory,
+  OutputTypeFactory,
+  ObjectTypeDefinitionFactory,
+  CompositeObjectTypeDefinitionFactory,
+  EnumTypeDefinitionFactory,
+  RelationTypeFactory,
+  ExtendObjectTypeDefinitionFactory,
+  ConnectionTypeFactory,
+  ConnectionTypeDefinitionFactory,
+  EdgeTypeFactory,
+  EdgeTypeDefinitionFactory,
+  RootTypeFactory,
+  QueryTypeFactory,
+  MutationTypeFactory,
+  OrphanedTypesFactory,
+];
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/input-type-definition.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/input-type-definition.factory.ts
new file mode 100644
index 000000000000..183a419037a1
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/input-type-definition.factory.ts
@@ -0,0 +1,125 @@
+import { Inject, Injectable, forwardRef } from '@nestjs/common';
+
+import { GraphQLInputFieldConfigMap, GraphQLInputObjectType } from 'graphql';
+
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import { pascalCase } from 'src/utils/pascal-case';
+import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
+import { TypeMapperService } from 'src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service';
+
+import { InputTypeFactory } from './input-type.factory';
+
+export enum InputTypeDefinitionKind {
+  Create = 'Create',
+  Update = 'Update',
+  Filter = 'Filter',
+  OrderBy = 'OrderBy',
+}
+
+export interface InputTypeDefinition {
+  target: string;
+  kind: InputTypeDefinitionKind;
+  type: GraphQLInputObjectType;
+}
+
+@Injectable()
+export class InputTypeDefinitionFactory {
+  constructor(
+    @Inject(forwardRef(() => InputTypeFactory))
+    private readonly inputTypeFactory: InputTypeFactory,
+    private readonly typeMapperService: TypeMapperService,
+  ) {}
+
+  public create(
+    objectMetadata: ObjectMetadataInterface,
+    kind: InputTypeDefinitionKind,
+    options: WorkspaceBuildSchemaOptions,
+  ): InputTypeDefinition {
+    const inputType = new GraphQLInputObjectType({
+      name: `${pascalCase(objectMetadata.nameSingular)}${kind.toString()}Input`,
+      description: objectMetadata.description,
+      fields: () => {
+        switch (kind) {
+          /**
+           * Filter input type has additional fields for filtering and is self referencing
+           */
+          case InputTypeDefinitionKind.Filter: {
+            const andOrType = this.typeMapperService.mapToGqlType(inputType, {
+              isArray: true,
+              arrayDepth: 1,
+              nullable: true,
+            });
+
+            return {
+              ...this.generateFields(objectMetadata, kind, options),
+              and: {
+                type: andOrType,
+              },
+              or: {
+                type: andOrType,
+              },
+              not: {
+                type: this.typeMapperService.mapToGqlType(inputType, {
+                  nullable: true,
+                }),
+              },
+            };
+          }
+          /**
+           * Other input types are generated with fields only
+           */
+          default:
+            return this.generateFields(objectMetadata, kind, options);
+        }
+      },
+    });
+
+    return {
+      target: objectMetadata.id,
+      kind,
+      type: inputType,
+    };
+  }
+
+  private generateFields(
+    objectMetadata: ObjectMetadataInterface,
+    kind: InputTypeDefinitionKind,
+    options: WorkspaceBuildSchemaOptions,
+  ): GraphQLInputFieldConfigMap {
+    const fields: GraphQLInputFieldConfigMap = {};
+
+    for (const fieldMetadata of objectMetadata.fields) {
+      // Relation field types are generated during extension of object type definition
+      if (isRelationFieldMetadataType(fieldMetadata.type)) {
+        continue;
+      }
+
+      const target = isCompositeFieldMetadataType(fieldMetadata.type)
+        ? fieldMetadata.type.toString()
+        : fieldMetadata.id;
+
+      const type = this.inputTypeFactory.create(
+        target,
+        fieldMetadata.type,
+        kind,
+        options,
+        {
+          nullable: fieldMetadata.isNullable,
+          defaultValue: fieldMetadata.defaultValue,
+          isArray: fieldMetadata.type === FieldMetadataType.MULTI_SELECT,
+        },
+      );
+
+      fields[fieldMetadata.name] = {
+        type,
+        description: fieldMetadata.description,
+      };
+    }
+
+    return fields;
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/input-type.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/input-type.factory.ts
new file mode 100644
index 000000000000..1449a59fc77f
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/input-type.factory.ts
@@ -0,0 +1,110 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { GraphQLInputObjectType, GraphQLInputType, GraphQLList } from 'graphql';
+
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+
+import {
+  TypeMapperService,
+  TypeOptions,
+} from 'src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service';
+import { TypeDefinitionsStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FilterIs } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input/filter-is.input-type';
+import { isEnumFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util';
+
+import { InputTypeDefinitionKind } from './input-type-definition.factory';
+
+@Injectable()
+export class InputTypeFactory {
+  private readonly logger = new Logger(InputTypeFactory.name);
+
+  constructor(
+    private readonly typeMapperService: TypeMapperService,
+    private readonly typeDefinitionsStorage: TypeDefinitionsStorage,
+  ) {}
+
+  public create(
+    target: string,
+    type: FieldMetadataType,
+    kind: InputTypeDefinitionKind,
+    buildOptions: WorkspaceBuildSchemaOptions,
+    typeOptions: TypeOptions,
+  ): GraphQLInputType {
+    let inputType: GraphQLInputType | undefined;
+
+    switch (kind) {
+      /**
+       * Create and Update input types are classic scalar types
+       */
+      case InputTypeDefinitionKind.Create:
+      case InputTypeDefinitionKind.Update:
+        inputType = this.typeMapperService.mapToScalarType(
+          type,
+          buildOptions.dateScalarMode,
+          buildOptions.numberScalarMode,
+        );
+        break;
+      /**
+       * Filter input maps to special filter type
+       */
+      case InputTypeDefinitionKind.Filter: {
+        if (isEnumFieldMetadataType(type)) {
+          inputType = this.createEnumFilterType(target);
+        } else {
+          inputType = this.typeMapperService.mapToFilterType(
+            type,
+            buildOptions.dateScalarMode,
+            buildOptions.numberScalarMode,
+          );
+        }
+
+        break;
+      }
+      /**
+       * OrderBy input maps to special order by type
+       */
+      case InputTypeDefinitionKind.OrderBy:
+        inputType = this.typeMapperService.mapToOrderByType(type);
+        break;
+    }
+
+    /**
+     * If input type is not scalar, we're looking for it in the type definitions storage as it can be an object type
+     */
+    inputType ??= this.typeDefinitionsStorage.getInputTypeByKey(target, kind);
+
+    if (!inputType) {
+      this.logger.error(`Could not find a GraphQL type for ${target}`, {
+        type,
+        kind,
+        buildOptions,
+        typeOptions,
+      });
+
+      throw new Error(`Could not find a GraphQL type for ${target}`);
+    }
+
+    return this.typeMapperService.mapToGqlType(inputType, typeOptions);
+  }
+
+  private createEnumFilterType(target: string): GraphQLInputObjectType {
+    const enumType = this.typeDefinitionsStorage.getEnumTypeByKey(target);
+
+    if (!enumType) {
+      this.logger.error(`Could not find a GraphQL enum type for ${target}`);
+
+      throw new Error(`Could not find a GraphQL enum type for ${target}`);
+    }
+
+    return new GraphQLInputObjectType({
+      name: `${enumType.name}Filter`,
+      fields: () => ({
+        eq: { type: enumType },
+        neq: { type: enumType },
+        in: { type: new GraphQLList(enumType) },
+        is: { type: FilterIs },
+      }),
+    });
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/mutation-type.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/mutation-type.factory.ts
new file mode 100644
index 000000000000..b19e73898b18
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/mutation-type.factory.ts
@@ -0,0 +1,27 @@
+import { Injectable } from '@nestjs/common';
+
+import { GraphQLObjectType } from 'graphql';
+
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+import { WorkspaceResolverBuilderMutationMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import { ObjectTypeName, RootTypeFactory } from './root-type.factory';
+
+@Injectable()
+export class MutationTypeFactory {
+  constructor(private readonly rootTypeFactory: RootTypeFactory) {}
+
+  create(
+    objectMetadataCollection: ObjectMetadataInterface[],
+    workspaceResolverMethodNames: WorkspaceResolverBuilderMutationMethodNames[],
+    options: WorkspaceBuildSchemaOptions,
+  ): GraphQLObjectType {
+    return this.rootTypeFactory.create(
+      objectMetadataCollection,
+      workspaceResolverMethodNames,
+      ObjectTypeName.Mutation,
+      options,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/object-type-definition.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/object-type-definition.factory.ts
new file mode 100644
index 000000000000..e0e078fe1c1e
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/object-type-definition.factory.ts
@@ -0,0 +1,83 @@
+import { Injectable } from '@nestjs/common';
+
+import { GraphQLFieldConfigMap, GraphQLObjectType } from 'graphql';
+
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import { pascalCase } from 'src/utils/pascal-case';
+import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
+
+import { OutputTypeFactory } from './output-type.factory';
+
+export enum ObjectTypeDefinitionKind {
+  Connection = 'Connection',
+  Edge = 'Edge',
+  Plain = '',
+}
+
+export interface ObjectTypeDefinition {
+  target: string;
+  kind: ObjectTypeDefinitionKind;
+  type: GraphQLObjectType;
+}
+
+@Injectable()
+export class ObjectTypeDefinitionFactory {
+  constructor(private readonly outputTypeFactory: OutputTypeFactory) {}
+
+  public create(
+    objectMetadata: ObjectMetadataInterface,
+    kind: ObjectTypeDefinitionKind,
+    options: WorkspaceBuildSchemaOptions,
+  ): ObjectTypeDefinition {
+    return {
+      target: objectMetadata.id,
+      kind,
+      type: new GraphQLObjectType({
+        name: `${pascalCase(objectMetadata.nameSingular)}${kind.toString()}`,
+        description: objectMetadata.description,
+        fields: this.generateFields(objectMetadata, kind, options),
+      }),
+    };
+  }
+
+  private generateFields(
+    objectMetadata: ObjectMetadataInterface,
+    kind: ObjectTypeDefinitionKind,
+    options: WorkspaceBuildSchemaOptions,
+  ): GraphQLFieldConfigMap<any, any> {
+    const fields: GraphQLFieldConfigMap<any, any> = {};
+
+    for (const fieldMetadata of objectMetadata.fields) {
+      // Relation field types are generated during extension of object type definition
+      if (isRelationFieldMetadataType(fieldMetadata.type)) {
+        continue;
+      }
+
+      const target = isCompositeFieldMetadataType(fieldMetadata.type)
+        ? fieldMetadata.type.toString()
+        : fieldMetadata.id;
+
+      const type = this.outputTypeFactory.create(
+        target,
+        fieldMetadata.type,
+        kind,
+        options,
+        {
+          nullable: fieldMetadata.isNullable,
+          isArray: fieldMetadata.type === FieldMetadataType.MULTI_SELECT,
+        },
+      );
+
+      fields[fieldMetadata.name] = {
+        type,
+        description: fieldMetadata.description,
+      };
+    }
+
+    return fields;
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/orphaned-types.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/orphaned-types.factory.ts
similarity index 82%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/factories/orphaned-types.factory.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/orphaned-types.factory.ts
index 72e767a4b893..4cb29d234e42 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/orphaned-types.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/orphaned-types.factory.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 import { GraphQLNamedType } from 'graphql';
 
-import { TypeDefinitionsStorage } from 'src/workspace/workspace-schema-builder/storages/type-definitions.storage';
+import { TypeDefinitionsStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage';
 
 @Injectable()
 export class OrphanedTypesFactory {
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/output-type.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/output-type.factory.ts
new file mode 100644
index 000000000000..425bee70d06a
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/output-type.factory.ts
@@ -0,0 +1,53 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { GraphQLOutputType } from 'graphql';
+
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+
+import {
+  TypeMapperService,
+  TypeOptions,
+} from 'src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service';
+import { TypeDefinitionsStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+import { ObjectTypeDefinitionKind } from './object-type-definition.factory';
+
+@Injectable()
+export class OutputTypeFactory {
+  private readonly logger = new Logger(OutputTypeFactory.name);
+
+  constructor(
+    private readonly typeMapperService: TypeMapperService,
+    private readonly typeDefinitionsStorage: TypeDefinitionsStorage,
+  ) {}
+
+  public create(
+    target: string,
+    type: FieldMetadataType,
+    kind: ObjectTypeDefinitionKind,
+    buildOtions: WorkspaceBuildSchemaOptions,
+    typeOptions: TypeOptions,
+  ): GraphQLOutputType {
+    let gqlType: GraphQLOutputType | undefined =
+      this.typeMapperService.mapToScalarType(
+        type,
+        buildOtions.dateScalarMode,
+        buildOtions.numberScalarMode,
+      );
+
+    gqlType ??= this.typeDefinitionsStorage.getOutputTypeByKey(target, kind);
+
+    if (!gqlType) {
+      this.logger.error(`Could not find a GraphQL type for ${target}`, {
+        type,
+        buildOtions,
+        typeOptions,
+      });
+
+      throw new Error(`Could not find a GraphQL type for ${target}`);
+    }
+
+    return this.typeMapperService.mapToGqlType(gqlType, typeOptions);
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/query-type.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/query-type.factory.ts
new file mode 100644
index 000000000000..59ce2e0f455f
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/query-type.factory.ts
@@ -0,0 +1,27 @@
+import { Injectable } from '@nestjs/common';
+
+import { GraphQLObjectType } from 'graphql';
+
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+import { WorkspaceResolverBuilderQueryMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import { ObjectTypeName, RootTypeFactory } from './root-type.factory';
+
+@Injectable()
+export class QueryTypeFactory {
+  constructor(private readonly rootTypeFactory: RootTypeFactory) {}
+
+  create(
+    objectMetadataCollection: ObjectMetadataInterface[],
+    workspaceResolverMethodNames: WorkspaceResolverBuilderQueryMethodNames[],
+    options: WorkspaceBuildSchemaOptions,
+  ): GraphQLObjectType {
+    return this.rootTypeFactory.create(
+      objectMetadataCollection,
+      workspaceResolverMethodNames,
+      ObjectTypeName.Query,
+      options,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/relation-type.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/relation-type.factory.ts
new file mode 100644
index 000000000000..2c5fbea0bba1
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/relation-type.factory.ts
@@ -0,0 +1,62 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { GraphQLOutputType } from 'graphql';
+
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+import { RelationMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-metadata.interface';
+
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { TypeDefinitionsStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage';
+import { RelationDirection } from 'src/engine/utils/deduce-relation-direction.util';
+
+import { ObjectTypeDefinitionKind } from './object-type-definition.factory';
+
+@Injectable()
+export class RelationTypeFactory {
+  private readonly logger = new Logger(RelationTypeFactory.name);
+
+  constructor(
+    private readonly typeDefinitionsStorage: TypeDefinitionsStorage,
+  ) {}
+
+  public create(
+    fieldMetadata: FieldMetadataInterface,
+    relationMetadata: RelationMetadataInterface,
+    relationDirection: RelationDirection,
+  ): GraphQLOutputType {
+    let relationQqlType: GraphQLOutputType | undefined = undefined;
+
+    if (
+      relationDirection === RelationDirection.FROM &&
+      relationMetadata.relationType === RelationMetadataType.ONE_TO_MANY
+    ) {
+      relationQqlType = this.typeDefinitionsStorage.getObjectTypeByKey(
+        relationMetadata.toObjectMetadataId,
+        ObjectTypeDefinitionKind.Connection,
+      );
+    } else {
+      const relationObjectId =
+        relationDirection === RelationDirection.FROM
+          ? relationMetadata.toObjectMetadataId
+          : relationMetadata.fromObjectMetadataId;
+
+      relationQqlType = this.typeDefinitionsStorage.getObjectTypeByKey(
+        relationObjectId,
+        ObjectTypeDefinitionKind.Plain,
+      );
+    }
+
+    if (!relationQqlType) {
+      this.logger.error(
+        `Could not find a relation type for ${fieldMetadata.id}`,
+        {
+          fieldMetadata,
+        },
+      );
+
+      throw new Error(`Could not find a relation type for ${fieldMetadata.id}`);
+    }
+
+    return relationQqlType;
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/root-type.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/root-type.factory.ts
similarity index 79%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/factories/root-type.factory.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/root-type.factory.ts
index d7fd5e627def..66a031420ab8 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/root-type.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/root-type.factory.ts
@@ -2,14 +2,14 @@ import { Injectable, Logger } from '@nestjs/common';
 
 import { GraphQLFieldConfigMap, GraphQLObjectType } from 'graphql';
 
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { WorkspaceResolverBuilderMethodNames } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-import { TypeDefinitionsStorage } from 'src/workspace/workspace-schema-builder/storages/type-definitions.storage';
-import { getResolverName } from 'src/workspace/utils/get-resolver-name.util';
-import { getResolverArgs } from 'src/workspace/workspace-schema-builder/utils/get-resolver-args.util';
-import { TypeMapperService } from 'src/workspace/workspace-schema-builder/services/type-mapper.service';
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+import { WorkspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import { TypeDefinitionsStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage';
+import { getResolverName } from 'src/engine/utils/get-resolver-name.util';
+import { getResolverArgs } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util';
+import { TypeMapperService } from 'src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service';
 
 import { ArgsFactory } from './args.factory';
 import { ObjectTypeDefinitionKind } from './object-type-definition.factory';
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/enum/index.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/enum/index.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/enum/index.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/enum/index.ts
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/enum/order-by-direction.enum-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/enum/order-by-direction.enum-type.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/enum/order-by-direction.enum-type.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/enum/order-by-direction.enum-type.ts
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/big-float-filter.input-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/big-float-filter.input-type.ts
new file mode 100644
index 000000000000..b9db4a6a4ae6
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/big-float-filter.input-type.ts
@@ -0,0 +1,18 @@
+import { GraphQLInputObjectType, GraphQLList, GraphQLNonNull } from 'graphql';
+
+import { FilterIs } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input/filter-is.input-type';
+import { BigFloatScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+export const BigFloatFilterType = new GraphQLInputObjectType({
+  name: 'BigFloatFilter',
+  fields: {
+    eq: { type: BigFloatScalarType },
+    gt: { type: BigFloatScalarType },
+    gte: { type: BigFloatScalarType },
+    in: { type: new GraphQLList(new GraphQLNonNull(BigFloatScalarType)) },
+    lt: { type: BigFloatScalarType },
+    lte: { type: BigFloatScalarType },
+    neq: { type: BigFloatScalarType },
+    is: { type: FilterIs },
+  },
+});
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/big-int-filter.input-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/big-int-filter.input-type.ts
similarity index 80%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/big-int-filter.input-type.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/big-int-filter.input-type.ts
index e93eb2c7aea6..fed62dc16f2d 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/big-int-filter.input-type.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/big-int-filter.input-type.ts
@@ -5,7 +5,7 @@ import {
   GraphQLInt,
 } from 'graphql';
 
-import { FilterIs } from 'src/workspace/workspace-schema-builder/graphql-types/input/filter-is.input-type';
+import { FilterIs } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input/filter-is.input-type';
 
 export const BigIntFilterType = new GraphQLInputObjectType({
   name: 'BigIntFilter',
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/boolean-filter.input-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/boolean-filter.input-type.ts
new file mode 100644
index 000000000000..1ea6346481b5
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/boolean-filter.input-type.ts
@@ -0,0 +1,11 @@
+import { GraphQLBoolean, GraphQLInputObjectType } from 'graphql';
+
+import { FilterIs } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input/filter-is.input-type';
+
+export const BooleanFilterType = new GraphQLInputObjectType({
+  name: 'BooleanFilter',
+  fields: {
+    eq: { type: GraphQLBoolean },
+    is: { type: FilterIs },
+  },
+});
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/date-filter.input-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/date-filter.input-type.ts
new file mode 100644
index 000000000000..43499e96e430
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/date-filter.input-type.ts
@@ -0,0 +1,18 @@
+import { GraphQLInputObjectType, GraphQLList, GraphQLNonNull } from 'graphql';
+
+import { FilterIs } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input/filter-is.input-type';
+import { DateScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+export const DateFilterType = new GraphQLInputObjectType({
+  name: 'DateFilter',
+  fields: {
+    eq: { type: DateScalarType },
+    gt: { type: DateScalarType },
+    gte: { type: DateScalarType },
+    in: { type: new GraphQLList(new GraphQLNonNull(DateScalarType)) },
+    lt: { type: DateScalarType },
+    lte: { type: DateScalarType },
+    neq: { type: DateScalarType },
+    is: { type: FilterIs },
+  },
+});
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/date-time-filter.input-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/date-time-filter.input-type.ts
new file mode 100644
index 000000000000..278eff46dbdc
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/date-time-filter.input-type.ts
@@ -0,0 +1,18 @@
+import { GraphQLInputObjectType, GraphQLList, GraphQLNonNull } from 'graphql';
+
+import { FilterIs } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input/filter-is.input-type';
+import { DateTimeScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+export const DatetimeFilterType = new GraphQLInputObjectType({
+  name: 'DateTimeFilter',
+  fields: {
+    eq: { type: DateTimeScalarType },
+    gt: { type: DateTimeScalarType },
+    gte: { type: DateTimeScalarType },
+    in: { type: new GraphQLList(new GraphQLNonNull(DateTimeScalarType)) },
+    lt: { type: DateTimeScalarType },
+    lte: { type: DateTimeScalarType },
+    neq: { type: DateTimeScalarType },
+    is: { type: FilterIs },
+  },
+});
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/filter-is.input-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/filter-is.input-type.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/filter-is.input-type.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/filter-is.input-type.ts
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/float-filter.input-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/float-filter.input-type.ts
similarity index 81%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/float-filter.input-type.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/float-filter.input-type.ts
index 15346e427598..24be95056c48 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/float-filter.input-type.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/float-filter.input-type.ts
@@ -5,7 +5,7 @@ import {
   GraphQLNonNull,
 } from 'graphql';
 
-import { FilterIs } from 'src/workspace/workspace-schema-builder/graphql-types/input/filter-is.input-type';
+import { FilterIs } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input/filter-is.input-type';
 
 export const FloatFilterType = new GraphQLInputObjectType({
   name: 'FloatFilter',
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/index.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/index.ts
new file mode 100644
index 000000000000..b362a0a1186f
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/index.ts
@@ -0,0 +1,11 @@
+export * from './big-float-filter.input-type';
+export * from './big-int-filter.input-type';
+export * from './date-filter.input-type';
+export * from './date-time-filter.input-type';
+export * from './float-filter.input-type';
+export * from './int-filter.input-type';
+export * from './string-filter.input-type';
+export * from './time-filter.input-type';
+export * from './uuid-filter.input-type';
+export * from './boolean-filter.input-type';
+export * from './raw-json-filter.input-type';
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/int-filter.input-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/int-filter.input-type.ts
similarity index 80%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/int-filter.input-type.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/int-filter.input-type.ts
index f8e76f70b877..4b2d1dc80091 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/int-filter.input-type.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/int-filter.input-type.ts
@@ -5,7 +5,7 @@ import {
   GraphQLInt,
 } from 'graphql';
 
-import { FilterIs } from 'src/workspace/workspace-schema-builder/graphql-types/input/filter-is.input-type';
+import { FilterIs } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input/filter-is.input-type';
 
 export const IntFilterType = new GraphQLInputObjectType({
   name: 'IntFilter',
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/raw-json-filter.input-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/raw-json-filter.input-type.ts
new file mode 100644
index 000000000000..5b06437dd695
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/raw-json-filter.input-type.ts
@@ -0,0 +1,10 @@
+import { GraphQLInputObjectType } from 'graphql';
+
+import { FilterIs } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input/filter-is.input-type';
+
+export const RawJsonFilterType = new GraphQLInputObjectType({
+  name: 'RawJsonFilter',
+  fields: {
+    is: { type: FilterIs },
+  },
+});
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/string-filter.input-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/string-filter.input-type.ts
similarity index 85%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/string-filter.input-type.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/string-filter.input-type.ts
index 96ffd19cfd7e..3ea34f85b0dd 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/string-filter.input-type.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/string-filter.input-type.ts
@@ -5,7 +5,7 @@ import {
   GraphQLString,
 } from 'graphql';
 
-import { FilterIs } from 'src/workspace/workspace-schema-builder/graphql-types/input/filter-is.input-type';
+import { FilterIs } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input/filter-is.input-type';
 
 export const StringFilterType = new GraphQLInputObjectType({
   name: 'StringFilter',
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/time-filter.input-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/time-filter.input-type.ts
new file mode 100644
index 000000000000..58d1b7bab1a4
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/time-filter.input-type.ts
@@ -0,0 +1,18 @@
+import { GraphQLInputObjectType, GraphQLList, GraphQLNonNull } from 'graphql';
+
+import { FilterIs } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input/filter-is.input-type';
+import { TimeScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+export const TimeFilterType = new GraphQLInputObjectType({
+  name: 'TimeFilter',
+  fields: {
+    eq: { type: TimeScalarType },
+    gt: { type: TimeScalarType },
+    gte: { type: TimeScalarType },
+    in: { type: new GraphQLList(new GraphQLNonNull(TimeScalarType)) },
+    lt: { type: TimeScalarType },
+    lte: { type: TimeScalarType },
+    neq: { type: TimeScalarType },
+    is: { type: FilterIs },
+  },
+});
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/uuid-filter.input-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/uuid-filter.input-type.ts
new file mode 100644
index 000000000000..4935e4d94400
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/uuid-filter.input-type.ts
@@ -0,0 +1,14 @@
+import { GraphQLInputObjectType, GraphQLList } from 'graphql';
+
+import { FilterIs } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input/filter-is.input-type';
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+export const UUIDFilterType = new GraphQLInputObjectType({
+  name: 'UUIDFilter',
+  fields: {
+    eq: { type: UUIDScalarType },
+    in: { type: new GraphQLList(UUIDScalarType) },
+    neq: { type: UUIDScalarType },
+    is: { type: FilterIs },
+  },
+});
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/object/index.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/index.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/object/index.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/index.ts
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/object/page-into.object-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/page-into.object-type.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/object/page-into.object-type.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/page-into.object-type.ts
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/big-float.scalar.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/big-float.scalar.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/big-float.scalar.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/big-float.scalar.ts
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/big-int.scalar.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/big-int.scalar.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/big-int.scalar.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/big-int.scalar.ts
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/cursor.scalar.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/cursor.scalar.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/cursor.scalar.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/cursor.scalar.ts
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/date-time.scalar.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/date-time.scalar.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/date-time.scalar.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/date-time.scalar.ts
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/date.scalar.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/date.scalar.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/date.scalar.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/date.scalar.ts
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/index.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/index.ts
new file mode 100644
index 000000000000..b6c4f05a8474
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/index.ts
@@ -0,0 +1,29 @@
+import { JsonScalarType } from './json.scalar';
+import { PositionScalarType } from './position.scalar';
+import { CursorScalarType } from './cursor.scalar';
+import { BigFloatScalarType } from './big-float.scalar';
+import { BigIntScalarType } from './big-int.scalar';
+import { DateScalarType } from './date.scalar';
+import { DateTimeScalarType } from './date-time.scalar';
+import { TimeScalarType } from './time.scalar';
+import { UUIDScalarType } from './uuid.scalar';
+
+export * from './big-float.scalar';
+export * from './big-int.scalar';
+export * from './cursor.scalar';
+export * from './date.scalar';
+export * from './date-time.scalar';
+export * from './time.scalar';
+export * from './uuid.scalar';
+
+export const scalars = [
+  BigFloatScalarType,
+  BigIntScalarType,
+  DateScalarType,
+  DateTimeScalarType,
+  TimeScalarType,
+  UUIDScalarType,
+  CursorScalarType,
+  PositionScalarType,
+  JsonScalarType,
+];
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/json.scalar.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/json.scalar.ts
new file mode 100644
index 000000000000..1f03304e715c
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/json.scalar.ts
@@ -0,0 +1,14 @@
+import { isString } from 'class-validator';
+import { GraphQLScalarType } from 'graphql';
+import GraphQLJSON from 'graphql-type-json';
+
+export const JsonScalarType = new GraphQLScalarType({
+  ...GraphQLJSON,
+  parseValue: (value) => {
+    if (isString(value) && isString(JSON.parse(value))) {
+      throw new Error(`Strings are not supported as JSON: ${value}`);
+    }
+
+    return GraphQLJSON.parseValue(value);
+  },
+});
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/position.scalar.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/position.scalar.ts
new file mode 100644
index 000000000000..a9619d098c39
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/position.scalar.ts
@@ -0,0 +1,39 @@
+import { GraphQLScalarType, Kind } from 'graphql';
+
+type PositionType = 'first' | 'last' | number;
+
+const isValidStringPosition = (value: string): boolean =>
+  typeof value === 'string' && (value === 'first' || value === 'last');
+
+const isValidNumberPosition = (value: number): boolean =>
+  typeof value === 'number' && value >= 0;
+
+const checkPosition = (value: any): PositionType => {
+  if (isValidNumberPosition(value) || isValidStringPosition(value)) {
+    return value;
+  }
+
+  throw new Error('Invalid position found');
+};
+
+export const PositionScalarType = new GraphQLScalarType({
+  name: 'Position',
+  description:
+    'A custom scalar type for representing record position in a list',
+  serialize: checkPosition,
+  parseValue: checkPosition,
+  parseLiteral(ast): PositionType {
+    if (
+      ast.kind == Kind.STRING &&
+      (ast.value === 'first' || ast.value === 'last')
+    ) {
+      return ast.value;
+    }
+
+    if (ast.kind == Kind.INT || ast.kind == Kind.FLOAT) {
+      return parseFloat(ast.value);
+    }
+
+    throw new Error('Invalid position found');
+  },
+});
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/time.scalar.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/time.scalar.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/time.scalar.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/time.scalar.ts
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/uuid.scalar.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/uuid.scalar.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/uuid.scalar.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/uuid.scalar.ts
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/interfaces/param-metadata.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/interfaces/param-metadata.interface.ts
new file mode 100644
index 000000000000..8a4071d6ca78
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/interfaces/param-metadata.interface.ts
@@ -0,0 +1,17 @@
+import { InputTypeDefinitionKind } from 'src/engine/api/graphql/workspace-schema-builder/factories/input-type-definition.factory';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+export interface ArgMetadata<T = any> {
+  kind?: InputTypeDefinitionKind;
+  type?: FieldMetadataType;
+  isNullable?: boolean;
+  isArray?: boolean;
+  defaultValue?: T;
+}
+
+export interface ArgsMetadata {
+  args: {
+    [key: string]: ArgMetadata;
+  };
+  objectMetadataId: string;
+}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface.ts
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface.ts
new file mode 100644
index 000000000000..1cbf69aef60d
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface.ts
@@ -0,0 +1,10 @@
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+export interface WorkspaceSchemaBuilderContext {
+  workspaceId: string;
+  userId: string | undefined;
+  objectMetadataItem: ObjectMetadataInterface;
+  fieldMetadataCollection: FieldMetadataInterface[];
+  objectMetadataCollection: ObjectMetadataInterface[];
+}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/services/type-mapper.service.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service.ts
similarity index 76%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/services/type-mapper.service.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service.ts
index b54194317eb4..9b3eb2dee921 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/services/type-mapper.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service.ts
@@ -5,7 +5,6 @@ import {
   GraphQLBoolean,
   GraphQLEnumType,
   GraphQLFloat,
-  GraphQLID,
   GraphQLInputObjectType,
   GraphQLInputType,
   GraphQLInt,
@@ -19,9 +18,9 @@ import {
 import {
   DateScalarMode,
   NumberScalarMode,
-} from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+} from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
 
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   UUIDFilterType,
   StringFilterType,
@@ -31,9 +30,15 @@ import {
   IntFilterType,
   BooleanFilterType,
   BigFloatFilterType,
-} from 'src/workspace/workspace-schema-builder/graphql-types/input';
-import { OrderByDirectionType } from 'src/workspace/workspace-schema-builder/graphql-types/enum';
-import { BigFloatScalarType } from 'src/workspace/workspace-schema-builder/graphql-types/scalars';
+  RawJsonFilterType,
+} from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input';
+import { OrderByDirectionType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/enum';
+import {
+  BigFloatScalarType,
+  UUIDScalarType,
+} from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { PositionScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/position.scalar';
+import { JsonScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/json.scalar';
 
 export interface TypeOptions<T = any> {
   nullable?: boolean;
@@ -54,18 +59,20 @@ export class TypeMapperService {
     const numberScalar =
       numberScalarMode === 'float' ? GraphQLFloat : GraphQLInt;
 
-    // LINK and CURRENCY are handled in the factories because they are objects
     const typeScalarMapping = new Map<FieldMetadataType, GraphQLScalarType>([
-      [FieldMetadataType.UUID, GraphQLID],
+      [FieldMetadataType.UUID, UUIDScalarType],
       [FieldMetadataType.TEXT, GraphQLString],
       [FieldMetadataType.PHONE, GraphQLString],
       [FieldMetadataType.EMAIL, GraphQLString],
       [FieldMetadataType.DATE_TIME, dateScalar],
+      [FieldMetadataType.DATE, dateScalar],
       [FieldMetadataType.BOOLEAN, GraphQLBoolean],
       [FieldMetadataType.NUMBER, numberScalar],
       [FieldMetadataType.NUMERIC, BigFloatScalarType],
       [FieldMetadataType.PROBABILITY, GraphQLFloat],
-      [FieldMetadataType.RELATION, GraphQLID],
+      [FieldMetadataType.RELATION, UUIDScalarType],
+      [FieldMetadataType.POSITION, PositionScalarType],
+      [FieldMetadataType.RAW_JSON, JsonScalarType],
     ]);
 
     return typeScalarMapping.get(fieldMetadataType);
@@ -81,7 +88,6 @@ export class TypeMapperService {
     const numberScalar =
       numberScalarMode === 'float' ? FloatFilterType : IntFilterType;
 
-    // LINK and CURRENCY are handled in the factories because they are objects
     const typeFilterMapping = new Map<
       FieldMetadataType,
       GraphQLInputObjectType | GraphQLScalarType
@@ -91,11 +97,14 @@ export class TypeMapperService {
       [FieldMetadataType.PHONE, StringFilterType],
       [FieldMetadataType.EMAIL, StringFilterType],
       [FieldMetadataType.DATE_TIME, dateFilter],
+      [FieldMetadataType.DATE, DateFilterType],
       [FieldMetadataType.BOOLEAN, BooleanFilterType],
       [FieldMetadataType.NUMBER, numberScalar],
       [FieldMetadataType.NUMERIC, BigFloatFilterType],
       [FieldMetadataType.PROBABILITY, FloatFilterType],
       [FieldMetadataType.RELATION, UUIDFilterType],
+      [FieldMetadataType.POSITION, FloatFilterType],
+      [FieldMetadataType.RAW_JSON, RawJsonFilterType],
     ]);
 
     return typeFilterMapping.get(fieldMetadataType);
@@ -104,13 +113,13 @@ export class TypeMapperService {
   mapToOrderByType(
     fieldMetadataType: FieldMetadataType,
   ): GraphQLInputType | undefined {
-    // LINK and CURRENCY are handled in the factories because they are objects
     const typeOrderByMapping = new Map<FieldMetadataType, GraphQLEnumType>([
       [FieldMetadataType.UUID, OrderByDirectionType],
       [FieldMetadataType.TEXT, OrderByDirectionType],
       [FieldMetadataType.PHONE, OrderByDirectionType],
       [FieldMetadataType.EMAIL, OrderByDirectionType],
       [FieldMetadataType.DATE_TIME, OrderByDirectionType],
+      [FieldMetadataType.DATE, OrderByDirectionType],
       [FieldMetadataType.BOOLEAN, OrderByDirectionType],
       [FieldMetadataType.NUMBER, OrderByDirectionType],
       [FieldMetadataType.NUMERIC, OrderByDirectionType],
@@ -118,6 +127,8 @@ export class TypeMapperService {
       [FieldMetadataType.RATING, OrderByDirectionType],
       [FieldMetadataType.SELECT, OrderByDirectionType],
       [FieldMetadataType.MULTI_SELECT, OrderByDirectionType],
+      [FieldMetadataType.POSITION, OrderByDirectionType],
+      [FieldMetadataType.RAW_JSON, OrderByDirectionType],
     ]);
 
     return typeOrderByMapping.get(fieldMetadataType);
@@ -137,7 +148,7 @@ export class TypeMapperService {
       );
     }
 
-    if (!options.nullable && !options.defaultValue) {
+    if (options.nullable === false && options.defaultValue === null) {
       graphqlType = new GraphQLNonNull(graphqlType) as unknown as T;
     }
 
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage.ts
new file mode 100644
index 000000000000..585e9ad99df5
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage.ts
@@ -0,0 +1,113 @@
+import { Injectable, Scope } from '@nestjs/common';
+
+import {
+  GraphQLEnumType,
+  GraphQLInputObjectType,
+  GraphQLObjectType,
+} from 'graphql';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { EnumTypeDefinition } from 'src/engine/api/graphql/workspace-schema-builder/factories/enum-type-definition.factory';
+import {
+  InputTypeDefinition,
+  InputTypeDefinitionKind,
+} from 'src/engine/api/graphql/workspace-schema-builder/factories/input-type-definition.factory';
+import {
+  ObjectTypeDefinition,
+  ObjectTypeDefinitionKind,
+} from 'src/engine/api/graphql/workspace-schema-builder/factories/object-type-definition.factory';
+
+export type GqlInputType = InputTypeDefinition | EnumTypeDefinition;
+
+export type GqlOutputType = ObjectTypeDefinition | EnumTypeDefinition;
+
+// Must be scoped on REQUEST level, because we need to recreate it for each workspaces
+// TODO: Implement properly durable by workspace
+@Injectable({ scope: Scope.REQUEST, durable: true })
+export class TypeDefinitionsStorage {
+  private readonly enumTypeDefinitions = new Map<string, EnumTypeDefinition>();
+  private readonly objectTypeDefinitions = new Map<
+    string,
+    ObjectTypeDefinition
+  >();
+  private readonly inputTypeDefinitions = new Map<
+    string,
+    InputTypeDefinition
+  >();
+
+  addEnumTypes(enumDefs: EnumTypeDefinition[]) {
+    enumDefs.forEach((item) => this.enumTypeDefinitions.set(item.target, item));
+  }
+
+  addObjectTypes(objectDefs: ObjectTypeDefinition[]) {
+    objectDefs.forEach((item) =>
+      this.objectTypeDefinitions.set(
+        this.generateCompositeKey(item.target, item.kind),
+        item,
+      ),
+    );
+  }
+
+  getObjectTypeByKey(
+    target: string,
+    kind: ObjectTypeDefinitionKind,
+  ): GraphQLObjectType | undefined {
+    return this.objectTypeDefinitions.get(
+      this.generateCompositeKey(target, kind),
+    )?.type;
+  }
+
+  getAllObjectTypeDefinitions(): ObjectTypeDefinition[] {
+    return Array.from(this.objectTypeDefinitions.values());
+  }
+
+  addInputTypes(inputDefs: InputTypeDefinition[]) {
+    inputDefs.forEach((item) =>
+      this.inputTypeDefinitions.set(
+        this.generateCompositeKey(item.target, item.kind),
+        item,
+      ),
+    );
+  }
+
+  getInputTypeByKey(
+    target: string,
+    kind: InputTypeDefinitionKind,
+  ): GraphQLInputObjectType | GraphQLEnumType | undefined {
+    const key = this.generateCompositeKey(target, kind);
+    let definition: GqlInputType | undefined;
+
+    definition ??= this.inputTypeDefinitions.get(key);
+    definition ??= this.enumTypeDefinitions.get(target);
+
+    return definition?.type;
+  }
+
+  getOutputTypeByKey(
+    target: string,
+    kind: ObjectTypeDefinitionKind,
+  ): GraphQLObjectType | GraphQLEnumType | undefined {
+    const key = this.generateCompositeKey(target, kind);
+    let definition: GqlOutputType | undefined;
+
+    definition ??= this.objectTypeDefinitions.get(key);
+    definition ??= this.enumTypeDefinitions.get(target);
+
+    return definition?.type;
+  }
+
+  getEnumTypeByKey(target: string): GraphQLEnumType | undefined {
+    return this.enumTypeDefinitions.get(target)?.type;
+  }
+
+  getAllInputTypeDefinitions(): InputTypeDefinition[] {
+    return Array.from(this.inputTypeDefinitions.values());
+  }
+
+  private generateCompositeKey(
+    target: string | FieldMetadataType,
+    kind: ObjectTypeDefinitionKind | InputTypeDefinitionKind,
+  ): string {
+    return `${target.toString()}_${kind.toString()}`;
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/type-definitions.generator.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/type-definitions.generator.ts
new file mode 100644
index 000000000000..9b91550fa334
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/type-definitions.generator.ts
@@ -0,0 +1,257 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+
+import { EnumTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/enum-type-definition.factory';
+import { compositeTypeDefintions } from 'src/engine/metadata-modules/field-metadata/composite-types';
+import { CompositeObjectTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/composite-object-type-definition.factory';
+import { CompositeInputTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/composite-input-type-definition.factory';
+
+import { TypeDefinitionsStorage } from './storages/type-definitions.storage';
+import {
+  ObjectTypeDefinitionFactory,
+  ObjectTypeDefinitionKind,
+} from './factories/object-type-definition.factory';
+import {
+  InputTypeDefinitionFactory,
+  InputTypeDefinitionKind,
+} from './factories/input-type-definition.factory';
+import { WorkspaceBuildSchemaOptions } from './interfaces/workspace-build-schema-optionts.interface';
+import { ConnectionTypeDefinitionFactory } from './factories/connection-type-definition.factory';
+import { EdgeTypeDefinitionFactory } from './factories/edge-type-definition.factory';
+import { ExtendObjectTypeDefinitionFactory } from './factories/extend-object-type-definition.factory';
+import { objectContainsRelationField } from './utils/object-contains-relation-field';
+
+@Injectable()
+export class TypeDefinitionsGenerator {
+  private readonly logger = new Logger(TypeDefinitionsGenerator.name);
+
+  constructor(
+    private readonly typeDefinitionsStorage: TypeDefinitionsStorage,
+    private readonly objectTypeDefinitionFactory: ObjectTypeDefinitionFactory,
+    private readonly compositeObjectTypeDefinitionFactory: CompositeObjectTypeDefinitionFactory,
+    private readonly enumTypeDefinitionFactory: EnumTypeDefinitionFactory,
+    private readonly inputTypeDefinitionFactory: InputTypeDefinitionFactory,
+    private readonly compositeInputTypeDefinitionFactory: CompositeInputTypeDefinitionFactory,
+    private readonly edgeTypeDefinitionFactory: EdgeTypeDefinitionFactory,
+    private readonly connectionTypeDefinitionFactory: ConnectionTypeDefinitionFactory,
+    private readonly extendObjectTypeDefinitionFactory: ExtendObjectTypeDefinitionFactory,
+  ) {}
+
+  generate(
+    objectMetadataCollection: ObjectMetadataInterface[],
+    options: WorkspaceBuildSchemaOptions,
+  ) {
+    // Generate composite type objects first because they can be used in dynamic objects
+    this.generateCompositeTypeDefs(options);
+    // Generate metadata objects
+    this.generateMetadataTypeDefs(objectMetadataCollection, options);
+  }
+
+  /**
+   * GENERATE COMPOSITE TYPE OBJECTS
+   */
+  private generateCompositeTypeDefs(options: WorkspaceBuildSchemaOptions) {
+    const compositeTypeCollection = [...compositeTypeDefintions.values()];
+
+    this.logger.log(
+      `Generating composite type objects: [${compositeTypeCollection
+        .map((compositeType) => compositeType.type)
+        .join(', ')}]`,
+    );
+
+    // Generate composite types first because they can be used in metadata objects
+    this.generateCompositeObjectTypeDefs(compositeTypeCollection, options);
+    this.generateCompositeInputTypeDefs(compositeTypeCollection, options);
+  }
+
+  private generateCompositeObjectTypeDefs(
+    compositeTypes: CompositeType[],
+    options: WorkspaceBuildSchemaOptions,
+  ) {
+    const compositeObjectTypeDefs = compositeTypes.map((compositeType) =>
+      this.compositeObjectTypeDefinitionFactory.create(compositeType, options),
+    );
+
+    this.typeDefinitionsStorage.addObjectTypes(compositeObjectTypeDefs);
+  }
+
+  private generateCompositeInputTypeDefs(
+    compisteTypes: CompositeType[],
+    options: WorkspaceBuildSchemaOptions,
+  ) {
+    const inputTypeDefs = compisteTypes
+      .map((compositeType) => {
+        const optionalExtendedObjectMetadata = {
+          ...compositeType,
+          properties: compositeType.properties.map((property) => ({
+            ...property,
+            isRequired: false,
+          })),
+        };
+
+        return [
+          // Input type for create
+          this.compositeInputTypeDefinitionFactory.create(
+            compositeType,
+            InputTypeDefinitionKind.Create,
+            options,
+          ),
+          // Input type for update
+          this.compositeInputTypeDefinitionFactory.create(
+            optionalExtendedObjectMetadata,
+            InputTypeDefinitionKind.Update,
+            options,
+          ),
+          // Filter input type
+          this.compositeInputTypeDefinitionFactory.create(
+            optionalExtendedObjectMetadata,
+            InputTypeDefinitionKind.Filter,
+            options,
+          ),
+          // OrderBy input type
+          this.compositeInputTypeDefinitionFactory.create(
+            optionalExtendedObjectMetadata,
+            InputTypeDefinitionKind.OrderBy,
+            options,
+          ),
+        ];
+      })
+      .flat();
+
+    this.typeDefinitionsStorage.addInputTypes(inputTypeDefs);
+  }
+
+  /**
+   * GENERATE METADATA OBJECTS
+   */
+
+  private generateMetadataTypeDefs(
+    dynamicObjectMetadataCollection: ObjectMetadataInterface[],
+    options: WorkspaceBuildSchemaOptions,
+  ) {
+    this.logger.log(
+      `Generating metadata objects: [${dynamicObjectMetadataCollection
+        .map((object) => object.nameSingular)
+        .join(', ')}]`,
+    );
+
+    // Generate dynamic objects
+    this.generateEnumTypeDefs(dynamicObjectMetadataCollection, options);
+    this.generateObjectTypeDefs(dynamicObjectMetadataCollection, options);
+    this.generatePaginationTypeDefs(dynamicObjectMetadataCollection, options);
+    this.generateInputTypeDefs(dynamicObjectMetadataCollection, options);
+    this.generateExtendedObjectTypeDefs(
+      dynamicObjectMetadataCollection,
+      options,
+    );
+  }
+
+  private generateObjectTypeDefs(
+    objectMetadataCollection: ObjectMetadataInterface[] | CompositeType[],
+    options: WorkspaceBuildSchemaOptions,
+  ) {
+    const objectTypeDefs = objectMetadataCollection.map((objectMetadata) =>
+      this.objectTypeDefinitionFactory.create(
+        objectMetadata,
+        ObjectTypeDefinitionKind.Plain,
+        options,
+      ),
+    );
+
+    this.typeDefinitionsStorage.addObjectTypes(objectTypeDefs);
+  }
+
+  private generatePaginationTypeDefs(
+    objectMetadataCollection: ObjectMetadataInterface[],
+    options: WorkspaceBuildSchemaOptions,
+  ) {
+    const edgeTypeDefs = objectMetadataCollection.map((objectMetadata) =>
+      this.edgeTypeDefinitionFactory.create(objectMetadata, options),
+    );
+
+    this.typeDefinitionsStorage.addObjectTypes(edgeTypeDefs);
+
+    // Connection type defs are using edge type defs
+    const connectionTypeDefs = objectMetadataCollection.map((objectMetadata) =>
+      this.connectionTypeDefinitionFactory.create(objectMetadata, options),
+    );
+
+    this.typeDefinitionsStorage.addObjectTypes(connectionTypeDefs);
+  }
+
+  private generateInputTypeDefs(
+    objectMetadataCollection: ObjectMetadataInterface[],
+    options: WorkspaceBuildSchemaOptions,
+  ) {
+    const inputTypeDefs = objectMetadataCollection
+      .map((objectMetadata) => {
+        const optionalExtendedObjectMetadata = {
+          ...objectMetadata,
+          fields: objectMetadata.fields.map((field) => ({
+            ...field,
+            isNullable: true,
+          })),
+        };
+
+        return [
+          // Input type for create
+          this.inputTypeDefinitionFactory.create(
+            objectMetadata,
+            InputTypeDefinitionKind.Create,
+            options,
+          ),
+          // Input type for update
+          this.inputTypeDefinitionFactory.create(
+            optionalExtendedObjectMetadata,
+            InputTypeDefinitionKind.Update,
+            options,
+          ),
+          // Filter input type
+          this.inputTypeDefinitionFactory.create(
+            optionalExtendedObjectMetadata,
+            InputTypeDefinitionKind.Filter,
+            options,
+          ),
+          // OrderBy input type
+          this.inputTypeDefinitionFactory.create(
+            optionalExtendedObjectMetadata,
+            InputTypeDefinitionKind.OrderBy,
+            options,
+          ),
+        ];
+      })
+      .flat();
+
+    this.typeDefinitionsStorage.addInputTypes(inputTypeDefs);
+  }
+
+  private generateEnumTypeDefs(
+    objectMetadataCollection: ObjectMetadataInterface[],
+    options: WorkspaceBuildSchemaOptions,
+  ) {
+    const enumTypeDefs = objectMetadataCollection
+      .map((objectMetadata) =>
+        this.enumTypeDefinitionFactory.create(objectMetadata, options),
+      )
+      .flat();
+
+    this.typeDefinitionsStorage.addEnumTypes(enumTypeDefs);
+  }
+
+  private generateExtendedObjectTypeDefs(
+    objectMetadataCollection: ObjectMetadataInterface[],
+    options: WorkspaceBuildSchemaOptions,
+  ) {
+    // Generate extended object type defs only for objects that contain composite fields
+    const objectMetadataCollectionWithCompositeFields =
+      objectMetadataCollection.filter(objectContainsRelationField);
+    const objectTypeDefs = objectMetadataCollectionWithCompositeFields.map(
+      (objectMetadata) =>
+        this.extendObjectTypeDefinitionFactory.create(objectMetadata, options),
+    );
+
+    this.typeDefinitionsStorage.addObjectTypes(objectTypeDefs);
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/utils/__tests__/clean-entity-name.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/clean-entity-name.spec.ts
similarity index 86%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/utils/__tests__/clean-entity-name.spec.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/clean-entity-name.spec.ts
index 32874b48edbf..3b95a01eb4be 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/utils/__tests__/clean-entity-name.spec.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/clean-entity-name.spec.ts
@@ -1,4 +1,4 @@
-import { cleanEntityName } from 'src/workspace/workspace-schema-builder/utils/clean-entity-name.util';
+import { cleanEntityName } from 'src/engine/api/graphql/workspace-schema-builder/utils/clean-entity-name.util';
 
 describe('cleanEntityName', () => {
   test('should camelCase strings', () => {
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/get-field-metadata-type.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/get-field-metadata-type.spec.ts
new file mode 100644
index 000000000000..022eab2af3dd
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/get-field-metadata-type.spec.ts
@@ -0,0 +1,22 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { getFieldMetadataType } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-field-metadata-type.util';
+
+describe('getFieldMetadataType', () => {
+  it.each([
+    ['uuid', FieldMetadataType.UUID],
+    ['timestamptz', FieldMetadataType.DATE_TIME],
+  ])(
+    'should return correct FieldMetadataType for type %s',
+    (type, expectedMetadataType) => {
+      expect(getFieldMetadataType(type)).toBe(expectedMetadataType);
+    },
+  );
+
+  it('should throw an error for an unknown type', () => {
+    const unknownType = 'unknownType';
+
+    expect(() => getFieldMetadataType(unknownType)).toThrow(
+      `Unknown type ${unknownType}`,
+    );
+  });
+});
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/utils/__tests__/get-resolver-args.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/get-resolver-args.spec.ts
similarity index 78%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/utils/__tests__/get-resolver-args.spec.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/get-resolver-args.spec.ts
index 35bc8011ca1a..3d4763054035 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/utils/__tests__/get-resolver-args.spec.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/get-resolver-args.spec.ts
@@ -1,8 +1,8 @@
-import { WorkspaceResolverBuilderMethodNames } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { InputTypeDefinitionKind } from 'src/workspace/workspace-schema-builder/factories/input-type-definition.factory';
-import { getResolverArgs } from 'src/workspace/workspace-schema-builder/utils/get-resolver-args.util';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { InputTypeDefinitionKind } from 'src/engine/api/graphql/workspace-schema-builder/factories/input-type-definition.factory';
+import { getResolverArgs } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util';
 
 describe('getResolverArgs', () => {
   const expectedOutputs = {
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/utils/clean-entity-name.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/clean-entity-name.util.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/utils/clean-entity-name.util.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/clean-entity-name.util.ts
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-field-metadata-type.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-field-metadata-type.util.ts
new file mode 100644
index 000000000000..8c93756899dd
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-field-metadata-type.util.ts
@@ -0,0 +1,17 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+const typeOrmTypeMapping = new Map<string, FieldMetadataType>([
+  ['uuid', FieldMetadataType.UUID],
+  ['timestamptz', FieldMetadataType.DATE_TIME],
+  // Add more types here if we need to support more than id, and createdAt/updatedAt/deletedAt
+]);
+
+export const getFieldMetadataType = (type: string) => {
+  const fieldType = typeOrmTypeMapping.get(type);
+
+  if (fieldType === undefined || fieldType === null) {
+    throw new Error(`Unknown type ${type}`);
+  }
+
+  return fieldType;
+};
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/utils/get-resolver-args.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util.ts
similarity index 82%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/utils/get-resolver-args.util.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util.ts
index bdf67209c7b8..0f99bc0db570 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/utils/get-resolver-args.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util.ts
@@ -1,8 +1,8 @@
-import { WorkspaceResolverBuilderMethodNames } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { ArgMetadata } from 'src/workspace/workspace-schema-builder/interfaces/param-metadata.interface';
+import { WorkspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { ArgMetadata } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/param-metadata.interface';
 
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { InputTypeDefinitionKind } from 'src/workspace/workspace-schema-builder/factories/input-type-definition.factory';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { InputTypeDefinitionKind } from 'src/engine/api/graphql/workspace-schema-builder/factories/input-type-definition.factory';
 
 export const getResolverArgs = (
   type: WorkspaceResolverBuilderMethodNames,
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/object-contains-relation-field.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/object-contains-relation-field.ts
new file mode 100644
index 000000000000..e842e4219678
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/object-contains-relation-field.ts
@@ -0,0 +1,11 @@
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
+
+export const objectContainsRelationField = (
+  objectMetadata: ObjectMetadataInterface,
+): boolean => {
+  return objectMetadata.fields.some((field) =>
+    isRelationFieldMetadataType(field.type),
+  );
+};
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/workspace-graphql-schema.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/workspace-graphql-schema.factory.ts
similarity index 86%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/workspace-graphql-schema.factory.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/workspace-graphql-schema.factory.ts
index 252bcf432b51..6d1708db0aa0 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/workspace-graphql-schema.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/workspace-graphql-schema.factory.ts
@@ -2,8 +2,8 @@ import { Injectable, Logger } from '@nestjs/common';
 
 import { GraphQLSchema } from 'graphql';
 
-import { WorkspaceResolverBuilderMethods } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
+import { WorkspaceResolverBuilderMethods } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
 import { TypeDefinitionsGenerator } from './type-definitions.generator';
 
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/workspace-schema-builder.module.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/workspace-schema-builder.module.ts
similarity index 81%
rename from packages/twenty-server/src/workspace/workspace-schema-builder/workspace-schema-builder.module.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/workspace-schema-builder.module.ts
index 748c2efd522d..a5bc54e85189 100644
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/workspace-schema-builder.module.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/workspace-schema-builder.module.ts
@@ -1,7 +1,6 @@
 import { Module } from '@nestjs/common';
 
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
 
 import { TypeDefinitionsGenerator } from './type-definitions.generator';
 import { WorkspaceGraphQLSchemaFactory } from './workspace-graphql-schema.factory';
@@ -13,12 +12,11 @@ import { TypeMapperService } from './services/type-mapper.service';
 @Module({
   imports: [ObjectMetadataModule],
   providers: [
-    ...workspaceSchemaBuilderFactories,
-    TypeDefinitionsGenerator,
     TypeDefinitionsStorage,
     TypeMapperService,
+    ...workspaceSchemaBuilderFactories,
+    TypeDefinitionsGenerator,
     WorkspaceGraphQLSchemaFactory,
-    JwtAuthGuard,
   ],
   exports: [WorkspaceGraphQLSchemaFactory],
 })
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-storage/workspace-schema-storage.module.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-storage/workspace-schema-storage.module.ts
new file mode 100644
index 000000000000..bd57d9db28b8
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-storage/workspace-schema-storage.module.ts
@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
+import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+import { WorkspaceSchemaStorageService } from 'src/engine/api/graphql/workspace-schema-storage/workspace-schema-storage.service';
+
+@Module({
+  imports: [ObjectMetadataModule, WorkspaceCacheVersionModule],
+  providers: [WorkspaceSchemaStorageService],
+  exports: [WorkspaceSchemaStorageService],
+})
+export class WorkspaceSchemaStorageModule {}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-storage/workspace-schema-storage.service.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-storage/workspace-schema-storage.service.ts
new file mode 100644
index 000000000000..c92f911a28bb
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-storage/workspace-schema-storage.service.ts
@@ -0,0 +1,95 @@
+import { Injectable } from '@nestjs/common';
+
+import { CacheStorageService } from 'src/engine/integrations/cache-storage/cache-storage.service';
+import { InjectCacheStorage } from 'src/engine/integrations/cache-storage/decorators/cache-storage.decorator';
+import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+
+@Injectable()
+export class WorkspaceSchemaStorageService {
+  constructor(
+    @InjectCacheStorage(CacheStorageNamespace.WorkspaceSchema)
+    private readonly workspaceSchemaCache: CacheStorageService,
+
+    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+  ) {}
+
+  async validateCacheVersion(workspaceId: string): Promise<void> {
+    const currentVersion =
+      (await this.workspaceSchemaCache.get<string>(
+        `cacheVersion:${workspaceId}`,
+      )) ?? '0';
+
+    let latestVersion =
+      await this.workspaceCacheVersionService.getVersion(workspaceId);
+
+    if (!latestVersion || currentVersion !== latestVersion) {
+      // Invalidate cache if version mismatch is detected
+      await this.invalidateCache(workspaceId);
+
+      // If the latest version is not found, increment the version
+      latestVersion ??=
+        await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+
+      // Update the cache version after invalidation
+      await this.workspaceSchemaCache.set<string>(
+        `cacheVersion:${workspaceId}`,
+        latestVersion,
+      );
+    }
+  }
+
+  setObjectMetadataCollection(
+    workspaceId: string,
+    objectMetadataCollection: ObjectMetadataEntity[],
+  ) {
+    return this.workspaceSchemaCache.set<ObjectMetadataEntity[]>(
+      `objectMetadataCollection:${workspaceId}`,
+      objectMetadataCollection,
+    );
+  }
+
+  getObjectMetadataCollection(
+    workspaceId: string,
+  ): Promise<ObjectMetadataEntity[] | undefined> {
+    return this.workspaceSchemaCache.get<ObjectMetadataEntity[]>(
+      `objectMetadataCollection:${workspaceId}`,
+    );
+  }
+
+  setTypeDefs(workspaceId: string, typeDefs: string): Promise<void> {
+    return this.workspaceSchemaCache.set<string>(
+      `typeDefs:${workspaceId}`,
+      typeDefs,
+    );
+  }
+
+  getTypeDefs(workspaceId: string): Promise<string | undefined> {
+    return this.workspaceSchemaCache.get<string>(`typeDefs:${workspaceId}`);
+  }
+
+  setUsedScalarNames(
+    workspaceId: string,
+    scalarsUsed: string[],
+  ): Promise<void> {
+    return this.workspaceSchemaCache.set<string[]>(
+      `usedScalarNames:${workspaceId}`,
+      scalarsUsed,
+    );
+  }
+
+  getUsedScalarNames(workspaceId: string): Promise<string[] | undefined> {
+    return this.workspaceSchemaCache.get<string[]>(
+      `usedScalarNames:${workspaceId}`,
+    );
+  }
+
+  async invalidateCache(workspaceId: string): Promise<void> {
+    await this.workspaceSchemaCache.del(
+      `objectMetadataCollection:${workspaceId}`,
+    );
+    await this.workspaceSchemaCache.del(`typeDefs:${workspaceId}`);
+    await this.workspaceSchemaCache.del(`usedScalarNames:${workspaceId}`);
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema.factory.ts
new file mode 100644
index 000000000000..608e7a952a6a
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema.factory.ts
@@ -0,0 +1,113 @@
+import { Injectable } from '@nestjs/common';
+
+import { GraphQLSchema, printSchema } from 'graphql';
+import { makeExecutableSchema } from '@graphql-tools/schema';
+import { gql } from 'graphql-tag';
+
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { WorkspaceSchemaStorageService } from 'src/engine/api/graphql/workspace-schema-storage/workspace-schema-storage.service';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { ScalarsExplorerService } from 'src/engine/api/graphql/services/scalars-explorer.service';
+import { WorkspaceGraphQLSchemaFactory } from 'src/engine/api/graphql/workspace-schema-builder/workspace-graphql-schema.factory';
+import { workspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/factories/factories';
+import { WorkspaceResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory';
+
+@Injectable()
+export class WorkspaceSchemaFactory {
+  constructor(
+    private readonly dataSourceService: DataSourceService,
+    private readonly objectMetadataService: ObjectMetadataService,
+    private readonly scalarsExplorerService: ScalarsExplorerService,
+    private readonly workspaceGraphQLSchemaFactory: WorkspaceGraphQLSchemaFactory,
+    private readonly workspaceResolverFactory: WorkspaceResolverFactory,
+    private readonly workspaceSchemaStorageService: WorkspaceSchemaStorageService,
+  ) {}
+
+  async createGraphQLSchema(
+    workspaceId: string | undefined,
+    userId: string | undefined,
+  ): Promise<GraphQLSchema> {
+    if (!workspaceId) {
+      return new GraphQLSchema({});
+    }
+
+    const dataSourcesMetadata =
+      await this.dataSourceService.getDataSourcesMetadataFromWorkspaceId(
+        workspaceId,
+      );
+
+    // Can'f find any data sources for this workspace
+    if (!dataSourcesMetadata || dataSourcesMetadata.length === 0) {
+      return new GraphQLSchema({});
+    }
+
+    // Validate cache version
+    await this.workspaceSchemaStorageService.validateCacheVersion(workspaceId);
+
+    // Get object metadata from cache
+    let objectMetadataCollection =
+      await this.workspaceSchemaStorageService.getObjectMetadataCollection(
+        workspaceId,
+      );
+
+    // If object metadata is not cached, get it from the database
+    if (!objectMetadataCollection) {
+      objectMetadataCollection =
+        await this.objectMetadataService.findManyWithinWorkspace(workspaceId);
+
+      await this.workspaceSchemaStorageService.setObjectMetadataCollection(
+        workspaceId,
+        objectMetadataCollection,
+      );
+    }
+
+    // Get typeDefs from cache
+    let typeDefs =
+      await this.workspaceSchemaStorageService.getTypeDefs(workspaceId);
+    let usedScalarNames =
+      await this.workspaceSchemaStorageService.getUsedScalarNames(workspaceId);
+
+    // If typeDefs are not cached, generate them
+    if (!typeDefs || !usedScalarNames) {
+      const autoGeneratedSchema =
+        await this.workspaceGraphQLSchemaFactory.create(
+          objectMetadataCollection,
+          workspaceResolverBuilderMethodNames,
+        );
+
+      usedScalarNames =
+        this.scalarsExplorerService.getUsedScalarNames(autoGeneratedSchema);
+      typeDefs = printSchema(autoGeneratedSchema);
+
+      await this.workspaceSchemaStorageService.setTypeDefs(
+        workspaceId,
+        typeDefs,
+      );
+      await this.workspaceSchemaStorageService.setUsedScalarNames(
+        workspaceId,
+        usedScalarNames,
+      );
+    }
+
+    const autoGeneratedResolvers = await this.workspaceResolverFactory.create(
+      workspaceId,
+      userId,
+      objectMetadataCollection,
+      workspaceResolverBuilderMethodNames,
+    );
+    const scalarsResolvers =
+      this.scalarsExplorerService.getScalarResolvers(usedScalarNames);
+
+    const executableSchema = makeExecutableSchema({
+      typeDefs: gql`
+        ${typeDefs}
+      `,
+      resolvers: {
+        ...scalarsResolvers,
+        ...autoGeneratedResolvers,
+      },
+    });
+
+    return executableSchema;
+  }
+}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest.controller.utils.spec.ts b/packages/twenty-server/src/engine/api/rest/__tests__/api-rest.controller.utils.spec.ts
similarity index 93%
rename from packages/twenty-server/src/core/api-rest/api-rest.controller.utils.spec.ts
rename to packages/twenty-server/src/engine/api/rest/__tests__/api-rest.controller.utils.spec.ts
index 59fe4249ca57..4655a731fcb1 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest.controller.utils.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/__tests__/api-rest.controller.utils.spec.ts
@@ -1,4 +1,4 @@
-import { cleanGraphQLResponse } from 'src/core/api-rest/api-rest.controller.utils';
+import { cleanGraphQLResponse } from 'src/engine/api/rest/api-rest.controller.utils';
 
 describe('cleanGraphQLResponse', () => {
   it('should remove edges/node from results', () => {
diff --git a/packages/twenty-server/src/engine/api/rest/__tests__/api-rest.service.spec.ts b/packages/twenty-server/src/engine/api/rest/__tests__/api-rest.service.spec.ts
new file mode 100644
index 000000000000..83ed4dadfd9c
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/__tests__/api-rest.service.spec.ts
@@ -0,0 +1,40 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { HttpService } from '@nestjs/axios';
+
+import { ApiRestService } from 'src/engine/api/rest/api-rest.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+import { ApiRestQueryBuilderFactory } from 'src/engine/api/rest/api-rest-query-builder/api-rest-query-builder.factory';
+
+describe('ApiRestService', () => {
+  let service: ApiRestService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        ApiRestService,
+        {
+          provide: ApiRestQueryBuilderFactory,
+          useValue: {},
+        },
+        {
+          provide: EnvironmentService,
+          useValue: {},
+        },
+        {
+          provide: TokenService,
+          useValue: {},
+        },
+        {
+          provide: HttpService,
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    service = module.get<ApiRestService>(ApiRestService);
+  });
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/__tests__/api-rest-query-builder.factory.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/__tests__/api-rest-query-builder.factory.spec.ts
new file mode 100644
index 000000000000..579786a214af
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/__tests__/api-rest-query-builder.factory.spec.ts
@@ -0,0 +1,46 @@
+import { Test, TestingModule } from '@nestjs/testing';
+
+import { ApiRestQueryBuilderFactory } from 'src/engine/api/rest/api-rest-query-builder/api-rest-query-builder.factory';
+import { DeleteQueryFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/delete-query.factory';
+import { CreateQueryFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/create-query.factory';
+import { UpdateQueryFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/update-query.factory';
+import { FindOneQueryFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/find-one-query.factory';
+import { FindManyQueryFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/find-many-query.factory';
+import { DeleteVariablesFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/delete-variables.factory';
+import { CreateVariablesFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/create-variables.factory';
+import { UpdateVariablesFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/update-variables.factory';
+import { GetVariablesFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/get-variables.factory';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+
+describe('ApiRestQueryBuilderFactory', () => {
+  let service: ApiRestQueryBuilderFactory;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        ApiRestQueryBuilderFactory,
+        { provide: DeleteQueryFactory, useValue: {} },
+        { provide: CreateQueryFactory, useValue: {} },
+        { provide: UpdateQueryFactory, useValue: {} },
+        { provide: FindOneQueryFactory, useValue: {} },
+        { provide: FindManyQueryFactory, useValue: {} },
+        { provide: DeleteVariablesFactory, useValue: {} },
+        { provide: CreateVariablesFactory, useValue: {} },
+        { provide: UpdateVariablesFactory, useValue: {} },
+        { provide: GetVariablesFactory, useValue: {} },
+        { provide: ObjectMetadataService, useValue: {} },
+        { provide: TokenService, useValue: {} },
+        { provide: EnvironmentService, useValue: {} },
+      ],
+    }).compile();
+
+    service = module.get<ApiRestQueryBuilderFactory>(
+      ApiRestQueryBuilderFactory,
+    );
+  });
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/api-rest-query-builder.factory.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/api-rest-query-builder.factory.ts
new file mode 100644
index 000000000000..e6df92853c71
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/api-rest-query-builder.factory.ts
@@ -0,0 +1,145 @@
+import { BadRequestException, Injectable } from '@nestjs/common';
+
+import { Request } from 'express';
+
+import { DeleteQueryFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/delete-query.factory';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+import { CreateQueryFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/create-query.factory';
+import { UpdateQueryFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/update-query.factory';
+import { FindOneQueryFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/find-one-query.factory';
+import { FindManyQueryFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/find-many-query.factory';
+import { DeleteVariablesFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/delete-variables.factory';
+import { CreateVariablesFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/create-variables.factory';
+import { UpdateVariablesFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/update-variables.factory';
+import { GetVariablesFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/get-variables.factory';
+import { parsePath } from 'src/engine/api/rest/api-rest-query-builder/utils/parse-path.utils';
+import { computeDepth } from 'src/engine/api/rest/api-rest-query-builder/utils/compute-depth.utils';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { ApiRestQuery } from 'src/engine/api/rest/types/api-rest-query.type';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+
+@Injectable()
+export class ApiRestQueryBuilderFactory {
+  constructor(
+    private readonly deleteQueryFactory: DeleteQueryFactory,
+    private readonly createQueryFactory: CreateQueryFactory,
+    private readonly updateQueryFactory: UpdateQueryFactory,
+    private readonly findOneQueryFactory: FindOneQueryFactory,
+    private readonly findManyQueryFactory: FindManyQueryFactory,
+    private readonly deleteVariablesFactory: DeleteVariablesFactory,
+    private readonly createVariablesFactory: CreateVariablesFactory,
+    private readonly updateVariablesFactory: UpdateVariablesFactory,
+    private readonly getVariablesFactory: GetVariablesFactory,
+    private readonly objectMetadataService: ObjectMetadataService,
+    private readonly tokenService: TokenService,
+    private readonly environmentService: EnvironmentService,
+  ) {}
+
+  async getObjectMetadata(request: Request): Promise<{
+    objectMetadataItems: ObjectMetadataEntity[];
+    objectMetadataItem: ObjectMetadataEntity;
+  }> {
+    const { workspace } = await this.tokenService.validateToken(request);
+
+    const objectMetadataItems =
+      await this.objectMetadataService.findManyWithinWorkspace(workspace.id);
+
+    if (!objectMetadataItems.length) {
+      throw new BadRequestException(
+        `No object was found for the workspace associated with this API key. You may generate a new one here ${this.environmentService.get(
+          'FRONT_BASE_URL',
+        )}/settings/developers`,
+      );
+    }
+
+    const { object: parsedObject } = parsePath(request);
+
+    const [objectMetadata] = objectMetadataItems.filter(
+      (object) => object.namePlural === parsedObject,
+    );
+
+    if (!objectMetadata) {
+      const [wrongObjectMetadata] = objectMetadataItems.filter(
+        (object) => object.nameSingular === parsedObject,
+      );
+
+      let hint = 'eg: companies';
+
+      if (wrongObjectMetadata) {
+        hint = `Did you mean '${wrongObjectMetadata.namePlural}'?`;
+      }
+
+      throw new BadRequestException(
+        `object '${parsedObject}' not found. ${hint}`,
+      );
+    }
+
+    return {
+      objectMetadataItems,
+      objectMetadataItem: objectMetadata,
+    };
+  }
+
+  async delete(request: Request): Promise<ApiRestQuery> {
+    const objectMetadata = await this.getObjectMetadata(request);
+
+    const { id } = parsePath(request);
+
+    if (!id) {
+      throw new BadRequestException(
+        `delete ${objectMetadata.objectMetadataItem.nameSingular} query invalid. Id missing. eg: /rest/${objectMetadata.objectMetadataItem.namePlural}/0d4389ef-ea9c-4ae8-ada1-1cddc440fb56`,
+      );
+    }
+
+    return {
+      query: this.deleteQueryFactory.create(objectMetadata.objectMetadataItem),
+      variables: this.deleteVariablesFactory.create(id),
+    };
+  }
+
+  async create(request): Promise<ApiRestQuery> {
+    const objectMetadata = await this.getObjectMetadata(request);
+
+    const depth = computeDepth(request);
+
+    return {
+      query: this.createQueryFactory.create(objectMetadata, depth),
+      variables: this.createVariablesFactory.create(request),
+    };
+  }
+
+  async update(request): Promise<ApiRestQuery> {
+    const objectMetadata = await this.getObjectMetadata(request);
+
+    const depth = computeDepth(request);
+
+    const { id } = parsePath(request);
+
+    if (!id) {
+      throw new BadRequestException(
+        `update ${objectMetadata.objectMetadataItem.nameSingular} query invalid. Id missing. eg: /rest/${objectMetadata.objectMetadataItem.namePlural}/0d4389ef-ea9c-4ae8-ada1-1cddc440fb56`,
+      );
+    }
+
+    return {
+      query: this.updateQueryFactory.create(objectMetadata, depth),
+      variables: this.updateVariablesFactory.create(id, request),
+    };
+  }
+
+  async get(request): Promise<ApiRestQuery> {
+    const objectMetadata = await this.getObjectMetadata(request);
+
+    const depth = computeDepth(request);
+
+    const { id } = parsePath(request);
+
+    return {
+      query: id
+        ? this.findOneQueryFactory.create(objectMetadata, depth)
+        : this.findManyQueryFactory.create(objectMetadata, depth),
+      variables: this.getVariablesFactory.create(id, request, objectMetadata),
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/api-rest-query-builder.module.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/api-rest-query-builder.module.ts
new file mode 100644
index 000000000000..d4c09f901561
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/api-rest-query-builder.module.ts
@@ -0,0 +1,13 @@
+import { Module } from '@nestjs/common';
+
+import { ApiRestQueryBuilderFactory } from 'src/engine/api/rest/api-rest-query-builder/api-rest-query-builder.factory';
+import { apiRestQueryBuilderFactories } from 'src/engine/api/rest/api-rest-query-builder/factories/factories';
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
+import { AuthModule } from 'src/engine/core-modules/auth/auth.module';
+
+@Module({
+  imports: [ObjectMetadataModule, AuthModule],
+  providers: [...apiRestQueryBuilderFactories, ApiRestQueryBuilderFactory],
+  exports: [ApiRestQueryBuilderFactory],
+})
+export class ApiRestQueryBuilderModule {}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/create-query.factory.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/create-query.factory.ts
similarity index 84%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/create-query.factory.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/create-query.factory.ts
index 16622d8ed5f6..731567e162e5 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/create-query.factory.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/create-query.factory.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 import { capitalize } from 'src/utils/capitalize';
-import { mapFieldMetadataToGraphqlQuery } from 'src/core/api-rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils';
+import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils';
 
 @Injectable()
 export class CreateQueryFactory {
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/create-variables.factory.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/create-variables.factory.ts
new file mode 100644
index 000000000000..190d50fd9b3c
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/create-variables.factory.ts
@@ -0,0 +1,12 @@
+import { Injectable } from '@nestjs/common';
+
+import { ApiRestQueryVariables } from 'src/engine/api/rest/types/api-rest-query-variables.type';
+
+@Injectable()
+export class CreateVariablesFactory {
+  create(request: Request): ApiRestQueryVariables {
+    return {
+      data: request.body,
+    };
+  }
+}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/delete-query.factory.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/delete-query.factory.ts
similarity index 86%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/delete-query.factory.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/delete-query.factory.ts
index d1f0a497ee95..e3fa74fa99fa 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/delete-query.factory.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/delete-query.factory.ts
@@ -8,7 +8,7 @@ export class DeleteQueryFactory {
     const objectNameSingular = capitalize(objectMetadataItem.nameSingular);
 
     return `
-      mutation Delete${objectNameSingular}($id: ID!) {
+      mutation Delete${objectNameSingular}($id: UUID!) {
         delete${objectNameSingular}(id: $id) {
           id
         }
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/delete-variables.factory.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/delete-variables.factory.ts
new file mode 100644
index 000000000000..4cd89b779550
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/delete-variables.factory.ts
@@ -0,0 +1,12 @@
+import { Injectable } from '@nestjs/common';
+
+import { ApiRestQueryVariables } from 'src/engine/api/rest/types/api-rest-query-variables.type';
+
+@Injectable()
+export class DeleteVariablesFactory {
+  create(id: string): ApiRestQueryVariables {
+    return {
+      id: id,
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/factories.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/factories.ts
new file mode 100644
index 000000000000..a2e3951a9939
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/factories.ts
@@ -0,0 +1,29 @@
+import { DeleteQueryFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/delete-query.factory';
+import { CreateQueryFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/create-query.factory';
+import { UpdateQueryFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/update-query.factory';
+import { FindOneQueryFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/find-one-query.factory';
+import { FindManyQueryFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/find-many-query.factory';
+import { DeleteVariablesFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/delete-variables.factory';
+import { CreateVariablesFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/create-variables.factory';
+import { UpdateVariablesFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/update-variables.factory';
+import { GetVariablesFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/get-variables.factory';
+import { LastCursorInputFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/last-cursor-input.factory';
+import { LimitInputFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/limit-input.factory';
+import { OrderByInputFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/order-by-input.factory';
+import { FilterInputFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-input.factory';
+
+export const apiRestQueryBuilderFactories = [
+  DeleteQueryFactory,
+  CreateQueryFactory,
+  UpdateQueryFactory,
+  FindOneQueryFactory,
+  FindManyQueryFactory,
+  DeleteVariablesFactory,
+  CreateVariablesFactory,
+  UpdateVariablesFactory,
+  GetVariablesFactory,
+  LastCursorInputFactory,
+  LimitInputFactory,
+  OrderByInputFactory,
+  FilterInputFactory,
+];
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/find-many-query.factory.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/find-many-query.factory.ts
new file mode 100644
index 000000000000..2f5a6b36daac
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/find-many-query.factory.ts
@@ -0,0 +1,48 @@
+import { Injectable } from '@nestjs/common';
+
+import { capitalize } from 'src/utils/capitalize';
+import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils';
+
+@Injectable()
+export class FindManyQueryFactory {
+  create(objectMetadata, depth?: number): string {
+    const objectNameSingular = capitalize(
+      objectMetadata.objectMetadataItem.nameSingular,
+    );
+    const objectNamePlural = objectMetadata.objectMetadataItem.namePlural;
+
+    return `
+      query FindMany${capitalize(objectNamePlural)}(
+        $filter: ${objectNameSingular}FilterInput,
+        $orderBy: ${objectNameSingular}OrderByInput,
+        $lastCursor: String,
+        $limit: Float = 60
+        ) {
+        ${objectNamePlural}(
+        filter: $filter, orderBy: $orderBy, first: $limit, after: $lastCursor
+        ) {
+          edges {
+            node {
+              id
+              ${objectMetadata.objectMetadataItem.fields
+                .map((field) =>
+                  mapFieldMetadataToGraphqlQuery(
+                    objectMetadata.objectMetadataItems,
+                    field,
+                    depth,
+                  ),
+                )
+                .join('\n')}
+              }
+            cursor
+          }
+          pageInfo {
+            hasNextPage
+            startCursor
+            endCursor
+          }
+        }
+      }
+    `;
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/find-one-query.factory.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/find-one-query.factory.ts
new file mode 100644
index 000000000000..0ab363e409f7
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/find-one-query.factory.ts
@@ -0,0 +1,30 @@
+import { Injectable } from '@nestjs/common';
+
+import { capitalize } from 'src/utils/capitalize';
+import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils';
+
+@Injectable()
+export class FindOneQueryFactory {
+  create(objectMetadata, depth?: number): string {
+    const objectNameSingular = objectMetadata.objectMetadataItem.nameSingular;
+
+    return `
+      query FindOne${capitalize(objectNameSingular)}(
+        $filter: ${capitalize(objectNameSingular)}FilterInput!,
+        ) {
+        ${objectNameSingular}(filter: $filter) {
+          id
+          ${objectMetadata.objectMetadataItem.fields
+            .map((field) =>
+              mapFieldMetadataToGraphqlQuery(
+                objectMetadata.objectMetadataItems,
+                field,
+                depth,
+              ),
+            )
+            .join('\n')}
+        }
+      }
+    `;
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/get-variables.factory.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/get-variables.factory.ts
new file mode 100644
index 000000000000..dfe87ce77d5a
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/get-variables.factory.ts
@@ -0,0 +1,36 @@
+import { Injectable } from '@nestjs/common';
+
+import { Request } from 'express';
+
+import { LastCursorInputFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/last-cursor-input.factory';
+import { LimitInputFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/limit-input.factory';
+import { OrderByInputFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/order-by-input.factory';
+import { FilterInputFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-input.factory';
+import { ApiRestQueryVariables } from 'src/engine/api/rest/types/api-rest-query-variables.type';
+
+@Injectable()
+export class GetVariablesFactory {
+  constructor(
+    private readonly lastCursorInputFactory: LastCursorInputFactory,
+    private readonly limitInputFactory: LimitInputFactory,
+    private readonly orderByInputFactory: OrderByInputFactory,
+    private readonly filterInputFactory: FilterInputFactory,
+  ) {}
+
+  create(
+    id: string | undefined,
+    request: Request,
+    objectMetadata,
+  ): ApiRestQueryVariables {
+    if (id) {
+      return { filter: { id: { eq: id } } };
+    }
+
+    return {
+      filter: this.filterInputFactory.create(request, objectMetadata),
+      orderBy: this.orderByInputFactory.create(request, objectMetadata),
+      limit: this.limitInputFactory.create(request),
+      lastCursor: this.lastCursorInputFactory.create(request),
+    };
+  }
+}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/__tests__/filter-input.factory.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/__tests__/filter-input.factory.spec.ts
similarity index 93%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/__tests__/filter-input.factory.spec.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/__tests__/filter-input.factory.spec.ts
index aeeeb57011da..d4e9e3cf85ca 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/__tests__/filter-input.factory.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/__tests__/filter-input.factory.spec.ts
@@ -1,10 +1,10 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { objectMetadataItem } from 'src/utils/utils-test/object-metadata-item';
-import { FilterInputFactory } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-input.factory';
+import { objectMetadataItemMock } from 'src/engine/api/__mocks__/object-metadata-item.mock';
+import { FilterInputFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-input.factory';
 
 describe('FilterInputFactory', () => {
-  const objectMetadata = { objectMetadataItem: objectMetadataItem };
+  const objectMetadata = { objectMetadataItem: objectMetadataItemMock };
 
   let service: FilterInputFactory;
 
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/__tests__/last-cursor-input.factory.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/__tests__/last-cursor-input.factory.spec.ts
similarity index 85%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/__tests__/last-cursor-input.factory.spec.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/__tests__/last-cursor-input.factory.spec.ts
index 6d0c7281efc7..58a7f1432828 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/__tests__/last-cursor-input.factory.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/__tests__/last-cursor-input.factory.spec.ts
@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { LastCursorInputFactory } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/last-cursor-input.factory';
+import { LastCursorInputFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/last-cursor-input.factory';
 
 describe('LastCursorInputFactory', () => {
   let service: LastCursorInputFactory;
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/__tests__/limit-input.factory.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/__tests__/limit-input.factory.spec.ts
similarity index 90%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/__tests__/limit-input.factory.spec.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/__tests__/limit-input.factory.spec.ts
index 5851a878ff5b..a3e0fcdf6bd9 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/__tests__/limit-input.factory.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/__tests__/limit-input.factory.spec.ts
@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { LimitInputFactory } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/limit-input.factory';
+import { LimitInputFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/limit-input.factory';
 
 describe('LimitInputFactory', () => {
   let service: LimitInputFactory;
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/__tests__/order-by-input.factory.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/__tests__/order-by-input.factory.spec.ts
similarity index 90%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/__tests__/order-by-input.factory.spec.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/__tests__/order-by-input.factory.spec.ts
index ceb08ce2778b..7e09cbc73a4f 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/__tests__/order-by-input.factory.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/__tests__/order-by-input.factory.spec.ts
@@ -1,12 +1,12 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { OrderByDirection } from 'src/workspace/workspace-query-builder/interfaces/record.interface';
+import { OrderByDirection } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
 
-import { objectMetadataItem } from 'src/utils/utils-test/object-metadata-item';
-import { OrderByInputFactory } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/order-by-input.factory';
+import { objectMetadataItemMock } from 'src/engine/api/__mocks__/object-metadata-item.mock';
+import { OrderByInputFactory } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/order-by-input.factory';
 
 describe('OrderByInputFactory', () => {
-  const objectMetadata = { objectMetadataItem: objectMetadataItem };
+  const objectMetadata = { objectMetadataItem: objectMetadataItemMock };
 
   let service: OrderByInputFactory;
 
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-input.factory.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-input.factory.ts
new file mode 100644
index 000000000000..be2efdfbbd5e
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-input.factory.ts
@@ -0,0 +1,25 @@
+import { Injectable } from '@nestjs/common';
+
+import { Request } from 'express';
+
+import { addDefaultConjunctionIfMissing } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils';
+import { checkFilterQuery } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/check-filter-query.utils';
+import { parseFilter } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils';
+import { FieldValue } from 'src/engine/api/rest/types/api-rest-field-value.type';
+
+@Injectable()
+export class FilterInputFactory {
+  create(request: Request, objectMetadata): Record<string, FieldValue> {
+    let filterQuery = request.query.filter;
+
+    if (typeof filterQuery !== 'string') {
+      return {};
+    }
+
+    checkFilterQuery(filterQuery);
+
+    filterQuery = addDefaultConjunctionIfMissing(filterQuery);
+
+    return parseFilter(filterQuery, objectMetadata.objectMetadataItem);
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/add-default-conjunction.utils.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/add-default-conjunction.utils.spec.ts
new file mode 100644
index 000000000000..90a58f59caf9
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/add-default-conjunction.utils.spec.ts
@@ -0,0 +1,15 @@
+import { addDefaultConjunctionIfMissing } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils';
+
+describe('addDefaultConjunctionIfMissing', () => {
+  it('should add default conjunction if missing', () => {
+    expect(addDefaultConjunctionIfMissing('field[eq]:1')).toEqual(
+      'and(field[eq]:1)',
+    );
+  });
+
+  it('should not add default conjunction if not missing', () => {
+    expect(addDefaultConjunctionIfMissing('and(field[eq]:1)')).toEqual(
+      'and(field[eq]:1)',
+    );
+  });
+});
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/check-filter-enum-values.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/check-filter-enum-values.spec.ts
new file mode 100644
index 000000000000..7c4f35d0a140
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/check-filter-enum-values.spec.ts
@@ -0,0 +1,30 @@
+import { checkFilterEnumValues } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/check-filter-enum-values';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  fieldSelectMock,
+  objectMetadataItemMock,
+} from 'src/engine/api/__mocks__/object-metadata-item.mock';
+
+describe('checkFilterEnumValues', () => {
+  it('should check properly', () => {
+    expect(() =>
+      checkFilterEnumValues(
+        FieldMetadataType.SELECT,
+        fieldSelectMock.name,
+        'OPTION_1',
+        objectMetadataItemMock,
+      ),
+    ).not.toThrow();
+
+    expect(() =>
+      checkFilterEnumValues(
+        FieldMetadataType.SELECT,
+        fieldSelectMock.name,
+        'MISSING_OPTION',
+        objectMetadataItemMock,
+      ),
+    ).toThrow(
+      `'filter' enum value 'MISSING_OPTION' not available in '${fieldSelectMock.name}' enum. Available enum values are ['OPTION_1', 'OPTION_2']`,
+    );
+  });
+});
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/check-filter-query.utils.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/check-filter-query.utils.spec.ts
similarity index 86%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/check-filter-query.utils.spec.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/check-filter-query.utils.spec.ts
index 1471f66d3b37..88d08c661ce8 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/check-filter-query.utils.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/check-filter-query.utils.spec.ts
@@ -1,4 +1,4 @@
-import { checkFilterQuery } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/check-filter-query.utils';
+import { checkFilterQuery } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/check-filter-query.utils';
 
 describe('checkFilterQuery', () => {
   it('should check filter query', () => {
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/format-field-values.utils.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/format-field-values.utils.spec.ts
similarity index 86%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/format-field-values.utils.spec.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/format-field-values.utils.spec.ts
index 8bbf87d1eb4e..22ad6baa6544 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/format-field-values.utils.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/format-field-values.utils.spec.ts
@@ -1,5 +1,5 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { formatFieldValue } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/format-field-values.utils';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { formatFieldValue } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/format-field-values.utils';
 
 describe('formatFieldValue', () => {
   it('should format fieldNumber value', () => {
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-base-filter.utils.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-base-filter.utils.spec.ts
similarity index 90%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-base-filter.utils.spec.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-base-filter.utils.spec.ts
index aed61bb6f4b9..d335485abbee 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-base-filter.utils.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-base-filter.utils.spec.ts
@@ -1,4 +1,4 @@
-import { parseBaseFilter } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-base-filter.utils';
+import { parseBaseFilter } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-base-filter.utils';
 
 describe('parseBaseFilter', () => {
   it('should parse simple filter string test 1', () => {
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-filter-content.utils.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-filter-content.utils.spec.ts
similarity index 91%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-filter-content.utils.spec.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-filter-content.utils.spec.ts
index 1d09464eea12..fc08fc400df2 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-filter-content.utils.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-filter-content.utils.spec.ts
@@ -1,4 +1,4 @@
-import { parseFilterContent } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter-content.utils';
+import { parseFilterContent } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter-content.utils';
 
 describe('parseFilterContent', () => {
   it('should parse query filter test 1', () => {
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-filter.utils.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-filter.utils.spec.ts
similarity index 85%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-filter.utils.spec.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-filter.utils.spec.ts
index b0bbfef883f8..a5c36b91dcfb 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-filter.utils.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/__tests__/parse-filter.utils.spec.ts
@@ -1,12 +1,12 @@
-import { objectMetadataItem } from 'src/utils/utils-test/object-metadata-item';
-import { parseFilter } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils';
+import { objectMetadataItemMock } from 'src/engine/api/__mocks__/object-metadata-item.mock';
+import { parseFilter } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils';
 
 describe('parseFilter', () => {
   it('should parse string filter test 1', () => {
     expect(
       parseFilter(
         'and(fieldNumber[eq]:1,fieldNumber[eq]:2)',
-        objectMetadataItem,
+        objectMetadataItemMock,
       ),
     ).toEqual({
       and: [{ fieldNumber: { eq: 1 } }, { fieldNumber: { eq: 2 } }],
@@ -17,7 +17,7 @@ describe('parseFilter', () => {
     expect(
       parseFilter(
         'and(fieldNumber[eq]:1,or(fieldNumber[eq]:2,fieldNumber[eq]:3))',
-        objectMetadataItem,
+        objectMetadataItemMock,
       ),
     ).toEqual({
       and: [
@@ -31,7 +31,7 @@ describe('parseFilter', () => {
     expect(
       parseFilter(
         'and(fieldNumber[eq]:1,or(fieldNumber[eq]:2,fieldNumber[eq]:3,and(fieldNumber[eq]:6,fieldNumber[eq]:7)),or(fieldNumber[eq]:4,fieldNumber[eq]:5))',
-        objectMetadataItem,
+        objectMetadataItemMock,
       ),
     ).toEqual({
       and: [
@@ -52,7 +52,7 @@ describe('parseFilter', () => {
     expect(
       parseFilter(
         'and(fieldString[gt]:"val,ue",or(fieldNumber[is]:NOT_NULL,not(fieldString[startsWith]:"val"),and(fieldNumber[eq]:6,fieldString[ilike]:"%val%")),or(fieldNumber[eq]:4,fieldString[is]:NULL))',
-        objectMetadataItem,
+        objectMetadataItemMock,
       ),
     ).toEqual({
       and: [
@@ -78,7 +78,7 @@ describe('parseFilter', () => {
     expect(
       parseFilter(
         'and(fieldNumber[eq]:1,not(fieldNumber[eq]:2))',
-        objectMetadataItem,
+        objectMetadataItemMock,
       ),
     ).toEqual({
       and: [
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils.ts
new file mode 100644
index 000000000000..61606bb10b4f
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils.ts
@@ -0,0 +1,11 @@
+import { Conjunctions } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils';
+
+export const DEFAULT_CONJUNCTION = Conjunctions.and;
+
+export const addDefaultConjunctionIfMissing = (filterQuery: string): string => {
+  if (!(filterQuery.includes('(') && filterQuery.includes(')'))) {
+    return `${DEFAULT_CONJUNCTION}(${filterQuery})`;
+  }
+
+  return filterQuery;
+};
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/check-filter-enum-values.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/check-filter-enum-values.ts
new file mode 100644
index 000000000000..3a57186c15cb
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/check-filter-enum-values.ts
@@ -0,0 +1,42 @@
+import { BadRequestException } from '@nestjs/common';
+
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+export const checkFilterEnumValues = (
+  fieldType: FieldMetadataType | undefined,
+  fieldName: string,
+  value: string,
+  objectMetadataItem: ObjectMetadataInterface,
+): void => {
+  if (
+    !fieldType ||
+    ![FieldMetadataType.MULTI_SELECT, FieldMetadataType.SELECT].includes(
+      fieldType,
+    )
+  ) {
+    return;
+  }
+  const field = objectMetadataItem.fields.find(
+    (field) => field.name === fieldName,
+  );
+
+  const values = /^\[.*\]$/.test(value)
+    ? value.slice(1, -1).split(',')
+    : [value];
+  const enumValues = field?.options?.map((option) => option.value);
+
+  if (!enumValues) {
+    return;
+  }
+  values.forEach((val) => {
+    if (!enumValues.includes(val)) {
+      throw new BadRequestException(
+        `'filter' enum value '${val}' not available in '${fieldName}' enum. Available enum values are ['${enumValues.join(
+          "', '",
+        )}']`,
+      );
+    }
+  });
+};
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/check-filter-query.utils.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/check-filter-query.utils.ts
similarity index 100%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/check-filter-query.utils.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/check-filter-query.utils.ts
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/format-field-values.utils.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/format-field-values.utils.ts
similarity index 85%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/format-field-values.utils.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/format-field-values.utils.ts
index 2c7a4bdd78a8..4271970ce1d2 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/format-field-values.utils.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/format-field-values.utils.ts
@@ -1,7 +1,7 @@
 import { BadRequestException } from '@nestjs/common';
 
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { FieldValue } from 'src/core/api-rest/types/api-rest-field-value.type';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldValue } from 'src/engine/api/rest/types/api-rest-field-value.type';
 
 export const formatFieldValue = (
   value: string,
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-base-filter.utils.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-base-filter.utils.ts
similarity index 100%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-base-filter.utils.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-base-filter.utils.ts
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter-content.utils.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter-content.utils.ts
similarity index 100%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter-content.utils.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter-content.utils.ts
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils.ts
new file mode 100644
index 000000000000..74d5e6179254
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils.ts
@@ -0,0 +1,72 @@
+import { BadRequestException } from '@nestjs/common';
+
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import { parseFilterContent } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter-content.utils';
+import { parseBaseFilter } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-base-filter.utils';
+import {
+  checkFields,
+  getFieldType,
+} from 'src/engine/api/rest/api-rest-query-builder/utils/fields.utils';
+import { formatFieldValue } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/format-field-values.utils';
+import { FieldValue } from 'src/engine/api/rest/types/api-rest-field-value.type';
+import { checkFilterEnumValues } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/check-filter-enum-values';
+
+export enum Conjunctions {
+  or = 'or',
+  and = 'and',
+  not = 'not',
+}
+
+export const parseFilter = (
+  filterQuery: string,
+  objectMetadataItem: ObjectMetadataInterface,
+): Record<string, FieldValue> => {
+  const result = {};
+  const match = filterQuery.match(
+    `^(${Object.values(Conjunctions).join('|')})((.+))$`,
+  );
+
+  if (match) {
+    const conjunction = match?.[1];
+
+    if (!conjunction) {
+      throw new BadRequestException(
+        'Error while matching filter query. Conjunction not found',
+      );
+    }
+    const subResult = parseFilterContent(filterQuery).map((elem) =>
+      parseFilter(elem, objectMetadataItem),
+    );
+
+    if (conjunction === Conjunctions.not) {
+      if (subResult.length > 1) {
+        throw new BadRequestException(
+          `'filter' invalid. 'not' conjunction should contain only 1 condition. eg: not(field[eq]:1)`,
+        );
+      }
+      result[conjunction] = subResult[0];
+    } else {
+      result[conjunction] = subResult;
+    }
+
+    return result;
+  }
+  const { fields, comparator, value } = parseBaseFilter(filterQuery);
+
+  const fieldName = fields[0];
+
+  checkFields(objectMetadataItem, fields);
+  const fieldType = getFieldType(objectMetadataItem, fieldName);
+
+  checkFilterEnumValues(fieldType, fieldName, value, objectMetadataItem);
+
+  const formattedValue = formatFieldValue(value, fieldType, comparator);
+
+  return fields.reverse().reduce(
+    (acc, currentValue) => {
+      return { [currentValue]: acc };
+    },
+    { [comparator]: formattedValue },
+  );
+};
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/last-cursor-input.factory.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/last-cursor-input.factory.ts
similarity index 100%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/last-cursor-input.factory.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/last-cursor-input.factory.ts
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/limit-input.factory.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/limit-input.factory.ts
similarity index 100%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/limit-input.factory.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/limit-input.factory.ts
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/order-by-input.factory.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/order-by-input.factory.ts
similarity index 91%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/order-by-input.factory.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/order-by-input.factory.ts
index 2fb18068acd8..56720b1208ff 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/input-factories/order-by-input.factory.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/input-factories/order-by-input.factory.ts
@@ -5,9 +5,9 @@ import { Request } from 'express';
 import {
   OrderByDirection,
   RecordOrderBy,
-} from 'src/workspace/workspace-query-builder/interfaces/record.interface';
+} from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
 
-import { checkFields } from 'src/core/api-rest/api-rest-query-builder/utils/fields.utils';
+import { checkFields } from 'src/engine/api/rest/api-rest-query-builder/utils/fields.utils';
 
 export const DEFAULT_ORDER_DIRECTION = OrderByDirection.AscNullsFirst;
 
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/update-query.factory.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/update-query.factory.ts
similarity index 77%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/update-query.factory.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/update-query.factory.ts
index 386ec4b97c9e..e2be04b652e7 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/factories/update-query.factory.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/update-query.factory.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 import { capitalize } from 'src/utils/capitalize';
-import { mapFieldMetadataToGraphqlQuery } from 'src/core/api-rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils';
+import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils';
 
 @Injectable()
 export class UpdateQueryFactory {
@@ -11,7 +11,7 @@ export class UpdateQueryFactory {
     return `
       mutation Update${capitalize(
         objectNameSingular,
-      )}($id: ID!, $data: ${capitalize(objectNameSingular)}UpdateInput!) {
+      )}($id: UUID!, $data: ${capitalize(objectNameSingular)}UpdateInput!) {
         update${capitalize(objectNameSingular)}(id: $id, data: $data) {
           id
           ${objectMetadata.objectMetadataItem.fields
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/update-variables.factory.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/update-variables.factory.ts
new file mode 100644
index 000000000000..2d1bca67ef5e
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/factories/update-variables.factory.ts
@@ -0,0 +1,13 @@
+import { Injectable } from '@nestjs/common';
+
+import { ApiRestQueryVariables } from 'src/engine/api/rest/types/api-rest-query-variables.type';
+
+@Injectable()
+export class UpdateVariablesFactory {
+  create(id: string, request: Request): ApiRestQueryVariables {
+    return {
+      id,
+      data: request.body,
+    };
+  }
+}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/__tests__/compute-depth.utils.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/__tests__/compute-depth.utils.spec.ts
similarity index 85%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/__tests__/compute-depth.utils.spec.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/__tests__/compute-depth.utils.spec.ts
index b257618fbaea..3fc57097f5ac 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/__tests__/compute-depth.utils.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/__tests__/compute-depth.utils.spec.ts
@@ -1,4 +1,4 @@
-import { computeDepth } from 'src/core/api-rest/api-rest-query-builder/utils/compute-depth.utils';
+import { computeDepth } from 'src/engine/api/rest/api-rest-query-builder/utils/compute-depth.utils';
 
 describe('computeDepth', () => {
   it('should compute depth from query', () => {
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/__tests__/fields.utils.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/__tests__/fields.utils.spec.ts
new file mode 100644
index 000000000000..fc0e2bc44cbb
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/__tests__/fields.utils.spec.ts
@@ -0,0 +1,32 @@
+import { objectMetadataItemMock } from 'src/engine/api/__mocks__/object-metadata-item.mock';
+import {
+  checkFields,
+  getFieldType,
+} from 'src/engine/api/rest/api-rest-query-builder/utils/fields.utils';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+describe('FieldUtils', () => {
+  describe('getFieldType', () => {
+    it('should get field type', () => {
+      expect(getFieldType(objectMetadataItemMock, 'fieldNumber')).toEqual(
+        FieldMetadataType.NUMBER,
+      );
+    });
+  });
+
+  describe('checkFields', () => {
+    it('should check field types', () => {
+      expect(() =>
+        checkFields(objectMetadataItemMock, ['fieldNumber']),
+      ).not.toThrow();
+
+      expect(() =>
+        checkFields(objectMetadataItemMock, ['wrongField']),
+      ).toThrow();
+
+      expect(() =>
+        checkFields(objectMetadataItemMock, ['fieldNumber', 'wrongField']),
+      ).toThrow();
+    });
+  });
+});
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/__tests__/map-field-metadata-to-graphql-query.utils.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/__tests__/map-field-metadata-to-graphql-query.utils.spec.ts
new file mode 100644
index 000000000000..fea18cb63bbe
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/__tests__/map-field-metadata-to-graphql-query.utils.spec.ts
@@ -0,0 +1,37 @@
+import {
+  fieldCurrencyMock,
+  fieldLinkMock,
+  fieldNumberMock,
+  fieldStringMock,
+  objectMetadataItemMock,
+} from 'src/engine/api/__mocks__/object-metadata-item.mock';
+import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils';
+
+describe('mapFieldMetadataToGraphqlQuery', () => {
+  it('should map properly', () => {
+    expect(
+      mapFieldMetadataToGraphqlQuery(objectMetadataItemMock, fieldNumberMock),
+    ).toEqual('fieldNumber');
+    expect(
+      mapFieldMetadataToGraphqlQuery(objectMetadataItemMock, fieldStringMock),
+    ).toEqual('fieldString');
+    expect(
+      mapFieldMetadataToGraphqlQuery(objectMetadataItemMock, fieldLinkMock),
+    ).toEqual(`
+      fieldLink
+      {
+        label
+        url
+      }
+    `);
+    expect(
+      mapFieldMetadataToGraphqlQuery(objectMetadataItemMock, fieldCurrencyMock),
+    ).toEqual(`
+      fieldCurrency
+      {
+        amountMicros
+        currencyCode
+      }
+    `);
+  });
+});
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/__tests__/parse-path.utils.spec.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/__tests__/parse-path.utils.spec.ts
similarity index 82%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/__tests__/parse-path.utils.spec.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/__tests__/parse-path.utils.spec.ts
index bd2cd22c6752..b81a46d5d031 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/__tests__/parse-path.utils.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/__tests__/parse-path.utils.spec.ts
@@ -1,4 +1,4 @@
-import { parsePath } from 'src/core/api-rest/api-rest-query-builder/utils/parse-path.utils';
+import { parsePath } from 'src/engine/api/rest/api-rest-query-builder/utils/parse-path.utils';
 
 describe('parsePath', () => {
   it('should parse object from request path', () => {
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/compute-depth.utils.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/compute-depth.utils.ts
similarity index 100%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/compute-depth.utils.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/compute-depth.utils.ts
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/fields.utils.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/fields.utils.ts
new file mode 100644
index 000000000000..eca664a7a4f0
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/fields.utils.ts
@@ -0,0 +1,58 @@
+import { BadRequestException } from '@nestjs/common';
+
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import { compositeTypeDefintions } from 'src/engine/metadata-modules/field-metadata/composite-types';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+
+export const getFieldType = (
+  objectMetadata: ObjectMetadataInterface,
+  fieldName: string,
+): FieldMetadataType | undefined => {
+  for (const fieldMetdata of objectMetadata.fields) {
+    if (fieldName === fieldMetdata.name) {
+      return fieldMetdata.type;
+    }
+  }
+};
+
+export const checkFields = (
+  objectMetadata: ObjectMetadataInterface,
+  fieldNames: string[],
+): void => {
+  const fieldMetadataNames = objectMetadata.fields
+    .map((field) => {
+      if (isCompositeFieldMetadataType(field.type)) {
+        const compositeType = compositeTypeDefintions.get(field.type);
+
+        if (!compositeType) {
+          throw new BadRequestException(
+            `Composite type '${field.type}' not found`,
+          );
+        }
+
+        // TODO: Don't really know why we need to put fieldName and compositeType name here
+        return [
+          field.name,
+          compositeType.properties.map(
+            (compositeProperty) => compositeProperty.name,
+          ),
+        ].flat();
+      }
+
+      return field.name;
+    })
+    .flat();
+
+  for (const fieldName of fieldNames) {
+    if (!fieldMetadataNames.includes(fieldName)) {
+      throw new BadRequestException(
+        `field '${fieldName}' does not exist in '${computeObjectTargetTable(
+          objectMetadata,
+        )}' object`,
+      );
+    }
+  }
+};
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils.ts
similarity index 78%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils.ts
index a8dc2884058a..eec9a40c3726 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/map-field-metadata-to-graphql-query.utils.ts
@@ -1,8 +1,9 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { RelationMetadataType } from 'src/metadata/relation-metadata/relation-metadata.entity';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 
 const DEFAULT_DEPTH_VALUE = 2;
 
+// TODO: Should be properly type and based on composite type definitions
 export const mapFieldMetadataToGraphqlQuery = (
   objectMetadataItems,
   field,
@@ -19,9 +20,13 @@ export const mapFieldMetadataToGraphqlQuery = (
     FieldMetadataType.TEXT,
     FieldMetadataType.PHONE,
     FieldMetadataType.DATE_TIME,
+    FieldMetadataType.DATE,
     FieldMetadataType.EMAIL,
     FieldMetadataType.NUMBER,
+    FieldMetadataType.SELECT,
+    FieldMetadataType.RATING,
     FieldMetadataType.BOOLEAN,
+    FieldMetadataType.POSITION,
   ].includes(fieldType);
 
   if (fieldIsSimpleValue) {
@@ -103,5 +108,19 @@ export const mapFieldMetadataToGraphqlQuery = (
         lastName
       }
     `;
+  } else if (fieldType === FieldMetadataType.ADDRESS) {
+    return `
+      ${field.name}
+      {
+        addressStreet1
+        addressStreet2
+        addressCity
+        addressPostcode
+        addressState
+        addressCountry
+        addressLat
+        addressLng
+      }
+    `;
   }
 };
diff --git a/packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/parse-path.utils.ts b/packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/parse-path.utils.ts
similarity index 100%
rename from packages/twenty-server/src/core/api-rest/api-rest-query-builder/utils/parse-path.utils.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest-query-builder/utils/parse-path.utils.ts
diff --git a/packages/twenty-server/src/core/api-rest/api-rest.controller.ts b/packages/twenty-server/src/engine/api/rest/api-rest.controller.ts
similarity index 85%
rename from packages/twenty-server/src/core/api-rest/api-rest.controller.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest.controller.ts
index 3c2559d45de2..f1eee2cc3066 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest.controller.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest.controller.ts
@@ -2,8 +2,8 @@ import { Controller, Delete, Get, Post, Put, Req, Res } from '@nestjs/common';
 
 import { Request, Response } from 'express';
 
-import { ApiRestService } from 'src/core/api-rest/api-rest.service';
-import { handleResult } from 'src/core/api-rest/api-rest.controller.utils';
+import { ApiRestService } from 'src/engine/api/rest/api-rest.service';
+import { handleResult } from 'src/engine/api/rest/api-rest.controller.utils';
 
 @Controller('rest/*')
 export class ApiRestController {
diff --git a/packages/twenty-server/src/core/api-rest/api-rest.controller.utils.ts b/packages/twenty-server/src/engine/api/rest/api-rest.controller.utils.ts
similarity index 91%
rename from packages/twenty-server/src/core/api-rest/api-rest.controller.utils.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest.controller.utils.ts
index e82792b4fa8d..a45efb8a5fd6 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest.controller.utils.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest.controller.utils.ts
@@ -1,6 +1,6 @@
 import { Response } from 'express';
 
-import { ApiRestResponse } from 'src/core/api-rest/types/api-rest-response.type';
+import { ApiRestResponse } from 'src/engine/api/rest/types/api-rest-response.type';
 
 // https://gist.github.com/ManUtopiK/469aec75b655d6a4d912aeb3b75af3c9
 export const cleanGraphQLResponse = (input) => {
diff --git a/packages/twenty-server/src/engine/api/rest/api-rest.module.ts b/packages/twenty-server/src/engine/api/rest/api-rest.module.ts
new file mode 100644
index 000000000000..79f492733e9f
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/rest/api-rest.module.ts
@@ -0,0 +1,17 @@
+import { Module } from '@nestjs/common';
+import { HttpModule } from '@nestjs/axios';
+
+import { ApiRestController } from 'src/engine/api/rest/api-rest.controller';
+import { ApiRestService } from 'src/engine/api/rest/api-rest.service';
+import { ApiRestQueryBuilderModule } from 'src/engine/api/rest/api-rest-query-builder/api-rest-query-builder.module';
+import { AuthModule } from 'src/engine/core-modules/auth/auth.module';
+import { ApiRestMetadataController } from 'src/engine/api/rest/metadata-rest.controller';
+import { ApiRestMetadataService } from 'src/engine/api/rest/metadata-rest.service';
+
+@Module({
+  imports: [ApiRestQueryBuilderModule, AuthModule, HttpModule],
+  controllers: [ApiRestMetadataController, ApiRestController],
+  providers: [ApiRestMetadataService, ApiRestService],
+  exports: [ApiRestMetadataService],
+})
+export class ApiRestModule {}
diff --git a/packages/twenty-server/src/core/api-rest/api-rest.service.ts b/packages/twenty-server/src/engine/api/rest/api-rest.service.ts
similarity index 76%
rename from packages/twenty-server/src/core/api-rest/api-rest.service.ts
rename to packages/twenty-server/src/engine/api/rest/api-rest.service.ts
index 086784bb2fdf..4db2893f3082 100644
--- a/packages/twenty-server/src/core/api-rest/api-rest.service.ts
+++ b/packages/twenty-server/src/engine/api/rest/api-rest.service.ts
@@ -3,11 +3,12 @@ import { HttpService } from '@nestjs/axios';
 
 import { Request } from 'express';
 
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { ApiRestQueryBuilderFactory } from 'src/core/api-rest/api-rest-query-builder/api-rest-query-builder.factory';
-import { TokenService } from 'src/core/auth/services/token.service';
-import { ApiRestResponse } from 'src/core/api-rest/types/api-rest-response.type';
-import { ApiRestQuery } from 'src/core/api-rest/types/api-rest-query.type';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { ApiRestQueryBuilderFactory } from 'src/engine/api/rest/api-rest-query-builder/api-rest-query-builder.factory';
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+import { ApiRestResponse } from 'src/engine/api/rest/types/api-rest-response.type';
+import { ApiRestQuery } from 'src/engine/api/rest/types/api-rest-query.type';
+import { getServerUrl } from 'src/utils/get-server-url';
 
 @Injectable()
 export class ApiRestService {
@@ -22,9 +23,10 @@ export class ApiRestService {
     request: Request,
     data: ApiRestQuery,
   ): Promise<ApiRestResponse> {
-    const baseUrl =
-      this.environmentService.getServerUrl() ||
-      `${request.protocol}://${request.get('host')}`;
+    const baseUrl = getServerUrl(
+      request,
+      this.environmentService.get('SERVER_URL'),
+    );
 
     try {
       return await this.httpService.axiosRef.post(`${baseUrl}/graphql`, data, {
diff --git a/packages/twenty-server/src/core/api-rest/metadata-rest.controller.ts b/packages/twenty-server/src/engine/api/rest/metadata-rest.controller.ts
similarity index 84%
rename from packages/twenty-server/src/core/api-rest/metadata-rest.controller.ts
rename to packages/twenty-server/src/engine/api/rest/metadata-rest.controller.ts
index 2573a6b3a4d4..ea9728b86fc6 100644
--- a/packages/twenty-server/src/core/api-rest/metadata-rest.controller.ts
+++ b/packages/twenty-server/src/engine/api/rest/metadata-rest.controller.ts
@@ -2,8 +2,8 @@ import { Controller, Get, Delete, Post, Put, Req, Res } from '@nestjs/common';
 
 import { Request, Response } from 'express';
 
-import { handleResult } from 'src/core/api-rest/api-rest.controller.utils';
-import { ApiRestMetadataService } from 'src/core/api-rest/metadata-rest.service';
+import { handleResult } from 'src/engine/api/rest/api-rest.controller.utils';
+import { ApiRestMetadataService } from 'src/engine/api/rest/metadata-rest.service';
 
 @Controller('rest/metadata/*')
 export class ApiRestMetadataController {
diff --git a/packages/twenty-server/src/core/api-rest/metadata-rest.service.ts b/packages/twenty-server/src/engine/api/rest/metadata-rest.service.ts
similarity index 92%
rename from packages/twenty-server/src/core/api-rest/metadata-rest.service.ts
rename to packages/twenty-server/src/engine/api/rest/metadata-rest.service.ts
index 340889e61bc9..f5757dc36970 100644
--- a/packages/twenty-server/src/core/api-rest/metadata-rest.service.ts
+++ b/packages/twenty-server/src/engine/api/rest/metadata-rest.service.ts
@@ -1,12 +1,13 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { HttpService } from '@nestjs/axios';
 
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { ApiRestQueryBuilderFactory } from 'src/core/api-rest/api-rest-query-builder/api-rest-query-builder.factory';
-import { ApiRestQuery } from 'src/core/api-rest/types/api-rest-query.type';
-import { TokenService } from 'src/core/auth/services/token.service';
-import { parseMetadataPath } from 'src/core/api-rest/api-rest-query-builder/utils/parse-path.utils';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { ApiRestQueryBuilderFactory } from 'src/engine/api/rest/api-rest-query-builder/api-rest-query-builder.factory';
+import { ApiRestQuery } from 'src/engine/api/rest/types/api-rest-query.type';
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+import { parseMetadataPath } from 'src/engine/api/rest/api-rest-query-builder/utils/parse-path.utils';
 import { capitalize } from 'src/utils/capitalize';
+import { getServerUrl } from 'src/utils/get-server-url';
 
 @Injectable()
 export class ApiRestMetadataService {
@@ -18,9 +19,10 @@ export class ApiRestMetadataService {
   ) {}
 
   async callMetadata(request, data: ApiRestQuery) {
-    const baseUrl =
-      this.environmentService.getServerUrl() ||
-      `${request.protocol}://${request.get('host')}`;
+    const baseUrl = getServerUrl(
+      request,
+      this.environmentService.get('SERVER_URL'),
+    );
 
     try {
       return await this.httpService.axiosRef.post(`${baseUrl}/metadata`, data, {
@@ -179,7 +181,7 @@ export class ApiRestMetadataService {
 
     return `
       query FindOne${capitalize(objectNameSingular)}(
-        $id: ID!,
+        $id: UUID!,
         ) {
         ${objectNameSingular}(id: $id) {
           id
diff --git a/packages/twenty-server/src/core/api-rest/types/api-rest-field-value.type.ts b/packages/twenty-server/src/engine/api/rest/types/api-rest-field-value.type.ts
similarity index 100%
rename from packages/twenty-server/src/core/api-rest/types/api-rest-field-value.type.ts
rename to packages/twenty-server/src/engine/api/rest/types/api-rest-field-value.type.ts
diff --git a/packages/twenty-server/src/core/api-rest/types/api-rest-query-variables.type.ts b/packages/twenty-server/src/engine/api/rest/types/api-rest-query-variables.type.ts
similarity index 100%
rename from packages/twenty-server/src/core/api-rest/types/api-rest-query-variables.type.ts
rename to packages/twenty-server/src/engine/api/rest/types/api-rest-query-variables.type.ts
diff --git a/packages/twenty-server/src/core/api-rest/types/api-rest-query.type.ts b/packages/twenty-server/src/engine/api/rest/types/api-rest-query.type.ts
similarity index 100%
rename from packages/twenty-server/src/core/api-rest/types/api-rest-query.type.ts
rename to packages/twenty-server/src/engine/api/rest/types/api-rest-query.type.ts
diff --git a/packages/twenty-server/src/core/api-rest/types/api-rest-response.type.ts b/packages/twenty-server/src/engine/api/rest/types/api-rest-response.type.ts
similarity index 100%
rename from packages/twenty-server/src/core/api-rest/types/api-rest-response.type.ts
rename to packages/twenty-server/src/engine/api/rest/types/api-rest-response.type.ts
diff --git a/packages/twenty-server/src/engine/constants/settings/index.ts b/packages/twenty-server/src/engine/constants/settings/index.ts
new file mode 100644
index 000000000000..fadc116d7c47
--- /dev/null
+++ b/packages/twenty-server/src/engine/constants/settings/index.ts
@@ -0,0 +1,13 @@
+import { Settings } from './interfaces/settings.interface';
+
+export const settings: Settings = {
+  storage: {
+    imageCropSizes: {
+      'profile-picture': ['original'],
+      'workspace-logo': ['original'],
+      'person-picture': ['original'],
+    },
+    maxFileSize: '10MB',
+  },
+  minLengthOfStringForDuplicateCheck: 3,
+};
diff --git a/packages/twenty-server/src/engine/constants/settings/interfaces/settings.interface.ts b/packages/twenty-server/src/engine/constants/settings/interfaces/settings.interface.ts
new file mode 100644
index 000000000000..9a5ddf5d9c75
--- /dev/null
+++ b/packages/twenty-server/src/engine/constants/settings/interfaces/settings.interface.ts
@@ -0,0 +1,15 @@
+import { FileFolder } from 'src/engine/core-modules/file/interfaces/file-folder.interface';
+
+import { ShortCropSize } from 'src/utils/image';
+
+type ValueOfFileFolder = `${FileFolder}`;
+
+export interface Settings {
+  storage: {
+    imageCropSizes: {
+      [key in ValueOfFileFolder]?: ShortCropSize[];
+    };
+    maxFileSize: `${number}MB`;
+  };
+  minLengthOfStringForDuplicateCheck: number;
+}
diff --git a/packages/twenty-server/src/core/analytics/analytics.entity.ts b/packages/twenty-server/src/engine/core-modules/analytics/analytics.entity.ts
similarity index 100%
rename from packages/twenty-server/src/core/analytics/analytics.entity.ts
rename to packages/twenty-server/src/engine/core-modules/analytics/analytics.entity.ts
diff --git a/packages/twenty-server/src/core/analytics/analytics.module.ts b/packages/twenty-server/src/engine/core-modules/analytics/analytics.module.ts
similarity index 100%
rename from packages/twenty-server/src/core/analytics/analytics.module.ts
rename to packages/twenty-server/src/engine/core-modules/analytics/analytics.module.ts
diff --git a/packages/twenty-server/src/core/analytics/analytics.resolver.spec.ts b/packages/twenty-server/src/engine/core-modules/analytics/analytics.resolver.spec.ts
similarity index 89%
rename from packages/twenty-server/src/core/analytics/analytics.resolver.spec.ts
rename to packages/twenty-server/src/engine/core-modules/analytics/analytics.resolver.spec.ts
index 5015f09df6dc..f6f1e07d422f 100644
--- a/packages/twenty-server/src/core/analytics/analytics.resolver.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/analytics/analytics.resolver.spec.ts
@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { HttpService } from '@nestjs/axios';
 
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 
 import { AnalyticsResolver } from './analytics.resolver';
 import { AnalyticsService } from './analytics.service';
diff --git a/packages/twenty-server/src/engine/core-modules/analytics/analytics.resolver.ts b/packages/twenty-server/src/engine/core-modules/analytics/analytics.resolver.ts
new file mode 100644
index 000000000000..c62f30e0eb9b
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/analytics/analytics.resolver.ts
@@ -0,0 +1,36 @@
+import { Resolver, Mutation, Args, Context } from '@nestjs/graphql';
+import { UseGuards } from '@nestjs/common';
+
+import { Request } from 'express';
+
+import { OptionalJwtAuthGuard } from 'src/engine/guards/optional-jwt.auth.guard';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
+
+import { AnalyticsService } from './analytics.service';
+import { Analytics } from './analytics.entity';
+
+import { CreateAnalyticsInput } from './dto/create-analytics.input';
+
+@UseGuards(OptionalJwtAuthGuard)
+@Resolver(() => Analytics)
+export class AnalyticsResolver {
+  constructor(private readonly analyticsService: AnalyticsService) {}
+
+  @Mutation(() => Analytics)
+  track(
+    @Args() createAnalyticsInput: CreateAnalyticsInput,
+    @AuthWorkspace() workspace: Workspace | undefined,
+    @AuthUser({ allowUndefined: true }) user: User | undefined,
+    @Context('req') request: Request,
+  ) {
+    return this.analyticsService.create(
+      createAnalyticsInput,
+      user,
+      workspace,
+      request,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/core/analytics/analytics.service.spec.ts b/packages/twenty-server/src/engine/core-modules/analytics/analytics.service.spec.ts
similarity index 88%
rename from packages/twenty-server/src/core/analytics/analytics.service.spec.ts
rename to packages/twenty-server/src/engine/core-modules/analytics/analytics.service.spec.ts
index aecd70a70b27..c2cbd7a2f675 100644
--- a/packages/twenty-server/src/core/analytics/analytics.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/analytics/analytics.service.spec.ts
@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { HttpService } from '@nestjs/axios';
 
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 
 import { AnalyticsService } from './analytics.service';
 
diff --git a/packages/twenty-server/src/engine/core-modules/analytics/analytics.service.ts b/packages/twenty-server/src/engine/core-modules/analytics/analytics.service.ts
new file mode 100644
index 000000000000..0992f2d1d625
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/analytics/analytics.service.ts
@@ -0,0 +1,60 @@
+import { Injectable } from '@nestjs/common';
+import { HttpService } from '@nestjs/axios';
+
+import { Request } from 'express';
+
+import { anonymize } from 'src/utils/anonymize';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+
+import { CreateAnalyticsInput } from './dto/create-analytics.input';
+
+@Injectable()
+export class AnalyticsService {
+  constructor(
+    private readonly environmentService: EnvironmentService,
+    private readonly httpService: HttpService,
+  ) {}
+
+  async create(
+    createEventInput: CreateAnalyticsInput,
+    user: User | undefined,
+    workspace: Workspace | undefined,
+    request: Request,
+  ) {
+    if (!this.environmentService.get('TELEMETRY_ENABLED')) {
+      return { success: true };
+    }
+
+    const anonymizationEnabled = this.environmentService.get(
+      'TELEMETRY_ANONYMIZATION_ENABLED',
+    );
+
+    const data = {
+      type: createEventInput.type,
+      data: {
+        hostname: request.hostname,
+        userUUID: user
+          ? anonymizationEnabled
+            ? anonymize(user.id)
+            : user.id
+          : undefined,
+        workspaceUUID: workspace
+          ? anonymizationEnabled
+            ? anonymize(workspace.id)
+            : workspace.id
+          : undefined,
+        workspaceDisplayName: workspace ? workspace.displayName : undefined,
+        workspaceDomainName: workspace ? workspace.domainName : undefined,
+        ...createEventInput.data,
+      },
+    };
+
+    try {
+      await this.httpService.axiosRef.post('/v1', data);
+    } catch {}
+
+    return { success: true };
+  }
+}
diff --git a/packages/twenty-server/src/core/analytics/dto/create-analytics.input.ts b/packages/twenty-server/src/engine/core-modules/analytics/dto/create-analytics.input.ts
similarity index 100%
rename from packages/twenty-server/src/core/analytics/dto/create-analytics.input.ts
rename to packages/twenty-server/src/engine/core-modules/analytics/dto/create-analytics.input.ts
diff --git a/packages/twenty-server/src/engine/core-modules/app-token/app-token.auto-resolver-opts.ts b/packages/twenty-server/src/engine/core-modules/app-token/app-token.auto-resolver-opts.ts
new file mode 100644
index 000000000000..651fc08c61b5
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/app-token/app-token.auto-resolver-opts.ts
@@ -0,0 +1,39 @@
+import {
+  AutoResolverOpts,
+  PagingStrategies,
+  ReadResolverOpts,
+} from '@ptc-org/nestjs-query-graphql';
+
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
+import { CreateAppTokenInput } from 'src/engine/core-modules/app-token/dtos/create-app-token.input';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+
+export const appTokenAutoResolverOpts: AutoResolverOpts<
+  any,
+  any,
+  unknown,
+  unknown,
+  ReadResolverOpts<any>,
+  PagingStrategies
+>[] = [
+  {
+    EntityClass: AppToken,
+    DTOClass: AppToken,
+    CreateDTOClass: CreateAppTokenInput,
+    enableTotalCount: true,
+    pagingStrategy: PagingStrategies.CURSOR,
+    read: {
+      many: { disabled: true },
+      one: { disabled: true },
+    },
+    create: {
+      many: { disabled: true },
+    },
+    update: {
+      many: { disabled: true },
+      one: { disabled: true },
+    },
+    delete: { many: { disabled: true }, one: { disabled: true } },
+    guards: [JwtAuthGuard],
+  },
+];
diff --git a/packages/twenty-server/src/engine/core-modules/app-token/app-token.entity.ts b/packages/twenty-server/src/engine/core-modules/app-token/app-token.entity.ts
new file mode 100644
index 000000000000..546b5f507bad
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/app-token/app-token.entity.ts
@@ -0,0 +1,74 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import {
+  Entity,
+  Column,
+  PrimaryGeneratedColumn,
+  ManyToOne,
+  JoinColumn,
+  CreateDateColumn,
+  UpdateDateColumn,
+} from 'typeorm';
+import { BeforeCreateOne, IDField } from '@ptc-org/nestjs-query-graphql';
+
+import { BeforeCreateOneAppToken } from 'src/engine/core-modules/app-token/hooks/before-create-one-app-token.hook';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+export enum AppTokenType {
+  RefreshToken = 'REFRESH_TOKEN',
+  CodeChallenge = 'CODE_CHALLENGE',
+  AuthorizationCode = 'AUTHORIZATION_CODE',
+}
+
+@Entity({ name: 'appToken', schema: 'core' })
+@ObjectType('AppToken')
+@BeforeCreateOne(BeforeCreateOneAppToken)
+export class AppToken {
+  @IDField(() => UUIDScalarType)
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @ManyToOne(() => User, (user) => user.appTokens, {
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'userId' })
+  user: User;
+
+  @Column()
+  userId: string;
+
+  @ManyToOne(() => Workspace, (workspace) => workspace.appTokens, {
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'workspaceId' })
+  workspace: Workspace;
+
+  @Column({ nullable: true })
+  workspaceId: string;
+
+  @Field()
+  @Column({ nullable: false, type: 'text', default: AppTokenType.RefreshToken })
+  type: AppTokenType;
+
+  @Column({ nullable: true, type: 'text' })
+  value: string;
+
+  @Field()
+  @Column({ type: 'timestamptz' })
+  expiresAt: Date;
+
+  @Column({ nullable: true, type: 'timestamptz' })
+  deletedAt: Date | null;
+
+  @Column({ nullable: true, type: 'timestamptz' })
+  revokedAt: Date | null;
+
+  @Field()
+  @CreateDateColumn({ type: 'timestamptz' })
+  createdAt: Date;
+
+  @Field()
+  @UpdateDateColumn({ type: 'timestamptz' })
+  updatedAt: Date;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/app-token/app-token.module.ts b/packages/twenty-server/src/engine/core-modules/app-token/app-token.module.ts
new file mode 100644
index 000000000000..ade8e7cb6605
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/app-token/app-token.module.ts
@@ -0,0 +1,19 @@
+import { Module } from '@nestjs/common';
+
+import { NestjsQueryGraphQLModule } from '@ptc-org/nestjs-query-graphql';
+import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
+
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
+import { appTokenAutoResolverOpts } from 'src/engine/core-modules/app-token/app-token.auto-resolver-opts';
+import { AppTokenService } from 'src/engine/core-modules/app-token/services/app-token.service';
+
+@Module({
+  imports: [
+    NestjsQueryGraphQLModule.forFeature({
+      imports: [NestjsQueryTypeOrmModule.forFeature([AppToken], 'core')],
+      services: [AppTokenService],
+      resolvers: appTokenAutoResolverOpts,
+    }),
+  ],
+})
+export class AppTokenModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/app-token/dtos/create-app-token.input.ts b/packages/twenty-server/src/engine/core-modules/app-token/dtos/create-app-token.input.ts
new file mode 100644
index 000000000000..5d2385ee7ea1
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/app-token/dtos/create-app-token.input.ts
@@ -0,0 +1,11 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+import { IsDate, IsNotEmpty } from 'class-validator';
+
+@InputType()
+export class CreateAppTokenInput {
+  @IsDate()
+  @IsNotEmpty()
+  @Field()
+  expiresAt: Date;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/app-token/hooks/before-create-one-app-token.hook.ts b/packages/twenty-server/src/engine/core-modules/app-token/hooks/before-create-one-app-token.hook.ts
new file mode 100644
index 000000000000..9face2a59431
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/app-token/hooks/before-create-one-app-token.hook.ts
@@ -0,0 +1,25 @@
+import {
+  BeforeCreateOneHook,
+  CreateOneInputType,
+} from '@ptc-org/nestjs-query-graphql';
+import { v4 as uuidv4 } from 'uuid';
+
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
+
+export class BeforeCreateOneAppToken<T extends AppToken>
+  implements BeforeCreateOneHook<T, any>
+{
+  async run(
+    instance: CreateOneInputType<T>,
+    context: any,
+  ): Promise<CreateOneInputType<T>> {
+    const userId = context?.req?.user?.user?.id;
+
+    instance.input.userId = userId;
+    // FIXME: These fields should be autogenerated, we need to run a migration for this
+    instance.input.id = uuidv4();
+    instance.input.updatedAt = new Date();
+
+    return instance;
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/app-token/services/app-token.service.spec.ts b/packages/twenty-server/src/engine/core-modules/app-token/services/app-token.service.spec.ts
new file mode 100644
index 000000000000..c17ceca4a13a
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/app-token/services/app-token.service.spec.ts
@@ -0,0 +1,27 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { getRepositoryToken } from '@nestjs/typeorm';
+
+import { AppTokenService } from 'src/engine/core-modules/app-token/services/app-token.service';
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
+
+describe('AppTokenService', () => {
+  let service: AppTokenService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        AppTokenService,
+        {
+          provide: getRepositoryToken(AppToken),
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    service = module.get<AppTokenService>(AppTokenService);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/app-token/services/app-token.service.ts b/packages/twenty-server/src/engine/core-modules/app-token/services/app-token.service.ts
new file mode 100644
index 000000000000..3f42cdfdc583
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/app-token/services/app-token.service.ts
@@ -0,0 +1,5 @@
+import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
+
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
+
+export class AppTokenService extends TypeOrmQueryService<AppToken> {}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
new file mode 100644
index 000000000000..8c973c229276
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
@@ -0,0 +1,82 @@
+/* eslint-disable no-restricted-imports */
+import { Module } from '@nestjs/common';
+import { JwtModule } from '@nestjs/jwt';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { HttpModule } from '@nestjs/axios';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { UserModule } from 'src/engine/core-modules/user/user.module';
+import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
+import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
+import { GoogleAuthController } from 'src/engine/core-modules/auth/controllers/google-auth.controller';
+import { GoogleAPIsAuthController } from 'src/engine/core-modules/auth/controllers/google-apis-auth.controller';
+import { VerifyAuthController } from 'src/engine/core-modules/auth/controllers/verify-auth.controller';
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+import { GoogleAPIsService } from 'src/engine/core-modules/auth/services/google-apis.service';
+import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
+import { SignUpService } from 'src/engine/core-modules/auth/services/sign-up.service';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { FileUploadModule } from 'src/engine/core-modules/file/file-upload/file-upload.module';
+import { AppTokenService } from 'src/engine/core-modules/app-token/services/app-token.service';
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { CalendarChannelObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
+
+import { AuthResolver } from './auth.resolver';
+
+import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';
+import { AuthService } from './services/auth.service';
+const jwtModule = JwtModule.registerAsync({
+  useFactory: async (environmentService: EnvironmentService) => {
+    return {
+      secret: environmentService.get('ACCESS_TOKEN_SECRET'),
+      signOptions: {
+        expiresIn: environmentService.get('ACCESS_TOKEN_EXPIRES_IN'),
+      },
+    };
+  },
+  inject: [EnvironmentService],
+});
+
+@Module({
+  imports: [
+    jwtModule,
+    FileUploadModule,
+    DataSourceModule,
+    UserModule,
+    WorkspaceManagerModule,
+    TypeORMModule,
+    TypeOrmModule.forFeature(
+      [Workspace, User, AppToken, FeatureFlagEntity],
+      'core',
+    ),
+    ObjectMetadataRepositoryModule.forFeature([
+      ConnectedAccountObjectMetadata,
+      MessageChannelObjectMetadata,
+      CalendarChannelObjectMetadata,
+    ]),
+    HttpModule,
+    UserWorkspaceModule,
+  ],
+  controllers: [
+    GoogleAuthController,
+    GoogleAPIsAuthController,
+    VerifyAuthController,
+  ],
+  providers: [
+    SignUpService,
+    AuthService,
+    TokenService,
+    JwtAuthStrategy,
+    AuthResolver,
+    GoogleAPIsService,
+    AppTokenService,
+  ],
+  exports: [jwtModule, TokenService],
+})
+export class AuthModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts
new file mode 100644
index 000000000000..4edcf14796cf
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts
@@ -0,0 +1,54 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { getRepositoryToken } from '@nestjs/typeorm';
+
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
+import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
+import { User } from 'src/engine/core-modules/user/user.entity';
+
+import { AuthResolver } from './auth.resolver';
+
+import { TokenService } from './services/token.service';
+import { AuthService } from './services/auth.service';
+
+describe('AuthResolver', () => {
+  let resolver: AuthResolver;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        AuthResolver,
+        {
+          provide: getRepositoryToken(Workspace, 'core'),
+          useValue: {},
+        },
+        {
+          provide: getRepositoryToken(User, 'core'),
+          useValue: {},
+        },
+        {
+          provide: AuthService,
+          useValue: {},
+        },
+        {
+          provide: TokenService,
+          useValue: {},
+        },
+        {
+          provide: UserService,
+          useValue: {},
+        },
+        {
+          provide: UserWorkspaceService,
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    resolver = module.get<AuthResolver>(AuthResolver);
+  });
+
+  it('should be defined', () => {
+    expect(resolver).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
new file mode 100644
index 000000000000..96126b0e3f96
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
@@ -0,0 +1,257 @@
+import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import {
+  BadRequestException,
+  ForbiddenException,
+  InternalServerErrorException,
+  NotFoundException,
+  UseGuards,
+} from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import { AppTokenInput } from 'src/engine/core-modules/auth/dto/app-token.input';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
+import { assert } from 'src/utils/assert';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { ApiKeyTokenInput } from 'src/engine/core-modules/auth/dto/api-key-token.input';
+import { ValidatePasswordResetToken } from 'src/engine/core-modules/auth/dto/validate-password-reset-token.entity';
+import { TransientToken } from 'src/engine/core-modules/auth/dto/transient-token.entity';
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
+import { ValidatePasswordResetTokenInput } from 'src/engine/core-modules/auth/dto/validate-password-reset-token.input';
+import { UpdatePasswordViaResetTokenInput } from 'src/engine/core-modules/auth/dto/update-password-via-reset-token.input';
+import { EmailPasswordResetLink } from 'src/engine/core-modules/auth/dto/email-password-reset-link.entity';
+import { InvalidatePassword } from 'src/engine/core-modules/auth/dto/invalidate-password.entity';
+import { EmailPasswordResetLinkInput } from 'src/engine/core-modules/auth/dto/email-password-reset-link.input';
+import { GenerateJwtInput } from 'src/engine/core-modules/auth/dto/generate-jwt.input';
+import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
+import { AuthorizeApp } from 'src/engine/core-modules/auth/dto/authorize-app.entity';
+import { AuthorizeAppInput } from 'src/engine/core-modules/auth/dto/authorize-app.input';
+import { ExchangeAuthCodeInput } from 'src/engine/core-modules/auth/dto/exchange-auth-code.input';
+import { ExchangeAuthCode } from 'src/engine/core-modules/auth/dto/exchange-auth-code.entity';
+
+import { ApiKeyToken, AuthTokens } from './dto/token.entity';
+import { TokenService } from './services/token.service';
+import { Verify } from './dto/verify.entity';
+import { VerifyInput } from './dto/verify.input';
+import { AuthService } from './services/auth.service';
+import { LoginToken } from './dto/login-token.entity';
+import { ChallengeInput } from './dto/challenge.input';
+import { UserExists } from './dto/user-exists.entity';
+import { CheckUserExistsInput } from './dto/user-exists.input';
+import { WorkspaceInviteHashValid } from './dto/workspace-invite-hash-valid.entity';
+import { WorkspaceInviteHashValidInput } from './dto/workspace-invite-hash.input';
+import { SignUpInput } from './dto/sign-up.input';
+import { ImpersonateInput } from './dto/impersonate.input';
+
+@Resolver()
+export class AuthResolver {
+  constructor(
+    @InjectRepository(Workspace, 'core')
+    private readonly workspaceRepository: Repository<Workspace>,
+    private authService: AuthService,
+    private tokenService: TokenService,
+    private userService: UserService,
+    private userWorkspaceService: UserWorkspaceService,
+  ) {}
+
+  @Query(() => UserExists)
+  async checkUserExists(
+    @Args() checkUserExistsInput: CheckUserExistsInput,
+  ): Promise<UserExists> {
+    const { exists } = await this.authService.checkUserExists(
+      checkUserExistsInput.email,
+    );
+
+    return { exists };
+  }
+
+  @Query(() => WorkspaceInviteHashValid)
+  async checkWorkspaceInviteHashIsValid(
+    @Args() workspaceInviteHashValidInput: WorkspaceInviteHashValidInput,
+  ): Promise<WorkspaceInviteHashValid> {
+    return await this.authService.checkWorkspaceInviteHashIsValid(
+      workspaceInviteHashValidInput.inviteHash,
+    );
+  }
+
+  @Query(() => Workspace)
+  async findWorkspaceFromInviteHash(
+    @Args() workspaceInviteHashValidInput: WorkspaceInviteHashValidInput,
+  ) {
+    return await this.workspaceRepository.findOneBy({
+      inviteHash: workspaceInviteHashValidInput.inviteHash,
+    });
+  }
+
+  @Mutation(() => LoginToken)
+  async challenge(@Args() challengeInput: ChallengeInput): Promise<LoginToken> {
+    const user = await this.authService.challenge(challengeInput);
+    const loginToken = await this.tokenService.generateLoginToken(user.email);
+
+    return { loginToken };
+  }
+
+  @Mutation(() => LoginToken)
+  async signUp(@Args() signUpInput: SignUpInput): Promise<LoginToken> {
+    const user = await this.authService.signUp(signUpInput);
+
+    const loginToken = await this.tokenService.generateLoginToken(user.email);
+
+    return { loginToken };
+  }
+
+  @Mutation(() => TransientToken)
+  @UseGuards(JwtAuthGuard)
+  async generateTransientToken(
+    @AuthUser() user: User,
+  ): Promise<TransientToken | void> {
+    const workspaceMember = await this.userService.loadWorkspaceMember(user);
+
+    if (!workspaceMember) {
+      return;
+    }
+    const transientToken = await this.tokenService.generateTransientToken(
+      workspaceMember.id,
+      user.defaultWorkspace.id,
+    );
+
+    return { transientToken };
+  }
+
+  @Mutation(() => Verify)
+  async verify(@Args() verifyInput: VerifyInput): Promise<Verify> {
+    const email = await this.tokenService.verifyLoginToken(
+      verifyInput.loginToken,
+    );
+
+    assert(email, 'Invalid token', ForbiddenException);
+
+    const result = await this.authService.verify(email);
+
+    return result;
+  }
+
+  @Mutation(() => AuthorizeApp)
+  @UseGuards(JwtAuthGuard)
+  async authorizeApp(
+    @Args() authorizeAppInput: AuthorizeAppInput,
+    @AuthUser() user: User,
+  ): Promise<AuthorizeApp> {
+    const authorizedApp = await this.authService.generateAuthorizationCode(
+      authorizeAppInput,
+      user,
+    );
+
+    return authorizedApp;
+  }
+
+  @Query(() => ExchangeAuthCode)
+  async exchangeAuthorizationCode(
+    @Args() exchangeAuthCodeInput: ExchangeAuthCodeInput,
+  ) {
+    const tokens = await this.tokenService.verifyAuthorizationCode(
+      exchangeAuthCodeInput,
+    );
+
+    return tokens;
+  }
+
+  @Mutation(() => AuthTokens)
+  @UseGuards(JwtAuthGuard)
+  async generateJWT(
+    @AuthUser() user: User,
+    @Args() args: GenerateJwtInput,
+  ): Promise<AuthTokens> {
+    const token = await this.tokenService.generateSwitchWorkspaceToken(
+      user,
+      args.workspaceId,
+    );
+
+    return token;
+  }
+
+  @Mutation(() => AuthTokens)
+  async renewToken(@Args() args: AppTokenInput): Promise<AuthTokens> {
+    if (!args.appToken) {
+      throw new BadRequestException('Refresh token is mendatory');
+    }
+
+    const tokens = await this.tokenService.generateTokensFromRefreshToken(
+      args.appToken,
+    );
+
+    return { tokens: tokens };
+  }
+
+  @UseGuards(JwtAuthGuard)
+  @Mutation(() => Verify)
+  async impersonate(
+    @Args() impersonateInput: ImpersonateInput,
+    @AuthUser() user: User,
+  ): Promise<Verify> {
+    // Check if user can impersonate
+    assert(user.canImpersonate, 'User cannot impersonate', ForbiddenException);
+
+    return this.authService.impersonate(impersonateInput.userId);
+  }
+
+  @UseGuards(JwtAuthGuard)
+  @Mutation(() => ApiKeyToken)
+  async generateApiKeyToken(
+    @Args() args: ApiKeyTokenInput,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+  ): Promise<ApiKeyToken | undefined> {
+    return await this.tokenService.generateApiKeyToken(
+      workspaceId,
+      args.apiKeyId,
+      args.expiresAt,
+    );
+  }
+
+  @Mutation(() => EmailPasswordResetLink)
+  async emailPasswordResetLink(
+    @Args() emailPasswordResetInput: EmailPasswordResetLinkInput,
+  ): Promise<EmailPasswordResetLink> {
+    const resetToken = await this.tokenService.generatePasswordResetToken(
+      emailPasswordResetInput.email,
+    );
+
+    return await this.tokenService.sendEmailPasswordResetLink(
+      resetToken,
+      emailPasswordResetInput.email,
+    );
+  }
+
+  @Mutation(() => InvalidatePassword)
+  async updatePasswordViaResetToken(
+    @Args() args: UpdatePasswordViaResetTokenInput,
+  ): Promise<InvalidatePassword> {
+    const { id } = await this.tokenService.validatePasswordResetToken(
+      args.passwordResetToken,
+    );
+
+    assert(id, 'User not found', NotFoundException);
+
+    const { success } = await this.authService.updatePassword(
+      id,
+      args.newPassword,
+    );
+
+    assert(success, 'Password update failed', InternalServerErrorException);
+
+    return await this.tokenService.invalidatePasswordResetToken(id);
+  }
+
+  @Query(() => ValidatePasswordResetToken)
+  async validatePasswordResetToken(
+    @Args() args: ValidatePasswordResetTokenInput,
+  ): Promise<ValidatePasswordResetToken> {
+    return this.tokenService.validatePasswordResetToken(
+      args.passwordResetToken,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.util.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.util.ts
new file mode 100644
index 000000000000..275eeb7e5116
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.util.ts
@@ -0,0 +1,54 @@
+import {
+  createCipheriv,
+  createDecipheriv,
+  createHash,
+  randomBytes,
+} from 'crypto';
+
+import * as bcrypt from 'bcrypt';
+
+export const PASSWORD_REGEX = /^.{8,}$/;
+
+const saltRounds = 10;
+
+export const hashPassword = async (password: string) => {
+  const hash = await bcrypt.hash(password, saltRounds);
+
+  return hash;
+};
+
+export const compareHash = async (password: string, passwordHash: string) => {
+  return bcrypt.compare(password, passwordHash);
+};
+
+export const encryptText = (textToEncrypt: string, key: string): string => {
+  const keyHash = createHash('sha512')
+    .update(key)
+    .digest('hex')
+    .substring(0, 32);
+
+  const iv = randomBytes(16);
+
+  const cipher = createCipheriv('aes-256-ctr', keyHash, iv);
+
+  return Buffer.concat([
+    iv,
+    cipher.update(textToEncrypt),
+    cipher.final(),
+  ]).toString('base64');
+};
+
+export const decryptText = (textToDecrypt: string, key: string): string => {
+  const textBuffer = Buffer.from(textToDecrypt, 'base64');
+  const iv = textBuffer.subarray(0, 16);
+  const text = textBuffer.subarray(16);
+
+  const keyHash = createHash('sha512')
+    .update(key)
+    .digest('hex')
+    .substring(0, 32);
+
+  const decipher = createDecipheriv('aes-256-ctr', keyHash, iv);
+
+  return Buffer.concat([decipher.update(text), decipher.final()]).toString();
+};
diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts
new file mode 100644
index 000000000000..0428084e92fd
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts
@@ -0,0 +1,71 @@
+import {
+  Controller,
+  Get,
+  Req,
+  Res,
+  UnauthorizedException,
+  UseGuards,
+} from '@nestjs/common';
+
+import { Response } from 'express';
+
+import { GoogleAPIsProviderEnabledGuard } from 'src/engine/core-modules/auth/guards/google-apis-provider-enabled.guard';
+import { GoogleAPIsOauthGuard } from 'src/engine/core-modules/auth/guards/google-apis-oauth.guard';
+import { GoogleAPIsRequest } from 'src/engine/core-modules/auth/strategies/google-apis.auth.strategy';
+import { GoogleAPIsService } from 'src/engine/core-modules/auth/services/google-apis.service';
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+
+@Controller('auth/google-apis')
+export class GoogleAPIsAuthController {
+  constructor(
+    private readonly googleAPIsService: GoogleAPIsService,
+    private readonly tokenService: TokenService,
+    private readonly environmentService: EnvironmentService,
+  ) {}
+
+  @Get()
+  @UseGuards(GoogleAPIsProviderEnabledGuard, GoogleAPIsOauthGuard)
+  async googleAuth() {
+    // As this method is protected by Google Auth guard, it will trigger Google SSO flow
+    return;
+  }
+
+  @Get('get-access-token')
+  @UseGuards(GoogleAPIsProviderEnabledGuard, GoogleAPIsOauthGuard)
+  async googleAuthGetAccessToken(
+    @Req() req: GoogleAPIsRequest,
+    @Res() res: Response,
+  ) {
+    const { user } = req;
+
+    const { email, accessToken, refreshToken, transientToken } = user;
+
+    const { workspaceMemberId, workspaceId } =
+      await this.tokenService.verifyTransientToken(transientToken);
+
+    const demoWorkspaceIds = this.environmentService.get('DEMO_WORKSPACE_IDS');
+
+    if (demoWorkspaceIds.includes(workspaceId)) {
+      throw new UnauthorizedException(
+        'Cannot connect Google account to demo workspace',
+      );
+    }
+
+    if (!workspaceId) {
+      throw new Error('Workspace not found');
+    }
+
+    await this.googleAPIsService.refreshGoogleRefreshToken({
+      handle: email,
+      workspaceMemberId: workspaceMemberId,
+      workspaceId: workspaceId,
+      accessToken,
+      refreshToken,
+    });
+
+    return res.redirect(
+      `${this.environmentService.get('FRONT_BASE_URL')}/settings/accounts`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/google-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/google-auth.controller.ts
new file mode 100644
index 000000000000..99aeeefeb504
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/google-auth.controller.ts
@@ -0,0 +1,70 @@
+import { Controller, Get, Req, Res, UseGuards } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Response } from 'express';
+import { Repository } from 'typeorm';
+
+import { GoogleRequest } from 'src/engine/core-modules/auth/strategies/google.auth.strategy';
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+import { GoogleProviderEnabledGuard } from 'src/engine/core-modules/auth/guards/google-provider-enabled.guard';
+import { GoogleOauthGuard } from 'src/engine/core-modules/auth/guards/google-oauth.guard';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AuthService } from 'src/engine/core-modules/auth/services/auth.service';
+import { TypeORMService } from 'src/database/typeorm/typeorm.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+
+@Controller('auth/google')
+export class GoogleAuthController {
+  constructor(
+    private readonly tokenService: TokenService,
+    private readonly environmentService: EnvironmentService,
+    private readonly typeORMService: TypeORMService,
+    private readonly authService: AuthService,
+    @InjectRepository(Workspace, 'core')
+    @InjectRepository(User, 'core')
+    private readonly userRepository: Repository<User>,
+  ) {}
+
+  @Get()
+  @UseGuards(GoogleProviderEnabledGuard, GoogleOauthGuard)
+  async googleAuth() {
+    // As this method is protected by Google Auth guard, it will trigger Google SSO flow
+    return;
+  }
+
+  @Get('redirect')
+  @UseGuards(GoogleProviderEnabledGuard, GoogleOauthGuard)
+  async googleAuthRedirect(@Req() req: GoogleRequest, @Res() res: Response) {
+    const { firstName, lastName, email, picture, workspaceInviteHash } =
+      req.user;
+
+    const mainDataSource = this.typeORMService.getMainDataSource();
+
+    const existingUser = await mainDataSource
+      .getRepository(User)
+      .findOneBy({ email: email });
+
+    if (existingUser) {
+      const loginToken = await this.tokenService.generateLoginToken(
+        existingUser.email,
+      );
+
+      return res.redirect(
+        this.tokenService.computeRedirectURI(loginToken.token),
+      );
+    }
+
+    const user = await this.authService.signUp({
+      email,
+      firstName,
+      lastName,
+      picture,
+      workspaceInviteHash,
+    });
+
+    const loginToken = await this.tokenService.generateLoginToken(user.email);
+
+    return res.redirect(this.tokenService.computeRedirectURI(loginToken.token));
+  }
+}
diff --git a/packages/twenty-server/src/core/auth/controllers/verify-auth.controller.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/verify-auth.controller.spec.ts
similarity index 80%
rename from packages/twenty-server/src/core/auth/controllers/verify-auth.controller.spec.ts
rename to packages/twenty-server/src/engine/core-modules/auth/controllers/verify-auth.controller.spec.ts
index 3c9c726254a9..0aef1bea10d2 100644
--- a/packages/twenty-server/src/core/auth/controllers/verify-auth.controller.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/verify-auth.controller.spec.ts
@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { AuthService } from 'src/core/auth/services/auth.service';
-import { TokenService } from 'src/core/auth/services/token.service';
+import { AuthService } from 'src/engine/core-modules/auth/services/auth.service';
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
 
 import { VerifyAuthController } from './verify-auth.controller';
 
diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/verify-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/verify-auth.controller.ts
new file mode 100644
index 000000000000..68d680845011
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/verify-auth.controller.ts
@@ -0,0 +1,24 @@
+import { Body, Controller, Post } from '@nestjs/common';
+
+import { AuthService } from 'src/engine/core-modules/auth/services/auth.service';
+import { VerifyInput } from 'src/engine/core-modules/auth/dto/verify.input';
+import { Verify } from 'src/engine/core-modules/auth/dto/verify.entity';
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+
+@Controller('auth/verify')
+export class VerifyAuthController {
+  constructor(
+    private readonly authService: AuthService,
+    private readonly tokenService: TokenService,
+  ) {}
+
+  @Post()
+  async verify(@Body() verifyInput: VerifyInput): Promise<Verify> {
+    const email = await this.tokenService.verifyLoginToken(
+      verifyInput.loginToken,
+    );
+    const result = await this.authService.verify(email);
+
+    return result;
+  }
+}
diff --git a/packages/twenty-server/src/core/auth/dto/api-key-token.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/api-key-token.input.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/api-key-token.input.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/api-key-token.input.ts
diff --git a/packages/twenty-server/src/engine/core-modules/auth/dto/app-token.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/app-token.input.ts
new file mode 100644
index 000000000000..9345d9e3bb0a
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/dto/app-token.input.ts
@@ -0,0 +1,11 @@
+import { ArgsType, Field } from '@nestjs/graphql';
+
+import { IsNotEmpty, IsString } from 'class-validator';
+
+@ArgsType()
+export class AppTokenInput {
+  @Field(() => String)
+  @IsNotEmpty()
+  @IsString()
+  appToken: string;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/dto/authorize-app.entity.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/authorize-app.entity.ts
new file mode 100644
index 000000000000..9407e77816ff
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/dto/authorize-app.entity.ts
@@ -0,0 +1,7 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+@ObjectType()
+export class AuthorizeApp {
+  @Field(() => String)
+  redirectUrl: string;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/dto/authorize-app.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/authorize-app.input.ts
new file mode 100644
index 000000000000..fe464b7f90ec
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/dto/authorize-app.input.ts
@@ -0,0 +1,21 @@
+import { Field, ArgsType } from '@nestjs/graphql';
+
+import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
+
+@ArgsType()
+export class AuthorizeAppInput {
+  @Field(() => String)
+  @IsNotEmpty()
+  @IsString()
+  clientId: string;
+
+  @Field(() => String, { nullable: true })
+  @IsString()
+  @IsOptional()
+  codeChallenge?: string;
+
+  @Field(() => String, { nullable: true })
+  @IsString()
+  @IsOptional()
+  redirectUrl?: string;
+}
diff --git a/packages/twenty-server/src/core/auth/dto/challenge.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/challenge.input.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/challenge.input.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/challenge.input.ts
diff --git a/packages/twenty-server/src/core/auth/dto/email-password-reset-link.entity.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/email-password-reset-link.entity.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/email-password-reset-link.entity.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/email-password-reset-link.entity.ts
diff --git a/packages/twenty-server/src/core/auth/dto/email-password-reset-link.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/email-password-reset-link.input.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/email-password-reset-link.input.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/email-password-reset-link.input.ts
diff --git a/packages/twenty-server/src/engine/core-modules/auth/dto/exchange-auth-code.entity.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/exchange-auth-code.entity.ts
new file mode 100644
index 000000000000..cc2be5145773
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/dto/exchange-auth-code.entity.ts
@@ -0,0 +1,15 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import { AuthToken } from 'src/engine/core-modules/auth/dto/token.entity';
+
+@ObjectType()
+export class ExchangeAuthCode {
+  @Field(() => AuthToken)
+  accessToken: AuthToken;
+
+  @Field(() => AuthToken)
+  refreshToken: AuthToken;
+
+  @Field(() => AuthToken)
+  loginToken: AuthToken;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/dto/exchange-auth-code.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/exchange-auth-code.input.ts
new file mode 100644
index 000000000000..57a52576a3ea
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/dto/exchange-auth-code.input.ts
@@ -0,0 +1,21 @@
+import { ArgsType, Field } from '@nestjs/graphql';
+
+import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
+
+@ArgsType()
+export class ExchangeAuthCodeInput {
+  @Field(() => String)
+  @IsNotEmpty()
+  @IsString()
+  authorizationCode: string;
+
+  @Field(() => String, { nullable: true })
+  @IsOptional()
+  @IsString()
+  codeVerifier?: string;
+
+  @Field(() => String, { nullable: true })
+  @IsOptional()
+  @IsString()
+  clientSecret?: string;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/dto/generate-jwt.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/generate-jwt.input.ts
new file mode 100644
index 000000000000..cd8b4461ec68
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/dto/generate-jwt.input.ts
@@ -0,0 +1,11 @@
+import { ArgsType, Field } from '@nestjs/graphql';
+
+import { IsNotEmpty, IsString } from 'class-validator';
+
+@ArgsType()
+export class GenerateJwtInput {
+  @Field(() => String)
+  @IsNotEmpty()
+  @IsString()
+  workspaceId: string;
+}
diff --git a/packages/twenty-server/src/core/auth/dto/impersonate.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/impersonate.input.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/impersonate.input.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/impersonate.input.ts
diff --git a/packages/twenty-server/src/core/auth/dto/invalidate-password.entity.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/invalidate-password.entity.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/invalidate-password.entity.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/invalidate-password.entity.ts
diff --git a/packages/twenty-server/src/core/auth/dto/login-token.entity.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/login-token.entity.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/login-token.entity.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/login-token.entity.ts
diff --git a/packages/twenty-server/src/core/auth/dto/password-reset-token.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/password-reset-token.input.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/password-reset-token.input.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/password-reset-token.input.ts
diff --git a/packages/twenty-server/src/core/auth/dto/sign-up.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/sign-up.input.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/sign-up.input.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/sign-up.input.ts
diff --git a/packages/twenty-server/src/core/auth/dto/token.entity.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/token.entity.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/token.entity.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/token.entity.ts
diff --git a/packages/twenty-server/src/core/auth/dto/transient-token.entity.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/transient-token.entity.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/transient-token.entity.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/transient-token.entity.ts
diff --git a/packages/twenty-server/src/core/auth/dto/update-password-via-reset-token.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/update-password-via-reset-token.input.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/update-password-via-reset-token.input.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/update-password-via-reset-token.input.ts
diff --git a/packages/twenty-server/src/core/auth/dto/update-password.entity.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/update-password.entity.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/update-password.entity.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/update-password.entity.ts
diff --git a/packages/twenty-server/src/core/auth/dto/user-exists.entity.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/user-exists.entity.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/user-exists.entity.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/user-exists.entity.ts
diff --git a/packages/twenty-server/src/core/auth/dto/user-exists.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/user-exists.input.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/user-exists.input.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/user-exists.input.ts
diff --git a/packages/twenty-server/src/core/auth/dto/validate-password-reset-token.entity.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/validate-password-reset-token.entity.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/validate-password-reset-token.entity.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/validate-password-reset-token.entity.ts
diff --git a/packages/twenty-server/src/core/auth/dto/validate-password-reset-token.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/validate-password-reset-token.input.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/validate-password-reset-token.input.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/validate-password-reset-token.input.ts
diff --git a/packages/twenty-server/src/core/auth/dto/verify.entity.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/verify.entity.ts
similarity index 76%
rename from packages/twenty-server/src/core/auth/dto/verify.entity.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/verify.entity.ts
index 2035999312b5..5dc9b2ff0104 100644
--- a/packages/twenty-server/src/core/auth/dto/verify.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/dto/verify.entity.ts
@@ -1,6 +1,6 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 
-import { User } from 'src/core/user/user.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
 
 import { AuthTokens } from './token.entity';
 
diff --git a/packages/twenty-server/src/core/auth/dto/verify.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/verify.input.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/verify.input.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/verify.input.ts
diff --git a/packages/twenty-server/src/core/auth/dto/workspace-invite-hash-valid.entity.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/workspace-invite-hash-valid.entity.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/workspace-invite-hash-valid.entity.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/workspace-invite-hash-valid.entity.ts
diff --git a/packages/twenty-server/src/core/auth/dto/workspace-invite-hash.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/workspace-invite-hash.input.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/dto/workspace-invite-hash.input.ts
rename to packages/twenty-server/src/engine/core-modules/auth/dto/workspace-invite-hash.input.ts
diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth.guard.ts
new file mode 100644
index 000000000000..804776e21bdd
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth.guard.ts
@@ -0,0 +1,27 @@
+import { ExecutionContext, Injectable } from '@nestjs/common';
+import { AuthGuard } from '@nestjs/passport';
+
+@Injectable()
+export class GoogleAPIsOauthGuard extends AuthGuard('google-apis') {
+  constructor() {
+    super({
+      prompt: 'select_account',
+    });
+  }
+
+  async canActivate(context: ExecutionContext) {
+    try {
+      const request = context.switchToHttp().getRequest();
+      const transientToken = request.query.transientToken;
+
+      if (transientToken && typeof transientToken === 'string') {
+        request.params.transientToken = transientToken;
+      }
+      const activate = (await super.canActivate(context)) as boolean;
+
+      return activate;
+    } catch (ex) {
+      throw ex;
+    }
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-provider-enabled.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-provider-enabled.guard.ts
new file mode 100644
index 000000000000..23b4a0b986f7
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-provider-enabled.guard.ts
@@ -0,0 +1,24 @@
+import { Injectable, CanActivate, NotFoundException } from '@nestjs/common';
+
+import { Observable } from 'rxjs';
+
+import { GoogleAPIsStrategy } from 'src/engine/core-modules/auth/strategies/google-apis.auth.strategy';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+
+@Injectable()
+export class GoogleAPIsProviderEnabledGuard implements CanActivate {
+  constructor(private readonly environmentService: EnvironmentService) {}
+
+  canActivate(): boolean | Promise<boolean> | Observable<boolean> {
+    if (
+      !this.environmentService.get('MESSAGING_PROVIDER_GMAIL_ENABLED') &&
+      !this.environmentService.get('CALENDAR_PROVIDER_GOOGLE_ENABLED')
+    ) {
+      throw new NotFoundException('Google apis auth is not enabled');
+    }
+
+    new GoogleAPIsStrategy(this.environmentService);
+
+    return true;
+  }
+}
diff --git a/packages/twenty-server/src/core/auth/guards/google-oauth.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/google-oauth.guard.ts
similarity index 100%
rename from packages/twenty-server/src/core/auth/guards/google-oauth.guard.ts
rename to packages/twenty-server/src/engine/core-modules/auth/guards/google-oauth.guard.ts
diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/google-provider-enabled.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/google-provider-enabled.guard.ts
new file mode 100644
index 000000000000..f1a7eaf55620
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/guards/google-provider-enabled.guard.ts
@@ -0,0 +1,21 @@
+import { Injectable, CanActivate, NotFoundException } from '@nestjs/common';
+
+import { Observable } from 'rxjs';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { GoogleStrategy } from 'src/engine/core-modules/auth/strategies/google.auth.strategy';
+
+@Injectable()
+export class GoogleProviderEnabledGuard implements CanActivate {
+  constructor(private readonly environmentService: EnvironmentService) {}
+
+  canActivate(): boolean | Promise<boolean> | Observable<boolean> {
+    if (!this.environmentService.get('AUTH_GOOGLE_ENABLED')) {
+      throw new NotFoundException('Google auth is not enabled');
+    }
+
+    new GoogleStrategy(this.environmentService);
+
+    return true;
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts
new file mode 100644
index 000000000000..4b9bc4da3b5f
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts
@@ -0,0 +1,68 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { getRepositoryToken } from '@nestjs/typeorm';
+
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
+import { WorkspaceManagerService } from 'src/engine/workspace-manager/workspace-manager.service';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EmailService } from 'src/engine/integrations/email/email.service';
+import { SignUpService } from 'src/engine/core-modules/auth/services/sign-up.service';
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
+
+import { AuthService } from './auth.service';
+import { TokenService } from './token.service';
+
+describe('AuthService', () => {
+  let service: AuthService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        AuthService,
+        {
+          provide: TokenService,
+          useValue: {},
+        },
+        {
+          provide: UserService,
+          useValue: {},
+        },
+        {
+          provide: SignUpService,
+          useValue: {},
+        },
+        {
+          provide: WorkspaceManagerService,
+          useValue: {},
+        },
+        {
+          provide: getRepositoryToken(Workspace, 'core'),
+          useValue: {},
+        },
+        {
+          provide: getRepositoryToken(User, 'core'),
+          useValue: {},
+        },
+        {
+          provide: getRepositoryToken(AppToken, 'core'),
+          useValue: {},
+        },
+        {
+          provide: EnvironmentService,
+          useValue: {},
+        },
+        {
+          provide: EmailService,
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    service = module.get<AuthService>(AuthService);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
new file mode 100644
index 000000000000..0f9b301a203d
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
@@ -0,0 +1,300 @@
+import {
+  BadRequestException,
+  ForbiddenException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import crypto from 'node:crypto';
+
+import { Repository } from 'typeorm';
+import { render } from '@react-email/components';
+import { PasswordUpdateNotifyEmail } from 'twenty-emails';
+import { addMilliseconds } from 'date-fns';
+import ms from 'ms';
+
+import { ChallengeInput } from 'src/engine/core-modules/auth/dto/challenge.input';
+import { assert } from 'src/utils/assert';
+import {
+  PASSWORD_REGEX,
+  compareHash,
+  hashPassword,
+} from 'src/engine/core-modules/auth/auth.util';
+import { Verify } from 'src/engine/core-modules/auth/dto/verify.entity';
+import { UserExists } from 'src/engine/core-modules/auth/dto/user-exists.entity';
+import { WorkspaceInviteHashValid } from 'src/engine/core-modules/auth/dto/workspace-invite-hash-valid.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EmailService } from 'src/engine/integrations/email/email.service';
+import { UpdatePassword } from 'src/engine/core-modules/auth/dto/update-password.entity';
+import { SignUpService } from 'src/engine/core-modules/auth/services/sign-up.service';
+import { AuthorizeAppInput } from 'src/engine/core-modules/auth/dto/authorize-app.input';
+import { AuthorizeApp } from 'src/engine/core-modules/auth/dto/authorize-app.entity';
+import {
+  AppToken,
+  AppTokenType,
+} from 'src/engine/core-modules/app-token/app-token.entity';
+
+import { TokenService } from './token.service';
+
+export type UserPayload = {
+  firstName: string;
+  lastName: string;
+  email: string;
+};
+
+@Injectable()
+export class AuthService {
+  constructor(
+    private readonly tokenService: TokenService,
+    private readonly userService: UserService,
+    private readonly signUpService: SignUpService,
+    @InjectRepository(Workspace, 'core')
+    private readonly workspaceRepository: Repository<Workspace>,
+    @InjectRepository(User, 'core')
+    private readonly userRepository: Repository<User>,
+    private readonly environmentService: EnvironmentService,
+    private readonly emailService: EmailService,
+    @InjectRepository(AppToken, 'core')
+    private readonly appTokenRepository: Repository<AppToken>,
+  ) {}
+
+  async challenge(challengeInput: ChallengeInput) {
+    const user = await this.userRepository.findOneBy({
+      email: challengeInput.email,
+    });
+
+    assert(user, "This user doesn't exist", NotFoundException);
+    assert(user.passwordHash, 'Incorrect login method', ForbiddenException);
+
+    const isValid = await compareHash(
+      challengeInput.password,
+      user.passwordHash,
+    );
+
+    assert(isValid, 'Wrong password', ForbiddenException);
+
+    return user;
+  }
+
+  async signUp({
+    email,
+    password,
+    workspaceInviteHash,
+    firstName,
+    lastName,
+    picture,
+  }: {
+    email: string;
+    password?: string;
+    firstName?: string | null;
+    lastName?: string | null;
+    workspaceInviteHash?: string | null;
+    picture?: string | null;
+  }) {
+    return await this.signUpService.signUp({
+      email,
+      password,
+      firstName,
+      lastName,
+      workspaceInviteHash,
+      picture,
+    });
+  }
+
+  async verify(email: string): Promise<Verify> {
+    const user = await this.userRepository.findOne({
+      where: {
+        email,
+      },
+      relations: ['defaultWorkspace', 'workspaces', 'workspaces.workspace'],
+    });
+
+    assert(user, "This user doesn't exist", NotFoundException);
+
+    assert(
+      user.defaultWorkspace,
+      'User has no default workspace',
+      NotFoundException,
+    );
+
+    // passwordHash is hidden for security reasons
+    user.passwordHash = '';
+    const workspaceMember = await this.userService.loadWorkspaceMember(user);
+
+    if (workspaceMember) {
+      user.workspaceMember = workspaceMember;
+    }
+
+    const accessToken = await this.tokenService.generateAccessToken(user.id);
+    const refreshToken = await this.tokenService.generateRefreshToken(user.id);
+
+    return {
+      user,
+      tokens: {
+        accessToken,
+        refreshToken,
+      },
+    };
+  }
+
+  async checkUserExists(email: string): Promise<UserExists> {
+    const user = await this.userRepository.findOneBy({
+      email,
+    });
+
+    return { exists: !!user };
+  }
+
+  async checkWorkspaceInviteHashIsValid(
+    inviteHash: string,
+  ): Promise<WorkspaceInviteHashValid> {
+    const workspace = await this.workspaceRepository.findOneBy({
+      inviteHash,
+    });
+
+    return { isValid: !!workspace };
+  }
+
+  async impersonate(userId: string) {
+    const user = await this.userRepository.findOne({
+      where: {
+        id: userId,
+      },
+      relations: ['defaultWorkspace', 'workspaces', 'workspaces.workspace'],
+    });
+
+    assert(user, "This user doesn't exist", NotFoundException);
+
+    if (!user.defaultWorkspace.allowImpersonation) {
+      throw new ForbiddenException('Impersonation not allowed');
+    }
+
+    const accessToken = await this.tokenService.generateAccessToken(user.id);
+    const refreshToken = await this.tokenService.generateRefreshToken(user.id);
+
+    return {
+      user,
+      tokens: {
+        accessToken,
+        refreshToken,
+      },
+    };
+  }
+
+  async generateAuthorizationCode(
+    authorizeAppInput: AuthorizeAppInput,
+    user: User,
+  ): Promise<AuthorizeApp> {
+    // TODO: replace with db call to - third party app table
+    const apps = [
+      {
+        id: 'chrome',
+        name: 'Chrome Extension',
+        redirectUrl: `${this.environmentService.get(
+          'CHROME_EXTENSION_REDIRECT_URL',
+        )}`,
+      },
+    ];
+
+    const { clientId, codeChallenge } = authorizeAppInput;
+
+    const client = apps.find((app) => app.id === clientId);
+
+    if (!client) {
+      throw new NotFoundException(`Invalid client '${clientId}'`);
+    }
+
+    if (!client.redirectUrl && !authorizeAppInput.redirectUrl) {
+      throw new NotFoundException(`redirectUrl not found for '${clientId}'`);
+    }
+
+    const authorizationCode = crypto.randomBytes(42).toString('hex');
+
+    const expiresAt = addMilliseconds(new Date().getTime(), ms('5m'));
+
+    if (codeChallenge) {
+      const tokens = this.appTokenRepository.create([
+        {
+          value: codeChallenge,
+          type: AppTokenType.CodeChallenge,
+          userId: user.id,
+          workspaceId: user.defaultWorkspaceId,
+          expiresAt,
+        },
+        {
+          value: authorizationCode,
+          type: AppTokenType.AuthorizationCode,
+          userId: user.id,
+          workspaceId: user.defaultWorkspaceId,
+          expiresAt,
+        },
+      ]);
+
+      await this.appTokenRepository.save(tokens);
+    } else {
+      const token = this.appTokenRepository.create({
+        value: authorizationCode,
+        type: AppTokenType.AuthorizationCode,
+        userId: user.id,
+        workspaceId: user.defaultWorkspaceId,
+        expiresAt,
+      });
+
+      await this.appTokenRepository.save(token);
+    }
+
+    const redirectUrl = `${
+      client.redirectUrl ? client.redirectUrl : authorizeAppInput.redirectUrl
+    }?authorizationCode=${authorizationCode}`;
+
+    return { redirectUrl };
+  }
+
+  async updatePassword(
+    userId: string,
+    newPassword: string,
+  ): Promise<UpdatePassword> {
+    const user = await this.userRepository.findOneBy({ id: userId });
+
+    assert(user, 'User not found', NotFoundException);
+
+    const isPasswordValid = PASSWORD_REGEX.test(newPassword);
+
+    assert(isPasswordValid, 'Password too weak', BadRequestException);
+
+    const newPasswordHash = await hashPassword(newPassword);
+
+    await this.userRepository.update(userId, {
+      passwordHash: newPasswordHash,
+    });
+
+    const emailTemplate = PasswordUpdateNotifyEmail({
+      userName: `${user.firstName} ${user.lastName}`,
+      email: user.email,
+      link: this.environmentService.get('FRONT_BASE_URL'),
+    });
+
+    const html = render(emailTemplate, {
+      pretty: true,
+    });
+    const text = render(emailTemplate, {
+      plainText: true,
+    });
+
+    this.emailService.send({
+      from: `${this.environmentService.get(
+        'EMAIL_FROM_NAME',
+      )} <${this.environmentService.get('EMAIL_FROM_ADDRESS')}>`,
+      to: user.email,
+      subject: 'Your Password Has Been Successfully Changed',
+      text,
+      html,
+    });
+
+    return { success: true };
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts
new file mode 100644
index 000000000000..b812c861d5fa
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts
@@ -0,0 +1,199 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { v4 } from 'uuid';
+import { EntityManager, Repository } from 'typeorm';
+
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { TypeORMService } from 'src/database/typeorm/typeorm.service';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import {
+  GoogleCalendarSyncJob,
+  GoogleCalendarSyncJobData,
+} from 'src/modules/calendar/jobs/google-calendar-sync.job';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import {
+  FeatureFlagEntity,
+  FeatureFlagKeys,
+} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import {
+  GmailFullSyncV2Job,
+  GmailFullSyncV2JobData,
+} from 'src/modules/messaging/jobs/gmail-full-sync-v2.job';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import {
+  ConnectedAccountObjectMetadata,
+  ConnectedAccountProvider,
+} from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
+import {
+  MessageChannelObjectMetadata,
+  MessageChannelType,
+  MessageChannelVisibility,
+} from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { MessageChannelRepository } from 'src/modules/messaging/repositories/message-channel.repository';
+import {
+  CalendarChannelObjectMetadata,
+  CalendarChannelVisibility,
+} from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
+import { CalendarChannelRepository } from 'src/modules/calendar/repositories/calendar-channel.repository';
+
+@Injectable()
+export class GoogleAPIsService {
+  constructor(
+    private readonly dataSourceService: DataSourceService,
+    private readonly typeORMService: TypeORMService,
+    @Inject(MessageQueue.messagingQueue)
+    private readonly messageQueueService: MessageQueueService,
+    @Inject(MessageQueue.calendarQueue)
+    private readonly calendarQueueService: MessageQueueService,
+    private readonly environmentService: EnvironmentService,
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+    @InjectObjectMetadataRepository(ConnectedAccountObjectMetadata)
+    private readonly connectedAccountRepository: ConnectedAccountRepository,
+    @InjectObjectMetadataRepository(MessageChannelObjectMetadata)
+    private readonly messageChannelRepository: MessageChannelRepository,
+    @InjectObjectMetadataRepository(CalendarChannelObjectMetadata)
+    private readonly calendarChannelRepository: CalendarChannelRepository,
+  ) {}
+
+  async refreshGoogleRefreshToken(input: {
+    handle: string;
+    workspaceMemberId: string;
+    workspaceId: string;
+    accessToken: string;
+    refreshToken: string;
+  }) {
+    const { handle, workspaceId, workspaceMemberId } = input;
+
+    const dataSourceMetadata =
+      await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
+        workspaceId,
+      );
+
+    const workspaceDataSource =
+      await this.typeORMService.connectToDataSource(dataSourceMetadata);
+
+    const isCalendarEnabledFlag = await this.featureFlagRepository.findOneBy({
+      workspaceId,
+      key: FeatureFlagKeys.IsCalendarEnabled,
+      value: true,
+    });
+
+    const isCalendarEnabled =
+      this.environmentService.get('CALENDAR_PROVIDER_GOOGLE_ENABLED') &&
+      !!isCalendarEnabledFlag;
+
+    await workspaceDataSource?.transaction(async (manager: EntityManager) => {
+      const connectedAccounts =
+        await this.connectedAccountRepository.getAllByHandleAndWorkspaceMemberId(
+          handle,
+          workspaceMemberId,
+          workspaceId,
+          manager,
+        );
+
+      if (!connectedAccounts || connectedAccounts?.length === 0) {
+        const newConnectedAccountId = v4();
+
+        await this.connectedAccountRepository.create(
+          {
+            id: newConnectedAccountId,
+            handle,
+            provider: ConnectedAccountProvider.GOOGLE,
+            accessToken: input.accessToken,
+            refreshToken: input.refreshToken,
+            accountOwnerId: workspaceMemberId,
+          },
+          workspaceId,
+          manager,
+        );
+
+        await this.messageChannelRepository.create(
+          {
+            id: v4(),
+            connectedAccountId: newConnectedAccountId,
+            type: MessageChannelType.EMAIL,
+            handle,
+            visibility: MessageChannelVisibility.SHARE_EVERYTHING,
+          },
+          workspaceId,
+          manager,
+        );
+
+        if (isCalendarEnabled) {
+          await this.calendarChannelRepository.create(
+            {
+              id: v4(),
+              connectedAccountId: newConnectedAccountId,
+              handle,
+              visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
+            },
+            workspaceId,
+            manager,
+          );
+        }
+
+        await this.enqueueSyncJobs(
+          newConnectedAccountId,
+          workspaceId,
+          isCalendarEnabled,
+        );
+      } else {
+        await this.connectedAccountRepository.updateAccessTokenAndRefreshToken(
+          input.accessToken,
+          input.refreshToken,
+          connectedAccounts[0].id,
+          workspaceId,
+          manager,
+        );
+
+        await this.messageChannelRepository.resetSync(
+          connectedAccounts[0].id,
+          workspaceId,
+          manager,
+        );
+
+        await this.enqueueSyncJobs(
+          connectedAccounts[0].id,
+          workspaceId,
+          isCalendarEnabled,
+        );
+      }
+    });
+  }
+
+  private async enqueueSyncJobs(
+    connectedAccountId: string,
+    workspaceId: string,
+    isCalendarEnabled: boolean,
+  ) {
+    if (this.environmentService.get('MESSAGING_PROVIDER_GMAIL_ENABLED')) {
+      await this.messageQueueService.add<GmailFullSyncV2JobData>(
+        GmailFullSyncV2Job.name,
+        {
+          workspaceId,
+          connectedAccountId,
+        },
+      );
+    }
+
+    if (
+      this.environmentService.get('CALENDAR_PROVIDER_GOOGLE_ENABLED') &&
+      isCalendarEnabled
+    ) {
+      await this.calendarQueueService.add<GoogleCalendarSyncJobData>(
+        GoogleCalendarSyncJob.name,
+        {
+          workspaceId,
+          connectedAccountId,
+        },
+        {
+          retryLimit: 2,
+        },
+      );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/sign-up.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/sign-up.service.spec.ts
new file mode 100644
index 000000000000..f453ce7f6eaf
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/sign-up.service.spec.ts
@@ -0,0 +1,52 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { getRepositoryToken } from '@nestjs/typeorm';
+import { HttpService } from '@nestjs/axios';
+
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { SignUpService } from 'src/engine/core-modules/auth/services/sign-up.service';
+import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
+import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
+
+describe('SignUpService', () => {
+  let service: SignUpService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        SignUpService,
+        {
+          provide: FileUploadService,
+          useValue: {},
+        },
+        {
+          provide: UserWorkspaceService,
+          useValue: {},
+        },
+        {
+          provide: getRepositoryToken(Workspace, 'core'),
+          useValue: {},
+        },
+        {
+          provide: getRepositoryToken(User, 'core'),
+          useValue: {},
+        },
+        {
+          provide: EnvironmentService,
+          useValue: {},
+        },
+        {
+          provide: HttpService,
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    service = module.get<SignUpService>(SignUpService);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/core/auth/services/sign-up.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/sign-up.service.ts
similarity index 89%
rename from packages/twenty-server/src/core/auth/services/sign-up.service.ts
rename to packages/twenty-server/src/engine/core-modules/auth/services/sign-up.service.ts
index 21e8fbbe5867..71f0b390cff1 100644
--- a/packages/twenty-server/src/core/auth/services/sign-up.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/sign-up.service.ts
@@ -10,16 +10,19 @@ import { Repository } from 'typeorm';
 import { v4 } from 'uuid';
 import FileType from 'file-type';
 
-import { FileFolder } from 'src/core/file/interfaces/file-folder.interface';
+import { FileFolder } from 'src/engine/core-modules/file/interfaces/file-folder.interface';
 
 import { assert } from 'src/utils/assert';
-import { PASSWORD_REGEX, hashPassword } from 'src/core/auth/auth.util';
-import { User } from 'src/core/user/user.entity';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { FileUploadService } from 'src/core/file/services/file-upload.service';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
+import {
+  PASSWORD_REGEX,
+  hashPassword,
+} from 'src/engine/core-modules/auth/auth.util';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 import { getImageBufferFromUrl } from 'src/utils/image';
-import { UserWorkspaceService } from 'src/core/user-workspace/user-workspace.service';
+import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
 
 export type SignUpServiceInput = {
   email: string;
@@ -190,7 +193,7 @@ export class SignUpService {
     }
 
     assert(
-      !this.environmentService.isSignUpDisabled(),
+      !this.environmentService.get('IS_SIGN_UP_DISABLED'),
       'Sign up is disabled',
       ForbiddenException,
     );
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/token.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/token.service.spec.ts
new file mode 100644
index 000000000000..721c4fa6620d
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/token.service.spec.ts
@@ -0,0 +1,58 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { JwtService } from '@nestjs/jwt';
+import { getRepositoryToken } from '@nestjs/typeorm';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { JwtAuthStrategy } from 'src/engine/core-modules/auth/strategies/jwt.auth.strategy';
+import { EmailService } from 'src/engine/integrations/email/email.service';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+
+import { TokenService } from './token.service';
+
+describe('TokenService', () => {
+  let service: TokenService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        TokenService,
+        {
+          provide: JwtService,
+          useValue: {},
+        },
+        {
+          provide: JwtAuthStrategy,
+          useValue: {},
+        },
+        {
+          provide: EnvironmentService,
+          useValue: {},
+        },
+        {
+          provide: EmailService,
+          useValue: {},
+        },
+        {
+          provide: getRepositoryToken(User, 'core'),
+          useValue: {},
+        },
+        {
+          provide: getRepositoryToken(AppToken, 'core'),
+          useValue: {},
+        },
+        {
+          provide: getRepositoryToken(Workspace, 'core'),
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    service = module.get<TokenService>(TokenService);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/token.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/token.service.ts
new file mode 100644
index 000000000000..288bac0643ce
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/token.service.ts
@@ -0,0 +1,651 @@
+import {
+  BadRequestException,
+  ForbiddenException,
+  Injectable,
+  InternalServerErrorException,
+  NotFoundException,
+  UnauthorizedException,
+  UnprocessableEntityException,
+} from '@nestjs/common';
+import { JwtService } from '@nestjs/jwt';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import crypto from 'crypto';
+
+import { addMilliseconds, differenceInMilliseconds, isFuture } from 'date-fns';
+import ms from 'ms';
+import { JsonWebTokenError, TokenExpiredError } from 'jsonwebtoken';
+import { Repository } from 'typeorm';
+import { Request } from 'express';
+import { ExtractJwt } from 'passport-jwt';
+import { render } from '@react-email/render';
+import { PasswordResetLinkEmail } from 'twenty-emails';
+
+import {
+  JwtAuthStrategy,
+  JwtPayload,
+} from 'src/engine/core-modules/auth/strategies/jwt.auth.strategy';
+import { assert } from 'src/utils/assert';
+import {
+  ApiKeyToken,
+  AuthToken,
+  AuthTokens,
+  PasswordResetToken,
+} from 'src/engine/core-modules/auth/dto/token.entity';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import {
+  AppToken,
+  AppTokenType,
+} from 'src/engine/core-modules/app-token/app-token.entity';
+import { ValidatePasswordResetToken } from 'src/engine/core-modules/auth/dto/validate-password-reset-token.entity';
+import { EmailService } from 'src/engine/integrations/email/email.service';
+import { InvalidatePassword } from 'src/engine/core-modules/auth/dto/invalidate-password.entity';
+import { EmailPasswordResetLink } from 'src/engine/core-modules/auth/dto/email-password-reset-link.entity';
+import { JwtData } from 'src/engine/core-modules/auth/types/jwt-data.type';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { ExchangeAuthCodeInput } from 'src/engine/core-modules/auth/dto/exchange-auth-code.input';
+import { ExchangeAuthCode } from 'src/engine/core-modules/auth/dto/exchange-auth-code.entity';
+
+@Injectable()
+export class TokenService {
+  constructor(
+    private readonly jwtService: JwtService,
+    private readonly jwtStrategy: JwtAuthStrategy,
+    private readonly environmentService: EnvironmentService,
+    @InjectRepository(User, 'core')
+    private readonly userRepository: Repository<User>,
+    @InjectRepository(AppToken, 'core')
+    private readonly appTokenRepository: Repository<AppToken>,
+    @InjectRepository(Workspace, 'core')
+    private readonly workspaceRepository: Repository<Workspace>,
+    private readonly emailService: EmailService,
+  ) { }
+
+  async generateAccessToken(
+    userId: string,
+    workspaceId?: string,
+  ): Promise<AuthToken> {
+    const expiresIn = this.environmentService.get('ACCESS_TOKEN_EXPIRES_IN');
+
+    assert(expiresIn, '', InternalServerErrorException);
+    const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
+
+    const user = await this.userRepository.findOne({
+      where: { id: userId },
+      relations: ['defaultWorkspace'],
+    });
+
+    if (!user) {
+      throw new NotFoundException('User is not found');
+    }
+
+    if (!user.defaultWorkspace) {
+      throw new NotFoundException('User does not have a default workspace');
+    }
+
+    const jwtPayload: JwtPayload = {
+      sub: user.id,
+      workspaceId: workspaceId ? workspaceId : user.defaultWorkspace.id,
+    };
+
+    return {
+      token: this.jwtService.sign(jwtPayload),
+      expiresAt,
+    };
+  }
+
+  async generateRefreshToken(userId: string): Promise<AuthToken> {
+    const secret = this.environmentService.get('REFRESH_TOKEN_SECRET');
+    const expiresIn = this.environmentService.get('REFRESH_TOKEN_EXPIRES_IN');
+
+    assert(expiresIn, '', InternalServerErrorException);
+    const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
+
+    const refreshTokenPayload = {
+      userId,
+      expiresAt,
+      type: AppTokenType.RefreshToken,
+    };
+    const jwtPayload = {
+      sub: userId,
+    };
+
+    const refreshToken = this.appTokenRepository.create(refreshTokenPayload);
+
+    await this.appTokenRepository.save(refreshToken);
+
+    return {
+      token: this.jwtService.sign(jwtPayload, {
+        secret,
+        expiresIn,
+        // Jwtid will be used to link RefreshToken entity to this token
+        jwtid: refreshToken.id,
+      }),
+      expiresAt,
+    };
+  }
+
+  async generateLoginToken(email: string): Promise<AuthToken> {
+    const secret = this.environmentService.get('LOGIN_TOKEN_SECRET');
+    const expiresIn = this.environmentService.get('LOGIN_TOKEN_EXPIRES_IN');
+
+    assert(expiresIn, '', InternalServerErrorException);
+    const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
+    const jwtPayload = {
+      sub: email,
+    };
+
+    return {
+      token: this.jwtService.sign(jwtPayload, {
+        secret,
+        expiresIn,
+      }),
+      expiresAt,
+    };
+  }
+
+  async generateTransientToken(
+    workspaceMemberId: string,
+    workspaceId: string,
+  ): Promise<AuthToken> {
+    const secret = this.environmentService.get('LOGIN_TOKEN_SECRET');
+    const expiresIn = this.environmentService.get(
+      'SHORT_TERM_TOKEN_EXPIRES_IN',
+    );
+
+    assert(expiresIn, '', InternalServerErrorException);
+    const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
+    const jwtPayload = {
+      sub: workspaceMemberId,
+      workspaceId,
+    };
+
+    return {
+      token: this.jwtService.sign(jwtPayload, {
+        secret,
+        expiresIn,
+      }),
+      expiresAt,
+    };
+  }
+
+  async generateApiKeyToken(
+    workspaceId: string,
+    apiKeyId?: string,
+    expiresAt?: Date | string,
+  ): Promise<Pick<ApiKeyToken, 'token'> | undefined> {
+    if (!apiKeyId) {
+      return;
+    }
+    const jwtPayload = {
+      sub: workspaceId,
+    };
+    const secret = this.environmentService.get('ACCESS_TOKEN_SECRET');
+    let expiresIn: string | number;
+
+    if (expiresAt) {
+      expiresIn = Math.floor(
+        (new Date(expiresAt).getTime() - new Date().getTime()) / 1000,
+      );
+    } else {
+      expiresIn = this.environmentService.get('API_TOKEN_EXPIRES_IN');
+    }
+    const token = this.jwtService.sign(jwtPayload, {
+      secret,
+      expiresIn,
+      jwtid: apiKeyId,
+    });
+
+    return { token };
+  }
+
+  isTokenPresent(request: Request): boolean {
+    const token = ExtractJwt.fromAuthHeaderAsBearerToken()(request);
+
+    return !!token;
+  }
+
+  async validateToken(request: Request): Promise<JwtData> {
+    const token = ExtractJwt.fromAuthHeaderAsBearerToken()(request);
+
+    if (!token) {
+      throw new UnauthorizedException('missing authentication token');
+    }
+    const decoded = await this.verifyJwt(
+      token,
+      this.environmentService.get('ACCESS_TOKEN_SECRET'),
+    );
+
+    const { user, workspace } = await this.jwtStrategy.validate(
+      decoded as JwtPayload,
+    );
+
+    return { user, workspace };
+  }
+
+  async verifyLoginToken(loginToken: string): Promise<string> {
+    const loginTokenSecret = this.environmentService.get('LOGIN_TOKEN_SECRET');
+
+    const payload = await this.verifyJwt(loginToken, loginTokenSecret);
+
+    return payload.sub;
+  }
+
+  async verifyTransientToken(transientToken: string): Promise<{
+    workspaceMemberId: string;
+    workspaceId: string;
+  }> {
+    const transientTokenSecret =
+      this.environmentService.get('LOGIN_TOKEN_SECRET');
+
+    const payload = await this.verifyJwt(transientToken, transientTokenSecret);
+
+    return {
+      workspaceMemberId: payload.sub,
+      workspaceId: payload.workspaceId,
+    };
+  }
+
+  async generateSwitchWorkspaceToken(
+    user: User,
+    workspaceId: string,
+  ): Promise<AuthTokens> {
+    const userExists = await this.userRepository.findBy({ id: user.id });
+
+    assert(userExists, 'User not found', NotFoundException);
+
+    const workspace = await this.workspaceRepository.findOne({
+      where: { id: workspaceId },
+      relations: ['workspaceUsers'],
+    });
+
+    assert(workspace, 'workspace doesnt exist', NotFoundException);
+
+    assert(
+      workspace.workspaceUsers
+        .map((userWorkspace) => userWorkspace.userId)
+        .includes(user.id),
+      'user does not belong to workspace',
+      ForbiddenException,
+    );
+
+    await this.userRepository.save({
+      id: user.id,
+      defaultWorkspace: workspace,
+    });
+
+    const token = await this.generateAccessToken(user.id, workspaceId);
+    const refreshToken = await this.generateRefreshToken(user.id);
+
+    return {
+      tokens: {
+        accessToken: token,
+        refreshToken,
+      },
+    };
+  }
+
+  async verifyAuthorizationCode(
+    exchangeAuthCodeInput: ExchangeAuthCodeInput,
+  ): Promise<ExchangeAuthCode> {
+    const { authorizationCode, codeVerifier, clientSecret } =
+      exchangeAuthCodeInput;
+
+    assert(
+      authorizationCode,
+      'Authorization code not found',
+      NotFoundException,
+    );
+
+    assert(
+      !codeVerifier || !clientSecret,
+      'client secret or code verifier not found',
+      NotFoundException,
+    );
+
+    let userId = '';
+
+    if (clientSecret) {
+      // TODO: replace this with call to third party apps table
+      // assert(client.secret, 'client secret code does not exist', ForbiddenException);
+      throw new ForbiddenException();
+    }
+
+    if (codeVerifier) {
+      const authorizationCodeAppToken = await this.appTokenRepository.findOne({
+        where: {
+          value: authorizationCode,
+        },
+      });
+
+      assert(
+        authorizationCodeAppToken,
+        'Authorization code does not exist',
+        ForbiddenException,
+      );
+
+      assert(
+        authorizationCodeAppToken.expiresAt.getTime() >= Date.now(),
+        'Authorization code expired.',
+        NotFoundException,
+      );
+
+      const codeChallenge = crypto
+        .createHash('sha256')
+        .update(codeVerifier)
+        .digest()
+        .toString('base64')
+        .replace(/\+/g, '-')
+        .replace(/\//g, '_')
+        .replace(/=/g, '');
+
+      const codeChallengeAppToken = await this.appTokenRepository.findOne({
+        where: {
+          value: codeChallenge,
+        },
+      });
+
+      assert(
+        codeChallengeAppToken,
+        'code verifier doesnt match the challenge',
+        ForbiddenException,
+      );
+
+      assert(
+        codeChallengeAppToken.expiresAt.getTime() >= Date.now(),
+        'code challenge expired.',
+        NotFoundException,
+      );
+
+      assert(
+        codeChallengeAppToken.userId === authorizationCodeAppToken.userId,
+        'authorization code / code verifier was not created by same client',
+        ForbiddenException,
+      );
+
+      userId = codeChallengeAppToken.userId;
+    }
+
+    const user = await this.userRepository.findOne({
+      where: { id: userId },
+      relations: ['defaultWorkspace'],
+    });
+
+    if (!user) {
+      throw new NotFoundException('User who generated the token does not exist');
+    }
+
+    if (!user.defaultWorkspace) {
+      throw new NotFoundException('User does not have a default workspace');
+    }
+
+    const accessToken = await this.generateAccessToken(
+      user.id,
+      user.defaultWorkspaceId,
+    );
+    const refreshToken = await this.generateRefreshToken(user.id);
+    const loginToken = await this.generateLoginToken(user.email);
+
+    return {
+      accessToken,
+      refreshToken,
+      loginToken,
+    };
+  }
+
+  async verifyRefreshToken(refreshToken: string) {
+    const secret = this.environmentService.get('REFRESH_TOKEN_SECRET');
+    const coolDown = this.environmentService.get('REFRESH_TOKEN_COOL_DOWN');
+    const jwtPayload = await this.verifyJwt(refreshToken, secret);
+
+    assert(
+      jwtPayload.jti && jwtPayload.sub,
+      'This refresh token is malformed',
+      UnprocessableEntityException,
+    );
+
+    const token = await this.appTokenRepository.findOneBy({
+      id: jwtPayload.jti,
+    });
+
+    assert(token, "This refresh token doesn't exist", NotFoundException);
+
+    const user = await this.userRepository.findOneBy({
+      id: jwtPayload.sub,
+    });
+
+    assert(user, 'User not found', NotFoundException);
+
+    // Check if revokedAt is less than coolDown
+    if (
+      token.revokedAt &&
+      token.revokedAt.getTime() <= Date.now() - ms(coolDown)
+    ) {
+      // Revoke all user refresh tokens
+      await Promise.all(
+        user.appTokens.map(async ({ id, type }) => {
+          if (type === AppTokenType.RefreshToken) {
+            await this.appTokenRepository.update(
+              { id },
+              {
+                revokedAt: new Date(),
+              },
+            );
+          }
+        }),
+      );
+
+      throw new ForbiddenException(
+        'Suspicious activity detected, this refresh token has been revoked. All tokens has been revoked.',
+      );
+    }
+
+    return { user, token };
+  }
+
+  async generateTokensFromRefreshToken(token: string): Promise<{
+    accessToken: AuthToken;
+    refreshToken: AuthToken;
+  }> {
+    const {
+      user,
+      token: { id },
+    } = await this.verifyRefreshToken(token);
+
+    // Revoke old refresh token
+    await this.appTokenRepository.update(
+      {
+        id,
+      },
+      {
+        revokedAt: new Date(),
+      },
+    );
+
+    const accessToken = await this.generateAccessToken(user.id);
+    const refreshToken = await this.generateRefreshToken(user.id);
+
+    return {
+      accessToken,
+      refreshToken,
+    };
+  }
+
+  computeRedirectURI(loginToken: string): string {
+    return `${this.environmentService.get(
+      'FRONT_BASE_URL',
+    )}/verify?loginToken=${loginToken}`;
+  }
+
+  async verifyJwt(token: string, secret?: string) {
+    try {
+      return this.jwtService.verify(token, secret ? { secret } : undefined);
+    } catch (error) {
+      if (error instanceof TokenExpiredError) {
+        throw new UnauthorizedException('Token has expired.');
+      } else if (error instanceof JsonWebTokenError) {
+        throw new UnauthorizedException('Token invalid.');
+      } else {
+        throw new UnprocessableEntityException();
+      }
+    }
+  }
+
+  async generatePasswordResetToken(email: string): Promise<PasswordResetToken> {
+    const user = await this.userRepository.findOneBy({
+      email,
+    });
+
+    assert(user, 'User not found', NotFoundException);
+
+    const expiresIn = this.environmentService.get(
+      'PASSWORD_RESET_TOKEN_EXPIRES_IN',
+    );
+
+    assert(
+      expiresIn,
+      'PASSWORD_RESET_TOKEN_EXPIRES_IN constant value not found',
+      InternalServerErrorException,
+    );
+
+    if (
+      user.passwordResetToken &&
+      user.passwordResetTokenExpiresAt &&
+      isFuture(user.passwordResetTokenExpiresAt)
+    ) {
+      assert(
+        false,
+        `Token has been already generated. Please wait for ${ms(
+          differenceInMilliseconds(
+            user.passwordResetTokenExpiresAt,
+            new Date(),
+          ),
+          {
+            long: true,
+          },
+        )} to generate again.`,
+        BadRequestException,
+      );
+    }
+
+    const plainResetToken = crypto.randomBytes(32).toString('hex');
+    const hashedResetToken = crypto
+      .createHash('sha256')
+      .update(plainResetToken)
+      .digest('hex');
+
+    const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
+
+    await this.userRepository.update(user.id, {
+      passwordResetToken: hashedResetToken,
+      passwordResetTokenExpiresAt: expiresAt,
+    });
+
+    return {
+      passwordResetToken: plainResetToken,
+      passwordResetTokenExpiresAt: expiresAt,
+    };
+  }
+
+  async sendEmailPasswordResetLink(
+    resetToken: PasswordResetToken,
+    email: string,
+  ): Promise<EmailPasswordResetLink> {
+    const user = await this.userRepository.findOneBy({
+      email,
+    });
+
+    assert(user, 'User not found', NotFoundException);
+
+    const frontBaseURL = this.environmentService.get('FRONT_BASE_URL');
+    const resetLink = `${frontBaseURL}/reset-password/${resetToken.passwordResetToken}`;
+
+    const emailData = {
+      link: resetLink,
+      duration: ms(
+        differenceInMilliseconds(
+          resetToken.passwordResetTokenExpiresAt,
+          new Date(),
+        ),
+        {
+          long: true,
+        },
+      ),
+    };
+
+    const emailTemplate = PasswordResetLinkEmail(emailData);
+    const html = render(emailTemplate, {
+      pretty: true,
+    });
+
+    const text = render(emailTemplate, {
+      plainText: true,
+    });
+
+    this.emailService.send({
+      from: `${this.environmentService.get(
+        'EMAIL_FROM_NAME',
+      )} <${this.environmentService.get('EMAIL_FROM_ADDRESS')}>`,
+      to: email,
+      subject: 'Action Needed to Reset Password',
+      text,
+      html,
+    });
+
+    return { success: true };
+  }
+
+  async validatePasswordResetToken(
+    resetToken: string,
+  ): Promise<ValidatePasswordResetToken> {
+    const hashedResetToken = crypto
+      .createHash('sha256')
+      .update(resetToken)
+      .digest('hex');
+
+    const user = await this.userRepository.findOneBy({
+      passwordResetToken: hashedResetToken,
+    });
+
+    assert(user, 'Token is invalid', NotFoundException);
+
+    const tokenExpiresAt = user.passwordResetTokenExpiresAt;
+
+    assert(
+      tokenExpiresAt && isFuture(tokenExpiresAt),
+      'Token has expired. Please regenerate',
+      NotFoundException,
+    );
+
+    return {
+      id: user.id,
+      email: user.email,
+    };
+  }
+
+  async invalidatePasswordResetToken(
+    userId: string,
+  ): Promise<InvalidatePassword> {
+    const user = await this.userRepository.findOneBy({
+      id: userId,
+    });
+
+    assert(user, 'User not found', NotFoundException);
+
+    await this.userRepository.update(user.id, {
+      passwordResetToken: '',
+      passwordResetTokenExpiresAt: undefined,
+    });
+
+    return { success: true };
+  }
+
+  async encodePayload(payload: any, options?: any): Promise<string> {
+    return this.jwtService.sign(payload, options);
+  }
+
+  async decodePayload(payload: any, options?: any): Promise<string> {
+    return this.jwtService.decode(payload, options);
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis.auth.strategy.ts
new file mode 100644
index 000000000000..c4b563bacc44
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis.auth.strategy.ts
@@ -0,0 +1,89 @@
+import { PassportStrategy } from '@nestjs/passport';
+import { Injectable } from '@nestjs/common';
+
+import { Strategy, VerifyCallback } from 'passport-google-oauth20';
+import { Request } from 'express';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+
+export type GoogleAPIsRequest = Omit<
+  Request,
+  'user' | 'workspace' | 'cacheVersion'
+> & {
+  user: {
+    firstName?: string | null;
+    lastName?: string | null;
+    email: string;
+    picture: string | null;
+    workspaceInviteHash?: string;
+    accessToken: string;
+    refreshToken: string;
+    transientToken: string;
+  };
+};
+
+@Injectable()
+export class GoogleAPIsStrategy extends PassportStrategy(
+  Strategy,
+  'google-apis',
+) {
+  constructor(environmentService: EnvironmentService) {
+    const scope = ['email', 'profile'];
+
+    if (environmentService.get('MESSAGING_PROVIDER_GMAIL_ENABLED')) {
+      scope.push('https://www.googleapis.com/auth/gmail.readonly');
+    }
+
+    if (environmentService.get('CALENDAR_PROVIDER_GOOGLE_ENABLED')) {
+      scope.push('https://www.googleapis.com/auth/calendar.events');
+    }
+
+    super({
+      clientID: environmentService.get('AUTH_GOOGLE_CLIENT_ID'),
+      clientSecret: environmentService.get('AUTH_GOOGLE_CLIENT_SECRET'),
+      callbackURL: environmentService.get('AUTH_GOOGLE_APIS_CALLBACK_URL'),
+      scope,
+      passReqToCallback: true,
+    });
+  }
+
+  authenticate(req: any, options: any) {
+    options = {
+      ...options,
+      accessType: 'offline',
+      prompt: 'consent',
+      state: JSON.stringify({
+        transientToken: req.params.transientToken,
+      }),
+    };
+
+    return super.authenticate(req, options);
+  }
+
+  async validate(
+    request: GoogleAPIsRequest,
+    accessToken: string,
+    refreshToken: string,
+    profile: any,
+    done: VerifyCallback,
+  ): Promise<void> {
+    const { name, emails, photos } = profile;
+
+    const state =
+      typeof request.query.state === 'string'
+        ? JSON.parse(request.query.state)
+        : undefined;
+
+    const user: GoogleAPIsRequest['user'] = {
+      email: emails[0].value,
+      firstName: name.givenName,
+      lastName: name.familyName,
+      picture: photos?.[0]?.value,
+      accessToken,
+      refreshToken,
+      transientToken: state.transientToken,
+    };
+
+    done(null, user);
+  }
+}
diff --git a/packages/twenty-server/src/core/auth/strategies/google.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts
similarity index 78%
rename from packages/twenty-server/src/core/auth/strategies/google.auth.strategy.ts
rename to packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts
index d8a7c6e5cf37..ec5669808cc2 100644
--- a/packages/twenty-server/src/core/auth/strategies/google.auth.strategy.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts
@@ -4,9 +4,12 @@ import { Injectable } from '@nestjs/common';
 import { Strategy, VerifyCallback } from 'passport-google-oauth20';
 import { Request } from 'express';
 
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 
-export type GoogleRequest = Request & {
+export type GoogleRequest = Omit<
+  Request,
+  'user' | 'workspace' | 'cacheVersion'
+> & {
   user: {
     firstName?: string | null;
     lastName?: string | null;
@@ -20,9 +23,9 @@ export type GoogleRequest = Request & {
 export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {
   constructor(environmentService: EnvironmentService) {
     super({
-      clientID: environmentService.getAuthGoogleClientId(),
-      clientSecret: environmentService.getAuthGoogleClientSecret(),
-      callbackURL: environmentService.getAuthGoogleCallbackUrl(),
+      clientID: environmentService.get('AUTH_GOOGLE_CLIENT_ID'),
+      clientSecret: environmentService.get('AUTH_GOOGLE_CLIENT_SECRET'),
+      callbackURL: environmentService.get('AUTH_GOOGLE_CALLBACK_URL'),
       scope: ['email', 'profile'],
       passReqToCallback: true,
     });
diff --git a/packages/twenty-server/src/core/auth/strategies/jwt.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts
similarity index 85%
rename from packages/twenty-server/src/core/auth/strategies/jwt.auth.strategy.ts
rename to packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts
index 32e4db5fc419..8e1b7b6e2f6e 100644
--- a/packages/twenty-server/src/core/auth/strategies/jwt.auth.strategy.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts
@@ -10,11 +10,11 @@ import { Strategy, ExtractJwt } from 'passport-jwt';
 import { Repository } from 'typeorm';
 
 import { assert } from 'src/utils/assert';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { User } from 'src/core/user/user.entity';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 
 export type JwtPayload = { sub: string; workspaceId: string; jti?: string };
 export type PassportUser = { user?: User; workspace: Workspace };
@@ -33,7 +33,7 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {
     super({
       jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
       ignoreExpiration: false,
-      secretOrKey: environmentService.getAccessTokenSecret(),
+      secretOrKey: environmentService.get('ACCESS_TOKEN_SECRET'),
     });
   }
 
diff --git a/packages/twenty-server/src/engine/core-modules/auth/types/jwt-data.type.ts b/packages/twenty-server/src/engine/core-modules/auth/types/jwt-data.type.ts
new file mode 100644
index 000000000000..3c24db8de86d
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/types/jwt-data.type.ts
@@ -0,0 +1,7 @@
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+
+export type JwtData = {
+  user?: User | undefined;
+  workspace: Workspace;
+};
diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.controller.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.controller.ts
new file mode 100644
index 000000000000..775604f7d295
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/billing.controller.ts
@@ -0,0 +1,68 @@
+import {
+  Controller,
+  Headers,
+  Req,
+  RawBodyRequest,
+  Logger,
+  Post,
+  Res,
+} from '@nestjs/common';
+
+import { Response } from 'express';
+
+import {
+  BillingService,
+  WebhookEvent,
+} from 'src/engine/core-modules/billing/billing.service';
+import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
+
+@Controller('billing')
+export class BillingController {
+  protected readonly logger = new Logger(BillingController.name);
+
+  constructor(
+    private readonly stripeService: StripeService,
+    private readonly billingService: BillingService,
+  ) {}
+
+  @Post('/webhooks')
+  async handleWebhooks(
+    @Headers('stripe-signature') signature: string,
+    @Req() req: RawBodyRequest<Request>,
+    @Res() res: Response,
+  ) {
+    if (!req.rawBody) {
+      res.status(400).end();
+
+      return;
+    }
+    const event = this.stripeService.constructEventFromPayload(
+      signature,
+      req.rawBody,
+    );
+
+    if (event.type === WebhookEvent.SETUP_INTENT_SUCCEEDED) {
+      await this.billingService.handleUnpaidInvoices(event.data);
+    }
+
+    if (
+      event.type === WebhookEvent.CUSTOMER_SUBSCRIPTION_CREATED ||
+      event.type === WebhookEvent.CUSTOMER_SUBSCRIPTION_UPDATED ||
+      event.type === WebhookEvent.CUSTOMER_SUBSCRIPTION_DELETED
+    ) {
+      const workspaceId = event.data.object.metadata?.workspaceId;
+
+      if (!workspaceId) {
+        res.status(404).end();
+
+        return;
+      }
+
+      await this.billingService.upsertBillingSubscription(
+        workspaceId,
+        event.data,
+      );
+    }
+    res.status(200).end();
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts
new file mode 100644
index 000000000000..4be921b78c04
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts
@@ -0,0 +1,27 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { BillingController } from 'src/engine/core-modules/billing/billing.controller';
+import { BillingService } from 'src/engine/core-modules/billing/billing.service';
+import { StripeModule } from 'src/engine/core-modules/billing/stripe/stripe.module';
+import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
+import { BillingSubscriptionItem } from 'src/engine/core-modules/billing/entities/billing-subscription-item.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { BillingResolver } from 'src/engine/core-modules/billing/billing.resolver';
+import { BillingWorkspaceMemberListener } from 'src/engine/core-modules/billing/listeners/billing-workspace-member.listener';
+import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
+
+@Module({
+  imports: [
+    StripeModule,
+    UserWorkspaceModule,
+    TypeOrmModule.forFeature(
+      [BillingSubscription, BillingSubscriptionItem, Workspace],
+      'core',
+    ),
+  ],
+  controllers: [BillingController],
+  providers: [BillingService, BillingResolver, BillingWorkspaceMemberListener],
+  exports: [BillingService],
+})
+export class BillingModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.resolver.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.resolver.ts
new file mode 100644
index 000000000000..8766c4adc37e
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/billing.resolver.ts
@@ -0,0 +1,100 @@
+import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { UseGuards } from '@nestjs/common';
+
+import {
+  AvailableProduct,
+  BillingService,
+} from 'src/engine/core-modules/billing/billing.service';
+import { ProductInput } from 'src/engine/core-modules/billing/dto/product.input';
+import { assert } from 'src/utils/assert';
+import { ProductPricesEntity } from 'src/engine/core-modules/billing/dto/product-prices.entity';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { CheckoutSessionInput } from 'src/engine/core-modules/billing/dto/checkout-session.input';
+import { SessionEntity } from 'src/engine/core-modules/billing/dto/session.entity';
+import { BillingSessionInput } from 'src/engine/core-modules/billing/dto/billing-session.input';
+import { UpdateBillingEntity } from 'src/engine/core-modules/billing/dto/update-billing.entity';
+
+@Resolver()
+export class BillingResolver {
+  constructor(private readonly billingService: BillingService) {}
+
+  @Query(() => ProductPricesEntity)
+  async getProductPrices(@Args() { product }: ProductInput) {
+    const stripeProductId = this.billingService.getProductStripeId(product);
+
+    assert(
+      stripeProductId,
+      `Product '${product}' not found, available products are ['${Object.values(
+        AvailableProduct,
+      ).join("','")}']`,
+    );
+
+    const productPrices =
+      await this.billingService.getProductPrices(stripeProductId);
+
+    return {
+      totalNumberOfPrices: productPrices.length,
+      productPrices: productPrices,
+    };
+  }
+
+  @Query(() => SessionEntity)
+  @UseGuards(JwtAuthGuard)
+  async billingPortalSession(
+    @AuthUser() user: User,
+    @Args() { returnUrlPath }: BillingSessionInput,
+  ) {
+    return {
+      url: await this.billingService.computeBillingPortalSessionURL(
+        user.defaultWorkspaceId,
+        returnUrlPath,
+      ),
+    };
+  }
+
+  @Mutation(() => SessionEntity)
+  @UseGuards(JwtAuthGuard)
+  async checkoutSession(
+    @AuthUser() user: User,
+    @Args() { recurringInterval, successUrlPath }: CheckoutSessionInput,
+  ) {
+    const stripeProductId = this.billingService.getProductStripeId(
+      AvailableProduct.BasePlan,
+    );
+
+    assert(
+      stripeProductId,
+      'BasePlan productId not found, please check your BILLING_STRIPE_BASE_PLAN_PRODUCT_ID env variable',
+    );
+
+    const productPrices =
+      await this.billingService.getProductPrices(stripeProductId);
+
+    const stripePriceId = productPrices.filter(
+      (price) => price.recurringInterval === recurringInterval,
+    )?.[0]?.stripePriceId;
+
+    assert(
+      stripePriceId,
+      `BasePlan priceId not found, please check body.recurringInterval and product '${AvailableProduct.BasePlan}' prices`,
+    );
+
+    return {
+      url: await this.billingService.computeCheckoutSessionURL(
+        user,
+        stripePriceId,
+        successUrlPath,
+      ),
+    };
+  }
+
+  @Mutation(() => UpdateBillingEntity)
+  @UseGuards(JwtAuthGuard)
+  async updateBillingSubscription(@AuthUser() user: User) {
+    await this.billingService.updateBillingSubscription(user);
+
+    return { success: true };
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.service.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.service.ts
new file mode 100644
index 000000000000..722c9f8c2303
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/billing.service.ts
@@ -0,0 +1,295 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import Stripe from 'stripe';
+import { Not, Repository } from 'typeorm';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
+import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
+import { BillingSubscriptionItem } from 'src/engine/core-modules/billing/entities/billing-subscription-item.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { ProductPriceEntity } from 'src/engine/core-modules/billing/dto/product-price.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { assert } from 'src/utils/assert';
+import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
+
+export enum AvailableProduct {
+  BasePlan = 'base-plan',
+}
+
+export enum WebhookEvent {
+  CUSTOMER_SUBSCRIPTION_CREATED = 'customer.subscription.created',
+  CUSTOMER_SUBSCRIPTION_UPDATED = 'customer.subscription.updated',
+  CUSTOMER_SUBSCRIPTION_DELETED = 'customer.subscription.deleted',
+  SETUP_INTENT_SUCCEEDED = 'setup_intent.succeeded',
+}
+
+@Injectable()
+export class BillingService {
+  protected readonly logger = new Logger(BillingService.name);
+  constructor(
+    private readonly stripeService: StripeService,
+    private readonly userWorkspaceService: UserWorkspaceService,
+    private readonly environmentService: EnvironmentService,
+    @InjectRepository(BillingSubscription, 'core')
+    private readonly billingSubscriptionRepository: Repository<BillingSubscription>,
+    @InjectRepository(BillingSubscriptionItem, 'core')
+    private readonly billingSubscriptionItemRepository: Repository<BillingSubscriptionItem>,
+    @InjectRepository(Workspace, 'core')
+    private readonly workspaceRepository: Repository<Workspace>,
+  ) {}
+
+  getProductStripeId(product: AvailableProduct) {
+    if (product === AvailableProduct.BasePlan) {
+      return this.environmentService.get('BILLING_STRIPE_BASE_PLAN_PRODUCT_ID');
+    }
+  }
+
+  async getProductPrices(stripeProductId: string) {
+    const productPrices =
+      await this.stripeService.getProductPrices(stripeProductId);
+
+    return this.formatProductPrices(productPrices.data);
+  }
+
+  formatProductPrices(prices: Stripe.Price[]) {
+    const result: Record<string, ProductPriceEntity> = {};
+
+    prices.forEach((item) => {
+      const interval = item.recurring?.interval;
+
+      if (!interval || !item.unit_amount) {
+        return;
+      }
+      if (
+        !result[interval] ||
+        item.created > (result[interval]?.created || 0)
+      ) {
+        result[interval] = {
+          unitAmount: item.unit_amount,
+          recurringInterval: interval,
+          created: item.created,
+          stripePriceId: item.id,
+        };
+      }
+    });
+
+    return Object.values(result).sort((a, b) => a.unitAmount - b.unitAmount);
+  }
+
+  async getCurrentBillingSubscription(criteria: {
+    workspaceId?: string;
+    stripeCustomerId?: string;
+  }) {
+    const notCanceledSubscriptions =
+      await this.billingSubscriptionRepository.find({
+        where: { ...criteria, status: Not('canceled') },
+        relations: ['billingSubscriptionItems'],
+      });
+
+    assert(
+      notCanceledSubscriptions.length <= 1,
+      `More than on not canceled subscription for workspace ${criteria.workspaceId}`,
+    );
+
+    return notCanceledSubscriptions?.[0];
+  }
+
+  async getBillingSubscriptionItem(
+    workspaceId: string,
+    stripeProductId = this.environmentService.get(
+      'BILLING_STRIPE_BASE_PLAN_PRODUCT_ID',
+    ),
+  ) {
+    const billingSubscription = await this.getCurrentBillingSubscription({
+      workspaceId,
+    });
+
+    if (!billingSubscription) {
+      throw new Error(
+        `Cannot find billingSubscriptionItem for product ${stripeProductId} for workspace ${workspaceId}`,
+      );
+    }
+
+    const billingSubscriptionItem =
+      billingSubscription.billingSubscriptionItems.filter(
+        (billingSubscriptionItem) =>
+          billingSubscriptionItem.stripeProductId === stripeProductId,
+      )?.[0];
+
+    if (!billingSubscriptionItem) {
+      throw new Error(
+        `Cannot find billingSubscriptionItem for product ${stripeProductId} for workspace ${workspaceId}`,
+      );
+    }
+
+    return billingSubscriptionItem;
+  }
+
+  async computeBillingPortalSessionURL(
+    workspaceId: string,
+    returnUrlPath?: string,
+  ) {
+    const billingSubscription = await this.getCurrentBillingSubscription({
+      workspaceId,
+    });
+
+    if (!billingSubscription) {
+      return;
+    }
+
+    const frontBaseUrl = this.environmentService.get('FRONT_BASE_URL');
+    const returnUrl = returnUrlPath
+      ? frontBaseUrl + returnUrlPath
+      : frontBaseUrl;
+
+    const session = await this.stripeService.createBillingPortalSession(
+      billingSubscription.stripeCustomerId,
+      returnUrl,
+    );
+
+    assert(session.url, 'Error: missing billingPortal.session.url');
+
+    return session.url;
+  }
+
+  async updateBillingSubscription(user: User) {
+    const billingSubscription = await this.getCurrentBillingSubscription({
+      workspaceId: user.defaultWorkspaceId,
+    });
+    const newInterval =
+      billingSubscription?.interval === 'year' ? 'month' : 'year';
+    const billingSubscriptionItem = await this.getBillingSubscriptionItem(
+      user.defaultWorkspaceId,
+    );
+    const stripeProductId = this.getProductStripeId(AvailableProduct.BasePlan);
+
+    if (!stripeProductId) {
+      throw new Error('Stripe product id not found for basePlan');
+    }
+    const productPrices = await this.getProductPrices(stripeProductId);
+
+    const stripePriceId = productPrices.filter(
+      (price) => price.recurringInterval === newInterval,
+    )?.[0]?.stripePriceId;
+
+    await this.stripeService.updateBillingSubscriptionItem(
+      billingSubscriptionItem,
+      stripePriceId,
+    );
+  }
+
+  async computeCheckoutSessionURL(
+    user: User,
+    priceId: string,
+    successUrlPath?: string,
+  ): Promise<string> {
+    const frontBaseUrl = this.environmentService.get('FRONT_BASE_URL');
+    const successUrl = successUrlPath
+      ? frontBaseUrl + successUrlPath
+      : frontBaseUrl;
+
+    let quantity = 1;
+
+    const stripeCustomerId = (
+      await this.billingSubscriptionRepository.findOneBy({
+        workspaceId: user.defaultWorkspaceId,
+      })
+    )?.stripeCustomerId;
+
+    try {
+      quantity = await this.userWorkspaceService.getWorkspaceMemberCount(
+        user.defaultWorkspaceId,
+      );
+    } catch (e) {}
+
+    const session = await this.stripeService.createCheckoutSession(
+      user,
+      priceId,
+      quantity,
+      successUrl,
+      frontBaseUrl,
+      stripeCustomerId,
+    );
+
+    assert(session.url, 'Error: missing checkout.session.url');
+
+    return session.url;
+  }
+
+  async deleteSubscription(workspaceId: string) {
+    const subscriptionToCancel = await this.getCurrentBillingSubscription({
+      workspaceId,
+    });
+
+    if (subscriptionToCancel) {
+      await this.stripeService.cancelSubscription(
+        subscriptionToCancel.stripeSubscriptionId,
+      );
+      await this.billingSubscriptionRepository.delete(subscriptionToCancel.id);
+    }
+  }
+
+  async handleUnpaidInvoices(data: Stripe.SetupIntentSucceededEvent.Data) {
+    const billingSubscription = await this.getCurrentBillingSubscription({
+      stripeCustomerId: data.object.customer as string,
+    });
+
+    if (billingSubscription?.status === 'unpaid') {
+      await this.stripeService.collectLastInvoice(
+        billingSubscription.stripeSubscriptionId,
+      );
+    }
+  }
+
+  async upsertBillingSubscription(
+    workspaceId: string,
+    data:
+      | Stripe.CustomerSubscriptionUpdatedEvent.Data
+      | Stripe.CustomerSubscriptionCreatedEvent.Data
+      | Stripe.CustomerSubscriptionDeletedEvent.Data,
+  ) {
+    await this.billingSubscriptionRepository.upsert(
+      {
+        workspaceId: workspaceId,
+        stripeCustomerId: data.object.customer as string,
+        stripeSubscriptionId: data.object.id,
+        status: data.object.status,
+        interval: data.object.items.data[0].plan.interval,
+      },
+      {
+        conflictPaths: ['stripeSubscriptionId'],
+        skipUpdateIfNoValuesChanged: true,
+      },
+    );
+
+    await this.workspaceRepository.update(workspaceId, {
+      subscriptionStatus: data.object.status,
+    });
+
+    const billingSubscription = await this.getCurrentBillingSubscription({
+      workspaceId,
+    });
+
+    if (!billingSubscription) {
+      return;
+    }
+
+    await this.billingSubscriptionItemRepository.upsert(
+      data.object.items.data.map((item) => {
+        return {
+          billingSubscriptionId: billingSubscription.id,
+          stripeProductId: item.price.product as string,
+          stripePriceId: item.price.id,
+          stripeSubscriptionItemId: item.id,
+          quantity: item.quantity,
+        };
+      }),
+      {
+        conflictPaths: ['billingSubscriptionId', 'stripeProductId'],
+        skipUpdateIfNoValuesChanged: true,
+      },
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dto/billing-session.input.ts b/packages/twenty-server/src/engine/core-modules/billing/dto/billing-session.input.ts
new file mode 100644
index 000000000000..67a6c27b8fe0
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/dto/billing-session.input.ts
@@ -0,0 +1,11 @@
+import { ArgsType, Field } from '@nestjs/graphql';
+
+import { IsOptional, IsString } from 'class-validator';
+
+@ArgsType()
+export class BillingSessionInput {
+  @Field(() => String, { nullable: true })
+  @IsString()
+  @IsOptional()
+  returnUrlPath?: string;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dto/checkout-session.input.ts b/packages/twenty-server/src/engine/core-modules/billing/dto/checkout-session.input.ts
new file mode 100644
index 000000000000..778f0671ee6c
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/dto/checkout-session.input.ts
@@ -0,0 +1,17 @@
+import { ArgsType, Field } from '@nestjs/graphql';
+
+import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
+import Stripe from 'stripe';
+
+@ArgsType()
+export class CheckoutSessionInput {
+  @Field(() => String)
+  @IsString()
+  @IsNotEmpty()
+  recurringInterval: Stripe.Price.Recurring.Interval;
+
+  @Field(() => String, { nullable: true })
+  @IsString()
+  @IsOptional()
+  successUrlPath?: string;
+}
diff --git a/packages/twenty-server/src/core/billing/dto/product-price.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/dto/product-price.entity.ts
similarity index 100%
rename from packages/twenty-server/src/core/billing/dto/product-price.entity.ts
rename to packages/twenty-server/src/engine/core-modules/billing/dto/product-price.entity.ts
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dto/product-prices.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/dto/product-prices.entity.ts
new file mode 100644
index 000000000000..02efc4174929
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/dto/product-prices.entity.ts
@@ -0,0 +1,12 @@
+import { Field, Int, ObjectType } from '@nestjs/graphql';
+
+import { ProductPriceEntity } from 'src/engine/core-modules/billing/dto/product-price.entity';
+
+@ObjectType()
+export class ProductPricesEntity {
+  @Field(() => Int)
+  totalNumberOfPrices: number;
+
+  @Field(() => [ProductPriceEntity])
+  productPrices: ProductPriceEntity[];
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dto/product.input.ts b/packages/twenty-server/src/engine/core-modules/billing/dto/product.input.ts
new file mode 100644
index 000000000000..089d18ba0e05
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/dto/product.input.ts
@@ -0,0 +1,13 @@
+import { ArgsType, Field } from '@nestjs/graphql';
+
+import { IsNotEmpty, IsString } from 'class-validator';
+
+import { AvailableProduct } from 'src/engine/core-modules/billing/billing.service';
+
+@ArgsType()
+export class ProductInput {
+  @Field(() => String)
+  @IsString()
+  @IsNotEmpty()
+  product: AvailableProduct;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dto/session.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/dto/session.entity.ts
new file mode 100644
index 000000000000..745a7364b749
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/dto/session.entity.ts
@@ -0,0 +1,7 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+@ObjectType()
+export class SessionEntity {
+  @Field(() => String, { nullable: true })
+  url: string;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dto/update-billing.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/dto/update-billing.entity.ts
new file mode 100644
index 000000000000..ae8f8660d0f0
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/dto/update-billing.entity.ts
@@ -0,0 +1,9 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+@ObjectType()
+export class UpdateBillingEntity {
+  @Field(() => Boolean, {
+    description: 'Boolean that confirms query was successful',
+  })
+  success: boolean;
+}
diff --git a/packages/twenty-server/src/core/billing/entities/billing-subscription-item.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-subscription-item.entity.ts
similarity index 81%
rename from packages/twenty-server/src/core/billing/entities/billing-subscription-item.entity.ts
rename to packages/twenty-server/src/engine/core-modules/billing/entities/billing-subscription-item.entity.ts
index 4d30e50a43cf..4b13cc2aac3d 100644
--- a/packages/twenty-server/src/core/billing/entities/billing-subscription-item.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-subscription-item.entity.ts
@@ -8,7 +8,7 @@ import {
   UpdateDateColumn,
 } from 'typeorm';
 
-import { BillingSubscription } from 'src/core/billing/entities/billing-subscription.entity';
+import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
 
 @Entity({ name: 'billingSubscriptionItem', schema: 'core' })
 @Unique('IndexOnBillingSubscriptionIdAndStripeProductIdUnique', [
@@ -23,13 +23,13 @@ export class BillingSubscriptionItem {
   @PrimaryGeneratedColumn('uuid')
   id: string;
 
-  @Column({ nullable: true })
+  @Column({ nullable: true, type: 'timestamptz' })
   deletedAt?: Date;
 
-  @CreateDateColumn({ type: 'timestamp with time zone' })
+  @CreateDateColumn({ type: 'timestamptz' })
   createdAt: Date;
 
-  @UpdateDateColumn({ type: 'timestamp with time zone' })
+  @UpdateDateColumn({ type: 'timestamptz' })
   updatedAt: Date;
 
   @Column({ nullable: false })
diff --git a/packages/twenty-server/src/engine/core-modules/billing/entities/billing-subscription.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-subscription.entity.ts
new file mode 100644
index 000000000000..00733fbf6c66
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-subscription.entity.ts
@@ -0,0 +1,64 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  JoinColumn,
+  ManyToOne,
+  OneToMany,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+} from 'typeorm';
+import Stripe from 'stripe';
+import { IDField } from '@ptc-org/nestjs-query-graphql';
+
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { BillingSubscriptionItem } from 'src/engine/core-modules/billing/entities/billing-subscription-item.entity';
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@Entity({ name: 'billingSubscription', schema: 'core' })
+@ObjectType('BillingSubscription')
+export class BillingSubscription {
+  @IDField(() => UUIDScalarType)
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column({ nullable: true, type: 'timestamptz' })
+  deletedAt?: Date;
+
+  @CreateDateColumn({ type: 'timestamptz' })
+  createdAt: Date;
+
+  @UpdateDateColumn({ type: 'timestamptz' })
+  updatedAt: Date;
+
+  @ManyToOne(() => Workspace, (workspace) => workspace.billingSubscriptions, {
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn()
+  workspace: Workspace;
+
+  @Column({ nullable: false, type: 'uuid' })
+  workspaceId: string;
+
+  @Column({ nullable: false })
+  stripeCustomerId: string;
+
+  @Column({ unique: true, nullable: false })
+  stripeSubscriptionId: string;
+
+  @Field()
+  @Column({ nullable: false })
+  status: Stripe.Subscription.Status;
+
+  @Field({ nullable: true })
+  @Column({ nullable: true })
+  interval: Stripe.Price.Recurring.Interval;
+
+  @OneToMany(
+    () => BillingSubscriptionItem,
+    (billingSubscriptionItem) => billingSubscriptionItem.billingSubscription,
+  )
+  billingSubscriptionItems: BillingSubscriptionItem[];
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/jobs/update-subscription.job.ts b/packages/twenty-server/src/engine/core-modules/billing/jobs/update-subscription.job.ts
new file mode 100644
index 000000000000..8dc74ab6c66f
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/jobs/update-subscription.job.ts
@@ -0,0 +1,46 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { BillingService } from 'src/engine/core-modules/billing/billing.service';
+import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
+import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
+export type UpdateSubscriptionJobData = { workspaceId: string };
+@Injectable()
+export class UpdateSubscriptionJob
+  implements MessageQueueJob<UpdateSubscriptionJobData>
+{
+  protected readonly logger = new Logger(UpdateSubscriptionJob.name);
+  constructor(
+    private readonly billingService: BillingService,
+    private readonly userWorkspaceService: UserWorkspaceService,
+    private readonly stripeService: StripeService,
+  ) {}
+
+  async handle(data: UpdateSubscriptionJobData): Promise<void> {
+    const workspaceMembersCount =
+      await this.userWorkspaceService.getWorkspaceMemberCount(data.workspaceId);
+
+    if (workspaceMembersCount <= 0) {
+      return;
+    }
+
+    try {
+      const billingSubscriptionItem =
+        await this.billingService.getBillingSubscriptionItem(data.workspaceId);
+
+      await this.stripeService.updateSubscriptionItem(
+        billingSubscriptionItem.stripeSubscriptionItemId,
+        workspaceMembersCount,
+      );
+
+      this.logger.log(
+        `Updating workspace ${data.workspaceId} subscription quantity to ${workspaceMembersCount} members`,
+      );
+    } catch (e) {
+      this.logger.warn(
+        `Failed to update workspace ${data.workspaceId} subscription quantity to ${workspaceMembersCount} members. Error: ${e}`,
+      );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts b/packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts
new file mode 100644
index 000000000000..e31a7b592806
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts
@@ -0,0 +1,30 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/types/object-record-create.event';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+import {
+  UpdateSubscriptionJob,
+  UpdateSubscriptionJobData,
+} from 'src/engine/core-modules/billing/jobs/update-subscription.job';
+
+@Injectable()
+export class BillingWorkspaceMemberListener {
+  constructor(
+    @Inject(MessageQueue.billingQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {}
+
+  @OnEvent('workspaceMember.created')
+  @OnEvent('workspaceMember.deleted')
+  async handleCreateOrDeleteEvent(
+    payload: ObjectRecordCreateEvent<WorkspaceMemberObjectMetadata>,
+  ) {
+    await this.messageQueueService.add<UpdateSubscriptionJobData>(
+      UpdateSubscriptionJob.name,
+      { workspaceId: payload.workspaceId },
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.module.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.module.ts
new file mode 100644
index 000000000000..31d456008301
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.module.ts
@@ -0,0 +1,9 @@
+import { Module } from '@nestjs/common';
+
+import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
+
+@Module({
+  providers: [StripeService],
+  exports: [StripeService],
+})
+export class StripeModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.service.ts
new file mode 100644
index 000000000000..1a4e728fe24c
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.service.ts
@@ -0,0 +1,122 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import Stripe from 'stripe';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { BillingSubscriptionItem } from 'src/engine/core-modules/billing/entities/billing-subscription-item.entity';
+
+@Injectable()
+export class StripeService {
+  protected readonly logger = new Logger(StripeService.name);
+  private readonly stripe: Stripe;
+
+  constructor(private readonly environmentService: EnvironmentService) {
+    this.stripe = new Stripe(
+      this.environmentService.get('BILLING_STRIPE_API_KEY'),
+      {},
+    );
+  }
+
+  constructEventFromPayload(signature: string, payload: Buffer) {
+    const webhookSecret = this.environmentService.get(
+      'BILLING_STRIPE_WEBHOOK_SECRET',
+    );
+
+    return this.stripe.webhooks.constructEvent(
+      payload,
+      signature,
+      webhookSecret,
+    );
+  }
+
+  async getProductPrices(stripeProductId: string) {
+    return this.stripe.prices.search({
+      query: `product: '${stripeProductId}'`,
+    });
+  }
+
+  async updateSubscriptionItem(stripeItemId: string, quantity: number) {
+    await this.stripe.subscriptionItems.update(stripeItemId, { quantity });
+  }
+
+  async cancelSubscription(stripeSubscriptionId: string) {
+    await this.stripe.subscriptions.cancel(stripeSubscriptionId);
+  }
+
+  async createBillingPortalSession(
+    stripeCustomerId: string,
+    returnUrl?: string,
+  ): Promise<Stripe.BillingPortal.Session> {
+    return await this.stripe.billingPortal.sessions.create({
+      customer: stripeCustomerId,
+      return_url: returnUrl ?? this.environmentService.get('FRONT_BASE_URL'),
+    });
+  }
+
+  async createCheckoutSession(
+    user: User,
+    priceId: string,
+    quantity: number,
+    successUrl?: string,
+    cancelUrl?: string,
+    stripeCustomerId?: string,
+  ): Promise<Stripe.Checkout.Session> {
+    return await this.stripe.checkout.sessions.create({
+      line_items: [
+        {
+          price: priceId,
+          quantity,
+        },
+      ],
+      mode: 'subscription',
+      subscription_data: {
+        metadata: {
+          workspaceId: user.defaultWorkspace.id,
+        },
+        trial_period_days: this.environmentService.get(
+          'BILLING_FREE_TRIAL_DURATION_IN_DAYS',
+        ),
+      },
+      automatic_tax: { enabled: true },
+      tax_id_collection: { enabled: true },
+      customer: stripeCustomerId,
+      customer_update: stripeCustomerId ? { name: 'auto' } : undefined,
+      customer_email: stripeCustomerId ? undefined : user.email,
+      success_url: successUrl,
+      cancel_url: cancelUrl,
+    });
+  }
+
+  async collectLastInvoice(stripeSubscriptionId: string) {
+    const subscription = await this.stripe.subscriptions.retrieve(
+      stripeSubscriptionId,
+      { expand: ['latest_invoice'] },
+    );
+    const latestInvoice = subscription.latest_invoice;
+
+    if (
+      !(
+        latestInvoice &&
+        typeof latestInvoice !== 'string' &&
+        latestInvoice.status === 'draft'
+      )
+    ) {
+      return;
+    }
+    await this.stripe.invoices.pay(latestInvoice.id);
+  }
+
+  async updateBillingSubscriptionItem(
+    stripeSubscriptionItem: BillingSubscriptionItem,
+    stripePriceId: string,
+  ) {
+    await this.stripe.subscriptionItems.update(
+      stripeSubscriptionItem.stripeSubscriptionItemId,
+      {
+        price: stripePriceId,
+        quantity: stripeSubscriptionItem.quantity,
+      },
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/calendar/constants/calendar.constants.ts b/packages/twenty-server/src/engine/core-modules/calendar/constants/calendar.constants.ts
new file mode 100644
index 000000000000..3a0d0be05fdc
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/calendar/constants/calendar.constants.ts
@@ -0,0 +1,2 @@
+export const TIMELINE_CALENDAR_EVENTS_DEFAULT_PAGE_SIZE = 20;
+export const TIMELINE_CALENDAR_EVENTS_MAX_PAGE_SIZE = 50;
diff --git a/packages/twenty-server/src/engine/core-modules/calendar/dtos/timeline-calendar-event-participant.dto.ts b/packages/twenty-server/src/engine/core-modules/calendar/dtos/timeline-calendar-event-participant.dto.ts
new file mode 100644
index 000000000000..1d5d99720899
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/calendar/dtos/timeline-calendar-event-participant.dto.ts
@@ -0,0 +1,27 @@
+import { ObjectType, Field } from '@nestjs/graphql';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@ObjectType('TimelineCalendarEventParticipant')
+export class TimelineCalendarEventParticipant {
+  @Field(() => UUIDScalarType, { nullable: true })
+  personId: string;
+
+  @Field(() => UUIDScalarType, { nullable: true })
+  workspaceMemberId: string;
+
+  @Field()
+  firstName: string;
+
+  @Field()
+  lastName: string;
+
+  @Field()
+  displayName: string;
+
+  @Field()
+  avatarUrl: string;
+
+  @Field()
+  handle: string;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/calendar/dtos/timeline-calendar-event.dto.ts b/packages/twenty-server/src/engine/core-modules/calendar/dtos/timeline-calendar-event.dto.ts
new file mode 100644
index 000000000000..d175bfdc9dc5
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/calendar/dtos/timeline-calendar-event.dto.ts
@@ -0,0 +1,62 @@
+import { ObjectType, Field, registerEnumType } from '@nestjs/graphql';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { TimelineCalendarEventParticipant } from 'src/engine/core-modules/calendar/dtos/timeline-calendar-event-participant.dto';
+
+export enum TimelineCalendarEventVisibility {
+  METADATA = 'METADATA',
+  SHARE_EVERYTHING = 'SHARE_EVERYTHING',
+}
+
+registerEnumType(TimelineCalendarEventVisibility, {
+  name: 'TimelineCalendarEventVisibility',
+  description: 'Visibility of the calendar event',
+});
+
+@ObjectType('LinkMetadata')
+export class LinkMetadata {
+  @Field()
+  label: string;
+
+  @Field()
+  url: string;
+}
+
+@ObjectType('TimelineCalendarEvent')
+export class TimelineCalendarEvent {
+  @Field(() => UUIDScalarType)
+  id: string;
+
+  @Field()
+  title: string;
+
+  @Field()
+  isCanceled: boolean;
+
+  @Field()
+  isFullDay: boolean;
+
+  @Field()
+  startsAt: Date;
+
+  @Field()
+  endsAt: Date;
+
+  @Field()
+  description: string;
+
+  @Field()
+  location: string;
+
+  @Field()
+  conferenceSolution: string;
+
+  @Field(() => LinkMetadata)
+  conferenceLink: LinkMetadata;
+
+  @Field(() => [TimelineCalendarEventParticipant])
+  participants: TimelineCalendarEventParticipant[];
+
+  @Field(() => TimelineCalendarEventVisibility)
+  visibility: TimelineCalendarEventVisibility;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/calendar/dtos/timeline-calendar-events-with-total.dto.ts b/packages/twenty-server/src/engine/core-modules/calendar/dtos/timeline-calendar-events-with-total.dto.ts
new file mode 100644
index 000000000000..10dd32a45c0a
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/calendar/dtos/timeline-calendar-events-with-total.dto.ts
@@ -0,0 +1,12 @@
+import { Field, Int, ObjectType } from '@nestjs/graphql';
+
+import { TimelineCalendarEvent } from 'src/engine/core-modules/calendar/dtos/timeline-calendar-event.dto';
+
+@ObjectType('TimelineCalendarEventsWithTotal')
+export class TimelineCalendarEventsWithTotal {
+  @Field(() => Int)
+  totalNumberOfCalendarEvents: number;
+
+  @Field(() => [TimelineCalendarEvent])
+  timelineCalendarEvents: TimelineCalendarEvent[];
+}
diff --git a/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.module.ts b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.module.ts
new file mode 100644
index 000000000000..917b4ee644c8
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.module.ts
@@ -0,0 +1,13 @@
+import { Module } from '@nestjs/common';
+
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { UserModule } from 'src/engine/core-modules/user/user.module';
+import { TimelineCalendarEventResolver } from 'src/engine/core-modules/calendar/timeline-calendar-event.resolver';
+import { TimelineCalendarEventService } from 'src/engine/core-modules/calendar/timeline-calendar-event.service';
+
+@Module({
+  imports: [WorkspaceDataSourceModule, UserModule],
+  exports: [],
+  providers: [TimelineCalendarEventResolver, TimelineCalendarEventService],
+})
+export class TimelineCalendarEventModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.resolver.ts b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.resolver.ts
new file mode 100644
index 000000000000..3c1fa40fc388
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.resolver.ts
@@ -0,0 +1,101 @@
+import { UseGuards } from '@nestjs/common';
+import { Query, Args, ArgsType, Field, Int, Resolver } from '@nestjs/graphql';
+
+import { Max } from 'class-validator';
+
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { TIMELINE_CALENDAR_EVENTS_MAX_PAGE_SIZE } from 'src/engine/core-modules/calendar/constants/calendar.constants';
+import { TimelineCalendarEventsWithTotal } from 'src/engine/core-modules/calendar/dtos/timeline-calendar-events-with-total.dto';
+import { TimelineCalendarEventService } from 'src/engine/core-modules/calendar/timeline-calendar-event.service';
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { NotFoundError } from 'src/engine/utils/graphql-errors.util';
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@ArgsType()
+class GetTimelineCalendarEventsFromPersonIdArgs {
+  @Field(() => UUIDScalarType)
+  personId: string;
+
+  @Field(() => Int)
+  page: number;
+
+  @Field(() => Int)
+  @Max(TIMELINE_CALENDAR_EVENTS_MAX_PAGE_SIZE)
+  pageSize: number;
+}
+
+@ArgsType()
+class GetTimelineCalendarEventsFromCompanyIdArgs {
+  @Field(() => UUIDScalarType)
+  companyId: string;
+
+  @Field(() => Int)
+  page: number;
+
+  @Field(() => Int)
+  @Max(TIMELINE_CALENDAR_EVENTS_MAX_PAGE_SIZE)
+  pageSize: number;
+}
+
+@UseGuards(JwtAuthGuard)
+@Resolver(() => TimelineCalendarEventsWithTotal)
+export class TimelineCalendarEventResolver {
+  constructor(
+    private readonly timelineCalendarEventService: TimelineCalendarEventService,
+    private readonly userService: UserService,
+  ) {}
+
+  @Query(() => TimelineCalendarEventsWithTotal)
+  async getTimelineCalendarEventsFromPersonId(
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+    @AuthUser() user: User,
+    @Args()
+    { personId, page, pageSize }: GetTimelineCalendarEventsFromPersonIdArgs,
+  ) {
+    const workspaceMember = await this.userService.loadWorkspaceMember(user);
+
+    if (!workspaceMember) {
+      throw new NotFoundError('Workspace member not found');
+    }
+
+    const timelineCalendarEvents =
+      await this.timelineCalendarEventService.getCalendarEventsFromPersonIds(
+        workspaceMember.id,
+        workspaceId,
+        [personId],
+        page,
+        pageSize,
+      );
+
+    return timelineCalendarEvents;
+  }
+
+  @Query(() => TimelineCalendarEventsWithTotal)
+  async getTimelineCalendarEventsFromCompanyId(
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+    @AuthUser() user: User,
+    @Args()
+    { companyId, page, pageSize }: GetTimelineCalendarEventsFromCompanyIdArgs,
+  ) {
+    const workspaceMember = await this.userService.loadWorkspaceMember(user);
+
+    if (!workspaceMember) {
+      throw new NotFoundError('Workspace member not found');
+    }
+
+    const timelineCalendarEvents =
+      await this.timelineCalendarEventService.getCalendarEventsFromCompanyId(
+        workspaceMember.id,
+        workspaceId,
+        companyId,
+        page,
+        pageSize,
+      );
+
+    return timelineCalendarEvents;
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.service.ts b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.service.ts
new file mode 100644
index 000000000000..283fd3325cce
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.service.ts
@@ -0,0 +1,277 @@
+import { Injectable } from '@nestjs/common';
+
+import groupBy from 'lodash.groupby';
+
+import { TIMELINE_CALENDAR_EVENTS_DEFAULT_PAGE_SIZE } from 'src/engine/core-modules/calendar/constants/calendar.constants';
+import { TimelineCalendarEventParticipant } from 'src/engine/core-modules/calendar/dtos/timeline-calendar-event-participant.dto';
+import {
+  TimelineCalendarEvent,
+  TimelineCalendarEventVisibility,
+} from 'src/engine/core-modules/calendar/dtos/timeline-calendar-event.dto';
+import { TimelineCalendarEventsWithTotal } from 'src/engine/core-modules/calendar/dtos/timeline-calendar-events-with-total.dto';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+
+type TimelineCalendarEventParticipantWithPersonInformation =
+  ObjectRecord<CalendarEventParticipantObjectMetadata> & {
+    personFirstName: string;
+    personLastName: string;
+    personAvatarUrl: string;
+    workspaceMemberFirstName: string;
+    workspaceMemberLastName: string;
+    workspaceMemberAvatarUrl: string;
+  };
+@Injectable()
+export class TimelineCalendarEventService {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  async getCalendarEventsFromPersonIds(
+    workspaceMemberId: string,
+    workspaceId: string,
+    personIds: string[],
+    page: number = 1,
+    pageSize: number = TIMELINE_CALENDAR_EVENTS_DEFAULT_PAGE_SIZE,
+  ): Promise<TimelineCalendarEventsWithTotal> {
+    const offset = (page - 1) * pageSize;
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const calendarEvents: Omit<TimelineCalendarEvent, 'participants'>[] =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `SELECT
+            "calendarEvent".*
+        FROM
+            ${dataSourceSchema}."calendarEvent" "calendarEvent"
+        LEFT JOIN
+            ${dataSourceSchema}."calendarEventParticipant" "calendarEventParticipant" ON "calendarEvent".id = "calendarEventParticipant"."calendarEventId"
+        LEFT JOIN
+            ${dataSourceSchema}."person" "person" ON "calendarEventParticipant"."personId" = "person".id
+        WHERE
+            "calendarEventParticipant"."personId" = ANY($1)
+        GROUP BY
+            "calendarEvent".id
+        ORDER BY
+            "calendarEvent"."startsAt" DESC
+        LIMIT $2
+        OFFSET $3`,
+        [personIds, pageSize, offset],
+        workspaceId,
+      );
+
+    if (!calendarEvents) {
+      return {
+        totalNumberOfCalendarEvents: 0,
+        timelineCalendarEvents: [],
+      };
+    }
+
+    const calendarEventParticipants: TimelineCalendarEventParticipantWithPersonInformation[] =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `SELECT
+            "calendarEventParticipant".*,
+            "person"."nameFirstName" as "personFirstName",
+            "person"."nameLastName" as "personLastName",
+            "person"."avatarUrl" as "personAvatarUrl",
+            "workspaceMember"."nameFirstName" as "workspaceMemberFirstName",
+            "workspaceMember"."nameLastName" as "workspaceMemberLastName",
+            "workspaceMember"."avatarUrl" as "workspaceMemberAvatarUrl"
+        FROM
+            ${dataSourceSchema}."calendarEventParticipant" "calendarEventParticipant"
+        LEFT JOIN
+            ${dataSourceSchema}."person" "person" ON "calendarEventParticipant"."personId" = "person".id
+        LEFT JOIN
+            ${dataSourceSchema}."workspaceMember" "workspaceMember" ON "calendarEventParticipant"."workspaceMemberId" = "workspaceMember".id
+        WHERE
+            "calendarEventParticipant"."calendarEventId" = ANY($1)`,
+        [calendarEvents.map((event) => event.id)],
+        workspaceId,
+      );
+
+    const formattedCalendarEventParticipants: TimelineCalendarEventParticipant[] =
+      calendarEventParticipants.map((participant) => {
+        const firstName =
+          participant.personFirstName ||
+          participant.workspaceMemberFirstName ||
+          '';
+
+        const lastName =
+          participant.personLastName ||
+          participant.workspaceMemberLastName ||
+          '';
+
+        const displayName =
+          firstName || participant.displayName || participant.handle;
+
+        const avatarUrl =
+          participant.personAvatarUrl ||
+          participant.workspaceMemberAvatarUrl ||
+          '';
+
+        return {
+          calendarEventId: participant.calendarEventId,
+          personId: participant.personId,
+          workspaceMemberId: participant.workspaceMemberId,
+          firstName,
+          lastName,
+          displayName,
+          avatarUrl,
+          handle: participant.handle,
+        };
+      });
+
+    const calendarEventParticipantsByEventId: {
+      [calendarEventId: string]: TimelineCalendarEventParticipant[];
+    } = groupBy(formattedCalendarEventParticipants, 'calendarEventId');
+
+    const totalNumberOfCalendarEvents: { count: number }[] =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `
+      SELECT
+          COUNT(DISTINCT "calendarEventId")
+      FROM
+          ${dataSourceSchema}."calendarEventParticipant" "calendarEventParticipant"
+      WHERE
+          "calendarEventParticipant"."personId" = ANY($1)
+      `,
+        [personIds],
+        workspaceId,
+      );
+
+    const timelineCalendarEvents = calendarEvents.map((event) => {
+      const participants = calendarEventParticipantsByEventId[event.id] || [];
+
+      return {
+        ...event,
+        participants,
+      };
+    });
+
+    const calendarEventIdsWithWorkspaceMemberInParticipants =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `
+      SELECT
+          "calendarEventId"
+      FROM
+          ${dataSourceSchema}."calendarEventParticipant" "calendarEventParticipant"
+      WHERE
+          "calendarEventParticipant"."workspaceMemberId" = $1
+      `,
+        [workspaceMemberId],
+        workspaceId,
+      );
+
+    const calendarEventIdsWithWorkspaceMemberInParticipantsFormatted =
+      calendarEventIdsWithWorkspaceMemberInParticipants.map(
+        (event: { calendarEventId: string }) => event.calendarEventId,
+      );
+
+    const calendarEventIdsToFetchVisibilityFor = timelineCalendarEvents
+      .filter(
+        (event) =>
+          !calendarEventIdsWithWorkspaceMemberInParticipantsFormatted.includes(
+            event.id,
+          ),
+      )
+      .map((event) => event.id);
+
+    const calendarEventIdsForWhichVisibilityIsMetadata:
+      | {
+          id: string;
+        }[]
+      | undefined = await this.workspaceDataSourceService.executeRawQuery(
+      `
+      SELECT
+          "calendarChannelEventAssociation"."calendarEventId" AS "id"
+      FROM
+          ${dataSourceSchema}."calendarChannel" "calendarChannel"
+      LEFT JOIN
+          ${dataSourceSchema}."calendarChannelEventAssociation" "calendarChannelEventAssociation" ON "calendarChannel".id = "calendarChannelEventAssociation"."calendarChannelId"
+      WHERE
+          "calendarChannelEventAssociation"."calendarEventId" = ANY($1)
+      AND
+          "calendarChannel"."visibility" = 'METADATA'
+      `,
+      [calendarEventIdsToFetchVisibilityFor],
+      workspaceId,
+    );
+
+    if (!calendarEventIdsForWhichVisibilityIsMetadata) {
+      throw new Error('Failed to fetch calendar event visibility');
+    }
+
+    const calendarEventIdsForWhichVisibilityIsMetadataMap = new Map(
+      calendarEventIdsForWhichVisibilityIsMetadata.map((event) => [
+        event.id,
+        TimelineCalendarEventVisibility.METADATA,
+      ]),
+    );
+
+    timelineCalendarEvents.forEach((event) => {
+      event.visibility =
+        calendarEventIdsForWhichVisibilityIsMetadataMap.get(event.id) ??
+        TimelineCalendarEventVisibility.SHARE_EVERYTHING;
+
+      if (event.visibility === TimelineCalendarEventVisibility.METADATA) {
+        event.title = '';
+        event.description = '';
+        event.location = '';
+        event.conferenceSolution = '';
+        event.conferenceLink = { label: '', url: '' };
+      }
+    });
+
+    return {
+      totalNumberOfCalendarEvents: totalNumberOfCalendarEvents[0].count,
+      timelineCalendarEvents,
+    };
+  }
+
+  async getCalendarEventsFromCompanyId(
+    workspaceMemberId: string,
+    workspaceId: string,
+    companyId: string,
+    page: number = 1,
+    pageSize: number = TIMELINE_CALENDAR_EVENTS_DEFAULT_PAGE_SIZE,
+  ): Promise<TimelineCalendarEventsWithTotal> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const personIds = await this.workspaceDataSourceService.executeRawQuery(
+      `
+        SELECT 
+            p."id"
+        FROM
+            ${dataSourceSchema}."person" p
+        WHERE
+            p."companyId" = $1
+        `,
+      [companyId],
+      workspaceId,
+    );
+
+    if (!personIds) {
+      return {
+        totalNumberOfCalendarEvents: 0,
+        timelineCalendarEvents: [],
+      };
+    }
+
+    const formattedPersonIds = personIds.map(
+      (personId: { id: string }) => personId.id,
+    );
+
+    const messageThreads = await this.getCalendarEventsFromPersonIds(
+      workspaceMemberId,
+      workspaceId,
+      formattedPersonIds,
+      page,
+      pageSize,
+    );
+
+    return messageThreads;
+  }
+}
diff --git a/packages/twenty-server/src/core/client-config/client-config.entity.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
similarity index 80%
rename from packages/twenty-server/src/core/client-config/client-config.entity.ts
rename to packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
index 57a719acc941..368ba81edba6 100644
--- a/packages/twenty-server/src/core/client-config/client-config.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
@@ -26,11 +26,11 @@ class Billing {
   @Field(() => Boolean)
   isBillingEnabled: boolean;
 
-  @Field(() => String)
-  billingUrl: string;
+  @Field(() => String, { nullable: true })
+  billingUrl?: string;
 
   @Field(() => Number, { nullable: true })
-  billingFreeTrialDurationInDays: number | undefined;
+  billingFreeTrialDurationInDays?: number;
 }
 
 @ObjectType()
@@ -39,13 +39,19 @@ class Support {
   supportDriver: string;
 
   @Field(() => String, { nullable: true })
-  supportFrontChatId: string | undefined;
+  supportFrontChatId?: string;
 }
 
 @ObjectType()
 class Sentry {
   @Field(() => String, { nullable: true })
-  dsn: string | undefined;
+  environment?: string;
+
+  @Field(() => String, { nullable: true })
+  release?: string;
+
+  @Field(() => String, { nullable: true })
+  dsn?: string;
 }
 
 @ObjectType()
diff --git a/packages/twenty-server/src/core/client-config/client-config.module.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.module.ts
similarity index 100%
rename from packages/twenty-server/src/core/client-config/client-config.module.ts
rename to packages/twenty-server/src/engine/core-modules/client-config/client-config.module.ts
diff --git a/packages/twenty-server/src/core/client-config/client-config.resolver.spec.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.spec.ts
similarity index 86%
rename from packages/twenty-server/src/core/client-config/client-config.resolver.spec.ts
rename to packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.spec.ts
index 3004995e1584..a723405b2851 100644
--- a/packages/twenty-server/src/core/client-config/client-config.resolver.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.spec.ts
@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 
 import { ClientConfigResolver } from './client-config.resolver';
 
diff --git a/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts
new file mode 100644
index 000000000000..8338493e1a4d
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts
@@ -0,0 +1,50 @@
+import { Resolver, Query } from '@nestjs/graphql';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+
+import { ClientConfig } from './client-config.entity';
+
+@Resolver()
+export class ClientConfigResolver {
+  constructor(private environmentService: EnvironmentService) {}
+
+  @Query(() => ClientConfig)
+  async clientConfig(): Promise<ClientConfig> {
+    const clientConfig: ClientConfig = {
+      authProviders: {
+        google: this.environmentService.get('AUTH_GOOGLE_ENABLED'),
+        magicLink: false,
+        password: true,
+      },
+      telemetry: {
+        enabled: this.environmentService.get('TELEMETRY_ENABLED'),
+        anonymizationEnabled: this.environmentService.get(
+          'TELEMETRY_ANONYMIZATION_ENABLED',
+        ),
+      },
+      billing: {
+        isBillingEnabled: this.environmentService.get('IS_BILLING_ENABLED'),
+        billingUrl: this.environmentService.get('BILLING_PLAN_REQUIRED_LINK'),
+        billingFreeTrialDurationInDays: this.environmentService.get(
+          'BILLING_FREE_TRIAL_DURATION_IN_DAYS',
+        ),
+      },
+      signInPrefilled: this.environmentService.get('SIGN_IN_PREFILLED'),
+      signUpDisabled: this.environmentService.get('IS_SIGN_UP_DISABLED'),
+      debugMode: this.environmentService.get('DEBUG_MODE'),
+      support: {
+        supportDriver: this.environmentService.get('SUPPORT_DRIVER'),
+        supportFrontChatId: this.environmentService.get(
+          'SUPPORT_FRONT_CHAT_ID',
+        ),
+      },
+      sentry: {
+        environment: this.environmentService.get('SENTRY_ENVIRONMENT'),
+        release: this.environmentService.get('SENTRY_RELEASE'),
+        dsn: this.environmentService.get('SENTRY_FRONT_DSN'),
+      },
+    };
+
+    return Promise.resolve(clientConfig);
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
new file mode 100644
index 000000000000..4fa8467538b9
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
@@ -0,0 +1,44 @@
+import { Module } from '@nestjs/common';
+
+import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.module';
+import { UserModule } from 'src/engine/core-modules/user/user.module';
+import { AppTokenModule } from 'src/engine/core-modules/app-token/app-token.module';
+import { AuthModule } from 'src/engine/core-modules/auth/auth.module';
+import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
+import { OpenApiModule } from 'src/engine/core-modules/open-api/open-api.module';
+import { TimelineMessagingModule } from 'src/engine/core-modules/messaging/timeline-messaging.module';
+import { TimelineCalendarEventModule } from 'src/engine/core-modules/calendar/timeline-calendar-event.module';
+import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
+import { HealthModule } from 'src/engine/core-modules/health/health.module';
+
+import { AnalyticsModule } from './analytics/analytics.module';
+import { FileModule } from './file/file.module';
+import { ClientConfigModule } from './client-config/client-config.module';
+
+@Module({
+  imports: [
+    HealthModule,
+    AnalyticsModule,
+    AuthModule,
+    BillingModule,
+    ClientConfigModule,
+    FeatureFlagModule,
+    FileModule,
+    OpenApiModule,
+    AppTokenModule,
+    TimelineMessagingModule,
+    TimelineCalendarEventModule,
+    UserModule,
+    WorkspaceModule,
+  ],
+  exports: [
+    AnalyticsModule,
+    AuthModule,
+    FeatureFlagModule,
+    TimelineMessagingModule,
+    TimelineCalendarEventModule,
+    UserModule,
+    WorkspaceModule,
+  ],
+})
+export class CoreEngineModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts
new file mode 100644
index 000000000000..617ecd03e7cf
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts
@@ -0,0 +1,57 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import {
+  Entity,
+  Unique,
+  PrimaryGeneratedColumn,
+  Column,
+  CreateDateColumn,
+  UpdateDateColumn,
+  ManyToOne,
+} from 'typeorm';
+import { IDField } from '@ptc-org/nestjs-query-graphql';
+
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+export enum FeatureFlagKeys {
+  IsBlocklistEnabled = 'IS_BLOCKLIST_ENABLED',
+  IsCalendarEnabled = 'IS_CALENDAR_ENABLED',
+  IsEventObjectEnabled = 'IS_EVENT_OBJECT_ENABLED',
+  IsAirtableIntegrationEnabled = 'IS_AIRTABLE_INTEGRATION_ENABLED',
+  IsPostgreSQLIntegrationEnabled = 'IS_POSTGRESQL_INTEGRATION_ENABLED',
+  IsMultiSelectEnabled = 'IS_MULTI_SELECT_ENABLED',
+  IsRelationForRemoteObjectsEnabled = 'IS_RELATION_FOR_REMOTE_OBJECTS_ENABLED',
+}
+
+@Entity({ name: 'featureFlag', schema: 'core' })
+@ObjectType('FeatureFlag')
+@Unique('IndexOnKeyAndWorkspaceIdUnique', ['key', 'workspaceId'])
+export class FeatureFlagEntity {
+  @IDField(() => UUIDScalarType)
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Field()
+  @Column({ nullable: false, type: 'text' })
+  key: FeatureFlagKeys;
+
+  @Field()
+  @Column({ nullable: false, type: 'uuid' })
+  workspaceId: string;
+
+  @ManyToOne(() => Workspace, (workspace) => workspace.featureFlags, {
+    onDelete: 'CASCADE',
+  })
+  workspace: Workspace;
+
+  @Field()
+  @Column({ nullable: false })
+  value: boolean;
+
+  @CreateDateColumn({ type: 'timestamptz' })
+  createdAt: Date;
+
+  @UpdateDateColumn({ type: 'timestamptz' })
+  updatedAt: Date;
+}
diff --git a/packages/twenty-server/src/core/feature-flag/feature-flag.module.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.module.ts
similarity index 85%
rename from packages/twenty-server/src/core/feature-flag/feature-flag.module.ts
rename to packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.module.ts
index be8d796efad4..0b0f9bbd25ad 100644
--- a/packages/twenty-server/src/core/feature-flag/feature-flag.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.module.ts
@@ -4,7 +4,7 @@ import { NestjsQueryGraphQLModule } from '@ptc-org/nestjs-query-graphql';
 import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
 
 import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { FeatureFlagEntity } from 'src/core/feature-flag/feature-flag.entity';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 
 @Module({
   imports: [
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface.ts
new file mode 100644
index 000000000000..11c8cc4bbe53
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface.ts
@@ -0,0 +1,3 @@
+import { FeatureFlagKeys } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+
+export type FeatureFlagMap = Record<`${FeatureFlagKeys}`, boolean>;
diff --git a/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.spec.ts b/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.spec.ts
new file mode 100644
index 000000000000..295c89b1b1b0
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.spec.ts
@@ -0,0 +1,33 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { CanActivate } from '@nestjs/common';
+
+import { FileService } from 'src/engine/core-modules/file/services/file.service';
+import { FilePathGuard } from 'src/engine/core-modules/file/guards/file-path-guard';
+
+import { FileController } from './file.controller';
+
+describe('FileController', () => {
+  let controller: FileController;
+  const mock_FilePathGuard: CanActivate = { canActivate: jest.fn(() => true) };
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      controllers: [FileController],
+      providers: [
+        {
+          provide: FileService,
+          useValue: {},
+        },
+      ],
+    })
+      .overrideGuard(FilePathGuard)
+      .useValue(mock_FilePathGuard)
+      .compile();
+
+    controller = module.get<FileController>(FileController);
+  });
+
+  it('should be defined', () => {
+    expect(controller).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.ts b/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.ts
new file mode 100644
index 000000000000..39f2b8c70cf4
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.ts
@@ -0,0 +1,37 @@
+import { Controller, Get, Param, Res, UseGuards } from '@nestjs/common';
+
+import { Response } from 'express';
+
+import { FilePathGuard } from 'src/engine/core-modules/file/guards/file-path-guard';
+import {
+  checkFilePath,
+  checkFilename,
+} from 'src/engine/core-modules/file/file.utils';
+import { FileService } from 'src/engine/core-modules/file/services/file.service';
+
+// TODO: Add cookie authentication
+@Controller('files')
+@UseGuards(FilePathGuard)
+export class FileController {
+  constructor(private readonly fileService: FileService) {}
+
+  /**
+   * Serve files from local storage
+   * We recommend using an s3 bucket for production
+   */
+  @Get('*/:filename')
+  async getFile(@Param() params: string[], @Res() res: Response) {
+    const folderPath = checkFilePath(params[0]);
+    const filename = checkFilename(params['filename']);
+    const fileStream = await this.fileService.getFileStream(
+      folderPath,
+      filename,
+    );
+
+    fileStream.on('error', () => {
+      res.status(404).send({ error: 'File not found' });
+    });
+
+    fileStream.pipe(res);
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/file/file-upload/file-upload.module.ts b/packages/twenty-server/src/engine/core-modules/file/file-upload/file-upload.module.ts
new file mode 100644
index 000000000000..5af72bd7a210
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/file/file-upload/file-upload.module.ts
@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { FileUploadResolver } from 'src/engine/core-modules/file/file-upload/resolvers/file-upload.resolver';
+import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
+
+@Module({
+  providers: [FileUploadService, FileUploadResolver, EnvironmentService],
+  exports: [FileUploadService, FileUploadResolver],
+})
+export class FileUploadModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/file/file-upload/resolvers/file-upload.resolver.spec.ts b/packages/twenty-server/src/engine/core-modules/file/file-upload/resolvers/file-upload.resolver.spec.ts
new file mode 100644
index 000000000000..5a62ebdc4ff4
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/file/file-upload/resolvers/file-upload.resolver.spec.ts
@@ -0,0 +1,27 @@
+import { Test, TestingModule } from '@nestjs/testing';
+
+import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
+
+import { FileUploadResolver } from './file-upload.resolver';
+
+describe('FileUploadResolver', () => {
+  let resolver: FileUploadResolver;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        FileUploadResolver,
+        {
+          provide: FileUploadService,
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    resolver = module.get<FileUploadResolver>(FileUploadResolver);
+  });
+
+  it('should be defined', () => {
+    expect(resolver).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/file/file-upload/resolvers/file-upload.resolver.ts b/packages/twenty-server/src/engine/core-modules/file/file-upload/resolvers/file-upload.resolver.ts
new file mode 100644
index 000000000000..1541bb63e39f
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/file/file-upload/resolvers/file-upload.resolver.ts
@@ -0,0 +1,57 @@
+import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { UseGuards } from '@nestjs/common';
+
+import { GraphQLUpload, FileUpload } from 'graphql-upload';
+
+import { FileFolder } from 'src/engine/core-modules/file/interfaces/file-folder.interface';
+
+import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { streamToBuffer } from 'src/utils/stream-to-buffer';
+import { DemoEnvGuard } from 'src/engine/guards/demo.env.guard';
+
+@UseGuards(JwtAuthGuard, DemoEnvGuard)
+@Resolver()
+export class FileUploadResolver {
+  constructor(private readonly fileUploadService: FileUploadService) {}
+
+  @Mutation(() => String)
+  async uploadFile(
+    @Args({ name: 'file', type: () => GraphQLUpload })
+    { createReadStream, filename, mimetype }: FileUpload,
+    @Args('fileFolder', { type: () => FileFolder, nullable: true })
+    fileFolder: FileFolder,
+  ): Promise<string> {
+    const stream = createReadStream();
+    const buffer = await streamToBuffer(stream);
+
+    const { path } = await this.fileUploadService.uploadFile({
+      file: buffer,
+      filename,
+      mimeType: mimetype,
+      fileFolder,
+    });
+
+    return path;
+  }
+
+  @Mutation(() => String)
+  async uploadImage(
+    @Args({ name: 'file', type: () => GraphQLUpload })
+    { createReadStream, filename, mimetype }: FileUpload,
+    @Args('fileFolder', { type: () => FileFolder, nullable: true })
+    fileFolder: FileFolder,
+  ): Promise<string> {
+    const stream = createReadStream();
+    const buffer = await streamToBuffer(stream);
+
+    const { paths } = await this.fileUploadService.uploadImage({
+      file: buffer,
+      filename,
+      mimeType: mimetype,
+      fileFolder,
+    });
+
+    return paths[0];
+  }
+}
diff --git a/packages/twenty-server/src/core/file/services/file-upload.service.spec.ts b/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload.service.spec.ts
similarity index 78%
rename from packages/twenty-server/src/core/file/services/file-upload.service.spec.ts
rename to packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload.service.spec.ts
index 52219e25d69d..c972a27c4342 100644
--- a/packages/twenty-server/src/core/file/services/file-upload.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload.service.spec.ts
@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { FileStorageService } from 'src/integrations/file-storage/file-storage.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { FileStorageService } from 'src/engine/integrations/file-storage/file-storage.service';
 
 import { FileUploadService } from './file-upload.service';
 
diff --git a/packages/twenty-server/src/core/file/services/file-upload.service.ts b/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload.service.ts
similarity index 75%
rename from packages/twenty-server/src/core/file/services/file-upload.service.ts
rename to packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload.service.ts
index 3294f4178816..7405aeb5618f 100644
--- a/packages/twenty-server/src/core/file/services/file-upload.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload.service.ts
@@ -2,12 +2,14 @@ import { Injectable } from '@nestjs/common';
 
 import sharp from 'sharp';
 import { v4 as uuidV4 } from 'uuid';
+import { JSDOM } from 'jsdom';
+import DOMPurify from 'dompurify';
 
-import { FileFolder } from 'src/core/file/interfaces/file-folder.interface';
+import { FileFolder } from 'src/engine/core-modules/file/interfaces/file-folder.interface';
 
 import { getCropSize } from 'src/utils/image';
-import { settings } from 'src/constants/settings';
-import { FileStorageService } from 'src/integrations/file-storage/file-storage.service';
+import { settings } from 'src/engine/constants/settings';
+import { FileStorageService } from 'src/engine/integrations/file-storage/file-storage.service';
 
 @Injectable()
 export class FileUploadService {
@@ -32,6 +34,25 @@ export class FileUploadService {
     });
   }
 
+  private _sanitizeFile({
+    file,
+    ext,
+    mimeType,
+  }: {
+    file: Buffer | Uint8Array | string;
+    ext: string;
+    mimeType: string | undefined;
+  }): Buffer | Uint8Array | string {
+    if (ext === 'svg' || mimeType === 'image/svg+xml') {
+      const window = new JSDOM('').window;
+      const purify = DOMPurify(window);
+
+      return purify.sanitize(file.toString());
+    }
+
+    return file;
+  }
+
   async uploadFile({
     file,
     filename,
@@ -48,7 +69,7 @@ export class FileUploadService {
     const name = `${id}${ext ? `.${ext}` : ''}`;
 
     await this._uploadFile({
-      file,
+      file: this._sanitizeFile({ file, ext, mimeType }),
       filename: name,
       mimeType,
       fileFolder,
diff --git a/packages/twenty-server/src/engine/core-modules/file/file.module.ts b/packages/twenty-server/src/engine/core-modules/file/file.module.ts
new file mode 100644
index 000000000000..521cde04bdad
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/file/file.module.ts
@@ -0,0 +1,17 @@
+import { Module } from '@nestjs/common';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { FilePathGuard } from 'src/engine/core-modules/file/guards/file-path-guard';
+import { AuthModule } from 'src/engine/core-modules/auth/auth.module';
+import { FileUploadModule } from 'src/engine/core-modules/file/file-upload/file-upload.module';
+
+import { FileService } from './services/file.service';
+import { FileController } from './controllers/file.controller';
+
+@Module({
+  imports: [FileUploadModule, AuthModule],
+  providers: [FileService, EnvironmentService, FilePathGuard],
+  exports: [FileService],
+  controllers: [FileController],
+})
+export class FileModule {}
diff --git a/packages/twenty-server/src/core/file/file.utils.ts b/packages/twenty-server/src/engine/core-modules/file/file.utils.ts
similarity index 95%
rename from packages/twenty-server/src/core/file/file.utils.ts
rename to packages/twenty-server/src/engine/core-modules/file/file.utils.ts
index 94d1b0b99587..8868e4bc220d 100644
--- a/packages/twenty-server/src/core/file/file.utils.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/file.utils.ts
@@ -5,7 +5,7 @@ import { basename } from 'path';
 import { KebabCase } from 'type-fest';
 
 import { kebabCase } from 'src/utils/kebab-case';
-import { settings } from 'src/constants/settings';
+import { settings } from 'src/engine/constants/settings';
 
 import { FileFolder } from './interfaces/file-folder.interface';
 
diff --git a/packages/twenty-server/src/engine/core-modules/file/guards/file-path-guard.ts b/packages/twenty-server/src/engine/core-modules/file/guards/file-path-guard.ts
new file mode 100644
index 000000000000..98891647314d
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/file/guards/file-path-guard.ts
@@ -0,0 +1,52 @@
+import {
+  Injectable,
+  CanActivate,
+  ExecutionContext,
+  HttpException,
+  HttpStatus,
+} from '@nestjs/common';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+
+@Injectable()
+export class FilePathGuard implements CanActivate {
+  constructor(
+    private readonly tokenService: TokenService,
+    private readonly environmentService: EnvironmentService,
+  ) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const query = context.switchToHttp().getRequest().query;
+
+    if (query && query['token']) {
+      return !(await this.isExpired(query['token']));
+    }
+
+    return true;
+  }
+
+  private async isExpired(signedExpirationDate: string): Promise<boolean> {
+    const decodedPayload = await this.tokenService.decodePayload(
+      signedExpirationDate,
+      {
+        secret: this.environmentService.get('FILE_TOKEN_SECRET'),
+      },
+    );
+
+    const expirationDate = decodedPayload?.['expiration_date'];
+
+    if (!expirationDate) {
+      return true;
+    }
+
+    if (new Date(expirationDate) < new Date()) {
+      throw new HttpException(
+        'This url has expired. Please reload twenty page and open file again.',
+        HttpStatus.FORBIDDEN,
+      );
+    }
+
+    return false;
+  }
+}
diff --git a/packages/twenty-server/src/core/file/interfaces/file-folder.interface.ts b/packages/twenty-server/src/engine/core-modules/file/interfaces/file-folder.interface.ts
similarity index 100%
rename from packages/twenty-server/src/core/file/interfaces/file-folder.interface.ts
rename to packages/twenty-server/src/engine/core-modules/file/interfaces/file-folder.interface.ts
diff --git a/packages/twenty-server/src/engine/core-modules/file/resolvers/file-upload.resolver.spec.ts b/packages/twenty-server/src/engine/core-modules/file/resolvers/file-upload.resolver.spec.ts
new file mode 100644
index 000000000000..5a62ebdc4ff4
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/file/resolvers/file-upload.resolver.spec.ts
@@ -0,0 +1,27 @@
+import { Test, TestingModule } from '@nestjs/testing';
+
+import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
+
+import { FileUploadResolver } from './file-upload.resolver';
+
+describe('FileUploadResolver', () => {
+  let resolver: FileUploadResolver;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        FileUploadResolver,
+        {
+          provide: FileUploadService,
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    resolver = module.get<FileUploadResolver>(FileUploadResolver);
+  });
+
+  it('should be defined', () => {
+    expect(resolver).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/file/resolvers/file-upload.resolver.ts b/packages/twenty-server/src/engine/core-modules/file/resolvers/file-upload.resolver.ts
new file mode 100644
index 000000000000..1541bb63e39f
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/file/resolvers/file-upload.resolver.ts
@@ -0,0 +1,57 @@
+import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { UseGuards } from '@nestjs/common';
+
+import { GraphQLUpload, FileUpload } from 'graphql-upload';
+
+import { FileFolder } from 'src/engine/core-modules/file/interfaces/file-folder.interface';
+
+import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { streamToBuffer } from 'src/utils/stream-to-buffer';
+import { DemoEnvGuard } from 'src/engine/guards/demo.env.guard';
+
+@UseGuards(JwtAuthGuard, DemoEnvGuard)
+@Resolver()
+export class FileUploadResolver {
+  constructor(private readonly fileUploadService: FileUploadService) {}
+
+  @Mutation(() => String)
+  async uploadFile(
+    @Args({ name: 'file', type: () => GraphQLUpload })
+    { createReadStream, filename, mimetype }: FileUpload,
+    @Args('fileFolder', { type: () => FileFolder, nullable: true })
+    fileFolder: FileFolder,
+  ): Promise<string> {
+    const stream = createReadStream();
+    const buffer = await streamToBuffer(stream);
+
+    const { path } = await this.fileUploadService.uploadFile({
+      file: buffer,
+      filename,
+      mimeType: mimetype,
+      fileFolder,
+    });
+
+    return path;
+  }
+
+  @Mutation(() => String)
+  async uploadImage(
+    @Args({ name: 'file', type: () => GraphQLUpload })
+    { createReadStream, filename, mimetype }: FileUpload,
+    @Args('fileFolder', { type: () => FileFolder, nullable: true })
+    fileFolder: FileFolder,
+  ): Promise<string> {
+    const stream = createReadStream();
+    const buffer = await streamToBuffer(stream);
+
+    const { paths } = await this.fileUploadService.uploadImage({
+      file: buffer,
+      filename,
+      mimeType: mimetype,
+      fileFolder,
+    });
+
+    return paths[0];
+  }
+}
diff --git a/packages/twenty-server/src/core/file/services/file.service.spec.ts b/packages/twenty-server/src/engine/core-modules/file/services/file.service.spec.ts
similarity index 76%
rename from packages/twenty-server/src/core/file/services/file.service.spec.ts
rename to packages/twenty-server/src/engine/core-modules/file/services/file.service.spec.ts
index 89e8d98bddf2..da68c62a442e 100644
--- a/packages/twenty-server/src/core/file/services/file.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/services/file.service.spec.ts
@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { FileStorageService } from 'src/integrations/file-storage/file-storage.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { FileStorageService } from 'src/engine/integrations/file-storage/file-storage.service';
 
 import { FileService } from './file.service';
 
diff --git a/packages/twenty-server/src/core/file/services/file.service.ts b/packages/twenty-server/src/engine/core-modules/file/services/file.service.ts
similarity index 76%
rename from packages/twenty-server/src/core/file/services/file.service.ts
rename to packages/twenty-server/src/engine/core-modules/file/services/file.service.ts
index f2fe510cd504..290a13f8bd9a 100644
--- a/packages/twenty-server/src/core/file/services/file.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/services/file.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
-import { FileStorageService } from 'src/integrations/file-storage/file-storage.service';
+import { FileStorageService } from 'src/engine/integrations/file-storage/file-storage.service';
 
 @Injectable()
 export class FileService {
diff --git a/packages/twenty-server/src/health/health.controller.spec.ts b/packages/twenty-server/src/engine/core-modules/health/health.controller.spec.ts
similarity index 89%
rename from packages/twenty-server/src/health/health.controller.spec.ts
rename to packages/twenty-server/src/engine/core-modules/health/health.controller.spec.ts
index 796656f80d7b..9ee2a50c4a4b 100644
--- a/packages/twenty-server/src/health/health.controller.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/health/health.controller.spec.ts
@@ -1,7 +1,7 @@
 import { HealthCheckService, HttpHealthIndicator } from '@nestjs/terminus';
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { HealthController } from 'src/health/health.controller';
+import { HealthController } from 'src/engine/core-modules/health/health.controller';
 
 describe('HealthController', () => {
   let healthController: HealthController;
diff --git a/packages/twenty-server/src/health/health.controller.ts b/packages/twenty-server/src/engine/core-modules/health/health.controller.ts
similarity index 100%
rename from packages/twenty-server/src/health/health.controller.ts
rename to packages/twenty-server/src/engine/core-modules/health/health.controller.ts
diff --git a/packages/twenty-server/src/engine/core-modules/health/health.module.ts b/packages/twenty-server/src/engine/core-modules/health/health.module.ts
new file mode 100644
index 000000000000..fa099ef52dbc
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/health/health.module.ts
@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+import { TerminusModule } from '@nestjs/terminus';
+
+import { HealthController } from 'src/engine/core-modules/health/health.controller';
+
+@Module({
+  imports: [TerminusModule],
+  controllers: [HealthController],
+})
+export class HealthModule {}
diff --git a/packages/twenty-server/src/core/messaging/constants/messaging.constants.ts b/packages/twenty-server/src/engine/core-modules/messaging/constants/messaging.constants.ts
similarity index 100%
rename from packages/twenty-server/src/core/messaging/constants/messaging.constants.ts
rename to packages/twenty-server/src/engine/core-modules/messaging/constants/messaging.constants.ts
diff --git a/packages/twenty-server/src/engine/core-modules/messaging/dtos/timeline-thread-participant.dto.ts b/packages/twenty-server/src/engine/core-modules/messaging/dtos/timeline-thread-participant.dto.ts
new file mode 100644
index 000000000000..6444474155ad
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/messaging/dtos/timeline-thread-participant.dto.ts
@@ -0,0 +1,27 @@
+import { ObjectType, Field } from '@nestjs/graphql';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@ObjectType('TimelineThreadParticipant')
+export class TimelineThreadParticipant {
+  @Field(() => UUIDScalarType, { nullable: true })
+  personId: string;
+
+  @Field(() => UUIDScalarType, { nullable: true })
+  workspaceMemberId: string;
+
+  @Field()
+  firstName: string;
+
+  @Field()
+  lastName: string;
+
+  @Field()
+  displayName: string;
+
+  @Field()
+  avatarUrl: string;
+
+  @Field()
+  handle: string;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/messaging/dtos/timeline-thread.dto.ts b/packages/twenty-server/src/engine/core-modules/messaging/dtos/timeline-thread.dto.ts
new file mode 100644
index 000000000000..c1a27a014e3c
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/messaging/dtos/timeline-thread.dto.ts
@@ -0,0 +1,37 @@
+import { ObjectType, Field } from '@nestjs/graphql';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { TimelineThreadParticipant } from 'src/engine/core-modules/messaging/dtos/timeline-thread-participant.dto';
+
+@ObjectType('TimelineThread')
+export class TimelineThread {
+  @Field(() => UUIDScalarType)
+  id: string;
+
+  @Field()
+  read: boolean;
+
+  @Field()
+  visibility: string;
+
+  @Field()
+  firstParticipant: TimelineThreadParticipant;
+
+  @Field(() => [TimelineThreadParticipant])
+  lastTwoParticipants: TimelineThreadParticipant[];
+
+  @Field()
+  lastMessageReceivedAt: Date;
+
+  @Field()
+  lastMessageBody: string;
+
+  @Field()
+  subject: string;
+
+  @Field()
+  numberOfMessagesInThread: number;
+
+  @Field()
+  participantCount: number;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/messaging/dtos/timeline-threads-with-total.dto.ts b/packages/twenty-server/src/engine/core-modules/messaging/dtos/timeline-threads-with-total.dto.ts
new file mode 100644
index 000000000000..3cdafcf23252
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/messaging/dtos/timeline-threads-with-total.dto.ts
@@ -0,0 +1,12 @@
+import { Field, Int, ObjectType } from '@nestjs/graphql';
+
+import { TimelineThread } from 'src/engine/core-modules/messaging/dtos/timeline-thread.dto';
+
+@ObjectType('TimelineThreadsWithTotal')
+export class TimelineThreadsWithTotal {
+  @Field(() => Int)
+  totalNumberOfThreads: number;
+
+  @Field(() => [TimelineThread])
+  timelineThreads: TimelineThread[];
+}
diff --git a/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.module.ts b/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.module.ts
new file mode 100644
index 000000000000..275f7f0df151
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.module.ts
@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+
+import { TimelineMessagingResolver } from 'src/engine/core-modules/messaging/timeline-messaging.resolver';
+import { TimelineMessagingService } from 'src/engine/core-modules/messaging/timeline-messaging.service';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { UserModule } from 'src/engine/core-modules/user/user.module';
+@Module({
+  imports: [WorkspaceDataSourceModule, UserModule],
+  exports: [],
+  providers: [TimelineMessagingResolver, TimelineMessagingService],
+})
+export class TimelineMessagingModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.resolver.ts b/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.resolver.ts
new file mode 100644
index 000000000000..6ed83dc9d215
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.resolver.ts
@@ -0,0 +1,98 @@
+import { Args, Query, Resolver, Int, ArgsType, Field } from '@nestjs/graphql';
+import { UseGuards } from '@nestjs/common';
+
+import { Max } from 'class-validator';
+
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { TimelineMessagingService } from 'src/engine/core-modules/messaging/timeline-messaging.service';
+import { TIMELINE_THREADS_MAX_PAGE_SIZE } from 'src/engine/core-modules/messaging/constants/messaging.constants';
+import { TimelineThreadsWithTotal } from 'src/engine/core-modules/messaging/dtos/timeline-threads-with-total.dto';
+import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@ArgsType()
+class GetTimelineThreadsFromPersonIdArgs {
+  @Field(() => UUIDScalarType)
+  personId: string;
+
+  @Field(() => Int)
+  page: number;
+
+  @Field(() => Int)
+  @Max(TIMELINE_THREADS_MAX_PAGE_SIZE)
+  pageSize: number;
+}
+
+@ArgsType()
+class GetTimelineThreadsFromCompanyIdArgs {
+  @Field(() => UUIDScalarType)
+  companyId: string;
+
+  @Field(() => Int)
+  page: number;
+
+  @Field(() => Int)
+  @Max(TIMELINE_THREADS_MAX_PAGE_SIZE)
+  pageSize: number;
+}
+
+@UseGuards(JwtAuthGuard)
+@Resolver(() => TimelineThreadsWithTotal)
+export class TimelineMessagingResolver {
+  constructor(
+    private readonly timelineMessagingService: TimelineMessagingService,
+    private readonly userService: UserService,
+  ) {}
+
+  @Query(() => TimelineThreadsWithTotal)
+  async getTimelineThreadsFromPersonId(
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+    @AuthUser() user: User,
+    @Args() { personId, page, pageSize }: GetTimelineThreadsFromPersonIdArgs,
+  ) {
+    const workspaceMember = await this.userService.loadWorkspaceMember(user);
+
+    if (!workspaceMember) {
+      return;
+    }
+
+    const timelineThreads =
+      await this.timelineMessagingService.getMessagesFromPersonIds(
+        workspaceMember.id,
+        workspaceId,
+        [personId],
+        page,
+        pageSize,
+      );
+
+    return timelineThreads;
+  }
+
+  @Query(() => TimelineThreadsWithTotal)
+  async getTimelineThreadsFromCompanyId(
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+    @AuthUser() user: User,
+    @Args() { companyId, page, pageSize }: GetTimelineThreadsFromCompanyIdArgs,
+  ) {
+    const workspaceMember = await this.userService.loadWorkspaceMember(user);
+
+    if (!workspaceMember) {
+      return;
+    }
+
+    const timelineThreads =
+      await this.timelineMessagingService.getMessagesFromCompanyId(
+        workspaceMember.id,
+        workspaceId,
+        companyId,
+        page,
+        pageSize,
+      );
+
+    return timelineThreads;
+  }
+}
diff --git a/packages/twenty-server/src/core/messaging/timeline-messaging.service.ts b/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.service.ts
similarity index 97%
rename from packages/twenty-server/src/core/messaging/timeline-messaging.service.ts
rename to packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.service.ts
index 5f3bca1cc9ed..9b962cae849b 100644
--- a/packages/twenty-server/src/core/messaging/timeline-messaging.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.service.ts
@@ -1,8 +1,8 @@
 import { Injectable } from '@nestjs/common';
 
-import { TIMELINE_THREADS_DEFAULT_PAGE_SIZE } from 'src/core/messaging/constants/messaging.constants';
-import { TimelineThreadsWithTotal } from 'src/core/messaging/dtos/timeline-threads-with-total.dto';
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
+import { TIMELINE_THREADS_DEFAULT_PAGE_SIZE } from 'src/engine/core-modules/messaging/constants/messaging.constants';
+import { TimelineThreadsWithTotal } from 'src/engine/core-modules/messaging/dtos/timeline-threads-with-total.dto';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
 
 type TimelineThreadParticipant = {
   personId: string;
diff --git a/packages/twenty-server/src/core/open-api/open-api.controller.ts b/packages/twenty-server/src/engine/core-modules/open-api/open-api.controller.ts
similarity index 87%
rename from packages/twenty-server/src/core/open-api/open-api.controller.ts
rename to packages/twenty-server/src/engine/core-modules/open-api/open-api.controller.ts
index 2dcaf8a4b387..53c614869176 100644
--- a/packages/twenty-server/src/core/open-api/open-api.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/open-api/open-api.controller.ts
@@ -2,7 +2,7 @@ import { Controller, Get, Req, Res } from '@nestjs/common';
 
 import { Request, Response } from 'express';
 
-import { OpenApiService } from 'src/core/open-api/open-api.service';
+import { OpenApiService } from 'src/engine/core-modules/open-api/open-api.service';
 
 @Controller('open-api')
 export class OpenApiController {
@@ -23,7 +23,7 @@ export class OpenApiController {
     @Req() request: Request,
     @Res() res: Response,
   ) {
-    const data = await this.openApiService.generateMetaDataSchema();
+    const data = await this.openApiService.generateMetaDataSchema(request);
 
     res.send(data);
   }
diff --git a/packages/twenty-server/src/engine/core-modules/open-api/open-api.module.ts b/packages/twenty-server/src/engine/core-modules/open-api/open-api.module.ts
new file mode 100644
index 000000000000..69cc16f97a96
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/open-api/open-api.module.ts
@@ -0,0 +1,13 @@
+import { Module } from '@nestjs/common';
+
+import { OpenApiController } from 'src/engine/core-modules/open-api/open-api.controller';
+import { OpenApiService } from 'src/engine/core-modules/open-api/open-api.service';
+import { AuthModule } from 'src/engine/core-modules/auth/auth.module';
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
+
+@Module({
+  imports: [ObjectMetadataModule, AuthModule],
+  controllers: [OpenApiController],
+  providers: [OpenApiService],
+})
+export class OpenApiModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/open-api/open-api.service.spec.ts b/packages/twenty-server/src/engine/core-modules/open-api/open-api.service.spec.ts
new file mode 100644
index 000000000000..b2252b0c6810
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/open-api/open-api.service.spec.ts
@@ -0,0 +1,35 @@
+import { Test, TestingModule } from '@nestjs/testing';
+
+import { OpenApiService } from 'src/engine/core-modules/open-api/open-api.service';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+
+describe('OpenApiService', () => {
+  let service: OpenApiService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        OpenApiService,
+        {
+          provide: TokenService,
+          useValue: {},
+        },
+        {
+          provide: ObjectMetadataService,
+          useValue: {},
+        },
+        {
+          provide: EnvironmentService,
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    service = module.get<OpenApiService>(OpenApiService);
+  });
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/open-api/open-api.service.ts b/packages/twenty-server/src/engine/core-modules/open-api/open-api.service.ts
new file mode 100644
index 000000000000..58fe617ca9cc
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/open-api/open-api.service.ts
@@ -0,0 +1,199 @@
+import { Injectable } from '@nestjs/common';
+
+import { Request } from 'express';
+import { OpenAPIV3_1 } from 'openapi-types';
+
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { baseSchema } from 'src/engine/core-modules/open-api/utils/base-schema.utils';
+import {
+  computeManyResultPath,
+  computeSingleResultPath,
+} from 'src/engine/core-modules/open-api/utils/path.utils';
+import { getErrorResponses } from 'src/engine/core-modules/open-api/utils/get-error-responses.utils';
+import {
+  computeMetadataSchemaComponents,
+  computeParameterComponents,
+  computeSchemaComponents,
+} from 'src/engine/core-modules/open-api/utils/components.utils';
+import { computeSchemaTags } from 'src/engine/core-modules/open-api/utils/compute-schema-tags.utils';
+import { computeWebhooks } from 'src/engine/core-modules/open-api/utils/computeWebhooks.utils';
+import { capitalize } from 'src/utils/capitalize';
+import {
+  getDeleteResponse200,
+  getManyResultResponse200,
+  getSingleResultSuccessResponse,
+} from 'src/engine/core-modules/open-api/utils/responses.utils';
+import { getRequestBody } from 'src/engine/core-modules/open-api/utils/request-body.utils';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { getServerUrl } from 'src/utils/get-server-url';
+
+@Injectable()
+export class OpenApiService {
+  constructor(
+    private readonly tokenService: TokenService,
+    private readonly environmentService: EnvironmentService,
+    private readonly objectMetadataService: ObjectMetadataService,
+  ) {}
+
+  async generateCoreSchema(request: Request): Promise<OpenAPIV3_1.Document> {
+    const baseUrl = getServerUrl(
+      request,
+      this.environmentService.get('SERVER_URL'),
+    );
+
+    const schema = baseSchema('core', baseUrl);
+
+    let objectMetadataItems;
+
+    try {
+      const { workspace } = await this.tokenService.validateToken(request);
+
+      objectMetadataItems =
+        await this.objectMetadataService.findManyWithinWorkspace(workspace.id);
+    } catch (err) {
+      return schema;
+    }
+
+    if (!objectMetadataItems.length) {
+      return schema;
+    }
+    schema.paths = objectMetadataItems.reduce((paths, item) => {
+      paths[`/${item.namePlural}`] = computeManyResultPath(item);
+      paths[`/${item.namePlural}/{id}`] = computeSingleResultPath(item);
+
+      return paths;
+    }, schema.paths as OpenAPIV3_1.PathsObject);
+
+    schema.webhooks = objectMetadataItems.reduce(
+      (paths, item) => {
+        paths[`Create ${item.nameSingular}`] = computeWebhooks('create', item);
+        paths[`Update ${item.nameSingular}`] = computeWebhooks('update', item);
+        paths[`Delete ${item.nameSingular}`] = computeWebhooks('delete', item);
+
+        return paths;
+      },
+      {} as Record<
+        string,
+        OpenAPIV3_1.PathItemObject | OpenAPIV3_1.ReferenceObject
+      >,
+    );
+
+    schema.tags = computeSchemaTags(objectMetadataItems);
+
+    schema.components = {
+      ...schema.components, // components.securitySchemes is defined in base Schema
+      schemas: computeSchemaComponents(objectMetadataItems),
+      parameters: computeParameterComponents(),
+      responses: {
+        '400': getErrorResponses('Invalid request'),
+        '401': getErrorResponses('Unauthorized'),
+      },
+    };
+
+    return schema;
+  }
+
+  async generateMetaDataSchema(
+    request: Request,
+  ): Promise<OpenAPIV3_1.Document> {
+    const baseUrl = getServerUrl(
+      request,
+      this.environmentService.get('SERVER_URL'),
+    );
+
+    const schema = baseSchema('metadata', baseUrl);
+
+    schema.tags = [{ name: 'placeholder' }];
+
+    const metadata = [
+      {
+        nameSingular: 'object',
+        namePlural: 'objects',
+      },
+      {
+        nameSingular: 'field',
+        namePlural: 'fields',
+      },
+      {
+        nameSingular: 'relation',
+        namePlural: 'relations',
+      },
+    ];
+
+    schema.paths = metadata.reduce((path, item) => {
+      path[`/${item.namePlural}`] = {
+        get: {
+          tags: [item.namePlural],
+          summary: `Find Many ${item.namePlural}`,
+          parameters: [{ $ref: '#/components/parameters/filter' }],
+          responses: {
+            '200': getManyResultResponse200(item),
+            '400': { $ref: '#/components/responses/400' },
+            '401': { $ref: '#/components/responses/401' },
+          },
+        },
+        post: {
+          tags: [item.namePlural],
+          summary: `Create One ${item.nameSingular}`,
+          operationId: `createOne${capitalize(item.nameSingular)}`,
+          requestBody: getRequestBody(item),
+          responses: {
+            '200': getSingleResultSuccessResponse(item),
+            '400': { $ref: '#/components/responses/400' },
+            '401': { $ref: '#/components/responses/401' },
+          },
+        },
+      } as OpenAPIV3_1.PathItemObject;
+      path[`/${item.namePlural}/{id}`] = {
+        get: {
+          tags: [item.namePlural],
+          summary: `Find One ${item.nameSingular}`,
+          parameters: [{ $ref: '#/components/parameters/idPath' }],
+          responses: {
+            '200': getSingleResultSuccessResponse(item),
+            '400': { $ref: '#/components/responses/400' },
+            '401': { $ref: '#/components/responses/401' },
+          },
+        },
+        delete: {
+          tags: [item.namePlural],
+          summary: `Delete One ${item.nameSingular}`,
+          operationId: `deleteOne${capitalize(item.nameSingular)}`,
+          parameters: [{ $ref: '#/components/parameters/idPath' }],
+          responses: {
+            '200': getDeleteResponse200(item),
+            '400': { $ref: '#/components/responses/400' },
+            '401': { $ref: '#/components/responses/401' },
+          },
+        },
+        put: {
+          tags: [item.namePlural],
+          summary: `Update One ${item.namePlural}`,
+          operationId: `updateOne${capitalize(item.nameSingular)}`,
+          parameters: [{ $ref: '#/components/parameters/idPath' }],
+          requestBody: getRequestBody(item),
+          responses: {
+            '200': getSingleResultSuccessResponse(item),
+            '400': { $ref: '#/components/responses/400' },
+            '401': { $ref: '#/components/responses/401' },
+          },
+        },
+      } as OpenAPIV3_1.PathItemObject;
+
+      return path;
+    }, schema.paths as OpenAPIV3_1.PathsObject);
+
+    schema.components = {
+      ...schema.components, // components.securitySchemes is defined in base Schema
+      schemas: computeMetadataSchemaComponents(metadata),
+      parameters: computeParameterComponents(),
+      responses: {
+        '400': getErrorResponses('Invalid request'),
+        '401': getErrorResponses('Unauthorized'),
+      },
+    };
+
+    return schema;
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/__tests__/components.utils.spec.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/__tests__/components.utils.spec.ts
new file mode 100644
index 000000000000..25bce40f6667
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/__tests__/components.utils.spec.ts
@@ -0,0 +1,45 @@
+import { computeSchemaComponents } from 'src/engine/core-modules/open-api/utils/components.utils';
+import { objectMetadataItemMock } from 'src/engine/api/__mocks__/object-metadata-item.mock';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+
+describe('computeSchemaComponents', () => {
+  it('should compute schema components', () => {
+    expect(
+      computeSchemaComponents([
+        objectMetadataItemMock,
+      ] as ObjectMetadataEntity[]),
+    ).toEqual({
+      ObjectName: {
+        type: 'object',
+        description: undefined,
+        required: ['fieldNumber'],
+        example: { fieldNumber: '' },
+        properties: {
+          fieldCurrency: {
+            properties: {
+              amountMicros: { type: 'string' },
+              currencyCode: { type: 'string' },
+            },
+            type: 'object',
+          },
+          fieldLink: {
+            properties: {
+              label: { type: 'string' },
+              url: { type: 'string' },
+            },
+            type: 'object',
+          },
+          fieldNumber: {
+            type: 'number',
+          },
+          fieldSelect: {
+            type: 'string',
+          },
+          fieldString: {
+            type: 'string',
+          },
+        },
+      },
+    });
+  });
+});
diff --git a/packages/twenty-server/src/core/open-api/utils/__tests__/parameters.utils.spec.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/__tests__/parameters.utils.spec.ts
similarity index 83%
rename from packages/twenty-server/src/core/open-api/utils/__tests__/parameters.utils.spec.ts
rename to packages/twenty-server/src/engine/core-modules/open-api/utils/__tests__/parameters.utils.spec.ts
index 1b27b2a3451a..06c4684c9a4d 100644
--- a/packages/twenty-server/src/core/open-api/utils/__tests__/parameters.utils.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/__tests__/parameters.utils.spec.ts
@@ -1,4 +1,4 @@
-import { OrderByDirection } from 'src/workspace/workspace-query-builder/interfaces/record.interface';
+import { OrderByDirection } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
 
 import {
   computeDepthParameters,
@@ -7,11 +7,11 @@ import {
   computeLastCursorParameters,
   computeLimitParameters,
   computeOrderByParameters,
-} from 'src/core/open-api/utils/parameters.utils';
-import { DEFAULT_ORDER_DIRECTION } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/order-by-input.factory';
-import { FilterComparators } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-base-filter.utils';
-import { Conjunctions } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils';
-import { DEFAULT_CONJUNCTION } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils';
+} from 'src/engine/core-modules/open-api/utils/parameters.utils';
+import { DEFAULT_ORDER_DIRECTION } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/order-by-input.factory';
+import { FilterComparators } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-base-filter.utils';
+import { Conjunctions } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils';
+import { DEFAULT_CONJUNCTION } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils';
 
 describe('computeParameters', () => {
   describe('computeLimit', () => {
diff --git a/packages/twenty-server/src/core/open-api/utils/base-schema.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/base-schema.utils.ts
similarity index 75%
rename from packages/twenty-server/src/core/open-api/utils/base-schema.utils.ts
rename to packages/twenty-server/src/engine/core-modules/open-api/utils/base-schema.utils.ts
index 9f3438ad0e14..d506d6fb6cf0 100644
--- a/packages/twenty-server/src/core/open-api/utils/base-schema.utils.ts
+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/base-schema.utils.ts
@@ -1,8 +1,11 @@
 import { OpenAPIV3_1 } from 'openapi-types';
 
-import { computeOpenApiPath } from 'src/core/open-api/utils/path.utils';
+import { computeOpenApiPath } from 'src/engine/core-modules/open-api/utils/path.utils';
 
-export const baseSchema = (): OpenAPIV3_1.Document => {
+export const baseSchema = (
+  schemaName: 'core' | 'metadata',
+  serverUrl: string,
+): OpenAPIV3_1.Document => {
   return {
     openapi: '3.0.3',
     info: {
@@ -21,7 +24,7 @@ export const baseSchema = (): OpenAPIV3_1.Document => {
     // Testing purposes
     servers: [
       {
-        url: 'https://api.twenty.com/rest',
+        url: `${serverUrl}/rest/${schemaName !== 'core' ? schemaName : ''}`,
         description: 'Production Development',
       },
     ],
@@ -45,6 +48,6 @@ export const baseSchema = (): OpenAPIV3_1.Document => {
       description: 'Find out more about **Twenty**',
       url: 'https://twenty.com',
     },
-    paths: { '/open-api': computeOpenApiPath() },
+    paths: { [`/open-api/${schemaName}`]: computeOpenApiPath(serverUrl) },
   };
 };
diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts
new file mode 100644
index 000000000000..8cba00761bae
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts
@@ -0,0 +1,303 @@
+import { OpenAPIV3_1 } from 'openapi-types';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { capitalize } from 'src/utils/capitalize';
+import {
+  computeDepthParameters,
+  computeFilterParameters,
+  computeIdPathParameter,
+  computeLastCursorParameters,
+  computeLimitParameters,
+  computeOrderByParameters,
+} from 'src/engine/core-modules/open-api/utils/parameters.utils';
+import { compositeTypeDefintions } from 'src/engine/metadata-modules/field-metadata/composite-types';
+
+type Property = OpenAPIV3_1.SchemaObject;
+
+type Properties = {
+  [name: string]: Property;
+};
+
+const getSchemaComponentsProperties = (
+  item: ObjectMetadataEntity,
+): Properties => {
+  return item.fields.reduce((node, field) => {
+    let itemProperty = {} as Property;
+
+    switch (field.type) {
+      case FieldMetadataType.UUID:
+      case FieldMetadataType.TEXT:
+      case FieldMetadataType.PHONE:
+      case FieldMetadataType.EMAIL:
+      case FieldMetadataType.DATE_TIME:
+      case FieldMetadataType.DATE:
+        itemProperty.type = 'string';
+        break;
+      case FieldMetadataType.NUMBER:
+      case FieldMetadataType.NUMERIC:
+      case FieldMetadataType.PROBABILITY:
+      case FieldMetadataType.RATING:
+      case FieldMetadataType.POSITION:
+        itemProperty.type = 'number';
+        break;
+      case FieldMetadataType.BOOLEAN:
+        itemProperty.type = 'boolean';
+        break;
+      case FieldMetadataType.RELATION:
+        if (field.fromRelationMetadata?.toObjectMetadata.nameSingular) {
+          itemProperty = {
+            type: 'array',
+            items: {
+              $ref: `#/components/schemas/${capitalize(
+                field.fromRelationMetadata?.toObjectMetadata.nameSingular || '',
+              )}`,
+            },
+          };
+        }
+        break;
+      case FieldMetadataType.LINK:
+      case FieldMetadataType.CURRENCY:
+      case FieldMetadataType.FULL_NAME:
+      case FieldMetadataType.ADDRESS:
+        itemProperty = {
+          type: 'object',
+          properties: compositeTypeDefintions
+            .get(field.type)
+            ?.properties?.reduce((properties, property) => {
+              // TODO: This should not be statically typed, instead we should do someting recursive
+              properties[property.name] = { type: 'string' };
+
+              return properties;
+            }, {} as Properties),
+        };
+        break;
+      case FieldMetadataType.RAW_JSON:
+        itemProperty.type = 'object';
+        break;
+      default:
+        itemProperty.type = 'string';
+        break;
+    }
+
+    if (field.description) {
+      itemProperty.description = field.description;
+    }
+
+    if (Object.keys(itemProperty).length) {
+      node[field.name] = itemProperty;
+    }
+
+    return node;
+  }, {} as Properties);
+};
+
+const getRequiredFields = (item: ObjectMetadataEntity): string[] => {
+  return item.fields.reduce((required, field) => {
+    if (!field.isNullable && field.defaultValue === null) {
+      required.push(field.name);
+
+      return required;
+    }
+
+    return required;
+  }, [] as string[]);
+};
+
+const computeSchemaComponent = (
+  item: ObjectMetadataEntity,
+): OpenAPIV3_1.SchemaObject => {
+  const result = {
+    type: 'object',
+    description: item.description,
+    properties: getSchemaComponentsProperties(item),
+    example: {},
+  } as OpenAPIV3_1.SchemaObject;
+
+  const requiredFields = getRequiredFields(item);
+
+  if (requiredFields?.length) {
+    result.required = requiredFields;
+    result.example = requiredFields.reduce(
+      (example, requiredField) => {
+        example[requiredField] = '';
+
+        return example;
+      },
+      {} as Record<string, string>,
+    );
+  }
+
+  return result;
+};
+
+export const computeSchemaComponents = (
+  objectMetadataItems: ObjectMetadataEntity[],
+): Record<string, OpenAPIV3_1.SchemaObject> => {
+  return objectMetadataItems.reduce(
+    (schemas, item) => {
+      schemas[capitalize(item.nameSingular)] = computeSchemaComponent(item);
+
+      return schemas;
+    },
+    {} as Record<string, OpenAPIV3_1.SchemaObject>,
+  );
+};
+
+export const computeParameterComponents = (): Record<
+  string,
+  OpenAPIV3_1.ParameterObject
+> => {
+  return {
+    idPath: computeIdPathParameter(),
+    lastCursor: computeLastCursorParameters(),
+    filter: computeFilterParameters(),
+    depth: computeDepthParameters(),
+    orderBy: computeOrderByParameters(),
+    limit: computeLimitParameters(),
+  };
+};
+
+export const computeMetadataSchemaComponents = (
+  metadataSchema: { nameSingular: string; namePlural: string }[],
+): Record<string, OpenAPIV3_1.SchemaObject> => {
+  return metadataSchema.reduce(
+    (schemas, item) => {
+      switch (item.nameSingular) {
+        case 'object': {
+          schemas[`${capitalize(item.nameSingular)}`] = {
+            type: 'object',
+            properties: {
+              dataSourceId: { type: 'string' },
+              nameSingular: { type: 'string' },
+              namePlural: { type: 'string' },
+              labelSingular: { type: 'string' },
+              labelPlural: { type: 'string' },
+              description: { type: 'string' },
+              icon: { type: 'string' },
+              isCustom: { type: 'boolean' },
+              isRemote: { type: 'boolean' },
+              isActive: { type: 'boolean' },
+              isSystem: { type: 'boolean' },
+              createdAt: { type: 'string' },
+              updatedAt: { type: 'string' },
+              labelIdentifierFieldMetadataId: { type: 'string' },
+              imageIdentifierFieldMetadataId: { type: 'string' },
+              fields: {
+                type: 'object',
+                properties: {
+                  edges: {
+                    type: 'object',
+                    properties: {
+                      node: {
+                        type: 'array',
+                        items: {
+                          $ref: '#/components/schemas/Field',
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          };
+
+          return schemas;
+        }
+        case 'field': {
+          schemas[`${capitalize(item.nameSingular)}`] = {
+            type: 'object',
+            properties: {
+              type: { type: 'string' },
+              name: { type: 'string' },
+              label: { type: 'string' },
+              description: { type: 'string' },
+              icon: { type: 'string' },
+              isCustom: { type: 'boolean' },
+              isActive: { type: 'boolean' },
+              isSystem: { type: 'boolean' },
+              isNullable: { type: 'boolean' },
+              createdAt: { type: 'string' },
+              updatedAt: { type: 'string' },
+              fromRelationMetadata: {
+                type: 'object',
+                properties: {
+                  id: { type: 'string' },
+                  relationType: { type: 'string' },
+                  toObjectMetadata: {
+                    type: 'object',
+                    properties: {
+                      id: { type: 'string' },
+                      dataSourceId: { type: 'string' },
+                      nameSingular: { type: 'string' },
+                      namePlural: { type: 'string' },
+                      isSystem: { type: 'boolean' },
+                    },
+                  },
+                  toFieldMetadataId: { type: 'string' },
+                },
+              },
+              toRelationMetadata: {
+                type: 'object',
+                properties: {
+                  id: { type: 'string' },
+                  relationType: { type: 'string' },
+                  fromObjectMetadata: {
+                    type: 'object',
+                    properties: {
+                      id: { type: 'string' },
+                      dataSourceId: { type: 'string' },
+                      nameSingular: { type: 'string' },
+                      namePlural: { type: 'string' },
+                      isSystem: { type: 'boolean' },
+                    },
+                  },
+                  fromFieldMetadataId: { type: 'string' },
+                },
+              },
+              defaultValue: { type: 'object' },
+              options: { type: 'object' },
+            },
+          };
+
+          return schemas;
+        }
+        case 'relation': {
+          schemas[`${capitalize(item.nameSingular)}`] = {
+            type: 'object',
+            properties: {
+              relationType: { type: 'string' },
+              fromObjectMetadata: {
+                type: 'object',
+                properties: {
+                  id: { type: 'string' },
+                  dataSourceId: { type: 'string' },
+                  nameSingular: { type: 'string' },
+                  namePlural: { type: 'string' },
+                  isSystem: { type: 'boolean' },
+                },
+              },
+              fromObjectMetadataId: { type: 'string' },
+              toObjectMetadata: {
+                type: 'object',
+                properties: {
+                  id: { type: 'string' },
+                  dataSourceId: { type: 'string' },
+                  nameSingular: { type: 'string' },
+                  namePlural: { type: 'string' },
+                  isSystem: { type: 'boolean' },
+                },
+              },
+              toObjectMetadataId: { type: 'string' },
+              fromFieldMetadataId: { type: 'string' },
+              toFieldMetadataId: { type: 'string' },
+            },
+          };
+        }
+      }
+
+      return schemas;
+    },
+    {} as Record<string, OpenAPIV3_1.SchemaObject>,
+  );
+};
diff --git a/packages/twenty-server/src/core/open-api/utils/compute-schema-tags.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/compute-schema-tags.utils.ts
similarity index 80%
rename from packages/twenty-server/src/core/open-api/utils/compute-schema-tags.utils.ts
rename to packages/twenty-server/src/engine/core-modules/open-api/utils/compute-schema-tags.utils.ts
index f7f25027b3c7..e303157a321c 100644
--- a/packages/twenty-server/src/core/open-api/utils/compute-schema-tags.utils.ts
+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/compute-schema-tags.utils.ts
@@ -1,6 +1,6 @@
 import { OpenAPIV3_1 } from 'openapi-types';
 
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { capitalize } from 'src/utils/capitalize';
 
 export const computeSchemaTags = (
diff --git a/packages/twenty-server/src/core/open-api/utils/computeWebhooks.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/computeWebhooks.utils.ts
similarity index 95%
rename from packages/twenty-server/src/core/open-api/utils/computeWebhooks.utils.ts
rename to packages/twenty-server/src/engine/core-modules/open-api/utils/computeWebhooks.utils.ts
index 436d397ec7ef..c7a2483c002b 100644
--- a/packages/twenty-server/src/core/open-api/utils/computeWebhooks.utils.ts
+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/computeWebhooks.utils.ts
@@ -1,6 +1,6 @@
 import { OpenAPIV3_1 } from 'openapi-types';
 
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { capitalize } from 'src/utils/capitalize';
 
 export const computeWebhooks = (
diff --git a/packages/twenty-server/src/core/open-api/utils/get-error-responses.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/get-error-responses.utils.ts
similarity index 100%
rename from packages/twenty-server/src/core/open-api/utils/get-error-responses.utils.ts
rename to packages/twenty-server/src/engine/core-modules/open-api/utils/get-error-responses.utils.ts
diff --git a/packages/twenty-server/src/core/open-api/utils/parameters.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/parameters.utils.ts
similarity index 81%
rename from packages/twenty-server/src/core/open-api/utils/parameters.utils.ts
rename to packages/twenty-server/src/engine/core-modules/open-api/utils/parameters.utils.ts
index fb8f95d9fee5..03f7319e7cd0 100644
--- a/packages/twenty-server/src/core/open-api/utils/parameters.utils.ts
+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/parameters.utils.ts
@@ -1,11 +1,11 @@
 import { OpenAPIV3_1 } from 'openapi-types';
 
-import { OrderByDirection } from 'src/workspace/workspace-query-builder/interfaces/record.interface';
+import { OrderByDirection } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
 
-import { FilterComparators } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-base-filter.utils';
-import { Conjunctions } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils';
-import { DEFAULT_ORDER_DIRECTION } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/order-by-input.factory';
-import { DEFAULT_CONJUNCTION } from 'src/core/api-rest/api-rest-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils';
+import { FilterComparators } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-base-filter.utils';
+import { Conjunctions } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/parse-filter.utils';
+import { DEFAULT_ORDER_DIRECTION } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/order-by-input.factory';
+import { DEFAULT_CONJUNCTION } from 'src/engine/api/rest/api-rest-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils';
 
 export const computeLimitParameters = (): OpenAPIV3_1.ParameterObject => {
   return {
diff --git a/packages/twenty-server/src/core/open-api/utils/path.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/path.utils.ts
similarity index 89%
rename from packages/twenty-server/src/core/open-api/utils/path.utils.ts
rename to packages/twenty-server/src/engine/core-modules/open-api/utils/path.utils.ts
index 04bdc78c0e9b..497e95e778e6 100644
--- a/packages/twenty-server/src/core/open-api/utils/path.utils.ts
+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/path.utils.ts
@@ -1,14 +1,14 @@
 import { OpenAPIV3_1 } from 'openapi-types';
 
 import { capitalize } from 'src/utils/capitalize';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import {
   getDeleteResponse200,
   getJsonResponse,
   getManyResultResponse200,
   getSingleResultSuccessResponse,
-} from 'src/core/open-api/utils/responses.utils';
-import { getRequestBody } from 'src/core/open-api/utils/request-body.utils';
+} from 'src/engine/core-modules/open-api/utils/responses.utils';
+import { getRequestBody } from 'src/engine/core-modules/open-api/utils/request-body.utils';
 
 export const computeManyResultPath = (
   item: ObjectMetadataEntity,
@@ -95,12 +95,19 @@ export const computeSingleResultPath = (
   } as OpenAPIV3_1.PathItemObject;
 };
 
-export const computeOpenApiPath = (): OpenAPIV3_1.PathItemObject => {
+export const computeOpenApiPath = (
+  serverUrl: string,
+): OpenAPIV3_1.PathItemObject => {
   return {
     get: {
       tags: ['General'],
       summary: 'Get Open Api Schema',
       operationId: 'GetOpenApiSchema',
+      servers: [
+        {
+          url: serverUrl,
+        },
+      ],
       responses: {
         '200': getJsonResponse(),
       },
diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/request-body.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/request-body.utils.ts
new file mode 100644
index 000000000000..6ba3b3023f61
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/request-body.utils.ts
@@ -0,0 +1,18 @@
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { capitalize } from 'src/utils/capitalize';
+
+export const getRequestBody = (
+  item: Pick<ObjectMetadataEntity, 'nameSingular'>,
+) => {
+  return {
+    description: 'body',
+    required: true,
+    content: {
+      'application/json': {
+        schema: {
+          $ref: `#/components/schemas/${capitalize(item.nameSingular)}`,
+        },
+      },
+    },
+  };
+};
diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/responses.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/responses.utils.ts
new file mode 100644
index 000000000000..c3905e2d2841
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/responses.utils.ts
@@ -0,0 +1,152 @@
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { capitalize } from 'src/utils/capitalize';
+
+export const getManyResultResponse200 = (
+  item: Pick<ObjectMetadataEntity, 'nameSingular' | 'namePlural'>,
+) => {
+  return {
+    description: 'Successful operation',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            data: {
+              type: 'object',
+              properties: {
+                [item.namePlural]: {
+                  type: 'array',
+                  items: {
+                    $ref: `#/components/schemas/${capitalize(
+                      item.nameSingular,
+                    )}`,
+                  },
+                },
+              },
+            },
+          },
+          example: {
+            data: {
+              [item.namePlural]: [
+                `${capitalize(item.nameSingular)}Object`,
+                '...',
+              ],
+            },
+          },
+        },
+      },
+    },
+  };
+};
+
+export const getSingleResultSuccessResponse = (
+  item: Pick<ObjectMetadataEntity, 'nameSingular'>,
+) => {
+  return {
+    description: 'Successful operation',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            data: {
+              type: 'object',
+              properties: {
+                [item.nameSingular]: {
+                  $ref: `#/components/schemas/${capitalize(item.nameSingular)}`,
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  };
+};
+
+export const getDeleteResponse200 = (
+  item: Pick<ObjectMetadataEntity, 'nameSingular'>,
+) => {
+  return {
+    description: 'Successful operation',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            data: {
+              type: 'object',
+              properties: {
+                [item.nameSingular]: {
+                  type: 'object',
+                  properties: {
+                    id: {
+                      type: 'string',
+                      format: 'uuid',
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  };
+};
+
+export const getJsonResponse = () => {
+  return {
+    description: 'Successful operation',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            openapi: { type: 'string' },
+            info: {
+              type: 'object',
+              properties: {
+                title: { type: 'string' },
+                description: { type: 'string' },
+                termsOfService: { type: 'string' },
+                contact: {
+                  type: 'object',
+                  properties: { email: { type: 'string' } },
+                },
+                license: {
+                  type: 'object',
+                  properties: {
+                    name: { type: 'string' },
+                    url: { type: 'string' },
+                  },
+                },
+              },
+            },
+            servers: {
+              type: 'array',
+              items: {
+                url: { type: 'string' },
+                description: { type: 'string' },
+              },
+            },
+            components: {
+              type: 'object',
+              properties: {
+                schemas: { type: 'object' },
+                parameters: { type: 'object' },
+                responses: { type: 'object' },
+              },
+            },
+            paths: {
+              type: 'object',
+            },
+            tags: {
+              type: 'object',
+            },
+          },
+        },
+      },
+    },
+  };
+};
diff --git a/packages/twenty-server/src/core/quick-actions/intelligence.service.ts b/packages/twenty-server/src/engine/core-modules/quick-actions/intelligence.service.ts
similarity index 80%
rename from packages/twenty-server/src/core/quick-actions/intelligence.service.ts
rename to packages/twenty-server/src/engine/core-modules/quick-actions/intelligence.service.ts
index cdae9066f5e7..860b81f85715 100644
--- a/packages/twenty-server/src/core/quick-actions/intelligence.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/quick-actions/intelligence.service.ts
@@ -1,9 +1,9 @@
 import { HttpService } from '@nestjs/axios';
 import { Injectable } from '@nestjs/common';
 
-import { CompanyInteface } from 'src/core/quick-actions/interfaces/company.interface';
+import { CompanyInteface } from 'src/engine/core-modules/quick-actions/interfaces/company.interface';
 
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 
 @Injectable()
 export class IntelligenceService {
@@ -37,7 +37,9 @@ export class IntelligenceService {
       'https://openrouter.ai/api/v1/chat/completions',
       {
         headers: {
-          Authorization: `Bearer ${this.environmentService.getOpenRouterApiKey()}`,
+          Authorization: `Bearer ${this.environmentService.get(
+            'OPENROUTER_API_KEY',
+          )}`,
           'HTTP-Referer': `https://twenty.com`,
           'X-Title': `Twenty CRM`,
           'Content-Type': 'application/json',
diff --git a/packages/twenty-server/src/core/quick-actions/interfaces/company.interface.ts b/packages/twenty-server/src/engine/core-modules/quick-actions/interfaces/company.interface.ts
similarity index 100%
rename from packages/twenty-server/src/core/quick-actions/interfaces/company.interface.ts
rename to packages/twenty-server/src/engine/core-modules/quick-actions/interfaces/company.interface.ts
diff --git a/packages/twenty-server/src/engine/core-modules/quick-actions/quick-actions.module.ts b/packages/twenty-server/src/engine/core-modules/quick-actions/quick-actions.module.ts
new file mode 100644
index 000000000000..95fa48dbcd19
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/quick-actions/quick-actions.module.ts
@@ -0,0 +1,14 @@
+import { Module } from '@nestjs/common';
+import { HttpModule } from '@nestjs/axios';
+
+import { IntelligenceService } from 'src/engine/core-modules/quick-actions/intelligence.service';
+import { QuickActionsService } from 'src/engine/core-modules/quick-actions/quick-actions.service';
+import { WorkspaceQueryRunnerModule } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module';
+
+@Module({
+  imports: [WorkspaceQueryRunnerModule, HttpModule],
+  controllers: [],
+  providers: [QuickActionsService, IntelligenceService],
+  exports: [QuickActionsService, IntelligenceService],
+})
+export class QuickActionsModule {}
diff --git a/packages/twenty-server/src/core/quick-actions/quick-actions.service.ts b/packages/twenty-server/src/engine/core-modules/quick-actions/quick-actions.service.ts
similarity index 88%
rename from packages/twenty-server/src/core/quick-actions/quick-actions.service.ts
rename to packages/twenty-server/src/engine/core-modules/quick-actions/quick-actions.service.ts
index 377fb5e71fe9..ed16e678a718 100644
--- a/packages/twenty-server/src/core/quick-actions/quick-actions.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/quick-actions/quick-actions.service.ts
@@ -2,13 +2,13 @@ import { Injectable } from '@nestjs/common';
 
 import { v4 as uuidv4 } from 'uuid';
 
-import { Record as IRecord } from 'src/workspace/workspace-query-builder/interfaces/record.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
+import { Record as IRecord } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
 import { isWorkEmail } from 'src/utils/is-work-email';
-import { stringifyWithoutKeyQuote } from 'src/workspace/workspace-query-builder/utils/stringify-without-key-quote.util';
-import { WorkspaceQueryRunnerService } from 'src/workspace/workspace-query-runner/workspace-query-runner.service';
-import { IntelligenceService } from 'src/core/quick-actions/intelligence.service';
+import { stringifyWithoutKeyQuote } from 'src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util';
+import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+import { IntelligenceService } from 'src/engine/core-modules/quick-actions/intelligence.service';
 import { capitalize } from 'src/utils/capitalize';
 
 @Injectable()
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.entity.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.entity.ts
new file mode 100644
index 000000000000..57d6cc196901
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.entity.ts
@@ -0,0 +1,60 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import { IDField } from '@ptc-org/nestjs-query-graphql';
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  Unique,
+  UpdateDateColumn,
+} from 'typeorm';
+
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@Entity({ name: 'userWorkspace', schema: 'core' })
+@ObjectType('UserWorkspace')
+@Unique('IndexOnUserIdAndWorkspaceIdUnique', ['userId', 'workspaceId'])
+export class UserWorkspace {
+  @IDField(() => UUIDScalarType)
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Field(() => User)
+  @ManyToOne(() => User, (user) => user.workspaces, {
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'userId' })
+  user: User;
+
+  @Field({ nullable: false })
+  @Column()
+  userId: string;
+
+  @Field(() => Workspace, { nullable: true })
+  @ManyToOne(() => Workspace, (workspace) => workspace.workspaceUsers, {
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'workspaceId' })
+  workspace: Workspace;
+
+  @Field({ nullable: false })
+  @Column()
+  workspaceId: string;
+
+  @Field()
+  @CreateDateColumn({ type: 'timestamptz' })
+  createdAt: Date;
+
+  @Field()
+  @UpdateDateColumn({ type: 'timestamptz' })
+  updatedAt: Date;
+
+  @Field({ nullable: true })
+  @Column({ nullable: true, type: 'timestamptz' })
+  deletedAt: Date;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts
new file mode 100644
index 000000000000..bc827d9d32d3
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts
@@ -0,0 +1,27 @@
+import { Module } from '@nestjs/common';
+
+import { NestjsQueryGraphQLModule } from '@ptc-org/nestjs-query-graphql';
+import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
+
+import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
+import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+
+@Module({
+  imports: [
+    NestjsQueryGraphQLModule.forFeature({
+      imports: [
+        NestjsQueryTypeOrmModule.forFeature([UserWorkspace], 'core'),
+        TypeORMModule,
+        DataSourceModule,
+        WorkspaceDataSourceModule,
+      ],
+      services: [UserWorkspaceService],
+    }),
+  ],
+  exports: [UserWorkspaceService],
+  providers: [UserWorkspaceService],
+})
+export class UserWorkspaceModule {}
diff --git a/packages/twenty-server/src/core/user-workspace/user-workspace.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
similarity index 77%
rename from packages/twenty-server/src/core/user-workspace/user-workspace.service.ts
rename to packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
index 5f8716574049..30703d0d3568 100644
--- a/packages/twenty-server/src/core/user-workspace/user-workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
@@ -4,13 +4,13 @@ import { EventEmitter2 } from '@nestjs/event-emitter';
 import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
 import { Repository } from 'typeorm';
 
-import { UserWorkspace } from 'src/core/user-workspace/user-workspace.entity';
+import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
-import { User } from 'src/core/user/user.entity';
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { ObjectRecordCreateEvent } from 'src/integrations/event-emitter/types/object-record-create.event';
-import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/types/object-record-create.event';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
 import { assert } from 'src/utils/assert';
 
 export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
@@ -62,8 +62,10 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
       new ObjectRecordCreateEvent<WorkspaceMemberObjectMetadata>();
 
     payload.workspaceId = workspaceId;
-    payload.createdRecord = new WorkspaceMemberObjectMetadata();
-    payload.createdRecord = workspaceMember[0];
+    payload.details = {
+      after: workspaceMember[0],
+    };
+    payload.recordId = workspaceMember[0].id;
 
     this.eventEmitter.emit('workspaceMember.created', payload);
   }
@@ -81,14 +83,6 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
     ).length;
   }
 
-  async findUserWorkspaces(userId: string): Promise<UserWorkspace[]> {
-    return this.userWorkspaceRepository.find({
-      where: {
-        userId,
-      },
-    });
-  }
-
   async checkUserWorkspaceExists(
     userId: string,
     workspaceId: string,
diff --git a/packages/twenty-server/src/engine/core-modules/user/dtos/workspace-member.dto.ts b/packages/twenty-server/src/engine/core-modules/user/dtos/workspace-member.dto.ts
new file mode 100644
index 000000000000..b2779567ddf1
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/user/dtos/workspace-member.dto.ts
@@ -0,0 +1,32 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import { IDField } from '@ptc-org/nestjs-query-graphql';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@ObjectType('FullName')
+export class FullName {
+  @Field({ nullable: false })
+  firstName: string;
+
+  @Field({ nullable: false })
+  lastName: string;
+}
+
+@ObjectType('WorkspaceMember')
+export class WorkspaceMember {
+  @IDField(() => UUIDScalarType)
+  id: string;
+
+  @Field(() => FullName)
+  name: FullName;
+
+  @Field({ nullable: false })
+  colorScheme: string;
+
+  @Field({ nullable: true })
+  avatarUrl: string;
+
+  @Field({ nullable: false })
+  locale: string;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/user.service.spec.ts b/packages/twenty-server/src/engine/core-modules/user/services/user.service.spec.ts
new file mode 100644
index 000000000000..64228c0eaf20
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/user/services/user.service.spec.ts
@@ -0,0 +1,43 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { getRepositoryToken } from '@nestjs/typeorm';
+
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { TypeORMService } from 'src/database/typeorm/typeorm.service';
+import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+
+import { UserService } from './user.service';
+
+describe('UserService', () => {
+  let service: UserService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        UserService,
+        {
+          provide: getRepositoryToken(User, 'core'),
+          useValue: {},
+        },
+        {
+          provide: getRepositoryToken(UserWorkspace, 'core'),
+          useValue: {},
+        },
+        {
+          provide: DataSourceService,
+          useValue: {},
+        },
+        {
+          provide: TypeORMService,
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    service = module.get<UserService>(UserService);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
new file mode 100644
index 000000000000..998066e0b6ff
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
@@ -0,0 +1,158 @@
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
+import { Repository } from 'typeorm';
+
+import { assert } from 'src/utils/assert';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { WorkspaceMember } from 'src/engine/core-modules/user/dtos/workspace-member.dto';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { TypeORMService } from 'src/database/typeorm/typeorm.service';
+import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
+
+export class UserService extends TypeOrmQueryService<User> {
+  constructor(
+    @InjectRepository(User, 'core')
+    private readonly userRepository: Repository<User>,
+    @InjectRepository(UserWorkspace, 'core')
+    private readonly userWorkspaceRepository: Repository<UserWorkspace>,
+    private readonly dataSourceService: DataSourceService,
+    private readonly typeORMService: TypeORMService,
+  ) {
+    super(userRepository);
+  }
+
+  async loadWorkspaceMember(user: User) {
+    const dataSourcesMetadata =
+      await this.dataSourceService.getDataSourcesMetadataFromWorkspaceId(
+        user.defaultWorkspace.id,
+      );
+
+    if (!dataSourcesMetadata.length) {
+      return;
+    }
+
+    if (dataSourcesMetadata.length > 1) {
+      throw new Error(
+        `user '${user.id}' default workspace '${user.defaultWorkspace.id}' has multiple data source metadata`,
+      );
+    }
+
+    const dataSourceMetadata = dataSourcesMetadata[0];
+
+    const workspaceDataSource =
+      await this.typeORMService.connectToDataSource(dataSourceMetadata);
+
+    const workspaceMembers = await workspaceDataSource?.query(
+      `SELECT * FROM ${dataSourceMetadata.schema}."workspaceMember" WHERE "userId" = '${user.id}'`,
+    );
+
+    if (!workspaceMembers.length) {
+      return;
+    }
+
+    assert(
+      workspaceMembers.length === 1,
+      'WorkspaceMember not found or too many found',
+    );
+
+    const userWorkspaceMember = new WorkspaceMember();
+
+    userWorkspaceMember.id = workspaceMembers[0].id;
+    userWorkspaceMember.colorScheme = workspaceMembers[0].colorScheme;
+    userWorkspaceMember.locale = workspaceMembers[0].locale;
+    userWorkspaceMember.avatarUrl = workspaceMembers[0].avatarUrl;
+    userWorkspaceMember.name = {
+      firstName: workspaceMembers[0].nameFirstName,
+      lastName: workspaceMembers[0].nameLastName,
+    };
+
+    return userWorkspaceMember;
+  }
+
+  async loadWorkspaceMembers(dataSource: DataSourceEntity) {
+    const workspaceDataSource =
+      await this.typeORMService.connectToDataSource(dataSource);
+
+    return await workspaceDataSource?.query(
+      `
+      SELECT * 
+      FROM ${dataSource.schema}."workspaceMember" AS s 
+      INNER JOIN core.user AS u 
+      ON s."userId" = u.id
+    `,
+    );
+  }
+
+  async deleteUser(userId: string): Promise<User> {
+    const user = await this.userRepository.findOne({
+      where: {
+        id: userId,
+      },
+      relations: ['defaultWorkspace'],
+    });
+
+    assert(user, 'User not found');
+
+    const dataSourceMetadata =
+      await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
+        user.defaultWorkspace.id,
+      );
+
+    const workspaceDataSource =
+      await this.typeORMService.connectToDataSource(dataSourceMetadata);
+
+    await workspaceDataSource?.query(
+      `DELETE FROM ${dataSourceMetadata.schema}."workspaceMember" WHERE "userId" = '${userId}'`,
+    );
+
+    await this.userWorkspaceRepository.delete({ userId });
+
+    await this.userRepository.delete(user.id);
+
+    return user;
+  }
+
+  async handleRemoveWorkspaceMember(workspaceId: string, userId: string) {
+    await this.userWorkspaceRepository.delete({
+      userId,
+      workspaceId,
+    });
+    await this.reassignOrRemoveUserDefaultWorkspace(workspaceId, userId);
+  }
+
+  private async reassignOrRemoveUserDefaultWorkspace(
+    workspaceId: string,
+    userId: string,
+  ) {
+    const userWorkspaces = await this.userWorkspaceRepository.find({
+      where: { userId: userId },
+    });
+
+    if (userWorkspaces.length === 0) {
+      await this.userRepository.delete({ id: userId });
+
+      return;
+    }
+
+    const user = await this.userRepository.findOne({
+      where: {
+        id: userId,
+      },
+    });
+
+    if (!user) {
+      throw new Error(`User ${userId} not found in workspace ${workspaceId}`);
+    }
+
+    if (user.defaultWorkspaceId === workspaceId) {
+      await this.userRepository.update(
+        { id: userId },
+        {
+          defaultWorkspaceId: userWorkspaces[0].workspaceId,
+        },
+      );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/core/user/user.auto-resolver-opts.ts b/packages/twenty-server/src/engine/core-modules/user/user.auto-resolver-opts.ts
similarity index 84%
rename from packages/twenty-server/src/core/user/user.auto-resolver-opts.ts
rename to packages/twenty-server/src/engine/core-modules/user/user.auto-resolver-opts.ts
index e13034485500..eeb6b95bbb25 100644
--- a/packages/twenty-server/src/core/user/user.auto-resolver-opts.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.auto-resolver-opts.ts
@@ -4,8 +4,8 @@ import {
   PagingStrategies,
 } from '@ptc-org/nestjs-query-graphql';
 
-import { User } from 'src/core/user/user.entity';
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
 
 export const userAutoResolverOpts: AutoResolverOpts<
   any,
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.entity.ts b/packages/twenty-server/src/engine/core-modules/user/user.entity.ts
new file mode 100644
index 000000000000..ca61cadb9a11
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/user/user.entity.ts
@@ -0,0 +1,100 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import {
+  Entity,
+  Column,
+  PrimaryGeneratedColumn,
+  CreateDateColumn,
+  UpdateDateColumn,
+  OneToMany,
+  ManyToOne,
+} from 'typeorm';
+import { IDField } from '@ptc-org/nestjs-query-graphql';
+
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { WorkspaceMember } from 'src/engine/core-modules/user/dtos/workspace-member.dto';
+import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@Entity({ name: 'user', schema: 'core' })
+@ObjectType('User')
+export class User {
+  @IDField(() => UUIDScalarType)
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Field()
+  @Column({ default: '' })
+  firstName: string;
+
+  @Field()
+  @Column({ default: '' })
+  lastName: string;
+
+  @Field()
+  @Column()
+  email: string;
+
+  @Field({ nullable: true })
+  @Column({ nullable: true })
+  defaultAvatarUrl: string;
+
+  @Field()
+  @Column({ default: false })
+  emailVerified: boolean;
+
+  @Field({ nullable: true })
+  @Column({ default: false })
+  disabled: boolean;
+
+  @Field({ nullable: true })
+  @Column({ nullable: true })
+  passwordHash: string;
+
+  @Field()
+  @Column({ default: false })
+  canImpersonate: boolean;
+
+  @Field()
+  @CreateDateColumn({ type: 'timestamptz' })
+  createdAt: Date;
+
+  @Field()
+  @UpdateDateColumn({ type: 'timestamptz' })
+  updatedAt: Date;
+
+  @Field({ nullable: true })
+  @Column({ nullable: true, type: 'timestamptz' })
+  deletedAt: Date;
+
+  @Field(() => Workspace, { nullable: false })
+  @ManyToOne(() => Workspace, (workspace) => workspace.users, {
+    onDelete: 'SET NULL',
+  })
+  defaultWorkspace: Workspace;
+
+  @Field()
+  @Column()
+  defaultWorkspaceId: string;
+
+  @Field({ nullable: true })
+  @Column({ nullable: true })
+  passwordResetToken: string;
+
+  @Field({ nullable: true })
+  @Column({ nullable: true, type: 'timestamptz' })
+  passwordResetTokenExpiresAt: Date;
+
+  @OneToMany(() => AppToken, (appToken) => appToken.user, {
+    cascade: true,
+  })
+  appTokens: AppToken[];
+
+  @Field(() => WorkspaceMember, { nullable: true })
+  workspaceMember: WorkspaceMember;
+
+  @Field(() => [UserWorkspace])
+  @OneToMany(() => UserWorkspace, (userWorkspace) => userWorkspace.user)
+  workspaces: UserWorkspace[];
+}
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.module.ts b/packages/twenty-server/src/engine/core-modules/user/user.module.ts
new file mode 100644
index 000000000000..81b3a708347c
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/user/user.module.ts
@@ -0,0 +1,36 @@
+/* eslint-disable no-restricted-imports */
+import { Module } from '@nestjs/common';
+
+import { NestjsQueryGraphQLModule } from '@ptc-org/nestjs-query-graphql';
+import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
+
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { UserResolver } from 'src/engine/core-modules/user/user.resolver';
+import { TypeORMService } from 'src/database/typeorm/typeorm.service';
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
+import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
+import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { FileUploadModule } from 'src/engine/core-modules/file/file-upload/file-upload.module';
+
+import { userAutoResolverOpts } from './user.auto-resolver-opts';
+
+import { UserService } from './services/user.service';
+
+@Module({
+  imports: [
+    NestjsQueryGraphQLModule.forFeature({
+      imports: [
+        NestjsQueryTypeOrmModule.forFeature([User, UserWorkspace], 'core'),
+        TypeORMModule,
+      ],
+      resolvers: userAutoResolverOpts,
+    }),
+    DataSourceModule,
+    FileUploadModule,
+    UserWorkspaceModule,
+  ],
+  exports: [UserService],
+  providers: [UserService, UserResolver, TypeORMService],
+})
+export class UserModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
new file mode 100644
index 000000000000..2ec203b1014a
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
@@ -0,0 +1,116 @@
+import {
+  Resolver,
+  Query,
+  Args,
+  Parent,
+  ResolveField,
+  Mutation,
+} from '@nestjs/graphql';
+import { UseGuards } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import crypto from 'crypto';
+
+import { FileUpload, GraphQLUpload } from 'graphql-upload';
+import { Repository } from 'typeorm';
+
+import { SupportDriver } from 'src/engine/integrations/environment/interfaces/support.interface';
+import { FileFolder } from 'src/engine/core-modules/file/interfaces/file-folder.interface';
+
+import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { streamToBuffer } from 'src/utils/stream-to-buffer';
+import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
+import { assert } from 'src/utils/assert';
+import { DemoEnvGuard } from 'src/engine/guards/demo.env.guard';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { WorkspaceMember } from 'src/engine/core-modules/user/dtos/workspace-member.dto';
+
+import { UserService } from './services/user.service';
+
+const getHMACKey = (email?: string, key?: string | null) => {
+  if (!email || !key) return null;
+
+  const hmac = crypto.createHmac('sha256', key);
+
+  return hmac.update(email).digest('hex');
+};
+
+@UseGuards(JwtAuthGuard)
+@Resolver(() => User)
+export class UserResolver {
+  constructor(
+    @InjectRepository(User, 'core')
+    private readonly userRepository: Repository<User>,
+    private readonly userService: UserService,
+    private readonly environmentService: EnvironmentService,
+    private readonly fileUploadService: FileUploadService,
+  ) {}
+
+  @Query(() => User)
+  async currentUser(@AuthUser() { id }: User): Promise<User> {
+    const user = await this.userRepository.findOne({
+      where: {
+        id,
+      },
+      relations: ['defaultWorkspace', 'workspaces', 'workspaces.workspace'],
+    });
+
+    assert(user, 'User not found');
+
+    return user;
+  }
+
+  @ResolveField(() => WorkspaceMember, {
+    nullable: true,
+  })
+  async workspaceMember(
+    @Parent() user: User,
+  ): Promise<WorkspaceMember | undefined> {
+    return this.userService.loadWorkspaceMember(user);
+  }
+
+  @ResolveField(() => String, {
+    nullable: true,
+  })
+  supportUserHash(@Parent() parent: User): string | null {
+    if (this.environmentService.get('SUPPORT_DRIVER') !== SupportDriver.Front) {
+      return null;
+    }
+    const key = this.environmentService.get('SUPPORT_FRONT_HMAC_KEY');
+
+    return getHMACKey(parent.email, key);
+  }
+
+  @Mutation(() => String)
+  async uploadProfilePicture(
+    @AuthUser() { id }: User,
+    @Args({ name: 'file', type: () => GraphQLUpload })
+    { createReadStream, filename, mimetype }: FileUpload,
+  ): Promise<string> {
+    if (!id) {
+      throw new Error('User not found');
+    }
+
+    const stream = createReadStream();
+    const buffer = await streamToBuffer(stream);
+    const fileFolder = FileFolder.ProfilePicture;
+
+    const { paths } = await this.fileUploadService.uploadImage({
+      file: buffer,
+      filename,
+      mimeType: mimetype,
+      fileFolder,
+    });
+
+    return paths[0];
+  }
+
+  @UseGuards(DemoEnvGuard)
+  @Mutation(() => User)
+  async deleteUser(@AuthUser() { id: userId }: User) {
+    // Proceed with user deletion
+    return this.userService.deleteUser(userId);
+  }
+}
diff --git a/packages/twenty-server/src/core/workspace/dtos/activate-workspace-input.ts b/packages/twenty-server/src/engine/core-modules/workspace/dtos/activate-workspace-input.ts
similarity index 100%
rename from packages/twenty-server/src/core/workspace/dtos/activate-workspace-input.ts
rename to packages/twenty-server/src/engine/core-modules/workspace/dtos/activate-workspace-input.ts
diff --git a/packages/twenty-server/src/core/workspace/dtos/update-workspace-input.ts b/packages/twenty-server/src/engine/core-modules/workspace/dtos/update-workspace-input.ts
similarity index 100%
rename from packages/twenty-server/src/core/workspace/dtos/update-workspace-input.ts
rename to packages/twenty-server/src/engine/core-modules/workspace/dtos/update-workspace-input.ts
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/handle-workspace-member-deleted.job.ts b/packages/twenty-server/src/engine/core-modules/workspace/handle-workspace-member-deleted.job.ts
new file mode 100644
index 000000000000..7f36247c1eb1
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/workspace/handle-workspace-member-deleted.job.ts
@@ -0,0 +1,22 @@
+import { Injectable } from '@nestjs/common';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
+
+export type HandleWorkspaceMemberDeletedJobData = {
+  workspaceId: string;
+  userId: string;
+};
+@Injectable()
+export class HandleWorkspaceMemberDeletedJob
+  implements MessageQueueJob<HandleWorkspaceMemberDeletedJobData>
+{
+  constructor(private readonly userService: UserService) {}
+
+  async handle(data: HandleWorkspaceMemberDeletedJobData): Promise<void> {
+    const { workspaceId, userId } = data;
+
+    await this.userService.handleRemoveWorkspaceMember(workspaceId, userId);
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.spec.ts b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.spec.ts
new file mode 100644
index 000000000000..8b6dbbfd1da3
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.spec.ts
@@ -0,0 +1,58 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { getRepositoryToken } from '@nestjs/typeorm';
+
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { WorkspaceManagerService } from 'src/engine/workspace-manager/workspace-manager.service';
+import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { BillingService } from 'src/engine/core-modules/billing/billing.service';
+import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
+
+import { WorkspaceService } from './workspace.service';
+
+describe('WorkspaceService', () => {
+  let service: WorkspaceService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        WorkspaceService,
+        {
+          provide: getRepositoryToken(Workspace, 'core'),
+          useValue: {},
+        },
+        {
+          provide: getRepositoryToken(UserWorkspace, 'core'),
+          useValue: {},
+        },
+        {
+          provide: getRepositoryToken(User, 'core'),
+          useValue: {},
+        },
+        {
+          provide: WorkspaceManagerService,
+          useValue: {},
+        },
+        {
+          provide: UserWorkspaceService,
+          useValue: {},
+        },
+        {
+          provide: UserService,
+          useValue: {},
+        },
+        {
+          provide: BillingService,
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    service = module.get<WorkspaceService>(WorkspaceService);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
new file mode 100644
index 000000000000..532ae2fa6eaf
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
@@ -0,0 +1,88 @@
+import { InjectRepository } from '@nestjs/typeorm';
+import { BadRequestException } from '@nestjs/common';
+
+import assert from 'assert';
+
+import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
+import { Repository } from 'typeorm';
+
+import { WorkspaceManagerService } from 'src/engine/workspace-manager/workspace-manager.service';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { ActivateWorkspaceInput } from 'src/engine/core-modules/workspace/dtos/activate-workspace-input';
+import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
+import { BillingService } from 'src/engine/core-modules/billing/billing.service';
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
+
+export class WorkspaceService extends TypeOrmQueryService<Workspace> {
+  constructor(
+    @InjectRepository(Workspace, 'core')
+    private readonly workspaceRepository: Repository<Workspace>,
+    @InjectRepository(UserWorkspace, 'core')
+    private readonly userWorkspaceRepository: Repository<UserWorkspace>,
+    private readonly workspaceManagerService: WorkspaceManagerService,
+    private readonly userWorkspaceService: UserWorkspaceService,
+    private readonly billingService: BillingService,
+    private readonly userService: UserService,
+  ) {
+    super(workspaceRepository);
+  }
+
+  async activateWorkspace(user: User, data: ActivateWorkspaceInput) {
+    if (!data.displayName || !data.displayName.length) {
+      throw new BadRequestException("'displayName' not provided");
+    }
+    await this.workspaceRepository.update(user.defaultWorkspace.id, {
+      displayName: data.displayName,
+    });
+    await this.workspaceManagerService.init(user.defaultWorkspace.id);
+    await this.userWorkspaceService.createWorkspaceMember(
+      user.defaultWorkspace.id,
+      user,
+    );
+
+    return user.defaultWorkspace;
+  }
+
+  async isWorkspaceActivated(id: string): Promise<boolean> {
+    return await this.workspaceManagerService.doesDataSourceExist(id);
+  }
+
+  async solfDeleteWorkspace(id: string) {
+    const workspace = await this.workspaceRepository.findOneBy({ id });
+
+    assert(workspace, 'Workspace not found');
+
+    await this.userWorkspaceRepository.delete({ workspaceId: id });
+    await this.billingService.deleteSubscription(workspace.id);
+
+    await this.workspaceManagerService.delete(id);
+
+    return workspace;
+  }
+
+  async deleteWorkspace(id: string) {
+    const userWorkspaces = await this.userWorkspaceRepository.findBy({
+      workspaceId: id,
+    });
+
+    const workspace = await this.solfDeleteWorkspace(id);
+
+    for (const userWorkspace of userWorkspaces) {
+      await this.userService.handleRemoveWorkspaceMember(
+        id,
+        userWorkspace.userId,
+      );
+    }
+    await this.workspaceRepository.delete(id);
+
+    return workspace;
+  }
+
+  async getWorkspaceIds() {
+    return this.workspaceRepository
+      .find()
+      .then((workspaces) => workspaces.map((workspace) => workspace.id));
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace-workspace-member.listener.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace-workspace-member.listener.ts
new file mode 100644
index 000000000000..3b6982cfe0aa
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace-workspace-member.listener.ts
@@ -0,0 +1,35 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+import { ObjectRecordDeleteEvent } from 'src/engine/integrations/event-emitter/types/object-record-delete.event';
+import {
+  HandleWorkspaceMemberDeletedJob,
+  HandleWorkspaceMemberDeletedJobData,
+} from 'src/engine/core-modules/workspace/handle-workspace-member-deleted.job';
+
+@Injectable()
+export class WorkspaceWorkspaceMemberListener {
+  constructor(
+    @Inject(MessageQueue.workspaceQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {}
+
+  @OnEvent('workspaceMember.deleted')
+  async handleDeleteEvent(
+    payload: ObjectRecordDeleteEvent<WorkspaceMemberObjectMetadata>,
+  ) {
+    const userId = payload.details.before.userId;
+
+    if (!userId) {
+      return;
+    }
+
+    await this.messageQueueService.add<HandleWorkspaceMemberDeletedJobData>(
+      HandleWorkspaceMemberDeletedJob.name,
+      { workspaceId: payload.workspaceId, userId },
+    );
+  }
+}
diff --git a/packages/twenty-server/src/core/workspace/workspace.auto-resolver-opts.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.auto-resolver-opts.ts
similarity index 83%
rename from packages/twenty-server/src/core/workspace/workspace.auto-resolver-opts.ts
rename to packages/twenty-server/src/engine/core-modules/workspace/workspace.auto-resolver-opts.ts
index 3ff4f05944b2..50f7a0a5aa13 100644
--- a/packages/twenty-server/src/core/workspace/workspace.auto-resolver-opts.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.auto-resolver-opts.ts
@@ -4,8 +4,8 @@ import {
   ReadResolverOpts,
 } from '@ptc-org/nestjs-query-graphql';
 
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-import { UpdateWorkspaceInput } from 'src/core/workspace/dtos/update-workspace-input';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { UpdateWorkspaceInput } from 'src/engine/core-modules/workspace/dtos/update-workspace-input';
 
 import { Workspace } from './workspace.entity';
 
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts
new file mode 100644
index 000000000000..09bd051b82bd
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts
@@ -0,0 +1,95 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import { IDField, UnPagedRelation } from '@ptc-org/nestjs-query-graphql';
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  OneToMany,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+} from 'typeorm';
+import Stripe from 'stripe';
+
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
+import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@Entity({ name: 'workspace', schema: 'core' })
+@ObjectType('Workspace')
+@UnPagedRelation('featureFlags', () => FeatureFlagEntity, { nullable: true })
+@UnPagedRelation('billingSubscriptions', () => BillingSubscription, {
+  nullable: true,
+})
+export class Workspace {
+  @IDField(() => UUIDScalarType)
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Field({ nullable: true })
+  @Column({ nullable: true })
+  domainName?: string;
+
+  @Field({ nullable: true })
+  @Column({ nullable: true })
+  displayName?: string;
+
+  @Field({ nullable: true })
+  @Column({ nullable: true })
+  logo?: string;
+
+  @Field({ nullable: true })
+  @Column({ nullable: true })
+  inviteHash?: string;
+
+  @Field({ nullable: true })
+  @Column({ nullable: true, type: 'timestamptz' })
+  deletedAt?: Date;
+
+  @Field()
+  @CreateDateColumn({ type: 'timestamptz' })
+  createdAt: Date;
+
+  @Field()
+  @UpdateDateColumn({ type: 'timestamptz' })
+  updatedAt: Date;
+
+  @OneToMany(() => AppToken, (appToken) => appToken.workspace, {
+    cascade: true,
+  })
+  appTokens: AppToken[];
+
+  @OneToMany(() => User, (user) => user.defaultWorkspace)
+  users: User[];
+
+  @OneToMany(() => UserWorkspace, (userWorkspace) => userWorkspace.workspace, {
+    onDelete: 'CASCADE',
+  })
+  workspaceUsers: UserWorkspace[];
+
+  @Field()
+  @Column({ default: true })
+  allowImpersonation: boolean;
+
+  @OneToMany(() => FeatureFlagEntity, (featureFlag) => featureFlag.workspace)
+  featureFlags: FeatureFlagEntity[];
+
+  @Field()
+  @Column({ default: 'incomplete' })
+  subscriptionStatus: Stripe.Subscription.Status;
+
+  @Field({ nullable: true })
+  currentBillingSubscription: BillingSubscription;
+
+  @Field()
+  activationStatus: 'active' | 'inactive';
+
+  @OneToMany(
+    () => BillingSubscription,
+    (billingSubscription) => billingSubscription.workspace,
+  )
+  billingSubscriptions: BillingSubscription[];
+}
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts
new file mode 100644
index 000000000000..63b821476948
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts
@@ -0,0 +1,53 @@
+import { Module } from '@nestjs/common';
+
+import { NestjsQueryGraphQLModule } from '@ptc-org/nestjs-query-graphql';
+import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
+
+import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
+import { WorkspaceResolver } from 'src/engine/core-modules/workspace/workspace.resolver';
+import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
+import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
+import { FileUploadModule } from 'src/engine/core-modules/file/file-upload/file-upload.module';
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { UserModule } from 'src/engine/core-modules/user/user.module';
+import { WorkspaceWorkspaceMemberListener } from 'src/engine/core-modules/workspace/workspace-workspace-member.listener';
+import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+
+import { workspaceAutoResolverOpts } from './workspace.auto-resolver-opts';
+import { Workspace } from './workspace.entity';
+
+import { WorkspaceService } from './services/workspace.service';
+
+@Module({
+  imports: [
+    TypeORMModule,
+    NestjsQueryGraphQLModule.forFeature({
+      imports: [
+        BillingModule,
+        FileUploadModule,
+        WorkspaceCacheVersionModule,
+        NestjsQueryTypeOrmModule.forFeature(
+          [Workspace, UserWorkspace, FeatureFlagEntity],
+          'core',
+        ),
+        UserWorkspaceModule,
+        WorkspaceManagerModule,
+        DataSourceModule,
+        TypeORMModule,
+        UserModule,
+      ],
+      services: [WorkspaceService],
+      resolvers: workspaceAutoResolverOpts,
+    }),
+  ],
+  exports: [WorkspaceService],
+  providers: [
+    WorkspaceResolver,
+    WorkspaceService,
+    WorkspaceWorkspaceMemberListener,
+  ],
+})
+export class WorkspaceModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
new file mode 100644
index 000000000000..1a11675b4a27
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
@@ -0,0 +1,125 @@
+import {
+  Resolver,
+  Query,
+  Args,
+  Mutation,
+  ResolveField,
+  Parent,
+} from '@nestjs/graphql';
+import { UseGuards } from '@nestjs/common';
+
+import { FileUpload, GraphQLUpload } from 'graphql-upload';
+
+import { FileFolder } from 'src/engine/core-modules/file/interfaces/file-folder.interface';
+
+import { streamToBuffer } from 'src/utils/stream-to-buffer';
+import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { assert } from 'src/utils/assert';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { UpdateWorkspaceInput } from 'src/engine/core-modules/workspace/dtos/update-workspace-input';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
+import { ActivateWorkspaceInput } from 'src/engine/core-modules/workspace/dtos/activate-workspace-input';
+import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
+import { BillingService } from 'src/engine/core-modules/billing/billing.service';
+import { DemoEnvGuard } from 'src/engine/guards/demo.env.guard';
+import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+
+import { Workspace } from './workspace.entity';
+
+import { WorkspaceService } from './services/workspace.service';
+
+@UseGuards(JwtAuthGuard)
+@Resolver(() => Workspace)
+export class WorkspaceResolver {
+  constructor(
+    private readonly workspaceService: WorkspaceService,
+    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+    private readonly fileUploadService: FileUploadService,
+    private readonly billingService: BillingService,
+  ) {}
+
+  @Query(() => Workspace)
+  async currentWorkspace(@AuthWorkspace() { id }: Workspace) {
+    const workspace = await this.workspaceService.findById(id);
+
+    assert(workspace, 'User not found');
+
+    return workspace;
+  }
+
+  @Mutation(() => Workspace)
+  @UseGuards(JwtAuthGuard)
+  async activateWorkspace(
+    @Args('data') data: ActivateWorkspaceInput,
+    @AuthUser() user: User,
+  ) {
+    return await this.workspaceService.activateWorkspace(user, data);
+  }
+
+  @Mutation(() => Workspace)
+  async updateWorkspace(
+    @Args('data') data: UpdateWorkspaceInput,
+    @AuthWorkspace() workspace: Workspace,
+  ) {
+    return this.workspaceService.updateOne(workspace.id, data);
+  }
+
+  @Mutation(() => String)
+  async uploadWorkspaceLogo(
+    @AuthWorkspace() { id }: Workspace,
+    @Args({ name: 'file', type: () => GraphQLUpload })
+    { createReadStream, filename, mimetype }: FileUpload,
+  ): Promise<string> {
+    const stream = createReadStream();
+    const buffer = await streamToBuffer(stream);
+    const fileFolder = FileFolder.WorkspaceLogo;
+
+    const { paths } = await this.fileUploadService.uploadImage({
+      file: buffer,
+      filename,
+      mimeType: mimetype,
+      fileFolder,
+    });
+
+    await this.workspaceService.updateOne(id, {
+      logo: paths[0],
+    });
+
+    return paths[0];
+  }
+
+  @UseGuards(DemoEnvGuard)
+  @Mutation(() => Workspace)
+  async deleteCurrentWorkspace(@AuthWorkspace() { id }: Workspace) {
+    return this.workspaceService.deleteWorkspace(id);
+  }
+
+  @ResolveField(() => String)
+  async activationStatus(
+    @Parent() workspace: Workspace,
+  ): Promise<'active' | 'inactive'> {
+    if (await this.workspaceService.isWorkspaceActivated(workspace.id)) {
+      return 'active';
+    }
+
+    return 'inactive';
+  }
+
+  @ResolveField(() => String, { nullable: true })
+  async currentCacheVersion(
+    @Parent() workspace: Workspace,
+  ): Promise<string | null> {
+    return this.workspaceCacheVersionService.getVersion(workspace.id);
+  }
+
+  @ResolveField(() => BillingSubscription)
+  async currentBillingSubscription(
+    @Parent() workspace: Workspace,
+  ): Promise<BillingSubscription | null> {
+    return this.billingService.getCurrentBillingSubscription({
+      workspaceId: workspace.id,
+    });
+  }
+}
diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts
new file mode 100644
index 000000000000..defdba21188a
--- /dev/null
+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts
@@ -0,0 +1,7 @@
+import DataLoader from 'dataloader';
+
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+
+export interface IDataloaders {
+  relationMetadataLoader: DataLoader<string, RelationMetadataEntity>;
+}
diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.module.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.module.ts
new file mode 100644
index 000000000000..a669e0e0501a
--- /dev/null
+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.module.ts
@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+
+import { DataloaderService } from 'src/engine/dataloaders/dataloader.service';
+import { RelationMetadataModule } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.module';
+
+@Module({
+  providers: [DataloaderService],
+  imports: [RelationMetadataModule],
+  exports: [DataloaderService],
+})
+export class DataloaderModule {}
diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts
new file mode 100644
index 000000000000..4a12186c5dd0
--- /dev/null
+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts
@@ -0,0 +1,32 @@
+import { Injectable } from '@nestjs/common';
+
+import DataLoader from 'dataloader';
+
+import { IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { RelationMetadataService } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.service';
+
+@Injectable()
+export class DataloaderService {
+  constructor(
+    private readonly relationMetadataService: RelationMetadataService,
+  ) {}
+
+  createLoaders(): IDataloaders {
+    const relationMetadataLoader = new DataLoader<
+      string,
+      RelationMetadataEntity
+    >(async (fieldMetadataIds: string[]) => {
+      const relationsMetadataCollection =
+        await this.relationMetadataService.findManyRelationMetadataByFieldMetadataIds(
+          fieldMetadataIds,
+        );
+
+      return relationsMetadataCollection;
+    });
+
+    return {
+      relationMetadataLoader,
+    };
+  }
+}
diff --git a/packages/twenty-server/src/decorators/ability/user-ability.decorator.ts b/packages/twenty-server/src/engine/decorators/ability/user-ability.decorator.ts
similarity index 100%
rename from packages/twenty-server/src/decorators/ability/user-ability.decorator.ts
rename to packages/twenty-server/src/engine/decorators/ability/user-ability.decorator.ts
diff --git a/packages/twenty-server/src/decorators/auth/auth-user.decorator.ts b/packages/twenty-server/src/engine/decorators/auth/auth-user.decorator.ts
similarity index 100%
rename from packages/twenty-server/src/decorators/auth/auth-user.decorator.ts
rename to packages/twenty-server/src/engine/decorators/auth/auth-user.decorator.ts
diff --git a/packages/twenty-server/src/decorators/auth/auth-workspace.decorator.ts b/packages/twenty-server/src/engine/decorators/auth/auth-workspace.decorator.ts
similarity index 100%
rename from packages/twenty-server/src/decorators/auth/auth-workspace.decorator.ts
rename to packages/twenty-server/src/engine/decorators/auth/auth-workspace.decorator.ts
diff --git a/packages/twenty-server/src/engine/decorators/metadata/is-valid-metadata-name.decorator.ts b/packages/twenty-server/src/engine/decorators/metadata/is-valid-metadata-name.decorator.ts
new file mode 100644
index 000000000000..d58663db3d40
--- /dev/null
+++ b/packages/twenty-server/src/engine/decorators/metadata/is-valid-metadata-name.decorator.ts
@@ -0,0 +1,26 @@
+import {
+  registerDecorator,
+  ValidationOptions,
+  ValidationArguments,
+} from 'class-validator';
+
+export function IsValidMetadataName(validationOptions?: ValidationOptions) {
+  return function (object: object, propertyName: string) {
+    registerDecorator({
+      name: 'IsValidName',
+      target: object.constructor,
+      propertyName: propertyName,
+      options: validationOptions,
+      validator: {
+        validate(value: any) {
+          return /^(?!(?:not|or|and|Int|Float|Boolean|String|ID)$)[^'\"\\;.=*/]+$/.test(
+            value,
+          );
+        },
+        defaultMessage(args: ValidationArguments) {
+          return `${args.property} has failed the name validation check`;
+        },
+      },
+    });
+  };
+}
diff --git a/packages/twenty-server/src/engine/guards/demo.env.guard.ts b/packages/twenty-server/src/engine/guards/demo.env.guard.ts
new file mode 100644
index 000000000000..49fe9ae479dc
--- /dev/null
+++ b/packages/twenty-server/src/engine/guards/demo.env.guard.ts
@@ -0,0 +1,36 @@
+import {
+  Injectable,
+  ExecutionContext,
+  UnauthorizedException,
+} from '@nestjs/common';
+import { AuthGuard } from '@nestjs/passport';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { getRequest } from 'src/utils/extract-request';
+
+@Injectable()
+export class DemoEnvGuard extends AuthGuard(['jwt']) {
+  constructor(private readonly environmentService: EnvironmentService) {
+    super();
+  }
+
+  getRequest(context: ExecutionContext) {
+    return getRequest(context);
+  }
+
+  // TODO: input should be typed
+  handleRequest(err: any, user: any) {
+    const demoWorkspaceIds = this.environmentService.get('DEMO_WORKSPACE_IDS');
+    const currentUserWorkspaceId = user?.workspace?.id;
+
+    if (!currentUserWorkspaceId) {
+      throw new UnauthorizedException('Unauthorized for not logged in user');
+    }
+
+    if (demoWorkspaceIds.includes(currentUserWorkspaceId)) {
+      throw new UnauthorizedException('Unauthorized for demo workspace');
+    }
+
+    return user;
+  }
+}
diff --git a/packages/twenty-server/src/guards/jwt.auth.guard.ts b/packages/twenty-server/src/engine/guards/jwt.auth.guard.ts
similarity index 100%
rename from packages/twenty-server/src/guards/jwt.auth.guard.ts
rename to packages/twenty-server/src/engine/guards/jwt.auth.guard.ts
diff --git a/packages/twenty-server/src/guards/optional-jwt.auth.guard.ts b/packages/twenty-server/src/engine/guards/optional-jwt.auth.guard.ts
similarity index 100%
rename from packages/twenty-server/src/guards/optional-jwt.auth.guard.ts
rename to packages/twenty-server/src/engine/guards/optional-jwt.auth.guard.ts
diff --git a/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.module-factory.ts b/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.module-factory.ts
new file mode 100644
index 000000000000..79dedaf6bdc4
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.module-factory.ts
@@ -0,0 +1,46 @@
+import { CacheModuleOptions } from '@nestjs/common';
+
+import { redisStore } from 'cache-manager-redis-yet';
+
+import { CacheStorageType } from 'src/engine/integrations/cache-storage/types/cache-storage-type.enum';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+
+export const cacheStorageModuleFactory = (
+  environmentService: EnvironmentService,
+): CacheModuleOptions => {
+  const cacheStorageType = environmentService.get('CACHE_STORAGE_TYPE');
+  const cacheStorageTtl = environmentService.get('CACHE_STORAGE_TTL');
+  const cacheModuleOptions: CacheModuleOptions = {
+    isGlobal: true,
+    ttl: cacheStorageTtl * 1000,
+  };
+
+  switch (cacheStorageType) {
+    case CacheStorageType.Memory: {
+      return cacheModuleOptions;
+    }
+    case CacheStorageType.Redis: {
+      const host = environmentService.get('REDIS_HOST');
+      const port = environmentService.get('REDIS_PORT');
+
+      if (!(host && port)) {
+        throw new Error(
+          `${cacheStorageType} cache storage requires host: ${host} and port: ${port} to be defined, check your .env file`,
+        );
+      }
+
+      return {
+        ...cacheModuleOptions,
+        store: redisStore,
+        socket: {
+          host,
+          port,
+        },
+      };
+    }
+    default:
+      throw new Error(
+        `Invalid cache-storage (${cacheStorageType}), check your .env file`,
+      );
+  }
+};
diff --git a/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.module.ts b/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.module.ts
new file mode 100644
index 000000000000..b2af3906259a
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.module.ts
@@ -0,0 +1,39 @@
+import { Module, Global, Inject, OnModuleDestroy } from '@nestjs/common';
+import { CacheModule, CACHE_MANAGER, Cache } from '@nestjs/cache-manager';
+import { ConfigModule } from '@nestjs/config';
+
+import { CacheStorageService } from 'src/engine/integrations/cache-storage/cache-storage.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { cacheStorageModuleFactory } from 'src/engine/integrations/cache-storage/cache-storage.module-factory';
+import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
+
+@Global()
+@Module({
+  imports: [
+    CacheModule.registerAsync({
+      isGlobal: true,
+      imports: [ConfigModule],
+      useFactory: cacheStorageModuleFactory,
+      inject: [EnvironmentService],
+    }),
+  ],
+  providers: [
+    ...Object.values(CacheStorageNamespace).map((cacheStorageNamespace) => ({
+      provide: cacheStorageNamespace,
+      useFactory: (cacheManager: Cache) => {
+        return new CacheStorageService(cacheManager, cacheStorageNamespace);
+      },
+      inject: [CACHE_MANAGER],
+    })),
+  ],
+  exports: [...Object.values(CacheStorageNamespace)],
+})
+export class CacheStorageModule implements OnModuleDestroy {
+  constructor(@Inject(CACHE_MANAGER) private cacheManager: Cache) {}
+
+  async onModuleDestroy() {
+    if ((this.cacheManager.store as any)?.name === 'redis') {
+      await (this.cacheManager.store as any).client.quit();
+    }
+  }
+}
diff --git a/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.service.ts b/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.service.ts
new file mode 100644
index 000000000000..529025012341
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.service.ts
@@ -0,0 +1,67 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { CACHE_MANAGER, Cache } from '@nestjs/cache-manager';
+
+import { RedisCache } from 'cache-manager-redis-yet';
+
+import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
+
+@Injectable()
+export class CacheStorageService {
+  constructor(
+    @Inject(CACHE_MANAGER)
+    private readonly cache: Cache,
+    private readonly namespace: CacheStorageNamespace,
+  ) {}
+
+  async get<T>(key: string): Promise<T | undefined> {
+    return this.cache.get(`${this.namespace}:${key}`);
+  }
+
+  async set<T>(key: string, value: T, ttl?: number) {
+    return this.cache.set(`${this.namespace}:${key}`, value, ttl);
+  }
+
+  async del(key: string) {
+    return this.cache.del(`${this.namespace}:${key}`);
+  }
+
+  async setAdd(key: string, value: string[]) {
+    if (value.length === 0) {
+      return;
+    }
+    if (this.isRedisCache()) {
+      return (this.cache as RedisCache).store.client.sAdd(
+        `${this.namespace}:${key}`,
+        value,
+      );
+    }
+    this.get(key).then((res: string[]) => {
+      if (res) {
+        this.set(key, [...res, ...value]);
+      } else {
+        this.set(key, value);
+      }
+    });
+  }
+
+  async setPop(key: string, size: number = 1) {
+    if (this.isRedisCache()) {
+      return (this.cache as RedisCache).store.client.sPop(
+        `${this.namespace}:${key}`,
+        size,
+      );
+    }
+
+    return this.get(key).then((res: string[]) => {
+      if (res) {
+        this.set(key, res.slice(0, -size));
+      }
+
+      return res;
+    });
+  }
+
+  private isRedisCache() {
+    return (this.cache.store as any)?.name === 'redis';
+  }
+}
diff --git a/packages/twenty-server/src/engine/integrations/cache-storage/decorators/cache-storage.decorator.ts b/packages/twenty-server/src/engine/integrations/cache-storage/decorators/cache-storage.decorator.ts
new file mode 100644
index 000000000000..4782059b269f
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/cache-storage/decorators/cache-storage.decorator.ts
@@ -0,0 +1,9 @@
+import { Inject } from '@nestjs/common';
+
+import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
+
+export const InjectCacheStorage = (
+  cacheStorageNamespace: CacheStorageNamespace,
+) => {
+  return Inject(cacheStorageNamespace);
+};
diff --git a/packages/twenty-server/src/engine/integrations/cache-storage/types/cache-storage-namespace.enum.ts b/packages/twenty-server/src/engine/integrations/cache-storage/types/cache-storage-namespace.enum.ts
new file mode 100644
index 000000000000..5ef0221bc969
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/cache-storage/types/cache-storage-namespace.enum.ts
@@ -0,0 +1,4 @@
+export enum CacheStorageNamespace {
+  Messaging = 'messaging',
+  WorkspaceSchema = 'workspaceSchema',
+}
diff --git a/packages/twenty-server/src/engine/integrations/cache-storage/types/cache-storage-type.enum.ts b/packages/twenty-server/src/engine/integrations/cache-storage/types/cache-storage-type.enum.ts
new file mode 100644
index 000000000000..030b1b9ae1c0
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/cache-storage/types/cache-storage-type.enum.ts
@@ -0,0 +1,4 @@
+export enum CacheStorageType {
+  Memory = 'memory',
+  Redis = 'redis',
+}
diff --git a/packages/twenty-server/src/integrations/email/drivers/interfaces/email-driver.interface.ts b/packages/twenty-server/src/engine/integrations/email/drivers/interfaces/email-driver.interface.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/email/drivers/interfaces/email-driver.interface.ts
rename to packages/twenty-server/src/engine/integrations/email/drivers/interfaces/email-driver.interface.ts
diff --git a/packages/twenty-server/src/integrations/email/drivers/logger.driver.ts b/packages/twenty-server/src/engine/integrations/email/drivers/logger.driver.ts
similarity index 84%
rename from packages/twenty-server/src/integrations/email/drivers/logger.driver.ts
rename to packages/twenty-server/src/engine/integrations/email/drivers/logger.driver.ts
index 90ca586b91dc..a3138de0bd36 100644
--- a/packages/twenty-server/src/integrations/email/drivers/logger.driver.ts
+++ b/packages/twenty-server/src/engine/integrations/email/drivers/logger.driver.ts
@@ -2,7 +2,7 @@ import { Logger } from '@nestjs/common';
 
 import { SendMailOptions } from 'nodemailer';
 
-import { EmailDriver } from 'src/integrations/email/drivers/interfaces/email-driver.interface';
+import { EmailDriver } from 'src/engine/integrations/email/drivers/interfaces/email-driver.interface';
 
 export class LoggerDriver implements EmailDriver {
   private readonly logger = new Logger(LoggerDriver.name);
diff --git a/packages/twenty-server/src/integrations/email/drivers/smtp.driver.ts b/packages/twenty-server/src/engine/integrations/email/drivers/smtp.driver.ts
similarity index 88%
rename from packages/twenty-server/src/integrations/email/drivers/smtp.driver.ts
rename to packages/twenty-server/src/engine/integrations/email/drivers/smtp.driver.ts
index c4dfd77fb054..94445854ec06 100644
--- a/packages/twenty-server/src/integrations/email/drivers/smtp.driver.ts
+++ b/packages/twenty-server/src/engine/integrations/email/drivers/smtp.driver.ts
@@ -3,7 +3,7 @@ import { Logger } from '@nestjs/common';
 import { createTransport, Transporter, SendMailOptions } from 'nodemailer';
 import SMTPConnection from 'nodemailer/lib/smtp-connection';
 
-import { EmailDriver } from 'src/integrations/email/drivers/interfaces/email-driver.interface';
+import { EmailDriver } from 'src/engine/integrations/email/drivers/interfaces/email-driver.interface';
 
 export class SmtpDriver implements EmailDriver {
   private readonly logger = new Logger(SmtpDriver.name);
diff --git a/packages/twenty-server/src/engine/integrations/email/email-sender.job.ts b/packages/twenty-server/src/engine/integrations/email/email-sender.job.ts
new file mode 100644
index 000000000000..7b284d4b26c3
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/email/email-sender.job.ts
@@ -0,0 +1,16 @@
+import { Injectable } from '@nestjs/common';
+
+import { SendMailOptions } from 'nodemailer';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { EmailSenderService } from 'src/engine/integrations/email/email-sender.service';
+
+@Injectable()
+export class EmailSenderJob implements MessageQueueJob<SendMailOptions> {
+  constructor(private readonly emailSenderService: EmailSenderService) {}
+
+  async handle(data: SendMailOptions): Promise<void> {
+    await this.emailSenderService.send(data);
+  }
+}
diff --git a/packages/twenty-server/src/engine/integrations/email/email-sender.service.ts b/packages/twenty-server/src/engine/integrations/email/email-sender.service.ts
new file mode 100644
index 000000000000..96ec2196f03d
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/email/email-sender.service.ts
@@ -0,0 +1,16 @@
+import { Inject, Injectable } from '@nestjs/common';
+
+import { SendMailOptions } from 'nodemailer';
+
+import { EmailDriver } from 'src/engine/integrations/email/drivers/interfaces/email-driver.interface';
+
+import { EMAIL_DRIVER } from 'src/engine/integrations/email/email.constants';
+
+@Injectable()
+export class EmailSenderService implements EmailDriver {
+  constructor(@Inject(EMAIL_DRIVER) private driver: EmailDriver) {}
+
+  async send(sendMailOptions: SendMailOptions): Promise<void> {
+    await this.driver.send(sendMailOptions);
+  }
+}
diff --git a/packages/twenty-server/src/integrations/email/email.constants.ts b/packages/twenty-server/src/engine/integrations/email/email.constants.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/email/email.constants.ts
rename to packages/twenty-server/src/engine/integrations/email/email.constants.ts
diff --git a/packages/twenty-server/src/engine/integrations/email/email.module-factory.ts b/packages/twenty-server/src/engine/integrations/email/email.module-factory.ts
new file mode 100644
index 000000000000..870f30db2fab
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/email/email.module-factory.ts
@@ -0,0 +1,40 @@
+import {
+  EmailDriver,
+  EmailModuleOptions,
+} from 'src/engine/integrations/email/interfaces/email.interface';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+
+export const emailModuleFactory = (
+  environmentService: EnvironmentService,
+): EmailModuleOptions => {
+  const driver = environmentService.get('EMAIL_DRIVER');
+
+  switch (driver) {
+    case EmailDriver.Logger: {
+      return;
+    }
+    case EmailDriver.Smtp: {
+      const host = environmentService.get('EMAIL_SMTP_HOST');
+      const port = environmentService.get('EMAIL_SMTP_PORT');
+      const user = environmentService.get('EMAIL_SMTP_USER');
+      const pass = environmentService.get('EMAIL_SMTP_PASSWORD');
+
+      if (!(host && port)) {
+        throw new Error(
+          `${driver} email driver requires host: ${host} and port: ${port} to be defined, check your .env file`,
+        );
+      }
+
+      const auth = user && pass ? { user, pass } : undefined;
+
+      if (auth) {
+        return { host, port, auth };
+      }
+
+      return { host, port };
+    }
+    default:
+      throw new Error(`Invalid email driver (${driver}), check your .env file`);
+  }
+};
diff --git a/packages/twenty-server/src/engine/integrations/email/email.module.ts b/packages/twenty-server/src/engine/integrations/email/email.module.ts
new file mode 100644
index 000000000000..f97c246ab664
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/email/email.module.ts
@@ -0,0 +1,30 @@
+import { DynamicModule, Global } from '@nestjs/common';
+
+import { EmailModuleAsyncOptions } from 'src/engine/integrations/email/interfaces/email.interface';
+
+import { EMAIL_DRIVER } from 'src/engine/integrations/email/email.constants';
+import { LoggerDriver } from 'src/engine/integrations/email/drivers/logger.driver';
+import { SmtpDriver } from 'src/engine/integrations/email/drivers/smtp.driver';
+import { EmailService } from 'src/engine/integrations/email/email.service';
+import { EmailSenderService } from 'src/engine/integrations/email/email-sender.service';
+
+@Global()
+export class EmailModule {
+  static forRoot(options: EmailModuleAsyncOptions): DynamicModule {
+    const provider = {
+      provide: EMAIL_DRIVER,
+      useFactory: (...args: any[]) => {
+        const config = options.useFactory(...args);
+
+        return config ? new SmtpDriver(config) : new LoggerDriver();
+      },
+      inject: options.inject || [],
+    };
+
+    return {
+      module: EmailModule,
+      providers: [EmailSenderService, EmailService, provider],
+      exports: [EmailSenderService, EmailService],
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/integrations/email/email.service.ts b/packages/twenty-server/src/engine/integrations/email/email.service.ts
new file mode 100644
index 000000000000..a149c78023b2
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/email/email.service.ts
@@ -0,0 +1,23 @@
+import { Inject, Injectable } from '@nestjs/common';
+
+import { SendMailOptions } from 'nodemailer';
+
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { EmailSenderJob } from 'src/engine/integrations/email/email-sender.job';
+
+@Injectable()
+export class EmailService {
+  constructor(
+    @Inject(MessageQueue.emailQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {}
+
+  async send(sendMailOptions: SendMailOptions): Promise<void> {
+    await this.messageQueueService.add<SendMailOptions>(
+      EmailSenderJob.name,
+      sendMailOptions,
+      { retryLimit: 3 },
+    );
+  }
+}
diff --git a/packages/twenty-server/src/integrations/email/interfaces/email.interface.ts b/packages/twenty-server/src/engine/integrations/email/interfaces/email.interface.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/email/interfaces/email.interface.ts
rename to packages/twenty-server/src/engine/integrations/email/interfaces/email.interface.ts
diff --git a/packages/twenty-server/src/integrations/environment/decorators/__tests__/cast-to-log-level-array.decorator.spec.ts b/packages/twenty-server/src/engine/integrations/environment/decorators/__tests__/cast-to-log-level-array.decorator.spec.ts
similarity index 94%
rename from packages/twenty-server/src/integrations/environment/decorators/__tests__/cast-to-log-level-array.decorator.spec.ts
rename to packages/twenty-server/src/engine/integrations/environment/decorators/__tests__/cast-to-log-level-array.decorator.spec.ts
index 26ba667e4e92..43447e2de1e8 100644
--- a/packages/twenty-server/src/integrations/environment/decorators/__tests__/cast-to-log-level-array.decorator.spec.ts
+++ b/packages/twenty-server/src/engine/integrations/environment/decorators/__tests__/cast-to-log-level-array.decorator.spec.ts
@@ -1,6 +1,6 @@
 import { plainToClass } from 'class-transformer';
 
-import { CastToLogLevelArray } from 'src/integrations/environment/decorators/cast-to-log-level-array.decorator';
+import { CastToLogLevelArray } from 'src/engine/integrations/environment/decorators/cast-to-log-level-array.decorator';
 
 class TestClass {
   @CastToLogLevelArray()
diff --git a/packages/twenty-server/src/integrations/environment/decorators/__tests__/cast-to-positive-number.decorator.spec.ts b/packages/twenty-server/src/engine/integrations/environment/decorators/__tests__/cast-to-positive-number.decorator.spec.ts
similarity index 92%
rename from packages/twenty-server/src/integrations/environment/decorators/__tests__/cast-to-positive-number.decorator.spec.ts
rename to packages/twenty-server/src/engine/integrations/environment/decorators/__tests__/cast-to-positive-number.decorator.spec.ts
index b829404936ed..f3f77fb4c333 100644
--- a/packages/twenty-server/src/integrations/environment/decorators/__tests__/cast-to-positive-number.decorator.spec.ts
+++ b/packages/twenty-server/src/engine/integrations/environment/decorators/__tests__/cast-to-positive-number.decorator.spec.ts
@@ -1,6 +1,6 @@
 import { plainToClass } from 'class-transformer';
 
-import { CastToPositiveNumber } from 'src/integrations/environment/decorators/cast-to-positive-number.decorator';
+import { CastToPositiveNumber } from 'src/engine/integrations/environment/decorators/cast-to-positive-number.decorator';
 
 class TestClass {
   @CastToPositiveNumber()
diff --git a/packages/twenty-server/src/integrations/environment/decorators/cast-to-boolean.decorator.ts b/packages/twenty-server/src/engine/integrations/environment/decorators/cast-to-boolean.decorator.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/environment/decorators/cast-to-boolean.decorator.ts
rename to packages/twenty-server/src/engine/integrations/environment/decorators/cast-to-boolean.decorator.ts
diff --git a/packages/twenty-server/src/integrations/environment/decorators/cast-to-log-level-array.decorator.ts b/packages/twenty-server/src/engine/integrations/environment/decorators/cast-to-log-level-array.decorator.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/environment/decorators/cast-to-log-level-array.decorator.ts
rename to packages/twenty-server/src/engine/integrations/environment/decorators/cast-to-log-level-array.decorator.ts
diff --git a/packages/twenty-server/src/integrations/environment/decorators/cast-to-positive-number.decorator.ts b/packages/twenty-server/src/engine/integrations/environment/decorators/cast-to-positive-number.decorator.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/environment/decorators/cast-to-positive-number.decorator.ts
rename to packages/twenty-server/src/engine/integrations/environment/decorators/cast-to-positive-number.decorator.ts
diff --git a/packages/twenty-server/src/integrations/environment/decorators/cast-to-string-array.decorator.ts b/packages/twenty-server/src/engine/integrations/environment/decorators/cast-to-string-array.decorator.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/environment/decorators/cast-to-string-array.decorator.ts
rename to packages/twenty-server/src/engine/integrations/environment/decorators/cast-to-string-array.decorator.ts
diff --git a/packages/twenty-server/src/integrations/environment/decorators/is-aws-region.decorator.ts b/packages/twenty-server/src/engine/integrations/environment/decorators/is-aws-region.decorator.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/environment/decorators/is-aws-region.decorator.ts
rename to packages/twenty-server/src/engine/integrations/environment/decorators/is-aws-region.decorator.ts
diff --git a/packages/twenty-server/src/integrations/environment/decorators/is-duration.decorator.ts b/packages/twenty-server/src/engine/integrations/environment/decorators/is-duration.decorator.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/environment/decorators/is-duration.decorator.ts
rename to packages/twenty-server/src/engine/integrations/environment/decorators/is-duration.decorator.ts
diff --git a/packages/twenty-server/src/integrations/environment/decorators/is-strictly-lower-than.decorator.ts b/packages/twenty-server/src/engine/integrations/environment/decorators/is-strictly-lower-than.decorator.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/environment/decorators/is-strictly-lower-than.decorator.ts
rename to packages/twenty-server/src/engine/integrations/environment/decorators/is-strictly-lower-than.decorator.ts
diff --git a/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts b/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts
new file mode 100644
index 000000000000..dc2df8ed3d93
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts
@@ -0,0 +1,345 @@
+import { LogLevel } from '@nestjs/common';
+
+import { plainToClass } from 'class-transformer';
+import {
+  IsEnum,
+  IsOptional,
+  IsString,
+  IsUrl,
+  ValidateIf,
+  validateSync,
+  IsBoolean,
+  IsNumber,
+  IsDefined,
+  Min,
+  Max,
+} from 'class-validator';
+
+import { EmailDriver } from 'src/engine/integrations/email/interfaces/email.interface';
+
+import { assert } from 'src/utils/assert';
+import { CastToStringArray } from 'src/engine/integrations/environment/decorators/cast-to-string-array.decorator';
+import { ExceptionHandlerDriver } from 'src/engine/integrations/exception-handler/interfaces';
+import { StorageDriverType } from 'src/engine/integrations/file-storage/interfaces';
+import { LoggerDriverType } from 'src/engine/integrations/logger/interfaces';
+import { IsStrictlyLowerThan } from 'src/engine/integrations/environment/decorators/is-strictly-lower-than.decorator';
+import { MessageQueueDriverType } from 'src/engine/integrations/message-queue/interfaces';
+
+import { IsDuration } from './decorators/is-duration.decorator';
+import { AwsRegion } from './interfaces/aws-region.interface';
+import { IsAWSRegion } from './decorators/is-aws-region.decorator';
+import { CastToBoolean } from './decorators/cast-to-boolean.decorator';
+import { SupportDriver } from './interfaces/support.interface';
+import { CastToPositiveNumber } from './decorators/cast-to-positive-number.decorator';
+import { CastToLogLevelArray } from './decorators/cast-to-log-level-array.decorator';
+
+export class EnvironmentVariables {
+  // Misc
+  @CastToBoolean()
+  @IsOptional()
+  @IsBoolean()
+  DEBUG_MODE: boolean = false;
+
+  @CastToPositiveNumber()
+  @IsOptional()
+  @IsNumber()
+  @Min(0)
+  @Max(65535)
+  DEBUG_PORT: number = 9000;
+
+  @CastToBoolean()
+  @IsOptional()
+  @IsBoolean()
+  SIGN_IN_PREFILLED: boolean = false;
+
+  @CastToBoolean()
+  @IsOptional()
+  @IsBoolean()
+  IS_BILLING_ENABLED: boolean = false;
+
+  @IsString()
+  @ValidateIf((env) => env.IS_BILLING_ENABLED === true)
+  BILLING_PLAN_REQUIRED_LINK: string;
+
+  @IsString()
+  @ValidateIf((env) => env.IS_BILLING_ENABLED === true)
+  BILLING_STRIPE_BASE_PLAN_PRODUCT_ID: string;
+
+  @IsNumber()
+  @CastToPositiveNumber()
+  @IsOptional()
+  @ValidateIf((env) => env.IS_BILLING_ENABLED === true)
+  BILLING_FREE_TRIAL_DURATION_IN_DAYS: number = 7;
+
+  @IsString()
+  @ValidateIf((env) => env.IS_BILLING_ENABLED === true)
+  BILLING_STRIPE_API_KEY: string;
+
+  @IsString()
+  @ValidateIf((env) => env.IS_BILLING_ENABLED === true)
+  BILLING_STRIPE_WEBHOOK_SECRET: string;
+
+  @CastToBoolean()
+  @IsOptional()
+  @IsBoolean()
+  TELEMETRY_ENABLED: boolean = true;
+
+  @CastToBoolean()
+  @IsOptional()
+  @IsBoolean()
+  TELEMETRY_ANONYMIZATION_ENABLED: boolean = true;
+
+  @CastToPositiveNumber()
+  @IsNumber()
+  @IsOptional()
+  PORT: number = 3000;
+
+  // Database
+  @IsDefined()
+  @IsUrl({
+    protocols: ['postgres'],
+    require_tld: false,
+    allow_underscores: true,
+  })
+  PG_DATABASE_URL: string;
+
+  // Frontend URL
+  @IsUrl({ require_tld: false })
+  FRONT_BASE_URL: string;
+
+  // Server URL
+  @IsUrl({ require_tld: false })
+  @IsOptional()
+  SERVER_URL: string;
+
+  // Json Web Token
+  @IsString()
+  ACCESS_TOKEN_SECRET: string;
+
+  @IsDuration()
+  @IsOptional()
+  ACCESS_TOKEN_EXPIRES_IN: string = '30m';
+
+  @IsString()
+  REFRESH_TOKEN_SECRET: string;
+
+  @IsDuration()
+  @IsOptional()
+  REFRESH_TOKEN_EXPIRES_IN: string = '30m';
+
+  @IsDuration()
+  @IsOptional()
+  REFRESH_TOKEN_COOL_DOWN: string = '1m';
+
+  @IsString()
+  LOGIN_TOKEN_SECRET: string = '30m';
+
+  @IsDuration()
+  @IsOptional()
+  LOGIN_TOKEN_EXPIRES_IN: string = '15m';
+
+  @IsString()
+  @IsOptional()
+  FILE_TOKEN_SECRET: string = 'random_string';
+
+  @IsDuration()
+  @IsOptional()
+  FILE_TOKEN_EXPIRES_IN: string = '1d';
+
+  // Auth
+  @IsUrl({ require_tld: false })
+  @IsOptional()
+  FRONT_AUTH_CALLBACK_URL: string;
+
+  @CastToBoolean()
+  @IsOptional()
+  @IsBoolean()
+  AUTH_GOOGLE_ENABLED: boolean = false;
+
+  @IsString()
+  @ValidateIf((env) => env.AUTH_GOOGLE_ENABLED === true)
+  AUTH_GOOGLE_CLIENT_ID: string;
+
+  @IsString()
+  @ValidateIf((env) => env.AUTH_GOOGLE_ENABLED === true)
+  AUTH_GOOGLE_CLIENT_SECRET: string;
+
+  @IsUrl({ require_tld: false })
+  @ValidateIf((env) => env.AUTH_GOOGLE_ENABLED === true)
+  AUTH_GOOGLE_CALLBACK_URL: string;
+
+  // Storage
+  @IsEnum(StorageDriverType)
+  @IsOptional()
+  STORAGE_TYPE: StorageDriverType = StorageDriverType.Local;
+
+  @ValidateIf((env) => env.STORAGE_TYPE === StorageDriverType.S3)
+  @IsAWSRegion()
+  STORAGE_S3_REGION: AwsRegion;
+
+  @ValidateIf((env) => env.STORAGE_TYPE === StorageDriverType.S3)
+  @IsString()
+  STORAGE_S3_NAME: string;
+
+  @ValidateIf((env) => env.STORAGE_TYPE === StorageDriverType.S3)
+  @IsString()
+  @IsOptional()
+  STORAGE_S3_ENDPOINT: string;
+
+  @IsString()
+  @ValidateIf((env) => env.STORAGE_TYPE === StorageDriverType.Local)
+  STORAGE_LOCAL_PATH: string = '.local-storage';
+
+  // Support
+  @IsEnum(SupportDriver)
+  @IsOptional()
+  SUPPORT_DRIVER: SupportDriver = SupportDriver.None;
+
+  @ValidateIf((env) => env.SUPPORT_DRIVER === SupportDriver.Front)
+  @IsString()
+  SUPPORT_FRONT_CHAT_ID: string;
+
+  @ValidateIf((env) => env.SUPPORT_DRIVER === SupportDriver.Front)
+  @IsString()
+  SUPPORT_FRONT_HMAC_KEY: string;
+
+  @IsEnum(LoggerDriverType)
+  @IsOptional()
+  LOGGER_DRIVER: LoggerDriverType = LoggerDriverType.Console;
+
+  @CastToBoolean()
+  @IsBoolean()
+  @IsOptional()
+  LOGGER_IS_BUFFER_ENABLED: boolean = true;
+
+  @IsEnum(ExceptionHandlerDriver)
+  @IsOptional()
+  EXCEPTION_HANDLER_DRIVER: ExceptionHandlerDriver =
+    ExceptionHandlerDriver.Console;
+
+  @CastToLogLevelArray()
+  @IsOptional()
+  LOG_LEVELS: LogLevel[] = ['log', 'error', 'warn'];
+
+  @CastToStringArray()
+  @IsOptional()
+  DEMO_WORKSPACE_IDS: string[] = [];
+
+  @ValidateIf(
+    (env) => env.EXCEPTION_HANDLER_DRIVER === ExceptionHandlerDriver.Sentry,
+  )
+  @IsString()
+  SENTRY_DSN: string;
+
+  @ValidateIf(
+    (env) => env.EXCEPTION_HANDLER_DRIVER === ExceptionHandlerDriver.Sentry,
+  )
+  @IsString()
+  SENTRY_FRONT_DSN: string;
+
+  @ValidateIf(
+    (env) => env.EXCEPTION_HANDLER_DRIVER === ExceptionHandlerDriver.Sentry,
+  )
+  @IsString()
+  @IsOptional()
+  SENTRY_RELEASE: string;
+
+  @ValidateIf(
+    (env) => env.EXCEPTION_HANDLER_DRIVER === ExceptionHandlerDriver.Sentry,
+  )
+  @IsString()
+  @IsOptional()
+  SENTRY_ENVIRONMENT: string;
+
+  @IsDuration()
+  @IsOptional()
+  PASSWORD_RESET_TOKEN_EXPIRES_IN: string = '5m';
+
+  @CastToPositiveNumber()
+  @IsNumber()
+  @ValidateIf((env) => env.WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION > 0)
+  @IsStrictlyLowerThan('WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION', {
+    message:
+      '"WORKSPACE_INACTIVE_DAYS_BEFORE_NOTIFICATION" should be strictly lower that "WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION"',
+  })
+  @ValidateIf((env) => env.WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION > 0)
+  WORKSPACE_INACTIVE_DAYS_BEFORE_NOTIFICATION: number = 30;
+
+  @CastToPositiveNumber()
+  @IsNumber()
+  @ValidateIf((env) => env.WORKSPACE_INACTIVE_DAYS_BEFORE_NOTIFICATION > 0)
+  WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION: number = 60;
+
+  @CastToBoolean()
+  @IsOptional()
+  @IsBoolean()
+  IS_SIGN_UP_DISABLED: boolean = false;
+
+  @CastToPositiveNumber()
+  @IsOptional()
+  @IsNumber()
+  MUTATION_MAXIMUM_RECORD_AFFECTED: number = 100;
+
+  REDIS_HOST: string = '127.0.0.1';
+
+  @CastToPositiveNumber()
+  REDIS_PORT: number = 6379;
+
+  API_TOKEN_EXPIRES_IN: string = '100y';
+
+  SHORT_TERM_TOKEN_EXPIRES_IN: string = '5m';
+
+  @CastToBoolean()
+  MESSAGING_PROVIDER_GMAIL_ENABLED: boolean = false;
+
+  MESSAGE_QUEUE_TYPE: string = MessageQueueDriverType.Sync;
+
+  EMAIL_FROM_ADDRESS: string = 'noreply@yourdomain.com';
+
+  EMAIL_SYSTEM_ADDRESS: string = 'system@yourdomain.com';
+
+  EMAIL_FROM_NAME: string = 'Felix from Twenty';
+
+  EMAIL_DRIVER: EmailDriver = EmailDriver.Logger;
+
+  EMAIL_SMTP_HOST: string;
+
+  @CastToPositiveNumber()
+  EMAIL_SMTP_PORT: number = 587;
+
+  EMAIL_SMTP_USER: string;
+
+  EMAIL_SMTP_PASSWORD: string;
+
+  OPENROUTER_API_KEY: string;
+
+  @CastToPositiveNumber()
+  API_RATE_LIMITING_TTL: number = 100;
+
+  @CastToPositiveNumber()
+  API_RATE_LIMITING_LIMIT: number = 500;
+
+  CACHE_STORAGE_TYPE: string = 'memory';
+
+  @CastToPositiveNumber()
+  CACHE_STORAGE_TTL: number = 3600 * 24 * 7;
+
+  @CastToBoolean()
+  CALENDAR_PROVIDER_GOOGLE_ENABLED: boolean = false;
+
+  AUTH_GOOGLE_APIS_CALLBACK_URL: string;
+
+  CHROME_EXTENSION_REDIRECT_URL: string;
+}
+
+export const validate = (
+  config: Record<string, unknown>,
+): EnvironmentVariables => {
+  const validatedConfig = plainToClass(EnvironmentVariables, config);
+
+  const errors = validateSync(validatedConfig);
+
+  assert(!errors.length, errors.toString());
+
+  return validatedConfig;
+};
diff --git a/packages/twenty-server/src/integrations/environment/environment.module-definition.ts b/packages/twenty-server/src/engine/integrations/environment/environment.module-definition.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/environment/environment.module-definition.ts
rename to packages/twenty-server/src/engine/integrations/environment/environment.module-definition.ts
diff --git a/packages/twenty-server/src/integrations/environment/environment.module.ts b/packages/twenty-server/src/engine/integrations/environment/environment.module.ts
similarity index 90%
rename from packages/twenty-server/src/integrations/environment/environment.module.ts
rename to packages/twenty-server/src/engine/integrations/environment/environment.module.ts
index b116f17ffa62..c42fd6ee9780 100644
--- a/packages/twenty-server/src/integrations/environment/environment.module.ts
+++ b/packages/twenty-server/src/engine/integrations/environment/environment.module.ts
@@ -3,7 +3,7 @@ import { ConfigModule } from '@nestjs/config';
 
 import { EnvironmentService } from './environment.service';
 import { ConfigurableModuleClass } from './environment.module-definition';
-import { validate } from './environment.validation';
+import { validate } from './environment-variables';
 
 @Global()
 @Module({
diff --git a/packages/twenty-server/src/integrations/environment/environment.service.spec.ts b/packages/twenty-server/src/engine/integrations/environment/environment.service.spec.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/environment/environment.service.spec.ts
rename to packages/twenty-server/src/engine/integrations/environment/environment.service.spec.ts
diff --git a/packages/twenty-server/src/engine/integrations/environment/environment.service.ts b/packages/twenty-server/src/engine/integrations/environment/environment.service.ts
new file mode 100644
index 000000000000..8440249551fa
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/environment/environment.service.ts
@@ -0,0 +1,17 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+
+import { EnvironmentVariables } from 'src/engine/integrations/environment/environment-variables';
+
+@Injectable()
+export class EnvironmentService {
+  constructor(private readonly configService: ConfigService) {}
+
+  get<T extends keyof EnvironmentVariables>(key: T): EnvironmentVariables[T] {
+    return this.configService.get<EnvironmentVariables[T]>(
+      key,
+      new EnvironmentVariables()[key],
+    );
+  }
+}
diff --git a/packages/twenty-server/src/integrations/environment/interfaces/aws-region.interface.ts b/packages/twenty-server/src/engine/integrations/environment/interfaces/aws-region.interface.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/environment/interfaces/aws-region.interface.ts
rename to packages/twenty-server/src/engine/integrations/environment/interfaces/aws-region.interface.ts
diff --git a/packages/twenty-server/src/integrations/environment/interfaces/support.interface.ts b/packages/twenty-server/src/engine/integrations/environment/interfaces/support.interface.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/environment/interfaces/support.interface.ts
rename to packages/twenty-server/src/engine/integrations/environment/interfaces/support.interface.ts
diff --git a/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record-create.event.ts b/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record-create.event.ts
new file mode 100644
index 000000000000..3e72f4fa3151
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record-create.event.ts
@@ -0,0 +1,7 @@
+import { ObjectRecordBaseEvent } from 'src/engine/integrations/event-emitter/types/object-record.base.event';
+
+export class ObjectRecordCreateEvent<T> extends ObjectRecordBaseEvent {
+  details: {
+    after: T;
+  };
+}
diff --git a/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record-delete.event.ts b/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record-delete.event.ts
new file mode 100644
index 000000000000..b02f0a87b2c5
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record-delete.event.ts
@@ -0,0 +1,7 @@
+import { ObjectRecordBaseEvent } from 'src/engine/integrations/event-emitter/types/object-record.base.event';
+
+export class ObjectRecordDeleteEvent<T> extends ObjectRecordBaseEvent {
+  details: {
+    before: T;
+  };
+}
diff --git a/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record-update.event.ts b/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record-update.event.ts
new file mode 100644
index 000000000000..7f6dbfd04207
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record-update.event.ts
@@ -0,0 +1,9 @@
+import { ObjectRecordBaseEvent } from 'src/engine/integrations/event-emitter/types/object-record.base.event';
+
+export class ObjectRecordUpdateEvent<T> extends ObjectRecordBaseEvent {
+  details: {
+    before: T;
+    after: T;
+    diff?: Partial<T>;
+  };
+}
diff --git a/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record.base.event.ts b/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record.base.event.ts
new file mode 100644
index 000000000000..a82ed3e0a254
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record.base.event.ts
@@ -0,0 +1,9 @@
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+export class ObjectRecordBaseEvent {
+  workspaceId: string;
+  recordId: string;
+  userId?: string;
+  objectMetadata: ObjectMetadataInterface;
+  details: any;
+}
diff --git a/packages/twenty-server/src/engine/integrations/event-emitter/utils/__tests__/object-record-changed-values.spec.ts b/packages/twenty-server/src/engine/integrations/event-emitter/utils/__tests__/object-record-changed-values.spec.ts
new file mode 100644
index 000000000000..abe8dad89c92
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/event-emitter/utils/__tests__/object-record-changed-values.spec.ts
@@ -0,0 +1,65 @@
+import { objectRecordChangedValues } from 'src/engine/integrations/event-emitter/utils/object-record-changed-values';
+
+describe('objectRecordChangedValues', () => {
+  it('detects changes in scalar values correctly', () => {
+    const oldRecord = { id: 1, name: 'Original Name', updatedAt: new Date() };
+    const newRecord = { id: 1, name: 'Updated Name', updatedAt: new Date() };
+
+    const result = objectRecordChangedValues(oldRecord, newRecord);
+
+    expect(result).toEqual({
+      name: { before: 'Original Name', after: 'Updated Name' },
+    });
+  });
+});
+
+it('ignores changes in properties that are objects', () => {
+  const oldRecord = { id: 1, details: { age: 20 } };
+  const newRecord = { id: 1, details: { age: 21 } };
+
+  const result = objectRecordChangedValues(oldRecord, newRecord);
+
+  expect(result).toEqual({});
+});
+
+it('ignores changes to the updatedAt field', () => {
+  const oldRecord = { id: 1, updatedAt: new Date('2020-01-01') };
+  const newRecord = { id: 1, updatedAt: new Date('2024-01-01') };
+
+  const result = objectRecordChangedValues(oldRecord, newRecord);
+
+  expect(result).toEqual({});
+});
+
+it('returns an empty object when there are no changes', () => {
+  const oldRecord = { id: 1, name: 'Name', value: 100 };
+  const newRecord = { id: 1, name: 'Name', value: 100 };
+
+  const result = objectRecordChangedValues(oldRecord, newRecord);
+
+  expect(result).toEqual({});
+});
+
+it('correctly handles a mix of changed, unchanged, and special case values', () => {
+  const oldRecord = {
+    id: 1,
+    name: 'Original',
+    status: 'active',
+    updatedAt: new Date(2020, 1, 1),
+    config: { theme: 'dark' },
+  };
+  const newRecord = {
+    id: 1,
+    name: 'Updated',
+    status: 'active',
+    updatedAt: new Date(2021, 1, 1),
+    config: { theme: 'light' },
+  };
+  const expectedChanges = {
+    name: { before: 'Original', after: 'Updated' },
+  };
+
+  const result = objectRecordChangedValues(oldRecord, newRecord);
+
+  expect(result).toEqual(expectedChanges);
+});
diff --git a/packages/twenty-server/src/integrations/event-emitter/utils/object-record-changed-properties.util.ts b/packages/twenty-server/src/engine/integrations/event-emitter/utils/object-record-changed-properties.util.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/event-emitter/utils/object-record-changed-properties.util.ts
rename to packages/twenty-server/src/engine/integrations/event-emitter/utils/object-record-changed-properties.util.ts
diff --git a/packages/twenty-server/src/engine/integrations/event-emitter/utils/object-record-changed-values.ts b/packages/twenty-server/src/engine/integrations/event-emitter/utils/object-record-changed-values.ts
new file mode 100644
index 000000000000..99d82d2bf8bc
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/event-emitter/utils/object-record-changed-values.ts
@@ -0,0 +1,28 @@
+import deepEqual from 'deep-equal';
+
+export const objectRecordChangedValues = (
+  oldRecord: Record<string, any>,
+  newRecord: Record<string, any>,
+) => {
+  const isObject = (value: any) => {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+  };
+
+  const changedValues = Object.keys(newRecord).reduce(
+    (acc, key) => {
+      // Discard if values are objects (e.g. we don't want Company.AccountOwner ; we have AccountOwnerId already)
+      if (isObject(oldRecord[key]) || isObject(newRecord[key])) {
+        return acc;
+      }
+
+      if (!deepEqual(oldRecord[key], newRecord[key]) && key != 'updatedAt') {
+        acc[key] = { before: oldRecord[key], after: newRecord[key] };
+      }
+
+      return acc;
+    },
+    {} as Record<string, { before: any; after: any }>,
+  );
+
+  return changedValues;
+};
diff --git a/packages/twenty-server/src/engine/integrations/exception-handler/__tests__/exception-handler.service.spec.ts b/packages/twenty-server/src/engine/integrations/exception-handler/__tests__/exception-handler.service.spec.ts
new file mode 100644
index 000000000000..bae07ba64875
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/exception-handler/__tests__/exception-handler.service.spec.ts
@@ -0,0 +1,26 @@
+import { Test, TestingModule } from '@nestjs/testing';
+
+import { EXCEPTION_HANDLER_DRIVER } from 'src/engine/integrations/exception-handler/exception-handler.constants';
+import { ExceptionHandlerService } from 'src/engine/integrations/exception-handler/exception-handler.service';
+
+describe('ExceptionHandlerService', () => {
+  let service: ExceptionHandlerService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        ExceptionHandlerService,
+        {
+          provide: EXCEPTION_HANDLER_DRIVER,
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    service = module.get<ExceptionHandlerService>(ExceptionHandlerService);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/engine/integrations/exception-handler/drivers/console.driver.ts b/packages/twenty-server/src/engine/integrations/exception-handler/drivers/console.driver.ts
new file mode 100644
index 000000000000..9f60db644eb0
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/exception-handler/drivers/console.driver.ts
@@ -0,0 +1,27 @@
+import { ExceptionHandlerUser } from 'src/engine/integrations/exception-handler/interfaces/exception-handler-user.interface';
+import { ExceptionHandlerOptions } from 'src/engine/integrations/exception-handler/interfaces/exception-handler-options.interface';
+
+import { ExceptionHandlerDriverInterface } from 'src/engine/integrations/exception-handler/interfaces';
+
+export class ExceptionHandlerConsoleDriver
+  implements ExceptionHandlerDriverInterface
+{
+  captureExceptions(
+    exceptions: ReadonlyArray<any>,
+    options?: ExceptionHandlerOptions,
+  ) {
+    console.group('Exception Captured');
+    console.info(options);
+    console.error(exceptions);
+    console.groupEnd();
+
+    return [];
+  }
+
+  captureMessage(message: string, user?: ExceptionHandlerUser): void {
+    console.group('Message Captured');
+    console.info(user);
+    console.info(message);
+    console.groupEnd();
+  }
+}
diff --git a/packages/twenty-server/src/engine/integrations/exception-handler/drivers/sentry.driver.ts b/packages/twenty-server/src/engine/integrations/exception-handler/drivers/sentry.driver.ts
new file mode 100644
index 000000000000..1ece102d327b
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/exception-handler/drivers/sentry.driver.ts
@@ -0,0 +1,111 @@
+import * as Sentry from '@sentry/node';
+import { ProfilingIntegration } from '@sentry/profiling-node';
+
+import { ExceptionHandlerUser } from 'src/engine/integrations/exception-handler/interfaces/exception-handler-user.interface';
+import { ExceptionHandlerOptions } from 'src/engine/integrations/exception-handler/interfaces/exception-handler-options.interface';
+
+import {
+  ExceptionHandlerDriverInterface,
+  ExceptionHandlerSentryDriverFactoryOptions,
+} from 'src/engine/integrations/exception-handler/interfaces';
+
+export class ExceptionHandlerSentryDriver
+  implements ExceptionHandlerDriverInterface
+{
+  constructor(options: ExceptionHandlerSentryDriverFactoryOptions['options']) {
+    Sentry.init({
+      environment: options.environment,
+      release: options.release,
+      dsn: options.dsn,
+      integrations: [
+        new Sentry.Integrations.Http({ tracing: true }),
+        new Sentry.Integrations.Express({ app: options.serverInstance }),
+        new Sentry.Integrations.GraphQL(),
+        new Sentry.Integrations.Postgres(),
+        new ProfilingIntegration(),
+      ],
+      tracesSampleRate: 0.1,
+      profilesSampleRate: 0.3,
+      debug: options.debug,
+    });
+  }
+
+  captureExceptions(
+    exceptions: ReadonlyArray<any>,
+    options?: ExceptionHandlerOptions,
+  ) {
+    const eventIds: string[] = [];
+
+    Sentry.withScope((scope) => {
+      if (options?.operation) {
+        scope.setTag('operation', options.operation.name);
+        scope.setTag('operationName', options.operation.name);
+      }
+
+      if (options?.document) {
+        scope.setExtra('document', options.document);
+      }
+
+      if (options?.user) {
+        scope.setUser({
+          id: options.user.id,
+          email: options.user.email,
+          firstName: options.user.firstName,
+          lastName: options.user.lastName,
+          workspaceId: options.user.workspaceId,
+          workspaceDisplayName: options.user.workspaceDisplayName,
+        });
+      }
+
+      for (const exception of exceptions) {
+        const errorPath = (exception.path ?? [])
+          .map((v: string | number) => (typeof v === 'number' ? '$index' : v))
+          .join(' > ');
+
+        if (errorPath) {
+          scope.addBreadcrumb({
+            category: 'execution-path',
+            message: errorPath,
+            level: 'debug',
+          });
+        }
+
+        const eventId = Sentry.captureException(exception, {
+          fingerprint: [
+            'graphql',
+            errorPath,
+            options?.operation?.name,
+            options?.operation?.type,
+          ],
+          contexts: {
+            GraphQL: {
+              operationName: options?.operation?.name,
+              operationType: options?.operation?.type,
+            },
+          },
+        });
+
+        eventIds.push(eventId);
+      }
+    });
+
+    return eventIds;
+  }
+
+  captureMessage(message: string, user?: ExceptionHandlerUser) {
+    Sentry.captureMessage(message, (scope) => {
+      if (user) {
+        scope.setUser({
+          id: user.id,
+          email: user.email,
+          firstName: user.firstName,
+          lastName: user.lastName,
+          workspaceId: user.workspaceId,
+          workspaceDisplayName: user.workspaceDisplayName,
+        });
+      }
+
+      return scope;
+    });
+  }
+}
diff --git a/packages/twenty-server/src/integrations/exception-handler/exception-handler.constants.ts b/packages/twenty-server/src/engine/integrations/exception-handler/exception-handler.constants.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/exception-handler/exception-handler.constants.ts
rename to packages/twenty-server/src/engine/integrations/exception-handler/exception-handler.constants.ts
diff --git a/packages/twenty-server/src/integrations/exception-handler/exception-handler.module-definition.ts b/packages/twenty-server/src/engine/integrations/exception-handler/exception-handler.module-definition.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/exception-handler/exception-handler.module-definition.ts
rename to packages/twenty-server/src/engine/integrations/exception-handler/exception-handler.module-definition.ts
diff --git a/packages/twenty-server/src/engine/integrations/exception-handler/exception-handler.module-factory.ts b/packages/twenty-server/src/engine/integrations/exception-handler/exception-handler.module-factory.ts
new file mode 100644
index 000000000000..3b08ab93aeea
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/exception-handler/exception-handler.module-factory.ts
@@ -0,0 +1,41 @@
+import { HttpAdapterHost } from '@nestjs/core';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { OPTIONS_TYPE } from 'src/engine/integrations/exception-handler/exception-handler.module-definition';
+import { ExceptionHandlerDriver } from 'src/engine/integrations/exception-handler/interfaces';
+
+/**
+ * ExceptionHandler Module factory
+ * @param environment
+ * @returns ExceptionHandlerModuleOptions
+ */
+export const exceptionHandlerModuleFactory = async (
+  environmentService: EnvironmentService,
+  adapterHost: HttpAdapterHost,
+): Promise<typeof OPTIONS_TYPE> => {
+  const driverType = environmentService.get('EXCEPTION_HANDLER_DRIVER');
+
+  switch (driverType) {
+    case ExceptionHandlerDriver.Console: {
+      return {
+        type: ExceptionHandlerDriver.Console,
+      };
+    }
+    case ExceptionHandlerDriver.Sentry: {
+      return {
+        type: ExceptionHandlerDriver.Sentry,
+        options: {
+          environment: environmentService.get('SENTRY_ENVIRONMENT'),
+          release: environmentService.get('SENTRY_RELEASE'),
+          dsn: environmentService.get('SENTRY_DSN') ?? '',
+          serverInstance: adapterHost.httpAdapter?.getInstance(),
+          debug: environmentService.get('DEBUG_MODE'),
+        },
+      };
+    }
+    default:
+      throw new Error(
+        `Invalid exception capturer driver type (${driverType}), check your .env file`,
+      );
+  }
+};
diff --git a/packages/twenty-server/src/integrations/exception-handler/exception-handler.module.ts b/packages/twenty-server/src/engine/integrations/exception-handler/exception-handler.module.ts
similarity index 88%
rename from packages/twenty-server/src/integrations/exception-handler/exception-handler.module.ts
rename to packages/twenty-server/src/engine/integrations/exception-handler/exception-handler.module.ts
index e1221bcd2cb0..8c4ae87a8312 100644
--- a/packages/twenty-server/src/integrations/exception-handler/exception-handler.module.ts
+++ b/packages/twenty-server/src/engine/integrations/exception-handler/exception-handler.module.ts
@@ -1,7 +1,7 @@
 import { DynamicModule, Global, Module } from '@nestjs/common';
 
-import { ExceptionHandlerSentryDriver } from 'src/integrations/exception-handler/drivers/sentry.driver';
-import { ExceptionHandlerConsoleDriver } from 'src/integrations/exception-handler/drivers/console.driver';
+import { ExceptionHandlerSentryDriver } from 'src/engine/integrations/exception-handler/drivers/sentry.driver';
+import { ExceptionHandlerConsoleDriver } from 'src/engine/integrations/exception-handler/drivers/console.driver';
 
 import { ExceptionHandlerService } from './exception-handler.service';
 import { ExceptionHandlerDriver } from './interfaces';
diff --git a/packages/twenty-server/src/engine/integrations/exception-handler/exception-handler.service.ts b/packages/twenty-server/src/engine/integrations/exception-handler/exception-handler.service.ts
new file mode 100644
index 000000000000..ac46ae3465de
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/exception-handler/exception-handler.service.ts
@@ -0,0 +1,21 @@
+import { Inject, Injectable } from '@nestjs/common';
+
+import { ExceptionHandlerOptions } from 'src/engine/integrations/exception-handler/interfaces/exception-handler-options.interface';
+
+import { ExceptionHandlerDriverInterface } from 'src/engine/integrations/exception-handler/interfaces';
+import { EXCEPTION_HANDLER_DRIVER } from 'src/engine/integrations/exception-handler/exception-handler.constants';
+
+@Injectable()
+export class ExceptionHandlerService {
+  constructor(
+    @Inject(EXCEPTION_HANDLER_DRIVER)
+    private driver: ExceptionHandlerDriverInterface,
+  ) {}
+
+  captureExceptions(
+    exceptions: ReadonlyArray<any>,
+    options?: ExceptionHandlerOptions,
+  ): string[] {
+    return this.driver.captureExceptions(exceptions, options);
+  }
+}
diff --git a/packages/twenty-server/src/integrations/exception-handler/hooks/use-exception-handler.hook.ts b/packages/twenty-server/src/engine/integrations/exception-handler/hooks/use-exception-handler.hook.ts
similarity index 79%
rename from packages/twenty-server/src/integrations/exception-handler/hooks/use-exception-handler.hook.ts
rename to packages/twenty-server/src/engine/integrations/exception-handler/hooks/use-exception-handler.hook.ts
index f258d1666b4f..c358bc391f0c 100644
--- a/packages/twenty-server/src/integrations/exception-handler/hooks/use-exception-handler.hook.ts
+++ b/packages/twenty-server/src/engine/integrations/exception-handler/hooks/use-exception-handler.hook.ts
@@ -6,13 +6,13 @@ import {
   Plugin,
 } from '@envelop/core';
 
-import { GraphQLContext } from 'src/graphql-config/interfaces/graphql-context.interface';
+import { GraphQLContext } from 'src/engine/api/graphql/graphql-config/interfaces/graphql-context.interface';
 
-import { ExceptionHandlerService } from 'src/integrations/exception-handler/exception-handler.service';
+import { ExceptionHandlerService } from 'src/engine/integrations/exception-handler/exception-handler.service';
 import {
   convertExceptionToGraphQLError,
   filterException,
-} from 'src/filters/utils/global-exception-handler.util';
+} from 'src/engine/utils/global-exception-handler.util';
 
 export type ExceptionHandlerPluginOptions = {
   /**
@@ -49,7 +49,7 @@ export const useExceptionHandler = <PluginContext extends GraphQLContext>(
         (o) => o.kind === Kind.OPERATION_DEFINITION,
       ) as OperationDefinitionNode;
       const operationType = rootOperation.operation;
-      const user = args.contextValue.user;
+      const user = args.contextValue.req.user;
       const document = getDocumentString(args.document, print);
       const opName =
         args.operationName ||
@@ -125,5 +125,24 @@ export const useExceptionHandler = <PluginContext extends GraphQLContext>(
         },
       };
     },
+    onValidate: ({ context, validateFn, params: { documentAST, schema } }) => {
+      const errors = validateFn(schema, documentAST);
+
+      if (Array.isArray(errors) && errors.length > 0) {
+        const headers = context.req.headers;
+        const currentSchemaVersion = context.req.cacheVersion;
+
+        const requestSchemaVersion = headers['x-schema-version'];
+
+        if (
+          requestSchemaVersion &&
+          requestSchemaVersion !== currentSchemaVersion
+        ) {
+          throw new GraphQLError(
+            `Schema version mismatch, please refresh the page.`,
+          );
+        }
+      }
+    },
   };
 };
diff --git a/packages/twenty-server/src/engine/integrations/exception-handler/hooks/use-sentry-tracing.ts b/packages/twenty-server/src/engine/integrations/exception-handler/hooks/use-sentry-tracing.ts
new file mode 100644
index 000000000000..3db35cca3abf
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/exception-handler/hooks/use-sentry-tracing.ts
@@ -0,0 +1,57 @@
+import * as Sentry from '@sentry/node';
+import {
+  handleStreamOrSingleExecutionResult,
+  Plugin,
+  getDocumentString,
+} from '@envelop/core';
+import { OperationDefinitionNode, Kind, print } from 'graphql';
+
+import { GraphQLContext } from 'src/engine/api/graphql/graphql-config/graphql-config.service';
+
+export const useSentryTracing = <
+  PluginContext extends GraphQLContext,
+>(): Plugin<PluginContext> => {
+  return {
+    onExecute({ args }) {
+      const transactionName = args.operationName || 'Anonymous Operation';
+      const rootOperation = args.document.definitions.find(
+        (o) => o.kind === Kind.OPERATION_DEFINITION,
+      ) as OperationDefinitionNode;
+      const operationType = rootOperation.operation;
+
+      const user = args.contextValue.user;
+      const workspace = args.contextValue.workspace;
+      const document = getDocumentString(args.document, print);
+
+      Sentry.setTags({
+        operationName: transactionName,
+        operation: operationType,
+      });
+
+      const scope = Sentry.getCurrentScope();
+
+      scope.setTransactionName(transactionName);
+
+      if (user) {
+        scope.setUser({
+          id: user.id,
+          email: user.email,
+          firstName: user.firstName,
+          lastName: user.lastName,
+          workspaceId: workspace?.id,
+          workspaceDisplayName: workspace?.displayName,
+        });
+      }
+
+      if (document) {
+        scope.setExtra('document', document);
+      }
+
+      return {
+        onExecuteDone(payload) {
+          return handleStreamOrSingleExecutionResult(payload, () => {});
+        },
+      };
+    },
+  };
+};
diff --git a/packages/twenty-server/src/integrations/exception-handler/interfaces/exception-handler-driver.interface.ts b/packages/twenty-server/src/engine/integrations/exception-handler/interfaces/exception-handler-driver.interface.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/exception-handler/interfaces/exception-handler-driver.interface.ts
rename to packages/twenty-server/src/engine/integrations/exception-handler/interfaces/exception-handler-driver.interface.ts
diff --git a/packages/twenty-server/src/integrations/exception-handler/interfaces/exception-handler-options.interface.ts b/packages/twenty-server/src/engine/integrations/exception-handler/interfaces/exception-handler-options.interface.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/exception-handler/interfaces/exception-handler-options.interface.ts
rename to packages/twenty-server/src/engine/integrations/exception-handler/interfaces/exception-handler-options.interface.ts
diff --git a/packages/twenty-server/src/engine/integrations/exception-handler/interfaces/exception-handler-user.interface.ts b/packages/twenty-server/src/engine/integrations/exception-handler/interfaces/exception-handler-user.interface.ts
new file mode 100644
index 000000000000..ddfc61033864
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/exception-handler/interfaces/exception-handler-user.interface.ts
@@ -0,0 +1,8 @@
+export interface ExceptionHandlerUser {
+  id?: string;
+  email?: string;
+  firstName?: string;
+  lastName?: string;
+  workspaceId?: string;
+  workspaceDisplayName?: string;
+}
diff --git a/packages/twenty-server/src/integrations/exception-handler/interfaces/exception-handler.interface.ts b/packages/twenty-server/src/engine/integrations/exception-handler/interfaces/exception-handler.interface.ts
similarity index 91%
rename from packages/twenty-server/src/integrations/exception-handler/interfaces/exception-handler.interface.ts
rename to packages/twenty-server/src/engine/integrations/exception-handler/interfaces/exception-handler.interface.ts
index 9a38b1d679b2..431cbe4b9868 100644
--- a/packages/twenty-server/src/integrations/exception-handler/interfaces/exception-handler.interface.ts
+++ b/packages/twenty-server/src/engine/integrations/exception-handler/interfaces/exception-handler.interface.ts
@@ -8,6 +8,8 @@ export enum ExceptionHandlerDriver {
 export interface ExceptionHandlerSentryDriverFactoryOptions {
   type: ExceptionHandlerDriver.Sentry;
   options: {
+    environment?: string;
+    release?: string;
     dsn: string;
     serverInstance?: Router;
     debug?: boolean;
diff --git a/packages/twenty-server/src/integrations/exception-handler/interfaces/index.ts b/packages/twenty-server/src/engine/integrations/exception-handler/interfaces/index.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/exception-handler/interfaces/index.ts
rename to packages/twenty-server/src/engine/integrations/exception-handler/interfaces/index.ts
diff --git a/packages/twenty-server/src/engine/integrations/file-storage/__tests__/file-storage.service.spec.ts b/packages/twenty-server/src/engine/integrations/file-storage/__tests__/file-storage.service.spec.ts
new file mode 100644
index 000000000000..4ef268cf6ca5
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/file-storage/__tests__/file-storage.service.spec.ts
@@ -0,0 +1,26 @@
+import { Test, TestingModule } from '@nestjs/testing';
+
+import { STORAGE_DRIVER } from 'src/engine/integrations/file-storage/file-storage.constants';
+import { FileStorageService } from 'src/engine/integrations/file-storage/file-storage.service';
+
+describe('FileStorageService', () => {
+  let service: FileStorageService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        FileStorageService,
+        {
+          provide: STORAGE_DRIVER,
+          useValue: {},
+        },
+      ],
+    }).compile();
+
+    service = module.get<FileStorageService>(FileStorageService);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});
diff --git a/packages/twenty-server/src/integrations/file-storage/drivers/interfaces/storage-driver.interface.ts b/packages/twenty-server/src/engine/integrations/file-storage/drivers/interfaces/storage-driver.interface.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/file-storage/drivers/interfaces/storage-driver.interface.ts
rename to packages/twenty-server/src/engine/integrations/file-storage/drivers/interfaces/storage-driver.interface.ts
diff --git a/packages/twenty-server/src/integrations/file-storage/drivers/local.driver.ts b/packages/twenty-server/src/engine/integrations/file-storage/drivers/local.driver.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/file-storage/drivers/local.driver.ts
rename to packages/twenty-server/src/engine/integrations/file-storage/drivers/local.driver.ts
diff --git a/packages/twenty-server/src/integrations/file-storage/drivers/s3.driver.ts b/packages/twenty-server/src/engine/integrations/file-storage/drivers/s3.driver.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/file-storage/drivers/s3.driver.ts
rename to packages/twenty-server/src/engine/integrations/file-storage/drivers/s3.driver.ts
diff --git a/packages/twenty-server/src/integrations/file-storage/file-storage.constants.ts b/packages/twenty-server/src/engine/integrations/file-storage/file-storage.constants.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/file-storage/file-storage.constants.ts
rename to packages/twenty-server/src/engine/integrations/file-storage/file-storage.constants.ts
diff --git a/packages/twenty-server/src/integrations/file-storage/file-storage.module-definition.ts b/packages/twenty-server/src/engine/integrations/file-storage/file-storage.module-definition.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/file-storage/file-storage.module-definition.ts
rename to packages/twenty-server/src/engine/integrations/file-storage/file-storage.module-definition.ts
diff --git a/packages/twenty-server/src/engine/integrations/file-storage/file-storage.module-factory.ts b/packages/twenty-server/src/engine/integrations/file-storage/file-storage.module-factory.ts
new file mode 100644
index 000000000000..fc625ce89ee2
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/file-storage/file-storage.module-factory.ts
@@ -0,0 +1,53 @@
+import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import {
+  FileStorageModuleOptions,
+  StorageDriverType,
+} from 'src/engine/integrations/file-storage/interfaces';
+
+/**
+ * FileStorage Module factory
+ * @param environment
+ * @returns FileStorageModuleOptions
+ */
+export const fileStorageModuleFactory = async (
+  environmentService: EnvironmentService,
+): Promise<FileStorageModuleOptions> => {
+  const driverType = environmentService.get('STORAGE_TYPE');
+
+  switch (driverType) {
+    case StorageDriverType.Local: {
+      const storagePath = environmentService.get('STORAGE_LOCAL_PATH');
+
+      return {
+        type: StorageDriverType.Local,
+        options: {
+          storagePath: process.cwd() + '/' + storagePath,
+        },
+      };
+    }
+    case StorageDriverType.S3: {
+      const bucketName = environmentService.get('STORAGE_S3_NAME');
+      const endpoint = environmentService.get('STORAGE_S3_ENDPOINT');
+      const region = environmentService.get('STORAGE_S3_REGION');
+
+      return {
+        type: StorageDriverType.S3,
+        options: {
+          bucketName: bucketName ?? '',
+          endpoint: endpoint,
+          credentials: fromNodeProviderChain({
+            clientConfig: { region },
+          }),
+          forcePathStyle: true,
+          region: region ?? '',
+        },
+      };
+    }
+    default:
+      throw new Error(
+        `Invalid storage driver type (${driverType}), check your .env file`,
+      );
+  }
+};
diff --git a/packages/twenty-server/src/integrations/file-storage/file-storage.module.ts b/packages/twenty-server/src/engine/integrations/file-storage/file-storage.module.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/file-storage/file-storage.module.ts
rename to packages/twenty-server/src/engine/integrations/file-storage/file-storage.module.ts
diff --git a/packages/twenty-server/src/integrations/file-storage/file-storage.service.ts b/packages/twenty-server/src/engine/integrations/file-storage/file-storage.service.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/file-storage/file-storage.service.ts
rename to packages/twenty-server/src/engine/integrations/file-storage/file-storage.service.ts
diff --git a/packages/twenty-server/src/integrations/file-storage/interfaces/file-storage.interface.ts b/packages/twenty-server/src/engine/integrations/file-storage/interfaces/file-storage.interface.ts
similarity index 78%
rename from packages/twenty-server/src/integrations/file-storage/interfaces/file-storage.interface.ts
rename to packages/twenty-server/src/engine/integrations/file-storage/interfaces/file-storage.interface.ts
index 81151323a7c6..9d85a83ec554 100644
--- a/packages/twenty-server/src/integrations/file-storage/interfaces/file-storage.interface.ts
+++ b/packages/twenty-server/src/engine/integrations/file-storage/interfaces/file-storage.interface.ts
@@ -1,7 +1,7 @@
 import { FactoryProvider, ModuleMetadata } from '@nestjs/common';
 
-import { S3DriverOptions } from 'src/integrations/file-storage/drivers/s3.driver';
-import { LocalDriverOptions } from 'src/integrations/file-storage/drivers/local.driver';
+import { S3DriverOptions } from 'src/engine/integrations/file-storage/drivers/s3.driver';
+import { LocalDriverOptions } from 'src/engine/integrations/file-storage/drivers/local.driver';
 
 export enum StorageDriverType {
   S3 = 's3',
diff --git a/packages/twenty-server/src/integrations/file-storage/interfaces/index.ts b/packages/twenty-server/src/engine/integrations/file-storage/interfaces/index.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/file-storage/interfaces/index.ts
rename to packages/twenty-server/src/engine/integrations/file-storage/interfaces/index.ts
diff --git a/packages/twenty-server/src/engine/integrations/integrations.module.ts b/packages/twenty-server/src/engine/integrations/integrations.module.ts
new file mode 100644
index 000000000000..0f056fdf9e2f
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/integrations.module.ts
@@ -0,0 +1,51 @@
+import { Module } from '@nestjs/common';
+import { HttpAdapterHost } from '@nestjs/core';
+import { EventEmitterModule } from '@nestjs/event-emitter';
+
+import { ExceptionHandlerModule } from 'src/engine/integrations/exception-handler/exception-handler.module';
+import { exceptionHandlerModuleFactory } from 'src/engine/integrations/exception-handler/exception-handler.module-factory';
+import { fileStorageModuleFactory } from 'src/engine/integrations/file-storage/file-storage.module-factory';
+import { loggerModuleFactory } from 'src/engine/integrations/logger/logger.module-factory';
+import { messageQueueModuleFactory } from 'src/engine/integrations/message-queue/message-queue.module-factory';
+import { EmailModule } from 'src/engine/integrations/email/email.module';
+import { emailModuleFactory } from 'src/engine/integrations/email/email.module-factory';
+import { CacheStorageModule } from 'src/engine/integrations/cache-storage/cache-storage.module';
+
+import { EnvironmentModule } from './environment/environment.module';
+import { EnvironmentService } from './environment/environment.service';
+import { FileStorageModule } from './file-storage/file-storage.module';
+import { LoggerModule } from './logger/logger.module';
+import { MessageQueueModule } from './message-queue/message-queue.module';
+
+@Module({
+  imports: [
+    EnvironmentModule.forRoot({}),
+    FileStorageModule.forRootAsync({
+      useFactory: fileStorageModuleFactory,
+      inject: [EnvironmentService],
+    }),
+    LoggerModule.forRootAsync({
+      useFactory: loggerModuleFactory,
+      inject: [EnvironmentService],
+    }),
+    MessageQueueModule.forRoot({
+      useFactory: messageQueueModuleFactory,
+      inject: [EnvironmentService],
+    }),
+    ExceptionHandlerModule.forRootAsync({
+      useFactory: exceptionHandlerModuleFactory,
+      inject: [EnvironmentService, HttpAdapterHost],
+    }),
+    EmailModule.forRoot({
+      useFactory: emailModuleFactory,
+      inject: [EnvironmentService],
+    }),
+    EventEmitterModule.forRoot({
+      wildcard: true,
+    }),
+    CacheStorageModule,
+  ],
+  exports: [],
+  providers: [],
+})
+export class IntegrationsModule {}
diff --git a/packages/twenty-server/src/integrations/logger/logger.service.spec.ts b/packages/twenty-server/src/engine/integrations/logger/__tests__/logger.service.spec.ts
similarity index 76%
rename from packages/twenty-server/src/integrations/logger/logger.service.spec.ts
rename to packages/twenty-server/src/engine/integrations/logger/__tests__/logger.service.spec.ts
index 319e2a46d8bf..b5d6f94c897e 100644
--- a/packages/twenty-server/src/integrations/logger/logger.service.spec.ts
+++ b/packages/twenty-server/src/engine/integrations/logger/__tests__/logger.service.spec.ts
@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { LoggerService } from './logger.service';
-import { LOGGER_DRIVER } from './logger.constants';
+import { LOGGER_DRIVER } from 'src/engine/integrations/logger/logger.constants';
+import { LoggerService } from 'src/engine/integrations/logger/logger.service';
 
 describe('LoggerService', () => {
   let service: LoggerService;
diff --git a/packages/twenty-server/src/integrations/logger/interfaces/index.ts b/packages/twenty-server/src/engine/integrations/logger/interfaces/index.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/logger/interfaces/index.ts
rename to packages/twenty-server/src/engine/integrations/logger/interfaces/index.ts
diff --git a/packages/twenty-server/src/integrations/logger/interfaces/logger.interface.ts b/packages/twenty-server/src/engine/integrations/logger/interfaces/logger.interface.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/logger/interfaces/logger.interface.ts
rename to packages/twenty-server/src/engine/integrations/logger/interfaces/logger.interface.ts
diff --git a/packages/twenty-server/src/integrations/logger/logger.constants.ts b/packages/twenty-server/src/engine/integrations/logger/logger.constants.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/logger/logger.constants.ts
rename to packages/twenty-server/src/engine/integrations/logger/logger.constants.ts
diff --git a/packages/twenty-server/src/integrations/logger/logger.module-definition.ts b/packages/twenty-server/src/engine/integrations/logger/logger.module-definition.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/logger/logger.module-definition.ts
rename to packages/twenty-server/src/engine/integrations/logger/logger.module-definition.ts
diff --git a/packages/twenty-server/src/engine/integrations/logger/logger.module-factory.ts b/packages/twenty-server/src/engine/integrations/logger/logger.module-factory.ts
new file mode 100644
index 000000000000..93701802a68a
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/logger/logger.module-factory.ts
@@ -0,0 +1,30 @@
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import {
+  LoggerModuleOptions,
+  LoggerDriverType,
+} from 'src/engine/integrations/logger/interfaces';
+
+/**
+ * Logger Module factory
+ * @param environment
+ * @returns LoggerModuleOptions
+ */
+export const loggerModuleFactory = async (
+  environmentService: EnvironmentService,
+): Promise<LoggerModuleOptions> => {
+  const driverType = environmentService.get('LOGGER_DRIVER');
+  const logLevels = environmentService.get('LOG_LEVELS');
+
+  switch (driverType) {
+    case LoggerDriverType.Console: {
+      return {
+        type: LoggerDriverType.Console,
+        logLevels: logLevels,
+      };
+    }
+    default:
+      throw new Error(
+        `Invalid logger driver type (${driverType}), check your .env file`,
+      );
+  }
+};
diff --git a/packages/twenty-server/src/integrations/logger/logger.module.ts b/packages/twenty-server/src/engine/integrations/logger/logger.module.ts
similarity index 95%
rename from packages/twenty-server/src/integrations/logger/logger.module.ts
rename to packages/twenty-server/src/engine/integrations/logger/logger.module.ts
index 1cd4a4ed8b67..778dbbf54d1a 100644
--- a/packages/twenty-server/src/integrations/logger/logger.module.ts
+++ b/packages/twenty-server/src/engine/integrations/logger/logger.module.ts
@@ -1,6 +1,6 @@
 import { DynamicModule, Global, ConsoleLogger, Module } from '@nestjs/common';
 
-import { LoggerDriverType } from 'src/integrations/logger/interfaces';
+import { LoggerDriverType } from 'src/engine/integrations/logger/interfaces';
 
 import { LoggerService } from './logger.service';
 import { LOGGER_DRIVER } from './logger.constants';
diff --git a/packages/twenty-server/src/integrations/logger/logger.service.ts b/packages/twenty-server/src/engine/integrations/logger/logger.service.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/logger/logger.service.ts
rename to packages/twenty-server/src/engine/integrations/logger/logger.service.ts
diff --git a/packages/twenty-server/src/engine/integrations/message-queue/decorators/message-queue.decorator.ts b/packages/twenty-server/src/engine/integrations/message-queue/decorators/message-queue.decorator.ts
new file mode 100644
index 000000000000..69fa50ad5ef7
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/message-queue/decorators/message-queue.decorator.ts
@@ -0,0 +1,7 @@
+import { Inject } from '@nestjs/common';
+
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+
+export const InjectMessageQueue = (messageQueueName: MessageQueue) => {
+  return Inject(messageQueueName);
+};
diff --git a/packages/twenty-server/src/integrations/message-queue/drivers/bullmq.driver.ts b/packages/twenty-server/src/engine/integrations/message-queue/drivers/bullmq.driver.ts
similarity index 88%
rename from packages/twenty-server/src/integrations/message-queue/drivers/bullmq.driver.ts
rename to packages/twenty-server/src/engine/integrations/message-queue/drivers/bullmq.driver.ts
index 0ea7857de2e4..be282e726640 100644
--- a/packages/twenty-server/src/integrations/message-queue/drivers/bullmq.driver.ts
+++ b/packages/twenty-server/src/engine/integrations/message-queue/drivers/bullmq.driver.ts
@@ -1,8 +1,11 @@
 import { Queue, QueueOptions, Worker } from 'bullmq';
 
-import { QueueJobOptions } from 'src/integrations/message-queue/drivers/interfaces/job-options.interface';
+import {
+  QueueCronJobOptions,
+  QueueJobOptions,
+} from 'src/engine/integrations/message-queue/drivers/interfaces/job-options.interface';
 
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 
 import { MessageQueueDriver } from './interfaces/message-queue-driver.interface';
 
@@ -53,8 +56,7 @@ export class BullMQDriver implements MessageQueueDriver {
     queueName: MessageQueue,
     jobName: string,
     data: T,
-    pattern: string,
-    options?: QueueJobOptions,
+    options?: QueueCronJobOptions,
   ): Promise<void> {
     if (!this.queueMap[queueName]) {
       throw new Error(
@@ -64,9 +66,7 @@ export class BullMQDriver implements MessageQueueDriver {
     const queueOptions = {
       jobId: options?.id,
       priority: options?.priority,
-      repeat: {
-        pattern,
-      },
+      repeat: options?.repeat,
     };
 
     await this.queueMap[queueName].add(jobName, data, queueOptions);
diff --git a/packages/twenty-server/src/engine/integrations/message-queue/drivers/interfaces/job-options.interface.ts b/packages/twenty-server/src/engine/integrations/message-queue/drivers/interfaces/job-options.interface.ts
new file mode 100644
index 000000000000..f475ec2c4948
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/message-queue/drivers/interfaces/job-options.interface.ts
@@ -0,0 +1,13 @@
+export interface QueueJobOptions {
+  id?: string;
+  priority?: number;
+  retryLimit?: number;
+}
+
+export interface QueueCronJobOptions extends QueueJobOptions {
+  repeat?: {
+    every?: number;
+    pattern?: string;
+    limit?: number;
+  };
+}
diff --git a/packages/twenty-server/src/engine/integrations/message-queue/drivers/interfaces/message-queue-driver.interface.ts b/packages/twenty-server/src/engine/integrations/message-queue/drivers/interfaces/message-queue-driver.interface.ts
new file mode 100644
index 000000000000..cdd30913f439
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/message-queue/drivers/interfaces/message-queue-driver.interface.ts
@@ -0,0 +1,29 @@
+import {
+  QueueCronJobOptions,
+  QueueJobOptions,
+} from 'src/engine/integrations/message-queue/drivers/interfaces/job-options.interface';
+import { MessageQueueJobData } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+
+export interface MessageQueueDriver {
+  add<T extends MessageQueueJobData>(
+    queueName: MessageQueue,
+    jobName: string,
+    data: T,
+    options?: QueueJobOptions,
+  ): Promise<void>;
+  work<T extends MessageQueueJobData>(
+    queueName: MessageQueue,
+    handler: ({ data, id }: { data: T; id: string }) => Promise<void> | void,
+  );
+  addCron<T extends MessageQueueJobData | undefined>(
+    queueName: MessageQueue,
+    jobName: string,
+    data: T,
+    options?: QueueCronJobOptions,
+  );
+  removeCron(queueName: MessageQueue, jobName: string, pattern?: string);
+  stop?(): Promise<void>;
+  register?(queueName: MessageQueue): void;
+}
diff --git a/packages/twenty-server/src/integrations/message-queue/drivers/pg-boss.driver.ts b/packages/twenty-server/src/engine/integrations/message-queue/drivers/pg-boss.driver.ts
similarity index 76%
rename from packages/twenty-server/src/integrations/message-queue/drivers/pg-boss.driver.ts
rename to packages/twenty-server/src/engine/integrations/message-queue/drivers/pg-boss.driver.ts
index fc306b6f4112..5210593c3ff0 100644
--- a/packages/twenty-server/src/integrations/message-queue/drivers/pg-boss.driver.ts
+++ b/packages/twenty-server/src/engine/integrations/message-queue/drivers/pg-boss.driver.ts
@@ -1,13 +1,18 @@
 import PgBoss from 'pg-boss';
 
-import { QueueJobOptions } from 'src/integrations/message-queue/drivers/interfaces/job-options.interface';
+import {
+  QueueCronJobOptions,
+  QueueJobOptions,
+} from 'src/engine/integrations/message-queue/drivers/interfaces/job-options.interface';
 
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 
 import { MessageQueueDriver } from './interfaces/message-queue-driver.interface';
 
 export type PgBossDriverOptions = PgBoss.ConstructorOptions;
 
+const DEFAULT_PG_BOSS_CRON_PATTERN_WHEN_NOT_PROVIDED = '*/1 * * * *';
+
 export class PgBossDriver implements MessageQueueDriver {
   private pgBoss: PgBoss;
 
@@ -34,16 +39,15 @@ export class PgBossDriver implements MessageQueueDriver {
     queueName: MessageQueue,
     jobName: string,
     data: T,
-    pattern: string,
-    options?: QueueJobOptions,
+    options?: QueueCronJobOptions,
   ): Promise<void> {
     await this.pgBoss.schedule(
       `${queueName}.${jobName}`,
-      pattern,
+      options?.repeat?.pattern ??
+        DEFAULT_PG_BOSS_CRON_PATTERN_WHEN_NOT_PROVIDED,
       data as object,
       options
         ? {
-            ...options,
             singletonKey: options?.id,
           }
         : {},
diff --git a/packages/twenty-server/src/engine/integrations/message-queue/drivers/sync.driver.ts b/packages/twenty-server/src/engine/integrations/message-queue/drivers/sync.driver.ts
new file mode 100644
index 000000000000..d432e1d22235
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/message-queue/drivers/sync.driver.ts
@@ -0,0 +1,57 @@
+import { ModuleRef } from '@nestjs/core';
+import { Logger } from '@nestjs/common';
+
+import { MessageQueueDriver } from 'src/engine/integrations/message-queue/drivers/interfaces/message-queue-driver.interface';
+import {
+  MessageQueueCronJobData,
+  MessageQueueJob,
+  MessageQueueJobData,
+} from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { getJobClassName } from 'src/engine/integrations/message-queue/utils/get-job-class-name.util';
+
+export class SyncDriver implements MessageQueueDriver {
+  private readonly logger = new Logger(SyncDriver.name);
+  constructor(private readonly jobsModuleRef: ModuleRef) {}
+
+  async add<T extends MessageQueueJobData>(
+    _queueName: MessageQueue,
+    jobName: string,
+    data: T,
+  ): Promise<void> {
+    const jobClassName = getJobClassName(jobName);
+    const job: MessageQueueJob<MessageQueueJobData> = this.jobsModuleRef.get(
+      jobClassName,
+      { strict: true },
+    );
+
+    await job.handle(data);
+  }
+
+  async addCron<T extends MessageQueueJobData | undefined>(
+    _queueName: MessageQueue,
+    jobName: string,
+    data: T,
+  ): Promise<void> {
+    this.logger.log(`Running cron job with SyncDriver`);
+
+    const jobClassName = getJobClassName(jobName);
+    const job: MessageQueueCronJobData<MessageQueueJobData | undefined> =
+      this.jobsModuleRef.get(jobClassName, {
+        strict: true,
+      });
+
+    await job.handle(data);
+  }
+
+  async removeCron(_queueName: MessageQueue, jobName: string) {
+    this.logger.log(`Removing '${jobName}' cron job with SyncDriver`);
+
+    return;
+  }
+
+  work() {
+    return;
+  }
+}
diff --git a/packages/twenty-server/src/integrations/message-queue/interfaces/index.ts b/packages/twenty-server/src/engine/integrations/message-queue/interfaces/index.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/message-queue/interfaces/index.ts
rename to packages/twenty-server/src/engine/integrations/message-queue/interfaces/index.ts
diff --git a/packages/twenty-server/src/integrations/message-queue/interfaces/message-queue-job.interface.ts b/packages/twenty-server/src/engine/integrations/message-queue/interfaces/message-queue-job.interface.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/message-queue/interfaces/message-queue-job.interface.ts
rename to packages/twenty-server/src/engine/integrations/message-queue/interfaces/message-queue-job.interface.ts
diff --git a/packages/twenty-server/src/integrations/message-queue/interfaces/message-queue.interface.ts b/packages/twenty-server/src/engine/integrations/message-queue/interfaces/message-queue.interface.ts
similarity index 81%
rename from packages/twenty-server/src/integrations/message-queue/interfaces/message-queue.interface.ts
rename to packages/twenty-server/src/engine/integrations/message-queue/interfaces/message-queue.interface.ts
index 91d910f6abb5..568e0819fc8e 100644
--- a/packages/twenty-server/src/integrations/message-queue/interfaces/message-queue.interface.ts
+++ b/packages/twenty-server/src/engine/integrations/message-queue/interfaces/message-queue.interface.ts
@@ -1,7 +1,7 @@
 import { FactoryProvider, ModuleMetadata } from '@nestjs/common';
 
-import { BullMQDriverOptions } from 'src/integrations/message-queue/drivers/bullmq.driver';
-import { PgBossDriverOptions } from 'src/integrations/message-queue/drivers/pg-boss.driver';
+import { BullMQDriverOptions } from 'src/engine/integrations/message-queue/drivers/bullmq.driver';
+import { PgBossDriverOptions } from 'src/engine/integrations/message-queue/drivers/pg-boss.driver';
 
 export enum MessageQueueDriverType {
   PgBoss = 'pg-boss',
diff --git a/packages/twenty-server/src/engine/integrations/message-queue/jobs.module.ts b/packages/twenty-server/src/engine/integrations/message-queue/jobs.module.ts
new file mode 100644
index 000000000000..2f9c3e4b2e5f
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/message-queue/jobs.module.ts
@@ -0,0 +1,181 @@
+import { Module } from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
+import { HttpModule } from '@nestjs/axios';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { CallWebhookJobsJob } from 'src/engine/api/graphql/workspace-query-runner/jobs/call-webhook-jobs.job';
+import { CallWebhookJob } from 'src/engine/api/graphql/workspace-query-runner/jobs/call-webhook.job';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { CleanInactiveWorkspaceJob } from 'src/engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.job';
+import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
+import { EmailSenderJob } from 'src/engine/integrations/email/email-sender.job';
+import { UserModule } from 'src/engine/core-modules/user/user.module';
+import { EnvironmentModule } from 'src/engine/integrations/environment/environment.module';
+import { MatchParticipantJob } from 'src/modules/connected-account/jobs/match-participant.job';
+import { GmailPartialSyncCronJob } from 'src/modules/messaging/jobs/crons/gmail-partial-sync.cron.job';
+import { MessagingCreateCompanyAndContactAfterSyncJob } from 'src/modules/messaging/jobs/messaging-create-company-and-contact-after-sync.job';
+import { AutoCompaniesAndContactsCreationModule } from 'src/modules/connected-account/auto-companies-and-contacts-creation/auto-companies-and-contacts-creation.module';
+import { DataSeedDemoWorkspaceModule } from 'src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace.module';
+import { DataSeedDemoWorkspaceJob } from 'src/database/commands/data-seed-demo-workspace/jobs/data-seed-demo-workspace.job';
+import { DeleteConnectedAccountAssociatedMessagingDataJob } from 'src/modules/messaging/jobs/delete-connected-account-associated-messaging-data.job';
+import { ThreadCleanerModule } from 'src/modules/messaging/services/thread-cleaner/thread-cleaner.module';
+import { UpdateSubscriptionJob } from 'src/engine/core-modules/billing/jobs/update-subscription.job';
+import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
+import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
+import { StripeModule } from 'src/engine/core-modules/billing/stripe/stripe.module';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
+import { GoogleCalendarSyncJob } from 'src/modules/calendar/jobs/google-calendar-sync.job';
+import { CalendarEventCleanerModule } from 'src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.module';
+import { RecordPositionBackfillJob } from 'src/engine/api/graphql/workspace-query-runner/jobs/record-position-backfill.job';
+import { RecordPositionBackfillModule } from 'src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-module';
+import { GoogleCalendarSyncModule } from 'src/modules/calendar/services/google-calendar-sync.module';
+import { GoogleAPIRefreshAccessTokenModule } from 'src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.module';
+import { MessageParticipantModule } from 'src/modules/messaging/services/message-participant/message-participant.module';
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { SaveEventToDbJob } from 'src/engine/api/graphql/workspace-query-runner/jobs/save-event-to-db.job';
+import { CreateCompanyAndContactJob } from 'src/modules/connected-account/auto-companies-and-contacts-creation/jobs/create-company-and-contact.job';
+import { EventObjectMetadata } from 'src/modules/event/standard-objects/event.object-metadata';
+import { HandleWorkspaceMemberDeletedJob } from 'src/engine/core-modules/workspace/handle-workspace-member-deleted.job';
+import { GmailFullSynV2Module } from 'src/modules/messaging/services/gmail-full-sync-v2/gmail-full-sync.v2.module';
+import { GmailFetchMessageContentFromCacheModule } from 'src/modules/messaging/services/gmail-fetch-message-content-from-cache/gmail-fetch-message-content-from-cache.module';
+import { GmailFullSyncV2Job } from 'src/modules/messaging/jobs/gmail-full-sync-v2.job';
+import { GmailPartialSyncV2Job } from 'src/modules/messaging/jobs/gmail-partial-sync-v2.job';
+import { GmailPartialSyncV2Module } from 'src/modules/messaging/services/gmail-partial-sync-v2/gmail-partial-sync-v2.module';
+import { GoogleCalendarSyncCronJob } from 'src/modules/calendar/jobs/crons/google-calendar-sync.cron.job';
+import { CalendarEventParticipantModule } from 'src/modules/calendar/services/calendar-event-participant/calendar-event-participant.module';
+import { UnmatchParticipantJob } from 'src/modules/connected-account/jobs/unmatch-participant.job';
+import { CalendarCreateCompanyAndContactAfterSyncJob } from 'src/modules/calendar/jobs/calendar-create-company-and-contact-after-sync.job';
+import { DeleteConnectedAccountAssociatedCalendarDataJob } from 'src/modules/calendar/jobs/delete-connected-account-associated-calendar-data.job';
+import { FetchAllMessagesFromCacheCronJob } from 'src/modules/messaging/jobs/crons/fetch-all-messages-from-cache.cron.job';
+
+@Module({
+  imports: [
+    BillingModule,
+    DataSourceModule,
+    AutoCompaniesAndContactsCreationModule,
+    DataSeedDemoWorkspaceModule,
+    EnvironmentModule,
+    HttpModule,
+    GoogleCalendarSyncModule,
+    ObjectMetadataModule,
+    StripeModule,
+    ThreadCleanerModule,
+    CalendarEventCleanerModule,
+    TypeORMModule,
+    TypeOrmModule.forFeature([Workspace, FeatureFlagEntity], 'core'),
+    TypeOrmModule.forFeature([DataSourceEntity], 'metadata'),
+    UserModule,
+    UserWorkspaceModule,
+    WorkspaceDataSourceModule,
+    RecordPositionBackfillModule,
+    GoogleAPIRefreshAccessTokenModule,
+    MessageParticipantModule,
+    ObjectMetadataRepositoryModule.forFeature([
+      ConnectedAccountObjectMetadata,
+      MessageChannelObjectMetadata,
+      EventObjectMetadata,
+    ]),
+    GmailFullSynV2Module,
+    GmailFetchMessageContentFromCacheModule,
+    GmailPartialSyncV2Module,
+    CalendarEventParticipantModule,
+  ],
+  providers: [
+    {
+      provide: GoogleCalendarSyncJob.name,
+      useClass: GoogleCalendarSyncJob,
+    },
+    {
+      provide: CallWebhookJobsJob.name,
+      useClass: CallWebhookJobsJob,
+    },
+    {
+      provide: CallWebhookJob.name,
+      useClass: CallWebhookJob,
+    },
+    {
+      provide: CleanInactiveWorkspaceJob.name,
+      useClass: CleanInactiveWorkspaceJob,
+    },
+    { provide: EmailSenderJob.name, useClass: EmailSenderJob },
+    {
+      provide: GmailPartialSyncCronJob.name,
+      useClass: GmailPartialSyncCronJob,
+    },
+    {
+      provide: MatchParticipantJob.name,
+      useClass: MatchParticipantJob,
+    },
+    {
+      provide: UnmatchParticipantJob.name,
+      useClass: UnmatchParticipantJob,
+    },
+    {
+      provide: MessagingCreateCompanyAndContactAfterSyncJob.name,
+      useClass: MessagingCreateCompanyAndContactAfterSyncJob,
+    },
+    {
+      provide: CalendarCreateCompanyAndContactAfterSyncJob.name,
+      useClass: CalendarCreateCompanyAndContactAfterSyncJob,
+    },
+    {
+      provide: DataSeedDemoWorkspaceJob.name,
+      useClass: DataSeedDemoWorkspaceJob,
+    },
+    {
+      provide: DeleteConnectedAccountAssociatedMessagingDataJob.name,
+      useClass: DeleteConnectedAccountAssociatedMessagingDataJob,
+    },
+    {
+      provide: DeleteConnectedAccountAssociatedCalendarDataJob.name,
+      useClass: DeleteConnectedAccountAssociatedCalendarDataJob,
+    },
+    { provide: UpdateSubscriptionJob.name, useClass: UpdateSubscriptionJob },
+    {
+      provide: HandleWorkspaceMemberDeletedJob.name,
+      useClass: HandleWorkspaceMemberDeletedJob,
+    },
+    {
+      provide: RecordPositionBackfillJob.name,
+      useClass: RecordPositionBackfillJob,
+    },
+    {
+      provide: CreateCompanyAndContactJob.name,
+      useClass: CreateCompanyAndContactJob,
+    },
+
+    {
+      provide: SaveEventToDbJob.name,
+      useClass: SaveEventToDbJob,
+    },
+    {
+      provide: FetchAllMessagesFromCacheCronJob.name,
+      useClass: FetchAllMessagesFromCacheCronJob,
+    },
+    {
+      provide: GmailFullSyncV2Job.name,
+      useClass: GmailFullSyncV2Job,
+    },
+    {
+      provide: GmailPartialSyncV2Job.name,
+      useClass: GmailPartialSyncV2Job,
+    },
+    {
+      provide: GoogleCalendarSyncCronJob.name,
+      useClass: GoogleCalendarSyncCronJob,
+    },
+  ],
+})
+export class JobsModule {
+  static moduleRef: ModuleRef;
+
+  constructor(private moduleRef: ModuleRef) {
+    JobsModule.moduleRef = this.moduleRef;
+  }
+}
diff --git a/packages/twenty-server/src/engine/integrations/message-queue/message-queue.constants.ts b/packages/twenty-server/src/engine/integrations/message-queue/message-queue.constants.ts
new file mode 100644
index 000000000000..7576b8693a01
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/message-queue/message-queue.constants.ts
@@ -0,0 +1,15 @@
+export const QUEUE_DRIVER = Symbol('QUEUE_DRIVER');
+
+export enum MessageQueue {
+  taskAssignedQueue = 'task-assigned-queue',
+  messagingQueue = 'messaging-queue',
+  webhookQueue = 'webhook-queue',
+  cronQueue = 'cron-queue',
+  emailQueue = 'email-queue',
+  calendarQueue = 'calendar-queue',
+  contactCreationQueue = 'contact-creation-queue',
+  billingQueue = 'billing-queue',
+  workspaceQueue = 'workspace-queue',
+  recordPositionBackfillQueue = 'record-position-backfill-queue',
+  entityEventsToDbQueue = 'entity-events-to-db-queue',
+}
diff --git a/packages/twenty-server/src/engine/integrations/message-queue/message-queue.module-factory.ts b/packages/twenty-server/src/engine/integrations/message-queue/message-queue.module-factory.ts
new file mode 100644
index 000000000000..603f550c39c1
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/message-queue/message-queue.module-factory.ts
@@ -0,0 +1,53 @@
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import {
+  MessageQueueDriverType,
+  MessageQueueModuleOptions,
+} from 'src/engine/integrations/message-queue/interfaces';
+
+/**
+ * MessageQueue Module factory
+ * @param environment
+ * @returns MessageQueueModuleOptions
+ */
+export const messageQueueModuleFactory = async (
+  environmentService: EnvironmentService,
+): Promise<MessageQueueModuleOptions> => {
+  const driverType = environmentService.get('MESSAGE_QUEUE_TYPE');
+
+  switch (driverType) {
+    case MessageQueueDriverType.Sync: {
+      return {
+        type: MessageQueueDriverType.Sync,
+        options: {},
+      };
+    }
+    case MessageQueueDriverType.PgBoss: {
+      const connectionString = environmentService.get('PG_DATABASE_URL');
+
+      return {
+        type: MessageQueueDriverType.PgBoss,
+        options: {
+          connectionString,
+        },
+      };
+    }
+    case MessageQueueDriverType.BullMQ: {
+      const host = environmentService.get('REDIS_HOST');
+      const port = environmentService.get('REDIS_PORT');
+
+      return {
+        type: MessageQueueDriverType.BullMQ,
+        options: {
+          connection: {
+            host,
+            port,
+          },
+        },
+      };
+    }
+    default:
+      throw new Error(
+        `Invalid message queue driver type (${driverType}), check your .env file`,
+      );
+  }
+};
diff --git a/packages/twenty-server/src/engine/integrations/message-queue/message-queue.module.ts b/packages/twenty-server/src/engine/integrations/message-queue/message-queue.module.ts
new file mode 100644
index 000000000000..7381c0ee96c8
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/message-queue/message-queue.module.ts
@@ -0,0 +1,61 @@
+import { DynamicModule, Global } from '@nestjs/common';
+
+import { MessageQueueDriver } from 'src/engine/integrations/message-queue/drivers/interfaces/message-queue-driver.interface';
+
+import {
+  MessageQueueDriverType,
+  MessageQueueModuleAsyncOptions,
+} from 'src/engine/integrations/message-queue/interfaces';
+import {
+  MessageQueue,
+  QUEUE_DRIVER,
+} from 'src/engine/integrations/message-queue/message-queue.constants';
+import { PgBossDriver } from 'src/engine/integrations/message-queue/drivers/pg-boss.driver';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { BullMQDriver } from 'src/engine/integrations/message-queue/drivers/bullmq.driver';
+import { SyncDriver } from 'src/engine/integrations/message-queue/drivers/sync.driver';
+import { JobsModule } from 'src/engine/integrations/message-queue/jobs.module';
+
+@Global()
+export class MessageQueueModule {
+  static forRoot(options: MessageQueueModuleAsyncOptions): DynamicModule {
+    const providers = [
+      ...Object.values(MessageQueue).map((queue) => ({
+        provide: queue,
+        useFactory: (driver: MessageQueueDriver) => {
+          return new MessageQueueService(driver, queue);
+        },
+        inject: [QUEUE_DRIVER],
+      })),
+      {
+        provide: QUEUE_DRIVER,
+        useFactory: async (...args: any[]) => {
+          const config = await options.useFactory(...args);
+
+          switch (config.type) {
+            case MessageQueueDriverType.PgBoss:
+              const boss = new PgBossDriver(config.options);
+
+              await boss.init();
+
+              return boss;
+
+            case MessageQueueDriverType.BullMQ:
+              return new BullMQDriver(config.options);
+
+            default:
+              return new SyncDriver(JobsModule.moduleRef);
+          }
+        },
+        inject: options.inject || [],
+      },
+    ];
+
+    return {
+      module: MessageQueueModule,
+      imports: [JobsModule, ...(options.imports || [])],
+      providers,
+      exports: Object.values(MessageQueue),
+    };
+  }
+}
diff --git a/packages/twenty-server/src/integrations/message-queue/services/message-queue-task-assigned.service.spec.ts b/packages/twenty-server/src/engine/integrations/message-queue/services/__tests__/message-queue-task-assigned.service.spec.ts
similarity index 77%
rename from packages/twenty-server/src/integrations/message-queue/services/message-queue-task-assigned.service.spec.ts
rename to packages/twenty-server/src/engine/integrations/message-queue/services/__tests__/message-queue-task-assigned.service.spec.ts
index 03d7dfcb4cd9..31e2b66ae978 100644
--- a/packages/twenty-server/src/integrations/message-queue/services/message-queue-task-assigned.service.spec.ts
+++ b/packages/twenty-server/src/engine/integrations/message-queue/services/__tests__/message-queue-task-assigned.service.spec.ts
@@ -1,12 +1,12 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { MessageQueueDriver } from 'src/integrations/message-queue/drivers/interfaces/message-queue-driver.interface';
+import { MessageQueueDriver } from 'src/engine/integrations/message-queue/drivers/interfaces/message-queue-driver.interface';
 
 import {
   QUEUE_DRIVER,
   MessageQueue,
-} from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
+} from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
 
 describe('MessageQueueTaskAssigned queue', () => {
   let service: MessageQueueService;
diff --git a/packages/twenty-server/src/engine/integrations/message-queue/services/message-queue.service.ts b/packages/twenty-server/src/engine/integrations/message-queue/services/message-queue.service.ts
new file mode 100644
index 000000000000..87899696f907
--- /dev/null
+++ b/packages/twenty-server/src/engine/integrations/message-queue/services/message-queue.service.ts
@@ -0,0 +1,57 @@
+import { Inject, Injectable, OnModuleDestroy } from '@nestjs/common';
+
+import {
+  QueueCronJobOptions,
+  QueueJobOptions,
+} from 'src/engine/integrations/message-queue/drivers/interfaces/job-options.interface';
+import { MessageQueueDriver } from 'src/engine/integrations/message-queue/drivers/interfaces/message-queue-driver.interface';
+import { MessageQueueJobData } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import {
+  MessageQueue,
+  QUEUE_DRIVER,
+} from 'src/engine/integrations/message-queue/message-queue.constants';
+
+@Injectable()
+export class MessageQueueService implements OnModuleDestroy {
+  constructor(
+    @Inject(QUEUE_DRIVER) protected driver: MessageQueueDriver,
+    protected queueName: MessageQueue,
+  ) {
+    if (typeof this.driver.register === 'function') {
+      this.driver.register(queueName);
+    }
+  }
+
+  async onModuleDestroy() {
+    if (typeof this.driver.stop === 'function') {
+      await this.driver.stop();
+    }
+  }
+
+  add<T extends MessageQueueJobData>(
+    jobName: string,
+    data: T,
+    options?: QueueJobOptions,
+  ): Promise<void> {
+    return this.driver.add(this.queueName, jobName, data, options);
+  }
+
+  addCron<T extends MessageQueueJobData | undefined>(
+    jobName: string,
+    data: T,
+    options?: QueueCronJobOptions,
+  ): Promise<void> {
+    return this.driver.addCron(this.queueName, jobName, data, options);
+  }
+
+  removeCron(jobName: string, pattern: string): Promise<void> {
+    return this.driver.removeCron(this.queueName, jobName, pattern);
+  }
+
+  work<T extends MessageQueueJobData>(
+    handler: ({ data, id }: { data: T; id: string }) => Promise<void> | void,
+  ) {
+    return this.driver.work(this.queueName, handler);
+  }
+}
diff --git a/packages/twenty-server/src/integrations/message-queue/utils/get-job-class-name.util.ts b/packages/twenty-server/src/engine/integrations/message-queue/utils/get-job-class-name.util.ts
similarity index 100%
rename from packages/twenty-server/src/integrations/message-queue/utils/get-job-class-name.util.ts
rename to packages/twenty-server/src/engine/integrations/message-queue/utils/get-job-class-name.util.ts
diff --git a/packages/twenty-server/src/metadata/data-source/data-source.entity.ts b/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.entity.ts
similarity index 81%
rename from packages/twenty-server/src/metadata/data-source/data-source.entity.ts
rename to packages/twenty-server/src/engine/metadata-modules/data-source/data-source.entity.ts
index 55b10cd5f8ac..3553cf594a8f 100644
--- a/packages/twenty-server/src/metadata/data-source/data-source.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.entity.ts
@@ -8,7 +8,7 @@ import {
   OneToMany,
 } from 'typeorm';
 
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 
 export type DataSourceType = DataSourceOptions['type'];
 
@@ -40,9 +40,9 @@ export class DataSourceEntity {
   @Column({ nullable: false, type: 'uuid' })
   workspaceId: string;
 
-  @CreateDateColumn()
+  @CreateDateColumn({ type: 'timestamptz' })
   createdAt: Date;
 
-  @UpdateDateColumn()
+  @UpdateDateColumn({ type: 'timestamptz' })
   updatedAt: Date;
 }
diff --git a/packages/twenty-server/src/metadata/data-source/data-source.module.ts b/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.module.ts
similarity index 100%
rename from packages/twenty-server/src/metadata/data-source/data-source.module.ts
rename to packages/twenty-server/src/engine/metadata-modules/data-source/data-source.module.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.service.ts b/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.service.ts
new file mode 100644
index 000000000000..226b5a9ca830
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.service.ts
@@ -0,0 +1,61 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { FindManyOptions, Repository } from 'typeorm';
+
+import { DataSourceEntity } from './data-source.entity';
+
+@Injectable()
+export class DataSourceService {
+  constructor(
+    @InjectRepository(DataSourceEntity, 'metadata')
+    private readonly dataSourceMetadataRepository: Repository<DataSourceEntity>,
+  ) {}
+
+  async createDataSourceMetadata(
+    workspaceId: string,
+    workspaceSchema: string,
+  ): Promise<DataSourceEntity> {
+    // TODO: Double check if this is the correct way to do this
+    const dataSource = await this.dataSourceMetadataRepository.findOne({
+      where: { workspaceId },
+    });
+
+    if (dataSource) {
+      return dataSource;
+    }
+
+    return this.dataSourceMetadataRepository.save({
+      workspaceId,
+      schema: workspaceSchema,
+    });
+  }
+
+  async getManyDataSourceMetadata(
+    options: FindManyOptions<DataSourceEntity> = {},
+  ): Promise<DataSourceEntity[]> {
+    return this.dataSourceMetadataRepository.find(options);
+  }
+
+  async getDataSourcesMetadataFromWorkspaceId(
+    workspaceId: string,
+  ): Promise<DataSourceEntity[]> {
+    return this.dataSourceMetadataRepository.find({
+      where: { workspaceId },
+      order: { createdAt: 'DESC' },
+    });
+  }
+
+  async getLastDataSourceMetadataFromWorkspaceIdOrFail(
+    workspaceId: string,
+  ): Promise<DataSourceEntity> {
+    return this.dataSourceMetadataRepository.findOneOrFail({
+      where: { workspaceId },
+      order: { createdAt: 'DESC' },
+    });
+  }
+
+  async delete(workspaceId: string): Promise<void> {
+    await this.dataSourceMetadataRepository.delete({ workspaceId });
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/address.composite-type.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/address.composite-type.ts
new file mode 100644
index 000000000000..a8871b037bb8
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/address.composite-type.ts
@@ -0,0 +1,68 @@
+import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+export const addressCompositeType: CompositeType = {
+  type: FieldMetadataType.ADDRESS,
+  properties: [
+    {
+      name: 'addressStreet1',
+      type: FieldMetadataType.TEXT,
+      hidden: false,
+      isRequired: false,
+    },
+    {
+      name: 'addressStreet2',
+      type: FieldMetadataType.TEXT,
+      hidden: false,
+      isRequired: false,
+    },
+    {
+      name: 'addressCity',
+      type: FieldMetadataType.TEXT,
+      hidden: false,
+      isRequired: false,
+    },
+    {
+      name: 'addressPostcode',
+      type: FieldMetadataType.TEXT,
+      hidden: false,
+      isRequired: false,
+    },
+    {
+      name: 'addressState',
+      type: FieldMetadataType.TEXT,
+      hidden: false,
+      isRequired: false,
+    },
+    {
+      name: 'addressCountry',
+      type: FieldMetadataType.TEXT,
+      hidden: false,
+      isRequired: false,
+    },
+    {
+      name: 'addressLat',
+      type: FieldMetadataType.NUMERIC,
+      hidden: false,
+      isRequired: false,
+    },
+    {
+      name: 'addressLng',
+      type: FieldMetadataType.NUMERIC,
+      hidden: false,
+      isRequired: false,
+    },
+  ],
+};
+
+export type AddressMetadata = {
+  addressStreet1: string;
+  addressStreet2: string;
+  addressCity: string;
+  addressState: string;
+  addressZipCode: string;
+  addressCountry: string;
+  addressLat: number;
+  addressLng: number;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/currency.composite-type.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/currency.composite-type.ts
new file mode 100644
index 000000000000..c7ce2147b60c
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/currency.composite-type.ts
@@ -0,0 +1,26 @@
+import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+export const currencyCompositeType: CompositeType = {
+  type: FieldMetadataType.CURRENCY,
+  properties: [
+    {
+      name: 'amountMicros',
+      type: FieldMetadataType.NUMERIC,
+      hidden: false,
+      isRequired: false,
+    },
+    {
+      name: 'currencyCode',
+      type: FieldMetadataType.TEXT,
+      hidden: false,
+      isRequired: false,
+    },
+  ],
+};
+
+export type CurrencyMetadata = {
+  amountMicros: number;
+  currencyCode: string;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/full-name.composite-type.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/full-name.composite-type.ts
new file mode 100644
index 000000000000..835adb703501
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/full-name.composite-type.ts
@@ -0,0 +1,26 @@
+import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+export const fullNameCompositeType: CompositeType = {
+  type: FieldMetadataType.FULL_NAME,
+  properties: [
+    {
+      name: 'firstName',
+      type: FieldMetadataType.TEXT,
+      hidden: false,
+      isRequired: false,
+    },
+    {
+      name: 'lastName',
+      type: FieldMetadataType.TEXT,
+      hidden: false,
+      isRequired: false,
+    },
+  ],
+};
+
+export type FullNameMetadata = {
+  firstName: string;
+  lastName: string;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/index.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/index.ts
new file mode 100644
index 000000000000..970ac9baa04e
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/index.ts
@@ -0,0 +1,22 @@
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+
+import { currencyCompositeType } from 'src/engine/metadata-modules/field-metadata/composite-types/currency.composite-type';
+import { fullNameCompositeType } from 'src/engine/metadata-modules/field-metadata/composite-types/full-name.composite-type';
+import { linkCompositeType } from 'src/engine/metadata-modules/field-metadata/composite-types/link.composite-type';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { addressCompositeType } from 'src/engine/metadata-modules/field-metadata/composite-types/address.composite-type';
+
+export type CompositeFieldsDefinitionFunction = (
+  fieldMetadata?: FieldMetadataInterface,
+) => FieldMetadataInterface[];
+
+export const compositeTypeDefintions = new Map<
+  FieldMetadataType,
+  CompositeType
+>([
+  [FieldMetadataType.LINK, linkCompositeType],
+  [FieldMetadataType.CURRENCY, currencyCompositeType],
+  [FieldMetadataType.FULL_NAME, fullNameCompositeType],
+  [FieldMetadataType.ADDRESS, addressCompositeType],
+]);
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/link.composite-type.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/link.composite-type.ts
new file mode 100644
index 000000000000..4037a5d5c9f8
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/link.composite-type.ts
@@ -0,0 +1,26 @@
+import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+export const linkCompositeType: CompositeType = {
+  type: FieldMetadataType.LINK,
+  properties: [
+    {
+      name: 'label',
+      type: FieldMetadataType.TEXT,
+      hidden: false,
+      isRequired: false,
+    },
+    {
+      name: 'url',
+      type: FieldMetadataType.TEXT,
+      hidden: false,
+      isRequired: false,
+    },
+  ],
+};
+
+export type LinkMetadata = {
+  label: string;
+  url: string;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/create-field.input.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/create-field.input.ts
new file mode 100644
index 000000000000..c74687ae4ff4
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/create-field.input.ts
@@ -0,0 +1,31 @@
+import { Field, InputType, OmitType } from '@nestjs/graphql';
+
+import { IsOptional, IsUUID, ValidateNested } from 'class-validator';
+import { Type } from 'class-transformer';
+
+import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
+
+@InputType()
+export class CreateFieldInput extends OmitType(
+  FieldMetadataDTO,
+  ['id', 'createdAt', 'updatedAt'] as const,
+  InputType,
+) {
+  @IsUUID()
+  @Field()
+  objectMetadataId: string;
+
+  @Field(() => Boolean, { nullable: true })
+  @IsOptional()
+  isRemoteCreation?: boolean;
+}
+
+@InputType()
+export class CreateOneFieldMetadataInput {
+  @Type(() => CreateFieldInput)
+  @ValidateNested()
+  @Field(() => CreateFieldInput, {
+    description: 'The record to create',
+  })
+  field!: CreateFieldInput;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/default-value.input.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/default-value.input.ts
new file mode 100644
index 000000000000..421227303a31
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/default-value.input.ts
@@ -0,0 +1,140 @@
+import {
+  IsArray,
+  IsBoolean,
+  IsDate,
+  IsJSON,
+  IsNotEmpty,
+  IsNumber,
+  IsNumberString,
+  IsString,
+  Matches,
+  ValidateIf,
+} from 'class-validator';
+
+import { IsQuotedString } from 'src/engine/metadata-modules/field-metadata/validators/is-quoted-string.validator';
+
+export const fieldMetadataDefaultValueFunctionName = {
+  UUID: 'uuid',
+  NOW: 'now',
+} as const;
+
+export type FieldMetadataDefaultValueFunctionNames =
+  (typeof fieldMetadataDefaultValueFunctionName)[keyof typeof fieldMetadataDefaultValueFunctionName];
+
+export class FieldMetadataDefaultValueString {
+  @ValidateIf((object, value) => value !== null)
+  @IsQuotedString()
+  value: string | null;
+}
+
+export class FieldMetadataDefaultValueRawJson {
+  @ValidateIf((object, value) => value !== null)
+  @IsJSON()
+  value: JSON | null;
+}
+
+export class FieldMetadataDefaultValueNumber {
+  @ValidateIf((object, value) => value !== null)
+  @IsNumber()
+  value: number | null;
+}
+
+export class FieldMetadataDefaultValueBoolean {
+  @ValidateIf((object, value) => value !== null)
+  @IsBoolean()
+  value: boolean | null;
+}
+
+export class FieldMetadataDefaultValueStringArray {
+  @ValidateIf((object, value) => value !== null)
+  @IsArray()
+  @IsQuotedString({ each: true })
+  value: string[] | null;
+}
+
+export class FieldMetadataDefaultValueDateTime {
+  @ValidateIf((object, value) => value !== null)
+  @IsDate()
+  value: Date | null;
+}
+
+export class FieldMetadataDefaultValueDate {
+  @ValidateIf((object, value) => value !== null)
+  @IsDate()
+  value: Date | null;
+}
+
+export class FieldMetadataDefaultValueLink {
+  @ValidateIf((object, value) => value !== null)
+  @IsQuotedString()
+  label: string | null;
+
+  @ValidateIf((object, value) => value !== null)
+  @IsQuotedString()
+  url: string | null;
+}
+
+export class FieldMetadataDefaultValueCurrency {
+  @ValidateIf((object, value) => value !== null)
+  @IsNumberString()
+  amountMicros: string | null;
+
+  @ValidateIf((object, value) => value !== null)
+  @IsQuotedString()
+  currencyCode: string | null;
+}
+
+export class FieldMetadataDefaultValueFullName {
+  @ValidateIf((object, value) => value !== null)
+  @IsQuotedString()
+  firstName: string | null;
+
+  @ValidateIf((object, value) => value !== null)
+  @IsQuotedString()
+  lastName: string | null;
+}
+
+export class FieldMetadataDefaultValueUuidFunction {
+  @Matches(fieldMetadataDefaultValueFunctionName.UUID)
+  @IsNotEmpty()
+  value: typeof fieldMetadataDefaultValueFunctionName.UUID;
+}
+
+export class FieldMetadataDefaultValueNowFunction {
+  @Matches(fieldMetadataDefaultValueFunctionName.NOW)
+  @IsNotEmpty()
+  value: typeof fieldMetadataDefaultValueFunctionName.NOW;
+}
+export class FieldMetadataDefaultValueAddress {
+  @ValidateIf((_object, value) => value !== null)
+  @IsString()
+  addressStreet1: string | null;
+
+  @ValidateIf((_object, value) => value !== null)
+  @IsString()
+  addressStreet2: string | null;
+
+  @ValidateIf((_object, value) => value !== null)
+  @IsString()
+  addressCity: string | null;
+
+  @ValidateIf((_object, value) => value !== null)
+  @IsString()
+  addressPostcode: string | null;
+
+  @ValidateIf((_object, value) => value !== null)
+  @IsString()
+  addressState: string | null;
+
+  @ValidateIf((_object, value) => value !== null)
+  @IsString()
+  addressCountry: string | null;
+
+  @ValidateIf((_object, value) => value !== null)
+  @IsNumber()
+  addressLat: number | null;
+
+  @ValidateIf((_object, value) => value !== null)
+  @IsNumber()
+  addressLng: number | null;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/delete-field.input.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/delete-field.input.ts
new file mode 100644
index 000000000000..ab6716a781f6
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/delete-field.input.ts
@@ -0,0 +1,13 @@
+import { InputType } from '@nestjs/graphql';
+
+import { IDField } from '@ptc-org/nestjs-query-graphql';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@InputType()
+export class DeleteOneFieldInput {
+  @IDField(() => UUIDScalarType, {
+    description: 'The id of the field to delete.',
+  })
+  id!: string;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.ts
new file mode 100644
index 000000000000..6033b30f0801
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.ts
@@ -0,0 +1,133 @@
+import {
+  Field,
+  HideField,
+  ObjectType,
+  registerEnumType,
+} from '@nestjs/graphql';
+
+import { GraphQLJSON } from 'graphql-type-json';
+import {
+  Authorize,
+  FilterableField,
+  IDField,
+  QueryOptions,
+  Relation,
+} from '@ptc-org/nestjs-query-graphql';
+import {
+  IsBoolean,
+  IsDateString,
+  IsEnum,
+  IsNotEmpty,
+  IsOptional,
+  IsString,
+  IsUUID,
+  Validate,
+} from 'class-validator';
+
+import { FieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface';
+import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
+
+import { RelationMetadataDTO } from 'src/engine/metadata-modules/relation-metadata/dtos/relation-metadata.dto';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { IsFieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator';
+import { IsFieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator';
+import { IsValidMetadataName } from 'src/engine/decorators/metadata/is-valid-metadata-name.decorator';
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+registerEnumType(FieldMetadataType, {
+  name: 'FieldMetadataType',
+  description: 'Type of the field',
+});
+
+@ObjectType('field')
+@Authorize({
+  authorize: (context: any) => ({
+    workspaceId: { eq: context?.req?.user?.workspace?.id },
+  }),
+})
+@QueryOptions({
+  defaultResultSize: 10,
+  disableSort: true,
+  maxResultsSize: 1000,
+})
+@Relation('toRelationMetadata', () => RelationMetadataDTO, {
+  nullable: true,
+})
+@Relation('fromRelationMetadata', () => RelationMetadataDTO, {
+  nullable: true,
+})
+export class FieldMetadataDTO<
+  T extends FieldMetadataType | 'default' = 'default',
+> {
+  @IsUUID()
+  @IsNotEmpty()
+  @IDField(() => UUIDScalarType)
+  id: string;
+
+  @IsEnum(FieldMetadataType)
+  @IsNotEmpty()
+  @Field(() => FieldMetadataType)
+  type: FieldMetadataType;
+
+  @IsString()
+  @IsNotEmpty()
+  @Field()
+  @IsValidMetadataName()
+  name: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @Field()
+  label: string;
+
+  @IsString()
+  @IsOptional()
+  @Field({ nullable: true })
+  description?: string;
+
+  @IsString()
+  @IsOptional()
+  @Field({ nullable: true })
+  icon?: string;
+
+  @IsBoolean()
+  @IsOptional()
+  @FilterableField({ nullable: true })
+  isCustom?: boolean;
+
+  @IsBoolean()
+  @IsOptional()
+  @FilterableField({ nullable: true })
+  isActive?: boolean;
+
+  @IsBoolean()
+  @IsOptional()
+  @FilterableField({ nullable: true })
+  isSystem?: boolean;
+
+  @IsBoolean()
+  @IsOptional()
+  @Field({ nullable: true })
+  isNullable?: boolean;
+
+  @Validate(IsFieldMetadataDefaultValue)
+  @IsOptional()
+  @Field(() => GraphQLJSON, { nullable: true })
+  defaultValue?: FieldMetadataDefaultValue<T>;
+
+  @Validate(IsFieldMetadataOptions)
+  @IsOptional()
+  @Field(() => GraphQLJSON, { nullable: true })
+  options?: FieldMetadataOptions<T>;
+
+  @HideField()
+  workspaceId: string;
+
+  @IsDateString()
+  @Field()
+  createdAt: Date;
+
+  @IsDateString()
+  @Field()
+  updatedAt: Date;
+}
diff --git a/packages/twenty-server/src/metadata/field-metadata/dtos/options.input.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/options.input.ts
similarity index 76%
rename from packages/twenty-server/src/metadata/field-metadata/dtos/options.input.ts
rename to packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/options.input.ts
index 4ef3d036dacd..19ab79a7fb03 100644
--- a/packages/twenty-server/src/metadata/field-metadata/dtos/options.input.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/options.input.ts
@@ -1,6 +1,6 @@
 import { IsString, IsNumber, IsOptional, IsNotEmpty } from 'class-validator';
 
-import { IsValidGraphQLEnumName } from 'src/metadata/field-metadata/validators/is-valid-graphql-enum-name.validator';
+import { IsValidGraphQLEnumName } from 'src/engine/metadata-modules/field-metadata/validators/is-valid-graphql-enum-name.validator';
 
 export class FieldMetadataDefaultOption {
   @IsOptional()
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/relation-definition.dto.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/relation-definition.dto.ts
new file mode 100644
index 000000000000..3f97279947e9
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/relation-definition.dto.ts
@@ -0,0 +1,43 @@
+import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
+
+import { IsEnum, IsNotEmpty } from 'class-validator';
+
+import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
+import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+
+export enum RelationDefinitionType {
+  ONE_TO_ONE = RelationMetadataType.ONE_TO_ONE,
+  ONE_TO_MANY = RelationMetadataType.ONE_TO_MANY,
+  MANY_TO_MANY = RelationMetadataType.MANY_TO_MANY,
+  MANY_TO_ONE = 'MANY_TO_ONE',
+}
+
+registerEnumType(RelationDefinitionType, {
+  name: 'RelationDefinitionType',
+  description: 'Relation definition type',
+});
+
+@ObjectType('RelationDefinition')
+export class RelationDefinitionDTO {
+  @IsNotEmpty()
+  @Field(() => ObjectMetadataDTO)
+  sourceObjectMetadata: ObjectMetadataDTO;
+
+  @IsNotEmpty()
+  @Field(() => ObjectMetadataDTO)
+  targetObjectMetadata: ObjectMetadataDTO;
+
+  @IsNotEmpty()
+  @Field(() => FieldMetadataDTO)
+  sourceFieldMetadata: FieldMetadataDTO;
+
+  @IsNotEmpty()
+  @Field(() => FieldMetadataDTO)
+  targetFieldMetadata: FieldMetadataDTO;
+
+  @IsEnum(RelationDefinitionType)
+  @IsNotEmpty()
+  @Field(() => RelationDefinitionType)
+  direction: RelationDefinitionType;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/update-field.input.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/update-field.input.ts
new file mode 100644
index 000000000000..81f2ef8bd13c
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/update-field.input.ts
@@ -0,0 +1,42 @@
+import {
+  Field,
+  HideField,
+  InputType,
+  OmitType,
+  PartialType,
+} from '@nestjs/graphql';
+
+import { Type } from 'class-transformer';
+import { IsNotEmpty, IsUUID, ValidateNested } from 'class-validator';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
+
+@InputType()
+export class UpdateFieldInput extends OmitType(
+  PartialType(FieldMetadataDTO, InputType),
+  ['id', 'type', 'createdAt', 'updatedAt'] as const,
+) {
+  @HideField()
+  id: string;
+
+  @HideField()
+  workspaceId: string;
+}
+
+@InputType()
+export class UpdateOneFieldMetadataInput {
+  @IsUUID()
+  @IsNotEmpty()
+  @Field(() => UUIDScalarType, {
+    description: 'The id of the record to update',
+  })
+  id!: string;
+
+  @Type(() => UpdateFieldInput)
+  @ValidateNested()
+  @Field(() => UpdateFieldInput, {
+    description: 'The record to update',
+  })
+  update!: UpdateFieldInput;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.entity.ts
new file mode 100644
index 000000000000..ede4e44b1545
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.entity.ts
@@ -0,0 +1,121 @@
+import {
+  Entity,
+  Unique,
+  PrimaryGeneratedColumn,
+  Column,
+  ManyToOne,
+  JoinColumn,
+  OneToOne,
+  CreateDateColumn,
+  UpdateDateColumn,
+} from 'typeorm';
+
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
+import { FieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+
+export enum FieldMetadataType {
+  UUID = 'UUID',
+  TEXT = 'TEXT',
+  PHONE = 'PHONE',
+  EMAIL = 'EMAIL',
+  DATE_TIME = 'DATE_TIME',
+  DATE = 'DATE',
+  BOOLEAN = 'BOOLEAN',
+  NUMBER = 'NUMBER',
+  NUMERIC = 'NUMERIC',
+  PROBABILITY = 'PROBABILITY',
+  LINK = 'LINK',
+  CURRENCY = 'CURRENCY',
+  FULL_NAME = 'FULL_NAME',
+  RATING = 'RATING',
+  SELECT = 'SELECT',
+  MULTI_SELECT = 'MULTI_SELECT',
+  RELATION = 'RELATION',
+  POSITION = 'POSITION',
+  ADDRESS = 'ADDRESS',
+  RAW_JSON = 'RAW_JSON',
+}
+
+@Entity('fieldMetadata')
+@Unique('IndexOnNameObjectMetadataIdAndWorkspaceIdUnique', [
+  'name',
+  'objectMetadataId',
+  'workspaceId',
+])
+export class FieldMetadataEntity<
+  T extends FieldMetadataType | 'default' = 'default',
+> implements FieldMetadataInterface<T>
+{
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column({ nullable: true, type: 'uuid' })
+  standardId: string | null;
+
+  @Column({ nullable: false, type: 'uuid' })
+  objectMetadataId: string;
+
+  @ManyToOne(() => ObjectMetadataEntity, (object) => object.fields, {
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'objectMetadataId' })
+  object: ObjectMetadataEntity;
+
+  @Column({ nullable: false })
+  type: FieldMetadataType;
+
+  @Column({ nullable: false })
+  name: string;
+
+  @Column({ nullable: false })
+  label: string;
+
+  @Column({ nullable: true, type: 'jsonb' })
+  defaultValue: FieldMetadataDefaultValue<T>;
+
+  @Column({ nullable: true, type: 'text' })
+  description: string;
+
+  @Column({ nullable: true })
+  icon: string;
+
+  @Column('jsonb', { nullable: true })
+  options: FieldMetadataOptions<T>;
+
+  @Column({ default: false })
+  isCustom: boolean;
+
+  @Column({ default: false })
+  isActive: boolean;
+
+  @Column({ default: false })
+  isSystem: boolean;
+
+  @Column({ nullable: true, default: true })
+  isNullable: boolean;
+
+  @Column({ nullable: false, type: 'uuid' })
+  workspaceId: string;
+
+  @OneToOne(
+    () => RelationMetadataEntity,
+    (relation: RelationMetadataEntity) => relation.fromFieldMetadata,
+  )
+  fromRelationMetadata: RelationMetadataEntity;
+
+  @OneToOne(
+    () => RelationMetadataEntity,
+    (relation: RelationMetadataEntity) => relation.toFieldMetadata,
+  )
+  toRelationMetadata: RelationMetadataEntity;
+
+  @CreateDateColumn({ type: 'timestamptz' })
+  createdAt: Date;
+
+  @UpdateDateColumn({ type: 'timestamptz' })
+  updatedAt: Date;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts
new file mode 100644
index 000000000000..9dc578cf1179
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts
@@ -0,0 +1,78 @@
+import { Module } from '@nestjs/common';
+
+import {
+  NestjsQueryGraphQLModule,
+  PagingStrategies,
+} from '@ptc-org/nestjs-query-graphql';
+import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
+import { SortDirection } from '@ptc-org/nestjs-query-core';
+
+import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
+import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
+import { IsFieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator';
+import { FieldMetadataResolver } from 'src/engine/metadata-modules/field-metadata/field-metadata.resolver';
+import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
+import { IsFieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator';
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+
+import { FieldMetadataService } from './field-metadata.service';
+import { FieldMetadataEntity } from './field-metadata.entity';
+
+import { CreateFieldInput } from './dtos/create-field.input';
+import { UpdateFieldInput } from './dtos/update-field.input';
+
+@Module({
+  imports: [
+    NestjsQueryGraphQLModule.forFeature({
+      imports: [
+        NestjsQueryTypeOrmModule.forFeature(
+          [FieldMetadataEntity, RelationMetadataEntity],
+          'metadata',
+        ),
+        WorkspaceMigrationModule,
+        WorkspaceMigrationRunnerModule,
+        ObjectMetadataModule,
+        DataSourceModule,
+        TypeORMModule,
+      ],
+      services: [IsFieldMetadataDefaultValue, FieldMetadataService],
+      resolvers: [
+        {
+          EntityClass: FieldMetadataEntity,
+          DTOClass: FieldMetadataDTO,
+          CreateDTOClass: CreateFieldInput,
+          UpdateDTOClass: UpdateFieldInput,
+          ServiceClass: FieldMetadataService,
+          pagingStrategy: PagingStrategies.CURSOR,
+          read: {
+            defaultSort: [{ field: 'id', direction: SortDirection.DESC }],
+          },
+          create: {
+            // Manually created because of the async validation
+            one: { disabled: true },
+            many: { disabled: true },
+          },
+          update: {
+            // Manually created because of the async validation
+            one: { disabled: true },
+            many: { disabled: true },
+          },
+          delete: { disabled: true },
+          guards: [JwtAuthGuard],
+        },
+      ],
+    }),
+  ],
+  providers: [
+    IsFieldMetadataDefaultValue,
+    IsFieldMetadataOptions,
+    FieldMetadataService,
+    FieldMetadataResolver,
+  ],
+  exports: [FieldMetadataService],
+})
+export class FieldMetadataModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts
new file mode 100644
index 000000000000..b4bc92e00fa8
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts
@@ -0,0 +1,111 @@
+import {
+  BadRequestException,
+  UnauthorizedException,
+  UseGuards,
+} from '@nestjs/common';
+import {
+  Args,
+  Context,
+  Mutation,
+  Parent,
+  ResolveField,
+  Resolver,
+} from '@nestjs/graphql';
+
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { CreateOneFieldMetadataInput } from 'src/engine/metadata-modules/field-metadata/dtos/create-field.input';
+import { DeleteOneFieldInput } from 'src/engine/metadata-modules/field-metadata/dtos/delete-field.input';
+import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
+import { RelationDefinitionDTO } from 'src/engine/metadata-modules/field-metadata/dtos/relation-definition.dto';
+import { UpdateOneFieldMetadataInput } from 'src/engine/metadata-modules/field-metadata/dtos/update-field.input';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
+
+@UseGuards(JwtAuthGuard)
+@Resolver(() => FieldMetadataDTO)
+export class FieldMetadataResolver {
+  constructor(private readonly fieldMetadataService: FieldMetadataService) {}
+
+  @Mutation(() => FieldMetadataDTO)
+  createOneField(
+    @Args('input') input: CreateOneFieldMetadataInput,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+  ) {
+    return this.fieldMetadataService.createOne({
+      ...input.field,
+      workspaceId,
+    });
+  }
+
+  @Mutation(() => FieldMetadataDTO)
+  updateOneField(
+    @Args('input') input: UpdateOneFieldMetadataInput,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+  ) {
+    return this.fieldMetadataService.updateOne(input.id, {
+      ...input.update,
+      workspaceId,
+    });
+  }
+
+  @Mutation(() => FieldMetadataDTO)
+  async deleteOneField(
+    @Args('input') input: DeleteOneFieldInput,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+  ) {
+    if (!workspaceId) {
+      throw new UnauthorizedException();
+    }
+
+    const fieldMetadata =
+      await this.fieldMetadataService.findOneWithinWorkspace(workspaceId, {
+        where: {
+          id: input.id.toString(),
+        },
+      });
+
+    if (!fieldMetadata) {
+      throw new BadRequestException('Field does not exist');
+    }
+
+    if (!fieldMetadata.isCustom) {
+      throw new BadRequestException("Standard Fields can't be deleted");
+    }
+
+    if (fieldMetadata.isActive) {
+      throw new BadRequestException("Active fields can't be deleted");
+    }
+
+    if (fieldMetadata.type === FieldMetadataType.RELATION) {
+      throw new BadRequestException(
+        "Relation fields can't be deleted, you need to delete the RelationMetadata instead",
+      );
+    }
+
+    return this.fieldMetadataService.deleteOneField(input, workspaceId);
+  }
+
+  @ResolveField(() => RelationDefinitionDTO, { nullable: true })
+  async relationDefinition(
+    @Parent() fieldMetadata: FieldMetadataDTO,
+    @Context() context: { loaders: IDataloaders },
+  ): Promise<RelationDefinitionDTO | null> {
+    if (fieldMetadata.type !== FieldMetadataType.RELATION) {
+      return null;
+    }
+
+    const relationMetadataItem =
+      await context.loaders.relationMetadataLoader.load(fieldMetadata.id);
+
+    const relationDefinition =
+      await this.fieldMetadataService.getRelationDefinitionFromRelationMetadata(
+        fieldMetadata,
+        relationMetadataItem,
+      );
+
+    return relationDefinition;
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
new file mode 100644
index 000000000000..38b2d4b5718f
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
@@ -0,0 +1,536 @@
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
+
+import { v4 as uuidV4 } from 'uuid';
+import { DataSource, FindOneOptions, Repository } from 'typeorm';
+import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
+
+import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service';
+import { WorkspaceMigrationService } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.service';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { CreateFieldInput } from 'src/engine/metadata-modules/field-metadata/dtos/create-field.input';
+import {
+  WorkspaceMigrationColumnActionType,
+  WorkspaceMigrationColumnDrop,
+  WorkspaceMigrationTableAction,
+  WorkspaceMigrationTableActionType,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { TypeORMService } from 'src/database/typeorm/typeorm.service';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { UpdateFieldInput } from 'src/engine/metadata-modules/field-metadata/dtos/update-field.input';
+import { WorkspaceMigrationFactory } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.factory';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
+import { generateNullable } from 'src/engine/metadata-modules/field-metadata/utils/generate-nullable';
+import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
+import {
+  RelationDefinitionDTO,
+  RelationDefinitionType,
+} from 'src/engine/metadata-modules/field-metadata/dtos/relation-definition.dto';
+import {
+  RelationMetadataEntity,
+  RelationMetadataType,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { DeleteOneFieldInput } from 'src/engine/metadata-modules/field-metadata/dtos/delete-field.input';
+import { computeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
+import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';
+
+import {
+  FieldMetadataEntity,
+  FieldMetadataType,
+} from './field-metadata.entity';
+
+import { isEnumFieldMetadataType } from './utils/is-enum-field-metadata-type.util';
+import { generateRatingOptions } from './utils/generate-rating-optionts.util';
+import { generateDefaultValue } from './utils/generate-default-value';
+
+@Injectable()
+export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntity> {
+  constructor(
+    @InjectDataSource('metadata')
+    private readonly metadataDataSource: DataSource,
+    @InjectRepository(FieldMetadataEntity, 'metadata')
+    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
+    @InjectRepository(RelationMetadataEntity, 'metadata')
+    private readonly relationMetadataRepository: Repository<RelationMetadataEntity>,
+    private readonly objectMetadataService: ObjectMetadataService,
+    private readonly workspaceMigrationFactory: WorkspaceMigrationFactory,
+    private readonly workspaceMigrationService: WorkspaceMigrationService,
+    private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
+    private readonly dataSourceService: DataSourceService,
+    private readonly typeORMService: TypeORMService,
+  ) {
+    super(fieldMetadataRepository);
+  }
+
+  override async createOne(
+    fieldMetadataInput: CreateFieldInput,
+  ): Promise<FieldMetadataEntity> {
+    const queryRunner = this.metadataDataSource.createQueryRunner();
+
+    await queryRunner.connect();
+    await queryRunner.startTransaction();
+
+    try {
+      const fieldMetadataRepository =
+        queryRunner.manager.getRepository<FieldMetadataEntity<'default'>>(
+          FieldMetadataEntity,
+        );
+      const objectMetadata =
+        await this.objectMetadataService.findOneWithinWorkspace(
+          fieldMetadataInput.workspaceId,
+          {
+            where: {
+              id: fieldMetadataInput.objectMetadataId,
+            },
+          },
+        );
+
+      if (!objectMetadata) {
+        throw new NotFoundException('Object does not exist');
+      }
+
+      if (!fieldMetadataInput.isRemoteCreation) {
+        assertMutationNotOnRemoteObject(objectMetadata);
+      }
+
+      // Double check in case the service is directly called
+      if (isEnumFieldMetadataType(fieldMetadataInput.type)) {
+        if (
+          !fieldMetadataInput.options &&
+          fieldMetadataInput.type !== FieldMetadataType.RATING
+        ) {
+          throw new BadRequestException('Options are required for enum fields');
+        }
+      }
+
+      // Generate options for rating fields
+      if (fieldMetadataInput.type === FieldMetadataType.RATING) {
+        fieldMetadataInput.options = generateRatingOptions();
+      }
+
+      const fieldAlreadyExists = await fieldMetadataRepository.findOne({
+        where: {
+          name: fieldMetadataInput.name,
+          objectMetadataId: fieldMetadataInput.objectMetadataId,
+          workspaceId: fieldMetadataInput.workspaceId,
+        },
+      });
+
+      if (fieldAlreadyExists) {
+        throw new ConflictException('Field already exists');
+      }
+
+      const createdFieldMetadata = await fieldMetadataRepository.save({
+        ...fieldMetadataInput,
+        isNullable: generateNullable(
+          fieldMetadataInput.type,
+          fieldMetadataInput.isNullable,
+          fieldMetadataInput.isRemoteCreation,
+        ),
+        defaultValue:
+          fieldMetadataInput.defaultValue ??
+          generateDefaultValue(fieldMetadataInput.type),
+        options: fieldMetadataInput.options
+          ? fieldMetadataInput.options.map((option) => ({
+              ...option,
+              id: uuidV4(),
+            }))
+          : undefined,
+        isActive: true,
+        isCustom: true,
+      });
+
+      if (!fieldMetadataInput.isRemoteCreation) {
+        await this.workspaceMigrationService.createCustomMigration(
+          generateMigrationName(`create-${createdFieldMetadata.name}`),
+          fieldMetadataInput.workspaceId,
+          [
+            {
+              name: computeObjectTargetTable(objectMetadata),
+              action: WorkspaceMigrationTableActionType.ALTER,
+              columns: this.workspaceMigrationFactory.createColumnActions(
+                WorkspaceMigrationColumnActionType.CREATE,
+                createdFieldMetadata,
+              ),
+            } satisfies WorkspaceMigrationTableAction,
+          ],
+        );
+
+        await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
+          fieldMetadataInput.workspaceId,
+        );
+      }
+
+      // TODO: Move viewField creation to a cdc scheduler
+      const dataSourceMetadata =
+        await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
+          fieldMetadataInput.workspaceId,
+        );
+
+      const workspaceDataSource =
+        await this.typeORMService.connectToDataSource(dataSourceMetadata);
+
+      const workspaceQueryRunner = workspaceDataSource?.createQueryRunner();
+
+      if (!workspaceQueryRunner) {
+        throw new Error('Could not create workspace query runner');
+      }
+
+      await workspaceQueryRunner.connect();
+      await workspaceQueryRunner.startTransaction();
+
+      try {
+        // TODO: use typeorm repository
+        const view = await workspaceQueryRunner?.query(
+          `SELECT id FROM ${dataSourceMetadata.schema}."view"
+      WHERE "objectMetadataId" = '${createdFieldMetadata.objectMetadataId}'`,
+        );
+
+        const existingViewFields = await workspaceQueryRunner?.query(
+          `SELECT * FROM ${dataSourceMetadata.schema}."viewField"
+      WHERE "viewId" = '${view[0].id}'`,
+        );
+
+        const lastPosition = existingViewFields
+          .map((viewField) => viewField.position)
+          .reduce((acc, position) => {
+            if (position > acc) {
+              return position;
+            }
+
+            return acc;
+          }, -1);
+
+        await workspaceQueryRunner?.query(
+          `INSERT INTO ${dataSourceMetadata.schema}."viewField"
+    ("fieldMetadataId", "position", "isVisible", "size", "viewId")
+    VALUES ('${createdFieldMetadata.id}', '${lastPosition + 1}', true, 180, '${
+      view[0].id
+    }')`,
+        );
+        await workspaceQueryRunner.commitTransaction();
+      } catch (error) {
+        await workspaceQueryRunner.rollbackTransaction();
+        throw error;
+      } finally {
+        await workspaceQueryRunner.release();
+      }
+
+      await queryRunner.commitTransaction();
+
+      return createdFieldMetadata;
+    } catch (error) {
+      await queryRunner.rollbackTransaction();
+      throw error;
+    } finally {
+      await queryRunner.release();
+    }
+  }
+
+  override async updateOne(
+    id: string,
+    fieldMetadataInput: UpdateFieldInput,
+  ): Promise<FieldMetadataEntity> {
+    const queryRunner = this.metadataDataSource.createQueryRunner();
+
+    await queryRunner.connect();
+    await queryRunner.startTransaction();
+
+    try {
+      const fieldMetadataRepository =
+        queryRunner.manager.getRepository<FieldMetadataEntity<'default'>>(
+          FieldMetadataEntity,
+        );
+
+      const existingFieldMetadata = await fieldMetadataRepository.findOne({
+        where: {
+          id,
+          workspaceId: fieldMetadataInput.workspaceId,
+        },
+      });
+
+      if (!existingFieldMetadata) {
+        throw new NotFoundException('Field does not exist');
+      }
+
+      const objectMetadata =
+        await this.objectMetadataService.findOneWithinWorkspace(
+          fieldMetadataInput.workspaceId,
+          {
+            where: {
+              id: existingFieldMetadata?.objectMetadataId,
+            },
+          },
+        );
+
+      if (!objectMetadata) {
+        throw new NotFoundException('Object does not exist');
+      }
+
+      assertMutationNotOnRemoteObject(objectMetadata);
+
+      if (
+        objectMetadata.labelIdentifierFieldMetadataId ===
+          existingFieldMetadata.id &&
+        fieldMetadataInput.isActive === false
+      ) {
+        throw new BadRequestException(
+          'Cannot deactivate label identifier field',
+        );
+      }
+
+      if (fieldMetadataInput.options) {
+        for (const option of fieldMetadataInput.options) {
+          if (!option.id) {
+            throw new BadRequestException('Option id is required');
+          }
+        }
+      }
+
+      const updatableFieldInput =
+        existingFieldMetadata.isCustom === false
+          ? this.buildUpdatableStandardFieldInput(
+              fieldMetadataInput,
+              existingFieldMetadata,
+            )
+          : fieldMetadataInput;
+
+      // We're running field update under a transaction, so we can rollback if migration fails
+      await fieldMetadataRepository.update(id, {
+        ...updatableFieldInput,
+        defaultValue:
+          // Todo: we handle default value for all field types.
+          ![
+            FieldMetadataType.SELECT,
+            FieldMetadataType.MULTI_SELECT,
+            FieldMetadataType.BOOLEAN,
+          ].includes(existingFieldMetadata.type)
+            ? existingFieldMetadata.defaultValue
+            : updatableFieldInput.defaultValue !== null
+              ? updatableFieldInput.defaultValue
+              : null,
+      });
+      const updatedFieldMetadata = await fieldMetadataRepository.findOneOrFail({
+        where: { id },
+      });
+
+      if (
+        fieldMetadataInput.name ||
+        updatableFieldInput.options ||
+        updatableFieldInput.defaultValue
+      ) {
+        await this.workspaceMigrationService.createCustomMigration(
+          generateMigrationName(`update-${updatedFieldMetadata.name}`),
+          existingFieldMetadata.workspaceId,
+          [
+            {
+              name: computeObjectTargetTable(objectMetadata),
+              action: WorkspaceMigrationTableActionType.ALTER,
+              columns: this.workspaceMigrationFactory.createColumnActions(
+                WorkspaceMigrationColumnActionType.ALTER,
+                existingFieldMetadata,
+                updatedFieldMetadata,
+              ),
+            } satisfies WorkspaceMigrationTableAction,
+          ],
+        );
+
+        await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
+          updatedFieldMetadata.workspaceId,
+        );
+      }
+
+      await queryRunner.commitTransaction();
+
+      return updatedFieldMetadata;
+    } catch (error) {
+      await queryRunner.rollbackTransaction();
+      throw error;
+    } finally {
+      await queryRunner.release();
+    }
+  }
+
+  public async deleteOneField(
+    input: DeleteOneFieldInput,
+    workspaceId: string,
+  ): Promise<FieldMetadataEntity> {
+    const queryRunner = this.metadataDataSource.createQueryRunner();
+
+    await queryRunner.connect();
+    await queryRunner.startTransaction(); // transaction not safe as a different queryRunner is used within workspaceMigrationRunnerService
+
+    try {
+      const fieldMetadataRepository =
+        queryRunner.manager.getRepository<FieldMetadataEntity<'default'>>(
+          FieldMetadataEntity,
+        );
+
+      const fieldMetadata = await fieldMetadataRepository.findOne({
+        where: {
+          id: input.id,
+          workspaceId: workspaceId,
+        },
+      });
+
+      if (!fieldMetadata) {
+        throw new NotFoundException('Field does not exist');
+      }
+
+      const objectMetadata =
+        await this.objectMetadataService.findOneWithinWorkspace(workspaceId, {
+          where: {
+            id: fieldMetadata?.objectMetadataId,
+          },
+        });
+
+      if (!objectMetadata) {
+        throw new NotFoundException('Object does not exist');
+      }
+
+      await fieldMetadataRepository.delete(fieldMetadata.id);
+
+      await this.workspaceMigrationService.createCustomMigration(
+        generateMigrationName(`delete-${fieldMetadata.name}`),
+        workspaceId,
+        [
+          {
+            name: computeObjectTargetTable(objectMetadata),
+            action: WorkspaceMigrationTableActionType.ALTER,
+            columns: [
+              {
+                action: WorkspaceMigrationColumnActionType.DROP,
+                columnName: computeColumnName(fieldMetadata),
+              } satisfies WorkspaceMigrationColumnDrop,
+            ],
+          } satisfies WorkspaceMigrationTableAction,
+        ],
+      );
+
+      await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
+        workspaceId,
+      );
+
+      await queryRunner.commitTransaction();
+
+      return fieldMetadata;
+    } catch (error) {
+      await queryRunner.rollbackTransaction();
+      throw error;
+    } finally {
+      await queryRunner.release();
+    }
+  }
+
+  public async findOneOrFail(
+    id: string,
+    options?: FindOneOptions<FieldMetadataEntity>,
+  ) {
+    const fieldMetadata = await this.fieldMetadataRepository.findOne({
+      ...options,
+      where: {
+        ...options?.where,
+        id,
+      },
+    });
+
+    if (!fieldMetadata) {
+      throw new NotFoundException('Field does not exist');
+    }
+
+    return fieldMetadata;
+  }
+
+  public async findOneWithinWorkspace(
+    workspaceId: string,
+    options: FindOneOptions<FieldMetadataEntity>,
+  ) {
+    return this.fieldMetadataRepository.findOne({
+      ...options,
+      where: {
+        ...options.where,
+        workspaceId,
+      },
+    });
+  }
+
+  public async deleteFieldsMetadata(workspaceId: string) {
+    await this.fieldMetadataRepository.delete({ workspaceId });
+  }
+
+  private buildUpdatableStandardFieldInput(
+    fieldMetadataInput: UpdateFieldInput,
+    existingFieldMetadata: FieldMetadataEntity,
+  ) {
+    let fieldMetadataInputOverrided = {};
+
+    fieldMetadataInputOverrided = {
+      id: fieldMetadataInput.id,
+      isActive: fieldMetadataInput.isActive,
+      workspaceId: fieldMetadataInput.workspaceId,
+      defaultValue: fieldMetadataInput.defaultValue,
+    };
+
+    if (existingFieldMetadata.type === FieldMetadataType.SELECT) {
+      fieldMetadataInputOverrided = {
+        ...fieldMetadataInputOverrided,
+        options: fieldMetadataInput.options,
+      };
+    }
+
+    return fieldMetadataInputOverrided as UpdateFieldInput;
+  }
+
+  public async getRelationDefinitionFromRelationMetadata(
+    fieldMetadataDTO: FieldMetadataDTO,
+    relationMetadata: RelationMetadataEntity,
+  ): Promise<RelationDefinitionDTO | null> {
+    if (fieldMetadataDTO.type !== FieldMetadataType.RELATION) {
+      return null;
+    }
+
+    const isRelationFromSource =
+      relationMetadata.fromFieldMetadata.id === fieldMetadataDTO.id;
+
+    // TODO: implement MANY_TO_MANY
+    if (relationMetadata.relationType === RelationMetadataType.MANY_TO_MANY) {
+      throw new Error(`
+        Relation type ${relationMetadata.relationType} not supported
+      `);
+    }
+
+    if (isRelationFromSource) {
+      const direction =
+        relationMetadata.relationType === RelationMetadataType.ONE_TO_ONE
+          ? RelationDefinitionType.ONE_TO_ONE
+          : RelationDefinitionType.ONE_TO_MANY;
+
+      return {
+        sourceObjectMetadata: relationMetadata.fromObjectMetadata,
+        sourceFieldMetadata: relationMetadata.fromFieldMetadata,
+        targetObjectMetadata: relationMetadata.toObjectMetadata,
+        targetFieldMetadata: relationMetadata.toFieldMetadata,
+        direction,
+      };
+    } else {
+      const direction =
+        relationMetadata.relationType === RelationMetadataType.ONE_TO_ONE
+          ? RelationDefinitionType.ONE_TO_ONE
+          : RelationDefinitionType.MANY_TO_ONE;
+
+      return {
+        sourceObjectMetadata: relationMetadata.toObjectMetadata,
+        sourceFieldMetadata: relationMetadata.toFieldMetadata,
+        targetObjectMetadata: relationMetadata.fromObjectMetadata,
+        targetFieldMetadata: relationMetadata.fromFieldMetadata,
+        direction,
+      };
+    }
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface.ts
new file mode 100644
index 000000000000..1c812957e657
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface.ts
@@ -0,0 +1,14 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+export interface CompositeProperty {
+  name: string;
+  description?: string;
+  type: FieldMetadataType;
+  hidden: 'input' | 'output' | true | false;
+  isRequired: boolean;
+}
+
+export interface CompositeType {
+  type: FieldMetadataType;
+  properties: CompositeProperty[];
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface.ts
new file mode 100644
index 000000000000..5ca1ce6d4ff2
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface.ts
@@ -0,0 +1,75 @@
+import {
+  FieldMetadataDefaultValueAddress,
+  FieldMetadataDefaultValueBoolean,
+  FieldMetadataDefaultValueCurrency,
+  FieldMetadataDefaultValueDateTime,
+  FieldMetadataDefaultValueFullName,
+  FieldMetadataDefaultValueRawJson,
+  FieldMetadataDefaultValueLink,
+  FieldMetadataDefaultValueNumber,
+  FieldMetadataDefaultValueString,
+  FieldMetadataDefaultValueUuidFunction,
+  FieldMetadataDefaultValueNowFunction,
+} from 'src/engine/metadata-modules/field-metadata/dtos/default-value.input';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+type ExtractValueType<T> = T extends { value: infer V } ? V : T;
+
+type UnionOfValues<T> = T[keyof T];
+
+type FieldMetadataDefaultValueMapping = {
+  [FieldMetadataType.UUID]:
+    | FieldMetadataDefaultValueString
+    | FieldMetadataDefaultValueUuidFunction;
+  [FieldMetadataType.TEXT]: FieldMetadataDefaultValueString;
+  [FieldMetadataType.PHONE]: FieldMetadataDefaultValueString;
+  [FieldMetadataType.EMAIL]: FieldMetadataDefaultValueString;
+  [FieldMetadataType.DATE_TIME]:
+    | FieldMetadataDefaultValueDateTime
+    | FieldMetadataDefaultValueNowFunction;
+  [FieldMetadataType.DATE]:
+    | FieldMetadataDefaultValueDateTime
+    | FieldMetadataDefaultValueNowFunction;
+  [FieldMetadataType.BOOLEAN]: FieldMetadataDefaultValueBoolean;
+  [FieldMetadataType.NUMBER]: FieldMetadataDefaultValueNumber;
+  [FieldMetadataType.POSITION]: FieldMetadataDefaultValueNumber;
+  [FieldMetadataType.NUMERIC]: FieldMetadataDefaultValueString;
+  [FieldMetadataType.PROBABILITY]: FieldMetadataDefaultValueNumber;
+  [FieldMetadataType.LINK]: FieldMetadataDefaultValueLink;
+  [FieldMetadataType.CURRENCY]: FieldMetadataDefaultValueCurrency;
+  [FieldMetadataType.FULL_NAME]: FieldMetadataDefaultValueFullName;
+  [FieldMetadataType.ADDRESS]: FieldMetadataDefaultValueAddress;
+  [FieldMetadataType.RATING]: FieldMetadataDefaultValueString;
+  [FieldMetadataType.SELECT]: FieldMetadataDefaultValueString;
+  [FieldMetadataType.MULTI_SELECT]: FieldMetadataDefaultValueString;
+  [FieldMetadataType.RAW_JSON]: FieldMetadataDefaultValueRawJson;
+};
+
+export type FieldMetadataClassValidation =
+  UnionOfValues<FieldMetadataDefaultValueMapping>;
+
+export type FieldMetadataFunctionDefaultValue = ExtractValueType<
+  FieldMetadataDefaultValueUuidFunction | FieldMetadataDefaultValueNowFunction
+>;
+
+type DefaultValueByFieldMetadata<T extends FieldMetadataType | 'default'> = [
+  T,
+] extends [keyof FieldMetadataDefaultValueMapping]
+  ? ExtractValueType<FieldMetadataDefaultValueMapping[T]> | null
+  : T extends 'default'
+    ? ExtractValueType<UnionOfValues<FieldMetadataDefaultValueMapping>> | null
+    : never;
+
+export type FieldMetadataDefaultValue<
+  T extends FieldMetadataType | 'default' = 'default',
+> = DefaultValueByFieldMetadata<T>;
+
+type FieldMetadataDefaultValueExtractedTypes = {
+  [K in keyof FieldMetadataDefaultValueMapping]: ExtractValueType<
+    FieldMetadataDefaultValueMapping[K]
+  >;
+};
+
+export type FieldMetadataDefaultSerializableValue =
+  | FieldMetadataDefaultValueExtractedTypes[keyof FieldMetadataDefaultValueExtractedTypes]
+  | null;
diff --git a/packages/twenty-server/src/metadata/field-metadata/interfaces/field-metadata-options.interface.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface.ts
similarity index 79%
rename from packages/twenty-server/src/metadata/field-metadata/interfaces/field-metadata-options.interface.ts
rename to packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface.ts
index 12d56b1cd025..c6139048b511 100644
--- a/packages/twenty-server/src/metadata/field-metadata/interfaces/field-metadata-options.interface.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface.ts
@@ -1,8 +1,8 @@
 import {
   FieldMetadataComplexOption,
   FieldMetadataDefaultOption,
-} from 'src/metadata/field-metadata/dtos/options.input';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
+} from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 
 type FieldMetadataOptionsMapping = {
   [FieldMetadataType.RATING]: FieldMetadataDefaultOption[];
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface.ts
new file mode 100644
index 000000000000..0dff9064499c
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface.ts
@@ -0,0 +1,23 @@
+import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
+import { FieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+
+export interface FieldMetadataInterface<
+  T extends FieldMetadataType | 'default' = 'default',
+> {
+  id: string;
+  type: FieldMetadataType;
+  name: string;
+  label: string;
+  defaultValue?: FieldMetadataDefaultValue<T>;
+  options?: FieldMetadataOptions<T>;
+  objectMetadataId: string;
+  workspaceId?: string;
+  description?: string;
+  isNullable?: boolean;
+  fromRelationMetadata?: RelationMetadataEntity;
+  toRelationMetadata?: RelationMetadataEntity;
+  isCustom?: boolean;
+}
diff --git a/packages/twenty-server/src/metadata/field-metadata/interfaces/object-metadata.interface.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface.ts
similarity index 96%
rename from packages/twenty-server/src/metadata/field-metadata/interfaces/object-metadata.interface.ts
rename to packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface.ts
index e6629cfbfe8c..d20201de8c44 100644
--- a/packages/twenty-server/src/metadata/field-metadata/interfaces/object-metadata.interface.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface.ts
@@ -15,4 +15,5 @@ export interface ObjectMetadataInterface {
   isSystem: boolean;
   isCustom: boolean;
   isActive: boolean;
+  isRemote: boolean;
 }
diff --git a/packages/twenty-server/src/metadata/field-metadata/interfaces/relation-metadata.interface.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/relation-metadata.interface.ts
similarity index 83%
rename from packages/twenty-server/src/metadata/field-metadata/interfaces/relation-metadata.interface.ts
rename to packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/relation-metadata.interface.ts
index 9778d1f41d53..b1342b4b8396 100644
--- a/packages/twenty-server/src/metadata/field-metadata/interfaces/relation-metadata.interface.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/relation-metadata.interface.ts
@@ -1,4 +1,4 @@
-import { RelationMetadataType } from 'src/metadata/relation-metadata/relation-metadata.entity';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 
 import { ObjectMetadataInterface } from './object-metadata.interface';
 import { FieldMetadataInterface } from './field-metadata.interface';
diff --git a/packages/twenty-server/src/metadata/field-metadata/utils/__tests__/generate-nullable.spec.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/generate-nullable.spec.ts
similarity index 85%
rename from packages/twenty-server/src/metadata/field-metadata/utils/__tests__/generate-nullable.spec.ts
rename to packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/generate-nullable.spec.ts
index a9169996873a..6d4ab103196d 100644
--- a/packages/twenty-server/src/metadata/field-metadata/utils/__tests__/generate-nullable.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/generate-nullable.spec.ts
@@ -1,5 +1,5 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { generateNullable } from 'src/metadata/field-metadata/utils/generate-nullable';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { generateNullable } from 'src/engine/metadata-modules/field-metadata/utils/generate-nullable';
 
 describe('generateNullable', () => {
   it('should generate a nullable value false for TEXT, EMAIL, PHONE no matter what the input is', () => {
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/serialize-default-value.spec.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/serialize-default-value.spec.ts
new file mode 100644
index 000000000000..61e46ec6a8c5
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/serialize-default-value.spec.ts
@@ -0,0 +1,40 @@
+import { BadRequestException } from '@nestjs/common';
+
+import { serializeDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/serialize-default-value';
+
+describe('serializeDefaultValue', () => {
+  it('should return null for undefined defaultValue', () => {
+    expect(serializeDefaultValue()).toBeNull();
+  });
+
+  it('should handle uuid dynamic default value', () => {
+    expect(serializeDefaultValue('uuid')).toBe('public.uuid_generate_v4()');
+  });
+
+  it('should handle now dynamic default value', () => {
+    expect(serializeDefaultValue('now')).toBe('now()');
+  });
+
+  it('should throw BadRequestException for invalid dynamic default value type', () => {
+    expect(() => serializeDefaultValue('invalid')).toThrow(BadRequestException);
+  });
+
+  it('should handle string static default value', () => {
+    expect(serializeDefaultValue("'test'")).toBe("'test'");
+  });
+
+  it('should handle number static default value', () => {
+    expect(serializeDefaultValue(123)).toBe(123);
+  });
+
+  it('should handle boolean static default value', () => {
+    expect(serializeDefaultValue(true)).toBe(true);
+    expect(serializeDefaultValue(false)).toBe(false);
+  });
+
+  it('should handle Date static default value', () => {
+    const date = new Date('2023-01-01');
+
+    expect(serializeDefaultValue(date)).toBe(`'${date.toISOString()}'`);
+  });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/validate-default-value-based-on-type.spec.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/validate-default-value-based-on-type.spec.ts
new file mode 100644
index 000000000000..757303d4c1ea
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/validate-default-value-based-on-type.spec.ts
@@ -0,0 +1,154 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { validateDefaultValueForType } from 'src/engine/metadata-modules/field-metadata/utils/validate-default-value-for-type.util';
+
+describe('validateDefaultValueForType', () => {
+  it('should return true for null defaultValue', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.TEXT, null).isValid,
+    ).toBe(true);
+  });
+
+  // Dynamic default values
+  it('should validate uuid dynamic default value for UUID type', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.UUID, 'uuid').isValid,
+    ).toBe(true);
+  });
+
+  it('should validate now dynamic default value for DATE_TIME type', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.DATE_TIME, 'now').isValid,
+    ).toBe(true);
+  });
+
+  it('should return false for mismatched dynamic default value', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.UUID, 'now').isValid,
+    ).toBe(false);
+  });
+
+  // Static default values
+  it('should validate string default value for TEXT type', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.TEXT, "'test'").isValid,
+    ).toBe(true);
+  });
+
+  it('should return false for invalid string default value for TEXT type', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.TEXT, 123).isValid,
+    ).toBe(false);
+  });
+
+  it('should validate string default value for PHONE type', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.PHONE, "'+123456789'")
+        .isValid,
+    ).toBe(true);
+  });
+
+  it('should return false for invalid string default value for PHONE type', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.PHONE, 123).isValid,
+    ).toBe(false);
+  });
+
+  it('should validate string default value for EMAIL type', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.EMAIL, "'test@example.com'")
+        .isValid,
+    ).toBe(true);
+  });
+
+  it('should return false for invalid string default value for EMAIL type', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.EMAIL, 123).isValid,
+    ).toBe(false);
+  });
+
+  it('should validate number default value for NUMBER type', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.NUMBER, 100).isValid,
+    ).toBe(true);
+  });
+
+  it('should return false for invalid number default value for NUMBER type', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.NUMBER, '100').isValid,
+    ).toBe(false);
+  });
+
+  it('should validate number default value for PROBABILITY type', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.PROBABILITY, 0.5).isValid,
+    ).toBe(true);
+  });
+
+  it('should return false for invalid number default value for PROBABILITY type', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.PROBABILITY, '50%').isValid,
+    ).toBe(false);
+  });
+
+  it('should validate boolean default value for BOOLEAN type', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.BOOLEAN, true).isValid,
+    ).toBe(true);
+  });
+
+  it('should return false for invalid boolean default value for BOOLEAN type', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.BOOLEAN, 'true').isValid,
+    ).toBe(false);
+  });
+
+  // LINK type
+  it('should validate LINK default value', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.LINK, {
+        label: "'http://example.com'",
+        url: "'Example'",
+      }).isValid,
+    ).toBe(true);
+  });
+
+  it('should return false for invalid LINK default value', () => {
+    expect(
+      validateDefaultValueForType(
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-expect-error Just for testing purposes
+        { label: 123, url: {} },
+        FieldMetadataType.LINK,
+      ).isValid,
+    ).toBe(false);
+  });
+
+  // CURRENCY type
+  it('should validate CURRENCY default value', () => {
+    expect(
+      validateDefaultValueForType(FieldMetadataType.CURRENCY, {
+        amountMicros: '100',
+        currencyCode: "'USD'",
+      }).isValid,
+    ).toBe(true);
+  });
+
+  it('should return false for invalid CURRENCY default value', () => {
+    expect(
+      validateDefaultValueForType(
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-expect-error Just for testing purposes
+        { amountMicros: 100, currencyCode: "'USD'" },
+        FieldMetadataType.CURRENCY,
+      ).isValid,
+    ).toBe(false);
+  });
+
+  // Unknown type
+  it('should return false for unknown type', () => {
+    expect(
+      validateDefaultValueForType('unknown' as FieldMetadataType, "'test'")
+        .isValid,
+    ).toBe(false);
+  });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/compute-column-name.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/compute-column-name.util.ts
new file mode 100644
index 000000000000..ac912a4ca113
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/compute-column-name.util.ts
@@ -0,0 +1,53 @@
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+import { CompositeProperty } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
+import { pascalCase } from 'src/utils/pascal-case';
+
+type ComputeColumnNameOptions = { isForeignKey?: boolean };
+
+export function computeColumnName(
+  fieldName: string,
+  options?: ComputeColumnNameOptions,
+): string;
+export function computeColumnName<T extends FieldMetadataType | 'default'>(
+  fieldMetadata: FieldMetadataInterface<T>,
+  ioptions?: ComputeColumnNameOptions,
+): string;
+// TODO: If we need to implement custom name logic for columns, we can do it here
+export function computeColumnName<T extends FieldMetadataType | 'default'>(
+  fieldMetadataOrFieldName: FieldMetadataInterface<T> | string,
+  options?: ComputeColumnNameOptions,
+): string {
+  const generateName = (name: string) => {
+    return options?.isForeignKey ? `${name}Id` : name;
+  };
+
+  if (typeof fieldMetadataOrFieldName === 'string') {
+    return generateName(fieldMetadataOrFieldName);
+  }
+
+  if (isCompositeFieldMetadataType(fieldMetadataOrFieldName.type)) {
+    throw new Error(
+      `Cannot compute column name for composite field metadata type: ${fieldMetadataOrFieldName.type}`,
+    );
+  }
+
+  return generateName(fieldMetadataOrFieldName.name);
+}
+
+export const computeCompositeColumnName = <
+  T extends FieldMetadataType | 'default',
+>(
+  fieldMetadata: FieldMetadataInterface<T>,
+  compositeProperty: CompositeProperty,
+): string => {
+  if (!isCompositeFieldMetadataType(fieldMetadata.type)) {
+    throw new Error(
+      `Cannot compute composite column name for non-composite field metadata type: ${fieldMetadata.type}`,
+    );
+  }
+
+  return `${fieldMetadata.name}${pascalCase(compositeProperty.name)}`;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-default-value.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-default-value.ts
new file mode 100644
index 000000000000..2ec5a820ea70
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-default-value.ts
@@ -0,0 +1,42 @@
+import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+export function generateDefaultValue(
+  type: FieldMetadataType,
+): FieldMetadataDefaultValue {
+  switch (type) {
+    case FieldMetadataType.TEXT:
+    case FieldMetadataType.PHONE:
+    case FieldMetadataType.EMAIL:
+      return "''";
+    case FieldMetadataType.FULL_NAME:
+      return {
+        firstName: "''",
+        lastName: "''",
+      };
+    case FieldMetadataType.ADDRESS:
+      return {
+        addressStreet1: "''",
+        addressStreet2: "''",
+        addressCity: "''",
+        addressState: "''",
+        addressCountry: "''",
+        addressPostcode: "''",
+        addressLat: null,
+        addressLng: null,
+      };
+    case FieldMetadataType.LINK:
+      return {
+        url: "''",
+        label: "''",
+      };
+    case FieldMetadataType.CURRENCY:
+      return {
+        amountMicros: null,
+        currencyCode: "''",
+      };
+    default:
+      return null;
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-nullable.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-nullable.ts
new file mode 100644
index 000000000000..5724314847b0
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-nullable.ts
@@ -0,0 +1,20 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+export function generateNullable(
+  type: FieldMetadataType,
+  inputNullableValue?: boolean,
+  isRemoteCreation?: boolean,
+): boolean {
+  if (isRemoteCreation) {
+    return true;
+  }
+
+  switch (type) {
+    case FieldMetadataType.TEXT:
+    case FieldMetadataType.PHONE:
+    case FieldMetadataType.EMAIL:
+      return false;
+    default:
+      return inputNullableValue ?? true;
+  }
+}
diff --git a/packages/twenty-server/src/metadata/field-metadata/utils/generate-rating-optionts.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-rating-optionts.util.ts
similarity index 79%
rename from packages/twenty-server/src/metadata/field-metadata/utils/generate-rating-optionts.util.ts
rename to packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-rating-optionts.util.ts
index f4cc90dc2188..06f4f5a9e272 100644
--- a/packages/twenty-server/src/metadata/field-metadata/utils/generate-rating-optionts.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-rating-optionts.util.ts
@@ -1,6 +1,6 @@
 import { v4 as uuidV4 } from 'uuid';
 
-import { FieldMetadataDefaultOption } from 'src/metadata/field-metadata/dtos/options.input';
+import { FieldMetadataDefaultOption } from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
 
 const range = {
   start: 1,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util.ts
new file mode 100644
index 000000000000..81a7cdb6cbeb
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util.ts
@@ -0,0 +1,15 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+export const isCompositeFieldMetadataType = (
+  type: FieldMetadataType,
+): type is
+  | FieldMetadataType.LINK
+  | FieldMetadataType.CURRENCY
+  | FieldMetadataType.FULL_NAME => {
+  return (
+    type === FieldMetadataType.LINK ||
+    type === FieldMetadataType.CURRENCY ||
+    type === FieldMetadataType.FULL_NAME ||
+    type === FieldMetadataType.ADDRESS
+  );
+};
diff --git a/packages/twenty-server/src/metadata/field-metadata/utils/is-enum-field-metadata-type.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util.ts
similarity index 79%
rename from packages/twenty-server/src/metadata/field-metadata/utils/is-enum-field-metadata-type.util.ts
rename to packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util.ts
index 88dbd6404fe7..2e179b45f277 100644
--- a/packages/twenty-server/src/metadata/field-metadata/utils/is-enum-field-metadata-type.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util.ts
@@ -1,4 +1,4 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 
 export type EnumFieldMetadataUnionType =
   | FieldMetadataType.RATING
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-function-default-value.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-function-default-value.util.ts
new file mode 100644
index 000000000000..d4aaa00bb37e
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-function-default-value.util.ts
@@ -0,0 +1,21 @@
+import {
+  FieldMetadataDefaultSerializableValue,
+  FieldMetadataFunctionDefaultValue,
+} from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
+
+import {
+  FieldMetadataDefaultValueFunctionNames,
+  fieldMetadataDefaultValueFunctionName,
+} from 'src/engine/metadata-modules/field-metadata/dtos/default-value.input';
+
+export const isFunctionDefaultValue = (
+  defaultValue: FieldMetadataDefaultSerializableValue,
+): defaultValue is FieldMetadataFunctionDefaultValue => {
+  return (
+    typeof defaultValue === 'string' &&
+    !defaultValue.startsWith("'") &&
+    Object.values(fieldMetadataDefaultValueFunctionName).includes(
+      defaultValue as FieldMetadataDefaultValueFunctionNames,
+    )
+  );
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/serialize-default-value.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/serialize-default-value.ts
new file mode 100644
index 000000000000..2f93da1b8cc9
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/serialize-default-value.ts
@@ -0,0 +1,55 @@
+import { BadRequestException } from '@nestjs/common';
+
+import { FieldMetadataDefaultSerializableValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
+
+import { isFunctionDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/is-function-default-value.util';
+import { serializeFunctionDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/serialize-function-default-value.util';
+
+export const serializeDefaultValue = (
+  defaultValue?: FieldMetadataDefaultSerializableValue,
+) => {
+  if (defaultValue === undefined || defaultValue === null) {
+    return null;
+  }
+
+  // Function default values
+  if (isFunctionDefaultValue(defaultValue)) {
+    const serializedTypeDefaultValue =
+      serializeFunctionDefaultValue(defaultValue);
+
+    if (!serializedTypeDefaultValue) {
+      throw new BadRequestException('Invalid default value');
+    }
+
+    return serializedTypeDefaultValue;
+  }
+
+  // Static default values
+  if (typeof defaultValue === 'string' && defaultValue.startsWith("'")) {
+    return defaultValue;
+  }
+
+  if (typeof defaultValue === 'number') {
+    return defaultValue;
+  }
+
+  if (typeof defaultValue === 'boolean') {
+    return defaultValue;
+  }
+
+  if (defaultValue instanceof Date) {
+    return `'${defaultValue.toISOString()}'`;
+  }
+
+  if (Array.isArray(defaultValue)) {
+    return `'{${defaultValue
+      .map((value) => value.replace(/'/g, ''))
+      .join(',')}}'`;
+  }
+
+  if (typeof defaultValue === 'object') {
+    return `'${JSON.stringify(defaultValue)}'`;
+  }
+
+  throw new BadRequestException(`Invalid default value "${defaultValue}"`);
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/serialize-function-default-value.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/serialize-function-default-value.util.ts
new file mode 100644
index 000000000000..645abd556d56
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/serialize-function-default-value.util.ts
@@ -0,0 +1,14 @@
+import { FieldMetadataFunctionDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
+
+export const serializeFunctionDefaultValue = (
+  defaultValue?: FieldMetadataFunctionDefaultValue,
+) => {
+  switch (defaultValue) {
+    case 'uuid':
+      return 'public.uuid_generate_v4()';
+    case 'now':
+      return 'now()';
+    default:
+      return null;
+  }
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/validate-default-value-for-type.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/validate-default-value-for-type.util.ts
new file mode 100644
index 000000000000..ab22f3c0016d
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/validate-default-value-for-type.util.ts
@@ -0,0 +1,109 @@
+import { plainToInstance } from 'class-transformer';
+import { ValidationError, validateSync } from 'class-validator';
+
+import {
+  FieldMetadataClassValidation,
+  FieldMetadataDefaultValue,
+} from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  FieldMetadataDefaultValueAddress,
+  FieldMetadataDefaultValueBoolean,
+  FieldMetadataDefaultValueCurrency,
+  FieldMetadataDefaultValueDateTime,
+  FieldMetadataDefaultValueFullName,
+  FieldMetadataDefaultValueRawJson,
+  FieldMetadataDefaultValueLink,
+  FieldMetadataDefaultValueNumber,
+  FieldMetadataDefaultValueString,
+  FieldMetadataDefaultValueStringArray,
+  FieldMetadataDefaultValueNowFunction,
+  FieldMetadataDefaultValueUuidFunction,
+  FieldMetadataDefaultValueDate,
+} from 'src/engine/metadata-modules/field-metadata/dtos/default-value.input';
+import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
+
+export const defaultValueValidatorsMap = {
+  [FieldMetadataType.UUID]: [
+    FieldMetadataDefaultValueString,
+    FieldMetadataDefaultValueUuidFunction,
+  ],
+  [FieldMetadataType.TEXT]: [FieldMetadataDefaultValueString],
+  [FieldMetadataType.PHONE]: [FieldMetadataDefaultValueString],
+  [FieldMetadataType.EMAIL]: [FieldMetadataDefaultValueString],
+  [FieldMetadataType.DATE_TIME]: [
+    FieldMetadataDefaultValueDateTime,
+    FieldMetadataDefaultValueNowFunction,
+  ],
+  [FieldMetadataType.DATE]: [FieldMetadataDefaultValueDate],
+  [FieldMetadataType.BOOLEAN]: [FieldMetadataDefaultValueBoolean],
+  [FieldMetadataType.NUMBER]: [FieldMetadataDefaultValueNumber],
+  [FieldMetadataType.NUMERIC]: [FieldMetadataDefaultValueString],
+  [FieldMetadataType.PROBABILITY]: [FieldMetadataDefaultValueNumber],
+  [FieldMetadataType.LINK]: [FieldMetadataDefaultValueLink],
+  [FieldMetadataType.CURRENCY]: [FieldMetadataDefaultValueCurrency],
+  [FieldMetadataType.FULL_NAME]: [FieldMetadataDefaultValueFullName],
+  [FieldMetadataType.RATING]: [FieldMetadataDefaultValueString],
+  [FieldMetadataType.SELECT]: [FieldMetadataDefaultValueString],
+  [FieldMetadataType.MULTI_SELECT]: [FieldMetadataDefaultValueStringArray],
+  [FieldMetadataType.ADDRESS]: [FieldMetadataDefaultValueAddress],
+  [FieldMetadataType.RAW_JSON]: [FieldMetadataDefaultValueRawJson],
+};
+
+type ValidationResult = {
+  isValid: boolean;
+  errors: ValidationError[];
+};
+
+export const validateDefaultValueForType = (
+  type: FieldMetadataType,
+  defaultValue: FieldMetadataDefaultValue,
+): ValidationResult => {
+  if (defaultValue === null) {
+    return {
+      isValid: true,
+      errors: [],
+    };
+  }
+
+  const validators = defaultValueValidatorsMap[type] as any[];
+
+  if (!validators) {
+    return {
+      isValid: false,
+      errors: [],
+    };
+  }
+
+  const validationResults = validators.map((validator) => {
+    const conputedDefaultValue = isCompositeFieldMetadataType(type)
+      ? defaultValue
+      : { value: defaultValue };
+
+    const defaultValueInstance = plainToInstance<
+      any,
+      FieldMetadataClassValidation
+    >(validator, conputedDefaultValue as FieldMetadataClassValidation);
+
+    const errors = validateSync(defaultValueInstance, {
+      whitelist: true,
+      forbidNonWhitelisted: true,
+      forbidUnknownValues: true,
+    });
+
+    const isValid = errors.length === 0;
+
+    return {
+      isValid,
+      errors,
+    };
+  });
+
+  const isValid = validationResults.some((result) => result.isValid);
+
+  return {
+    isValid,
+    errors: validationResults.flatMap((result) => result.errors),
+  };
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/validate-options-for-type.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/validate-options-for-type.util.ts
new file mode 100644
index 000000000000..7e119d594638
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/validate-options-for-type.util.ts
@@ -0,0 +1,67 @@
+import { plainToInstance } from 'class-transformer';
+import { validateSync } from 'class-validator';
+
+import { FieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  FieldMetadataComplexOption,
+  FieldMetadataDefaultOption,
+} from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
+
+import { isEnumFieldMetadataType } from './is-enum-field-metadata-type.util';
+
+export const optionsValidatorsMap = {
+  // RATING doesn't need to be provided as it's the backend that will generate the options
+  [FieldMetadataType.SELECT]: [FieldMetadataComplexOption],
+  [FieldMetadataType.MULTI_SELECT]: [FieldMetadataComplexOption],
+};
+
+export const validateOptionsForType = (
+  type: FieldMetadataType,
+  options: FieldMetadataOptions,
+): boolean => {
+  if (options === null) return true;
+
+  if (!Array.isArray(options)) {
+    throw new Error('Options must be an array');
+  }
+
+  if (!isEnumFieldMetadataType(type)) {
+    return true;
+  }
+
+  if (type === FieldMetadataType.RATING) {
+    return true;
+  }
+
+  const values = options.map(({ value }) => value);
+
+  // Check if all options are unique
+  if (new Set(values).size !== options.length) {
+    throw new Error('Options must be unique');
+  }
+
+  const validators = optionsValidatorsMap[type];
+
+  if (!validators) return false;
+
+  const isValid = options.every((option) => {
+    return validators.some((validator) => {
+      const optionsInstance = plainToInstance<
+        any,
+        FieldMetadataDefaultOption | FieldMetadataComplexOption
+      >(validator, option);
+
+      return (
+        validateSync(optionsInstance, {
+          whitelist: true,
+          forbidNonWhitelisted: true,
+          forbidUnknownValues: true,
+        }).length === 0
+      );
+    });
+  });
+
+  return isValid;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator.ts
new file mode 100644
index 000000000000..f68aea19e253
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator.ts
@@ -0,0 +1,73 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  ValidationArguments,
+  ValidatorConstraint,
+  ValidatorConstraintInterface,
+} from 'class-validator';
+
+import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
+
+import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
+import {
+  FieldMetadataEntity,
+  FieldMetadataType,
+} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { validateDefaultValueForType } from 'src/engine/metadata-modules/field-metadata/utils/validate-default-value-for-type.util';
+import { LoggerService } from 'src/engine/integrations/logger/logger.service';
+
+@Injectable()
+@ValidatorConstraint({ name: 'isFieldMetadataDefaultValue', async: true })
+export class IsFieldMetadataDefaultValue
+  implements ValidatorConstraintInterface
+{
+  constructor(
+    private readonly fieldMetadataService: FieldMetadataService,
+    private readonly loggerService: LoggerService,
+  ) {}
+
+  async validate(
+    value: FieldMetadataDefaultValue,
+    args: ValidationArguments,
+  ): Promise<boolean> {
+    // Try to extract type value from the object
+    let type: FieldMetadataType | null = args.object['type'];
+
+    if (!type) {
+      // Extract id value from the instance, should happen only when updating
+      const id: string | undefined = args.instance?.['id'];
+
+      if (!id) {
+        return false;
+      }
+
+      let fieldMetadata: FieldMetadataEntity;
+
+      try {
+        fieldMetadata = await this.fieldMetadataService.findOneOrFail(id);
+      } catch {
+        return false;
+      }
+
+      type = fieldMetadata.type;
+    }
+
+    const validationResult = validateDefaultValueForType(type, value);
+
+    if (!validationResult.isValid) {
+      this.loggerService.error(
+        {
+          message: 'Error during field validation',
+          errors: validationResult.errors,
+        },
+        'Field Metadata Validation',
+      );
+    }
+
+    return validationResult.isValid;
+  }
+
+  defaultMessage(): string {
+    return 'FieldMetadataDefaultValue is not valid';
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator.ts
new file mode 100644
index 000000000000..110660d1ed34
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator.ts
@@ -0,0 +1,63 @@
+import { Injectable } from '@nestjs/common';
+
+import { ValidationArguments, ValidatorConstraint } from 'class-validator';
+
+import { FieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface';
+
+import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
+import {
+  FieldMetadataEntity,
+  FieldMetadataType,
+} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { validateOptionsForType } from 'src/engine/metadata-modules/field-metadata/utils/validate-options-for-type.util';
+
+@Injectable()
+@ValidatorConstraint({ name: 'isFieldMetadataOptions', async: true })
+export class IsFieldMetadataOptions {
+  private validationErrors: string[] = [];
+
+  constructor(private readonly fieldMetadataService: FieldMetadataService) {}
+
+  async validate(
+    value: FieldMetadataOptions,
+    args: ValidationArguments,
+  ): Promise<boolean> {
+    // Try to extract type value from the object
+    let type: FieldMetadataType | null = args.object['type'];
+
+    if (!type) {
+      // Extract id value from the instance, should happen only when updating
+      const id: string | undefined = args.instance?.['id'];
+
+      if (!id) {
+        return false;
+      }
+
+      let fieldMetadata: FieldMetadataEntity;
+
+      try {
+        fieldMetadata = await this.fieldMetadataService.findOneOrFail(id);
+      } catch {
+        return false;
+      }
+
+      type = fieldMetadata.type;
+    }
+
+    try {
+      return validateOptionsForType(type, value);
+    } catch (err) {
+      this.validationErrors.push(err.message);
+
+      return false;
+    }
+  }
+
+  defaultMessage(): string {
+    if (this.validationErrors.length > 0) {
+      return this.validationErrors.join(', ');
+    }
+
+    return 'FieldMetadataOptions is not valid';
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-quoted-string.validator.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-quoted-string.validator.ts
new file mode 100644
index 000000000000..bcff44500970
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-quoted-string.validator.ts
@@ -0,0 +1,24 @@
+import {
+  ValidationArguments,
+  ValidationOptions,
+  registerDecorator,
+} from 'class-validator';
+
+export function IsQuotedString(validationOptions?: ValidationOptions) {
+  return function (object: object, propertyName: string) {
+    registerDecorator({
+      name: 'isQuotedString',
+      target: object.constructor,
+      propertyName: propertyName,
+      options: validationOptions,
+      validator: {
+        validate(value: any) {
+          return typeof value === 'string' && /^'.*'$/.test(value);
+        },
+        defaultMessage(args: ValidationArguments) {
+          return `${args.property} must be a quoted string`;
+        },
+      },
+    });
+  };
+}
diff --git a/packages/twenty-server/src/metadata/field-metadata/validators/is-valid-graphql-enum-name.validator.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-valid-graphql-enum-name.validator.ts
similarity index 100%
rename from packages/twenty-server/src/metadata/field-metadata/validators/is-valid-graphql-enum-name.validator.ts
rename to packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-valid-graphql-enum-name.validator.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-engine.module.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-engine.module.ts
new file mode 100644
index 000000000000..9e096c8e018f
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-engine.module.ts
@@ -0,0 +1,30 @@
+import { Module } from '@nestjs/common';
+
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/field-metadata.module';
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
+import { RelationMetadataModule } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.module';
+import { RemoteServerModule } from 'src/engine/metadata-modules/remote-server/remote-server.module';
+import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
+
+@Module({
+  imports: [
+    DataSourceModule,
+    FieldMetadataModule,
+    ObjectMetadataModule,
+    RelationMetadataModule,
+    WorkspaceCacheVersionModule,
+    WorkspaceMigrationModule,
+    RemoteServerModule,
+  ],
+  providers: [],
+  exports: [
+    DataSourceModule,
+    FieldMetadataModule,
+    ObjectMetadataModule,
+    RelationMetadataModule,
+    RemoteServerModule,
+  ],
+})
+export class MetadataEngineModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/create-object.input.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/create-object.input.ts
new file mode 100644
index 000000000000..0930b4d8aedd
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/create-object.input.ts
@@ -0,0 +1,74 @@
+import { Field, HideField, InputType } from '@nestjs/graphql';
+
+import { BeforeCreateOne } from '@ptc-org/nestjs-query-graphql';
+import {
+  IsBoolean,
+  IsNotEmpty,
+  IsOptional,
+  IsString,
+  IsUUID,
+} from 'class-validator';
+
+import { IsValidMetadataName } from 'src/engine/decorators/metadata/is-valid-metadata-name.decorator';
+import { BeforeCreateOneObject } from 'src/engine/metadata-modules/object-metadata/hooks/before-create-one-object.hook';
+
+@InputType()
+@BeforeCreateOne(BeforeCreateOneObject)
+export class CreateObjectInput {
+  @IsString()
+  @IsNotEmpty()
+  @Field()
+  @IsValidMetadataName()
+  nameSingular: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @Field()
+  @IsValidMetadataName()
+  namePlural: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @Field()
+  labelSingular: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @Field()
+  labelPlural: string;
+
+  @IsString()
+  @IsOptional()
+  @Field({ nullable: true })
+  description?: string;
+
+  @IsString()
+  @IsOptional()
+  @Field({ nullable: true })
+  icon?: string;
+
+  @HideField()
+  dataSourceId: string;
+
+  @HideField()
+  workspaceId: string;
+
+  @IsUUID()
+  @IsOptional()
+  @Field({ nullable: true })
+  labelIdentifierFieldMetadataId?: string;
+
+  @IsUUID()
+  @IsOptional()
+  @Field({ nullable: true })
+  imageIdentifierFieldMetadataId?: string;
+
+  @IsBoolean()
+  @IsOptional()
+  @Field({ nullable: true })
+  isRemote?: boolean;
+
+  @IsOptional()
+  @Field({ nullable: true })
+  remoteTablePrimaryKeyColumnType?: string;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/delete-object.input.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/delete-object.input.ts
new file mode 100644
index 000000000000..7e10cd638f5e
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/delete-object.input.ts
@@ -0,0 +1,15 @@
+import { InputType } from '@nestjs/graphql';
+
+import { BeforeDeleteOne, IDField } from '@ptc-org/nestjs-query-graphql';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { BeforeDeleteOneObject } from 'src/engine/metadata-modules/object-metadata/hooks/before-delete-one-object.hook';
+
+@InputType()
+@BeforeDeleteOne(BeforeDeleteOneObject)
+export class DeleteOneObjectInput {
+  @IDField(() => UUIDScalarType, {
+    description: 'The id of the record to delete.',
+  })
+  id!: string;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto.ts
new file mode 100644
index 000000000000..425aebbe2d11
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto.ts
@@ -0,0 +1,80 @@
+import { ObjectType, Field, HideField } from '@nestjs/graphql';
+
+import {
+  Authorize,
+  BeforeDeleteOne,
+  CursorConnection,
+  FilterableField,
+  IDField,
+  QueryOptions,
+} from '@ptc-org/nestjs-query-graphql';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
+import { BeforeDeleteOneObject } from 'src/engine/metadata-modules/object-metadata/hooks/before-delete-one-object.hook';
+
+@ObjectType('object')
+@Authorize({
+  authorize: (context: any) => ({
+    workspaceId: { eq: context?.req?.user?.workspace?.id },
+  }),
+})
+@QueryOptions({
+  defaultResultSize: 10,
+  disableSort: true,
+  maxResultsSize: 1000,
+})
+@BeforeDeleteOne(BeforeDeleteOneObject)
+@CursorConnection('fields', () => FieldMetadataDTO)
+export class ObjectMetadataDTO {
+  @IDField(() => UUIDScalarType)
+  id: string;
+
+  @Field()
+  dataSourceId: string;
+
+  @Field()
+  nameSingular: string;
+
+  @Field()
+  namePlural: string;
+
+  @Field()
+  labelSingular: string;
+
+  @Field()
+  labelPlural: string;
+
+  @Field({ nullable: true })
+  description: string;
+
+  @Field({ nullable: true })
+  icon: string;
+
+  @FilterableField()
+  isCustom: boolean;
+
+  @FilterableField()
+  isRemote: boolean;
+
+  @FilterableField()
+  isActive: boolean;
+
+  @FilterableField()
+  isSystem: boolean;
+
+  @HideField()
+  workspaceId: string;
+
+  @Field()
+  createdAt: Date;
+
+  @Field()
+  updatedAt: Date;
+
+  @Field({ nullable: true })
+  labelIdentifierFieldMetadataId?: string;
+
+  @Field({ nullable: true })
+  imageIdentifierFieldMetadataId?: string;
+}
diff --git a/packages/twenty-server/src/metadata/object-metadata/dtos/update-object.input.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/update-object.input.ts
similarity index 79%
rename from packages/twenty-server/src/metadata/object-metadata/dtos/update-object.input.ts
rename to packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/update-object.input.ts
index 444a053202f6..cb74a3a30004 100644
--- a/packages/twenty-server/src/metadata/object-metadata/dtos/update-object.input.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/update-object.input.ts
@@ -3,8 +3,8 @@ import { Field, InputType } from '@nestjs/graphql';
 import { BeforeUpdateOne } from '@ptc-org/nestjs-query-graphql';
 import { IsBoolean, IsOptional, IsString, IsUUID } from 'class-validator';
 
-import { IsValidName } from 'src/metadata/decorators/is-valid-name.decorator';
-import { BeforeUpdateOneObject } from 'src/metadata/object-metadata/hooks/before-update-one-object.hook';
+import { IsValidMetadataName } from 'src/engine/decorators/metadata/is-valid-metadata-name.decorator';
+import { BeforeUpdateOneObject } from 'src/engine/metadata-modules/object-metadata/hooks/before-update-one-object.hook';
 
 @InputType()
 @BeforeUpdateOne(BeforeUpdateOneObject)
@@ -22,13 +22,13 @@ export class UpdateObjectInput {
   @IsString()
   @IsOptional()
   @Field({ nullable: true })
-  @IsValidName()
+  @IsValidMetadataName()
   nameSingular?: string;
 
   @IsString()
   @IsOptional()
   @Field({ nullable: true })
-  @IsValidName()
+  @IsValidMetadataName()
   namePlural?: string;
 
   @IsString()
diff --git a/packages/twenty-server/src/metadata/object-metadata/hooks/before-create-one-object.hook.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/hooks/before-create-one-object.hook.ts
similarity index 88%
rename from packages/twenty-server/src/metadata/object-metadata/hooks/before-create-one-object.hook.ts
rename to packages/twenty-server/src/engine/metadata-modules/object-metadata/hooks/before-create-one-object.hook.ts
index cebe75b0e0ef..48f3ec23e182 100644
--- a/packages/twenty-server/src/metadata/object-metadata/hooks/before-create-one-object.hook.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/hooks/before-create-one-object.hook.ts
@@ -9,11 +9,11 @@ import {
   CreateOneInputType,
 } from '@ptc-org/nestjs-query-graphql';
 
-import { CreateObjectInput } from 'src/metadata/object-metadata/dtos/create-object.input';
+import { CreateObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/create-object.input';
 
 const coreObjectNames = [
   'featureFlag',
-  'refreshToken',
+  'appToken',
   'workspace',
   'user',
   'event',
diff --git a/packages/twenty-server/src/metadata/object-metadata/hooks/before-delete-one-object.hook.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/hooks/before-delete-one-object.hook.ts
similarity index 91%
rename from packages/twenty-server/src/metadata/object-metadata/hooks/before-delete-one-object.hook.ts
rename to packages/twenty-server/src/engine/metadata-modules/object-metadata/hooks/before-delete-one-object.hook.ts
index 69bbe7cf4647..6c3db542dd05 100644
--- a/packages/twenty-server/src/metadata/object-metadata/hooks/before-delete-one-object.hook.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/hooks/before-delete-one-object.hook.ts
@@ -9,7 +9,7 @@ import {
   DeleteOneInputType,
 } from '@ptc-org/nestjs-query-graphql';
 
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
 
 @Injectable()
 export class BeforeDeleteOneObject implements BeforeDeleteOneHook<any> {
diff --git a/packages/twenty-server/src/metadata/object-metadata/hooks/before-update-one-object.hook.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/hooks/before-update-one-object.hook.ts
similarity index 90%
rename from packages/twenty-server/src/metadata/object-metadata/hooks/before-update-one-object.hook.ts
rename to packages/twenty-server/src/engine/metadata-modules/object-metadata/hooks/before-update-one-object.hook.ts
index e6fd71aa97c8..53018786215e 100644
--- a/packages/twenty-server/src/metadata/object-metadata/hooks/before-update-one-object.hook.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/hooks/before-update-one-object.hook.ts
@@ -11,10 +11,10 @@ import {
 } from '@ptc-org/nestjs-query-graphql';
 import { Equal, In, Repository } from 'typeorm';
 
-import { FieldMetadataEntity } from 'src/metadata/field-metadata/field-metadata.entity';
-import { UpdateObjectInput } from 'src/metadata/object-metadata/dtos/update-object.input';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { UpdateObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/update-object.input';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 
 @Injectable()
 export class BeforeUpdateOneObject<T extends UpdateObjectInput>
diff --git a/packages/twenty-server/src/metadata/object-metadata/object-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts
similarity index 75%
rename from packages/twenty-server/src/metadata/object-metadata/object-metadata.entity.ts
rename to packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts
index 709235ce6c37..ed21028815c0 100644
--- a/packages/twenty-server/src/metadata/object-metadata/object-metadata.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts
@@ -9,11 +9,11 @@ import {
   ManyToOne,
 } from 'typeorm';
 
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
-import { FieldMetadataEntity } from 'src/metadata/field-metadata/field-metadata.entity';
-import { RelationMetadataEntity } from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { DataSourceEntity } from 'src/metadata/data-source/data-source.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 
 @Entity('objectMetadata')
 @Unique('IndexOnNameSingularAndWorkspaceIdUnique', [
@@ -25,6 +25,9 @@ export class ObjectMetadataEntity implements ObjectMetadataInterface {
   @PrimaryGeneratedColumn('uuid')
   id: string;
 
+  @Column({ nullable: true, type: 'uuid' })
+  standardId: string | null;
+
   @Column({ nullable: false, type: 'uuid' })
   dataSourceId: string;
 
@@ -52,6 +55,9 @@ export class ObjectMetadataEntity implements ObjectMetadataInterface {
   @Column({ default: false })
   isCustom: boolean;
 
+  @Column({ default: false })
+  isRemote: boolean;
+
   @Column({ default: false })
   isActive: boolean;
 
@@ -95,9 +101,9 @@ export class ObjectMetadataEntity implements ObjectMetadataInterface {
   })
   dataSource: DataSourceEntity;
 
-  @CreateDateColumn()
+  @CreateDateColumn({ type: 'timestamptz' })
   createdAt: Date;
 
-  @UpdateDateColumn()
+  @UpdateDateColumn({ type: 'timestamptz' })
   updatedAt: Date;
 }
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts
new file mode 100644
index 000000000000..337796559430
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts
@@ -0,0 +1,71 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import {
+  NestjsQueryGraphQLModule,
+  PagingStrategies,
+} from '@ptc-org/nestjs-query-graphql';
+import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
+import { SortDirection } from '@ptc-org/nestjs-query-core';
+
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
+import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { ObjectMetadataResolver } from 'src/engine/metadata-modules/object-metadata/object-metadata.resolver';
+import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+
+import { ObjectMetadataService } from './object-metadata.service';
+import { ObjectMetadataEntity } from './object-metadata.entity';
+
+import { CreateObjectInput } from './dtos/create-object.input';
+import { UpdateObjectInput } from './dtos/update-object.input';
+import { ObjectMetadataDTO } from './dtos/object-metadata.dto';
+
+@Module({
+  imports: [
+    NestjsQueryGraphQLModule.forFeature({
+      imports: [
+        TypeORMModule,
+        NestjsQueryTypeOrmModule.forFeature(
+          [ObjectMetadataEntity, FieldMetadataEntity, RelationMetadataEntity],
+          'metadata',
+        ),
+        TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
+        DataSourceModule,
+        WorkspaceMigrationModule,
+        WorkspaceMigrationRunnerModule,
+        FeatureFlagModule,
+      ],
+      services: [ObjectMetadataService],
+      resolvers: [
+        {
+          EntityClass: ObjectMetadataEntity,
+          DTOClass: ObjectMetadataDTO,
+          CreateDTOClass: CreateObjectInput,
+          UpdateDTOClass: UpdateObjectInput,
+          ServiceClass: ObjectMetadataService,
+          pagingStrategy: PagingStrategies.CURSOR,
+          read: {
+            defaultSort: [{ field: 'id', direction: SortDirection.DESC }],
+          },
+          create: {
+            many: { disabled: true },
+          },
+          update: {
+            many: { disabled: true },
+          },
+          delete: { disabled: true },
+          guards: [JwtAuthGuard],
+        },
+      ],
+    }),
+  ],
+  providers: [ObjectMetadataService, ObjectMetadataResolver],
+  exports: [ObjectMetadataService],
+})
+export class ObjectMetadataModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts
new file mode 100644
index 000000000000..002ab0a2b05c
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts
@@ -0,0 +1,23 @@
+import { UseGuards } from '@nestjs/common';
+import { Args, Mutation, Resolver } from '@nestjs/graphql';
+
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
+import { DeleteOneObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/delete-object.input';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+
+@UseGuards(JwtAuthGuard)
+@Resolver(() => ObjectMetadataDTO)
+export class ObjectMetadataResolver {
+  constructor(private readonly objectMetadataService: ObjectMetadataService) {}
+
+  @Mutation(() => ObjectMetadataDTO)
+  deleteOneObject(
+    @Args('input') input: DeleteOneObjectInput,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+  ) {
+    return this.objectMetadataService.deleteOneObject(input, workspaceId);
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
new file mode 100644
index 000000000000..f9e92d2848dc
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
@@ -0,0 +1,905 @@
+import {
+  BadRequestException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import console from 'console';
+
+import {
+  DataSource,
+  FindManyOptions,
+  FindOneOptions,
+  Repository,
+} from 'typeorm';
+import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
+import { Query, QueryOptions } from '@ptc-org/nestjs-query-core';
+
+import { WorkspaceMigrationService } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.service';
+import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service';
+import {
+  WorkspaceMigrationColumnActionType,
+  WorkspaceMigrationColumnDrop,
+  WorkspaceMigrationTableActionType,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import {
+  FieldMetadataEntity,
+  FieldMetadataType,
+} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { TypeORMService } from 'src/database/typeorm/typeorm.service';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import {
+  RelationMetadataEntity,
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { computeTableName } from 'src/engine/utils/compute-table-name.util';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+import { DeleteOneObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/delete-object.input';
+import { RelationToDelete } from 'src/engine/metadata-modules/relation-metadata/types/relation-to-delete';
+import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
+import {
+  activityTargetStandardFieldIds,
+  attachmentStandardFieldIds,
+  baseObjectStandardFieldIds,
+  customObjectStandardFieldIds,
+  eventStandardFieldIds,
+  favoriteStandardFieldIds,
+} from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import {
+  createForeignKeyDeterministicUuid,
+  createRelationDeterministicUuid,
+} from 'src/engine/workspace-manager/workspace-sync-metadata/utils/create-deterministic-uuid.util';
+import { createWorkspaceMigrationsForCustomObject } from 'src/engine/metadata-modules/object-metadata/utils/create-workspace-migrations-for-custom-object.util';
+import { createWorkspaceMigrationsForRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/create-workspace-migrations-for-remote-object.util';
+import { computeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
+import {
+  FeatureFlagEntity,
+  FeatureFlagKeys,
+} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
+
+import { ObjectMetadataEntity } from './object-metadata.entity';
+
+import { CreateObjectInput } from './dtos/create-object.input';
+
+@Injectable()
+export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEntity> {
+  constructor(
+    @InjectRepository(ObjectMetadataEntity, 'metadata')
+    private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
+
+    @InjectRepository(FieldMetadataEntity, 'metadata')
+    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
+
+    @InjectRepository(RelationMetadataEntity, 'metadata')
+    private readonly relationMetadataRepository: Repository<RelationMetadataEntity>,
+
+    private readonly dataSourceService: DataSourceService,
+    private readonly typeORMService: TypeORMService,
+    private readonly workspaceMigrationService: WorkspaceMigrationService,
+    private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+  ) {
+    super(objectMetadataRepository);
+  }
+
+  override async query(
+    query: Query<ObjectMetadataEntity>,
+    opts?: QueryOptions<ObjectMetadataEntity> | undefined,
+  ): Promise<ObjectMetadataEntity[]> {
+    const start = performance.now();
+
+    const result = super.query(query, opts);
+
+    const end = performance.now();
+
+    console.log(`metadata query time: ${end - start} ms`);
+
+    return result;
+  }
+
+  public async deleteOneObject(
+    input: DeleteOneObjectInput,
+    workspaceId: string,
+  ): Promise<ObjectMetadataEntity> {
+    const objectMetadata = await this.objectMetadataRepository.findOne({
+      relations: [
+        'fromRelations.fromFieldMetadata',
+        'fromRelations.toFieldMetadata',
+        'toRelations.fromFieldMetadata',
+        'toRelations.toFieldMetadata',
+        'fromRelations.fromObjectMetadata',
+        'fromRelations.toObjectMetadata',
+        'toRelations.fromObjectMetadata',
+        'toRelations.toObjectMetadata',
+      ],
+      where: {
+        id: input.id,
+        workspaceId,
+      },
+    });
+
+    if (!objectMetadata) {
+      throw new NotFoundException('Object does not exist');
+    }
+
+    const relationsToDelete: RelationToDelete[] = [];
+
+    // TODO: Most of this logic should be moved to relation-metadata.service.ts
+    for (const relation of [
+      ...objectMetadata.fromRelations,
+      ...objectMetadata.toRelations,
+    ]) {
+      relationsToDelete.push({
+        id: relation.id,
+        fromFieldMetadataId: relation.fromFieldMetadata.id,
+        toFieldMetadataId: relation.toFieldMetadata.id,
+        fromFieldMetadataName: relation.fromFieldMetadata.name,
+        toFieldMetadataName: relation.toFieldMetadata.name,
+        fromObjectMetadataId: relation.fromObjectMetadata.id,
+        toObjectMetadataId: relation.toObjectMetadata.id,
+        fromObjectName: relation.fromObjectMetadata.nameSingular,
+        toObjectName: relation.toObjectMetadata.nameSingular,
+        toFieldMetadataIsCustom: relation.toFieldMetadata.isCustom,
+        toObjectMetadataIsCustom: relation.toObjectMetadata.isCustom,
+        direction:
+          relation.fromObjectMetadata.nameSingular ===
+          objectMetadata.nameSingular
+            ? 'from'
+            : 'to',
+      });
+    }
+
+    if (relationsToDelete.length > 0) {
+      await this.relationMetadataRepository.delete(
+        relationsToDelete.map((relation) => relation.id),
+      );
+    }
+
+    for (const relationToDelete of relationsToDelete) {
+      const foreignKeyFieldsToDelete = await this.fieldMetadataRepository.find({
+        where: {
+          name: `${relationToDelete.toFieldMetadataName}Id`,
+          objectMetadataId: relationToDelete.toObjectMetadataId,
+          workspaceId,
+        },
+      });
+
+      const foreignKeyFieldsToDeleteIds = foreignKeyFieldsToDelete.map(
+        (field) => field.id,
+      );
+
+      await this.fieldMetadataRepository.delete([
+        ...foreignKeyFieldsToDeleteIds,
+        relationToDelete.fromFieldMetadataId,
+        relationToDelete.toFieldMetadataId,
+      ]);
+
+      if (relationToDelete.direction === 'from') {
+        await this.workspaceMigrationService.createCustomMigration(
+          generateMigrationName(
+            `delete-${relationToDelete.fromObjectName}-${relationToDelete.toObjectName}`,
+          ),
+          workspaceId,
+          [
+            {
+              name: computeTableName(
+                relationToDelete.toObjectName,
+                relationToDelete.toObjectMetadataIsCustom,
+              ),
+              action: WorkspaceMigrationTableActionType.ALTER,
+              columns: [
+                {
+                  action: WorkspaceMigrationColumnActionType.DROP,
+                  columnName: computeColumnName(
+                    relationToDelete.toFieldMetadataName,
+                    { isForeignKey: true },
+                  ),
+                } satisfies WorkspaceMigrationColumnDrop,
+              ],
+            },
+          ],
+        );
+      }
+    }
+
+    await this.objectMetadataRepository.delete(objectMetadata.id);
+
+    if (!objectMetadata.isRemote) {
+      // DROP TABLE
+      await this.workspaceMigrationService.createCustomMigration(
+        generateMigrationName(`delete-${objectMetadata.nameSingular}`),
+        workspaceId,
+        [
+          {
+            name: computeObjectTargetTable(objectMetadata),
+            action: WorkspaceMigrationTableActionType.DROP,
+          },
+        ],
+      );
+    }
+
+    await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
+      workspaceId,
+    );
+
+    return objectMetadata;
+  }
+
+  override async createOne(
+    objectMetadataInput: CreateObjectInput,
+  ): Promise<ObjectMetadataEntity> {
+    const lastDataSourceMetadata =
+      await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
+        objectMetadataInput.workspaceId,
+      );
+
+    if (
+      objectMetadataInput.nameSingular.toLowerCase() ===
+      objectMetadataInput.namePlural.toLowerCase()
+    ) {
+      throw new BadRequestException(
+        'The singular and plural name cannot be the same for an object',
+      );
+    }
+
+    const isCustom = !objectMetadataInput.isRemote;
+
+    const createdObjectMetadata = await super.createOne({
+      ...objectMetadataInput,
+      dataSourceId: lastDataSourceMetadata.id,
+      targetTableName: 'DEPRECATED',
+      isActive: true,
+      isCustom: isCustom,
+      isSystem: false,
+      isRemote: objectMetadataInput.isRemote,
+      fields: isCustom
+        ? // Creating default fields.
+          // No need to create a custom migration for this though as the default columns are already
+          // created with default values which is not supported yet by workspace migrations.
+          [
+            {
+              standardId: baseObjectStandardFieldIds.id,
+              type: FieldMetadataType.UUID,
+              name: 'id',
+              label: 'Id',
+              icon: 'Icon123',
+              description: 'Id',
+              isNullable: false,
+              isActive: true,
+              isCustom: false,
+              isSystem: true,
+              workspaceId: objectMetadataInput.workspaceId,
+              defaultValue: 'uuid',
+            },
+            {
+              standardId: customObjectStandardFieldIds.name,
+              type: FieldMetadataType.TEXT,
+              name: 'name',
+              label: 'Name',
+              icon: 'IconAbc',
+              description: 'Name',
+              isNullable: false,
+              isActive: true,
+              isCustom: false,
+              workspaceId: objectMetadataInput.workspaceId,
+              defaultValue: "'Untitled'",
+            },
+            {
+              standardId: baseObjectStandardFieldIds.createdAt,
+              type: FieldMetadataType.DATE_TIME,
+              name: 'createdAt',
+              label: 'Creation date',
+              icon: 'IconCalendar',
+              description: 'Creation date',
+              isNullable: false,
+              isActive: true,
+              isCustom: false,
+              workspaceId: objectMetadataInput.workspaceId,
+              defaultValue: 'now',
+            },
+            {
+              standardId: baseObjectStandardFieldIds.updatedAt,
+              type: FieldMetadataType.DATE_TIME,
+              name: 'updatedAt',
+              label: 'Update date',
+              icon: 'IconCalendar',
+              description: 'Update date',
+              isNullable: false,
+              isActive: true,
+              isCustom: false,
+              isSystem: true,
+              workspaceId: objectMetadataInput.workspaceId,
+              defaultValue: 'now',
+            },
+            {
+              standardId: customObjectStandardFieldIds.position,
+              type: FieldMetadataType.POSITION,
+              name: 'position',
+              label: 'Position',
+              icon: 'IconHierarchy2',
+              description: 'Position',
+              isNullable: true,
+              isActive: true,
+              isCustom: false,
+              isSystem: true,
+              workspaceId: objectMetadataInput.workspaceId,
+              defaultValue: null,
+            },
+          ]
+        : // No fields for remote objects.
+          [],
+    });
+
+    const dataSourceMetadata =
+      await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
+        createdObjectMetadata.workspaceId,
+      );
+
+    const workspaceDataSource =
+      await this.typeORMService.connectToDataSource(dataSourceMetadata);
+
+    await this.createObjectRelationsMetadataAndMigrations(
+      objectMetadataInput,
+      createdObjectMetadata,
+      lastDataSourceMetadata,
+      workspaceDataSource,
+      objectMetadataInput.isRemote,
+    );
+
+    await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
+      createdObjectMetadata.workspaceId,
+    );
+
+    const view = await workspaceDataSource?.query(
+      `INSERT INTO ${dataSourceMetadata.schema}."view"
+      ("objectMetadataId", "type", "name", "key", "icon")
+      VALUES ($1, $2, $3, $4, $5) RETURNING *`,
+      [
+        createdObjectMetadata.id,
+        'table',
+        `All ${createdObjectMetadata.namePlural}`,
+        'INDEX',
+        createdObjectMetadata.icon,
+      ],
+    );
+
+    createdObjectMetadata.fields.map(async (field, index) => {
+      if (field.name === 'id') {
+        return;
+      }
+
+      await workspaceDataSource?.query(
+        `INSERT INTO ${dataSourceMetadata.schema}."viewField"
+      ("fieldMetadataId", "position", "isVisible", "size", "viewId")
+      VALUES ('${field.id}', '${index - 1}', true, 180, '${
+        view[0].id
+      }') RETURNING *`,
+      );
+    });
+
+    return createdObjectMetadata;
+  }
+
+  public async findOneWithinWorkspace(
+    workspaceId: string,
+    options: FindOneOptions<ObjectMetadataEntity>,
+  ): Promise<ObjectMetadataEntity | null> {
+    return this.objectMetadataRepository.findOne({
+      relations: [
+        'fields',
+        'fields.fromRelationMetadata',
+        'fields.toRelationMetadata',
+      ],
+      ...options,
+      where: {
+        ...options.where,
+        workspaceId,
+      },
+    });
+  }
+
+  public async findOneOrFailWithinWorkspace(
+    workspaceId: string,
+    options: FindOneOptions<ObjectMetadataEntity>,
+  ): Promise<ObjectMetadataEntity> {
+    return this.objectMetadataRepository.findOneOrFail({
+      relations: [
+        'fields',
+        'fields.fromRelationMetadata',
+        'fields.toRelationMetadata',
+      ],
+      ...options,
+      where: {
+        ...options.where,
+        workspaceId,
+      },
+    });
+  }
+
+  public async findManyWithinWorkspace(
+    workspaceId: string,
+    options?: FindManyOptions<ObjectMetadataEntity>,
+  ) {
+    return this.objectMetadataRepository.find({
+      relations: [
+        'fields.object',
+        'fields',
+        'fields.fromRelationMetadata',
+        'fields.toRelationMetadata',
+        'fields.fromRelationMetadata.toObjectMetadata',
+      ],
+      ...options,
+      where: {
+        ...options?.where,
+        workspaceId,
+      },
+    });
+  }
+
+  public async findMany(options?: FindManyOptions<ObjectMetadataEntity>) {
+    return this.objectMetadataRepository.find({
+      relations: [
+        'fields',
+        'fields.fromRelationMetadata',
+        'fields.toRelationMetadata',
+        'fields.fromRelationMetadata.toObjectMetadata',
+      ],
+      ...options,
+      where: {
+        ...options?.where,
+      },
+    });
+  }
+
+  public async deleteObjectsMetadata(workspaceId: string) {
+    await this.objectMetadataRepository.delete({ workspaceId });
+  }
+
+  private async createObjectRelationsMetadataAndMigrations(
+    objectMetadataInput: CreateObjectInput,
+    createdObjectMetadata: ObjectMetadataEntity,
+    lastDataSourceMetadata: DataSourceEntity,
+    workspaceDataSource: DataSource | undefined,
+    isRemoteObject: boolean = false,
+  ) {
+    const isRelationEnabledForRemoteObjects =
+      await this.isRelationEnabledForRemoteObjects(
+        objectMetadataInput.workspaceId,
+      );
+
+    if (isRemoteObject && !isRelationEnabledForRemoteObjects) {
+      return;
+    }
+
+    const { eventObjectMetadata } = await this.createEventRelation(
+      objectMetadataInput.workspaceId,
+      createdObjectMetadata,
+    );
+
+    const { activityTargetObjectMetadata } =
+      await this.createActivityTargetRelation(
+        objectMetadataInput.workspaceId,
+        createdObjectMetadata,
+      );
+
+    const { favoriteObjectMetadata } = await this.createFavoriteRelation(
+      objectMetadataInput.workspaceId,
+      createdObjectMetadata,
+    );
+
+    const { attachmentObjectMetadata } = await this.createAttachmentRelation(
+      objectMetadataInput.workspaceId,
+      createdObjectMetadata,
+    );
+
+    return this.workspaceMigrationService.createCustomMigration(
+      generateMigrationName(`create-${createdObjectMetadata.nameSingular}`),
+      createdObjectMetadata.workspaceId,
+      isRemoteObject
+        ? await createWorkspaceMigrationsForRemoteObject(
+            createdObjectMetadata,
+            activityTargetObjectMetadata,
+            attachmentObjectMetadata,
+            eventObjectMetadata,
+            favoriteObjectMetadata,
+            lastDataSourceMetadata.schema,
+            objectMetadataInput.remoteTablePrimaryKeyColumnType ?? 'uuid',
+            workspaceDataSource,
+          )
+        : createWorkspaceMigrationsForCustomObject(
+            createdObjectMetadata,
+            activityTargetObjectMetadata,
+            attachmentObjectMetadata,
+            eventObjectMetadata,
+            favoriteObjectMetadata,
+          ),
+    );
+  }
+
+  private async createActivityTargetRelation(
+    workspaceId: string,
+    createdObjectMetadata: ObjectMetadataEntity,
+  ) {
+    const activityTargetObjectMetadata =
+      await this.objectMetadataRepository.findOneByOrFail({
+        nameSingular: 'activityTarget',
+        workspaceId: workspaceId,
+      });
+
+    const activityTargetRelationFieldMetadata =
+      await this.fieldMetadataRepository.save([
+        // FROM
+        {
+          standardId: customObjectStandardFieldIds.activityTargets,
+          objectMetadataId: createdObjectMetadata.id,
+          workspaceId: workspaceId,
+          isCustom: false,
+          isActive: true,
+          type: FieldMetadataType.RELATION,
+          name: 'activityTargets',
+          label: 'Activities',
+          description: `Activities tied to the ${createdObjectMetadata.labelSingular}`,
+          icon: 'IconCheckbox',
+          isNullable: true,
+        },
+        // TO
+        {
+          standardId: createRelationDeterministicUuid({
+            objectId: createdObjectMetadata.id,
+            standardId: activityTargetStandardFieldIds.custom,
+          }),
+          objectMetadataId: activityTargetObjectMetadata.id,
+          workspaceId: workspaceId,
+          isCustom: false,
+          isActive: true,
+          type: FieldMetadataType.RELATION,
+          name: createdObjectMetadata.nameSingular,
+          label: createdObjectMetadata.labelSingular,
+          description: `ActivityTarget ${createdObjectMetadata.labelSingular}`,
+          icon: 'IconBuildingSkyscraper',
+          isNullable: true,
+        },
+        // Foreign key
+        {
+          standardId: createForeignKeyDeterministicUuid({
+            objectId: createdObjectMetadata.id,
+            standardId: activityTargetStandardFieldIds.custom,
+          }),
+          objectMetadataId: activityTargetObjectMetadata.id,
+          workspaceId: workspaceId,
+          isCustom: false,
+          isActive: true,
+          type: FieldMetadataType.UUID,
+          name: `${createdObjectMetadata.nameSingular}Id`,
+          label: `${createdObjectMetadata.labelSingular} ID (foreign key)`,
+          description: `ActivityTarget ${createdObjectMetadata.labelSingular} id foreign key`,
+          icon: undefined,
+          isNullable: true,
+          isSystem: true,
+          defaultValue: undefined,
+        },
+      ]);
+
+    const activityTargetRelationFieldMetadataMap =
+      activityTargetRelationFieldMetadata.reduce(
+        (acc, fieldMetadata: FieldMetadataEntity) => {
+          if (fieldMetadata.type === FieldMetadataType.RELATION) {
+            acc[fieldMetadata.objectMetadataId] = fieldMetadata;
+          }
+
+          return acc;
+        },
+        {},
+      );
+
+    await this.relationMetadataRepository.save([
+      {
+        workspaceId: workspaceId,
+        relationType: RelationMetadataType.ONE_TO_MANY,
+        fromObjectMetadataId: createdObjectMetadata.id,
+        toObjectMetadataId: activityTargetObjectMetadata.id,
+        fromFieldMetadataId:
+          activityTargetRelationFieldMetadataMap[createdObjectMetadata.id].id,
+        toFieldMetadataId:
+          activityTargetRelationFieldMetadataMap[
+            activityTargetObjectMetadata.id
+          ].id,
+        onDeleteAction: RelationOnDeleteAction.CASCADE,
+      },
+    ]);
+
+    return { activityTargetObjectMetadata };
+  }
+
+  private async createAttachmentRelation(
+    workspaceId: string,
+    createdObjectMetadata: ObjectMetadataEntity,
+  ) {
+    const attachmentObjectMetadata =
+      await this.objectMetadataRepository.findOneByOrFail({
+        nameSingular: 'attachment',
+        workspaceId: workspaceId,
+      });
+
+    const attachmentRelationFieldMetadata =
+      await this.fieldMetadataRepository.save([
+        // FROM
+        {
+          standardId: customObjectStandardFieldIds.attachments,
+          objectMetadataId: createdObjectMetadata.id,
+          workspaceId: workspaceId,
+          isCustom: false,
+          isActive: true,
+          type: FieldMetadataType.RELATION,
+          name: 'attachments',
+          label: 'Attachments',
+          description: `Attachments tied to the ${createdObjectMetadata.labelSingular}`,
+          icon: 'IconFileImport',
+          isNullable: true,
+        },
+        // TO
+        {
+          standardId: createRelationDeterministicUuid({
+            objectId: createdObjectMetadata.id,
+            standardId: attachmentStandardFieldIds.custom,
+          }),
+          objectMetadataId: attachmentObjectMetadata.id,
+          workspaceId: workspaceId,
+          isCustom: false,
+          isActive: true,
+          type: FieldMetadataType.RELATION,
+          name: createdObjectMetadata.nameSingular,
+          label: createdObjectMetadata.labelSingular,
+          description: `Attachment ${createdObjectMetadata.labelSingular}`,
+          icon: 'IconBuildingSkyscraper',
+          isNullable: true,
+        },
+        // Foreign key
+        {
+          standardId: createForeignKeyDeterministicUuid({
+            objectId: createdObjectMetadata.id,
+            standardId: attachmentStandardFieldIds.custom,
+          }),
+          objectMetadataId: attachmentObjectMetadata.id,
+          workspaceId: workspaceId,
+          isCustom: false,
+          isActive: true,
+          type: FieldMetadataType.UUID,
+          name: `${createdObjectMetadata.nameSingular}Id`,
+          label: `${createdObjectMetadata.labelSingular} ID (foreign key)`,
+          description: `Attachment ${createdObjectMetadata.labelSingular} id foreign key`,
+          icon: undefined,
+          isNullable: true,
+          isSystem: true,
+          defaultValue: undefined,
+        },
+      ]);
+
+    const attachmentRelationFieldMetadataMap =
+      attachmentRelationFieldMetadata.reduce(
+        (acc, fieldMetadata: FieldMetadataEntity) => {
+          if (fieldMetadata.type === FieldMetadataType.RELATION) {
+            acc[fieldMetadata.objectMetadataId] = fieldMetadata;
+          }
+
+          return acc;
+        },
+        {},
+      );
+
+    await this.relationMetadataRepository.save([
+      {
+        workspaceId: workspaceId,
+        relationType: RelationMetadataType.ONE_TO_MANY,
+        fromObjectMetadataId: createdObjectMetadata.id,
+        toObjectMetadataId: attachmentObjectMetadata.id,
+        fromFieldMetadataId:
+          attachmentRelationFieldMetadataMap[createdObjectMetadata.id].id,
+        toFieldMetadataId:
+          attachmentRelationFieldMetadataMap[attachmentObjectMetadata.id].id,
+        onDeleteAction: RelationOnDeleteAction.CASCADE,
+      },
+    ]);
+
+    return { attachmentObjectMetadata };
+  }
+
+  private async createEventRelation(
+    workspaceId: string,
+    createdObjectMetadata: ObjectMetadataEntity,
+  ) {
+    const eventObjectMetadata =
+      await this.objectMetadataRepository.findOneByOrFail({
+        nameSingular: 'event',
+        workspaceId: workspaceId,
+      });
+
+    const eventRelationFieldMetadata = await this.fieldMetadataRepository.save([
+      // FROM
+      {
+        standardId: customObjectStandardFieldIds.events,
+        objectMetadataId: createdObjectMetadata.id,
+        workspaceId: workspaceId,
+        isCustom: false,
+        isActive: true,
+        type: FieldMetadataType.RELATION,
+        name: 'events',
+        label: 'Events',
+        description: `Events tied to the ${createdObjectMetadata.labelSingular}`,
+        icon: 'IconFileImport',
+        isNullable: true,
+      },
+      // TO
+      {
+        standardId: createRelationDeterministicUuid({
+          objectId: createdObjectMetadata.id,
+          standardId: eventStandardFieldIds.custom,
+        }),
+        objectMetadataId: eventObjectMetadata.id,
+        workspaceId: workspaceId,
+        isCustom: false,
+        isActive: true,
+        type: FieldMetadataType.RELATION,
+        name: createdObjectMetadata.nameSingular,
+        label: createdObjectMetadata.labelSingular,
+        description: `Event ${createdObjectMetadata.labelSingular}`,
+        icon: 'IconBuildingSkyscraper',
+        isNullable: true,
+      },
+      // Foreign key
+      {
+        standardId: createForeignKeyDeterministicUuid({
+          objectId: createdObjectMetadata.id,
+          standardId: eventStandardFieldIds.custom,
+        }),
+        objectMetadataId: eventObjectMetadata.id,
+        workspaceId: workspaceId,
+        isCustom: false,
+        isActive: true,
+        type: FieldMetadataType.UUID,
+        name: `${createdObjectMetadata.nameSingular}Id`,
+        label: `${createdObjectMetadata.labelSingular} ID (foreign key)`,
+        description: `Event ${createdObjectMetadata.labelSingular} id foreign key`,
+        icon: undefined,
+        isNullable: true,
+        isSystem: true,
+        defaultValue: undefined,
+      },
+    ]);
+
+    const eventRelationFieldMetadataMap = eventRelationFieldMetadata.reduce(
+      (acc, fieldMetadata: FieldMetadataEntity) => {
+        if (fieldMetadata.type === FieldMetadataType.RELATION) {
+          acc[fieldMetadata.objectMetadataId] = fieldMetadata;
+        }
+
+        return acc;
+      },
+      {},
+    );
+
+    await this.relationMetadataRepository.save([
+      {
+        workspaceId: workspaceId,
+        relationType: RelationMetadataType.ONE_TO_MANY,
+        fromObjectMetadataId: createdObjectMetadata.id,
+        toObjectMetadataId: eventObjectMetadata.id,
+        fromFieldMetadataId:
+          eventRelationFieldMetadataMap[createdObjectMetadata.id].id,
+        toFieldMetadataId:
+          eventRelationFieldMetadataMap[eventObjectMetadata.id].id,
+        onDeleteAction: RelationOnDeleteAction.CASCADE,
+      },
+    ]);
+
+    return { eventObjectMetadata };
+  }
+
+  private async createFavoriteRelation(
+    workspaceId: string,
+    createdObjectMetadata: ObjectMetadataEntity,
+  ) {
+    const favoriteObjectMetadata =
+      await this.objectMetadataRepository.findOneByOrFail({
+        nameSingular: 'favorite',
+        workspaceId: workspaceId,
+      });
+
+    const favoriteRelationFieldMetadata =
+      await this.fieldMetadataRepository.save([
+        // FROM
+        {
+          standardId: customObjectStandardFieldIds.favorites,
+          objectMetadataId: createdObjectMetadata.id,
+          workspaceId: workspaceId,
+          isCustom: false,
+          isActive: true,
+          isSystem: true,
+          type: FieldMetadataType.RELATION,
+          name: 'favorites',
+          label: 'Favorites',
+          description: `Favorites tied to the ${createdObjectMetadata.labelSingular}`,
+          icon: 'IconHeart',
+          isNullable: true,
+        },
+        // TO
+        {
+          standardId: createRelationDeterministicUuid({
+            objectId: createdObjectMetadata.id,
+            standardId: favoriteStandardFieldIds.custom,
+          }),
+          objectMetadataId: favoriteObjectMetadata.id,
+          workspaceId: workspaceId,
+          isCustom: false,
+          isActive: true,
+          type: FieldMetadataType.RELATION,
+          name: createdObjectMetadata.nameSingular,
+          label: createdObjectMetadata.labelSingular,
+          description: `Favorite ${createdObjectMetadata.labelSingular}`,
+          icon: 'IconBuildingSkyscraper',
+          isNullable: true,
+        },
+        // Foreign key
+        {
+          standardId: createForeignKeyDeterministicUuid({
+            objectId: createdObjectMetadata.id,
+            standardId: favoriteStandardFieldIds.custom,
+          }),
+          objectMetadataId: favoriteObjectMetadata.id,
+          workspaceId: workspaceId,
+          isCustom: false,
+          isActive: true,
+          type: FieldMetadataType.UUID,
+          name: `${createdObjectMetadata.nameSingular}Id`,
+          label: `${createdObjectMetadata.labelSingular} ID (foreign key)`,
+          description: `Favorite ${createdObjectMetadata.labelSingular} id foreign key`,
+          icon: undefined,
+          isNullable: true,
+          isSystem: true,
+          defaultValue: undefined,
+        },
+      ]);
+
+    const favoriteRelationFieldMetadataMap =
+      favoriteRelationFieldMetadata.reduce(
+        (acc, fieldMetadata: FieldMetadataEntity) => {
+          if (fieldMetadata.type === FieldMetadataType.RELATION) {
+            acc[fieldMetadata.objectMetadataId] = fieldMetadata;
+          }
+
+          return acc;
+        },
+        {},
+      );
+
+    await this.relationMetadataRepository.save([
+      {
+        workspaceId: workspaceId,
+        relationType: RelationMetadataType.ONE_TO_MANY,
+        fromObjectMetadataId: createdObjectMetadata.id,
+        toObjectMetadataId: favoriteObjectMetadata.id,
+        fromFieldMetadataId:
+          favoriteRelationFieldMetadataMap[createdObjectMetadata.id].id,
+        toFieldMetadataId:
+          favoriteRelationFieldMetadataMap[favoriteObjectMetadata.id].id,
+        onDeleteAction: RelationOnDeleteAction.CASCADE,
+      },
+    ]);
+
+    return { favoriteObjectMetadata };
+  }
+
+  private async isRelationEnabledForRemoteObjects(workspaceId: string) {
+    const featureFlag = await this.featureFlagRepository.findOneBy({
+      workspaceId,
+      key: FeatureFlagKeys.IsRelationForRemoteObjectsEnabled,
+      value: true,
+    });
+
+    return featureFlag && featureFlag.value;
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util.ts
new file mode 100644
index 000000000000..e94ddab336dc
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util.ts
@@ -0,0 +1,9 @@
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+export const assertMutationNotOnRemoteObject = (
+  objectMetadataItem: ObjectMetadataInterface,
+) => {
+  if (objectMetadataItem.isRemote) {
+    throw new Error('Remote objects are read-only');
+  }
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/create-workspace-migrations-for-custom-object.util.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/create-workspace-migrations-for-custom-object.util.ts
new file mode 100644
index 000000000000..180cac0e1ff8
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/create-workspace-migrations-for-custom-object.util.ts
@@ -0,0 +1,168 @@
+import { computeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { RelationOnDeleteAction } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import {
+  WorkspaceMigrationTableAction,
+  WorkspaceMigrationColumnActionType,
+  WorkspaceMigrationColumnCreate,
+  WorkspaceMigrationTableActionType,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+
+export const createWorkspaceMigrationsForCustomObject = (
+  createdObjectMetadata: ObjectMetadataEntity,
+  activityTargetObjectMetadata: ObjectMetadataEntity,
+  attachmentObjectMetadata: ObjectMetadataEntity,
+  eventObjectMetadata: ObjectMetadataEntity,
+  favoriteObjectMetadata: ObjectMetadataEntity,
+): WorkspaceMigrationTableAction[] => [
+  {
+    name: computeObjectTargetTable(createdObjectMetadata),
+    action: WorkspaceMigrationTableActionType.CREATE,
+  } satisfies WorkspaceMigrationTableAction,
+  // Add activity target relation
+  {
+    name: computeObjectTargetTable(activityTargetObjectMetadata),
+    action: WorkspaceMigrationTableActionType.ALTER,
+    columns: [
+      {
+        action: WorkspaceMigrationColumnActionType.CREATE,
+        columnName: computeColumnName(createdObjectMetadata.nameSingular, {
+          isForeignKey: true,
+        }),
+        columnType: 'uuid',
+        isNullable: true,
+      } satisfies WorkspaceMigrationColumnCreate,
+    ],
+  },
+  {
+    name: computeObjectTargetTable(activityTargetObjectMetadata),
+    action: WorkspaceMigrationTableActionType.ALTER,
+    columns: [
+      {
+        action: WorkspaceMigrationColumnActionType.CREATE_FOREIGN_KEY,
+        columnName: computeColumnName(createdObjectMetadata.nameSingular, {
+          isForeignKey: true,
+        }),
+        referencedTableName: computeObjectTargetTable(createdObjectMetadata),
+        referencedTableColumnName: 'id',
+        onDelete: RelationOnDeleteAction.CASCADE,
+      },
+    ],
+  },
+  // Add attachment relation
+  {
+    name: computeObjectTargetTable(attachmentObjectMetadata),
+    action: WorkspaceMigrationTableActionType.ALTER,
+    columns: [
+      {
+        action: WorkspaceMigrationColumnActionType.CREATE,
+        columnName: computeColumnName(createdObjectMetadata.nameSingular, {
+          isForeignKey: true,
+        }),
+        columnType: 'uuid',
+        isNullable: true,
+      } satisfies WorkspaceMigrationColumnCreate,
+    ],
+  },
+  {
+    name: computeObjectTargetTable(attachmentObjectMetadata),
+    action: WorkspaceMigrationTableActionType.ALTER,
+    columns: [
+      {
+        action: WorkspaceMigrationColumnActionType.CREATE_FOREIGN_KEY,
+        columnName: computeColumnName(createdObjectMetadata.nameSingular, {
+          isForeignKey: true,
+        }),
+        referencedTableName: computeObjectTargetTable(createdObjectMetadata),
+        referencedTableColumnName: 'id',
+        onDelete: RelationOnDeleteAction.CASCADE,
+      },
+    ],
+  },
+  // Add event relation
+  {
+    name: computeObjectTargetTable(eventObjectMetadata),
+    action: WorkspaceMigrationTableActionType.ALTER,
+    columns: [
+      {
+        action: WorkspaceMigrationColumnActionType.CREATE,
+        columnName: computeColumnName(createdObjectMetadata.nameSingular, {
+          isForeignKey: true,
+        }),
+        columnType: 'uuid',
+        isNullable: true,
+      } satisfies WorkspaceMigrationColumnCreate,
+    ],
+  },
+  {
+    name: computeObjectTargetTable(eventObjectMetadata),
+    action: WorkspaceMigrationTableActionType.ALTER,
+    columns: [
+      {
+        action: WorkspaceMigrationColumnActionType.CREATE_FOREIGN_KEY,
+        columnName: computeColumnName(createdObjectMetadata.nameSingular, {
+          isForeignKey: true,
+        }),
+        referencedTableName: computeObjectTargetTable(createdObjectMetadata),
+        referencedTableColumnName: 'id',
+        onDelete: RelationOnDeleteAction.CASCADE,
+      },
+    ],
+  },
+  // Add favorite relation
+  {
+    name: computeObjectTargetTable(favoriteObjectMetadata),
+    action: WorkspaceMigrationTableActionType.ALTER,
+    columns: [
+      {
+        action: WorkspaceMigrationColumnActionType.CREATE,
+        columnName: computeColumnName(createdObjectMetadata.nameSingular, {
+          isForeignKey: true,
+        }),
+        columnType: 'uuid',
+        isNullable: true,
+      } satisfies WorkspaceMigrationColumnCreate,
+    ],
+  },
+  {
+    name: computeObjectTargetTable(favoriteObjectMetadata),
+    action: WorkspaceMigrationTableActionType.ALTER,
+    columns: [
+      {
+        action: WorkspaceMigrationColumnActionType.CREATE_FOREIGN_KEY,
+        columnName: computeColumnName(createdObjectMetadata.nameSingular, {
+          isForeignKey: true,
+        }),
+        referencedTableName: computeObjectTargetTable(createdObjectMetadata),
+        referencedTableColumnName: 'id',
+        onDelete: RelationOnDeleteAction.CASCADE,
+      },
+    ],
+  },
+  {
+    name: computeObjectTargetTable(createdObjectMetadata),
+    action: WorkspaceMigrationTableActionType.ALTER,
+    columns: [
+      {
+        action: WorkspaceMigrationColumnActionType.CREATE,
+        columnName: 'position',
+        columnType: 'float',
+        isNullable: true,
+      } satisfies WorkspaceMigrationColumnCreate,
+    ],
+  } satisfies WorkspaceMigrationTableAction,
+  // This is temporary until we implement mainIdentifier
+  {
+    name: computeObjectTargetTable(createdObjectMetadata),
+    action: WorkspaceMigrationTableActionType.ALTER,
+    columns: [
+      {
+        action: WorkspaceMigrationColumnActionType.CREATE,
+        columnName: 'name',
+        columnType: 'text',
+        defaultValue: "'Untitled'",
+      } satisfies WorkspaceMigrationColumnCreate,
+    ],
+  } satisfies WorkspaceMigrationTableAction,
+];
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/create-workspace-migrations-for-remote-object.util.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/create-workspace-migrations-for-remote-object.util.ts
new file mode 100644
index 000000000000..623ae397cbce
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/create-workspace-migrations-for-remote-object.util.ts
@@ -0,0 +1,183 @@
+import { DataSource } from 'typeorm';
+
+import { computeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import {
+  WorkspaceMigrationTableAction,
+  WorkspaceMigrationColumnActionType,
+  WorkspaceMigrationColumnCreate,
+  WorkspaceMigrationTableActionType,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+
+const buildCommentForRemoteObjectForeignKey = async (
+  localObjectMetadataName: string,
+  remoteObjectMetadataName: string,
+  schema: string,
+  workspaceDataSource: DataSource | undefined,
+): Promise<string> => {
+  const existingComment = await workspaceDataSource?.query(
+    `SELECT col_description('${schema}."${localObjectMetadataName}"'::regclass, 0)`,
+  );
+
+  if (!existingComment[0]?.col_description) {
+    return `@graphql({"totalCount":{"enabled": true},"foreign_keys":[{"local_name":"${localObjectMetadataName}Collection","local_columns":["${remoteObjectMetadataName}Id"],"foreign_name":"${remoteObjectMetadataName}","foreign_schema":"${schema}","foreign_table":"${remoteObjectMetadataName}","foreign_columns":["id"]}]})`;
+  }
+
+  const commentWithoutGraphQL = existingComment[0].col_description
+    .replace('@graphql(', '')
+    .replace(')', '');
+  const parsedComment = JSON.parse(commentWithoutGraphQL);
+
+  const foreignKey = {
+    local_name: `${localObjectMetadataName}Collection`,
+    local_columns: [`${remoteObjectMetadataName}Id`],
+    foreign_name: `${remoteObjectMetadataName}`,
+    foreign_schema: schema,
+    foreign_table: remoteObjectMetadataName,
+    foreign_columns: ['id'],
+  };
+
+  if (parsedComment.foreign_keys) {
+    parsedComment.foreign_keys.push(foreignKey);
+  } else {
+    parsedComment.foreign_keys = [foreignKey];
+  }
+
+  return `@graphql(${JSON.stringify(parsedComment)})`;
+};
+
+export const createWorkspaceMigrationsForRemoteObject = async (
+  createdObjectMetadata: ObjectMetadataEntity,
+  activityTargetObjectMetadata: ObjectMetadataEntity,
+  attachmentObjectMetadata: ObjectMetadataEntity,
+  eventObjectMetadata: ObjectMetadataEntity,
+  favoriteObjectMetadata: ObjectMetadataEntity,
+  schema: string,
+  remoteTablePrimaryKeyColumnType: string,
+  workspaceDataSource: DataSource | undefined,
+): Promise<WorkspaceMigrationTableAction[]> => {
+  const createdObjectName = createdObjectMetadata.nameSingular;
+
+  return [
+    {
+      name: computeObjectTargetTable(activityTargetObjectMetadata),
+      action: WorkspaceMigrationTableActionType.ALTER,
+      columns: [
+        {
+          action: WorkspaceMigrationColumnActionType.CREATE,
+          columnName: computeColumnName(createdObjectMetadata.nameSingular, {
+            isForeignKey: true,
+          }),
+          columnType: remoteTablePrimaryKeyColumnType,
+          isNullable: true,
+        } satisfies WorkspaceMigrationColumnCreate,
+      ],
+    },
+    {
+      name: computeObjectTargetTable(activityTargetObjectMetadata),
+      action: WorkspaceMigrationTableActionType.ALTER,
+      columns: [
+        {
+          action: WorkspaceMigrationColumnActionType.CREATE_COMMENT,
+          comment: await buildCommentForRemoteObjectForeignKey(
+            activityTargetObjectMetadata.nameSingular,
+            createdObjectName,
+            schema,
+            workspaceDataSource,
+          ),
+        },
+      ],
+    },
+    // Add attachment relation
+    {
+      name: computeObjectTargetTable(attachmentObjectMetadata),
+      action: WorkspaceMigrationTableActionType.ALTER,
+      columns: [
+        {
+          action: WorkspaceMigrationColumnActionType.CREATE,
+          columnName: computeColumnName(createdObjectMetadata.nameSingular, {
+            isForeignKey: true,
+          }),
+          columnType: remoteTablePrimaryKeyColumnType,
+          isNullable: true,
+        } satisfies WorkspaceMigrationColumnCreate,
+      ],
+    },
+    {
+      name: computeObjectTargetTable(attachmentObjectMetadata),
+      action: WorkspaceMigrationTableActionType.ALTER,
+      columns: [
+        {
+          action: WorkspaceMigrationColumnActionType.CREATE_COMMENT,
+          comment: await buildCommentForRemoteObjectForeignKey(
+            attachmentObjectMetadata.nameSingular,
+            createdObjectName,
+            schema,
+            workspaceDataSource,
+          ),
+        },
+      ],
+    },
+    // Add event relation
+    {
+      name: computeObjectTargetTable(eventObjectMetadata),
+      action: WorkspaceMigrationTableActionType.ALTER,
+      columns: [
+        {
+          action: WorkspaceMigrationColumnActionType.CREATE,
+          columnName: computeColumnName(createdObjectMetadata.nameSingular, {
+            isForeignKey: true,
+          }),
+          columnType: remoteTablePrimaryKeyColumnType,
+          isNullable: true,
+        } satisfies WorkspaceMigrationColumnCreate,
+      ],
+    },
+    {
+      name: computeObjectTargetTable(eventObjectMetadata),
+      action: WorkspaceMigrationTableActionType.ALTER,
+      columns: [
+        {
+          action: WorkspaceMigrationColumnActionType.CREATE_COMMENT,
+          comment: await buildCommentForRemoteObjectForeignKey(
+            eventObjectMetadata.nameSingular,
+            createdObjectName,
+            schema,
+            workspaceDataSource,
+          ),
+        },
+      ],
+    },
+    // Add favorite relation
+    {
+      name: computeObjectTargetTable(favoriteObjectMetadata),
+      action: WorkspaceMigrationTableActionType.ALTER,
+      columns: [
+        {
+          action: WorkspaceMigrationColumnActionType.CREATE,
+          columnName: computeColumnName(createdObjectMetadata.nameSingular, {
+            isForeignKey: true,
+          }),
+          columnType: remoteTablePrimaryKeyColumnType,
+          isNullable: true,
+        } satisfies WorkspaceMigrationColumnCreate,
+      ],
+    },
+    {
+      name: computeObjectTargetTable(favoriteObjectMetadata),
+      action: WorkspaceMigrationTableActionType.ALTER,
+      columns: [
+        {
+          action: WorkspaceMigrationColumnActionType.CREATE_COMMENT,
+          comment: await buildCommentForRemoteObjectForeignKey(
+            favoriteObjectMetadata.nameSingular,
+            createdObjectName,
+            schema,
+            workspaceDataSource,
+          ),
+        },
+      ],
+    },
+  ];
+};
diff --git a/packages/twenty-server/src/metadata/relation-metadata/dtos/create-relation.input.ts b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/dtos/create-relation.input.ts
similarity index 84%
rename from packages/twenty-server/src/metadata/relation-metadata/dtos/create-relation.input.ts
rename to packages/twenty-server/src/engine/metadata-modules/relation-metadata/dtos/create-relation.input.ts
index 278ee15b427b..d420b16ce96d 100644
--- a/packages/twenty-server/src/metadata/relation-metadata/dtos/create-relation.input.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/dtos/create-relation.input.ts
@@ -9,8 +9,8 @@ import {
   IsUUID,
 } from 'class-validator';
 
-import { BeforeCreateOneRelation } from 'src/metadata/relation-metadata/hooks/before-create-one-relation.hook';
-import { RelationMetadataType } from 'src/metadata/relation-metadata/relation-metadata.entity';
+import { BeforeCreateOneRelation } from 'src/engine/metadata-modules/relation-metadata/hooks/before-create-one-relation.hook';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 
 @InputType()
 @BeforeCreateOne(BeforeCreateOneRelation)
diff --git a/packages/twenty-server/src/engine/metadata-modules/relation-metadata/dtos/relation-metadata.dto.ts b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/dtos/relation-metadata.dto.ts
new file mode 100644
index 000000000000..b7d04156176e
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/dtos/relation-metadata.dto.ts
@@ -0,0 +1,71 @@
+import {
+  ObjectType,
+  Field,
+  HideField,
+  registerEnumType,
+} from '@nestjs/graphql';
+
+import { CreateDateColumn, UpdateDateColumn } from 'typeorm';
+import {
+  Authorize,
+  BeforeDeleteOne,
+  IDField,
+  QueryOptions,
+  Relation,
+} from '@ptc-org/nestjs-query-graphql';
+
+import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { BeforeDeleteOneRelation } from 'src/engine/metadata-modules/relation-metadata/hooks/before-delete-one-relation.hook';
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+registerEnumType(RelationMetadataType, {
+  name: 'RelationMetadataType',
+  description: 'Type of the relation',
+});
+
+@ObjectType('relation')
+@Authorize({
+  authorize: (context: any) => ({
+    workspaceId: { eq: context?.req?.user?.workspace?.id },
+  }),
+})
+@QueryOptions({
+  defaultResultSize: 10,
+  disableFilter: true,
+  disableSort: true,
+  maxResultsSize: 1000,
+})
+@BeforeDeleteOne(BeforeDeleteOneRelation)
+@Relation('fromObjectMetadata', () => ObjectMetadataDTO)
+@Relation('toObjectMetadata', () => ObjectMetadataDTO)
+export class RelationMetadataDTO {
+  @IDField(() => UUIDScalarType)
+  id: string;
+
+  @Field(() => RelationMetadataType)
+  relationType: RelationMetadataType;
+
+  @Field()
+  fromObjectMetadataId: string;
+
+  @Field()
+  toObjectMetadataId: string;
+
+  @Field()
+  fromFieldMetadataId: string;
+
+  @Field()
+  toFieldMetadataId: string;
+
+  @HideField()
+  workspaceId: string;
+
+  @Field()
+  @CreateDateColumn()
+  createdAt: Date;
+
+  @Field()
+  @UpdateDateColumn()
+  updatedAt: Date;
+}
diff --git a/packages/twenty-server/src/metadata/relation-metadata/hooks/before-create-one-relation.hook.ts b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/hooks/before-create-one-relation.hook.ts
similarity index 84%
rename from packages/twenty-server/src/metadata/relation-metadata/hooks/before-create-one-relation.hook.ts
rename to packages/twenty-server/src/engine/metadata-modules/relation-metadata/hooks/before-create-one-relation.hook.ts
index 57f2dd9f9851..d91d9c923d3f 100644
--- a/packages/twenty-server/src/metadata/relation-metadata/hooks/before-create-one-relation.hook.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/hooks/before-create-one-relation.hook.ts
@@ -5,7 +5,7 @@ import {
   CreateOneInputType,
 } from '@ptc-org/nestjs-query-graphql';
 
-import { CreateRelationInput } from 'src/metadata/relation-metadata/dtos/create-relation.input';
+import { CreateRelationInput } from 'src/engine/metadata-modules/relation-metadata/dtos/create-relation.input';
 
 @Injectable()
 export class BeforeCreateOneRelation<T extends CreateRelationInput>
diff --git a/packages/twenty-server/src/engine/metadata-modules/relation-metadata/hooks/before-delete-one-relation.hook.ts b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/hooks/before-delete-one-relation.hook.ts
new file mode 100644
index 000000000000..7976185590ac
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/hooks/before-delete-one-relation.hook.ts
@@ -0,0 +1,55 @@
+import {
+  BadRequestException,
+  Injectable,
+  UnauthorizedException,
+} from '@nestjs/common';
+
+import {
+  BeforeDeleteOneHook,
+  DeleteOneInputType,
+} from '@ptc-org/nestjs-query-graphql';
+
+import { RelationMetadataService } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.service';
+
+@Injectable()
+export class BeforeDeleteOneRelation implements BeforeDeleteOneHook<any> {
+  constructor(readonly relationMetadataService: RelationMetadataService) {}
+
+  async run(
+    instance: DeleteOneInputType,
+    context: any,
+  ): Promise<DeleteOneInputType> {
+    const workspaceId = context?.req?.user?.workspace?.id;
+
+    if (!workspaceId) {
+      throw new UnauthorizedException();
+    }
+
+    const relationMetadata =
+      await this.relationMetadataService.findOneWithinWorkspace(workspaceId, {
+        where: {
+          id: instance.id.toString(),
+        },
+      });
+
+    if (!relationMetadata) {
+      throw new BadRequestException('Relation does not exist');
+    }
+
+    if (
+      !relationMetadata.toFieldMetadata.isCustom ||
+      !relationMetadata.fromFieldMetadata.isCustom
+    ) {
+      throw new BadRequestException("Standard Relations can't be deleted");
+    }
+
+    if (
+      relationMetadata.toFieldMetadata.isActive ||
+      relationMetadata.fromFieldMetadata.isActive
+    ) {
+      throw new BadRequestException("Active relations can't be deleted");
+    }
+
+    return instance;
+  }
+}
diff --git a/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.entity.ts
similarity index 82%
rename from packages/twenty-server/src/metadata/relation-metadata/relation-metadata.entity.ts
rename to packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.entity.ts
index 6b6f8f6573b0..ebe9146d8b2e 100644
--- a/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.entity.ts
@@ -9,10 +9,10 @@ import {
   UpdateDateColumn,
 } from 'typeorm';
 
-import { RelationMetadataInterface } from 'src/metadata/field-metadata/interfaces/relation-metadata.interface';
+import { RelationMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-metadata.interface';
 
-import { FieldMetadataEntity } from 'src/metadata/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 
 export enum RelationMetadataType {
   ONE_TO_ONE = 'ONE_TO_ONE',
@@ -90,9 +90,9 @@ export class RelationMetadataEntity implements RelationMetadataInterface {
   @JoinColumn()
   toFieldMetadata: FieldMetadataEntity;
 
-  @CreateDateColumn()
+  @CreateDateColumn({ type: 'timestamptz' })
   createdAt: Date;
 
-  @UpdateDateColumn()
+  @UpdateDateColumn({ type: 'timestamptz' })
   updatedAt: Date;
 }
diff --git a/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.module.ts
new file mode 100644
index 000000000000..f0be7bc7df98
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.module.ts
@@ -0,0 +1,53 @@
+import { Module } from '@nestjs/common';
+
+import {
+  NestjsQueryGraphQLModule,
+  PagingStrategies,
+} from '@ptc-org/nestjs-query-graphql';
+import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
+
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/field-metadata.module';
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
+import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
+import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
+
+import { RelationMetadataService } from './relation-metadata.service';
+import { RelationMetadataEntity } from './relation-metadata.entity';
+
+import { CreateRelationInput } from './dtos/create-relation.input';
+import { RelationMetadataDTO } from './dtos/relation-metadata.dto';
+
+@Module({
+  imports: [
+    NestjsQueryGraphQLModule.forFeature({
+      imports: [
+        NestjsQueryTypeOrmModule.forFeature(
+          [RelationMetadataEntity],
+          'metadata',
+        ),
+        ObjectMetadataModule,
+        FieldMetadataModule,
+        WorkspaceMigrationRunnerModule,
+        WorkspaceMigrationModule,
+      ],
+      services: [RelationMetadataService],
+      resolvers: [
+        {
+          EntityClass: RelationMetadataEntity,
+          DTOClass: RelationMetadataDTO,
+          ServiceClass: RelationMetadataService,
+          CreateDTOClass: CreateRelationInput,
+          pagingStrategy: PagingStrategies.CURSOR,
+          create: { many: { disabled: true } },
+          update: { disabled: true },
+          delete: { many: { disabled: true } },
+          guards: [JwtAuthGuard],
+        },
+      ],
+    }),
+  ],
+  providers: [RelationMetadataService],
+  exports: [RelationMetadataService],
+})
+export class RelationMetadataModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts
new file mode 100644
index 000000000000..1180e0dc9957
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts
@@ -0,0 +1,359 @@
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
+import { FindOneOptions, In, Repository } from 'typeorm';
+import camelCase from 'lodash.camelcase';
+import { v4 as uuidV4 } from 'uuid';
+
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
+import { CreateRelationInput } from 'src/engine/metadata-modules/relation-metadata/dtos/create-relation.input';
+import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service';
+import { WorkspaceMigrationService } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.service';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  WorkspaceMigrationColumnActionType,
+  WorkspaceMigrationTableActionType,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
+
+import {
+  RelationMetadataEntity,
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from './relation-metadata.entity';
+
+@Injectable()
+export class RelationMetadataService extends TypeOrmQueryService<RelationMetadataEntity> {
+  constructor(
+    @InjectRepository(RelationMetadataEntity, 'metadata')
+    private readonly relationMetadataRepository: Repository<RelationMetadataEntity>,
+    private readonly objectMetadataService: ObjectMetadataService,
+    private readonly fieldMetadataService: FieldMetadataService,
+    private readonly workspaceMigrationService: WorkspaceMigrationService,
+    private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
+  ) {
+    super(relationMetadataRepository);
+  }
+
+  override async createOne(
+    relationMetadataInput: CreateRelationInput,
+  ): Promise<RelationMetadataEntity> {
+    const objectMetadataMap = await this.getObjectMetadataMap(
+      relationMetadataInput,
+    );
+
+    await this.validateCreateRelationMetadataInput(
+      relationMetadataInput,
+      objectMetadataMap,
+    );
+
+    // NOTE: this logic is called to create relation through metadata graphql endpoint (so only for custom field relations)
+    const isCustom = true;
+    const columnName = `${camelCase(relationMetadataInput.toName)}Id`;
+
+    const fromId = uuidV4();
+    const toId = uuidV4();
+
+    await this.fieldMetadataService.createMany([
+      this.createFieldMetadataForRelationMetadata(
+        relationMetadataInput,
+        'from',
+        isCustom,
+        fromId,
+      ),
+      this.createFieldMetadataForRelationMetadata(
+        relationMetadataInput,
+        'to',
+        isCustom,
+        toId,
+      ),
+      this.createForeignKeyFieldMetadata(relationMetadataInput, columnName),
+    ]);
+
+    const createdRelationMetadata = await super.createOne({
+      ...relationMetadataInput,
+      fromFieldMetadataId: fromId,
+      toFieldMetadataId: toId,
+    });
+
+    await this.createWorkspaceCustomMigration(
+      relationMetadataInput,
+      objectMetadataMap,
+      columnName,
+    );
+
+    await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
+      relationMetadataInput.workspaceId,
+    );
+
+    return createdRelationMetadata;
+  }
+
+  private async validateCreateRelationMetadataInput(
+    relationMetadataInput: CreateRelationInput,
+    objectMetadataMap: { [key: string]: ObjectMetadataEntity },
+  ) {
+    if (
+      relationMetadataInput.relationType === RelationMetadataType.MANY_TO_MANY
+    ) {
+      throw new BadRequestException(
+        'Many to many relations are not supported yet',
+      );
+    }
+
+    if (
+      objectMetadataMap[relationMetadataInput.fromObjectMetadataId] ===
+        undefined ||
+      objectMetadataMap[relationMetadataInput.toObjectMetadataId] === undefined
+    ) {
+      throw new NotFoundException(
+        'Can\t find an existing object matching with fromObjectMetadataId or toObjectMetadataId',
+      );
+    }
+
+    await this.checkIfFieldMetadataRelationNameExists(
+      relationMetadataInput,
+      objectMetadataMap,
+      'from',
+    );
+    await this.checkIfFieldMetadataRelationNameExists(
+      relationMetadataInput,
+      objectMetadataMap,
+      'to',
+    );
+  }
+
+  private async checkIfFieldMetadataRelationNameExists(
+    relationMetadataInput: CreateRelationInput,
+    objectMetadataMap: { [key: string]: ObjectMetadataEntity },
+    relationDirection: 'from' | 'to',
+  ) {
+    const fieldAlreadyExists =
+      await this.fieldMetadataService.findOneWithinWorkspace(
+        relationMetadataInput.workspaceId,
+        {
+          where: {
+            name: relationMetadataInput[`${relationDirection}Name`],
+            objectMetadataId:
+              relationMetadataInput[`${relationDirection}ObjectMetadataId`],
+          },
+        },
+      );
+
+    if (fieldAlreadyExists) {
+      throw new ConflictException(
+        `Field on ${
+          objectMetadataMap[
+            relationMetadataInput[`${relationDirection}ObjectMetadataId`]
+          ].nameSingular
+        } already exists`,
+      );
+    }
+  }
+
+  private async createWorkspaceCustomMigration(
+    relationMetadataInput: CreateRelationInput,
+    objectMetadataMap: { [key: string]: ObjectMetadataEntity },
+    columnName: string,
+  ) {
+    await this.workspaceMigrationService.createCustomMigration(
+      generateMigrationName(`create-${relationMetadataInput.fromName}`),
+      relationMetadataInput.workspaceId,
+      [
+        // Create the column
+        {
+          name: computeObjectTargetTable(
+            objectMetadataMap[relationMetadataInput.toObjectMetadataId],
+          ),
+          action: WorkspaceMigrationTableActionType.ALTER,
+          columns: [
+            {
+              action: WorkspaceMigrationColumnActionType.CREATE,
+              columnName,
+              columnType: 'uuid',
+              isNullable: true,
+            },
+          ],
+        },
+        // Create the foreignKey
+        {
+          name: computeObjectTargetTable(
+            objectMetadataMap[relationMetadataInput.toObjectMetadataId],
+          ),
+          action: WorkspaceMigrationTableActionType.ALTER,
+          columns: [
+            {
+              action: WorkspaceMigrationColumnActionType.CREATE_FOREIGN_KEY,
+              columnName,
+              referencedTableName: computeObjectTargetTable(
+                objectMetadataMap[relationMetadataInput.fromObjectMetadataId],
+              ),
+              referencedTableColumnName: 'id',
+              isUnique:
+                relationMetadataInput.relationType ===
+                RelationMetadataType.ONE_TO_ONE,
+              onDelete: RelationOnDeleteAction.SET_NULL,
+            },
+          ],
+        },
+      ],
+    );
+  }
+
+  private createFieldMetadataForRelationMetadata(
+    relationMetadataInput: CreateRelationInput,
+    relationDirection: 'from' | 'to',
+    isCustom: boolean,
+    id?: string,
+  ) {
+    return {
+      ...(id && { id: id }),
+      name: relationMetadataInput[`${relationDirection}Name`],
+      label: relationMetadataInput[`${relationDirection}Label`],
+      description: relationMetadataInput[`${relationDirection}Description`],
+      icon: relationMetadataInput[`${relationDirection}Icon`],
+      isCustom: true,
+      isActive: true,
+      isNullable: true,
+      type: FieldMetadataType.RELATION,
+      objectMetadataId:
+        relationMetadataInput[`${relationDirection}ObjectMetadataId`],
+      workspaceId: relationMetadataInput.workspaceId,
+    };
+  }
+
+  private createForeignKeyFieldMetadata(
+    relationMetadataInput: CreateRelationInput,
+    columnName: string,
+  ) {
+    return {
+      name: columnName,
+      label: `${relationMetadataInput.toLabel} Foreign Key`,
+      description: relationMetadataInput.toDescription
+        ? `${relationMetadataInput.toDescription} Foreign Key`
+        : undefined,
+      icon: undefined,
+      isCustom: true,
+      isActive: true,
+      isNullable: true,
+      isSystem: true,
+      type: FieldMetadataType.UUID,
+      objectMetadataId: relationMetadataInput.toObjectMetadataId,
+      workspaceId: relationMetadataInput.workspaceId,
+    };
+  }
+
+  private async getObjectMetadataMap(
+    relationMetadataInput: CreateRelationInput,
+  ): Promise<{ [key: string]: ObjectMetadataEntity }> {
+    const objectMetadataEntries =
+      await this.objectMetadataService.findManyWithinWorkspace(
+        relationMetadataInput.workspaceId,
+        {
+          where: {
+            id: In([
+              relationMetadataInput.fromObjectMetadataId,
+              relationMetadataInput.toObjectMetadataId,
+            ]),
+          },
+        },
+      );
+
+    return objectMetadataEntries.reduce(
+      (acc, curr) => {
+        acc[curr.id] = curr;
+
+        return acc;
+      },
+      {} as { [key: string]: ObjectMetadataEntity },
+    );
+  }
+
+  public async findOneWithinWorkspace(
+    workspaceId: string,
+    options: FindOneOptions<RelationMetadataEntity>,
+  ) {
+    return this.relationMetadataRepository.findOne({
+      ...options,
+      where: {
+        ...options.where,
+        workspaceId,
+      },
+      relations: ['fromFieldMetadata', 'toFieldMetadata'],
+    });
+  }
+
+  override async deleteOne(id: string): Promise<RelationMetadataEntity> {
+    // TODO: This logic is duplicated with the BeforeDeleteOneRelation hook
+    const relationMetadata = await this.relationMetadataRepository.findOne({
+      where: { id },
+      relations: ['fromFieldMetadata', 'toFieldMetadata'],
+    });
+
+    if (!relationMetadata) {
+      throw new NotFoundException('Relation does not exist');
+    }
+
+    const deletedRelationMetadata = super.deleteOne(id);
+
+    // TODO: Move to a cdc scheduler
+    this.fieldMetadataService.deleteMany({
+      id: {
+        in: [
+          relationMetadata.fromFieldMetadataId,
+          relationMetadata.toFieldMetadataId,
+        ],
+      },
+    });
+
+    return deletedRelationMetadata;
+  }
+
+  async findManyRelationMetadataByFieldMetadataIds(
+    fieldMetadataIds: string[],
+  ): Promise<(RelationMetadataEntity | NotFoundException)[]> {
+    const relationMetadataCollection =
+      await this.relationMetadataRepository.find({
+        where: [
+          {
+            fromFieldMetadataId: In(fieldMetadataIds),
+          },
+          {
+            toFieldMetadataId: In(fieldMetadataIds),
+          },
+        ],
+        relations: [
+          'fromObjectMetadata',
+          'toObjectMetadata',
+          'fromFieldMetadata',
+          'toFieldMetadata',
+        ],
+      });
+
+    const mappedResult = fieldMetadataIds.map((fieldMetadataId) => {
+      const foundRelationMetadataItem = relationMetadataCollection.find(
+        (relationMetadataItem) =>
+          relationMetadataItem.fromFieldMetadataId === fieldMetadataId ||
+          relationMetadataItem.toFieldMetadataId === fieldMetadataId,
+      );
+
+      return (
+        foundRelationMetadataItem ??
+        new NotFoundException(
+          `RelationMetadata with fieldMetadataId ${fieldMetadataId} not found`,
+        )
+      );
+    });
+
+    return mappedResult;
+  }
+}
diff --git a/packages/twenty-server/src/metadata/relation-metadata/types/relation-to-delete.ts b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/types/relation-to-delete.ts
similarity index 100%
rename from packages/twenty-server/src/metadata/relation-metadata/types/relation-to-delete.ts
rename to packages/twenty-server/src/engine/metadata-modules/relation-metadata/types/relation-to-delete.ts
diff --git a/packages/twenty-server/src/metadata/relation-metadata/utils/create-relation-foreign-key-field-metadata-name.util.ts b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/utils/create-relation-foreign-key-field-metadata-name.util.ts
similarity index 100%
rename from packages/twenty-server/src/metadata/relation-metadata/utils/create-relation-foreign-key-field-metadata-name.util.ts
rename to packages/twenty-server/src/engine/metadata-modules/relation-metadata/utils/create-relation-foreign-key-field-metadata-name.util.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/dtos/create-remote-server.input.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/dtos/create-remote-server.input.ts
new file mode 100644
index 000000000000..35cacf89b737
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/dtos/create-remote-server.input.ts
@@ -0,0 +1,24 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+import { IsOptional } from 'class-validator';
+import GraphQLJSON from 'graphql-type-json';
+
+import {
+  ForeignDataWrapperOptions,
+  RemoteServerType,
+  UserMappingOptions,
+} from 'src/engine/metadata-modules/remote-server/remote-server.entity';
+
+@InputType()
+export class CreateRemoteServerInput<T extends RemoteServerType> {
+  @Field(() => String)
+  foreignDataWrapperType: T;
+
+  @IsOptional()
+  @Field(() => GraphQLJSON)
+  foreignDataWrapperOptions: ForeignDataWrapperOptions<T>;
+
+  @IsOptional()
+  @Field(() => GraphQLJSON, { nullable: true })
+  userMappingOptions?: UserMappingOptions;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/dtos/remote-server-id.input.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/dtos/remote-server-id.input.ts
new file mode 100644
index 000000000000..958d0bae3f87
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/dtos/remote-server-id.input.ts
@@ -0,0 +1,9 @@
+import { InputType, ID } from '@nestjs/graphql';
+
+import { IDField } from '@ptc-org/nestjs-query-graphql';
+
+@InputType()
+export class RemoteServerIdInput {
+  @IDField(() => ID, { description: 'The id of the record.' })
+  id!: string;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/dtos/remote-server-type.input.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/dtos/remote-server-type.input.ts
new file mode 100644
index 000000000000..9c7b75e10e82
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/dtos/remote-server-type.input.ts
@@ -0,0 +1,12 @@
+import { InputType, Field } from '@nestjs/graphql';
+
+import { IsString } from 'class-validator';
+
+import { RemoteServerType } from 'src/engine/metadata-modules/remote-server/remote-server.entity';
+
+@InputType()
+export class RemoteServerTypeInput<T extends RemoteServerType> {
+  @Field(() => String)
+  @IsString()
+  foreignDataWrapperType!: T;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/dtos/remote-server.dto.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/dtos/remote-server.dto.ts
new file mode 100644
index 000000000000..7773e948bd49
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/dtos/remote-server.dto.ts
@@ -0,0 +1,34 @@
+import { ObjectType, Field, HideField, ID } from '@nestjs/graphql';
+
+import { IsOptional } from 'class-validator';
+import GraphQLJSON from 'graphql-type-json';
+
+import {
+  ForeignDataWrapperOptions,
+  RemoteServerType,
+} from 'src/engine/metadata-modules/remote-server/remote-server.entity';
+
+@ObjectType('RemoteServer')
+export class RemoteServerDTO<T extends RemoteServerType> {
+  @Field(() => ID)
+  id: string;
+
+  @Field(() => ID)
+  foreignDataWrapperId: string;
+
+  @Field(() => String)
+  foreignDataWrapperType: T;
+
+  @IsOptional()
+  @Field(() => GraphQLJSON, { nullable: true })
+  foreignDataWrapperOptions?: ForeignDataWrapperOptions<T>;
+
+  @HideField()
+  workspaceId: string;
+
+  @Field()
+  createdAt: Date;
+
+  @Field()
+  updatedAt: Date;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.entity.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.entity.ts
new file mode 100644
index 000000000000..cd6edc5dd307
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.entity.ts
@@ -0,0 +1,59 @@
+import { ObjectType } from '@nestjs/graphql';
+
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Generated,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+} from 'typeorm';
+
+export enum RemoteServerType {
+  POSTGRES_FDW = 'postgres_fdw',
+}
+
+type PostgresForeignDataWrapperOptions = {
+  host: string;
+  port: number;
+  dbname: string;
+};
+
+export type ForeignDataWrapperOptions<T extends RemoteServerType> =
+  T extends RemoteServerType.POSTGRES_FDW
+    ? PostgresForeignDataWrapperOptions
+    : never;
+
+export type UserMappingOptions = {
+  username: string;
+  password: string;
+};
+
+@Entity('remoteServer')
+@ObjectType('RemoteServer')
+export class RemoteServerEntity<T extends RemoteServerType> {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column()
+  @Generated('uuid')
+  foreignDataWrapperId: string;
+
+  @Column({ nullable: true })
+  foreignDataWrapperType: T;
+
+  @Column({ nullable: true, type: 'jsonb' })
+  foreignDataWrapperOptions: ForeignDataWrapperOptions<T>;
+
+  @Column({ nullable: true, type: 'jsonb' })
+  userMappingOptions: UserMappingOptions;
+
+  @Column({ nullable: false, type: 'uuid' })
+  workspaceId: string;
+
+  @CreateDateColumn({ type: 'timestamptz' })
+  createdAt: Date;
+
+  @UpdateDateColumn({ type: 'timestamptz' })
+  updatedAt: Date;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.module.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.module.ts
new file mode 100644
index 000000000000..9fc4bdbcbf83
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.module.ts
@@ -0,0 +1,21 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { ForeignDataWrapperQueryFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/foreign-data-wrapper-query.factory';
+import { RemoteServerEntity } from 'src/engine/metadata-modules/remote-server/remote-server.entity';
+import { RemoteServerResolver } from 'src/engine/metadata-modules/remote-server/remote-server.resolver';
+import { RemoteServerService } from 'src/engine/metadata-modules/remote-server/remote-server.service';
+import { RemoteTableModule } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table.module';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([RemoteServerEntity], 'metadata'),
+    RemoteTableModule,
+  ],
+  providers: [
+    RemoteServerService,
+    RemoteServerResolver,
+    ForeignDataWrapperQueryFactory,
+  ],
+})
+export class RemoteServerModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.resolver.ts
new file mode 100644
index 000000000000..9165aa4082e5
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.resolver.ts
@@ -0,0 +1,56 @@
+import { UseGuards } from '@nestjs/common';
+import { Resolver, Args, Mutation, Query } from '@nestjs/graphql';
+
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { CreateRemoteServerInput } from 'src/engine/metadata-modules/remote-server/dtos/create-remote-server.input';
+import { RemoteServerIdInput } from 'src/engine/metadata-modules/remote-server/dtos/remote-server-id.input';
+import { RemoteServerTypeInput } from 'src/engine/metadata-modules/remote-server/dtos/remote-server-type.input';
+import { RemoteServerDTO } from 'src/engine/metadata-modules/remote-server/dtos/remote-server.dto';
+import { RemoteServerType } from 'src/engine/metadata-modules/remote-server/remote-server.entity';
+import { RemoteServerService } from 'src/engine/metadata-modules/remote-server/remote-server.service';
+
+@UseGuards(JwtAuthGuard)
+@Resolver()
+export class RemoteServerResolver {
+  constructor(
+    private readonly remoteServerService: RemoteServerService<RemoteServerType>,
+  ) {}
+
+  @Mutation(() => RemoteServerDTO)
+  async createOneRemoteServer(
+    @Args('input') input: CreateRemoteServerInput<RemoteServerType>,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+  ) {
+    return this.remoteServerService.createOneRemoteServer(input, workspaceId);
+  }
+
+  @Mutation(() => RemoteServerDTO)
+  async deleteOneRemoteServer(
+    @Args('input') { id }: RemoteServerIdInput,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+  ) {
+    return this.remoteServerService.deleteOneRemoteServer(id, workspaceId);
+  }
+
+  @Query(() => RemoteServerDTO)
+  async findOneRemoteServerById(
+    @Args('input') { id }: RemoteServerIdInput,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+  ) {
+    return this.remoteServerService.findOneByIdWithinWorkspace(id, workspaceId);
+  }
+
+  @Query(() => [RemoteServerDTO])
+  async findManyRemoteServersByType(
+    @Args('input')
+    { foreignDataWrapperType }: RemoteServerTypeInput<RemoteServerType>,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+  ) {
+    return this.remoteServerService.findManyByTypeWithinWorkspace(
+      foreignDataWrapperType,
+      workspaceId,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.service.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.service.ts
new file mode 100644
index 000000000000..7caa28a3e6c3
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.service.ts
@@ -0,0 +1,171 @@
+import { Injectable, NotFoundException } from '@nestjs/common';
+import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
+
+import { v4 } from 'uuid';
+import { DataSource, EntityManager, Repository } from 'typeorm';
+
+import { CreateRemoteServerInput } from 'src/engine/metadata-modules/remote-server/dtos/create-remote-server.input';
+import {
+  RemoteServerEntity,
+  RemoteServerType,
+} from 'src/engine/metadata-modules/remote-server/remote-server.entity';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { encryptText } from 'src/engine/core-modules/auth/auth.util';
+import {
+  validateObject,
+  validateString,
+} from 'src/engine/metadata-modules/remote-server/utils/validate-remote-server-input';
+import { ForeignDataWrapperQueryFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/foreign-data-wrapper-query.factory';
+import { RemoteTableService } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table.service';
+import { RemoteTableStatus } from 'src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table.dto';
+
+@Injectable()
+export class RemoteServerService<T extends RemoteServerType> {
+  constructor(
+    @InjectRepository(RemoteServerEntity, 'metadata')
+    private readonly remoteServerRepository: Repository<
+      RemoteServerEntity<RemoteServerType>
+    >,
+    @InjectDataSource('metadata')
+    private readonly metadataDataSource: DataSource,
+    private readonly environmentService: EnvironmentService,
+    private readonly foreignDataWrapperQueryFactory: ForeignDataWrapperQueryFactory,
+    private readonly remoteTableService: RemoteTableService,
+  ) {}
+
+  async createOneRemoteServer(
+    remoteServerInput: CreateRemoteServerInput<T>,
+    workspaceId: string,
+  ): Promise<RemoteServerEntity<RemoteServerType>> {
+    validateObject(remoteServerInput.foreignDataWrapperOptions);
+
+    if (remoteServerInput.userMappingOptions) {
+      validateObject(remoteServerInput.userMappingOptions);
+    }
+
+    const foreignDataWrapperId = v4();
+
+    let remoteServerToCreate = {
+      ...remoteServerInput,
+      workspaceId,
+      foreignDataWrapperId,
+    };
+
+    if (remoteServerInput.userMappingOptions) {
+      const key = this.environmentService.get('LOGIN_TOKEN_SECRET');
+      const encryptedPassword = await encryptText(
+        remoteServerInput.userMappingOptions.password,
+        key,
+      );
+
+      remoteServerToCreate = {
+        ...remoteServerToCreate,
+        userMappingOptions: {
+          ...remoteServerInput.userMappingOptions,
+          password: encryptedPassword,
+        },
+      };
+    }
+
+    return this.metadataDataSource.transaction(
+      async (entityManager: EntityManager) => {
+        const createdRemoteServer = await entityManager.create(
+          RemoteServerEntity,
+          remoteServerToCreate,
+        );
+
+        const foreignDataWrapperQuery =
+          this.foreignDataWrapperQueryFactory.createForeignDataWrapper(
+            createdRemoteServer.foreignDataWrapperId,
+            remoteServerInput.foreignDataWrapperType,
+            remoteServerInput.foreignDataWrapperOptions,
+          );
+
+        await entityManager.query(foreignDataWrapperQuery);
+
+        if (remoteServerInput.userMappingOptions) {
+          const userMappingQuery =
+            this.foreignDataWrapperQueryFactory.createUserMapping(
+              createdRemoteServer.foreignDataWrapperId,
+              remoteServerInput.userMappingOptions,
+            );
+
+          await entityManager.query(userMappingQuery);
+        }
+
+        await entityManager.save(RemoteServerEntity, createdRemoteServer);
+
+        return createdRemoteServer;
+      },
+    );
+  }
+
+  async deleteOneRemoteServer(
+    id: string,
+    workspaceId: string,
+  ): Promise<RemoteServerEntity<RemoteServerType>> {
+    validateString(id);
+
+    const remoteServer = await this.remoteServerRepository.findOne({
+      where: {
+        id,
+        workspaceId,
+      },
+    });
+
+    if (!remoteServer) {
+      throw new NotFoundException('Object does not exist');
+    }
+
+    const remoteTablesToRemove = (
+      await this.remoteTableService.findAvailableRemoteTablesByServerId(
+        id,
+        workspaceId,
+      )
+    ).filter((remoteTable) => remoteTable.status === RemoteTableStatus.SYNCED);
+
+    if (remoteTablesToRemove.length) {
+      for (const remoteTable of remoteTablesToRemove) {
+        await this.remoteTableService.unsyncRemoteTable(
+          {
+            remoteServerId: id,
+            name: remoteTable.name,
+          },
+          workspaceId,
+        );
+      }
+    }
+
+    return this.metadataDataSource.transaction(
+      async (entityManager: EntityManager) => {
+        await entityManager.query(
+          `DROP SERVER "${remoteServer.foreignDataWrapperId}" CASCADE`,
+        );
+        await entityManager.delete(RemoteServerEntity, id);
+
+        return remoteServer;
+      },
+    );
+  }
+
+  public async findOneByIdWithinWorkspace(id: string, workspaceId: string) {
+    return this.remoteServerRepository.findOne({
+      where: {
+        id,
+        workspaceId,
+      },
+    });
+  }
+
+  public async findManyByTypeWithinWorkspace<T extends RemoteServerType>(
+    foreignDataWrapperType: T,
+    workspaceId: string,
+  ) {
+    return this.remoteServerRepository.find({
+      where: {
+        foreignDataWrapperType,
+        workspaceId,
+      },
+    });
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table-input.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table-input.ts
new file mode 100644
index 000000000000..178e5ad80443
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table-input.ts
@@ -0,0 +1,13 @@
+import { InputType, Field, ID } from '@nestjs/graphql';
+
+@InputType()
+export class RemoteTableInput {
+  @Field(() => ID)
+  remoteServerId: string;
+
+  @Field(() => String)
+  name: string;
+
+  @Field(() => String)
+  schema?: string;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table.dto.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table.dto.ts
new file mode 100644
index 000000000000..e44b2acc1b1b
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table.dto.ts
@@ -0,0 +1,26 @@
+import { ObjectType, Field, registerEnumType } from '@nestjs/graphql';
+
+import { IsEnum } from 'class-validator';
+
+export enum RemoteTableStatus {
+  SYNCED = 'SYNCED',
+  NOT_SYNCED = 'NOT_SYNCED',
+}
+
+registerEnumType(RemoteTableStatus, {
+  name: 'RemoteTableStatus',
+  description: 'Status of the table',
+});
+
+@ObjectType('RemoteTable')
+export class RemoteTableDTO {
+  @Field(() => String)
+  name: string;
+
+  @IsEnum(RemoteTableStatus)
+  @Field(() => RemoteTableStatus)
+  status: RemoteTableStatus;
+
+  @Field(() => String)
+  schema?: string;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/remote-postgres-table.module.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/remote-postgres-table.module.ts
new file mode 100644
index 000000000000..f12aba42a45e
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/remote-postgres-table.module.ts
@@ -0,0 +1,9 @@
+import { Module } from '@nestjs/common';
+
+import { RemotePostgresTableService } from 'src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/remote-postgres-table.service';
+
+@Module({
+  providers: [RemotePostgresTableService],
+  exports: [RemotePostgresTableService],
+})
+export class RemotePostgresTableModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/remote-postgres-table.service.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/remote-postgres-table.service.ts
new file mode 100644
index 000000000000..46249a202cf2
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/remote-postgres-table.service.ts
@@ -0,0 +1,83 @@
+import { Injectable } from '@nestjs/common';
+
+import { DataSource } from 'typeorm';
+
+import {
+  RemoteServerEntity,
+  RemoteServerType,
+} from 'src/engine/metadata-modules/remote-server/remote-server.entity';
+import {
+  buildPostgresUrl,
+  EXCLUDED_POSTGRES_SCHEMAS,
+} from 'src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/utils/remote-postgres-table.util';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { RemoteTableColumn } from 'src/engine/metadata-modules/remote-server/remote-table/types/remote-table-column';
+import { RemoteTable } from 'src/engine/metadata-modules/remote-server/remote-table/types/remote-table';
+
+@Injectable()
+export class RemotePostgresTableService {
+  constructor(private readonly environmentService: EnvironmentService) {}
+
+  public async fetchPostgresTableColumnsSchema(
+    remoteServer: RemoteServerEntity<RemoteServerType>,
+    tableName: string,
+    tableSchema: string,
+  ): Promise<RemoteTableColumn[]> {
+    const dataSource = new DataSource({
+      url: buildPostgresUrl(
+        this.environmentService.get('LOGIN_TOKEN_SECRET'),
+        remoteServer,
+      ),
+      type: 'postgres',
+      logging: true,
+    });
+
+    await dataSource.initialize();
+
+    const columns = await dataSource.query(
+      `SELECT column_name, data_type, udt_name FROM information_schema.columns WHERE table_name = '${tableName}' AND table_schema = '${tableSchema}'`,
+    );
+
+    await dataSource.destroy();
+
+    return columns.map((column) => ({
+      columnName: column.column_name,
+      dataType: column.data_type,
+      udtName: column.udt_name,
+    }));
+  }
+
+  public async fetchTablesFromRemotePostgresSchema(
+    remoteServer: RemoteServerEntity<RemoteServerType>,
+  ): Promise<RemoteTable[]> {
+    const dataSource = new DataSource({
+      url: buildPostgresUrl(
+        this.environmentService.get('LOGIN_TOKEN_SECRET'),
+        remoteServer,
+      ),
+      type: 'postgres',
+      logging: true,
+    });
+
+    await dataSource.initialize();
+
+    const schemaNames = await dataSource.query(
+      `SELECT schema_name FROM information_schema.schemata where schema_name not in ( ${EXCLUDED_POSTGRES_SCHEMAS.map(
+        (schema) => `'${schema}'`,
+      ).join(', ')} ) order by schema_name limit 1`,
+    );
+
+    const remotePostgresTables = await dataSource.query(
+      `SELECT table_name, table_schema FROM information_schema.tables WHERE table_schema IN (${schemaNames
+        .map((schemaName) => `'${schemaName.schema_name}'`)
+        .join(', ')})`,
+    );
+
+    await dataSource.destroy();
+
+    return remotePostgresTables.map((table) => ({
+      tableName: table.table_name,
+      tableSchema: table.table_schema,
+    }));
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/utils/remote-postgres-table.util.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/utils/remote-postgres-table.util.ts
new file mode 100644
index 000000000000..848ab2ba707d
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/utils/remote-postgres-table.util.ts
@@ -0,0 +1,65 @@
+import { Repository } from 'typeorm/repository/Repository';
+
+import { decryptText } from 'src/engine/core-modules/auth/auth.util';
+import {
+  FeatureFlagEntity,
+  FeatureFlagKeys,
+} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  RemoteServerEntity,
+  RemoteServerType,
+} from 'src/engine/metadata-modules/remote-server/remote-server.entity';
+
+export const EXCLUDED_POSTGRES_SCHEMAS = [
+  'information_schema',
+  'pg_catalog',
+  'pg_toast',
+];
+
+export const buildPostgresUrl = (
+  secretKey: string,
+  remoteServer: RemoteServerEntity<RemoteServerType>,
+): string => {
+  const foreignDataWrapperOptions = remoteServer.foreignDataWrapperOptions;
+  const userMappingOptions = remoteServer.userMappingOptions;
+
+  const password = decryptText(userMappingOptions.password, secretKey);
+
+  const url = `postgres://${userMappingOptions.username}:${password}@${foreignDataWrapperOptions.host}:${foreignDataWrapperOptions.port}/${foreignDataWrapperOptions.dbname}`;
+
+  return url;
+};
+
+export const mapUdtNameToFieldType = (udtName: string): FieldMetadataType => {
+  switch (udtName) {
+    case 'uuid':
+      return FieldMetadataType.UUID;
+    case 'varchar':
+      return FieldMetadataType.TEXT;
+    case 'bool':
+      return FieldMetadataType.BOOLEAN;
+    case 'timestamp':
+    case 'timestamptz':
+      return FieldMetadataType.DATE_TIME;
+    default:
+      return FieldMetadataType.TEXT;
+  }
+};
+
+export const isPostgreSQLIntegrationEnabled = async (
+  featureFlagRepository: Repository<FeatureFlagEntity>,
+  workspaceId: string,
+) => {
+  const featureFlag = await featureFlagRepository.findOneBy({
+    workspaceId,
+    key: FeatureFlagKeys.IsPostgreSQLIntegrationEnabled,
+    value: true,
+  });
+
+  const featureFlagEnabled = featureFlag && featureFlag.value;
+
+  if (!featureFlagEnabled) {
+    throw new Error('PostgreSQL integration is not enabled');
+  }
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.module.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.module.ts
new file mode 100644
index 000000000000..c2cc592f3f3b
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.module.ts
@@ -0,0 +1,33 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/field-metadata.module';
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
+import { RemoteServerEntity } from 'src/engine/metadata-modules/remote-server/remote-server.entity';
+import { RemotePostgresTableModule } from 'src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/remote-postgres-table.module';
+import { RemoteTableResolver } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table.resolver';
+import { RemoteTableService } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table.service';
+import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([RemoteServerEntity], 'metadata'),
+    TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
+    DataSourceModule,
+    ObjectMetadataModule,
+    FieldMetadataModule,
+    RemotePostgresTableModule,
+    WorkspaceCacheVersionModule,
+    WorkspaceMigrationModule,
+    WorkspaceMigrationRunnerModule,
+    WorkspaceDataSourceModule,
+  ],
+  providers: [RemoteTableService, RemoteTableResolver],
+  exports: [RemoteTableService],
+})
+export class RemoteTableModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.resolver.ts
new file mode 100644
index 000000000000..5278c58c9911
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.resolver.ts
@@ -0,0 +1,43 @@
+import { UseGuards } from '@nestjs/common';
+import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
+import { RemoteServerIdInput } from 'src/engine/metadata-modules/remote-server/dtos/remote-server-id.input';
+import { RemoteTableInput } from 'src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table-input';
+import { RemoteTableDTO } from 'src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table.dto';
+import { RemoteTableService } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table.service';
+
+@UseGuards(JwtAuthGuard)
+@Resolver()
+export class RemoteTableResolver {
+  constructor(private readonly remoteTableService: RemoteTableService) {}
+
+  @Query(() => [RemoteTableDTO])
+  async findAvailableRemoteTablesByServerId(
+    @Args('input') { id }: RemoteServerIdInput,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+  ) {
+    return this.remoteTableService.findAvailableRemoteTablesByServerId(
+      id,
+      workspaceId,
+    );
+  }
+
+  @Mutation(() => RemoteTableDTO)
+  async syncRemoteTable(
+    @Args('input') input: RemoteTableInput,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+  ) {
+    return this.remoteTableService.syncRemoteTable(input, workspaceId);
+  }
+
+  @Mutation(() => RemoteTableDTO)
+  async unsyncRemoteTable(
+    @Args('input') input: RemoteTableInput,
+    @AuthWorkspace() { id: workspaceId }: Workspace,
+  ) {
+    return this.remoteTableService.unsyncRemoteTable(input, workspaceId);
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.service.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.service.ts
new file mode 100644
index 000000000000..ce9a8a3927d7
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.service.ts
@@ -0,0 +1,332 @@
+import { NotFoundException } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import {
+  RemoteServerType,
+  RemoteServerEntity,
+} from 'src/engine/metadata-modules/remote-server/remote-server.entity';
+import {
+  RemoteTableDTO,
+  RemoteTableStatus,
+} from 'src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table.dto';
+import {
+  isPostgreSQLIntegrationEnabled,
+  mapUdtNameToFieldType,
+} from 'src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/utils/remote-postgres-table.util';
+import { RemoteTableInput } from 'src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table-input';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { CreateObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/create-object.input';
+import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
+import { CreateFieldInput } from 'src/engine/metadata-modules/field-metadata/dtos/create-field.input';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { RemotePostgresTableService } from 'src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/remote-postgres-table.service';
+import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+import { camelCase } from 'src/utils/camel-case';
+import { camelToTitleCase } from 'src/utils/camel-to-title-case';
+import { getRemoteTableName } from 'src/engine/metadata-modules/remote-server/remote-table/utils/get-remote-table-name.util';
+import { WorkspaceMigrationService } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.service';
+import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service';
+import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
+import {
+  WorkspaceMigrationColumnDefinition,
+  WorkspaceMigrationForeignTable,
+  WorkspaceMigrationTableActionType,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { RemoteTableColumn } from 'src/engine/metadata-modules/remote-server/remote-table/types/remote-table-column';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { RemoteTable } from 'src/engine/metadata-modules/remote-server/remote-table/types/remote-table';
+
+export class RemoteTableService {
+  constructor(
+    @InjectRepository(RemoteServerEntity, 'metadata')
+    private readonly remoteServerRepository: Repository<
+      RemoteServerEntity<RemoteServerType>
+    >,
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+    private readonly dataSourceService: DataSourceService,
+    private readonly objectMetadataService: ObjectMetadataService,
+    private readonly fieldMetadataService: FieldMetadataService,
+    private readonly remotePostgresTableService: RemotePostgresTableService,
+    private readonly workspaceMigrationService: WorkspaceMigrationService,
+    private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async findAvailableRemoteTablesByServerId(
+    id: string,
+    workspaceId: string,
+  ) {
+    const remoteServer = await this.remoteServerRepository.findOne({
+      where: {
+        id,
+        workspaceId,
+      },
+    });
+
+    if (!remoteServer) {
+      throw new NotFoundException('Remote server does not exist');
+    }
+
+    const currentForeignTableNames =
+      await this.fetchForeignTableNamesWithinWorkspace(workspaceId);
+
+    const tableInRemoteSchema =
+      await this.fetchTablesFromRemoteSchema(remoteServer);
+
+    return tableInRemoteSchema.map((remoteTable) => ({
+      name: remoteTable.tableName,
+      schema: remoteTable.tableSchema,
+      status: currentForeignTableNames.includes(
+        getRemoteTableName(remoteTable.tableName),
+      )
+        ? RemoteTableStatus.SYNCED
+        : RemoteTableStatus.NOT_SYNCED,
+    }));
+  }
+
+  public async syncRemoteTable(input: RemoteTableInput, workspaceId: string) {
+    const remoteServer = await this.remoteServerRepository.findOne({
+      where: {
+        id: input.remoteServerId,
+        workspaceId,
+      },
+    });
+
+    if (!remoteServer) {
+      throw new NotFoundException('Remote server does not exist');
+    }
+
+    const remoteTable = await this.createForeignTableAndMetadata(
+      input,
+      remoteServer,
+      workspaceId,
+    );
+
+    await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+
+    return remoteTable;
+  }
+
+  public async unsyncRemoteTable(input: RemoteTableInput, workspaceId: string) {
+    const remoteTable = await this.removeForeignTableAndMetadata(
+      input,
+      workspaceId,
+    );
+
+    await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+
+    return remoteTable;
+  }
+
+  private async createForeignTableAndMetadata(
+    input: RemoteTableInput,
+    remoteServer: RemoteServerEntity<RemoteServerType>,
+    workspaceId: string,
+  ): Promise<RemoteTableDTO> {
+    if (!input.schema) {
+      throw new Error('Schema is required for syncing remote table');
+    }
+
+    const currentForeignTableNames =
+      await this.fetchForeignTableNamesWithinWorkspace(workspaceId);
+
+    if (currentForeignTableNames.includes(getRemoteTableName(input.name))) {
+      throw new Error('Remote table already exists');
+    }
+
+    const remoteTableColumns = await this.fetchTableColumnsSchema(
+      remoteServer,
+      input.name,
+      input.schema,
+    );
+
+    const remoteTableName = getRemoteTableName(input.name);
+    const remoteTableLabel = camelToTitleCase(remoteTableName);
+
+    // We only support remote tables with an id column for now.
+    const remoteTableIdColumn = remoteTableColumns.filter(
+      (column) => column.columnName === 'id',
+    )?.[0];
+
+    if (!remoteTableIdColumn) {
+      throw new Error('Remote table must have an id column');
+    }
+
+    const dataSourceMetatada =
+      await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
+        workspaceId,
+      );
+
+    await this.workspaceMigrationService.createCustomMigration(
+      generateMigrationName(`create-foreign-table-${remoteTableName}`),
+      workspaceId,
+      [
+        {
+          name: remoteTableName,
+          action: WorkspaceMigrationTableActionType.CREATE_FOREIGN_TABLE,
+          foreignTable: {
+            columns: remoteTableColumns.map(
+              (column) =>
+                ({
+                  columnName: column.columnName,
+                  columnType: column.dataType,
+                }) satisfies WorkspaceMigrationColumnDefinition,
+            ),
+            referencedTableName: input.name,
+            referencedTableSchema: input.schema,
+            foreignDataWrapperId: remoteServer.foreignDataWrapperId,
+          } satisfies WorkspaceMigrationForeignTable,
+        },
+      ],
+    );
+
+    await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
+      workspaceId,
+    );
+
+    const objectMetadata = await this.objectMetadataService.createOne({
+      nameSingular: remoteTableName,
+      namePlural: `${remoteTableName}s`,
+      labelSingular: remoteTableLabel,
+      labelPlural: `${remoteTableLabel}s`,
+      description: 'Remote table',
+      dataSourceId: dataSourceMetatada.id,
+      workspaceId: workspaceId,
+      icon: 'IconPlug',
+      isRemote: true,
+      remoteTablePrimaryKeyColumnType: remoteTableIdColumn.udtName,
+    } satisfies CreateObjectInput);
+
+    for (const column of remoteTableColumns) {
+      const field = await this.fieldMetadataService.createOne({
+        name: column.columnName,
+        label: camelToTitleCase(camelCase(column.columnName)),
+        description: 'Field of remote',
+        // TODO: function should work for other types than Postgres
+        type: mapUdtNameToFieldType(column.udtName),
+        workspaceId: workspaceId,
+        objectMetadataId: objectMetadata.id,
+        isRemoteCreation: true,
+        isNullable: true,
+        icon: 'IconPlug',
+      } satisfies CreateFieldInput);
+
+      if (column.columnName === 'id') {
+        await this.objectMetadataService.updateOne(objectMetadata.id, {
+          labelIdentifierFieldMetadataId: field.id,
+        });
+      }
+    }
+
+    return {
+      name: input.name,
+      schema: input.schema,
+      status: RemoteTableStatus.SYNCED,
+    };
+  }
+
+  private async removeForeignTableAndMetadata(
+    input: RemoteTableInput,
+    workspaceId: string,
+  ): Promise<RemoteTableDTO> {
+    const remoteTableName = getRemoteTableName(input.name);
+
+    const currentForeignTableNames =
+      await this.fetchForeignTableNamesWithinWorkspace(workspaceId);
+
+    if (!currentForeignTableNames.includes(remoteTableName)) {
+      throw new Error('Remote table does not exist');
+    }
+
+    const objectMetadata =
+      await this.objectMetadataService.findOneWithinWorkspace(workspaceId, {
+        where: { nameSingular: remoteTableName },
+      });
+
+    if (objectMetadata) {
+      await this.objectMetadataService.deleteOneObject(
+        { id: objectMetadata.id },
+        workspaceId,
+      );
+    }
+
+    await this.workspaceMigrationService.createCustomMigration(
+      generateMigrationName(`drop-foreign-table-${input.name}`),
+      workspaceId,
+      [
+        {
+          name: remoteTableName,
+          action: WorkspaceMigrationTableActionType.DROP_FOREIGN_TABLE,
+        },
+      ],
+    );
+
+    await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
+      workspaceId,
+    );
+
+    return {
+      name: input.name,
+      schema: input.schema,
+      status: RemoteTableStatus.NOT_SYNCED,
+    };
+  }
+
+  private async fetchTableColumnsSchema(
+    remoteServer: RemoteServerEntity<RemoteServerType>,
+    tableName: string,
+    tableSchema: string,
+  ): Promise<RemoteTableColumn[]> {
+    switch (remoteServer.foreignDataWrapperType) {
+      case RemoteServerType.POSTGRES_FDW:
+        await isPostgreSQLIntegrationEnabled(
+          this.featureFlagRepository,
+          remoteServer.workspaceId,
+        );
+
+        return this.remotePostgresTableService.fetchPostgresTableColumnsSchema(
+          remoteServer,
+          tableName,
+          tableSchema,
+        );
+      default:
+        throw new Error('Unsupported foreign data wrapper type');
+    }
+  }
+
+  private async fetchForeignTableNamesWithinWorkspace(workspaceId: string) {
+    const workspaceDataSource =
+      await this.workspaceDataSourceService.connectToWorkspaceDataSource(
+        workspaceId,
+      );
+
+    return (
+      await workspaceDataSource.query(
+        `SELECT foreign_table_name FROM information_schema.foreign_tables`,
+      )
+    ).map((foreignTable) => foreignTable.foreign_table_name);
+  }
+
+  private async fetchTablesFromRemoteSchema(
+    remoteServer: RemoteServerEntity<RemoteServerType>,
+  ): Promise<RemoteTable[]> {
+    switch (remoteServer.foreignDataWrapperType) {
+      case RemoteServerType.POSTGRES_FDW:
+        await isPostgreSQLIntegrationEnabled(
+          this.featureFlagRepository,
+          remoteServer.workspaceId,
+        );
+
+        return this.remotePostgresTableService.fetchTablesFromRemotePostgresSchema(
+          remoteServer,
+        );
+      default:
+        throw new Error('Unsupported foreign data wrapper type');
+    }
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/types/remote-table-column.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/types/remote-table-column.ts
new file mode 100644
index 000000000000..d3c8012be8e4
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/types/remote-table-column.ts
@@ -0,0 +1,6 @@
+// Type will evolve as we add more remote table types
+export type RemoteTableColumn = {
+  columnName: string;
+  dataType: string;
+  udtName: string;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/types/remote-table.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/types/remote-table.ts
new file mode 100644
index 000000000000..443f1245d9af
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/types/remote-table.ts
@@ -0,0 +1,5 @@
+// Type will evolve as we add more remote table types
+export type RemoteTable = {
+  tableName: string;
+  tableSchema: string;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/utils/get-remote-table-name.util.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/utils/get-remote-table-name.util.ts
new file mode 100644
index 000000000000..bcc7a2123d94
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/utils/get-remote-table-name.util.ts
@@ -0,0 +1,4 @@
+import { camelCase } from 'src/utils/camel-case';
+
+export const getRemoteTableName = (distantTableName: string) =>
+  `${camelCase(distantTableName)}Remote`;
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/utils/validate-remote-server-input.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/utils/validate-remote-server-input.ts
new file mode 100644
index 000000000000..5c043f2a9fdb
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/utils/validate-remote-server-input.ts
@@ -0,0 +1,20 @@
+const INPUT_REGEX = /^([A-Za-z0-9\-\_\.]+)$/;
+
+export const validateObject = (input: object) => {
+  for (const [key, value] of Object.entries(input)) {
+    // Password are encrypted so we don't need to validate them
+    if (key === 'password') {
+      continue;
+    }
+
+    if (!INPUT_REGEX.test(value.toString())) {
+      throw new Error('Invalid remote server input');
+    }
+  }
+};
+
+export const validateString = (input: string) => {
+  if (!INPUT_REGEX.test(input)) {
+    throw new Error('Invalid remote server input');
+  }
+};
diff --git a/packages/twenty-server/src/metadata/workspace-cache-version/workspace-cache-version.entity.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.entity.ts
similarity index 81%
rename from packages/twenty-server/src/metadata/workspace-cache-version/workspace-cache-version.entity.ts
rename to packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.entity.ts
index 892244630f57..fab0a85d5fb8 100644
--- a/packages/twenty-server/src/metadata/workspace-cache-version/workspace-cache-version.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.entity.ts
@@ -17,9 +17,9 @@ export class WorkspaceCacheVersionEntity {
   @Column()
   version: string;
 
-  @CreateDateColumn()
+  @CreateDateColumn({ type: 'timestamptz' })
   createdAt: Date;
 
-  @UpdateDateColumn()
+  @UpdateDateColumn({ type: 'timestamptz' })
   updatedAt: Date;
 }
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module.ts
new file mode 100644
index 000000000000..a0df038e4ee6
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module.ts
@@ -0,0 +1,14 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { WorkspaceCacheVersionEntity } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.entity';
+import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([WorkspaceCacheVersionEntity], 'metadata'),
+  ],
+  exports: [WorkspaceCacheVersionService],
+  providers: [WorkspaceCacheVersionService],
+})
+export class WorkspaceCacheVersionModule {}
diff --git a/packages/twenty-server/src/metadata/workspace-cache-version/workspace-cache-version.service.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service.ts
similarity index 88%
rename from packages/twenty-server/src/metadata/workspace-cache-version/workspace-cache-version.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service.ts
index 9ca2dae8d23e..347dc81a0927 100644
--- a/packages/twenty-server/src/metadata/workspace-cache-version/workspace-cache-version.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service.ts
@@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 
 import { Repository } from 'typeorm';
 
-import { WorkspaceCacheVersionEntity } from 'src/metadata/workspace-cache-version/workspace-cache-version.entity';
+import { WorkspaceCacheVersionEntity } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.entity';
 
 @Injectable()
 export class WorkspaceCacheVersionService {
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/basic-column-action.factory.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/basic-column-action.factory.ts
new file mode 100644
index 000000000000..093b3cba9cd8
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/basic-column-action.factory.ts
@@ -0,0 +1,94 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { WorkspaceColumnActionOptions } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-options.interface';
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  WorkspaceMigrationColumnActionType,
+  WorkspaceMigrationColumnAlter,
+  WorkspaceMigrationColumnCreate,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { serializeDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/serialize-default-value';
+import { fieldMetadataTypeToColumnType } from 'src/engine/metadata-modules/workspace-migration/utils/field-metadata-type-to-column-type.util';
+import { ColumnActionAbstractFactory } from 'src/engine/metadata-modules/workspace-migration/factories/column-action-abstract.factory';
+import { computeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
+
+export type BasicFieldMetadataType =
+  | FieldMetadataType.UUID
+  | FieldMetadataType.TEXT
+  | FieldMetadataType.PHONE
+  | FieldMetadataType.EMAIL
+  | FieldMetadataType.NUMERIC
+  | FieldMetadataType.NUMBER
+  | FieldMetadataType.PROBABILITY
+  | FieldMetadataType.BOOLEAN
+  | FieldMetadataType.POSITION
+  | FieldMetadataType.DATE_TIME
+  | FieldMetadataType.DATE
+  | FieldMetadataType.POSITION;
+
+@Injectable()
+export class BasicColumnActionFactory extends ColumnActionAbstractFactory<BasicFieldMetadataType> {
+  protected readonly logger = new Logger(BasicColumnActionFactory.name);
+
+  protected handleCreateAction(
+    fieldMetadata: FieldMetadataInterface<BasicFieldMetadataType>,
+    options?: WorkspaceColumnActionOptions,
+  ): WorkspaceMigrationColumnCreate[] {
+    const columnName = computeColumnName(fieldMetadata);
+    const defaultValue = fieldMetadata.defaultValue ?? options?.defaultValue;
+    const serializedDefaultValue = serializeDefaultValue(defaultValue);
+
+    return [
+      {
+        action: WorkspaceMigrationColumnActionType.CREATE,
+        columnName,
+        columnType: fieldMetadataTypeToColumnType(fieldMetadata.type),
+        isNullable: fieldMetadata.isNullable,
+        defaultValue: serializedDefaultValue,
+      },
+    ];
+  }
+
+  protected handleAlterAction(
+    currentFieldMetadata: FieldMetadataInterface<BasicFieldMetadataType>,
+    alteredFieldMetadata: FieldMetadataInterface<BasicFieldMetadataType>,
+    options?: WorkspaceColumnActionOptions,
+  ): WorkspaceMigrationColumnAlter[] {
+    const currentColumnName = computeColumnName(currentFieldMetadata);
+    const alteredColumnName = computeColumnName(alteredFieldMetadata);
+    const defaultValue =
+      alteredFieldMetadata.defaultValue ?? options?.defaultValue;
+    const serializedDefaultValue = serializeDefaultValue(defaultValue);
+
+    if (!currentColumnName || !alteredColumnName) {
+      this.logger.error(
+        `Column name not found for current or altered field metadata, can be due to a missing or an invalid target column map. Current column name: ${currentColumnName}, Altered column name: ${alteredColumnName}.`,
+      );
+      throw new Error(
+        `Column name not found for current or altered field metadata`,
+      );
+    }
+
+    return [
+      {
+        action: WorkspaceMigrationColumnActionType.ALTER,
+        currentColumnDefinition: {
+          columnName: currentColumnName,
+          columnType: fieldMetadataTypeToColumnType(currentFieldMetadata.type),
+          isNullable: currentFieldMetadata.isNullable,
+          defaultValue: serializeDefaultValue(
+            currentFieldMetadata.defaultValue,
+          ),
+        },
+        alteredColumnDefinition: {
+          columnName: alteredColumnName,
+          columnType: fieldMetadataTypeToColumnType(alteredFieldMetadata.type),
+          isNullable: alteredFieldMetadata.isNullable,
+          defaultValue: serializedDefaultValue,
+        },
+      },
+    ];
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/column-action-abstract.factory.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/column-action-abstract.factory.ts
new file mode 100644
index 000000000000..a56d3a8fdb28
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/column-action-abstract.factory.ts
@@ -0,0 +1,66 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import { Logger } from '@nestjs/common';
+
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+import { WorkspaceColumnActionOptions } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-options.interface';
+import { WorkspaceColumnActionFactory } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-factory.interface';
+
+import {
+  WorkspaceMigrationColumnActionType,
+  WorkspaceMigrationColumnAction,
+  WorkspaceMigrationColumnCreate,
+  WorkspaceMigrationColumnAlter,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+export class ColumnActionAbstractFactory<
+  T extends FieldMetadataType | 'default',
+> implements WorkspaceColumnActionFactory<T>
+{
+  protected readonly logger = new Logger(ColumnActionAbstractFactory.name);
+
+  create(
+    action:
+      | WorkspaceMigrationColumnActionType.CREATE
+      | WorkspaceMigrationColumnActionType.ALTER,
+    currentFieldMetadata: FieldMetadataInterface<T> | undefined,
+    alteredFieldMetadata: FieldMetadataInterface<T>,
+    options?: WorkspaceColumnActionOptions,
+  ): WorkspaceMigrationColumnAction[] {
+    switch (action) {
+      case WorkspaceMigrationColumnActionType.CREATE:
+        return this.handleCreateAction(alteredFieldMetadata, options);
+      case WorkspaceMigrationColumnActionType.ALTER: {
+        if (!currentFieldMetadata) {
+          throw new Error('current field metadata is required for alter');
+        }
+
+        return this.handleAlterAction(
+          currentFieldMetadata,
+          alteredFieldMetadata,
+          options,
+        );
+      }
+      default: {
+        this.logger.error(`Invalid action: ${action}`);
+
+        throw new Error('[AbstractFactory]: invalid action');
+      }
+    }
+  }
+
+  protected handleCreateAction(
+    _fieldMetadata: FieldMetadataInterface<T>,
+    _options?: WorkspaceColumnActionOptions,
+  ): WorkspaceMigrationColumnCreate[] {
+    throw new Error('handleCreateAction method not implemented.');
+  }
+
+  protected handleAlterAction(
+    _currentFieldMetadata: FieldMetadataInterface<T>,
+    _alteredFieldMetadata: FieldMetadataInterface<T>,
+    _options?: WorkspaceColumnActionOptions,
+  ): WorkspaceMigrationColumnAlter[] {
+    throw new Error('handleAlterAction method not implemented.');
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/composite-column-action.factory.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/composite-column-action.factory.ts
new file mode 100644
index 000000000000..f449b140054e
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/composite-column-action.factory.ts
@@ -0,0 +1,132 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  WorkspaceMigrationColumnActionType,
+  WorkspaceMigrationColumnAlter,
+  WorkspaceMigrationColumnCreate,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { serializeDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/serialize-default-value';
+import { fieldMetadataTypeToColumnType } from 'src/engine/metadata-modules/workspace-migration/utils/field-metadata-type-to-column-type.util';
+import { ColumnActionAbstractFactory } from 'src/engine/metadata-modules/workspace-migration/factories/column-action-abstract.factory';
+import { computeCompositeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
+import { compositeTypeDefintions } from 'src/engine/metadata-modules/field-metadata/composite-types';
+
+export type CompositeFieldMetadataType =
+  | FieldMetadataType.ADDRESS
+  | FieldMetadataType.CURRENCY
+  | FieldMetadataType.FULL_NAME
+  | FieldMetadataType.LINK;
+
+@Injectable()
+export class CompositeColumnActionFactory extends ColumnActionAbstractFactory<CompositeFieldMetadataType> {
+  protected readonly logger = new Logger(CompositeColumnActionFactory.name);
+
+  protected handleCreateAction(
+    fieldMetadata: FieldMetadataInterface<CompositeFieldMetadataType>,
+  ): WorkspaceMigrationColumnCreate[] {
+    const compositeType = compositeTypeDefintions.get(fieldMetadata.type);
+
+    if (!compositeType) {
+      this.logger.error(
+        `Composite type not found for field metadata type: ${fieldMetadata.type}`,
+      );
+      throw new Error(
+        `Composite type not found for field metadata type: ${fieldMetadata.type}`,
+      );
+    }
+
+    const columnActions: WorkspaceMigrationColumnCreate[] = [];
+
+    for (const property of compositeType.properties) {
+      const columnName = computeCompositeColumnName(fieldMetadata, property);
+      const defaultValue = fieldMetadata.defaultValue?.[property.name];
+      const serializedDefaultValue = serializeDefaultValue(defaultValue);
+
+      columnActions.push({
+        action: WorkspaceMigrationColumnActionType.CREATE,
+        columnName,
+        columnType: fieldMetadataTypeToColumnType(property.type),
+        isNullable: fieldMetadata.isNullable || !property.isRequired,
+        defaultValue: serializedDefaultValue,
+      });
+    }
+
+    return columnActions;
+  }
+
+  protected handleAlterAction(
+    currentFieldMetadata: FieldMetadataInterface<CompositeFieldMetadataType>,
+    alteredFieldMetadata: FieldMetadataInterface<CompositeFieldMetadataType>,
+  ): WorkspaceMigrationColumnAlter[] {
+    const currentCompositeType = compositeTypeDefintions.get(
+      currentFieldMetadata.type,
+    );
+    const alteredCompositeType = compositeTypeDefintions.get(
+      alteredFieldMetadata.type,
+    );
+
+    if (!currentCompositeType || !alteredCompositeType) {
+      this.logger.error(
+        `Composite type not found for field metadata type: ${currentFieldMetadata.type} or ${alteredFieldMetadata.type}`,
+      );
+      throw new Error(
+        `Composite type not found for field metadata type: ${currentFieldMetadata.type} or ${alteredFieldMetadata.type}`,
+      );
+    }
+
+    const columnActions: WorkspaceMigrationColumnAlter[] = [];
+
+    for (const alteredProperty of alteredCompositeType.properties) {
+      // TODO: Based on the name for now, we can add a more robust check in the future
+      const currentProperty = currentCompositeType.properties.find(
+        (p) => p.name === alteredProperty.name,
+      );
+
+      if (!currentProperty) {
+        this.logger.error(
+          `Current property not found for altered property: ${alteredProperty.name}`,
+        );
+        throw new Error(
+          `Current property not found for altered property: ${alteredProperty.name}`,
+        );
+      }
+
+      const currentColumnName = computeCompositeColumnName(
+        currentFieldMetadata,
+        currentProperty,
+      );
+      const alteredColumnName = computeCompositeColumnName(
+        alteredFieldMetadata,
+        alteredProperty,
+      );
+      const defaultValue =
+        alteredFieldMetadata.defaultValue?.[alteredProperty.name];
+      const serializedDefaultValue = serializeDefaultValue(defaultValue);
+
+      columnActions.push({
+        action: WorkspaceMigrationColumnActionType.ALTER,
+        currentColumnDefinition: {
+          columnName: currentColumnName,
+          columnType: fieldMetadataTypeToColumnType(currentProperty.type),
+          isNullable:
+            currentFieldMetadata.isNullable || !currentProperty.isRequired,
+          defaultValue: serializeDefaultValue(
+            currentFieldMetadata.defaultValue?.[currentProperty.name],
+          ),
+        },
+        alteredColumnDefinition: {
+          columnName: alteredColumnName,
+          columnType: fieldMetadataTypeToColumnType(alteredProperty.type),
+          isNullable:
+            alteredFieldMetadata.isNullable || !alteredProperty.isRequired,
+          defaultValue: serializedDefaultValue,
+        },
+      });
+    }
+
+    return columnActions;
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/enum-column-action.factory.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/enum-column-action.factory.ts
new file mode 100644
index 000000000000..1007f41e6297
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/enum-column-action.factory.ts
@@ -0,0 +1,116 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { WorkspaceColumnActionOptions } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-options.interface';
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  WorkspaceMigrationColumnActionType,
+  WorkspaceMigrationColumnAlter,
+  WorkspaceMigrationColumnCreate,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { serializeDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/serialize-default-value';
+import { fieldMetadataTypeToColumnType } from 'src/engine/metadata-modules/workspace-migration/utils/field-metadata-type-to-column-type.util';
+import { ColumnActionAbstractFactory } from 'src/engine/metadata-modules/workspace-migration/factories/column-action-abstract.factory';
+import { computeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
+
+export type EnumFieldMetadataType =
+  | FieldMetadataType.RATING
+  | FieldMetadataType.SELECT
+  | FieldMetadataType.MULTI_SELECT;
+
+@Injectable()
+export class EnumColumnActionFactory extends ColumnActionAbstractFactory<EnumFieldMetadataType> {
+  protected readonly logger = new Logger(EnumColumnActionFactory.name);
+
+  protected handleCreateAction(
+    fieldMetadata: FieldMetadataInterface<EnumFieldMetadataType>,
+    options: WorkspaceColumnActionOptions,
+  ): WorkspaceMigrationColumnCreate[] {
+    const columnName = computeColumnName(fieldMetadata);
+    const defaultValue = fieldMetadata.defaultValue ?? options?.defaultValue;
+    const serializedDefaultValue = serializeDefaultValue(defaultValue);
+    const enumOptions = fieldMetadata.options
+      ? [...fieldMetadata.options.map((option) => option.value)]
+      : undefined;
+
+    return [
+      {
+        action: WorkspaceMigrationColumnActionType.CREATE,
+        columnName,
+        columnType: fieldMetadataTypeToColumnType(fieldMetadata.type),
+        enum: enumOptions,
+        isArray: fieldMetadata.type === FieldMetadataType.MULTI_SELECT,
+        isNullable: fieldMetadata.isNullable,
+        defaultValue: serializedDefaultValue,
+      },
+    ];
+  }
+
+  protected handleAlterAction(
+    currentFieldMetadata: FieldMetadataInterface<EnumFieldMetadataType>,
+    alteredFieldMetadata: FieldMetadataInterface<EnumFieldMetadataType>,
+    options: WorkspaceColumnActionOptions,
+  ): WorkspaceMigrationColumnAlter[] {
+    const currentColumnName = computeColumnName(currentFieldMetadata);
+    const alteredColumnName = computeColumnName(alteredFieldMetadata);
+    const defaultValue =
+      alteredFieldMetadata.defaultValue ?? options?.defaultValue;
+    const serializedDefaultValue = serializeDefaultValue(defaultValue);
+
+    const enumOptions = alteredFieldMetadata.options
+      ? [
+          ...alteredFieldMetadata.options.map((option) => {
+            const currentOption = currentFieldMetadata.options?.find(
+              (currentOption) => currentOption.id === option.id,
+            );
+
+            // The id is the same, but the value is different, so we need to alter the enum
+            if (currentOption && currentOption.value !== option.value) {
+              return {
+                from: currentOption.value,
+                to: option.value,
+              };
+            }
+
+            return option.value;
+          }),
+        ]
+      : undefined;
+
+    if (!currentColumnName || !alteredColumnName) {
+      this.logger.error(
+        `Column name not found for current or altered field metadata, can be due to a missing or an invalid target column map. Current column name: ${currentColumnName}, Altered column name: ${alteredColumnName}.`,
+      );
+      throw new Error(
+        `Column name not found for current or altered field metadata`,
+      );
+    }
+
+    return [
+      {
+        action: WorkspaceMigrationColumnActionType.ALTER,
+        currentColumnDefinition: {
+          columnName: currentColumnName,
+          columnType: fieldMetadataTypeToColumnType(currentFieldMetadata.type),
+          enum: currentFieldMetadata.options
+            ? [...currentFieldMetadata.options.map((option) => option.value)]
+            : undefined,
+          isArray: currentFieldMetadata.type === FieldMetadataType.MULTI_SELECT,
+          isNullable: currentFieldMetadata.isNullable,
+          defaultValue: serializeDefaultValue(
+            currentFieldMetadata.defaultValue,
+          ),
+        },
+        alteredColumnDefinition: {
+          columnName: alteredColumnName,
+          columnType: fieldMetadataTypeToColumnType(alteredFieldMetadata.type),
+          enum: enumOptions,
+          isArray: alteredFieldMetadata.type === FieldMetadataType.MULTI_SELECT,
+          isNullable: alteredFieldMetadata.isNullable,
+          defaultValue: serializedDefaultValue,
+        },
+      },
+    ];
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/factories.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/factories.ts
new file mode 100644
index 000000000000..5bda4bac116a
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/factories.ts
@@ -0,0 +1,9 @@
+import { BasicColumnActionFactory } from 'src/engine/metadata-modules/workspace-migration/factories/basic-column-action.factory';
+import { CompositeColumnActionFactory } from 'src/engine/metadata-modules/workspace-migration/factories/composite-column-action.factory';
+import { EnumColumnActionFactory } from 'src/engine/metadata-modules/workspace-migration/factories/enum-column-action.factory';
+
+export const workspaceColumnActionFactories = [
+  BasicColumnActionFactory,
+  EnumColumnActionFactory,
+  CompositeColumnActionFactory,
+];
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-factory.interface.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-factory.interface.ts
new file mode 100644
index 000000000000..b1114c181488
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-factory.interface.ts
@@ -0,0 +1,21 @@
+import { WorkspaceColumnActionOptions } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-options.interface';
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  WorkspaceMigrationColumnActionType,
+  WorkspaceMigrationColumnAction,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+
+export interface WorkspaceColumnActionFactory<
+  T extends FieldMetadataType | 'default',
+> {
+  create(
+    action:
+      | WorkspaceMigrationColumnActionType.CREATE
+      | WorkspaceMigrationColumnActionType.ALTER,
+    currentFieldMetadata: FieldMetadataInterface<T> | undefined,
+    alteredFieldMetadata: FieldMetadataInterface<T>,
+    options?: WorkspaceColumnActionOptions,
+  ): WorkspaceMigrationColumnAction[];
+}
diff --git a/packages/twenty-server/src/metadata/workspace-migration/interfaces/workspace-column-action-options.interface.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-options.interface.ts
similarity index 100%
rename from packages/twenty-server/src/metadata/workspace-migration/interfaces/workspace-column-action-options.interface.ts
rename to packages/twenty-server/src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-options.interface.ts
diff --git a/packages/twenty-server/src/metadata/workspace-migration/utils/field-metadata-type-to-column-type.util.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/utils/field-metadata-type-to-column-type.util.ts
similarity index 78%
rename from packages/twenty-server/src/metadata/workspace-migration/utils/field-metadata-type-to-column-type.util.ts
rename to packages/twenty-server/src/engine/metadata-modules/workspace-migration/utils/field-metadata-type-to-column-type.util.ts
index 85647ae57424..f3999fd7f9f1 100644
--- a/packages/twenty-server/src/metadata/workspace-migration/utils/field-metadata-type-to-column-type.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/utils/field-metadata-type-to-column-type.util.ts
@@ -1,4 +1,4 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 
 export const fieldMetadataTypeToColumnType = <Type extends FieldMetadataType>(
   fieldMetadataType: Type,
@@ -19,15 +19,20 @@ export const fieldMetadataTypeToColumnType = <Type extends FieldMetadataType>(
       return 'numeric';
     case FieldMetadataType.NUMBER:
     case FieldMetadataType.PROBABILITY:
+    case FieldMetadataType.POSITION:
       return 'float';
     case FieldMetadataType.BOOLEAN:
       return 'boolean';
     case FieldMetadataType.DATE_TIME:
-      return 'timestamp';
+      return 'timestamptz';
+    case FieldMetadataType.DATE:
+      return 'date';
     case FieldMetadataType.RATING:
     case FieldMetadataType.SELECT:
     case FieldMetadataType.MULTI_SELECT:
       return 'enum';
+    case FieldMetadataType.RAW_JSON:
+      return 'jsonb';
     default:
       throw new Error(`Cannot convert ${fieldMetadataType} to column type.`);
   }
diff --git a/packages/twenty-server/src/metadata/workspace-migration/utils/generate-migration-name.util.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util.ts
similarity index 100%
rename from packages/twenty-server/src/metadata/workspace-migration/utils/generate-migration-name.util.ts
rename to packages/twenty-server/src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.entity.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.entity.ts
new file mode 100644
index 000000000000..6acee6df2e2a
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.entity.ts
@@ -0,0 +1,124 @@
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  PrimaryGeneratedColumn,
+} from 'typeorm';
+
+import { RelationOnDeleteAction } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+
+export enum WorkspaceMigrationColumnActionType {
+  CREATE = 'CREATE',
+  ALTER = 'ALTER',
+  CREATE_FOREIGN_KEY = 'CREATE_FOREIGN_KEY',
+  DROP_FOREIGN_KEY = 'DROP_FOREIGN_KEY',
+  DROP = 'DROP',
+  CREATE_COMMENT = 'CREATE_COMMENT',
+}
+export type WorkspaceMigrationRenamedEnum = { from: string; to: string };
+export type WorkspaceMigrationEnum = string | WorkspaceMigrationRenamedEnum;
+
+export interface WorkspaceMigrationColumnDefinition {
+  columnName: string;
+  columnType: string;
+  enum?: WorkspaceMigrationEnum[];
+  isArray?: boolean;
+  isNullable?: boolean;
+  defaultValue?: any;
+}
+
+export interface WorkspaceMigrationColumnCreate
+  extends WorkspaceMigrationColumnDefinition {
+  action: WorkspaceMigrationColumnActionType.CREATE;
+}
+
+export type WorkspaceMigrationColumnAlter = {
+  action: WorkspaceMigrationColumnActionType.ALTER;
+  currentColumnDefinition: WorkspaceMigrationColumnDefinition;
+  alteredColumnDefinition: WorkspaceMigrationColumnDefinition;
+};
+
+export type WorkspaceMigrationColumnCreateRelation = {
+  action: WorkspaceMigrationColumnActionType.CREATE_FOREIGN_KEY;
+  columnName: string;
+  referencedTableName: string;
+  referencedTableColumnName: string;
+  isUnique?: boolean;
+  onDelete?: RelationOnDeleteAction;
+};
+
+export type WorkspaceMigrationColumnDropRelation = {
+  action: WorkspaceMigrationColumnActionType.DROP_FOREIGN_KEY;
+  columnName: string;
+};
+
+export type WorkspaceMigrationColumnDrop = {
+  action: WorkspaceMigrationColumnActionType.DROP;
+  columnName: string;
+};
+
+export type WorkspaceMigrationCreateComment = {
+  action: WorkspaceMigrationColumnActionType.CREATE_COMMENT;
+  comment: string;
+};
+
+export type WorkspaceMigrationForeignTable = {
+  columns: WorkspaceMigrationColumnDefinition[];
+  referencedTableName: string;
+  referencedTableSchema: string;
+  foreignDataWrapperId: string;
+};
+
+export type WorkspaceMigrationColumnAction = {
+  action: WorkspaceMigrationColumnActionType;
+} & (
+  | WorkspaceMigrationColumnCreate
+  | WorkspaceMigrationColumnAlter
+  | WorkspaceMigrationColumnCreateRelation
+  | WorkspaceMigrationColumnDropRelation
+  | WorkspaceMigrationColumnDrop
+  | WorkspaceMigrationCreateComment
+);
+
+/**
+ * Enum values are lowercase to avoid issues with already existing enum values
+ */
+export enum WorkspaceMigrationTableActionType {
+  CREATE = 'create',
+  ALTER = 'alter',
+  DROP = 'drop',
+  CREATE_FOREIGN_TABLE = 'create_foreign_table',
+  DROP_FOREIGN_TABLE = 'drop_foreign_table'
+}
+
+export type WorkspaceMigrationTableAction = {
+  name: string;
+  newName?: string;
+  action: WorkspaceMigrationTableActionType;
+  columns?: WorkspaceMigrationColumnAction[];
+  foreignTable?: WorkspaceMigrationForeignTable;
+};
+
+@Entity('workspaceMigration')
+export class WorkspaceMigrationEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column({ nullable: true, type: 'jsonb' })
+  migrations: WorkspaceMigrationTableAction[];
+
+  @Column({ nullable: false })
+  name: string;
+
+  @Column({ default: false })
+  isCustom: boolean;
+
+  @Column({ nullable: true, type: 'timestamptz' })
+  appliedAt?: Date;
+
+  @Column({ nullable: false, type: 'uuid' })
+  workspaceId: string;
+
+  @CreateDateColumn({ type: 'timestamptz' })
+  createdAt: Date;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.factory.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.factory.ts
new file mode 100644
index 000000000000..43eeae07ad5c
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.factory.ts
@@ -0,0 +1,173 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { WorkspaceColumnActionFactory } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-factory.interface';
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+import { WorkspaceColumnActionOptions } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-options.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  WorkspaceMigrationColumnAction,
+  WorkspaceMigrationColumnActionType,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { BasicColumnActionFactory } from 'src/engine/metadata-modules/workspace-migration/factories/basic-column-action.factory';
+import { EnumColumnActionFactory } from 'src/engine/metadata-modules/workspace-migration/factories/enum-column-action.factory';
+import { CompositeColumnActionFactory } from 'src/engine/metadata-modules/workspace-migration/factories/composite-column-action.factory';
+
+@Injectable()
+export class WorkspaceMigrationFactory {
+  private readonly logger = new Logger(WorkspaceMigrationFactory.name);
+  private factoriesMap: Map<
+    FieldMetadataType,
+    {
+      factory: WorkspaceColumnActionFactory<any>;
+      options?: WorkspaceColumnActionOptions;
+    }
+  >;
+
+  constructor(
+    private readonly basicColumnActionFactory: BasicColumnActionFactory,
+    private readonly enumColumnActionFactory: EnumColumnActionFactory,
+    private readonly compositeColumnActionFactory: CompositeColumnActionFactory,
+  ) {
+    this.factoriesMap = new Map<
+      FieldMetadataType,
+      {
+        factory: WorkspaceColumnActionFactory<any>;
+        options?: WorkspaceColumnActionOptions;
+      }
+    >([
+      [FieldMetadataType.UUID, { factory: this.basicColumnActionFactory }],
+      [
+        FieldMetadataType.TEXT,
+        {
+          factory: this.basicColumnActionFactory,
+          options: {
+            defaultValue: '',
+          },
+        },
+      ],
+      [
+        FieldMetadataType.PHONE,
+        {
+          factory: this.basicColumnActionFactory,
+          options: {
+            defaultValue: '',
+          },
+        },
+      ],
+      [
+        FieldMetadataType.EMAIL,
+        {
+          factory: this.basicColumnActionFactory,
+          options: {
+            defaultValue: '',
+          },
+        },
+      ],
+      [FieldMetadataType.NUMERIC, { factory: this.basicColumnActionFactory }],
+      [FieldMetadataType.NUMBER, { factory: this.basicColumnActionFactory }],
+      [FieldMetadataType.POSITION, { factory: this.basicColumnActionFactory }],
+      [FieldMetadataType.RAW_JSON, { factory: this.basicColumnActionFactory }],
+      [
+        FieldMetadataType.PROBABILITY,
+        { factory: this.basicColumnActionFactory },
+      ],
+      [FieldMetadataType.BOOLEAN, { factory: this.basicColumnActionFactory }],
+      [FieldMetadataType.DATE_TIME, { factory: this.basicColumnActionFactory }],
+      [FieldMetadataType.DATE, { factory: this.basicColumnActionFactory }],
+      [FieldMetadataType.RATING, { factory: this.enumColumnActionFactory }],
+      [FieldMetadataType.SELECT, { factory: this.enumColumnActionFactory }],
+      [
+        FieldMetadataType.MULTI_SELECT,
+        { factory: this.enumColumnActionFactory },
+      ],
+      [FieldMetadataType.LINK, { factory: this.compositeColumnActionFactory }],
+      [
+        FieldMetadataType.CURRENCY,
+        { factory: this.compositeColumnActionFactory },
+      ],
+      [
+        FieldMetadataType.ADDRESS,
+        { factory: this.compositeColumnActionFactory },
+      ],
+      [
+        FieldMetadataType.FULL_NAME,
+        { factory: this.compositeColumnActionFactory },
+      ],
+    ]);
+  }
+
+  createColumnActions(
+    action: WorkspaceMigrationColumnActionType.CREATE,
+    fieldMetadata: FieldMetadataInterface,
+  ): WorkspaceMigrationColumnAction[];
+
+  createColumnActions(
+    action: WorkspaceMigrationColumnActionType.ALTER,
+    currentFieldMetadata: FieldMetadataInterface,
+    alteredFieldMetadata: FieldMetadataInterface,
+  ): WorkspaceMigrationColumnAction[];
+
+  createColumnActions(
+    action:
+      | WorkspaceMigrationColumnActionType.CREATE
+      | WorkspaceMigrationColumnActionType.ALTER,
+    fieldMetadataOrCurrentFieldMetadata: FieldMetadataInterface,
+    undefinedOrAlteredFieldMetadata?: FieldMetadataInterface,
+  ): WorkspaceMigrationColumnAction[] {
+    const currentFieldMetadata =
+      action === WorkspaceMigrationColumnActionType.ALTER
+        ? fieldMetadataOrCurrentFieldMetadata
+        : undefined;
+    const alteredFieldMetadata =
+      action === WorkspaceMigrationColumnActionType.CREATE
+        ? fieldMetadataOrCurrentFieldMetadata
+        : undefinedOrAlteredFieldMetadata;
+
+    if (!alteredFieldMetadata) {
+      this.logger.error(
+        `No field metadata provided for action ${action}`,
+        undefinedOrAlteredFieldMetadata,
+      );
+
+      throw new Error(`No field metadata provided for action ${action}`);
+    }
+
+    const columnActions = this.createColumnAction(
+      action,
+      currentFieldMetadata,
+      alteredFieldMetadata,
+    );
+
+    return columnActions;
+  }
+
+  private createColumnAction(
+    action:
+      | WorkspaceMigrationColumnActionType.CREATE
+      | WorkspaceMigrationColumnActionType.ALTER,
+    currentFieldMetadata: FieldMetadataInterface | undefined,
+    alteredFieldMetadata: FieldMetadataInterface,
+  ): WorkspaceMigrationColumnAction[] {
+    const { factory, options } =
+      this.factoriesMap.get(alteredFieldMetadata.type) ?? {};
+
+    if (!factory) {
+      this.logger.error(
+        `No factory found for type ${alteredFieldMetadata.type}`,
+        {
+          alteredFieldMetadata,
+        },
+      );
+
+      throw new Error(`No factory found for type ${alteredFieldMetadata.type}`);
+    }
+
+    return factory.create(
+      action,
+      currentFieldMetadata,
+      alteredFieldMetadata,
+      options,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.module.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.module.ts
new file mode 100644
index 000000000000..9e0d4072c476
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.module.ts
@@ -0,0 +1,19 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { workspaceColumnActionFactories } from 'src/engine/metadata-modules/workspace-migration/factories/factories';
+import { WorkspaceMigrationFactory } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.factory';
+
+import { WorkspaceMigrationService } from './workspace-migration.service';
+import { WorkspaceMigrationEntity } from './workspace-migration.entity';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([WorkspaceMigrationEntity], 'metadata')],
+  providers: [
+    ...workspaceColumnActionFactories,
+    WorkspaceMigrationFactory,
+    WorkspaceMigrationService,
+  ],
+  exports: [WorkspaceMigrationFactory, WorkspaceMigrationService],
+})
+export class WorkspaceMigrationModule {}
diff --git a/packages/twenty-server/src/metadata/workspace-migration/workspace-migration.service.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.service.ts
similarity index 100%
rename from packages/twenty-server/src/metadata/workspace-migration/workspace-migration.service.ts
rename to packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.service.ts
diff --git a/packages/twenty-server/src/engine/middlewares/user-workspace.middleware.ts b/packages/twenty-server/src/engine/middlewares/user-workspace.middleware.ts
new file mode 100644
index 000000000000..a1ebe7a9298d
--- /dev/null
+++ b/packages/twenty-server/src/engine/middlewares/user-workspace.middleware.ts
@@ -0,0 +1,34 @@
+import { Injectable, Logger, NestMiddleware } from '@nestjs/common';
+
+import { Request, Response, NextFunction } from 'express';
+
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+
+@Injectable()
+export class UserWorkspaceMiddleware implements NestMiddleware {
+  private readonly logger = new Logger(UserWorkspaceMiddleware.name);
+
+  constructor(
+    private readonly tokenService: TokenService,
+    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+  ) {}
+
+  async use(req: Request, res: Response, next: NextFunction) {
+    if (this.tokenService.isTokenPresent(req)) {
+      try {
+        const data = await this.tokenService.validateToken(req);
+        const cacheVersion = await this.workspaceCacheVersionService.getVersion(
+          data.workspace.id,
+        );
+
+        req.user = data.user;
+        req.workspace = data.workspace;
+        req.cacheVersion = cacheVersion;
+      } catch (error) {
+        this.logger.error('Error while validating token in middleware.', error);
+      }
+    }
+    next();
+  }
+}
diff --git a/packages/twenty-server/src/engine/object-metadata-repository/metadata-to-repository.mapping.ts b/packages/twenty-server/src/engine/object-metadata-repository/metadata-to-repository.mapping.ts
new file mode 100644
index 000000000000..33d7685e90a2
--- /dev/null
+++ b/packages/twenty-server/src/engine/object-metadata-repository/metadata-to-repository.mapping.ts
@@ -0,0 +1,35 @@
+import { CalendarChannelEventAssociationRepository } from 'src/modules/calendar/repositories/calendar-channel-event-association.repository';
+import { CalendarChannelRepository } from 'src/modules/calendar/repositories/calendar-channel.repository';
+import { CalendarEventParticipantRepository } from 'src/modules/calendar/repositories/calendar-event-participant.repository';
+import { CalendarEventRepository } from 'src/modules/calendar/repositories/calendar-event.repository';
+import { CompanyRepository } from 'src/modules/company/repositories/company.repository';
+import { BlocklistRepository } from 'src/modules/connected-account/repositories/blocklist.repository';
+import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
+import { EventRepository } from 'src/modules/event/repositiories/event.repository';
+import { MessageChannelMessageAssociationRepository } from 'src/modules/messaging/repositories/message-channel-message-association.repository';
+import { MessageChannelRepository } from 'src/modules/messaging/repositories/message-channel.repository';
+import { MessageParticipantRepository } from 'src/modules/messaging/repositories/message-participant.repository';
+import { MessageThreadRepository } from 'src/modules/messaging/repositories/message-thread.repository';
+import { MessageRepository } from 'src/modules/messaging/repositories/message.repository';
+import { PersonRepository } from 'src/modules/person/repositories/person.repository';
+import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
+
+export const metadataToRepositoryMapping = {
+  BlocklistObjectMetadata: BlocklistRepository,
+  CalendarChannelEventAssociationObjectMetadata:
+    CalendarChannelEventAssociationRepository,
+  CalendarChannelObjectMetadata: CalendarChannelRepository,
+  CalendarEventParticipantObjectMetadata: CalendarEventParticipantRepository,
+  CalendarEventObjectMetadata: CalendarEventRepository,
+  CompanyObjectMetadata: CompanyRepository,
+  ConnectedAccountObjectMetadata: ConnectedAccountRepository,
+  EventObjectMetadata: EventRepository,
+  MessageChannelMessageAssociationObjectMetadata:
+    MessageChannelMessageAssociationRepository,
+  MessageChannelObjectMetadata: MessageChannelRepository,
+  MessageObjectMetadata: MessageRepository,
+  MessageParticipantObjectMetadata: MessageParticipantRepository,
+  MessageThreadObjectMetadata: MessageThreadRepository,
+  PersonObjectMetadata: PersonRepository,
+  WorkspaceMemberObjectMetadata: WorkspaceMemberRepository,
+};
diff --git a/packages/twenty-server/src/engine/object-metadata-repository/object-metadata-repository.decorator.ts b/packages/twenty-server/src/engine/object-metadata-repository/object-metadata-repository.decorator.ts
new file mode 100644
index 000000000000..d8e35a705e30
--- /dev/null
+++ b/packages/twenty-server/src/engine/object-metadata-repository/object-metadata-repository.decorator.ts
@@ -0,0 +1,12 @@
+import { Inject } from '@nestjs/common';
+
+import { convertClassNameToObjectMetadataName } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/convert-class-to-object-metadata-name.util';
+import { capitalize } from 'src/utils/capitalize';
+
+export const InjectObjectMetadataRepository = (objectMetadata: any) => {
+  const token = `${capitalize(
+    convertClassNameToObjectMetadataName(objectMetadata.name),
+  )}Repository`;
+
+  return Inject(token);
+};
diff --git a/packages/twenty-server/src/engine/object-metadata-repository/object-metadata-repository.module.ts b/packages/twenty-server/src/engine/object-metadata-repository/object-metadata-repository.module.ts
new file mode 100644
index 000000000000..624269b0bf8c
--- /dev/null
+++ b/packages/twenty-server/src/engine/object-metadata-repository/object-metadata-repository.module.ts
@@ -0,0 +1,40 @@
+import { Global, Module, DynamicModule, Provider } from '@nestjs/common';
+
+import { metadataToRepositoryMapping } from 'src/engine/object-metadata-repository/metadata-to-repository.mapping';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { convertClassNameToObjectMetadataName } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/convert-class-to-object-metadata-name.util';
+import { capitalize } from 'src/utils/capitalize';
+
+@Global()
+@Module({})
+export class ObjectMetadataRepositoryModule {
+  static forFeature(objectMetadatas): DynamicModule {
+    const providers: Provider[] = objectMetadatas.map((objectMetadata) => {
+      const repositoryClass = metadataToRepositoryMapping[objectMetadata.name];
+
+      if (!repositoryClass) {
+        throw new Error(`No repository found for ${objectMetadata.name}`);
+      }
+
+      return {
+        provide: `${capitalize(
+          convertClassNameToObjectMetadataName(objectMetadata.name),
+        )}Repository`,
+        useFactory: (
+          workspaceDataSourceService: WorkspaceDataSourceService,
+        ) => {
+          return new repositoryClass(workspaceDataSourceService);
+        },
+        inject: [WorkspaceDataSourceService],
+      };
+    });
+
+    return {
+      module: ObjectMetadataRepositoryModule,
+      imports: [WorkspaceDataSourceModule],
+      providers: [...providers],
+      exports: providers,
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/strategies/aggregate-by-workspace-context-id.strategy.ts b/packages/twenty-server/src/engine/strategies/aggregate-by-workspace-context-id.strategy.ts
new file mode 100644
index 000000000000..0a61e7354e9f
--- /dev/null
+++ b/packages/twenty-server/src/engine/strategies/aggregate-by-workspace-context-id.strategy.ts
@@ -0,0 +1,38 @@
+import {
+  HostComponentInfo,
+  ContextId,
+  ContextIdFactory,
+  ContextIdStrategy,
+} from '@nestjs/core';
+
+import { jwtDecode } from 'jwt-decode';
+import { Request } from 'express';
+
+import { JwtPayload } from 'src/engine/core-modules/auth/strategies/jwt.auth.strategy';
+
+const workspaces = new Map<string, ContextId>();
+
+export class AggregateByWorkspaceContextIdStrategy
+  implements ContextIdStrategy
+{
+  attach(contextId: ContextId, request: Request) {
+    const token = request.header('Authorization')?.replace('Bearer ', '');
+    const jwtPayload = token ? jwtDecode<JwtPayload>(token) : null;
+    let workspaceSubTreeId: ContextId;
+
+    if (!jwtPayload) {
+      return () => contextId;
+    }
+
+    if (workspaces.has(jwtPayload.workspaceId)) {
+      workspaceSubTreeId = workspaces.get(jwtPayload.workspaceId)!;
+    } else {
+      workspaceSubTreeId = ContextIdFactory.create();
+      workspaces.set(jwtPayload.workspaceId, workspaceSubTreeId);
+    }
+
+    // If tree is not durable, return the original "contextId" object
+    return (info: HostComponentInfo) =>
+      info.isTreeDurable ? workspaceSubTreeId : contextId;
+  }
+}
diff --git a/packages/twenty-server/src/workspace/utils/__tests__/deduce-relation-direction.spec.ts b/packages/twenty-server/src/engine/utils/__tests__/deduce-relation-direction.spec.ts
similarity index 80%
rename from packages/twenty-server/src/workspace/utils/__tests__/deduce-relation-direction.spec.ts
rename to packages/twenty-server/src/engine/utils/__tests__/deduce-relation-direction.spec.ts
index 048e372f0cbc..71114d678a59 100644
--- a/packages/twenty-server/src/workspace/utils/__tests__/deduce-relation-direction.spec.ts
+++ b/packages/twenty-server/src/engine/utils/__tests__/deduce-relation-direction.spec.ts
@@ -1,12 +1,12 @@
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-import { RelationMetadataInterface } from 'src/metadata/field-metadata/interfaces/relation-metadata.interface';
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+import { RelationMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-metadata.interface';
 
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { RelationMetadataType } from 'src/metadata/relation-metadata/relation-metadata.entity';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import {
   deduceRelationDirection,
   RelationDirection,
-} from 'src/workspace/utils/deduce-relation-direction.util';
+} from 'src/engine/utils/deduce-relation-direction.util';
 
 describe('deduceRelationDirection', () => {
   it('should return FROM when the current object Metadata ID matches fromObjectMetadataId and id matches fromFieldMetadataId', () => {
@@ -17,9 +17,6 @@ describe('deduceRelationDirection', () => {
       name: 'field_name',
       label: 'Field Name',
       description: 'Field Description',
-      targetColumnMap: {
-        default: 'default_column',
-      },
     };
 
     const relationMetadata = {
@@ -48,9 +45,6 @@ describe('deduceRelationDirection', () => {
       name: 'field_name',
       label: 'Field Name',
       description: 'Field Description',
-      targetColumnMap: {
-        default: 'default_column',
-      },
     };
 
     const relationMetadata = {
@@ -78,9 +72,6 @@ describe('deduceRelationDirection', () => {
       name: 'field_name',
       label: 'Field Name',
       description: 'Field Description',
-      targetColumnMap: {
-        default: 'default_column',
-      },
     };
 
     const relationMetadata = {
diff --git a/packages/twenty-server/src/workspace/utils/__tests__/get-resolver-name.spec.ts b/packages/twenty-server/src/engine/utils/__tests__/get-resolver-name.spec.ts
similarity index 79%
rename from packages/twenty-server/src/workspace/utils/__tests__/get-resolver-name.spec.ts
rename to packages/twenty-server/src/engine/utils/__tests__/get-resolver-name.spec.ts
index 2c2a5b66f1e3..16560a4e63d2 100644
--- a/packages/twenty-server/src/workspace/utils/__tests__/get-resolver-name.spec.ts
+++ b/packages/twenty-server/src/engine/utils/__tests__/get-resolver-name.spec.ts
@@ -1,6 +1,6 @@
-import { WorkspaceResolverBuilderMethodNames } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
-import { getResolverName } from 'src/workspace/utils/get-resolver-name.util';
+import { getResolverName } from 'src/engine/utils/get-resolver-name.util';
 
 describe('getResolverName', () => {
   const metadata = {
diff --git a/packages/twenty-server/src/engine/utils/compute-object-target-table.util.ts b/packages/twenty-server/src/engine/utils/compute-object-target-table.util.ts
new file mode 100644
index 000000000000..03430009dd9c
--- /dev/null
+++ b/packages/twenty-server/src/engine/utils/compute-object-target-table.util.ts
@@ -0,0 +1,9 @@
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+
+import { computeTableName } from './compute-table-name.util';
+
+export const computeObjectTargetTable = (
+  objectMetadata: ObjectMetadataInterface,
+) => {
+  return computeTableName(objectMetadata.nameSingular, objectMetadata.isCustom);
+};
diff --git a/packages/twenty-server/src/engine/utils/compute-table-name.util.ts b/packages/twenty-server/src/engine/utils/compute-table-name.util.ts
new file mode 100644
index 000000000000..ca031ed31530
--- /dev/null
+++ b/packages/twenty-server/src/engine/utils/compute-table-name.util.ts
@@ -0,0 +1,5 @@
+export const customNamePrefix = '_';
+
+export const computeTableName = (name: string, isCustom: boolean) => {
+  return isCustom ? `${customNamePrefix}${name}` : name;
+};
diff --git a/packages/twenty-server/src/engine/utils/deduce-relation-direction.util.ts b/packages/twenty-server/src/engine/utils/deduce-relation-direction.util.ts
new file mode 100644
index 000000000000..1d78d049bb15
--- /dev/null
+++ b/packages/twenty-server/src/engine/utils/deduce-relation-direction.util.ts
@@ -0,0 +1,30 @@
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+import { RelationMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-metadata.interface';
+
+export enum RelationDirection {
+  FROM = 'from',
+  TO = 'to',
+}
+
+export const deduceRelationDirection = (
+  fieldMetadata: FieldMetadataInterface,
+  relationMetadata: RelationMetadataInterface,
+): RelationDirection => {
+  if (
+    relationMetadata.fromObjectMetadataId === fieldMetadata.objectMetadataId &&
+    relationMetadata.fromFieldMetadataId === fieldMetadata.id
+  ) {
+    return RelationDirection.FROM;
+  }
+
+  if (
+    relationMetadata.toObjectMetadataId === fieldMetadata.objectMetadataId &&
+    relationMetadata.toFieldMetadataId === fieldMetadata.id
+  ) {
+    return RelationDirection.TO;
+  }
+
+  throw new Error(
+    `Relation metadata ${relationMetadata.id} is not related to object ${fieldMetadata.objectMetadataId}`,
+  );
+};
diff --git a/packages/twenty-server/src/workspace/utils/get-resolver-name.util.ts b/packages/twenty-server/src/engine/utils/get-resolver-name.util.ts
similarity index 81%
rename from packages/twenty-server/src/workspace/utils/get-resolver-name.util.ts
rename to packages/twenty-server/src/engine/utils/get-resolver-name.util.ts
index e2de8f2d5d11..1f4d0ebc7b31 100644
--- a/packages/twenty-server/src/workspace/utils/get-resolver-name.util.ts
+++ b/packages/twenty-server/src/engine/utils/get-resolver-name.util.ts
@@ -1,5 +1,5 @@
-import { WorkspaceResolverBuilderMethodNames } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
+import { WorkspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
 import { camelCase } from 'src/utils/camel-case';
 import { pascalCase } from 'src/utils/pascal-case';
diff --git a/packages/twenty-server/src/filters/utils/global-exception-handler.util.ts b/packages/twenty-server/src/engine/utils/global-exception-handler.util.ts
similarity index 88%
rename from packages/twenty-server/src/filters/utils/global-exception-handler.util.ts
rename to packages/twenty-server/src/engine/utils/global-exception-handler.util.ts
index d57619fe0fb7..12f32656f86c 100644
--- a/packages/twenty-server/src/filters/utils/global-exception-handler.util.ts
+++ b/packages/twenty-server/src/engine/utils/global-exception-handler.util.ts
@@ -1,6 +1,6 @@
 import { HttpException } from '@nestjs/common';
 
-import { ExceptionHandlerUser } from 'src/integrations/exception-handler/interfaces/exception-handler-user.interface';
+import { ExceptionHandlerUser } from 'src/engine/integrations/exception-handler/interfaces/exception-handler-user.interface';
 
 import {
   AuthenticationError,
@@ -9,8 +9,8 @@ import {
   ValidationError,
   NotFoundError,
   ConflictError,
-} from 'src/filters/utils/graphql-errors.util';
-import { ExceptionHandlerService } from 'src/integrations/exception-handler/exception-handler.service';
+} from 'src/engine/utils/graphql-errors.util';
+import { ExceptionHandlerService } from 'src/engine/integrations/exception-handler/exception-handler.service';
 
 const graphQLPredefinedExceptions = {
   400: ValidationError,
diff --git a/packages/twenty-server/src/filters/utils/graphql-errors.util.ts b/packages/twenty-server/src/engine/utils/graphql-errors.util.ts
similarity index 100%
rename from packages/twenty-server/src/filters/utils/graphql-errors.util.ts
rename to packages/twenty-server/src/engine/utils/graphql-errors.util.ts
diff --git a/packages/twenty-server/src/engine/utils/is-relation-field-metadata-type.util.ts b/packages/twenty-server/src/engine/utils/is-relation-field-metadata-type.util.ts
new file mode 100644
index 000000000000..a5ed9d644eba
--- /dev/null
+++ b/packages/twenty-server/src/engine/utils/is-relation-field-metadata-type.util.ts
@@ -0,0 +1,7 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+export const isRelationFieldMetadataType = (
+  type: FieldMetadataType,
+): type is FieldMetadataType.RELATION => {
+  return type === FieldMetadataType.RELATION;
+};
diff --git a/packages/twenty-server/src/workspace/utils/render-apollo-playground.util.ts b/packages/twenty-server/src/engine/utils/render-apollo-playground.util.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/utils/render-apollo-playground.util.ts
rename to packages/twenty-server/src/engine/utils/render-apollo-playground.util.ts
diff --git a/packages/twenty-server/src/workspace/workspace-datasource/workspace-datasource.module.ts b/packages/twenty-server/src/engine/workspace-datasource/workspace-datasource.module.ts
similarity index 79%
rename from packages/twenty-server/src/workspace/workspace-datasource/workspace-datasource.module.ts
rename to packages/twenty-server/src/engine/workspace-datasource/workspace-datasource.module.ts
index 9754aa2bac26..17d0a5cf3dda 100644
--- a/packages/twenty-server/src/workspace/workspace-datasource/workspace-datasource.module.ts
+++ b/packages/twenty-server/src/engine/workspace-datasource/workspace-datasource.module.ts
@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 
 import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
 
 import { WorkspaceDataSourceService } from './workspace-datasource.service';
 
diff --git a/packages/twenty-server/src/workspace/workspace-datasource/workspace-datasource.service.ts b/packages/twenty-server/src/engine/workspace-datasource/workspace-datasource.service.ts
similarity index 82%
rename from packages/twenty-server/src/workspace/workspace-datasource/workspace-datasource.service.ts
rename to packages/twenty-server/src/engine/workspace-datasource/workspace-datasource.service.ts
index 350ec645aba2..d4400a85e985 100644
--- a/packages/twenty-server/src/workspace/workspace-datasource/workspace-datasource.service.ts
+++ b/packages/twenty-server/src/engine/workspace-datasource/workspace-datasource.service.ts
@@ -2,8 +2,9 @@ import { Injectable } from '@nestjs/common';
 
 import { DataSource, EntityManager } from 'typeorm';
 
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
+import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 
 @Injectable()
 export class WorkspaceDataSourceService {
@@ -30,7 +31,7 @@ export class WorkspaceDataSourceService {
 
   public async connectedToWorkspaceDataSourceAndReturnMetadata(
     workspaceId: string,
-  ) {
+  ): Promise<{ dataSource: DataSource; dataSourceMetadata: DataSourceEntity }> {
     const dataSourceMetadata =
       await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
         workspaceId,
@@ -114,16 +115,18 @@ export class WorkspaceDataSourceService {
     workspaceId: string,
     transactionManager?: EntityManager,
   ): Promise<any> {
-    if (transactionManager) {
-      return await transactionManager.query(query, parameters);
-    }
-    const workspaceDataSource =
-      await this.connectToWorkspaceDataSource(workspaceId);
+    try {
+      if (transactionManager) {
+        return await transactionManager.query(query, parameters);
+      }
+      const workspaceDataSource =
+        await this.connectToWorkspaceDataSource(workspaceId);
 
-    if (workspaceDataSource) {
       return await workspaceDataSource.query(query, parameters);
+    } catch (error) {
+      throw new Error(
+        `Error executing raw query for workspace ${workspaceId}: ${error.message}`,
+      );
     }
-
-    throw new Error('No data source found or transaction manager provided');
   }
 }
diff --git a/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/companies-demo.json b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/companies-demo.json
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/companies-demo.json
rename to packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/companies-demo.json
diff --git a/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/company.ts b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/company.ts
similarity index 91%
rename from packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/company.ts
rename to packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/company.ts
index a7b724f612a9..f1df5a2ddc04 100644
--- a/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/company.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/company.ts
@@ -2,7 +2,7 @@ import { EntityManager } from 'typeorm';
 
 import companiesDemo from './companies-demo.json';
 
-export const companyPrefillData = async (
+export const companyPrefillDemoData = async (
   entityManager: EntityManager,
   schemaName: string,
 ) => {
diff --git a/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/demo-objects-prefill-data.ts b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/demo-objects-prefill-data.ts
new file mode 100644
index 000000000000..1b4b4ec8b908
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/demo-objects-prefill-data.ts
@@ -0,0 +1,39 @@
+import { DataSource, EntityManager } from 'typeorm';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { workspaceMemberPrefillData } from 'src/engine/workspace-manager/demo-objects-prefill-data/workspace-member';
+import { viewPrefillData } from 'src/engine/workspace-manager/standard-objects-prefill-data/view';
+import { companyPrefillDemoData } from 'src/engine/workspace-manager/demo-objects-prefill-data/company';
+import { personPrefillDemoData } from 'src/engine/workspace-manager/demo-objects-prefill-data/person';
+import { opportunityPrefillDemoData } from 'src/engine/workspace-manager/demo-objects-prefill-data/opportunity';
+
+export const demoObjectsPrefillData = async (
+  workspaceDataSource: DataSource,
+  schemaName: string,
+  objectMetadata: ObjectMetadataEntity[],
+) => {
+  const objectMetadataMap = objectMetadata.reduce((acc, object) => {
+    acc[object.standardId ?? ''] = {
+      id: object.id,
+      fields: object.fields.reduce((acc, field) => {
+        acc[field.standardId ?? ''] = field.id;
+
+        return acc;
+      }, {}),
+    };
+
+    return acc;
+  }, {});
+
+  await workspaceDataSource.transaction(
+    async (entityManager: EntityManager) => {
+      await companyPrefillDemoData(entityManager, schemaName);
+      await personPrefillDemoData(entityManager, schemaName);
+      await opportunityPrefillDemoData(entityManager, schemaName);
+
+      await viewPrefillData(entityManager, schemaName, objectMetadataMap);
+
+      await workspaceMemberPrefillData(entityManager, schemaName);
+    },
+  );
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/opportunity.ts b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/opportunity.ts
new file mode 100644
index 000000000000..e2d53abfb311
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/opportunity.ts
@@ -0,0 +1,72 @@
+import { EntityManager } from 'typeorm';
+import { v4 } from 'uuid';
+
+const tableName = 'opportunity';
+
+const getRandomProbability = () => {
+  const firstDigit = Math.floor(Math.random() * 9) + 1;
+
+  return firstDigit / 10;
+};
+
+const getRandomStage = () => {
+  const stages = ['NEW', 'SCREENING', 'MEETING', 'PROPOSAL', 'CUSTOMER'];
+
+  return stages[Math.floor(Math.random() * stages.length)];
+};
+
+const generateRandomAmountMicros = () => {
+  const firstDigit = Math.floor(Math.random() * 9) + 1;
+
+  return firstDigit * 10000000000;
+};
+
+const generateOpportunities = (companies) => {
+  return companies.map((company) => ({
+    id: v4(),
+    amountAmountMicros: generateRandomAmountMicros(),
+    amountCurrencyCode: 'USD',
+    closeDate: new Date(),
+    stage: getRandomStage(),
+    probability: getRandomProbability(),
+    pointOfContactId: company.personId,
+    companyId: company.id,
+  }));
+};
+
+export const opportunityPrefillDemoData = async (
+  entityManager: EntityManager,
+  schemaName: string,
+) => {
+  const companiesWithPeople = await entityManager?.query(
+    `SELECT company.*, person.id AS "personId"
+     FROM ${schemaName}.company
+     LEFT JOIN ${schemaName}.person ON company.id = "person"."companyId"
+     LIMIT 50`,
+  );
+
+  const opportunities = generateOpportunities(companiesWithPeople);
+
+  await entityManager
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.${tableName}`, [
+      'id',
+      'amountAmountMicros',
+      'amountCurrencyCode',
+      'closeDate',
+      'stage',
+      'probability',
+      'pointOfContactId',
+      'companyId',
+      'position',
+    ])
+    .orIgnore()
+    .values(
+      opportunities.map((opportunity, index) => ({
+        ...opportunity,
+        position: index,
+      })),
+    )
+    .execute();
+};
diff --git a/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/people-demo.json b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/people-demo.json
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/people-demo.json
rename to packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/people-demo.json
diff --git a/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/person.ts b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/person.ts
similarity index 95%
rename from packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/person.ts
rename to packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/person.ts
index 9edd9639d290..48df7d4b8004 100644
--- a/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/person.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/person.ts
@@ -2,7 +2,7 @@ import { EntityManager } from 'typeorm';
 
 import peopleDemo from './people-demo.json';
 
-export const personPrefillData = async (
+export const personPrefillDemoData = async (
   entityManager: EntityManager,
   schemaName: string,
 ) => {
diff --git a/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/workspace-member.ts b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/workspace-member.ts
new file mode 100644
index 000000000000..b31f52e94732
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/workspace-member.ts
@@ -0,0 +1,54 @@
+import { EntityManager } from 'typeorm';
+
+import { DEMO_SEED_USER_IDS } from 'src/database/typeorm-seeds/core/demo/users';
+
+export const DEMO_SEED_WORKSPACE_MEMBER_IDS = {
+  NOAH: '20202020-0687-4c41-b707-ed1bfca972a2',
+  HUGO: '20202020-77d5-4cb6-b60a-f4a835a85d62',
+  JULIA: '20202020-1553-45c6-a028-5a9064cce07e',
+};
+
+export const workspaceMemberPrefillData = async (
+  entityManager: EntityManager,
+  schemaName: string,
+) => {
+  await entityManager
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.workspaceMember`, [
+      'id',
+      'nameFirstName',
+      'nameLastName',
+      'locale',
+      'colorScheme',
+      'userId',
+    ])
+    .orIgnore()
+    .values([
+      {
+        id: DEMO_SEED_WORKSPACE_MEMBER_IDS.NOAH,
+        nameFirstName: 'Noah',
+        nameLastName: 'A',
+        locale: 'en',
+        colorScheme: 'Light',
+        userId: DEMO_SEED_USER_IDS.NOAH,
+      },
+      {
+        id: DEMO_SEED_WORKSPACE_MEMBER_IDS.HUGO,
+        nameFirstName: 'Hugo',
+        nameLastName: 'I',
+        locale: 'en',
+        colorScheme: 'Light',
+        userId: DEMO_SEED_USER_IDS.HUGO,
+      },
+      {
+        id: DEMO_SEED_WORKSPACE_MEMBER_IDS.JULIA,
+        nameFirstName: 'Julia',
+        nameLastName: 'S',
+        locale: 'en',
+        colorScheme: 'Light',
+        userId: DEMO_SEED_USER_IDS.JULIA,
+      },
+    ])
+    .execute();
+};
diff --git a/packages/twenty-server/src/workspace/workspace-manager/standard-objects-prefill-data/company.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/company.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-manager/standard-objects-prefill-data/company.ts
rename to packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/company.ts
diff --git a/packages/twenty-server/src/workspace/workspace-manager/standard-objects-prefill-data/person.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/person.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-manager/standard-objects-prefill-data/person.ts
rename to packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/person.ts
diff --git a/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/pipeline-step.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/pipeline-step.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/pipeline-step.ts
rename to packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/pipeline-step.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/standard-objects-prefill-data.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/standard-objects-prefill-data.ts
new file mode 100644
index 000000000000..4e404878f9f4
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/standard-objects-prefill-data.ts
@@ -0,0 +1,39 @@
+import { DataSource, EntityManager } from 'typeorm';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { viewPrefillData } from 'src/engine/workspace-manager/standard-objects-prefill-data/view';
+import { companyPrefillData } from 'src/engine/workspace-manager/standard-objects-prefill-data/company';
+import { personPrefillData } from 'src/engine/workspace-manager/standard-objects-prefill-data/person';
+
+export const standardObjectsPrefillData = async (
+  workspaceDataSource: DataSource,
+  schemaName: string,
+  objectMetadata: ObjectMetadataEntity[],
+) => {
+  const objectMetadataMap = objectMetadata.reduce((acc, object) => {
+    if (!object.standardId) {
+      throw new Error('Standard Id is not set for object: ${object.name}');
+    }
+
+    acc[object.standardId] = {
+      id: object.id,
+      fields: object.fields.reduce((acc, field) => {
+        if (!field.standardId) {
+          throw new Error('Standard Id is not set for field: ${field.name}');
+        }
+
+        acc[field.standardId] = field.id;
+
+        return acc;
+      }, {}),
+    };
+
+    return acc;
+  }, {});
+
+  workspaceDataSource.transaction(async (entityManager: EntityManager) => {
+    await companyPrefillData(entityManager, schemaName);
+    await personPrefillData(entityManager, schemaName);
+    await viewPrefillData(entityManager, schemaName, objectMetadataMap);
+  });
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view-company-fields.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view-company-fields.ts
new file mode 100644
index 000000000000..20f5841ba4d3
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view-company-fields.ts
@@ -0,0 +1,84 @@
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import {
+  baseObjectStandardFieldIds,
+  companyStandardFieldIds,
+} from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+
+export const viewCompanyFields = (
+  viewId: string,
+  objectMetadataMap: Record<string, ObjectMetadataEntity>,
+) => {
+  return [
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.company].fields[
+          companyStandardFieldIds.name
+        ],
+      viewId: viewId,
+      position: 0,
+      isVisible: true,
+      size: 180,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.company].fields[
+          companyStandardFieldIds.domainName
+        ],
+      viewId: viewId,
+      position: 1,
+      isVisible: true,
+      size: 100,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.company].fields[
+          companyStandardFieldIds.accountOwner
+        ],
+      viewId: viewId,
+      position: 2,
+      isVisible: true,
+      size: 150,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.company].fields[
+          baseObjectStandardFieldIds.createdAt
+        ],
+      viewId: viewId,
+      position: 3,
+      isVisible: true,
+      size: 150,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.company].fields[
+          companyStandardFieldIds.employees
+        ],
+      viewId: viewId,
+      position: 4,
+      isVisible: true,
+      size: 150,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.company].fields[
+          companyStandardFieldIds.linkedinLink
+        ],
+      viewId: viewId,
+      position: 5,
+      isVisible: true,
+      size: 170,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.company].fields[
+          companyStandardFieldIds.address
+        ],
+      viewId: viewId,
+      position: 6,
+      isVisible: true,
+      size: 170,
+    },
+  ];
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view-opportunity-fields.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view-opportunity-fields.ts
new file mode 100644
index 000000000000..d455e51bdfff
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view-opportunity-fields.ts
@@ -0,0 +1,61 @@
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { opportunityStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+
+export const viewOpportunityFields = (
+  viewId: string,
+  objectMetadataMap: Record<string, ObjectMetadataEntity>,
+) => {
+  return [
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.opportunity].fields[
+          opportunityStandardFieldIds.name
+        ],
+      viewId: viewId,
+      position: 0,
+      isVisible: true,
+      size: 150,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.opportunity].fields[
+          opportunityStandardFieldIds.amount
+        ],
+      viewId: viewId,
+      position: 1,
+      isVisible: true,
+      size: 150,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.opportunity].fields[
+          opportunityStandardFieldIds.closeDate
+        ],
+      viewId: viewId,
+      position: 2,
+      isVisible: true,
+      size: 150,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.opportunity].fields[
+          opportunityStandardFieldIds.probability
+        ],
+      viewId: viewId,
+      position: 3,
+      isVisible: true,
+      size: 150,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.opportunity].fields[
+          opportunityStandardFieldIds.pointOfContact
+        ],
+      viewId: viewId,
+      position: 4,
+      isVisible: true,
+      size: 150,
+    },
+  ];
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view-person-fields.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view-person-fields.ts
new file mode 100644
index 000000000000..19df85dbd9f5
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view-person-fields.ts
@@ -0,0 +1,104 @@
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import {
+  baseObjectStandardFieldIds,
+  personStandardFieldIds,
+} from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+
+export const viewPersonFields = (
+  viewId: string,
+  objectMetadataMap: Record<string, ObjectMetadataEntity>,
+) => {
+  return [
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.person].fields[
+          personStandardFieldIds.name
+        ],
+      viewId: viewId,
+      position: 0,
+      isVisible: true,
+      size: 210,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.person].fields[
+          personStandardFieldIds.email
+        ],
+      viewId: viewId,
+      position: 1,
+      isVisible: true,
+      size: 150,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.person].fields[
+          personStandardFieldIds.company
+        ],
+      viewId: viewId,
+      position: 2,
+      isVisible: true,
+      size: 150,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.person].fields[
+          personStandardFieldIds.phone
+        ],
+      viewId: viewId,
+      position: 3,
+      isVisible: true,
+      size: 150,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.person].fields[
+          baseObjectStandardFieldIds.createdAt
+        ],
+      viewId: viewId,
+      position: 4,
+      isVisible: true,
+      size: 150,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.person].fields[
+          personStandardFieldIds.city
+        ],
+      viewId: viewId,
+      position: 5,
+      isVisible: true,
+      size: 150,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.person].fields[
+          personStandardFieldIds.jobTitle
+        ],
+      viewId: viewId,
+      position: 6,
+      isVisible: true,
+      size: 150,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.person].fields[
+          personStandardFieldIds.linkedinLink
+        ],
+      viewId: viewId,
+      position: 7,
+      isVisible: true,
+      size: 150,
+    },
+    {
+      fieldMetadataId:
+        objectMetadataMap[standardObjectIds.person].fields[
+          personStandardFieldIds.xLink
+        ],
+      viewId: viewId,
+      position: 8,
+      isVisible: true,
+      size: 150,
+    },
+  ];
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view.ts
new file mode 100644
index 000000000000..5c41f81587fe
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view.ts
@@ -0,0 +1,97 @@
+import { EntityManager } from 'typeorm';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { viewCompanyFields } from 'src/engine/workspace-manager/standard-objects-prefill-data/view-company-fields';
+import { viewPersonFields } from 'src/engine/workspace-manager/standard-objects-prefill-data/view-person-fields';
+import { viewOpportunityFields } from 'src/engine/workspace-manager/standard-objects-prefill-data/view-opportunity-fields';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { opportunityStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+
+export const viewPrefillData = async (
+  entityManager: EntityManager,
+  schemaName: string,
+  objectMetadataMap: Record<string, ObjectMetadataEntity>,
+) => {
+  const createdViews = await entityManager
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.view`, [
+      'name',
+      'objectMetadataId',
+      'type',
+      'key',
+      'position',
+      'icon',
+      'kanbanFieldMetadataId',
+    ])
+    .values([
+      {
+        name: 'All Companies',
+        objectMetadataId: objectMetadataMap[standardObjectIds.company].id,
+        type: 'table',
+        key: 'INDEX',
+        position: 0,
+        icon: 'IconBuildingSkyscraper',
+        kanbanFieldMetadataId: '',
+      },
+      {
+        name: 'All People',
+        objectMetadataId: objectMetadataMap[standardObjectIds.person].id,
+        type: 'table',
+        key: 'INDEX',
+        position: 0,
+        icon: 'IconUser',
+        kanbanFieldMetadataId: '',
+      },
+      {
+        name: 'All Opportunities',
+        objectMetadataId: objectMetadataMap[standardObjectIds.opportunity].id,
+        type: 'table',
+        key: 'INDEX',
+        position: 0,
+        icon: 'IconTargetArrow',
+        kanbanFieldMetadataId: '',
+      },
+      {
+        name: 'By Stage',
+        objectMetadataId: objectMetadataMap[standardObjectIds.opportunity].id,
+        type: 'kanban',
+        key: null,
+        position: 1,
+        icon: 'IconLayoutKanban',
+        kanbanFieldMetadataId:
+          objectMetadataMap[standardObjectIds.opportunity].fields[
+            opportunityStandardFieldIds.stage
+          ],
+      },
+    ])
+    .returning('*')
+    .execute();
+
+  const viewIdMap = createdViews.raw.reduce((acc, view) => {
+    acc[view.name] = view.id;
+
+    return acc;
+  }, {});
+
+  await entityManager
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.viewField`, [
+      'fieldMetadataId',
+      'viewId',
+      'position',
+      'isVisible',
+      'size',
+    ])
+    .values([
+      ...viewCompanyFields(viewIdMap['All Companies'], objectMetadataMap),
+      ...viewPersonFields(viewIdMap['All People'], objectMetadataMap),
+      ...viewOpportunityFields(
+        viewIdMap['All Opportunities'],
+        objectMetadataMap,
+      ),
+      ...viewOpportunityFields(viewIdMap['By Stage'], objectMetadataMap),
+    ])
+    .execute();
+};
diff --git a/packages/twenty-server/src/workspace/workspace-cleaner/commands/clean-inactive-workspaces.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/clean-inactive-workspaces.command.ts
similarity index 75%
rename from packages/twenty-server/src/workspace/workspace-cleaner/commands/clean-inactive-workspaces.command.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/clean-inactive-workspaces.command.ts
index 1dc2eea27168..822fd2e94fd1 100644
--- a/packages/twenty-server/src/workspace/workspace-cleaner/commands/clean-inactive-workspaces.command.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/clean-inactive-workspaces.command.ts
@@ -2,9 +2,9 @@ import { Inject } from '@nestjs/common';
 
 import { Command, CommandRunner, Option } from 'nest-commander';
 
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import { CleanInactiveWorkspaceJob } from 'src/workspace/workspace-cleaner/crons/clean-inactive-workspace.job';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { CleanInactiveWorkspaceJob } from 'src/engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.job';
 
 export type CleanInactiveWorkspacesCommandOptions = {
   dryRun: boolean;
diff --git a/packages/twenty-server/src/workspace/workspace-cleaner/commands/delete-incomplete-workspaces.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-incomplete-workspaces.command.ts
similarity index 87%
rename from packages/twenty-server/src/workspace/workspace-cleaner/commands/delete-incomplete-workspaces.command.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-incomplete-workspaces.command.ts
index 1bd74cd30309..372968b1c8a5 100644
--- a/packages/twenty-server/src/workspace/workspace-cleaner/commands/delete-incomplete-workspaces.command.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-incomplete-workspaces.command.ts
@@ -4,10 +4,10 @@ import { Logger } from '@nestjs/common';
 import { Command, CommandRunner, Option } from 'nest-commander';
 import { FindOptionsWhere, In, Repository } from 'typeorm';
 
-import { WorkspaceService } from 'src/core/workspace/services/workspace.service';
-import { Workspace } from 'src/core/workspace/workspace.entity';
+import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { getDryRunLogHeader } from 'src/utils/get-dry-run-log-header';
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 
 type DeleteIncompleteWorkspacesCommandOptions = {
   dryRun?: boolean;
@@ -83,10 +83,7 @@ export class DeleteIncompleteWorkspacesCommand extends CommandRunner {
         } name: '${incompleteWorkspace.displayName}'`,
       );
       if (!options.dryRun) {
-        await this.workspaceService.deleteWorkspace(
-          incompleteWorkspace.id,
-          false,
-        );
+        await this.workspaceService.solfDeleteWorkspace(incompleteWorkspace.id);
       }
     }
   }
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/start-clean-inactive-workspaces.cron.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/start-clean-inactive-workspaces.cron.command.ts
new file mode 100644
index 000000000000..62b7f0fa0e4d
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/start-clean-inactive-workspaces.cron.command.ts
@@ -0,0 +1,29 @@
+import { Inject } from '@nestjs/common';
+
+import { Command, CommandRunner } from 'nest-commander';
+
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { cleanInactiveWorkspaceCronPattern } from 'src/engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.cron.pattern';
+import { CleanInactiveWorkspaceJob } from 'src/engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.job';
+
+@Command({
+  name: 'clean-inactive-workspaces:cron:start',
+  description: 'Starts a cron job to clean inactive workspaces',
+})
+export class StartCleanInactiveWorkspacesCronCommand extends CommandRunner {
+  constructor(
+    @Inject(MessageQueue.cronQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {
+    super();
+  }
+
+  async run(): Promise<void> {
+    await this.messageQueueService.addCron<undefined>(
+      CleanInactiveWorkspaceJob.name,
+      undefined,
+      { retryLimit: 3, repeat: { pattern: cleanInactiveWorkspaceCronPattern } },
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/stop-clean-inactive-workspaces.cron.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/stop-clean-inactive-workspaces.cron.command.ts
new file mode 100644
index 000000000000..1dd6dd85e650
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/stop-clean-inactive-workspaces.cron.command.ts
@@ -0,0 +1,28 @@
+import { Inject } from '@nestjs/common';
+
+import { Command, CommandRunner } from 'nest-commander';
+
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { cleanInactiveWorkspaceCronPattern } from 'src/engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.cron.pattern';
+import { CleanInactiveWorkspaceJob } from 'src/engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.job';
+
+@Command({
+  name: 'clean-inactive-workspaces:cron:stop',
+  description: 'Stops the clean inactive workspaces cron job',
+})
+export class StopCleanInactiveWorkspacesCronCommand extends CommandRunner {
+  constructor(
+    @Inject(MessageQueue.cronQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {
+    super();
+  }
+
+  async run(): Promise<void> {
+    await this.messageQueueService.removeCron(
+      CleanInactiveWorkspaceJob.name,
+      cleanInactiveWorkspaceCronPattern,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-cleaner/crons/clean-inactive-workspace.cron.pattern.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.cron.pattern.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-cleaner/crons/clean-inactive-workspace.cron.pattern.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.cron.pattern.ts
diff --git a/packages/twenty-server/src/workspace/workspace-cleaner/crons/clean-inactive-workspace.job.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.job.ts
similarity index 81%
rename from packages/twenty-server/src/workspace/workspace-cleaner/crons/clean-inactive-workspace.job.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.job.ts
index 026d16c8e32a..952c606f6903 100644
--- a/packages/twenty-server/src/workspace/workspace-cleaner/crons/clean-inactive-workspace.job.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.job.ts
@@ -7,18 +7,18 @@ import {
   DeleteInactiveWorkspaceEmail,
 } from 'twenty-emails';
 
-import { MessageQueueJob } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
 
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { DataSourceEntity } from 'src/metadata/data-source/data-source.entity';
-import { UserService } from 'src/core/user/services/user.service';
-import { EmailService } from 'src/integrations/email/email.service';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-import { CleanInactiveWorkspacesCommandOptions } from 'src/workspace/workspace-cleaner/commands/clean-inactive-workspaces.command';
+import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
+import { EmailService } from 'src/engine/integrations/email/email.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+import { CleanInactiveWorkspacesCommandOptions } from 'src/engine/workspace-manager/workspace-cleaner/commands/clean-inactive-workspaces.command';
 import { getDryRunLogHeader } from 'src/utils/get-dry-run-log-header';
 
 const MILLISECONDS_IN_ONE_DAY = 1000 * 3600 * 24;
@@ -44,10 +44,12 @@ export class CleanInactiveWorkspaceJob
     private readonly emailService: EmailService,
     private readonly environmentService: EnvironmentService,
   ) {
-    this.inactiveDaysBeforeDelete =
-      this.environmentService.getInactiveDaysBeforeDelete();
-    this.inactiveDaysBeforeEmail =
-      this.environmentService.getInactiveDaysBeforeEmail();
+    this.inactiveDaysBeforeDelete = this.environmentService.get(
+      'WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION',
+    );
+    this.inactiveDaysBeforeEmail = this.environmentService.get(
+      'WORKSPACE_INACTIVE_DAYS_BEFORE_NOTIFICATION',
+    );
   }
 
   async getMostRecentUpdatedAt(
@@ -133,8 +135,10 @@ export class CleanInactiveWorkspaceJob
 
       this.emailService.send({
         to: workspaceMember.email,
-        bcc: this.environmentService.getEmailSystemAddress(),
-        from: `${this.environmentService.getEmailFromName()} <${this.environmentService.getEmailFromAddress()}>`,
+        bcc: this.environmentService.get('EMAIL_SYSTEM_ADDRESS'),
+        from: `${this.environmentService.get(
+          'EMAIL_FROM_NAME',
+        )} <${this.environmentService.get('EMAIL_FROM_ADDRESS')}>`,
         subject: 'Action Needed to Prevent Workspace Deletion',
         html,
         text,
@@ -179,8 +183,10 @@ export class CleanInactiveWorkspaceJob
     });
 
     await this.emailService.send({
-      to: this.environmentService.getEmailSystemAddress(),
-      from: `${this.environmentService.getEmailFromName()} <${this.environmentService.getEmailFromAddress()}>`,
+      to: this.environmentService.get('EMAIL_SYSTEM_ADDRESS'),
+      from: `${this.environmentService.get(
+        'EMAIL_FROM_NAME',
+      )} <${this.environmentService.get('EMAIL_FROM_ADDRESS')}>`,
       subject: 'Action Needed to Delete Workspaces',
       html,
       text,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/workspace-cleaner.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/workspace-cleaner.module.ts
new file mode 100644
index 000000000000..6bf7eb0136ad
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/workspace-cleaner.module.ts
@@ -0,0 +1,25 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.module';
+import { DeleteIncompleteWorkspacesCommand } from 'src/engine/workspace-manager/workspace-cleaner/commands/delete-incomplete-workspaces.command';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { CleanInactiveWorkspacesCommand } from 'src/engine/workspace-manager/workspace-cleaner/commands/clean-inactive-workspaces.command';
+import { StartCleanInactiveWorkspacesCronCommand } from 'src/engine/workspace-manager/workspace-cleaner/commands/start-clean-inactive-workspaces.cron.command';
+import { StopCleanInactiveWorkspacesCronCommand } from 'src/engine/workspace-manager/workspace-cleaner/commands/stop-clean-inactive-workspaces.cron.command';
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([Workspace], 'core'),
+    WorkspaceModule,
+    DataSourceModule,
+  ],
+  providers: [
+    DeleteIncompleteWorkspacesCommand,
+    CleanInactiveWorkspacesCommand,
+    StartCleanInactiveWorkspacesCronCommand,
+    StopCleanInactiveWorkspacesCronCommand,
+  ],
+})
+export class WorkspaceCleanerModule {}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-health/commands/workspace-health-command.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/commands/workspace-health-command.module.ts
new file mode 100644
index 000000000000..06bb4cb45b51
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/commands/workspace-health-command.module.ts
@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+
+import { WorkspaceHealthCommand } from 'src/engine/workspace-manager/workspace-health/commands/workspace-health.command';
+import { WorkspaceHealthModule } from 'src/engine/workspace-manager/workspace-health/workspace-health.module';
+
+@Module({
+  imports: [WorkspaceHealthModule],
+  providers: [WorkspaceHealthCommand],
+})
+export class WorkspaceHealthCommandModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-health/commands/workspace-health.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/commands/workspace-health.command.ts
similarity index 88%
rename from packages/twenty-server/src/workspace/workspace-health/commands/workspace-health.command.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-health/commands/workspace-health.command.ts
index bbfe1d6e6455..a54366e6bdab 100644
--- a/packages/twenty-server/src/workspace/workspace-health/commands/workspace-health.command.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/commands/workspace-health.command.ts
@@ -3,11 +3,11 @@ import { Logger } from '@nestjs/common';
 import { Command, CommandRunner, Option } from 'nest-commander';
 import chalk from 'chalk';
 
-import { WorkspaceHealthMode } from 'src/workspace/workspace-health/interfaces/workspace-health-options.interface';
-import { WorkspaceHealthFixKind } from 'src/workspace/workspace-health/interfaces/workspace-health-fix-kind.interface';
+import { WorkspaceHealthMode } from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-options.interface';
+import { WorkspaceHealthFixKind } from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-fix-kind.interface';
 
-import { WorkspaceHealthService } from 'src/workspace/workspace-health/workspace-health.service';
-import { CommandLogger } from 'src/commands/command-logger';
+import { WorkspaceHealthService } from 'src/engine/workspace-manager/workspace-health/workspace-health.service';
+import { CommandLogger } from 'src/command/command-logger';
 
 interface WorkspaceHealthCommandOptions {
   workspaceId: string;
diff --git a/packages/twenty-server/src/workspace/workspace-health/fixer/abstract-workspace.fixer.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/abstract-workspace.fixer.ts
similarity index 84%
rename from packages/twenty-server/src/workspace/workspace-health/fixer/abstract-workspace.fixer.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/abstract-workspace.fixer.ts
index 4434317a5c00..73af458d766c 100644
--- a/packages/twenty-server/src/workspace/workspace-health/fixer/abstract-workspace.fixer.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/abstract-workspace.fixer.ts
@@ -4,10 +4,10 @@ import {
   WorkspaceHealthIssue,
   WorkspaceHealthIssueType,
   WorkspaceIssueTypeToInterface,
-} from 'src/workspace/workspace-health/interfaces/workspace-health-issue.interface';
+} from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-issue.interface';
 
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { WorkspaceMigrationEntity } from 'src/metadata/workspace-migration/workspace-migration.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
 
 export class CompareEntity<T> {
   current: T | null;
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/index.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/index.ts
new file mode 100644
index 000000000000..ad32c60fc3de
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/index.ts
@@ -0,0 +1,12 @@
+import { WorkspaceMissingColumnFixer } from 'src/engine/workspace-manager/workspace-health/fixer/workspace-missing-column.fixer';
+
+import { WorkspaceNullableFixer } from './workspace-nullable.fixer';
+import { WorkspaceDefaultValueFixer } from './workspace-default-value.fixer';
+import { WorkspaceTypeFixer } from './workspace-type.fixer';
+
+export const workspaceFixers = [
+  WorkspaceNullableFixer,
+  WorkspaceDefaultValueFixer,
+  WorkspaceTypeFixer,
+  WorkspaceMissingColumnFixer,
+];
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/workspace-default-value.fixer.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/workspace-default-value.fixer.ts
new file mode 100644
index 000000000000..9478de8c695c
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/workspace-default-value.fixer.ts
@@ -0,0 +1,227 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import {
+  WorkspaceHealthColumnIssue,
+  WorkspaceHealthIssueType,
+} from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-issue.interface';
+import { WorkspaceMigrationBuilderAction } from 'src/engine/workspace-manager/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
+import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { WorkspaceMigrationFieldFactory } from 'src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-field.factory';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  FieldMetadataDefaultValueFunctionNames,
+  fieldMetadataDefaultValueFunctionName,
+} from 'src/engine/metadata-modules/field-metadata/dtos/default-value.input';
+
+import {
+  AbstractWorkspaceFixer,
+  CompareEntity,
+} from './abstract-workspace.fixer';
+
+type WorkspaceDefaultValueFixerType =
+  | WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_CONFLICT
+  | WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_NOT_VALID;
+
+@Injectable()
+export class WorkspaceDefaultValueFixer extends AbstractWorkspaceFixer<WorkspaceDefaultValueFixerType> {
+  constructor(
+    private readonly workspaceMigrationFieldFactory: WorkspaceMigrationFieldFactory,
+  ) {
+    super(
+      WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_CONFLICT,
+      WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_NOT_VALID,
+    );
+  }
+
+  async createWorkspaceMigrations(
+    manager: EntityManager,
+    objectMetadataCollection: ObjectMetadataEntity[],
+    issues: WorkspaceHealthColumnIssue<WorkspaceDefaultValueFixerType>[],
+  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
+    if (issues.length <= 0) {
+      return [];
+    }
+    const splittedIssues = this.splitIssuesByType(issues);
+    const issueNeedingMigration =
+      splittedIssues[WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_CONFLICT] ??
+      [];
+
+    return this.fixColumnDefaultValueConflictIssues(
+      objectMetadataCollection,
+      issueNeedingMigration as WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_CONFLICT>[],
+    );
+  }
+
+  async createMetadataUpdates(
+    manager: EntityManager,
+    objectMetadataCollection: ObjectMetadataEntity[],
+    issues: WorkspaceHealthColumnIssue<WorkspaceDefaultValueFixerType>[],
+  ): Promise<CompareEntity<FieldMetadataEntity>[]> {
+    if (issues.length <= 0) {
+      return [];
+    }
+
+    const splittedIssues = this.splitIssuesByType(issues);
+    const issueNeedingMetadataUpdate =
+      splittedIssues[WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_NOT_VALID] ??
+      [];
+
+    return this.fixColumnDefaultValueNotValidIssues(
+      manager,
+      issueNeedingMetadataUpdate as WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_NOT_VALID>[],
+    );
+  }
+
+  private async fixColumnDefaultValueConflictIssues(
+    objectMetadataCollection: ObjectMetadataEntity[],
+    issues: WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_CONFLICT>[],
+  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
+    const fieldMetadataUpdateCollection = issues.map((issue) => {
+      const oldDefaultValue =
+        this.computeFieldMetadataDefaultValueFromColumnDefault(
+          issue.columnStructure?.columnDefault,
+        );
+
+      return {
+        current: {
+          ...issue.fieldMetadata,
+          defaultValue: oldDefaultValue,
+        },
+        altered: issue.fieldMetadata,
+      };
+    });
+
+    return this.workspaceMigrationFieldFactory.create(
+      objectMetadataCollection,
+      fieldMetadataUpdateCollection,
+      WorkspaceMigrationBuilderAction.UPDATE,
+    );
+  }
+
+  private async fixColumnDefaultValueNotValidIssues(
+    manager: EntityManager,
+    issues: WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_NOT_VALID>[],
+  ): Promise<CompareEntity<FieldMetadataEntity>[]> {
+    const fieldMetadataRepository = manager.getRepository(FieldMetadataEntity);
+    const updatedEntities: CompareEntity<FieldMetadataEntity>[] = [];
+
+    for (const issue of issues) {
+      const currentDefaultValue:
+        | FieldMetadataDefaultValue<'default'>
+        // Old format for default values
+        // TODO: Remove this after all workspaces are migrated
+        | { type: FieldMetadataDefaultValueFunctionNames }
+        | null = issue.fieldMetadata.defaultValue;
+      let alteredDefaultValue: FieldMetadataDefaultValue<'default'> | null =
+        null;
+
+      // Check if it's an old function default value
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
+      if (currentDefaultValue && 'type' in currentDefaultValue) {
+        alteredDefaultValue =
+          currentDefaultValue.type as FieldMetadataDefaultValueFunctionNames;
+      }
+
+      // Check if it's an old string default value
+      if (currentDefaultValue) {
+        for (const key of Object.keys(currentDefaultValue)) {
+          if (key === 'type') {
+            continue;
+          }
+
+          const value = currentDefaultValue[key];
+
+          const newValue =
+            typeof value === 'string' &&
+            !value.startsWith("'") &&
+            !Object.values(fieldMetadataDefaultValueFunctionName).includes(
+              value as FieldMetadataDefaultValueFunctionNames,
+            )
+              ? `'${value}'`
+              : value;
+
+          alteredDefaultValue = {
+            ...(currentDefaultValue as any),
+            ...(alteredDefaultValue as any),
+            [key]: newValue,
+          };
+        }
+      }
+
+      // Old formart default values
+      if (
+        alteredDefaultValue &&
+        typeof alteredDefaultValue === 'object' &&
+        'value' in alteredDefaultValue
+      ) {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-expect-error
+        alteredDefaultValue = alteredDefaultValue.value;
+      }
+
+      if (alteredDefaultValue === null) {
+        continue;
+      }
+
+      await fieldMetadataRepository.update(issue.fieldMetadata.id, {
+        defaultValue: alteredDefaultValue,
+      });
+      const alteredEntity = await fieldMetadataRepository.findOne({
+        where: {
+          id: issue.fieldMetadata.id,
+        },
+      });
+
+      updatedEntities.push({
+        current: issue.fieldMetadata,
+        altered: alteredEntity as FieldMetadataEntity | null,
+      });
+    }
+
+    return updatedEntities;
+  }
+
+  private computeFieldMetadataDefaultValueFromColumnDefault(
+    columnDefault: string | undefined,
+  ): FieldMetadataDefaultValue<'default'> {
+    if (
+      columnDefault === undefined ||
+      columnDefault === null ||
+      columnDefault === 'NULL'
+    ) {
+      return null;
+    }
+
+    if (!isNaN(Number(columnDefault))) {
+      return +columnDefault;
+    }
+
+    if (columnDefault === 'true') {
+      return true;
+    }
+
+    if (columnDefault === 'false') {
+      return false;
+    }
+
+    if (columnDefault === '') {
+      return "''";
+    }
+
+    if (columnDefault === 'now()') {
+      return 'now';
+    }
+
+    if (columnDefault.startsWith('public.uuid_generate_v4')) {
+      return 'uuid';
+    }
+
+    return columnDefault;
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/workspace-missing-column.fixer.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/workspace-missing-column.fixer.ts
new file mode 100644
index 000000000000..072475f32c99
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/workspace-missing-column.fixer.ts
@@ -0,0 +1,82 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import {
+  WorkspaceHealthColumnIssue,
+  WorkspaceHealthIssueType,
+} from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-issue.interface';
+import { WorkspaceMigrationBuilderAction } from 'src/engine/workspace-manager/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import {
+  FieldMetadataUpdate,
+  WorkspaceMigrationFieldFactory,
+} from 'src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-field.factory';
+
+import { AbstractWorkspaceFixer } from './abstract-workspace.fixer';
+
+@Injectable()
+export class WorkspaceMissingColumnFixer extends AbstractWorkspaceFixer<WorkspaceHealthIssueType.MISSING_COLUMN> {
+  constructor(
+    private readonly workspaceMigrationFieldFactory: WorkspaceMigrationFieldFactory,
+  ) {
+    super(WorkspaceHealthIssueType.MISSING_COLUMN);
+  }
+
+  async createWorkspaceMigrations(
+    manager: EntityManager,
+    objectMetadataCollection: ObjectMetadataEntity[],
+    issues: WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.MISSING_COLUMN>[],
+  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
+    if (issues.length <= 0) {
+      return [];
+    }
+
+    return this.fixMissingColumnIssues(objectMetadataCollection, issues);
+  }
+
+  private async fixMissingColumnIssues(
+    objectMetadataCollection: ObjectMetadataEntity[],
+    issues: WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.MISSING_COLUMN>[],
+  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
+    const fieldMetadataUpdateCollection: FieldMetadataUpdate[] = [];
+
+    for (const issue of issues) {
+      if (!issue.columnStructures) {
+        continue;
+      }
+
+      /**
+       * Check if the column is prefixed with an underscore as it was the old convention
+       */
+      const oldColumnName = `_${issue.fieldMetadata.name}`;
+      const oldColumnStructure = issue.columnStructures.find(
+        (columnStructure) => columnStructure.columnName === oldColumnName,
+      );
+
+      if (!oldColumnStructure) {
+        continue;
+      }
+
+      fieldMetadataUpdateCollection.push({
+        current: {
+          ...issue.fieldMetadata,
+          name: oldColumnName,
+        },
+        altered: issue.fieldMetadata,
+      });
+    }
+
+    if (fieldMetadataUpdateCollection.length <= 0) {
+      return [];
+    }
+
+    return this.workspaceMigrationFieldFactory.create(
+      objectMetadataCollection,
+      fieldMetadataUpdateCollection,
+      WorkspaceMigrationBuilderAction.UPDATE,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/workspace-nullable.fixer.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/workspace-nullable.fixer.ts
new file mode 100644
index 000000000000..639acba87fae
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/workspace-nullable.fixer.ts
@@ -0,0 +1,57 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import {
+  WorkspaceHealthColumnIssue,
+  WorkspaceHealthIssueType,
+} from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-issue.interface';
+import { WorkspaceMigrationBuilderAction } from 'src/engine/workspace-manager/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { WorkspaceMigrationFieldFactory } from 'src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-field.factory';
+
+import { AbstractWorkspaceFixer } from './abstract-workspace.fixer';
+
+@Injectable()
+export class WorkspaceNullableFixer extends AbstractWorkspaceFixer<WorkspaceHealthIssueType.COLUMN_NULLABILITY_CONFLICT> {
+  constructor(
+    private readonly workspaceMigrationFieldFactory: WorkspaceMigrationFieldFactory,
+  ) {
+    super(WorkspaceHealthIssueType.COLUMN_NULLABILITY_CONFLICT);
+  }
+
+  async createWorkspaceMigrations(
+    manager: EntityManager,
+    objectMetadataCollection: ObjectMetadataEntity[],
+    issues: WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.COLUMN_NULLABILITY_CONFLICT>[],
+  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
+    if (issues.length <= 0) {
+      return [];
+    }
+
+    return this.fixColumnNullabilityIssues(objectMetadataCollection, issues);
+  }
+
+  private async fixColumnNullabilityIssues(
+    objectMetadataCollection: ObjectMetadataEntity[],
+    issues: WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.COLUMN_NULLABILITY_CONFLICT>[],
+  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
+    const fieldMetadataUpdateCollection = issues.map((issue) => {
+      return {
+        current: {
+          ...issue.fieldMetadata,
+          isNullable: issue.columnStructure?.isNullable ?? false,
+        },
+        altered: issue.fieldMetadata,
+      };
+    });
+
+    return this.workspaceMigrationFieldFactory.create(
+      objectMetadataCollection,
+      fieldMetadataUpdateCollection,
+      WorkspaceMigrationBuilderAction.UPDATE,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-health/fixer/workspace-type.fixer.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/workspace-type.fixer.ts
similarity index 77%
rename from packages/twenty-server/src/workspace/workspace-health/fixer/workspace-type.fixer.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/workspace-type.fixer.ts
index 4125c9477f2f..280cb66133b4 100644
--- a/packages/twenty-server/src/workspace/workspace-health/fixer/workspace-type.fixer.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/fixer/workspace-type.fixer.ts
@@ -5,16 +5,16 @@ import { EntityManager } from 'typeorm';
 import {
   WorkspaceHealthColumnIssue,
   WorkspaceHealthIssueType,
-} from 'src/workspace/workspace-health/interfaces/workspace-health-issue.interface';
-import { WorkspaceMigrationBuilderAction } from 'src/workspace/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
+} from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-issue.interface';
+import { WorkspaceMigrationBuilderAction } from 'src/engine/workspace-manager/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
 
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { WorkspaceMigrationEntity } from 'src/metadata/workspace-migration/workspace-migration.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
 import {
   FieldMetadataUpdate,
   WorkspaceMigrationFieldFactory,
-} from 'src/workspace/workspace-migration-builder/factories/workspace-migration-field.factory';
-import { DatabaseStructureService } from 'src/workspace/workspace-health/services/database-structure.service';
+} from 'src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-field.factory';
+import { DatabaseStructureService } from 'src/engine/workspace-manager/workspace-health/services/database-structure.service';
 
 import { AbstractWorkspaceFixer } from './abstract-workspace.fixer';
 
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-health/interfaces/workspace-health-fix-kind.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/interfaces/workspace-health-fix-kind.interface.ts
new file mode 100644
index 000000000000..907c02f2eed8
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/interfaces/workspace-health-fix-kind.interface.ts
@@ -0,0 +1,6 @@
+export enum WorkspaceHealthFixKind {
+  Nullable = 'nullable',
+  Type = 'type',
+  DefaultValue = 'default-value',
+  MissingColumn = 'missing-column',
+}
diff --git a/packages/twenty-server/src/workspace/workspace-health/interfaces/workspace-health-issue.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/interfaces/workspace-health-issue.interface.ts
similarity index 86%
rename from packages/twenty-server/src/workspace/workspace-health/interfaces/workspace-health-issue.interface.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-health/interfaces/workspace-health-issue.interface.ts
index f4e432e70e62..c399ec30d0de 100644
--- a/packages/twenty-server/src/workspace/workspace-health/interfaces/workspace-health-issue.interface.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/interfaces/workspace-health-issue.interface.ts
@@ -1,8 +1,8 @@
-import { WorkspaceTableStructure } from 'src/workspace/workspace-health/interfaces/workspace-table-definition.interface';
+import { WorkspaceTableStructure } from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-table-definition.interface';
 
-import { FieldMetadataEntity } from 'src/metadata/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { RelationMetadataEntity } from 'src/metadata/relation-metadata/relation-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 
 export enum WorkspaceHealthIssueType {
   MISSING_TABLE = 'MISSING_TABLE',
@@ -15,8 +15,7 @@ export enum WorkspaceHealthIssueType {
   MISSING_FOREIGN_KEY = 'MISSING_FOREIGN_KEY',
   MISSING_COMPOSITE_TYPE = 'MISSING_COMPOSITE_TYPE',
   COLUMN_NAME_SHOULD_NOT_BE_PREFIXED = 'COLUMN_NAME_SHOULD_NOT_BE_PREFIXED',
-  COLUMN_TARGET_COLUMN_MAP_NOT_VALID = 'COLUMN_TARGET_COLUMN_MAP_NOT_VALID',
-  COLUMN_NAME_SHOULD_BE_CUSTOM = 'COLUMN_NAME_SHOULD_BE_CUSTOM',
+  COLUMN_NAME_SHOULD_NOT_BE_CUSTOM = 'COLUMN_NAME_SHOULD_NOT_BE_CUSTOM',
   COLUMN_OBJECT_REFERENCE_INVALID = 'COLUMN_OBJECT_REFERENCE_INVALID',
   COLUMN_NAME_NOT_VALID = 'COLUMN_NAME_NOT_VALID',
   COLUMN_TYPE_NOT_VALID = 'COLUMN_TYPE_NOT_VALID',
@@ -58,8 +57,7 @@ export type WorkspaceColumnIssueTypes =
   | WorkspaceHealthIssueType.MISSING_FOREIGN_KEY
   | WorkspaceHealthIssueType.MISSING_COMPOSITE_TYPE
   | WorkspaceHealthIssueType.COLUMN_NAME_SHOULD_NOT_BE_PREFIXED
-  | WorkspaceHealthIssueType.COLUMN_TARGET_COLUMN_MAP_NOT_VALID
-  | WorkspaceHealthIssueType.COLUMN_NAME_SHOULD_BE_CUSTOM
+  | WorkspaceHealthIssueType.COLUMN_NAME_SHOULD_NOT_BE_CUSTOM
   | WorkspaceHealthIssueType.COLUMN_OBJECT_REFERENCE_INVALID
   | WorkspaceHealthIssueType.COLUMN_NAME_NOT_VALID
   | WorkspaceHealthIssueType.COLUMN_TYPE_NOT_VALID
@@ -75,6 +73,7 @@ export interface WorkspaceHealthColumnIssue<
   type: T;
   fieldMetadata: FieldMetadataEntity;
   columnStructure?: WorkspaceTableStructure;
+  columnStructures?: WorkspaceTableStructure[];
   message: string;
 }
 
diff --git a/packages/twenty-server/src/workspace/workspace-health/interfaces/workspace-health-options.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/interfaces/workspace-health-options.interface.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-health/interfaces/workspace-health-options.interface.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-health/interfaces/workspace-health-options.interface.ts
diff --git a/packages/twenty-server/src/workspace/workspace-health/interfaces/workspace-table-definition.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/interfaces/workspace-table-definition.interface.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-health/interfaces/workspace-table-definition.interface.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-health/interfaces/workspace-table-definition.interface.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/database-structure.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/database-structure.service.ts
new file mode 100644
index 000000000000..a3752aba7b92
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/database-structure.service.ts
@@ -0,0 +1,321 @@
+import { Injectable } from '@nestjs/common';
+
+import { ColumnType } from 'typeorm';
+import { ColumnMetadata } from 'typeorm/metadata/ColumnMetadata';
+
+import {
+  WorkspaceTableStructure,
+  WorkspaceTableStructureResult,
+} from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-table-definition.interface';
+import {
+  FieldMetadataDefaultValue,
+  FieldMetadataFunctionDefaultValue,
+} from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
+
+import { TypeORMService } from 'src/database/typeorm/typeorm.service';
+import {
+  FieldMetadataEntity,
+  FieldMetadataType,
+} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { fieldMetadataTypeToColumnType } from 'src/engine/metadata-modules/workspace-migration/utils/field-metadata-type-to-column-type.util';
+import { serializeFunctionDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/serialize-function-default-value.util';
+import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
+import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
+import { isFunctionDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/is-function-default-value.util';
+import { FieldMetadataDefaultValueFunctionNames } from 'src/engine/metadata-modules/field-metadata/dtos/default-value.input';
+import { compositeTypeDefintions } from 'src/engine/metadata-modules/field-metadata/composite-types';
+
+@Injectable()
+export class DatabaseStructureService {
+  constructor(private readonly typeORMService: TypeORMService) {}
+
+  async getWorkspaceTableColumns(
+    schemaName: string,
+    tableName: string,
+  ): Promise<WorkspaceTableStructure[]> {
+    const mainDataSource = this.typeORMService.getMainDataSource();
+    const results = await mainDataSource.query<
+      WorkspaceTableStructureResult[]
+    >(`
+      WITH foreign_keys AS (
+        SELECT
+          kcu.table_schema AS schema_name,
+          kcu.table_name AS table_name,
+          kcu.column_name AS column_name,
+          tc.constraint_name AS constraint_name
+        FROM
+          information_schema.key_column_usage AS kcu
+        JOIN
+          information_schema.table_constraints AS tc
+          ON tc.constraint_name = kcu.constraint_name
+          AND tc.table_schema = kcu.table_schema
+        WHERE
+          tc.constraint_type = 'FOREIGN KEY'
+          AND tc.table_schema = '${schemaName}'
+          AND tc.table_name = '${tableName}'
+        ),
+        unique_constraints AS (
+          SELECT
+            tc.table_schema AS schema_name,
+            tc.table_name AS table_name,
+            kcu.column_name AS column_name
+          FROM
+            information_schema.key_column_usage AS kcu
+          JOIN
+            information_schema.table_constraints AS tc
+            ON tc.constraint_name = kcu.constraint_name
+            AND tc.table_schema = kcu.table_schema
+          WHERE
+            tc.constraint_type = 'UNIQUE'
+            AND tc.table_schema = '${schemaName}'
+            AND tc.table_name = '${tableName}'
+        )
+        SELECT
+          c.table_schema AS "tableSchema",
+          c.table_name AS "tableName",
+          c.column_name AS "columnName",
+          CASE 
+            WHEN (c.data_type = 'USER-DEFINED') THEN c.udt_name 
+            ELSE data_type
+          END AS "dataType",
+          c.is_nullable AS "isNullable",
+          c.column_default AS "columnDefault",
+          CASE
+            WHEN pk.constraint_type = 'PRIMARY KEY' THEN 'TRUE'
+            ELSE 'FALSE'
+          END AS "isPrimaryKey",
+          CASE
+            WHEN fk.constraint_name IS NOT NULL THEN 'TRUE'
+            ELSE 'FALSE'
+          END AS "isForeignKey",
+          CASE
+            WHEN uc.column_name IS NOT NULL THEN 'TRUE'
+            ELSE 'FALSE'
+          END AS "isUnique",
+          rc.update_rule AS "onUpdateAction",
+          rc.delete_rule AS "onDeleteAction"
+        FROM
+          information_schema.columns AS c
+        LEFT JOIN
+          information_schema.constraint_column_usage AS ccu
+          ON c.column_name = ccu.column_name
+          AND c.table_name = ccu.table_name
+          AND c.table_schema = ccu.table_schema
+        LEFT JOIN
+          information_schema.table_constraints AS pk
+          ON pk.constraint_name = ccu.constraint_name
+          AND pk.constraint_type = 'PRIMARY KEY'
+          AND pk.table_name = c.table_name
+          AND pk.table_schema = c.table_schema
+        LEFT JOIN
+          foreign_keys AS fk
+          ON c.table_schema = fk.schema_name
+          AND c.table_name = fk.table_name
+          AND c.column_name = fk.column_name
+        LEFT JOIN
+          unique_constraints AS uc
+          ON c.table_schema = uc.schema_name
+          AND c.table_name = uc.table_name
+          AND c.column_name = uc.column_name
+        LEFT JOIN
+          information_schema.referential_constraints AS rc
+          ON rc.constraint_name = fk.constraint_name
+          AND rc.constraint_schema = '${schemaName}'
+        WHERE
+          c.table_schema = '${schemaName}'
+          AND c.table_name = '${tableName}';
+    `);
+
+    if (!results || results.length === 0) {
+      return [];
+    }
+
+    return results.map((item) => ({
+      ...item,
+      isNullable: item.isNullable === 'YES',
+      isPrimaryKey: item.isPrimaryKey === 'TRUE',
+      isForeignKey: item.isForeignKey === 'TRUE',
+      isUnique: item.isUnique === 'TRUE',
+    }));
+  }
+
+  async workspaceColumnExist(
+    schemaName: string,
+    tableName: string,
+    columnName: string,
+  ): Promise<boolean> {
+    const mainDataSource = this.typeORMService.getMainDataSource();
+    const results = await mainDataSource.query(
+      `SELECT column_name
+        FROM information_schema.columns
+        WHERE table_schema = $1
+        AND table_name = $2
+        AND column_name = $3`,
+      [schemaName, tableName, columnName],
+    );
+
+    return results.length >= 1;
+  }
+
+  getPostgresDataTypes(fieldMetadata: FieldMetadataEntity): string[] {
+    const mainDataSource = this.typeORMService.getMainDataSource();
+
+    const normalizer = (type: FieldMetadataType, columnName: string) => {
+      const typeORMType = fieldMetadataTypeToColumnType(type);
+
+      // Compute enum name to compare data type properly
+      if (typeORMType === 'enum') {
+        const objectName = fieldMetadata.object?.nameSingular;
+        const prefix = fieldMetadata.isCustom ? '_' : '';
+
+        return `${objectName}_${prefix}${columnName}_enum`;
+      }
+
+      return mainDataSource.driver.normalizeType({
+        type: typeORMType,
+      });
+    };
+
+    if (isCompositeFieldMetadataType(fieldMetadata.type)) {
+      const compositeType = compositeTypeDefintions.get(fieldMetadata.type);
+
+      if (!compositeType) {
+        throw new Error(
+          `Composite type definition not found for ${fieldMetadata.type}`,
+        );
+      }
+
+      return compositeType.properties.map((compositeProperty) =>
+        normalizer(compositeProperty.type, compositeProperty.name),
+      );
+    }
+
+    return [normalizer(fieldMetadata.type, fieldMetadata.name)];
+  }
+
+  getFieldMetadataTypeFromPostgresDataType(
+    postgresDataType: string,
+  ): FieldMetadataType | null {
+    const mainDataSource = this.typeORMService.getMainDataSource();
+    const types = Object.values(FieldMetadataType).filter((type) => {
+      // We're skipping composite and relation types, as they're not directly mapped to a column type
+      if (isCompositeFieldMetadataType(type)) {
+        return false;
+      }
+
+      if (isRelationFieldMetadataType(type)) {
+        return false;
+      }
+
+      return true;
+    });
+
+    for (const type of types) {
+      const typeORMType = fieldMetadataTypeToColumnType(
+        FieldMetadataType[type],
+      ) as ColumnType;
+      const dataType = mainDataSource.driver.normalizeType({
+        type: typeORMType,
+      });
+
+      if (postgresDataType === dataType) {
+        return FieldMetadataType[type];
+      }
+    }
+
+    return null;
+  }
+
+  getPostgresDefaults(
+    fieldMetadataType: FieldMetadataType,
+    initialDefaultValue:
+      | FieldMetadataDefaultValue
+      // Old format for default values
+      // TODO: Should be removed once all default values are migrated
+      | { type: FieldMetadataDefaultValueFunctionNames }
+      | null,
+  ): (string | null | undefined)[] {
+    const normalizer = (
+      type: FieldMetadataType,
+      defaultValue:
+        | FieldMetadataDefaultValue
+        | { type: FieldMetadataDefaultValueFunctionNames }
+        | null,
+    ) => {
+      const typeORMType = fieldMetadataTypeToColumnType(type) as ColumnType;
+      const mainDataSource = this.typeORMService.getMainDataSource();
+
+      let value: any =
+        // Old formart default values
+        defaultValue &&
+        typeof defaultValue === 'object' &&
+        'value' in defaultValue
+          ? defaultValue.value
+          : defaultValue;
+
+      // Old format for default values
+      // TODO: Should be removed once all default values are migrated
+      if (
+        defaultValue &&
+        typeof defaultValue === 'object' &&
+        'type' in defaultValue
+      ) {
+        return this.computeFunctionDefaultValue(defaultValue.type);
+      }
+
+      if (isFunctionDefaultValue(value)) {
+        return this.computeFunctionDefaultValue(value);
+      }
+
+      if (typeof value === 'number') {
+        return value.toString();
+      }
+
+      // Remove leading and trailing single quotes for string default values as it's already handled by TypeORM
+      if (typeof value === 'string' && value.match(/^'.*'$/)) {
+        value = value.replace(/^'/, '').replace(/'$/, '');
+      }
+
+      return mainDataSource.driver.normalizeDefault({
+        type: typeORMType,
+        default: value,
+        isArray: false,
+        // Workaround to use normalizeDefault without a complete ColumnMetadata object
+      } as ColumnMetadata);
+    };
+
+    if (isCompositeFieldMetadataType(fieldMetadataType)) {
+      const compositeType = compositeTypeDefintions.get(fieldMetadataType);
+
+      if (!compositeType) {
+        throw new Error(
+          `Composite type definition not found for ${fieldMetadataType}`,
+        );
+      }
+
+      return compositeType.properties.map((compositeProperty) =>
+        normalizer(
+          compositeProperty.type,
+          typeof initialDefaultValue === 'object'
+            ? initialDefaultValue?.[compositeProperty.name]
+            : null,
+        ),
+      );
+    }
+
+    return [normalizer(fieldMetadataType, initialDefaultValue)];
+  }
+
+  private computeFunctionDefaultValue(
+    value: FieldMetadataFunctionDefaultValue,
+  ) {
+    const serializedDefaultValue = serializeFunctionDefaultValue(value);
+
+    // Special case for uuid_generate_v4() default value
+    if (serializedDefaultValue === 'public.uuid_generate_v4()') {
+      return 'uuid_generate_v4()';
+    }
+
+    return serializedDefaultValue;
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/field-metadata-health.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/field-metadata-health.service.ts
new file mode 100644
index 000000000000..ea33fe2b1a2e
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/field-metadata-health.service.ts
@@ -0,0 +1,309 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  WorkspaceHealthIssue,
+  WorkspaceHealthIssueType,
+} from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-issue.interface';
+import { WorkspaceTableStructure } from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-table-definition.interface';
+import { WorkspaceHealthOptions } from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-options.interface';
+import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
+
+import {
+  FieldMetadataEntity,
+  FieldMetadataType,
+} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
+import { DatabaseStructureService } from 'src/engine/workspace-manager/workspace-health/services/database-structure.service';
+import { validName } from 'src/engine/workspace-manager/workspace-health/utils/valid-name.util';
+import { validateDefaultValueForType } from 'src/engine/metadata-modules/field-metadata/utils/validate-default-value-for-type.util';
+import {
+  EnumFieldMetadataUnionType,
+  isEnumFieldMetadataType,
+} from 'src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util';
+import { validateOptionsForType } from 'src/engine/metadata-modules/field-metadata/utils/validate-options-for-type.util';
+import { serializeDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/serialize-default-value';
+import { customNamePrefix } from 'src/engine/utils/compute-table-name.util';
+import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
+import { compositeTypeDefintions } from 'src/engine/metadata-modules/field-metadata/composite-types';
+import {
+  computeColumnName,
+  computeCompositeColumnName,
+} from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
+
+@Injectable()
+export class FieldMetadataHealthService {
+  constructor(
+    private readonly databaseStructureService: DatabaseStructureService,
+  ) {}
+
+  async healthCheck(
+    tableName: string,
+    workspaceTableColumns: WorkspaceTableStructure[],
+    fieldMetadataCollection: FieldMetadataEntity[],
+    options: WorkspaceHealthOptions,
+  ): Promise<WorkspaceHealthIssue[]> {
+    const issues: WorkspaceHealthIssue[] = [];
+
+    for (const fieldMetadata of fieldMetadataCollection) {
+      // Relation metadata are checked in another service
+      if (isRelationFieldMetadataType(fieldMetadata.type)) {
+        continue;
+      }
+
+      const fieldIssues = await this.healthCheckField(
+        tableName,
+        workspaceTableColumns,
+        fieldMetadata,
+        options,
+      );
+
+      issues.push(...fieldIssues);
+    }
+
+    return issues;
+  }
+
+  private async healthCheckField(
+    tableName: string,
+    workspaceTableColumns: WorkspaceTableStructure[],
+    fieldMetadata: FieldMetadataEntity,
+    options: WorkspaceHealthOptions,
+  ): Promise<WorkspaceHealthIssue[]> {
+    const issues: WorkspaceHealthIssue[] = [];
+
+    if (options.mode === 'structure' || options.mode === 'all') {
+      const structureIssues = this.structureFieldCheck(
+        tableName,
+        workspaceTableColumns,
+        fieldMetadata,
+      );
+
+      issues.push(...structureIssues);
+    }
+
+    if (options.mode === 'metadata' || options.mode === 'all') {
+      const metadataIssues = this.metadataFieldCheck(tableName, fieldMetadata);
+
+      issues.push(...metadataIssues);
+    }
+
+    return issues;
+  }
+
+  private structureFieldCheck(
+    tableName: string,
+    workspaceTableColumns: WorkspaceTableStructure[],
+    fieldMetadata: FieldMetadataEntity,
+  ): WorkspaceHealthIssue[] {
+    const dataTypes =
+      this.databaseStructureService.getPostgresDataTypes(fieldMetadata);
+    const issues: WorkspaceHealthIssue[] = [];
+    let columnNames: string[] = [];
+
+    if (isCompositeFieldMetadataType(fieldMetadata.type)) {
+      const compositeType = compositeTypeDefintions.get(fieldMetadata.type);
+
+      if (!compositeType) {
+        throw new Error(`Composite type ${fieldMetadata.type} is not defined`);
+      }
+
+      columnNames = compositeType.properties.map((compositeProperty) =>
+        computeCompositeColumnName(fieldMetadata, compositeProperty),
+      );
+    } else {
+      columnNames = [computeColumnName(fieldMetadata)];
+    }
+
+    const defaultValues = this.databaseStructureService.getPostgresDefaults(
+      fieldMetadata.type,
+      fieldMetadata.defaultValue,
+    );
+
+    // Check if column exist in database
+    const columnStructureMap = workspaceTableColumns.reduce(
+      (acc, workspaceTableColumn) => {
+        const columnName = workspaceTableColumn.columnName;
+
+        if (columnNames.includes(columnName)) {
+          acc[columnName] = workspaceTableColumn;
+        }
+
+        return acc;
+      },
+      {} as { [key: string]: WorkspaceTableStructure },
+    );
+
+    for (const [index, columnName] of columnNames.entries()) {
+      const columnStructure = columnStructureMap[columnName];
+
+      if (!columnStructure) {
+        issues.push({
+          type: WorkspaceHealthIssueType.MISSING_COLUMN,
+          fieldMetadata,
+          columnStructures: workspaceTableColumns,
+          message: `Column ${columnName} not found in table ${tableName}`,
+        });
+
+        continue;
+      }
+
+      const columnDefaultValue =
+        columnStructure.columnDefault?.split('::')?.[0];
+
+      // Check if column data type is the same
+      if (!dataTypes[index] || columnStructure.dataType !== dataTypes[index]) {
+        issues.push({
+          type: WorkspaceHealthIssueType.COLUMN_DATA_TYPE_CONFLICT,
+          fieldMetadata,
+          columnStructure,
+          message: `Column ${columnName} type is not the same as the field metadata type "${columnStructure.dataType}" !== "${dataTypes[index]}"`,
+        });
+      }
+
+      if (columnStructure.isNullable !== fieldMetadata.isNullable) {
+        issues.push({
+          type: WorkspaceHealthIssueType.COLUMN_NULLABILITY_CONFLICT,
+          fieldMetadata,
+          columnStructure,
+          message: `Column ${columnName} is expected to be ${
+            fieldMetadata.isNullable ? 'nullable' : 'not nullable'
+          } but is ${columnStructure.isNullable ? 'nullable' : 'not nullable'}`,
+        });
+      }
+
+      if (columnDefaultValue && isEnumFieldMetadataType(fieldMetadata.type)) {
+        const enumValues = fieldMetadata.options?.map((option) =>
+          serializeDefaultValue(`'${option.value}'`),
+        );
+
+        if (!enumValues.includes(columnDefaultValue)) {
+          issues.push({
+            type: WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_NOT_VALID,
+            fieldMetadata,
+            columnStructure,
+            message: `Column ${columnName} default value is not in the enum values "${columnDefaultValue}" NOT IN "${enumValues}"`,
+          });
+        }
+      }
+
+      if (columnDefaultValue !== defaultValues[index]) {
+        issues.push({
+          type: WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_CONFLICT,
+          fieldMetadata,
+          columnStructure,
+          message: `Column ${columnName} default value is not the same as the field metadata default value "${columnStructure.columnDefault}" !== "${defaultValues[index]}"`,
+        });
+      }
+    }
+
+    return issues;
+  }
+
+  private metadataFieldCheck(
+    tableName: string,
+    fieldMetadata: FieldMetadataEntity,
+  ): WorkspaceHealthIssue[] {
+    const issues: WorkspaceHealthIssue[] = [];
+    const columnName = fieldMetadata.name;
+    const defaultValueIssues = this.defaultValueHealthCheck(fieldMetadata);
+
+    if (fieldMetadata.name.startsWith(customNamePrefix)) {
+      issues.push({
+        type: WorkspaceHealthIssueType.COLUMN_NAME_SHOULD_NOT_BE_PREFIXED,
+        fieldMetadata,
+        message: `Column ${columnName} should not be prefixed with "${customNamePrefix}"`,
+      });
+    }
+
+    if (fieldMetadata.isCustom && columnName?.startsWith(customNamePrefix)) {
+      issues.push({
+        type: WorkspaceHealthIssueType.COLUMN_NAME_SHOULD_NOT_BE_CUSTOM,
+        fieldMetadata,
+        message: `Column ${columnName} is marked as custom in table ${tableName} but and start with "_", this behavior has been removed. Please remove the prefix.`,
+      });
+    }
+
+    if (!fieldMetadata.objectMetadataId) {
+      issues.push({
+        type: WorkspaceHealthIssueType.COLUMN_OBJECT_REFERENCE_INVALID,
+        fieldMetadata,
+        message: `Column ${columnName} doesn't have a valid object metadata id`,
+      });
+    }
+
+    if (!Object.values(FieldMetadataType).includes(fieldMetadata.type)) {
+      issues.push({
+        type: WorkspaceHealthIssueType.COLUMN_TYPE_NOT_VALID,
+        fieldMetadata,
+        message: `Column ${columnName} doesn't have a valid field metadata type`,
+      });
+    }
+
+    if (
+      !fieldMetadata.name ||
+      !validName(fieldMetadata.name) ||
+      !fieldMetadata.label
+    ) {
+      issues.push({
+        type: WorkspaceHealthIssueType.COLUMN_NAME_NOT_VALID,
+        fieldMetadata,
+        message: `Column ${columnName} doesn't have a valid name or label`,
+      });
+    }
+
+    if (
+      isEnumFieldMetadataType(fieldMetadata.type) &&
+      !validateOptionsForType(fieldMetadata.type, fieldMetadata.options)
+    ) {
+      issues.push({
+        type: WorkspaceHealthIssueType.COLUMN_OPTIONS_NOT_VALID,
+        fieldMetadata,
+        message: `Column options of ${fieldMetadata.name} is not valid`,
+      });
+    }
+
+    issues.push(...defaultValueIssues);
+
+    return issues;
+  }
+
+  private defaultValueHealthCheck(
+    fieldMetadata: FieldMetadataEntity,
+  ): WorkspaceHealthIssue[] {
+    const issues: WorkspaceHealthIssue[] = [];
+
+    if (
+      !validateDefaultValueForType(
+        fieldMetadata.type,
+        fieldMetadata.defaultValue,
+      )
+    ) {
+      issues.push({
+        type: WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_NOT_VALID,
+        fieldMetadata,
+        message: `Column default value for composite type ${fieldMetadata.type} is not well structured`,
+      });
+    }
+
+    if (
+      isEnumFieldMetadataType(fieldMetadata.type) &&
+      fieldMetadata.defaultValue
+    ) {
+      const enumValues = fieldMetadata.options?.map((option) =>
+        serializeDefaultValue(`'${option.value}'`),
+      );
+      const metadataDefaultValue =
+        fieldMetadata.defaultValue as FieldMetadataDefaultValue<EnumFieldMetadataUnionType>;
+
+      if (metadataDefaultValue && !enumValues.includes(metadataDefaultValue)) {
+        issues.push({
+          type: WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_NOT_VALID,
+          fieldMetadata,
+          message: `Column default value is not in the enum values "${metadataDefaultValue}" NOT IN "${enumValues}"`,
+        });
+      }
+    }
+
+    return issues;
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-health/services/object-metadata-health.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/object-metadata-health.service.ts
similarity index 85%
rename from packages/twenty-server/src/workspace/workspace-health/services/object-metadata-health.service.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-health/services/object-metadata-health.service.ts
index 81ee66a20028..aa73f2e89dcc 100644
--- a/packages/twenty-server/src/workspace/workspace-health/services/object-metadata-health.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/object-metadata-health.service.ts
@@ -3,13 +3,13 @@ import { Injectable } from '@nestjs/common';
 import {
   WorkspaceHealthIssue,
   WorkspaceHealthIssueType,
-} from 'src/workspace/workspace-health/interfaces/workspace-health-issue.interface';
-import { WorkspaceHealthOptions } from 'src/workspace/workspace-health/interfaces/workspace-health-options.interface';
+} from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-issue.interface';
+import { WorkspaceHealthOptions } from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-options.interface';
 
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { validName } from 'src/workspace/workspace-health/utils/valid-name.util';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { validName } from 'src/engine/workspace-manager/workspace-health/utils/valid-name.util';
 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
 
 @Injectable()
 export class ObjectMetadataHealthService {
diff --git a/packages/twenty-server/src/workspace/workspace-health/services/relation-metadata.health.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/relation-metadata.health.service.ts
similarity index 84%
rename from packages/twenty-server/src/workspace/workspace-health/services/relation-metadata.health.service.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-health/services/relation-metadata.health.service.ts
index b85f67b9ffb7..8a4f9d69dd4c 100644
--- a/packages/twenty-server/src/workspace/workspace-health/services/relation-metadata.health.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/relation-metadata.health.service.ts
@@ -1,29 +1,29 @@
 import { Injectable } from '@nestjs/common';
 
-import { WorkspaceTableStructure } from 'src/workspace/workspace-health/interfaces/workspace-table-definition.interface';
+import { WorkspaceTableStructure } from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-table-definition.interface';
 import {
   WorkspaceHealthIssue,
   WorkspaceHealthIssueType,
-} from 'src/workspace/workspace-health/interfaces/workspace-health-issue.interface';
+} from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-issue.interface';
 import {
   WorkspaceHealthMode,
   WorkspaceHealthOptions,
-} from 'src/workspace/workspace-health/interfaces/workspace-health-options.interface';
+} from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-options.interface';
 
-import { FieldMetadataEntity } from 'src/metadata/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   RelationMetadataEntity,
   RelationMetadataType,
-} from 'src/metadata/relation-metadata/relation-metadata.entity';
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import {
   RelationDirection,
   deduceRelationDirection,
-} from 'src/workspace/utils/deduce-relation-direction.util';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { createRelationForeignKeyColumnName } from 'src/metadata/relation-metadata/utils/create-relation-foreign-key-column-name.util';
-import { createRelationForeignKeyFieldMetadataName } from 'src/metadata/relation-metadata/utils/create-relation-foreign-key-field-metadata-name.util';
-import { isRelationFieldMetadataType } from 'src/workspace/utils/is-relation-field-metadata-type.util';
-import { convertOnDeleteActionToOnDelete } from 'src/workspace/workspace-migration-runner/utils/convert-on-delete-action-to-on-delete.util';
+} from 'src/engine/utils/deduce-relation-direction.util';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { createRelationForeignKeyFieldMetadataName } from 'src/engine/metadata-modules/relation-metadata/utils/create-relation-foreign-key-field-metadata-name.util';
+import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
+import { convertOnDeleteActionToOnDelete } from 'src/engine/workspace-manager/workspace-migration-runner/utils/convert-on-delete-action-to-on-delete.util';
+import { camelCase } from 'src/utils/camel-case';
 
 @Injectable()
 export class RelationMetadataHealthService {
@@ -145,11 +145,7 @@ export class RelationMetadataHealthService {
       return [];
     }
 
-    const isCustom = toFieldMetadata.isCustom ?? false;
-    const foreignKeyColumnName = createRelationForeignKeyColumnName(
-      toFieldMetadata.name,
-      isCustom,
-    );
+    const foreignKeyColumnName = `${camelCase(toFieldMetadata.name)}Id`;
     const relationColumn = workspaceTableColumns.find(
       (column) => column.columnName === foreignKeyColumnName,
     );
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/workspace-fix.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/workspace-fix.service.ts
new file mode 100644
index 000000000000..fa687cfa65f8
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/workspace-fix.service.ts
@@ -0,0 +1,99 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceHealthFixKind } from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-fix-kind.interface';
+import { WorkspaceHealthIssue } from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-issue.interface';
+
+import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { WorkspaceNullableFixer } from 'src/engine/workspace-manager/workspace-health/fixer/workspace-nullable.fixer';
+import { WorkspaceDefaultValueFixer } from 'src/engine/workspace-manager/workspace-health/fixer/workspace-default-value.fixer';
+import { WorkspaceTypeFixer } from 'src/engine/workspace-manager/workspace-health/fixer/workspace-type.fixer';
+import { CompareEntity } from 'src/engine/workspace-manager/workspace-health/fixer/abstract-workspace.fixer';
+import { WorkspaceMissingColumnFixer } from 'src/engine/workspace-manager/workspace-health/fixer/workspace-missing-column.fixer';
+
+@Injectable()
+export class WorkspaceFixService {
+  constructor(
+    private readonly workspaceNullableFixer: WorkspaceNullableFixer,
+    private readonly workspaceDefaultValueFixer: WorkspaceDefaultValueFixer,
+    private readonly workspaceTypeFixer: WorkspaceTypeFixer,
+    private readonly workspaceMissingColumnFixer: WorkspaceMissingColumnFixer,
+  ) {}
+
+  async createWorkspaceMigrations(
+    manager: EntityManager,
+    objectMetadataCollection: ObjectMetadataEntity[],
+    type: WorkspaceHealthFixKind,
+    issues: WorkspaceHealthIssue[],
+  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
+    switch (type) {
+      case WorkspaceHealthFixKind.Nullable: {
+        const filteredIssues = this.workspaceNullableFixer.filterIssues(issues);
+
+        return this.workspaceNullableFixer.createWorkspaceMigrations(
+          manager,
+          objectMetadataCollection,
+          filteredIssues,
+        );
+      }
+      case WorkspaceHealthFixKind.DefaultValue: {
+        const filteredIssues =
+          this.workspaceDefaultValueFixer.filterIssues(issues);
+
+        return this.workspaceDefaultValueFixer.createWorkspaceMigrations(
+          manager,
+          objectMetadataCollection,
+          filteredIssues,
+        );
+      }
+      case WorkspaceHealthFixKind.Type: {
+        const filteredIssues = this.workspaceTypeFixer.filterIssues(issues);
+
+        return this.workspaceTypeFixer.createWorkspaceMigrations(
+          manager,
+          objectMetadataCollection,
+          filteredIssues,
+        );
+      }
+      case WorkspaceHealthFixKind.MissingColumn: {
+        const filteredIssues =
+          this.workspaceMissingColumnFixer.filterIssues(issues);
+
+        return this.workspaceMissingColumnFixer.createWorkspaceMigrations(
+          manager,
+          objectMetadataCollection,
+          filteredIssues,
+        );
+      }
+      default: {
+        return [];
+      }
+    }
+  }
+
+  async createMetadataUpdates(
+    manager: EntityManager,
+    objectMetadataCollection: ObjectMetadataEntity[],
+    type: WorkspaceHealthFixKind,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    issues: WorkspaceHealthIssue[],
+  ): Promise<CompareEntity<unknown>[]> {
+    switch (type) {
+      case WorkspaceHealthFixKind.DefaultValue: {
+        const filteredIssues =
+          this.workspaceDefaultValueFixer.filterIssues(issues);
+
+        return this.workspaceDefaultValueFixer.createMetadataUpdates(
+          manager,
+          objectMetadataCollection,
+          filteredIssues,
+        );
+      }
+      default: {
+        return [];
+      }
+    }
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-health/utils/compute-composite-field-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/utils/compute-composite-field-metadata.util.ts
new file mode 100644
index 000000000000..02051e1283e2
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/utils/compute-composite-field-metadata.util.ts
@@ -0,0 +1,15 @@
+import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { camelCase } from 'src/utils/camel-case';
+
+// Compute composite field metadata by combining the composite field metadata with the field metadata
+export const computeCompositeFieldMetadata = (
+  compositeFieldMetadata: FieldMetadataInterface,
+  fieldMetadata: FieldMetadataEntity,
+): FieldMetadataEntity => ({
+  ...fieldMetadata,
+  ...compositeFieldMetadata,
+  objectMetadataId: fieldMetadata.objectMetadataId,
+  name: camelCase(`${fieldMetadata.name}-${compositeFieldMetadata.name}`),
+});
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-health/utils/is-workspace-health-issue-type.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/utils/is-workspace-health-issue-type.util.ts
new file mode 100644
index 000000000000..1a43d475aa55
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/utils/is-workspace-health-issue-type.util.ts
@@ -0,0 +1,19 @@
+import { WorkspaceHealthIssueType } from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-issue.interface';
+
+export const isWorkspaceHealthNullableIssue = (
+  type: WorkspaceHealthIssueType,
+): type is WorkspaceHealthIssueType.COLUMN_NULLABILITY_CONFLICT => {
+  return type === WorkspaceHealthIssueType.COLUMN_NULLABILITY_CONFLICT;
+};
+
+export const isWorkspaceHealthTypeIssue = (
+  type: WorkspaceHealthIssueType,
+): type is WorkspaceHealthIssueType.COLUMN_DATA_TYPE_CONFLICT => {
+  return type === WorkspaceHealthIssueType.COLUMN_DATA_TYPE_CONFLICT;
+};
+
+export const isWorkspaceHealthDefaultValueIssue = (
+  type: WorkspaceHealthIssueType,
+): type is WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_CONFLICT => {
+  return type === WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_CONFLICT;
+};
diff --git a/packages/twenty-server/src/workspace/workspace-health/utils/valid-name.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/utils/valid-name.util.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-health/utils/valid-name.util.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-health/utils/valid-name.util.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-health/workspace-health.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/workspace-health.module.ts
new file mode 100644
index 000000000000..90e87ba941f1
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/workspace-health.module.ts
@@ -0,0 +1,39 @@
+import { Module } from '@nestjs/common';
+
+import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { DatabaseStructureService } from 'src/engine/workspace-manager/workspace-health/services/database-structure.service';
+import { FieldMetadataHealthService } from 'src/engine/workspace-manager/workspace-health/services/field-metadata-health.service';
+import { ObjectMetadataHealthService } from 'src/engine/workspace-manager/workspace-health/services/object-metadata-health.service';
+import { RelationMetadataHealthService } from 'src/engine/workspace-manager/workspace-health/services/relation-metadata.health.service';
+import { WorkspaceHealthService } from 'src/engine/workspace-manager/workspace-health/workspace-health.service';
+import { WorkspaceMigrationBuilderModule } from 'src/engine/workspace-manager/workspace-migration-builder/workspace-migration-builder.module';
+import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
+
+import { workspaceFixers } from './fixer';
+
+import { WorkspaceFixService } from './services/workspace-fix.service';
+
+@Module({
+  imports: [
+    DataSourceModule,
+    TypeORMModule,
+    ObjectMetadataModule,
+    WorkspaceDataSourceModule,
+    WorkspaceMigrationRunnerModule,
+    WorkspaceMigrationBuilderModule,
+  ],
+  providers: [
+    ...workspaceFixers,
+    WorkspaceHealthService,
+    DatabaseStructureService,
+    ObjectMetadataHealthService,
+    FieldMetadataHealthService,
+    RelationMetadataHealthService,
+    WorkspaceFixService,
+  ],
+  exports: [WorkspaceHealthService],
+})
+export class WorkspaceHealthModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-health/workspace-health.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/workspace-health.service.ts
similarity index 77%
rename from packages/twenty-server/src/workspace/workspace-health/workspace-health.service.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-health/workspace-health.service.ts
index d7c6c8779063..e62b56ef9b6a 100644
--- a/packages/twenty-server/src/workspace/workspace-health/workspace-health.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/workspace-health.service.ts
@@ -3,25 +3,25 @@ import { InjectDataSource } from '@nestjs/typeorm';
 
 import { DataSource } from 'typeorm';
 
-import { WorkspaceHealthIssue } from 'src/workspace/workspace-health/interfaces/workspace-health-issue.interface';
+import { WorkspaceHealthIssue } from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-issue.interface';
 import {
   WorkspaceHealthMode,
   WorkspaceHealthOptions,
-} from 'src/workspace/workspace-health/interfaces/workspace-health-options.interface';
-import { WorkspaceHealthFixKind } from 'src/workspace/workspace-health/interfaces/workspace-health-fix-kind.interface';
+} from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-options.interface';
+import { WorkspaceHealthFixKind } from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-health-fix-kind.interface';
 
 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { ObjectMetadataHealthService } from 'src/workspace/workspace-health/services/object-metadata-health.service';
-import { FieldMetadataHealthService } from 'src/workspace/workspace-health/services/field-metadata-health.service';
-import { RelationMetadataHealthService } from 'src/workspace/workspace-health/services/relation-metadata.health.service';
-import { DatabaseStructureService } from 'src/workspace/workspace-health/services/database-structure.service';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-import { WorkspaceMigrationEntity } from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { WorkspaceMigrationRunnerService } from 'src/workspace/workspace-migration-runner/workspace-migration-runner.service';
-import { WorkspaceFixService } from 'src/workspace/workspace-health/services/workspace-fix.service';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { ObjectMetadataHealthService } from 'src/engine/workspace-manager/workspace-health/services/object-metadata-health.service';
+import { FieldMetadataHealthService } from 'src/engine/workspace-manager/workspace-health/services/field-metadata-health.service';
+import { RelationMetadataHealthService } from 'src/engine/workspace-manager/workspace-health/services/relation-metadata.health.service';
+import { DatabaseStructureService } from 'src/engine/workspace-manager/workspace-health/services/database-structure.service';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service';
+import { WorkspaceFixService } from 'src/engine/workspace-manager/workspace-health/services/workspace-fix.service';
 
 @Injectable()
 export class WorkspaceHealthService {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.module.ts
new file mode 100644
index 000000000000..a3afeb00cc42
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.module.ts
@@ -0,0 +1,24 @@
+import { Module } from '@nestjs/common';
+
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
+import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module';
+import { WorkspaceHealthModule } from 'src/engine/workspace-manager/workspace-health/workspace-health.module';
+
+import { WorkspaceManagerService } from './workspace-manager.service';
+
+@Module({
+  imports: [
+    WorkspaceDataSourceModule,
+    WorkspaceMigrationModule,
+    ObjectMetadataModule,
+    DataSourceModule,
+    WorkspaceSyncMetadataModule,
+    WorkspaceHealthModule,
+  ],
+  exports: [WorkspaceManagerService],
+  providers: [WorkspaceManagerService],
+})
+export class WorkspaceManagerModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-manager/workspace-manager.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts
similarity index 79%
rename from packages/twenty-server/src/workspace/workspace-manager/workspace-manager.service.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts
index b71238f42598..3a17901ee2d6 100644
--- a/packages/twenty-server/src/workspace/workspace-manager/workspace-manager.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts
@@ -1,13 +1,13 @@
 import { Injectable } from '@nestjs/common';
 
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
-import { WorkspaceMigrationService } from 'src/metadata/workspace-migration/workspace-migration.service';
-import { standardObjectsPrefillData } from 'src/workspace/workspace-manager/standard-objects-prefill-data/standard-objects-prefill-data';
-import { demoObjectsPrefillData } from 'src/workspace/workspace-manager/demo-objects-prefill-data/demo-objects-prefill-data';
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { DataSourceEntity } from 'src/metadata/data-source/data-source.entity';
-import { WorkspaceSyncMetadataService } from 'src/workspace/workspace-sync-metadata/workspace-sync-metadata.service';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { WorkspaceMigrationService } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.service';
+import { standardObjectsPrefillData } from 'src/engine/workspace-manager/standard-objects-prefill-data/standard-objects-prefill-data';
+import { demoObjectsPrefillData } from 'src/engine/workspace-manager/demo-objects-prefill-data/demo-objects-prefill-data';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
+import { WorkspaceSyncMetadataService } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service';
 
 @Injectable()
 export class WorkspaceManagerService {
@@ -38,12 +38,10 @@ export class WorkspaceManagerService {
 
     await this.setWorkspaceMaxRow(workspaceId, schemaName);
 
-    await this.workspaceSyncMetadataService.syncStandardObjectsAndFieldsMetadata(
-      {
-        workspaceId,
-        dataSourceId: dataSourceMetadata.id,
-      },
-    );
+    await this.workspaceSyncMetadataService.synchronize({
+      workspaceId,
+      dataSourceId: dataSourceMetadata.id,
+    });
 
     await this.prefillWorkspaceWithStandardObjects(
       dataSourceMetadata,
@@ -70,12 +68,10 @@ export class WorkspaceManagerService {
 
     await this.setWorkspaceMaxRow(workspaceId, schemaName);
 
-    await this.workspaceSyncMetadataService.syncStandardObjectsAndFieldsMetadata(
-      {
-        workspaceId,
-        dataSourceId: dataSourceMetadata.id,
-      },
-    );
+    await this.workspaceSyncMetadataService.synchronize({
+      workspaceId,
+      dataSourceId: dataSourceMetadata.id,
+    });
 
     await this.prefillWorkspaceWithDemoObjects(dataSourceMetadata, workspaceId);
   }
diff --git a/packages/twenty-server/src/workspace/workspace-migration-builder/factories/index.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/index.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-migration-builder/factories/index.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/index.ts
diff --git a/packages/twenty-server/src/workspace/workspace-migration-builder/factories/workspace-migration-field.factory.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-field.factory.ts
similarity index 85%
rename from packages/twenty-server/src/workspace/workspace-migration-builder/factories/workspace-migration-field.factory.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-field.factory.ts
index 9337b6c1413b..d764bbc8d20b 100644
--- a/packages/twenty-server/src/workspace/workspace-migration-builder/factories/workspace-migration-field.factory.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-field.factory.ts
@@ -1,20 +1,21 @@
 import { Injectable } from '@nestjs/common';
 
-import { WorkspaceMigrationBuilderAction } from 'src/workspace/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
+import { WorkspaceMigrationBuilderAction } from 'src/engine/workspace-manager/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
 
 import {
   FieldMetadataEntity,
   FieldMetadataType,
-} from 'src/metadata/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
+} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import {
   WorkspaceMigrationColumnActionType,
   WorkspaceMigrationEntity,
   WorkspaceMigrationTableAction,
-} from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-import { WorkspaceMigrationFactory } from 'src/metadata/workspace-migration/workspace-migration.factory';
-import { generateMigrationName } from 'src/metadata/workspace-migration/utils/generate-migration-name.util';
+  WorkspaceMigrationTableActionType,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+import { WorkspaceMigrationFactory } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.factory';
+import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
 
 export interface FieldMetadataUpdate {
   current: FieldMetadataEntity;
@@ -94,7 +95,7 @@ export class WorkspaceMigrationFieldFactory {
           name: computeObjectTargetTable(
             originalObjectMetadataMap[fieldMetadata.objectMetadataId],
           ),
-          action: 'alter',
+          action: WorkspaceMigrationTableActionType.ALTER,
           columns: this.workspaceMigrationFactory.createColumnActions(
             WorkspaceMigrationColumnActionType.CREATE,
             fieldMetadata,
@@ -132,7 +133,7 @@ export class WorkspaceMigrationFieldFactory {
               fieldMetadataUpdate.current.objectMetadataId
             ],
           ),
-          action: 'alter',
+          action: WorkspaceMigrationTableActionType.ALTER,
           columns: this.workspaceMigrationFactory.createColumnActions(
             WorkspaceMigrationColumnActionType.ALTER,
             fieldMetadataUpdate.current,
@@ -171,7 +172,7 @@ export class WorkspaceMigrationFieldFactory {
           name: computeObjectTargetTable(
             originalObjectMetadataMap[fieldMetadata.objectMetadataId],
           ),
-          action: 'alter',
+          action: WorkspaceMigrationTableActionType.ALTER,
           columns: [
             {
               action: WorkspaceMigrationColumnActionType.DROP,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-object.factory.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-object.factory.ts
new file mode 100644
index 000000000000..3102956c1bff
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-object.factory.ts
@@ -0,0 +1,160 @@
+import { Injectable } from '@nestjs/common';
+
+import { WorkspaceMigrationBuilderAction } from 'src/engine/workspace-manager/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import {
+  WorkspaceMigrationColumnActionType,
+  WorkspaceMigrationEntity,
+  WorkspaceMigrationTableAction,
+  WorkspaceMigrationTableActionType,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+import { WorkspaceMigrationFactory } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.factory';
+import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
+
+export interface ObjectMetadataUpdate {
+  current: ObjectMetadataEntity;
+  altered: ObjectMetadataEntity;
+}
+
+@Injectable()
+export class WorkspaceMigrationObjectFactory {
+  constructor(
+    private readonly workspaceMigrationFactory: WorkspaceMigrationFactory,
+  ) {}
+
+  async create(
+    objectMetadataCollection: ObjectMetadataEntity[],
+    action:
+      | WorkspaceMigrationBuilderAction.CREATE
+      | WorkspaceMigrationBuilderAction.DELETE,
+  ): Promise<Partial<WorkspaceMigrationEntity>[]>;
+
+  async create(
+    objectMetadataUpdateCollection: ObjectMetadataUpdate[],
+    action: WorkspaceMigrationBuilderAction.UPDATE,
+  ): Promise<Partial<WorkspaceMigrationEntity>[]>;
+
+  async create(
+    objectMetadataCollectionOrObjectMetadataUpdateCollection:
+      | ObjectMetadataEntity[]
+      | ObjectMetadataUpdate[],
+    action: WorkspaceMigrationBuilderAction,
+  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
+    switch (action) {
+      case WorkspaceMigrationBuilderAction.CREATE:
+        return this.createObjectMigration(
+          objectMetadataCollectionOrObjectMetadataUpdateCollection as ObjectMetadataEntity[],
+        );
+      case WorkspaceMigrationBuilderAction.UPDATE:
+        return this.updateObjectMigration(
+          objectMetadataCollectionOrObjectMetadataUpdateCollection as ObjectMetadataUpdate[],
+        );
+      case WorkspaceMigrationBuilderAction.DELETE:
+        return this.deleteObjectMigration(
+          objectMetadataCollectionOrObjectMetadataUpdateCollection as ObjectMetadataEntity[],
+        );
+      default:
+        return [];
+    }
+  }
+
+  private async createObjectMigration(
+    objectMetadataCollection: ObjectMetadataEntity[],
+  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
+    const workspaceMigrations: Partial<WorkspaceMigrationEntity>[] = [];
+
+    for (const objectMetadata of objectMetadataCollection) {
+      const migrations: WorkspaceMigrationTableAction[] = [
+        {
+          name: computeObjectTargetTable(objectMetadata),
+          action: WorkspaceMigrationTableActionType.CREATE,
+        },
+      ];
+
+      for (const field of objectMetadata.fields) {
+        if (field.type === FieldMetadataType.RELATION) {
+          continue;
+        }
+
+        migrations.push({
+          name: computeObjectTargetTable(objectMetadata),
+          action: WorkspaceMigrationTableActionType.ALTER,
+          columns: this.workspaceMigrationFactory.createColumnActions(
+            WorkspaceMigrationColumnActionType.CREATE,
+            field,
+          ),
+        });
+      }
+
+      workspaceMigrations.push({
+        workspaceId: objectMetadata.workspaceId,
+        name: generateMigrationName(`create-${objectMetadata.nameSingular}`),
+        isCustom: false,
+        migrations,
+      });
+    }
+
+    return workspaceMigrations;
+  }
+
+  private async updateObjectMigration(
+    objectMetadataUpdateCollection: ObjectMetadataUpdate[],
+  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
+    const workspaceMigrations: Partial<WorkspaceMigrationEntity>[] = [];
+
+    for (const objectMetadataUpdate of objectMetadataUpdateCollection) {
+      const oldTableName = computeObjectTargetTable(
+        objectMetadataUpdate.current,
+      );
+      const newTableName = computeObjectTargetTable(
+        objectMetadataUpdate.altered,
+      );
+
+      if (oldTableName !== newTableName) {
+        workspaceMigrations.push({
+          workspaceId: objectMetadataUpdate.current.workspaceId,
+          name: generateMigrationName(
+            `rename-${objectMetadataUpdate.current.nameSingular}`,
+          ),
+          isCustom: false,
+          migrations: [
+            {
+              name: oldTableName,
+              newName: newTableName,
+              action: WorkspaceMigrationTableActionType.ALTER,
+            },
+          ],
+        });
+      }
+    }
+
+    return workspaceMigrations;
+  }
+
+  private async deleteObjectMigration(
+    objectMetadataCollection: ObjectMetadataEntity[],
+  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
+    const workspaceMigrations: Partial<WorkspaceMigrationEntity>[] = [];
+
+    for (const objectMetadata of objectMetadataCollection) {
+      const migrations: WorkspaceMigrationTableAction[] = [
+        {
+          name: computeObjectTargetTable(objectMetadata),
+          action: WorkspaceMigrationTableActionType.DROP,
+        },
+      ];
+
+      workspaceMigrations.push({
+        workspaceId: objectMetadata.workspaceId,
+        name: generateMigrationName(`delete-${objectMetadata.nameSingular}`),
+        isCustom: false,
+        migrations,
+      });
+    }
+
+    return workspaceMigrations;
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-migration-builder/factories/workspace-migration-relation.factory.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-relation.factory.ts
similarity index 87%
rename from packages/twenty-server/src/workspace/workspace-migration-builder/factories/workspace-migration-relation.factory.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-relation.factory.ts
index 321ebcf5d590..73e8c3ed99d5 100644
--- a/packages/twenty-server/src/workspace/workspace-migration-builder/factories/workspace-migration-relation.factory.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-relation.factory.ts
@@ -1,20 +1,21 @@
 import { Injectable } from '@nestjs/common';
 
-import { WorkspaceMigrationBuilderAction } from 'src/workspace/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
+import { WorkspaceMigrationBuilderAction } from 'src/engine/workspace-manager/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
 
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import {
   WorkspaceMigrationColumnActionType,
   WorkspaceMigrationEntity,
   WorkspaceMigrationTableAction,
-} from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
+  WorkspaceMigrationTableActionType,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
 import {
   RelationMetadataEntity,
   RelationMetadataType,
-} from 'src/metadata/relation-metadata/relation-metadata.entity';
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { camelCase } from 'src/utils/camel-case';
-import { generateMigrationName } from 'src/metadata/workspace-migration/utils/generate-migration-name.util';
+import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
 
 @Injectable()
 export class WorkspaceMigrationRelationFactory {
@@ -90,7 +91,7 @@ export class WorkspaceMigrationRelationFactory {
       const migrations: WorkspaceMigrationTableAction[] = [
         {
           name: computeObjectTargetTable(toObjectMetadata),
-          action: 'alter',
+          action: WorkspaceMigrationTableActionType.ALTER,
           columns: [
             {
               action: WorkspaceMigrationColumnActionType.DROP_FOREIGN_KEY,
@@ -100,7 +101,7 @@ export class WorkspaceMigrationRelationFactory {
         },
         {
           name: computeObjectTargetTable(toObjectMetadata),
-          action: 'alter',
+          action: WorkspaceMigrationTableActionType.ALTER,
           columns: [
             {
               action: WorkspaceMigrationColumnActionType.CREATE_FOREIGN_KEY,
@@ -166,7 +167,7 @@ export class WorkspaceMigrationRelationFactory {
       const migrations: WorkspaceMigrationTableAction[] = [
         {
           name: computeObjectTargetTable(toObjectMetadata),
-          action: 'alter',
+          action: WorkspaceMigrationTableActionType.ALTER,
           columns: [
             {
               action: WorkspaceMigrationColumnActionType.CREATE_FOREIGN_KEY,
diff --git a/packages/twenty-server/src/workspace/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/workspace-migration-builder.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/workspace-migration-builder.module.ts
new file mode 100644
index 000000000000..cdf08d16d741
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/workspace-migration-builder.module.ts
@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+
+import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
+
+import { workspaceMigrationBuilderFactories } from './factories';
+
+@Module({
+  imports: [WorkspaceMigrationModule],
+  providers: [...workspaceMigrationBuilderFactories],
+  exports: [...workspaceMigrationBuilderFactories],
+})
+export class WorkspaceMigrationBuilderModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-migration-runner/commands/workspace-execute-pending-migrations.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/commands/workspace-execute-pending-migrations.command.ts
similarity index 85%
rename from packages/twenty-server/src/workspace/workspace-migration-runner/commands/workspace-execute-pending-migrations.command.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/commands/workspace-execute-pending-migrations.command.ts
index 5b6ccb614963..47777bf1e424 100644
--- a/packages/twenty-server/src/workspace/workspace-migration-runner/commands/workspace-execute-pending-migrations.command.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/commands/workspace-execute-pending-migrations.command.ts
@@ -1,6 +1,6 @@
 import { Command, CommandRunner, Option } from 'nest-commander';
 
-import { WorkspaceMigrationRunnerService } from 'src/workspace/workspace-migration-runner/workspace-migration-runner.service';
+import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service';
 
 interface ExecuteWorkspaceMigrationsOptions {
   workspaceId: string;
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/commands/workspace-sync-metadata-commands.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/commands/workspace-sync-metadata-commands.module.ts
new file mode 100644
index 000000000000..1cdf825ce6f7
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/commands/workspace-sync-metadata-commands.module.ts
@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+
+import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
+
+import { WorkspaceExecutePendingMigrationsCommand } from './workspace-execute-pending-migrations.command';
+
+@Module({
+  imports: [WorkspaceMigrationRunnerModule],
+  providers: [WorkspaceExecutePendingMigrationsCommand],
+})
+export class WorkspaceMigrationRunnerCommandsModule {}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/services/workspace-migration-enum.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/services/workspace-migration-enum.service.ts
new file mode 100644
index 000000000000..b6bf1b675799
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/services/workspace-migration-enum.service.ts
@@ -0,0 +1,185 @@
+import { Injectable } from '@nestjs/common';
+
+import { QueryRunner, TableColumn } from 'typeorm';
+import { v4 } from 'uuid';
+
+import {
+  WorkspaceMigrationColumnAlter,
+  WorkspaceMigrationRenamedEnum,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { serializeDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/serialize-default-value';
+
+@Injectable()
+export class WorkspaceMigrationEnumService {
+  async alterEnum(
+    queryRunner: QueryRunner,
+    schemaName: string,
+    tableName: string,
+    migrationColumn: WorkspaceMigrationColumnAlter,
+  ) {
+    // Rename column name
+    if (
+      migrationColumn.currentColumnDefinition.columnName !==
+      migrationColumn.alteredColumnDefinition.columnName
+    ) {
+      await this.renameColumn(
+        queryRunner,
+        schemaName,
+        tableName,
+        migrationColumn.currentColumnDefinition.columnName,
+        migrationColumn.alteredColumnDefinition.columnName,
+      );
+    }
+
+    const columnDefinition = migrationColumn.alteredColumnDefinition;
+    const oldEnumTypeName =
+      `${tableName}_${migrationColumn.currentColumnDefinition.columnName}_enum`.toLowerCase();
+    const tempEnumTypeName = `${oldEnumTypeName}_temp`;
+    const enumValues =
+      columnDefinition.enum?.map((enumValue) => {
+        if (typeof enumValue === 'string') {
+          return enumValue;
+        }
+
+        return enumValue.to;
+      }) ?? [];
+    const renamedEnumValues = columnDefinition.enum?.filter(
+      (enumValue): enumValue is WorkspaceMigrationRenamedEnum =>
+        typeof enumValue !== 'string',
+    );
+
+    if (!columnDefinition.isNullable && !columnDefinition.defaultValue) {
+      columnDefinition.defaultValue = serializeDefaultValue(enumValues[0]);
+    }
+
+    const oldColumnName = `${columnDefinition.columnName}_old_${v4()}`;
+
+    // Rename old column
+    await this.renameColumn(
+      queryRunner,
+      schemaName,
+      tableName,
+      columnDefinition.columnName,
+      oldColumnName,
+    );
+    await this.renameEnumType(
+      queryRunner,
+      schemaName,
+      oldEnumTypeName,
+      tempEnumTypeName,
+    );
+
+    await queryRunner.addColumn(
+      `${schemaName}.${tableName}`,
+      new TableColumn({
+        name: columnDefinition.columnName,
+        type: columnDefinition.columnType,
+        default: columnDefinition.defaultValue,
+        enum: enumValues,
+        isArray: columnDefinition.isArray,
+        isNullable: columnDefinition.isNullable,
+      }),
+    );
+
+    await this.migrateEnumValues(
+      queryRunner,
+      schemaName,
+      migrationColumn,
+      tableName,
+      oldColumnName,
+      enumValues,
+      renamedEnumValues,
+    );
+
+    // Drop old column
+    await queryRunner.query(`
+      ALTER TABLE "${schemaName}"."${tableName}"
+      DROP COLUMN "${oldColumnName}"
+    `);
+    // Drop temp enum type
+    await this.dropOldEnumType(queryRunner, schemaName, tempEnumTypeName);
+  }
+
+  private async renameColumn(
+    queryRunner: QueryRunner,
+    schemaName: string,
+    tableName: string,
+    oldColumnName: string,
+    newColumnName: string,
+  ) {
+    await queryRunner.query(`
+      ALTER TABLE "${schemaName}"."${tableName}"
+      RENAME COLUMN "${oldColumnName}" TO "${newColumnName}"
+    `);
+  }
+
+  private migrateEnumValue(
+    value: string,
+    renamedEnumValues?: WorkspaceMigrationRenamedEnum[],
+  ) {
+    return (
+      renamedEnumValues?.find((enumVal) => enumVal?.from === value)?.to || value
+    );
+  }
+
+  private async migrateEnumValues(
+    queryRunner: QueryRunner,
+    schemaName: string,
+    migrationColumn: WorkspaceMigrationColumnAlter,
+    tableName: string,
+    oldColumnName: string,
+    enumValues: string[],
+    renamedEnumValues?: WorkspaceMigrationRenamedEnum[],
+  ) {
+    const columnDefinition = migrationColumn.alteredColumnDefinition;
+
+    const values = await queryRunner.query(
+      `SELECT id, "${oldColumnName}" FROM "${schemaName}"."${tableName}"`,
+    );
+
+    values.map(async (value) => {
+      let val = value[oldColumnName];
+
+      if (/^\{.*\}$/.test(val)) {
+        val = serializeDefaultValue(
+          val
+            .slice(1, -1)
+            .split(',')
+            .map((v: string) => v.trim())
+            .map((v: string) => this.migrateEnumValue(v, renamedEnumValues))
+            .filter((v: string) => enumValues.includes(v)),
+        );
+      } else if (typeof val === 'string') {
+        val = `'${this.migrateEnumValue(val, renamedEnumValues)}'`;
+      }
+
+      await queryRunner.query(`
+        UPDATE "${schemaName}"."${tableName}"
+        SET "${columnDefinition.columnName}" = ${val}
+        WHERE id='${value.id}'
+      `);
+    });
+  }
+
+  private async dropOldEnumType(
+    queryRunner: QueryRunner,
+    schemaName: string,
+    oldEnumTypeName: string,
+  ) {
+    await queryRunner.query(
+      `DROP TYPE IF EXISTS "${schemaName}"."${oldEnumTypeName}"`,
+    );
+  }
+
+  private async renameEnumType(
+    queryRunner: QueryRunner,
+    schemaName: string,
+    oldEnumTypeName: string,
+    newEnumTypeName: string,
+  ) {
+    await queryRunner.query(`
+      ALTER TYPE "${schemaName}"."${oldEnumTypeName}"
+      RENAME TO "${newEnumTypeName}"
+    `);
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-migration-runner/services/workspace-migration-type.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/services/workspace-migration-type.service.ts
similarity index 89%
rename from packages/twenty-server/src/workspace/workspace-migration-runner/services/workspace-migration-type.service.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/services/workspace-migration-type.service.ts
index d34778c4c5c7..08c6ecbdf081 100644
--- a/packages/twenty-server/src/workspace/workspace-migration-runner/services/workspace-migration-type.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/services/workspace-migration-type.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 import { QueryRunner } from 'typeorm';
 
-import { WorkspaceMigrationColumnAlter } from 'src/metadata/workspace-migration/workspace-migration.entity';
+import { WorkspaceMigrationColumnAlter } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
 
 @Injectable()
 export class WorkspaceMigrationTypeService {
diff --git a/packages/twenty-server/src/workspace/workspace-migration-runner/utils/convert-on-delete-action-to-on-delete.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/utils/convert-on-delete-action-to-on-delete.util.ts
similarity index 76%
rename from packages/twenty-server/src/workspace/workspace-migration-runner/utils/convert-on-delete-action-to-on-delete.util.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/utils/convert-on-delete-action-to-on-delete.util.ts
index 393fde818753..73e36ba678d7 100644
--- a/packages/twenty-server/src/workspace/workspace-migration-runner/utils/convert-on-delete-action-to-on-delete.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/utils/convert-on-delete-action-to-on-delete.util.ts
@@ -1,12 +1,8 @@
-import { RelationOnDeleteAction } from 'src/metadata/relation-metadata/relation-metadata.entity';
+import { RelationOnDeleteAction } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 
 export const convertOnDeleteActionToOnDelete = (
   onDeleteAction: RelationOnDeleteAction | undefined,
 ): 'CASCADE' | 'SET NULL' | 'RESTRICT' | 'NO ACTION' | undefined => {
-  if (!onDeleteAction) {
-    return;
-  }
-
   switch (onDeleteAction) {
     case 'CASCADE':
       return 'CASCADE';
diff --git a/packages/twenty-server/src/workspace/workspace-migration-runner/utils/custom-table-default-column.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/utils/custom-table-default-column.util.ts
similarity index 83%
rename from packages/twenty-server/src/workspace/workspace-migration-runner/utils/custom-table-default-column.util.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/utils/custom-table-default-column.util.ts
index 14f5ec5a06af..f1eea9072bbc 100644
--- a/packages/twenty-server/src/workspace/workspace-migration-runner/utils/custom-table-default-column.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/utils/custom-table-default-column.util.ts
@@ -9,17 +9,17 @@ export const customTableDefaultColumns: TableColumnOptions[] = [
   },
   {
     name: 'createdAt',
-    type: 'timestamp',
+    type: 'timestamptz',
     default: 'now()',
   },
   {
     name: 'updatedAt',
-    type: 'timestamp',
+    type: 'timestamptz',
     default: 'now()',
   },
   {
     name: 'deletedAt',
-    type: 'timestamp',
+    type: 'timestamptz',
     isNullable: true,
   },
 ];
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module.ts
new file mode 100644
index 000000000000..59f0bec2e661
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module.ts
@@ -0,0 +1,25 @@
+import { Module } from '@nestjs/common';
+
+import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+import { WorkspaceMigrationEnumService } from 'src/engine/workspace-manager/workspace-migration-runner/services/workspace-migration-enum.service';
+
+import { WorkspaceMigrationRunnerService } from './workspace-migration-runner.service';
+
+import { WorkspaceMigrationTypeService } from './services/workspace-migration-type.service';
+
+@Module({
+  imports: [
+    WorkspaceDataSourceModule,
+    WorkspaceMigrationModule,
+    WorkspaceCacheVersionModule,
+  ],
+  providers: [
+    WorkspaceMigrationRunnerService,
+    WorkspaceMigrationEnumService,
+    WorkspaceMigrationTypeService,
+  ],
+  exports: [WorkspaceMigrationRunnerService],
+})
+export class WorkspaceMigrationRunnerModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-migration-runner/workspace-migration-runner.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service.ts
similarity index 77%
rename from packages/twenty-server/src/workspace/workspace-migration-runner/workspace-migration-runner.service.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service.ts
index 2c87e1f79e82..96fbc52eb09e 100644
--- a/packages/twenty-server/src/workspace/workspace-migration-runner/workspace-migration-runner.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service.ts
@@ -8,8 +8,8 @@ import {
   TableUnique,
 } from 'typeorm';
 
-import { WorkspaceMigrationService } from 'src/metadata/workspace-migration/workspace-migration.service';
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
+import { WorkspaceMigrationService } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.service';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
 import {
   WorkspaceMigrationTableAction,
   WorkspaceMigrationColumnAction,
@@ -18,10 +18,12 @@ import {
   WorkspaceMigrationColumnCreateRelation,
   WorkspaceMigrationColumnAlter,
   WorkspaceMigrationColumnDropRelation,
-} from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { WorkspaceCacheVersionService } from 'src/metadata/workspace-cache-version/workspace-cache-version.service';
-import { WorkspaceMigrationEnumService } from 'src/workspace/workspace-migration-runner/services/workspace-migration-enum.service';
-import { convertOnDeleteActionToOnDelete } from 'src/workspace/workspace-migration-runner/utils/convert-on-delete-action-to-on-delete.util';
+  WorkspaceMigrationTableActionType,
+  WorkspaceMigrationForeignTable,
+} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+import { WorkspaceMigrationEnumService } from 'src/engine/workspace-manager/workspace-migration-runner/services/workspace-migration-enum.service';
+import { convertOnDeleteActionToOnDelete } from 'src/engine/workspace-manager/workspace-migration-runner/utils/convert-on-delete-action-to-on-delete.util';
 
 import { customTableDefaultColumns } from './utils/custom-table-default-column.util';
 import { WorkspaceMigrationTypeService } from './services/workspace-migration-type.service';
@@ -117,19 +119,44 @@ export class WorkspaceMigrationRunnerService {
     tableMigration: WorkspaceMigrationTableAction,
   ) {
     switch (tableMigration.action) {
-      case 'create':
+      case WorkspaceMigrationTableActionType.CREATE:
         await this.createTable(queryRunner, schemaName, tableMigration.name);
         break;
-      case 'alter':
-        await this.handleColumnChanges(
+      case WorkspaceMigrationTableActionType.ALTER: {
+        if (tableMigration.newName) {
+          await this.renameTable(
+            queryRunner,
+            schemaName,
+            tableMigration.name,
+            tableMigration.newName,
+          );
+        }
+
+        if (tableMigration.columns && tableMigration.columns.length > 0) {
+          await this.handleColumnChanges(
+            queryRunner,
+            schemaName,
+            tableMigration.newName ?? tableMigration.name,
+            tableMigration.columns,
+          );
+        }
+        break;
+      }
+      case WorkspaceMigrationTableActionType.DROP:
+        await queryRunner.dropTable(`${schemaName}.${tableMigration.name}`);
+        break;
+      case 'create_foreign_table':
+        await this.createForeignTable(
           queryRunner,
           schemaName,
           tableMigration.name,
-          tableMigration?.columns,
+          tableMigration?.foreignTable,
         );
         break;
-      case 'drop':
-        await queryRunner.dropTable(`${schemaName}.${tableMigration.name}`);
+      case 'drop_foreign_table':
+        await queryRunner.query(
+          `DROP FOREIGN TABLE ${schemaName}."${tableMigration.name}"`,
+        );
         break;
       default:
         throw new Error(
@@ -165,6 +192,25 @@ export class WorkspaceMigrationRunnerService {
     `);
   }
 
+  /**
+   * Rename a table
+   * @param queryRunner QueryRunner
+   * @param schemaName string
+   * @param oldTableName string
+   * @param newTableName string
+   */
+  private async renameTable(
+    queryRunner: QueryRunner,
+    schemaName: string,
+    oldTableName: string,
+    newTableName: string,
+  ) {
+    await queryRunner.renameTable(
+      `${schemaName}.${oldTableName}`,
+      newTableName,
+    );
+  }
+
   /**
    * Handles column changes for a given migration
    *
@@ -224,6 +270,14 @@ export class WorkspaceMigrationRunnerService {
             columnMigration.columnName,
           );
           break;
+        case WorkspaceMigrationColumnActionType.CREATE_COMMENT:
+          await this.createComment(
+            queryRunner,
+            schemaName,
+            tableName,
+            columnMigration.comment,
+          );
+          break;
         default:
           throw new Error(`Migration column action not supported`);
       }
@@ -412,4 +466,38 @@ export class WorkspaceMigrationRunnerService {
 
     return foreignKeys[0]?.constraint_name;
   }
+
+  private async createComment(
+    queryRunner: QueryRunner,
+    schemaName: string,
+    tableName: string,
+    comment: string,
+  ) {
+    await queryRunner.query(`
+      COMMENT ON TABLE "${schemaName}"."${tableName}" IS e'${comment}';
+    `);
+  }
+
+  private async createForeignTable(
+    queryRunner: QueryRunner,
+    schemaName: string,
+    name: string,
+    foreignTable: WorkspaceMigrationForeignTable | undefined,
+  ) {
+    if (!foreignTable) {
+      return;
+    }
+
+    const foreignTableColumns = foreignTable.columns
+      .map((column) => `"${column.columnName}" ${column.columnType}`)
+      .join(', ');
+
+    await queryRunner.query(
+      `CREATE FOREIGN TABLE ${schemaName}."${name}" (${foreignTableColumns}) SERVER "${foreignTable.foreignDataWrapperId}" OPTIONS (schema_name '${foreignTable.referencedTableSchema}', table_name '${foreignTable.referencedTableName}')`,
+    );
+
+    await queryRunner.query(`
+      COMMENT ON FOREIGN TABLE "${schemaName}"."${name}" IS '@graphql({"primary_key_columns": ["id"], "totalCount": {"enabled": true}})';
+    `);
+  }
 }
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts
new file mode 100644
index 000000000000..7be752c8fb2c
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts
@@ -0,0 +1,176 @@
+import { Logger } from '@nestjs/common';
+import { InjectDataSource } from '@nestjs/typeorm';
+
+import { Command, CommandRunner, Option } from 'nest-commander';
+import { DataSource } from 'typeorm';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { standardObjectMetadataDefinitions } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects';
+import { StandardObjectFactory } from 'src/engine/workspace-manager/workspace-sync-metadata/factories/standard-object.factory';
+import { computeStandardObject } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/compute-standard-object.util';
+import { StandardFieldFactory } from 'src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory';
+import { CustomObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/custom-objects/custom.object-metadata';
+
+interface RunCommandOptions {
+  workspaceId?: string;
+}
+
+@Command({
+  name: 'workspace:add-standard-id',
+  description: 'Add standard id to all metadata objects and fields',
+})
+export class AddStandardIdCommand extends CommandRunner {
+  private readonly logger = new Logger(AddStandardIdCommand.name);
+
+  constructor(
+    @InjectDataSource('metadata')
+    private readonly metadataDataSource: DataSource,
+    private readonly standardObjectFactory: StandardObjectFactory,
+    private readonly standardFieldFactory: StandardFieldFactory,
+  ) {
+    super();
+  }
+
+  async run(_passedParam: string[], options: RunCommandOptions): Promise<void> {
+    const queryRunner = this.metadataDataSource.createQueryRunner();
+    const workspaceId = options.workspaceId;
+
+    await queryRunner.connect();
+    await queryRunner.startTransaction();
+
+    const manager = queryRunner.manager;
+
+    this.logger.log('Adding standardId to metadata objects and fields');
+
+    try {
+      const standardObjectMetadataCollection =
+        this.standardObjectFactory.create(
+          standardObjectMetadataDefinitions,
+          {
+            // We don't need to provide the workspace id and data source id as we're only adding standardId
+            workspaceId: '',
+            dataSourceId: '',
+          },
+          {
+            IS_BLOCKLIST_ENABLED: true,
+            IS_CALENDAR_ENABLED: true,
+            IS_EVENT_OBJECT_ENABLED: true,
+            IS_AIRTABLE_INTEGRATION_ENABLED: true,
+            IS_POSTGRESQL_INTEGRATION_ENABLED: true,
+            IS_MULTI_SELECT_ENABLED: false,
+            IS_RELATION_FOR_REMOTE_OBJECTS_ENABLED: false,
+          },
+        );
+      const standardFieldMetadataCollection = this.standardFieldFactory.create(
+        CustomObjectMetadata,
+        {
+          workspaceId: '',
+          dataSourceId: '',
+        },
+        {
+          IS_BLOCKLIST_ENABLED: true,
+          IS_CALENDAR_ENABLED: true,
+          IS_EVENT_OBJECT_ENABLED: true,
+          IS_AIRTABLE_INTEGRATION_ENABLED: true,
+          IS_POSTGRESQL_INTEGRATION_ENABLED: true,
+          IS_MULTI_SELECT_ENABLED: false,
+          IS_RELATION_FOR_REMOTE_OBJECTS_ENABLED: false,
+        },
+      );
+
+      const objectMetadataRepository =
+        manager.getRepository(ObjectMetadataEntity);
+      const fieldMetadataRepository =
+        manager.getRepository(FieldMetadataEntity);
+
+      /**
+       * Update all object metadata with standard id
+       */
+      const updateObjectMetadataCollection: Partial<ObjectMetadataEntity>[] =
+        [];
+      const updateFieldMetadataCollection: Partial<FieldMetadataEntity>[] = [];
+      const originalObjectMetadataCollection =
+        await objectMetadataRepository.find({
+          where: {
+            fields: { isCustom: false },
+            workspaceId: workspaceId,
+          },
+          relations: ['fields'],
+        });
+      const customObjectMetadataCollection =
+        originalObjectMetadataCollection.filter(
+          (metadata) => metadata.isCustom,
+        );
+
+      const standardObjectMetadataMap = new Map(
+        standardObjectMetadataCollection.map((metadata) => [
+          metadata.nameSingular,
+          metadata,
+        ]),
+      );
+
+      for (const originalObjectMetadata of originalObjectMetadataCollection) {
+        const standardObjectMetadata = standardObjectMetadataMap.get(
+          originalObjectMetadata.nameSingular,
+        );
+
+        if (!standardObjectMetadata && !originalObjectMetadata.isCustom) {
+          continue;
+        }
+
+        const computedStandardObjectMetadata = computeStandardObject(
+          standardObjectMetadata ?? {
+            ...originalObjectMetadata,
+            fields: standardFieldMetadataCollection,
+          },
+          originalObjectMetadata,
+          customObjectMetadataCollection,
+        );
+
+        if (!originalObjectMetadata.isCustom) {
+          updateObjectMetadataCollection.push({
+            id: originalObjectMetadata.id,
+            standardId: computedStandardObjectMetadata.standardId,
+          });
+        }
+
+        for (const fieldMetadata of originalObjectMetadata.fields) {
+          const standardFieldMetadata =
+            computedStandardObjectMetadata.fields.find(
+              (field) => field.name === fieldMetadata.name && !field.isCustom,
+            );
+
+          if (!standardFieldMetadata) {
+            continue;
+          }
+
+          updateFieldMetadataCollection.push({
+            id: fieldMetadata.id,
+            standardId: standardFieldMetadata.standardId,
+          });
+        }
+      }
+
+      await objectMetadataRepository.save(updateObjectMetadataCollection);
+
+      await fieldMetadataRepository.save(updateFieldMetadataCollection);
+
+      await queryRunner.commitTransaction();
+    } catch (error) {
+      await queryRunner.rollbackTransaction();
+      this.logger.error('Error adding standard id to metadata', error);
+    } finally {
+      await queryRunner.release();
+    }
+  }
+
+  @Option({
+    flags: '-w, --workspace-id [workspace_id]',
+    description: 'workspace id',
+    required: false,
+  })
+  parseWorkspaceId(value: string): string {
+    return value;
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/services/sync-workspace-logger.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/services/sync-workspace-logger.service.ts
new file mode 100644
index 000000000000..25f92347d96f
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/services/sync-workspace-logger.service.ts
@@ -0,0 +1,83 @@
+import { Injectable } from '@nestjs/common';
+
+import { WorkspaceSyncStorage } from 'src/engine/workspace-manager/workspace-sync-metadata/storage/workspace-sync.storage';
+import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { CommandLogger } from 'src/command/command-logger';
+
+@Injectable()
+export class SyncWorkspaceLoggerService {
+  private readonly commandLogger = new CommandLogger(
+    SyncWorkspaceLoggerService.name,
+  );
+
+  constructor() {}
+
+  async saveLogs(
+    workspaceId: string,
+    storage: WorkspaceSyncStorage,
+    workspaceMigrations: WorkspaceMigrationEntity[],
+  ) {
+    // Create sub directory
+    await this.commandLogger.createSubDirectory(workspaceId);
+
+    // Save workspace migrations
+    await this.commandLogger.writeLog(
+      `${workspaceId}/workspace-migrations`,
+      workspaceMigrations,
+    );
+
+    // Save object metadata create collection
+    await this.commandLogger.writeLog(
+      `${workspaceId}/object-metadata-create-collection`,
+      storage.objectMetadataCreateCollection,
+    );
+
+    // Save object metadata update collection
+    await this.commandLogger.writeLog(
+      `${workspaceId}/object-metadata-update-collection`,
+      storage.objectMetadataUpdateCollection,
+    );
+
+    // Save object metadata delete collection
+    await this.commandLogger.writeLog(
+      `${workspaceId}/object-metadata-delete-collection`,
+      storage.objectMetadataDeleteCollection,
+    );
+
+    // Save field metadata create collection
+    await this.commandLogger.writeLog(
+      `${workspaceId}/field-metadata-create-collection`,
+      storage.fieldMetadataCreateCollection,
+    );
+
+    // Save field metadata update collection
+    await this.commandLogger.writeLog(
+      `${workspaceId}/field-metadata-update-collection`,
+      storage.fieldMetadataUpdateCollection,
+    );
+
+    // Save field metadata delete collection
+    await this.commandLogger.writeLog(
+      `${workspaceId}/field-metadata-delete-collection`,
+      storage.fieldMetadataDeleteCollection,
+    );
+
+    // Save relation metadata create collection
+    await this.commandLogger.writeLog(
+      `${workspaceId}/relation-metadata-create-collection`,
+      storage.relationMetadataCreateCollection,
+    );
+
+    // Save relation metadata update collection
+    await this.commandLogger.writeLog(
+      `${workspaceId}/relation-metadata-update-collection`,
+      storage.relationMetadataUpdateCollection,
+    );
+
+    // Save relation metadata delete collection
+    await this.commandLogger.writeLog(
+      `${workspaceId}/relation-metadata-delete-collection`,
+      storage.relationMetadataDeleteCollection,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command.ts
new file mode 100644
index 000000000000..b6d15d677bd5
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command.ts
@@ -0,0 +1,131 @@
+import { Logger } from '@nestjs/common';
+
+import { Command, CommandRunner, Option } from 'nest-commander';
+
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { WorkspaceSyncMetadataService } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service';
+import { WorkspaceHealthService } from 'src/engine/workspace-manager/workspace-health/workspace-health.service';
+import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
+
+import { SyncWorkspaceLoggerService } from './services/sync-workspace-logger.service';
+
+// TODO: implement dry-run
+interface RunWorkspaceMigrationsOptions {
+  workspaceId?: string;
+  dryRun?: boolean;
+  force?: boolean;
+}
+
+@Command({
+  name: 'workspace:sync-metadata',
+  description: 'Sync metadata',
+})
+export class SyncWorkspaceMetadataCommand extends CommandRunner {
+  private readonly logger = new Logger(SyncWorkspaceMetadataCommand.name);
+
+  constructor(
+    private readonly workspaceSyncMetadataService: WorkspaceSyncMetadataService,
+    private readonly workspaceHealthService: WorkspaceHealthService,
+    private readonly dataSourceService: DataSourceService,
+    private readonly syncWorkspaceLoggerService: SyncWorkspaceLoggerService,
+    private readonly workspaceService: WorkspaceService,
+  ) {
+    super();
+  }
+
+  async run(
+    _passedParam: string[],
+    options: RunWorkspaceMigrationsOptions,
+  ): Promise<void> {
+    const workspaceIds = options.workspaceId
+      ? [options.workspaceId]
+      : await this.workspaceService.getWorkspaceIds();
+
+    for (const workspaceId of workspaceIds) {
+      try {
+        const issues =
+          await this.workspaceHealthService.healthCheck(workspaceId);
+
+        // Security: abort if there are issues.
+        if (issues.length > 0) {
+          if (!options.force) {
+            this.logger.error(
+              `Workspace contains ${issues.length} issues, aborting.`,
+            );
+
+            this.logger.log(
+              'If you want to force the migration, use --force flag',
+            );
+            this.logger.log(
+              'Please use `workspace:health` command to check issues and fix them before running this command.',
+            );
+
+            return;
+          }
+
+          this.logger.warn(
+            `Workspace contains ${issues.length} issues, sync has been forced.`,
+          );
+        }
+      } catch (error) {
+        if (!options.force) {
+          throw error;
+        }
+
+        this.logger.warn(
+          `Workspace health check failed with error, but sync has been forced.`,
+          error,
+        );
+      }
+
+      const dataSourceMetadata =
+        await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
+          workspaceId,
+        );
+
+      const { storage, workspaceMigrations } =
+        await this.workspaceSyncMetadataService.synchronize(
+          {
+            workspaceId,
+            dataSourceId: dataSourceMetadata.id,
+          },
+          { applyChanges: !options.dryRun },
+        );
+
+      if (options.dryRun) {
+        await this.syncWorkspaceLoggerService.saveLogs(
+          workspaceId,
+          storage,
+          workspaceMigrations,
+        );
+      }
+    }
+  }
+
+  @Option({
+    flags: '-w, --workspace-id [workspace_id]',
+    description: 'workspace id',
+    required: false,
+  })
+  parseWorkspaceId(value: string): string {
+    return value;
+  }
+
+  @Option({
+    flags: '-d, --dry-run',
+    description: 'Dry run without applying changes',
+    required: false,
+  })
+  dryRun(): boolean {
+    return true;
+  }
+
+  @Option({
+    flags: '-f, --force',
+    description: 'Force migration',
+    required: false,
+  })
+  force(): boolean {
+    return true;
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module.ts
new file mode 100644
index 000000000000..c9fc90423322
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module.ts
@@ -0,0 +1,26 @@
+import { Module } from '@nestjs/common';
+
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module';
+import { WorkspaceHealthModule } from 'src/engine/workspace-manager/workspace-health/workspace-health.module';
+import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.module';
+import { AddStandardIdCommand } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command';
+
+import { SyncWorkspaceMetadataCommand } from './sync-workspace-metadata.command';
+
+import { SyncWorkspaceLoggerService } from './services/sync-workspace-logger.service';
+
+@Module({
+  imports: [
+    WorkspaceSyncMetadataModule,
+    WorkspaceHealthModule,
+    WorkspaceModule,
+    DataSourceModule,
+  ],
+  providers: [
+    SyncWorkspaceMetadataCommand,
+    AddStandardIdCommand,
+    SyncWorkspaceLoggerService,
+  ],
+})
+export class WorkspaceSyncMetadataCommandsModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/__tests__/workspace-field.comparator.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/__tests__/workspace-field.comparator.spec.ts
similarity index 78%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/__tests__/workspace-field.comparator.spec.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/__tests__/workspace-field.comparator.spec.ts
index 28bd2560a985..e4deb708c3a6 100644
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/__tests__/workspace-field.comparator.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/__tests__/workspace-field.comparator.spec.ts
@@ -1,6 +1,6 @@
-import { ComparatorAction } from 'src/workspace/workspace-sync-metadata/interfaces/comparator.interface';
+import { ComparatorAction } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface';
 
-import { WorkspaceFieldComparator } from 'src/workspace/workspace-sync-metadata/comparators/workspace-field.comparator';
+import { WorkspaceFieldComparator } from 'src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator';
 
 describe('WorkspaceFieldComparator', () => {
   let comparator: WorkspaceFieldComparator;
@@ -16,7 +16,6 @@ describe('WorkspaceFieldComparator', () => {
       type: 'TEXT',
       name: 'DefaultFieldName',
       label: 'Default Field Label',
-      targetColumnMap: 'default_column',
       defaultValue: null,
       description: 'Default description',
       isCustom: false,
@@ -29,7 +28,12 @@ describe('WorkspaceFieldComparator', () => {
   it('should generate CREATE action for new fields', () => {
     const original = { fields: [] } as any;
     const standard = {
-      fields: [createMockFieldMetadata({ name: 'New Field' })],
+      fields: [
+        createMockFieldMetadata({
+          standardId: 'no-field-1',
+          name: 'New Field',
+        }),
+      ],
     } as any;
 
     const result = comparator.compare(original, standard);
@@ -46,6 +50,7 @@ describe('WorkspaceFieldComparator', () => {
     const original = {
       fields: [
         createMockFieldMetadata({
+          standardId: '1',
           id: '1',
           isNullable: true,
         }),
@@ -54,6 +59,7 @@ describe('WorkspaceFieldComparator', () => {
     const standard = {
       fields: [
         createMockFieldMetadata({
+          standardId: '1',
           isNullable: false,
         }),
       ],
@@ -73,6 +79,7 @@ describe('WorkspaceFieldComparator', () => {
     const original = {
       fields: [
         createMockFieldMetadata({
+          standardId: '1',
           id: '1',
           name: 'Removed Field',
           isActive: true,
@@ -93,10 +100,12 @@ describe('WorkspaceFieldComparator', () => {
 
   it('should not generate any action for identical fields', () => {
     const original = {
-      fields: [createMockFieldMetadata({ id: '1', isActive: true })],
+      fields: [
+        createMockFieldMetadata({ standardId: '1', id: '1', isActive: true }),
+      ],
     } as any;
     const standard = {
-      fields: [createMockFieldMetadata({})],
+      fields: [createMockFieldMetadata({ standardId: '1' })],
     } as any;
 
     const result = comparator.compare(original, standard);
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/__tests__/workspace-object.comparator.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/__tests__/workspace-object.comparator.spec.ts
similarity index 83%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/__tests__/workspace-object.comparator.spec.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/__tests__/workspace-object.comparator.spec.ts
index a92a297cca3f..8e3456752e71 100644
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/__tests__/workspace-object.comparator.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/__tests__/workspace-object.comparator.spec.ts
@@ -1,6 +1,6 @@
-import { ComparatorAction } from 'src/workspace/workspace-sync-metadata/interfaces/comparator.interface';
+import { ComparatorAction } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface';
 
-import { WorkspaceObjectComparator } from 'src/workspace/workspace-sync-metadata/comparators/workspace-object.comparator';
+import { WorkspaceObjectComparator } from 'src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-object.comparator';
 
 describe('WorkspaceObjectComparator', () => {
   let comparator: WorkspaceObjectComparator;
@@ -22,6 +22,7 @@ describe('WorkspaceObjectComparator', () => {
 
   it('should generate CREATE action for new objects', () => {
     const standardObjectMetadata = createMockObjectMetadata({
+      standardId: 'no-object-1',
       description: 'A standard object',
     });
 
@@ -35,10 +36,12 @@ describe('WorkspaceObjectComparator', () => {
 
   it('should generate UPDATE action for objects with differences', () => {
     const originalObjectMetadata = createMockObjectMetadata({
+      standardId: '1',
       id: '1',
       description: 'Original description',
     });
     const standardObjectMetadata = createMockObjectMetadata({
+      standardId: '1',
       description: 'Updated description',
     });
 
@@ -58,10 +61,12 @@ describe('WorkspaceObjectComparator', () => {
 
   it('should generate SKIP action for identical objects', () => {
     const originalObjectMetadata = createMockObjectMetadata({
+      standardId: '1',
       id: '1',
       description: 'Same description',
     });
     const standardObjectMetadata = createMockObjectMetadata({
+      standardId: '1',
       description: 'Same description',
     });
 
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/__tests__/workspace-relation.comparator.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/__tests__/workspace-relation.comparator.spec.ts
similarity index 88%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/__tests__/workspace-relation.comparator.spec.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/__tests__/workspace-relation.comparator.spec.ts
index 74b824e622a7..a877eacba15d 100644
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/__tests__/workspace-relation.comparator.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/__tests__/workspace-relation.comparator.spec.ts
@@ -1,6 +1,6 @@
-import { ComparatorAction } from 'src/workspace/workspace-sync-metadata/interfaces/comparator.interface';
+import { ComparatorAction } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface';
 
-import { WorkspaceRelationComparator } from 'src/workspace/workspace-sync-metadata/comparators/workspace-relation.comparator';
+import { WorkspaceRelationComparator } from 'src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-relation.comparator';
 
 describe('WorkspaceRelationComparator', () => {
   let comparator: WorkspaceRelationComparator;
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/index.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/index.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/index.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/index.ts
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/utils/__tests__/order-object-properties.util.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/__tests__/order-object-properties.util.spec.ts
similarity index 90%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/utils/__tests__/order-object-properties.util.spec.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/__tests__/order-object-properties.util.spec.ts
index 60309e8b73aa..c0e2e230f1c3 100644
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/utils/__tests__/order-object-properties.util.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/__tests__/order-object-properties.util.spec.ts
@@ -1,4 +1,4 @@
-import { orderObjectProperties } from 'src/workspace/workspace-sync-metadata/comparators/utils/order-object-properties.util';
+import { orderObjectProperties } from 'src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/order-object-properties.util';
 
 describe('orderObjectProperties', () => {
   it('orders simple object properties', () => {
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/utils/__tests__/transform-metadata-for-comparison.util.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/__tests__/transform-metadata-for-comparison.util.spec.ts
similarity index 90%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/utils/__tests__/transform-metadata-for-comparison.util.spec.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/__tests__/transform-metadata-for-comparison.util.spec.ts
index ffa322ebc1f2..44be32a29c13 100644
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/utils/__tests__/transform-metadata-for-comparison.util.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/__tests__/transform-metadata-for-comparison.util.spec.ts
@@ -1,4 +1,4 @@
-import { transformMetadataForComparison } from 'src/workspace/workspace-sync-metadata/comparators/utils/transform-metadata-for-comparison.util'; // Adjust the import path as necessary
+import { transformMetadataForComparison } from 'src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/transform-metadata-for-comparison.util'; // Adjust the import path as necessary
 
 describe('transformMetadataForComparison', () => {
   // Test for a single object
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/utils/order-object-properties.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/order-object-properties.util.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/utils/order-object-properties.util.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/order-object-properties.util.ts
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/utils/transform-metadata-for-comparison.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/transform-metadata-for-comparison.util.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/utils/transform-metadata-for-comparison.util.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/transform-metadata-for-comparison.util.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator.ts
new file mode 100644
index 000000000000..fb64f47fad92
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator.ts
@@ -0,0 +1,209 @@
+import { Injectable } from '@nestjs/common';
+
+import diff from 'microdiff';
+
+import {
+  ComparatorAction,
+  FieldComparatorResult,
+} from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface';
+import { ComputedPartialFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
+import { ComputedPartialObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-object-metadata.interface';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { transformMetadataForComparison } from 'src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/transform-metadata-for-comparison.util';
+import {
+  FieldMetadataEntity,
+  FieldMetadataType,
+} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+const commonFieldPropertiesToIgnore = [
+  'id',
+  'createdAt',
+  'updatedAt',
+  'objectMetadataId',
+  'isActive',
+  'options',
+];
+
+const fieldPropertiesToStringify = ['defaultValue'] as const;
+
+@Injectable()
+export class WorkspaceFieldComparator {
+  constructor() {}
+
+  public compare(
+    originalObjectMetadata: ObjectMetadataEntity,
+    standardObjectMetadata: ComputedPartialObjectMetadata,
+  ): FieldComparatorResult[] {
+    const result: FieldComparatorResult[] = [];
+    const fieldPropertiesToUpdateMap: Record<
+      string,
+      Partial<ComputedPartialFieldMetadata>
+    > = {};
+
+    // Double security to only compare non-custom fields
+    const filteredOriginalFieldCollection =
+      originalObjectMetadata.fields.filter((field) => !field.isCustom);
+    const originalFieldMetadataMap = transformMetadataForComparison(
+      filteredOriginalFieldCollection,
+      {
+        shouldIgnoreProperty: (property, originalMetadata) => {
+          if (commonFieldPropertiesToIgnore.includes(property)) {
+            return true;
+          }
+
+          if (
+            originalMetadata &&
+            property === 'defaultValue' &&
+            originalMetadata.type === FieldMetadataType.SELECT
+          ) {
+            return true;
+          }
+
+          return false;
+        },
+        propertiesToStringify: fieldPropertiesToStringify,
+        keyFactory(datum) {
+          // Happen when the field is custom
+          return datum.standardId || datum.name;
+        },
+      },
+    );
+    const standardFieldMetadataMap = transformMetadataForComparison(
+      standardObjectMetadata.fields,
+      {
+        shouldIgnoreProperty: (property, originalMetadata) => {
+          if (['options', 'gate'].includes(property)) {
+            return true;
+          }
+
+          if (
+            originalMetadata &&
+            property === 'defaultValue' &&
+            originalMetadata.type === FieldMetadataType.SELECT
+          ) {
+            return true;
+          }
+
+          return false;
+        },
+        propertiesToStringify: fieldPropertiesToStringify,
+        keyFactory(datum) {
+          // Happen when the field is custom
+          return datum.standardId || datum.name;
+        },
+      },
+    );
+
+    // Compare fields
+    const fieldMetadataDifference = diff(
+      originalFieldMetadataMap,
+      standardFieldMetadataMap,
+    );
+
+    for (const difference of fieldMetadataDifference) {
+      const fieldName = difference.path[0];
+      const findField = (
+        field: ComputedPartialFieldMetadata | FieldMetadataEntity,
+      ) => {
+        if (field.isCustom) {
+          return field.name === fieldName;
+        }
+
+        return field.standardId === fieldName;
+      };
+      // Object shouldn't have thousands of fields, so we can use find here
+      const standardFieldMetadata =
+        standardObjectMetadata.fields.find(findField);
+      const originalFieldMetadata =
+        originalObjectMetadata.fields.find(findField);
+
+      switch (difference.type) {
+        case 'CREATE': {
+          if (!standardFieldMetadata) {
+            throw new Error(
+              `Field ${fieldName} not found in standardObjectMetadata`,
+            );
+          }
+
+          result.push({
+            action: ComparatorAction.CREATE,
+            object: {
+              ...standardFieldMetadata,
+              objectMetadataId: originalObjectMetadata.id,
+            },
+          });
+          break;
+        }
+        case 'CHANGE': {
+          if (!originalFieldMetadata) {
+            throw new Error(
+              `Field ${fieldName} not found in originalObjectMetadata`,
+            );
+          }
+
+          const id = originalFieldMetadata.id;
+          const property = difference.path[difference.path.length - 1];
+
+          // If the old value and the new value are both null, skip
+          // Database is storing null, and we can get undefined here
+          if (
+            difference.oldValue === null &&
+            (difference.value === null || difference.value === undefined)
+          ) {
+            break;
+          }
+
+          if (typeof property !== 'string') {
+            break;
+          }
+
+          if (!fieldPropertiesToUpdateMap[id]) {
+            fieldPropertiesToUpdateMap[id] = {};
+          }
+
+          // If the property is a stringified JSON, parse it
+          if (
+            (fieldPropertiesToStringify as readonly string[]).includes(property)
+          ) {
+            fieldPropertiesToUpdateMap[id][property] = JSON.parse(
+              difference.value,
+            );
+          } else {
+            fieldPropertiesToUpdateMap[id][property] = difference.value;
+          }
+          break;
+        }
+        case 'REMOVE': {
+          if (!originalFieldMetadata) {
+            throw new Error(
+              `Field ${fieldName} not found in originalObjectMetadata`,
+            );
+          }
+
+          if (difference.path.length === 1) {
+            result.push({
+              action: ComparatorAction.DELETE,
+              object: originalFieldMetadata,
+            });
+          }
+          break;
+        }
+      }
+    }
+
+    for (const [id, fieldPropertiesToUpdate] of Object.entries(
+      fieldPropertiesToUpdateMap,
+    )) {
+      result.push({
+        action: ComparatorAction.UPDATE,
+        object: {
+          id,
+          ...fieldPropertiesToUpdate,
+        },
+      });
+    }
+
+    return result;
+  }
+}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/workspace-object.comparator.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-object.comparator.ts
similarity index 75%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/workspace-object.comparator.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-object.comparator.ts
index 45bd6ce1812c..40f1ad2d8510 100644
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/workspace-object.comparator.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-object.comparator.ts
@@ -6,11 +6,11 @@ import omit from 'lodash.omit';
 import {
   ComparatorAction,
   ObjectComparatorResult,
-} from 'src/workspace/workspace-sync-metadata/interfaces/comparator.interface';
-import { PartialObjectMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/partial-object-metadata.interface';
+} from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface';
+import { ComputedPartialObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-object-metadata.interface';
 
-import { transformMetadataForComparison } from 'src/workspace/workspace-sync-metadata/comparators/utils/transform-metadata-for-comparison.util';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
+import { transformMetadataForComparison } from 'src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/transform-metadata-for-comparison.util';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 
 const objectPropertiesToIgnore = [
   'id',
@@ -28,7 +28,7 @@ export class WorkspaceObjectComparator {
 
   public compare(
     originalObjectMetadata: ObjectMetadataEntity | undefined,
-    standardObjectMetadata: PartialObjectMetadata,
+    standardObjectMetadata: ComputedPartialObjectMetadata,
   ): ObjectComparatorResult {
     // If the object doesn't exist in the original metadata, we need to create it
     if (!originalObjectMetadata) {
@@ -38,7 +38,7 @@ export class WorkspaceObjectComparator {
       };
     }
 
-    const objectPropertiesToUpdate: Partial<PartialObjectMetadata> = {};
+    const objectPropertiesToUpdate: Partial<ComputedPartialObjectMetadata> = {};
 
     // Only compare properties that are not ignored
     const partialOriginalObjectMetadata = transformMetadataForComparison(
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/workspace-relation.comparator.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-relation.comparator.ts
similarity index 90%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/workspace-relation.comparator.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-relation.comparator.ts
index 9982c27ade4f..a0baf8e53437 100644
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/workspace-relation.comparator.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-relation.comparator.ts
@@ -5,10 +5,10 @@ import diff from 'microdiff';
 import {
   ComparatorAction,
   RelationComparatorResult,
-} from 'src/workspace/workspace-sync-metadata/interfaces/comparator.interface';
+} from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface';
 
-import { RelationMetadataEntity } from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { transformMetadataForComparison } from 'src/workspace/workspace-sync-metadata/comparators/utils/transform-metadata-for-comparison.util';
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { transformMetadataForComparison } from 'src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/transform-metadata-for-comparison.util';
 
 const relationPropertiesToIgnore = ['createdAt', 'updatedAt'];
 const relationPropertiesToUpdate = ['onDeleteAction'];
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts
new file mode 100644
index 000000000000..f27e8f1e77ed
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts
@@ -0,0 +1,307 @@
+/**
+ * /!\ DO NOT EDIT THE IDS OF THIS FILE /!\
+ * This file contains static ids for standard objects.
+ * These ids are used to identify standard objects in the database and compare them even when renamed.
+ * For readability keys can be edited but the values should not be changed.
+ */
+
+export const activityTargetStandardFieldIds = {
+  activity: '20202020-ca58-478c-a4f5-ae825671c30e',
+  person: '20202020-4afd-4ae7-99c2-de57d795a93f',
+  company: '20202020-7cc0-44a1-8068-f11171fdd02e',
+  opportunity: '20202020-1fc2-4af1-8c91-7901ee0fd38b',
+  custom: '20202020-7f21-442f-94be-32462281b1ca',
+};
+
+export const activityStandardFieldIds = {
+  title: '20202020-24a1-4d94-a071-617f3eeed7b0',
+  body: '20202020-209b-440a-b2a8-043fa36a7d37',
+  type: '20202020-0f2b-4aab-8827-ee5d3f07d993',
+  reminderAt: '20202020-eb06-43e2-ba06-336be0e665a3',
+  dueAt: '20202020-0336-4511-ba79-565b12801bd9',
+  completedAt: '20202020-0f4d-4fca-9f2f-6309d9ecb85f',
+  activityTargets: '20202020-7253-42cb-8586-8cf950e70b79',
+  attachments: '20202020-5547-4197-bc2e-a07dfc4559ca',
+  comments: '20202020-6b2e-4d29-bbd1-ecddb330e71a',
+  author: '20202020-455f-44f2-8e89-1b0ef01cb7fb',
+  assignee: '20202020-4259-48e4-9e77-6b92991906d5',
+};
+
+export const apiKeyStandardFieldIds = {
+  name: '20202020-72e6-4079-815b-436ce8a62f23',
+  expiresAt: '20202020-659b-4241-af59-66515b8e7d40',
+  revokedAt: '20202020-06ab-44b5-8faf-f6e407685001',
+};
+
+export const attachmentStandardFieldIds = {
+  name: '20202020-87a5-48f8-bbf7-ade388825a57',
+  fullPath: '20202020-0d19-453d-8e8d-fbcda8ca3747',
+  type: '20202020-a417-49b8-a40b-f6a7874caa0d',
+  author: '20202020-6501-4ac5-a4ef-b2f8522ef6cd',
+  activity: '20202020-b569-481b-a13f-9b94e47e54fe',
+  person: '20202020-0158-4aa2-965c-5cdafe21ffa2',
+  company: '20202020-ceab-4a28-b546-73b06b4c08d5',
+  opportunity: '20202020-7374-499d-bea3-9354890755b5',
+  custom: '20202020-302d-43b3-9aea-aa4f89282a9f',
+};
+
+export const baseObjectStandardFieldIds = {
+  id: '20202020-eda0-4cee-9577-3eb357e3c22b',
+  createdAt: '20202020-66ac-4502-9975-e4d959c50311',
+  updatedAt: '20202020-d767-4622-bdcf-d8a084834d86',
+};
+
+export const blocklistStandardFieldIds = {
+  handle: '20202020-eef3-44ed-aa32-4641d7fd4a3e',
+  workspaceMember: '20202020-548d-4084-a947-fa20a39f7c06',
+};
+
+export const calendarChannelEventAssociationStandardFieldIds = {
+  calendarChannel: '20202020-93ee-4da4-8d58-0282c4a9cb7d',
+  calendarEvent: '20202020-5aa5-437e-bb86-f42d457783e3',
+  eventExternalId: '20202020-9ec8-48bb-b279-21d0734a75a1',
+};
+
+export const calendarChannelStandardFieldIds = {
+  connectedAccount: '20202020-95b1-4f44-82dc-61b042ae2414',
+  handle: '20202020-1d08-420a-9aa7-22e0f298232d',
+  visibility: '20202020-1b07-4796-9f01-d626bab7ca4d',
+  isContactAutoCreationEnabled: '20202020-50fb-404b-ba28-369911a3793a',
+  isSyncEnabled: '20202020-fe19-4818-8854-21f7b1b43395',
+  syncCursor: '20202020-bac2-4852-a5cb-7a7898992b70',
+  calendarChannelEventAssociations: '20202020-afb0-4a9f-979f-2d5087d71d09',
+};
+
+export const calendarEventParticipantStandardFieldIds = {
+  calendarEvent: '20202020-fe3a-401c-b889-af4f4657a861',
+  handle: '20202020-8692-4580-8210-9e09cbd031a7',
+  displayName: '20202020-ee1e-4f9f-8ac1-5c0b2f69691e',
+  isOrganizer: '20202020-66e7-4e00-9e06-d06c92650580',
+  responseStatus: '20202020-cec0-4be8-8fba-c366abc23147',
+  person: '20202020-5761-4842-8186-e1898ef93966',
+  workspaceMember: '20202020-20e4-4591-93ed-aeb17a4dcbd2',
+};
+
+export const calendarEventStandardFieldIds = {
+  title: '20202020-080e-49d1-b21d-9702a7e2525c',
+  isCanceled: '20202020-335b-4e04-b470-43b84b64863c',
+  isFullDay: '20202020-551c-402c-bb6d-dfe9efe86bcb',
+  startsAt: '20202020-2c57-4c75-93c5-2ac950a6ed67',
+  endsAt: '20202020-2554-4ee1-a617-17907f6bab21',
+  externalCreatedAt: '20202020-9f03-4058-a898-346c62181599',
+  externalUpdatedAt: '20202020-b355-4c18-8825-ef42c8a5a755',
+  description: '20202020-52c4-4266-a98f-e90af0b4d271',
+  location: '20202020-641a-4ffe-960d-c3c186d95b17',
+  iCalUID: '20202020-f24b-45f4-b6a3-d2f9fcb98714',
+  conferenceSolution: '20202020-1c3f-4b5a-b526-5411a82179eb',
+  conferenceLink: '20202020-35da-43ef-9ca0-e936e9dc237b',
+  recurringEventExternalId: '20202020-4b96-43d0-8156-4c7a9717635c',
+  calendarChannelEventAssociations: '20202020-bdf8-4572-a2cc-ecbb6bcc3a02',
+  calendarEventParticipants: '20202020-e07e-4ccb-88f5-6f3d00458eec',
+};
+
+export const commentStandardFieldIds = {
+  body: '20202020-d5eb-49d2-b3e0-1ed04145ebb7',
+  author: '20202020-2ab1-427e-a981-cf089de3a9bd',
+  activity: '20202020-c8d9-4c30-a35e-dc7f44388070',
+};
+
+export const companyStandardFieldIds = {
+  name: '20202020-4d99-4e2e-a84c-4a27837b1ece',
+  domainName: '20202020-0c28-43d8-8ba5-3659924d3489',
+  address: '20202020-a82a-4ee2-96cc-a18a3259d953',
+  employees: '20202020-8965-464a-8a75-74bafc152a0b',
+  linkedinLink: '20202020-ebeb-4beb-b9ad-6848036fb451',
+  xLink: '20202020-6f64-4fd9-9580-9c1991c7d8c3',
+  annualRecurringRevenue: '20202020-602a-495c-9776-f5d5b11d227b',
+  idealCustomerProfile: '20202020-ba6b-438a-8213-2c5ba28d76a2',
+  position: '20202020-9b4e-462b-991d-a0ee33326454',
+  people: '20202020-3213-4ddf-9494-6422bcff8d7c',
+  accountOwner: '20202020-95b8-4e10-9881-edb5d4765f9d',
+  activityTargets: '20202020-c2a5-4c9b-9d9a-582bcd57fbc8',
+  opportunities: '20202020-add3-4658-8e23-d70dccb6d0ec',
+  favorites: '20202020-4d1d-41ac-b13b-621631298d55',
+  attachments: '20202020-c1b5-4120-b0f0-987ca401ed53',
+  events: '20202020-0414-4daf-9c0d-64fe7b27f89f',
+};
+
+export const connectedAccountStandardFieldIds = {
+  handle: '20202020-c804-4a50-bb05-b3a9e24f1dec',
+  provider: '20202020-ebb0-4516-befc-a9e95935efd5',
+  accessToken: '20202020-707b-4a0a-8753-2ad42efe1e29',
+  refreshToken: '20202020-532d-48bd-80a5-c4be6e7f6e49',
+  accountOwner: '20202020-3517-4896-afac-b1d0aa362af6',
+  lastSyncHistoryId: '20202020-115c-4a87-b50f-ac4367a971b9',
+  authFailedAt: '20202020-d268-4c6b-baff-400d402b430a',
+  messageChannels: '20202020-24f7-4362-8468-042204d1e445',
+  calendarChannels: '20202020-af4a-47bb-99ec-51911c1d3977',
+};
+
+export const eventStandardFieldIds = {
+  properties: '20202020-f142-4b04-b91b-6a2b4af3bf10',
+  workspaceMember: '20202020-af23-4479-9a30-868edc474b35',
+  person: '20202020-c414-45b9-a60a-ac27aa96229e',
+  company: '20202020-04ad-4221-a744-7a8278a5ce20',
+  opportunity: '20202020-7664-4a35-a3df-580d389fd5f0',
+  custom: '20202020-4a71-41b0-9f83-9cdcca3f8b14',
+};
+
+export const favoriteStandardFieldIds = {
+  position: '20202020-dd26-42c6-8c3c-2a7598c204f6',
+  workspaceMember: '20202020-ce63-49cb-9676-fdc0c45892cd',
+  person: '20202020-c428-4f40-b6f3-86091511c41c',
+  company: '20202020-cff5-4682-8bf9-069169e08279',
+  opportunity: '20202020-dabc-48e1-8318-2781a2b32aa2',
+  custom: '20202020-855a-4bc8-9861-79deef37011f',
+};
+
+export const messageChannelMessageAssociationStandardFieldIds = {
+  messageChannel: '20202020-b658-408f-bd46-3bd2d15d7e52',
+  message: '20202020-da5d-4ac5-8743-342ab0a0336b',
+  messageExternalId: '20202020-37d6-438f-b6fd-6503596c8f34',
+  messageThread: '20202020-fac8-42a8-94dd-44dbc920ae16',
+  messageThreadExternalId: '20202020-35fb-421e-afa0-0b8e8f7f9018',
+};
+
+export const messageChannelStandardFieldIds = {
+  visibility: '20202020-6a6b-4532-9767-cbc61b469453',
+  handle: '20202020-2c96-43c3-93e3-ed6b1acb69bc',
+  connectedAccount: '20202020-49a2-44a4-b470-282c0440d15d',
+  type: '20202020-ae95-42d9-a3f1-797a2ea22122',
+  isContactAutoCreationEnabled: '20202020-fabd-4f14-b7c6-3310f6d132c6',
+  messageChannelMessageAssociations: '20202020-49b8-4766-88fd-75f1e21b3d5f',
+  syncCursor: '20202020-79d1-41cf-b738-bcf5ed61e256',
+  syncedAt: '20202020-263d-4c6b-ad51-137ada56f7d4',
+  syncStatus: '20202020-56a1-4f7e-9880-a8493bb899cc',
+  ongoingSyncStartedAt: '20202020-8c61-4a42-ae63-73c1c3c52e06',
+};
+
+export const messageParticipantStandardFieldIds = {
+  message: '20202020-985b-429a-9db9-9e55f4898a2a',
+  role: '20202020-65d1-42f4-8729-c9ec1f52aecd',
+  handle: '20202020-2456-464e-b422-b965a4db4a0b',
+  displayName: '20202020-36dd-4a4f-ac02-228425be9fac',
+  person: '20202020-249d-4e0f-82cd-1b9df5cd3da2',
+  workspaceMember: '20202020-77a7-4845-99ed-1bcbb478be6f',
+};
+
+export const messageThreadStandardFieldIds = {
+  messages: '20202020-3115-404f-aade-e1154b28e35a',
+  messageChannelMessageAssociations: '20202020-314e-40a4-906d-a5d5d6c285f6',
+};
+
+export const messageStandardFieldIds = {
+  headerMessageId: '20202020-72b5-416d-aed8-b55609067d01',
+  messageThread: '20202020-30f2-4ccd-9f5c-e41bb9d26214',
+  direction: '20202020-0203-4118-8e2a-05b9bdae6dab',
+  subject: '20202020-52d1-4036-b9ae-84bd722bb37a',
+  text: '20202020-d2ee-4e7e-89de-9a0a9044a143',
+  receivedAt: '20202020-140a-4a2a-9f86-f13b6a979afc',
+  messageParticipants: '20202020-7cff-4a74-b63c-73228448cbd9',
+  messageChannelMessageAssociations: '20202020-3cef-43a3-82c6-50e7cfbc9ae4',
+};
+
+export const opportunityStandardFieldIds = {
+  name: '20202020-8609-4f65-a2d9-44009eb422b5',
+  amount: '20202020-583e-4642-8533-db761d5fa82f',
+  closeDate: '20202020-527e-44d6-b1ac-c4158d307b97',
+  probability: '20202020-69d4-45f3-9703-690b09fafcf0',
+  stage: '20202020-6f76-477d-8551-28cd65b2b4b9',
+  position: '20202020-806d-493a-bbc6-6313e62958e2',
+  pointOfContact: '20202020-8dfb-42fc-92b6-01afb759ed16',
+  company: '20202020-cbac-457e-b565-adece5fc815f',
+  favorites: '20202020-a1c2-4500-aaae-83ba8a0e827a',
+  activityTargets: '20202020-220a-42d6-8261-b2102d6eab35',
+  attachments: '20202020-87c7-4118-83d6-2f4031005209',
+  events: '20202020-30e2-421f-96c7-19c69d1cf631',
+};
+
+export const personStandardFieldIds = {
+  name: '20202020-3875-44d5-8c33-a6239011cab8',
+  email: '20202020-a740-42bb-8849-8980fb3f12e1',
+  linkedinLink: '20202020-f1af-48f7-893b-2007a73dd508',
+  xLink: '20202020-8fc2-487c-b84a-55a99b145cfd',
+  jobTitle: '20202020-b0d0-415a-bef9-640a26dacd9b',
+  phone: '20202020-4564-4b8b-a09f-05445f2e0bce',
+  city: '20202020-5243-4ffb-afc5-2c675da41346',
+  avatarUrl: '20202020-b8a6-40df-961c-373dc5d2ec21',
+  position: '20202020-fcd5-4231-aff5-fff583eaa0b1',
+  company: '20202020-e2f3-448e-b34c-2d625f0025fd',
+  pointOfContactForOpportunities: '20202020-911b-4a7d-b67b-918aa9a5b33a',
+  activityTargets: '20202020-dee7-4b7f-b50a-1f50bd3be452',
+  favorites: '20202020-4073-4117-9cf1-203bcdc91cbd',
+  attachments: '20202020-cd97-451f-87fa-bcb789bdbf3a',
+  messageParticipants: '20202020-498e-4c61-8158-fa04f0638334',
+  calendarEventParticipants: '20202020-52ee-45e9-a702-b64b3753e3a9',
+  events: '20202020-a43e-4873-9c23-e522de906ce5',
+};
+
+export const viewFieldStandardFieldIds = {
+  fieldMetadataId: '20202020-135f-4c5b-b361-15f24870473c',
+  isVisible: '20202020-e966-473c-9c18-f00d3347e0ba',
+  size: '20202020-6fab-4bd0-ae72-20f3ee39d581',
+  position: '20202020-19e5-4e4c-8c15-3a96d1fd0650',
+  view: '20202020-e8da-4521-afab-d6d231f9fa18',
+};
+
+export const viewFilterStandardFieldIds = {
+  fieldMetadataId: '20202020-c9aa-4c94-8d0e-9592f5008fb0',
+  operand: '20202020-bd23-48c4-9fab-29d1ffb80310',
+  value: '20202020-1e55-4a1e-a1d2-fefb86a5fce5',
+  displayValue: '20202020-1270-4ebf-9018-c0ec10d5038e',
+  view: '20202020-4f5b-487e-829c-3d881c163611',
+};
+
+export const viewSortStandardFieldIds = {
+  fieldMetadataId: '20202020-8240-4657-aee4-7f0df8e94eca',
+  direction: '20202020-b06e-4eb3-9b58-0a62e5d79836',
+  view: '20202020-bd6c-422b-9167-5c105f2d02c8',
+};
+
+export const viewStandardFieldIds = {
+  name: '20202020-12c6-4f37-b588-c9b9bf57328d',
+  objectMetadataId: '20202020-d6de-4fd5-84dd-47f9e730368b',
+  type: '20202020-dd11-4607-9ec7-c57217262a7f',
+  key: '20202020-298e-49fa-9f4a-7b416b110443',
+  icon: '20202020-1f08-4fd9-929b-cbc07f317166',
+  kanbanFieldMetadataId: '20202020-d09b-4f65-ac42-06a2f20ba0e8',
+  position: '20202020-e9db-4303-b271-e8250c450172',
+  isCompact: '20202020-674e-4314-994d-05754ea7b22b',
+  viewFields: '20202020-542b-4bdc-b177-b63175d48edf',
+  viewFilters: '20202020-ff23-4154-b63c-21fb36cd0967',
+  viewSorts: '20202020-891b-45c3-9fe1-80a75b4aa043',
+};
+
+export const webhookStandardFieldIds = {
+  targetUrl: '20202020-1229-45a8-8cf4-85c9172aae12',
+  operation: '20202020-15b7-458e-bf30-74770a54410c',
+};
+
+export const workspaceMemberStandardFieldIds = {
+  name: '20202020-e914-43a6-9c26-3603c59065f4',
+  colorScheme: '20202020-66bc-47f2-adac-f2ef7c598b63',
+  locale: '20202020-402e-4695-b169-794fa015afbe',
+  avatarUrl: '20202020-0ced-4c4f-a376-c98a966af3f6',
+  userEmail: '20202020-4c5f-4e09-bebc-9e624e21ecf4',
+  userId: '20202020-75a9-4dfc-bf25-2e4b43e89820',
+  authoredActivities: '20202020-f139-4f13-a82f-a65a8d290a74',
+  assignedActivities: '20202020-5c97-42b6-8ca9-c07622cbb33f',
+  favorites: '20202020-f3c1-4faf-b343-cf7681038757',
+  accountOwnerForCompanies: '20202020-dc29-4bd4-a3c1-29eafa324bee',
+  authoredAttachments: '20202020-000f-4947-917f-1b09851024fe',
+  authoredComments: '20202020-5536-4f59-b837-51c45ef43b05',
+  connectedAccounts: '20202020-e322-4bde-a525-727079b4a100',
+  messageParticipants: '20202020-8f99-48bc-a5eb-edd33dd54188',
+  blocklist: '20202020-6cb2-4161-9f29-a4b7f1283859',
+  calendarEventParticipants: '20202020-0dbc-4841-9ce1-3e793b5b3512',
+  events: '20202020-e15b-47b8-94fe-8200e3c66615',
+};
+
+export const customObjectStandardFieldIds = {
+  name: '20202020-ba07-4ffd-ba63-009491f5749c',
+  position: '20202020-c2bd-4e16-bb9a-c8b0411bf49d',
+  activityTargets: '20202020-7f42-40ae-b96c-c8a61acc83bf',
+  favorites: '20202020-a4a7-4686-b296-1c6c3482ee21',
+  attachments: '20202020-8d59-46ca-b7b2-73d167712134',
+  events: '20202020-a508-4334-9724-5c2bf1b05998',
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids.ts
new file mode 100644
index 000000000000..7af744af56ba
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids.ts
@@ -0,0 +1,36 @@
+/**
+ * /!\ DO NOT EDIT THE IDS OF THIS FILE /!\
+ * This file contains static ids for standard objects.
+ * These ids are used to identify standard objects in the database and compare them even when renamed.
+ * For readability keys can be edited but the values should not be changed.
+ */
+
+export const standardObjectIds = {
+  activityTarget: '20202020-2945-440e-8d1a-f84672d33d5e',
+  activity: '20202020-39aa-4a89-843b-eb5f2a8b677f',
+  apiKey: '20202020-4c00-401d-8cda-ec6a4c41cd7d',
+  attachment: '20202020-bd3d-4c60-8dca-571c71d4447a',
+  blocklist: '20202020-0408-4f38-b8a8-4d5e3e26e24d',
+  calendarChannelEventAssociation: '20202020-491b-4aaa-9825-afd1bae6ae00',
+  calendarChannel: '20202020-e8f2-40e1-a39c-c0e0039c5034',
+  calendarEventParticipant: '20202020-a1c3-47a6-9732-27e5b1e8436d',
+  calendarEvent: '20202020-8f1d-4eef-9f85-0d1965e27221',
+  comment: '20202020-435f-4de9-89b5-97e32233bf5f',
+  company: '20202020-b374-4779-a561-80086cb2e17f',
+  connectedAccount: '20202020-977e-46b2-890b-c3002ddfd5c5',
+  event: '20202020-6736-4337-b5c4-8b39fae325a5',
+  favorite: '20202020-ab56-4e05-92a3-e2414a499860',
+  messageChannelMessageAssociation: '20202020-ad1e-4127-bccb-d83ae04d2ccb',
+  messageChannel: '20202020-fe8c-40bc-a681-b80b771449b7',
+  messageParticipant: '20202020-a433-4456-aa2d-fd9cb26b774a',
+  messageThread: '20202020-849a-4c3e-84f5-a25a7d802271',
+  message: '20202020-3f6b-4425-80ab-e468899ab4b2',
+  opportunity: '20202020-9549-49dd-b2b2-883999db8938',
+  person: '20202020-e674-48e5-a542-72570eee7213',
+  viewField: '20202020-4d19-4655-95bf-b2a04cf206d4',
+  viewFilter: '20202020-6fb6-4631-aded-b7d67e952ec8',
+  viewSort: '20202020-e46a-47a8-939a-e5d911f83531',
+  view: '20202020-722e-4739-8e2c-0c372d661f49',
+  webhook: '20202020-be4d-4e08-811d-0fffcd13ffd4',
+  workspaceMember: '20202020-3319-4234-a34c-82d5c0e881a6',
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/custom-objects/custom.object-metadata.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/custom-objects/custom.object-metadata.ts
new file mode 100644
index 000000000000..c38fb3a958fa
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/custom-objects/custom.object-metadata.ts
@@ -0,0 +1,105 @@
+import { BaseCustomObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/base-custom-object-metadata.decorator';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import {
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { ActivityTargetObjectMetadata } from 'src/modules/activity/standard-objects/activity-target.object-metadata';
+import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
+import { FavoriteObjectMetadata } from 'src/modules/favorite/standard-objects/favorite.object-metadata';
+import { AttachmentObjectMetadata } from 'src/modules/attachment/standard-objects/attachment.object-metadata';
+import { customObjectStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { EventObjectMetadata } from 'src/modules/event/standard-objects/event.object-metadata';
+
+@BaseCustomObjectMetadata()
+export class CustomObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: customObjectStandardFieldIds.name,
+    label: 'Name',
+    description: 'Name',
+    type: FieldMetadataType.TEXT,
+    icon: 'IconAbc',
+    defaultValue: "'Untitled'",
+  })
+  name: string;
+
+  @FieldMetadata({
+    standardId: customObjectStandardFieldIds.position,
+    label: 'Position',
+    description: 'Position',
+    type: FieldMetadataType.POSITION,
+    icon: 'IconHierarchy2',
+  })
+  @IsNullable()
+  @IsSystem()
+  position: number;
+
+  @FieldMetadata({
+    standardId: customObjectStandardFieldIds.activityTargets,
+    type: FieldMetadataType.RELATION,
+    label: 'Activities',
+    description: (objectMetadata) =>
+      `Activities tied to the ${objectMetadata.labelSingular}`,
+    icon: 'IconCheckbox',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => ActivityTargetObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  activityTargets: ActivityTargetObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: customObjectStandardFieldIds.favorites,
+    type: FieldMetadataType.RELATION,
+    label: 'Favorites',
+    description: (objectMetadata) =>
+      `Favorites tied to the ${objectMetadata.labelSingular}`,
+    icon: 'IconHeart',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => FavoriteObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  @IsSystem()
+  favorites: FavoriteObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: customObjectStandardFieldIds.attachments,
+    type: FieldMetadataType.RELATION,
+    label: 'Attachments',
+    description: (objectMetadata) =>
+      `Attachments tied to the ${objectMetadata.labelSingular}`,
+    icon: 'IconFileImport',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => AttachmentObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  attachments: AttachmentObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: customObjectStandardFieldIds.events,
+    type: FieldMetadataType.RELATION,
+    label: 'Events',
+    description: (objectMetadata) =>
+      `Events tied to the ${objectMetadata.labelSingular}`,
+    icon: 'IconJson',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => EventObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  events: EventObjectMetadata[];
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/base-custom-object-metadata.decorator.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/base-custom-object-metadata.decorator.ts
new file mode 100644
index 000000000000..34e821d63181
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/base-custom-object-metadata.decorator.ts
@@ -0,0 +1,20 @@
+import { BaseCustomObjectMetadataDecoratorParams } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-custom-object-metadata.interface';
+
+import { TypedReflect } from 'src/utils/typed-reflect';
+
+export function BaseCustomObjectMetadata(
+  params?: BaseCustomObjectMetadataDecoratorParams,
+): ClassDecorator {
+  return (target) => {
+    const gate = TypedReflect.getMetadata('gate', target);
+
+    TypedReflect.defineMetadata(
+      'extendObjectMetadata',
+      {
+        ...params,
+        gate,
+      },
+      target,
+    );
+  };
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/dynamic-field-metadata.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/dynamic-field-metadata.interface.ts
new file mode 100644
index 000000000000..3d0b49ec3759
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/dynamic-field-metadata.interface.ts
@@ -0,0 +1,27 @@
+import { DynamicRelationFieldMetadataDecoratorParams } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-computed-relation-field-metadata.interface';
+
+import { TypedReflect } from 'src/utils/typed-reflect';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+export function DynamicRelationFieldMetadata(
+  params: DynamicRelationFieldMetadataDecoratorParams,
+): PropertyDecorator {
+  return (target: object, fieldKey: string) => {
+    const isSystem =
+      TypedReflect.getMetadata('isSystem', target, fieldKey) ?? false;
+    const gate = TypedReflect.getMetadata('gate', target, fieldKey);
+
+    TypedReflect.defineMetadata(
+      'dynamicRelationFieldMetadataMap',
+      {
+        type: FieldMetadataType.RELATION,
+        paramsFactory: params,
+        isCustom: false,
+        isNullable: true,
+        isSystem,
+        gate,
+      },
+      target.constructor,
+    );
+  };
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator.ts
new file mode 100644
index 000000000000..88e51b7a0391
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator.ts
@@ -0,0 +1,89 @@
+import {
+  FieldMetadataDecoratorParams,
+  ReflectFieldMetadata,
+} from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-field-metadata.interface';
+import { GateDecoratorParams } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/gate-decorator.interface';
+import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { generateDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/generate-default-value';
+import { TypedReflect } from 'src/utils/typed-reflect';
+import { createDeterministicUuid } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/create-deterministic-uuid.util';
+
+export function FieldMetadata<T extends FieldMetadataType>(
+  params: FieldMetadataDecoratorParams<T>,
+): PropertyDecorator {
+  return (target: object, fieldKey: string) => {
+    const existingFieldMetadata =
+      TypedReflect.getMetadata('fieldMetadataMap', target.constructor) ?? {};
+    const isNullable =
+      TypedReflect.getMetadata('isNullable', target, fieldKey) ?? false;
+    const isSystem =
+      TypedReflect.getMetadata('isSystem', target, fieldKey) ?? false;
+    const gate = TypedReflect.getMetadata('gate', target, fieldKey);
+    const { joinColumn, standardId, ...restParams } = params;
+
+    TypedReflect.defineMetadata(
+      'fieldMetadataMap',
+      {
+        ...existingFieldMetadata,
+        [fieldKey]: generateFieldMetadata<T>(
+          {
+            ...restParams,
+            standardId,
+          },
+          fieldKey,
+          isNullable,
+          isSystem,
+          gate,
+        ),
+        ...(joinColumn && restParams.type === FieldMetadataType.RELATION
+          ? {
+              [joinColumn]: generateFieldMetadata<FieldMetadataType.UUID>(
+                {
+                  ...restParams,
+                  standardId: createDeterministicUuid(standardId),
+                  type: FieldMetadataType.UUID,
+                  label: `${restParams.label} id (foreign key)`,
+                  description: `${restParams.description} id foreign key`,
+                  defaultValue: null,
+                  options: undefined,
+                },
+                joinColumn,
+                isNullable,
+                true,
+                gate,
+              ),
+            }
+          : {}),
+      },
+      target.constructor,
+    );
+  };
+}
+
+function generateFieldMetadata<T extends FieldMetadataType>(
+  params: FieldMetadataDecoratorParams<T>,
+  fieldKey: string,
+  isNullable: boolean,
+  isSystem: boolean,
+  gate: GateDecoratorParams | undefined = undefined,
+): ReflectFieldMetadata[string] {
+  const defaultValue = (params.defaultValue ??
+    generateDefaultValue(
+      params.type,
+    )) as FieldMetadataDefaultValue<'default'> | null;
+
+  return {
+    name: fieldKey,
+    ...params,
+    isNullable: params.type === FieldMetadataType.RELATION ? true : isNullable,
+    isSystem,
+    isCustom: false,
+    options: params.options,
+    description: params.description,
+    icon: params.icon,
+    defaultValue,
+    gate,
+  };
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/gate.decorator.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/gate.decorator.ts
new file mode 100644
index 000000000000..c492e1b8a2fe
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/gate.decorator.ts
@@ -0,0 +1,13 @@
+import { GateDecoratorParams } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/gate-decorator.interface';
+
+import { TypedReflect } from 'src/utils/typed-reflect';
+
+export function Gate(metadata: GateDecoratorParams) {
+  return function (target: object, fieldKey?: string) {
+    if (fieldKey) {
+      TypedReflect.defineMetadata('gate', metadata, target, fieldKey);
+    } else {
+      TypedReflect.defineMetadata('gate', metadata, target);
+    }
+  };
+}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator.ts
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/is-system.decorator.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/is-system.decorator.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator.ts
new file mode 100644
index 000000000000..0c559d5ae370
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator.ts
@@ -0,0 +1,30 @@
+import { ObjectMetadataDecoratorParams } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-object-metadata.interface';
+
+import { TypedReflect } from 'src/utils/typed-reflect';
+import { convertClassNameToObjectMetadataName } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/convert-class-to-object-metadata-name.util';
+
+export function ObjectMetadata(
+  params: ObjectMetadataDecoratorParams,
+): ClassDecorator {
+  return (target) => {
+    const isSystem = TypedReflect.getMetadata('isSystem', target) ?? false;
+    const gate = TypedReflect.getMetadata('gate', target);
+    const objectName = convertClassNameToObjectMetadataName(target.name);
+
+    TypedReflect.defineMetadata(
+      'objectMetadata',
+      {
+        nameSingular: objectName,
+        ...params,
+        targetTableName: 'DEPRECATED',
+        isSystem,
+        isCustom: false,
+        isRemote: false,
+        description: params.description,
+        icon: params.icon,
+        gate,
+      },
+      target,
+    );
+  };
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator.ts
new file mode 100644
index 000000000000..2981b4f9c90a
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator.ts
@@ -0,0 +1,35 @@
+import 'reflect-metadata';
+
+import {
+  ReflectRelationMetadata,
+  RelationMetadataDecoratorParams,
+} from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-relation-metadata.interface';
+
+import { TypedReflect } from 'src/utils/typed-reflect';
+
+export function RelationMetadata<TClass extends object>(
+  params: RelationMetadataDecoratorParams<TClass>,
+): PropertyDecorator {
+  return (target: object, fieldKey: string) => {
+    const relationMetadataCollection =
+      TypedReflect.getMetadata(
+        'reflectRelationMetadataCollection',
+        target.constructor,
+      ) ?? [];
+    const gate = TypedReflect.getMetadata('gate', target, fieldKey);
+
+    TypedReflect.defineMetadata(
+      'reflectRelationMetadataCollection',
+      [
+        ...relationMetadataCollection,
+        {
+          target,
+          fieldKey,
+          ...params,
+          gate,
+        } satisfies ReflectRelationMetadata,
+      ],
+      target.constructor,
+    );
+  };
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/feature-flags.factory.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/feature-flags.factory.ts
new file mode 100644
index 000000000000..763f1b43701e
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/feature-flags.factory.ts
@@ -0,0 +1,34 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import { WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
+import { FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';
+
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+
+@Injectable()
+export class FeatureFlagFactory {
+  constructor(
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+  ) {}
+
+  async create(context: WorkspaceSyncContext): Promise<FeatureFlagMap> {
+    const workspaceFeatureFlags = await this.featureFlagRepository.find({
+      where: { workspaceId: context.workspaceId },
+    });
+
+    const workspaceFeatureFlagsMap = workspaceFeatureFlags.reduce(
+      (result, currentFeatureFlag) => {
+        result[currentFeatureFlag.key] = currentFeatureFlag.value;
+
+        return result;
+      },
+      {} as FeatureFlagMap,
+    );
+
+    return workspaceFeatureFlagsMap;
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/index.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/index.ts
new file mode 100644
index 000000000000..72185436922b
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/index.ts
@@ -0,0 +1,11 @@
+import { FeatureFlagFactory } from './feature-flags.factory';
+import { StandardFieldFactory } from './standard-field.factory';
+import { StandardObjectFactory } from './standard-object.factory';
+import { StandardRelationFactory } from './standard-relation.factory';
+
+export const workspaceSyncMetadataFactories = [
+  FeatureFlagFactory,
+  StandardFieldFactory,
+  StandardObjectFactory,
+  StandardRelationFactory,
+];
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory.ts
new file mode 100644
index 000000000000..d665fa556273
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory.ts
@@ -0,0 +1,102 @@
+import { Injectable } from '@nestjs/common';
+
+import { WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
+import { FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';
+import {
+  PartialComputedFieldMetadata,
+  PartialFieldMetadata,
+} from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
+import { ReflectFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-field-metadata.interface';
+import { ReflectObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-object-metadata.interface';
+import { ReflectDynamicRelationFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-computed-relation-field-metadata.interface';
+
+import { TypedReflect } from 'src/utils/typed-reflect';
+import { isGatedAndNotEnabled } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/is-gate-and-not-enabled.util';
+
+@Injectable()
+export class StandardFieldFactory {
+  create(
+    target: object,
+    context: WorkspaceSyncContext,
+    workspaceFeatureFlagsMap: FeatureFlagMap,
+  ): (PartialFieldMetadata | PartialComputedFieldMetadata)[] {
+    const reflectObjectMetadata = TypedReflect.getMetadata(
+      'objectMetadata',
+      target,
+    );
+    const reflectFieldMetadataMap =
+      TypedReflect.getMetadata('fieldMetadataMap', target) ?? [];
+    const reflectDynamicRelationFieldMetadataMap = TypedReflect.getMetadata(
+      'dynamicRelationFieldMetadataMap',
+      target,
+    );
+    const partialFieldMetadataCollection: (
+      | PartialFieldMetadata
+      | PartialComputedFieldMetadata
+    )[] = Object.values(reflectFieldMetadataMap)
+      .map((reflectFieldMetadata) =>
+        this.createFieldMetadata(
+          reflectObjectMetadata,
+          reflectFieldMetadata,
+          context,
+          workspaceFeatureFlagsMap,
+        ),
+      )
+      .filter((metadata): metadata is PartialFieldMetadata => !!metadata);
+    const partialComputedFieldMetadata = this.createComputedFieldMetadata(
+      reflectDynamicRelationFieldMetadataMap,
+      context,
+      workspaceFeatureFlagsMap,
+    );
+
+    if (partialComputedFieldMetadata) {
+      partialFieldMetadataCollection.push(partialComputedFieldMetadata);
+    }
+
+    return partialFieldMetadataCollection;
+  }
+
+  private createFieldMetadata(
+    reflectObjectMetadata: ReflectObjectMetadata | undefined,
+    reflectFieldMetadata: ReflectFieldMetadata[string],
+    context: WorkspaceSyncContext,
+    workspaceFeatureFlagsMap: FeatureFlagMap,
+  ): PartialFieldMetadata | undefined {
+    if (
+      isGatedAndNotEnabled(reflectFieldMetadata.gate, workspaceFeatureFlagsMap)
+    ) {
+      return undefined;
+    }
+
+    return {
+      ...reflectFieldMetadata,
+      workspaceId: context.workspaceId,
+      isSystem:
+        reflectObjectMetadata?.isSystem || reflectFieldMetadata.isSystem,
+    };
+  }
+
+  private createComputedFieldMetadata(
+    reflectDynamicRelationFieldMetadata:
+      | ReflectDynamicRelationFieldMetadata
+      | undefined,
+    context: WorkspaceSyncContext,
+    workspaceFeatureFlagsMap: FeatureFlagMap,
+  ): PartialComputedFieldMetadata | undefined {
+    if (
+      !reflectDynamicRelationFieldMetadata ||
+      isGatedAndNotEnabled(
+        reflectDynamicRelationFieldMetadata.gate,
+        workspaceFeatureFlagsMap,
+      )
+    ) {
+      return undefined;
+    }
+
+    return {
+      ...reflectDynamicRelationFieldMetadata,
+      workspaceId: context.workspaceId,
+      isSystem: reflectDynamicRelationFieldMetadata.isSystem,
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-object.factory.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-object.factory.ts
new file mode 100644
index 000000000000..b68fd2393aa2
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-object.factory.ts
@@ -0,0 +1,59 @@
+import { Injectable } from '@nestjs/common';
+
+import { WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
+import { PartialObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-object-metadata.interface';
+import { FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';
+
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { TypedReflect } from 'src/utils/typed-reflect';
+import { isGatedAndNotEnabled } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/is-gate-and-not-enabled.util';
+
+import { StandardFieldFactory } from './standard-field.factory';
+
+@Injectable()
+export class StandardObjectFactory {
+  constructor(private readonly standardFieldFactory: StandardFieldFactory) {}
+
+  create(
+    standardObjectMetadataDefinitions: (typeof BaseObjectMetadata)[],
+    context: WorkspaceSyncContext,
+    workspaceFeatureFlagsMap: FeatureFlagMap,
+  ): PartialObjectMetadata[] {
+    return standardObjectMetadataDefinitions
+      .map((metadata) =>
+        this.createObjectMetadata(metadata, context, workspaceFeatureFlagsMap),
+      )
+      .filter((metadata): metadata is PartialObjectMetadata => !!metadata);
+  }
+
+  private createObjectMetadata(
+    metadata: typeof BaseObjectMetadata,
+    context: WorkspaceSyncContext,
+    workspaceFeatureFlagsMap: FeatureFlagMap,
+  ): PartialObjectMetadata | undefined {
+    const objectMetadata = TypedReflect.getMetadata('objectMetadata', metadata);
+
+    if (!objectMetadata) {
+      throw new Error(
+        `Object metadata decorator not found, can\'t parse ${metadata.name}`,
+      );
+    }
+
+    if (isGatedAndNotEnabled(objectMetadata.gate, workspaceFeatureFlagsMap)) {
+      return undefined;
+    }
+
+    const fields = this.standardFieldFactory.create(
+      metadata,
+      context,
+      workspaceFeatureFlagsMap,
+    );
+
+    return {
+      ...objectMetadata,
+      workspaceId: context.workspaceId,
+      dataSourceId: context.dataSourceId,
+      fields,
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-relation.factory.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-relation.factory.ts
new file mode 100644
index 000000000000..01b1e561aeae
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-relation.factory.ts
@@ -0,0 +1,169 @@
+import { Injectable } from '@nestjs/common';
+
+import { WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
+import { FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';
+
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { TypedReflect } from 'src/utils/typed-reflect';
+import { isGatedAndNotEnabled } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/is-gate-and-not-enabled.util';
+import { assert } from 'src/utils/assert';
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { convertClassNameToObjectMetadataName } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/convert-class-to-object-metadata-name.util';
+
+interface CustomRelationFactory {
+  object: ObjectMetadataEntity;
+  metadata: typeof BaseObjectMetadata;
+}
+
+@Injectable()
+export class StandardRelationFactory {
+  create(
+    customObjectFactories: CustomRelationFactory[],
+    context: WorkspaceSyncContext,
+    originalObjectMetadataMap: Record<string, ObjectMetadataEntity>,
+    workspaceFeatureFlagsMap: FeatureFlagMap,
+  ): Partial<RelationMetadataEntity>[];
+
+  create(
+    standardObjectMetadataDefinitions: (typeof BaseObjectMetadata)[],
+    context: WorkspaceSyncContext,
+    originalObjectMetadataMap: Record<string, ObjectMetadataEntity>,
+    workspaceFeatureFlagsMap: FeatureFlagMap,
+  ): Partial<RelationMetadataEntity>[];
+
+  create(
+    standardObjectMetadataDefinitionsOrCustomObjectFactories:
+      | (typeof BaseObjectMetadata)[]
+      | {
+          object: ObjectMetadataEntity;
+          metadata: typeof BaseObjectMetadata;
+        }[],
+    context: WorkspaceSyncContext,
+    originalObjectMetadataMap: Record<string, ObjectMetadataEntity>,
+    workspaceFeatureFlagsMap: FeatureFlagMap,
+  ): Partial<RelationMetadataEntity>[] {
+    return standardObjectMetadataDefinitionsOrCustomObjectFactories.flatMap(
+      (
+        standardObjectMetadata:
+          | typeof BaseObjectMetadata
+          | CustomRelationFactory,
+      ) =>
+        this.createRelationMetadata(
+          standardObjectMetadata,
+          context,
+          originalObjectMetadataMap,
+          workspaceFeatureFlagsMap,
+        ),
+    );
+  }
+
+  private createRelationMetadata(
+    standardObjectMetadataOrCustomRelationFactory:
+      | typeof BaseObjectMetadata
+      | CustomRelationFactory,
+    context: WorkspaceSyncContext,
+    originalObjectMetadataMap: Record<string, ObjectMetadataEntity>,
+    workspaceFeatureFlagsMap: FeatureFlagMap,
+  ): Partial<RelationMetadataEntity>[] {
+    const standardObjectMetadata =
+      'metadata' in standardObjectMetadataOrCustomRelationFactory
+        ? standardObjectMetadataOrCustomRelationFactory.metadata
+        : standardObjectMetadataOrCustomRelationFactory;
+    const objectMetadata = TypedReflect.getMetadata(
+      'metadata' in standardObjectMetadataOrCustomRelationFactory
+        ? 'extendObjectMetadata'
+        : 'objectMetadata',
+      standardObjectMetadata,
+    );
+    const reflectRelationMetadataCollection = TypedReflect.getMetadata(
+      'reflectRelationMetadataCollection',
+      standardObjectMetadata,
+    );
+
+    if (!objectMetadata) {
+      throw new Error(
+        `Object metadata decorator not found, can\'t parse ${standardObjectMetadata.name}`,
+      );
+    }
+
+    if (
+      !reflectRelationMetadataCollection ||
+      isGatedAndNotEnabled(objectMetadata?.gate, workspaceFeatureFlagsMap)
+    ) {
+      return [];
+    }
+
+    return reflectRelationMetadataCollection
+      .filter(
+        (reflectRelationMetadata) =>
+          !isGatedAndNotEnabled(
+            reflectRelationMetadata.gate,
+            workspaceFeatureFlagsMap,
+          ),
+      )
+      .map((reflectRelationMetadata) => {
+        // Compute reflect relation metadata
+        const fromObjectNameSingular =
+          'object' in standardObjectMetadataOrCustomRelationFactory
+            ? standardObjectMetadataOrCustomRelationFactory.object.nameSingular
+            : convertClassNameToObjectMetadataName(
+                reflectRelationMetadata.target.constructor.name,
+              );
+        const toObjectNameSingular = convertClassNameToObjectMetadataName(
+          reflectRelationMetadata.inverseSideTarget().name,
+        );
+        const fromFieldMetadataName = reflectRelationMetadata.fieldKey;
+        const toFieldMetadataName =
+          (reflectRelationMetadata.inverseSideFieldKey as string | undefined) ??
+          fromObjectNameSingular;
+        const fromObjectMetadata =
+          originalObjectMetadataMap[fromObjectNameSingular];
+
+        assert(
+          fromObjectMetadata,
+          `Object ${fromObjectNameSingular} not found in DB 
+        for relation FROM defined in class ${fromObjectNameSingular}`,
+        );
+
+        const toObjectMetadata =
+          originalObjectMetadataMap[toObjectNameSingular];
+
+        assert(
+          toObjectMetadata,
+          `Object ${toObjectNameSingular} not found in DB
+        for relation TO defined in class ${fromObjectNameSingular}`,
+        );
+
+        const fromFieldMetadata = fromObjectMetadata?.fields.find(
+          (field) => field.name === fromFieldMetadataName,
+        );
+
+        assert(
+          fromFieldMetadata,
+          `Field ${fromFieldMetadataName} not found in object ${fromObjectNameSingular}
+        for relation FROM defined in class ${fromObjectNameSingular}`,
+        );
+
+        const toFieldMetadata = toObjectMetadata?.fields.find(
+          (field) => field.name === toFieldMetadataName,
+        );
+
+        assert(
+          toFieldMetadata,
+          `Field ${toFieldMetadataName} not found in object ${toObjectNameSingular}
+        for relation TO defined in class ${fromObjectNameSingular}`,
+        );
+
+        return {
+          relationType: reflectRelationMetadata.type,
+          fromObjectMetadataId: fromObjectMetadata?.id,
+          toObjectMetadataId: toObjectMetadata?.id,
+          fromFieldMetadataId: fromFieldMetadata?.id,
+          toFieldMetadataId: toFieldMetadata?.id,
+          workspaceId: context.workspaceId,
+          onDeleteAction: reflectRelationMetadata.onDelete,
+        };
+      });
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface.ts
new file mode 100644
index 000000000000..c39a440a77c8
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface.ts
@@ -0,0 +1,51 @@
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+
+import { ComputedPartialFieldMetadata } from './partial-field-metadata.interface';
+import { ComputedPartialObjectMetadata } from './partial-object-metadata.interface';
+
+export const enum ComparatorAction {
+  SKIP = 'SKIP',
+  CREATE = 'CREATE',
+  UPDATE = 'UPDATE',
+  DELETE = 'DELETE',
+}
+
+export interface ComparatorSkipResult {
+  action: ComparatorAction.SKIP;
+}
+
+export interface ComparatorCreateResult<T> {
+  action: ComparatorAction.CREATE;
+  object: T;
+}
+
+export interface ComparatorUpdateResult<T> {
+  action: ComparatorAction.UPDATE;
+  object: T;
+}
+
+export interface ComparatorDeleteResult<T> {
+  action: ComparatorAction.DELETE;
+  object: T;
+}
+
+export type ObjectComparatorResult =
+  | ComparatorSkipResult
+  | ComparatorCreateResult<ComputedPartialObjectMetadata>
+  | ComparatorUpdateResult<
+      Partial<ComputedPartialObjectMetadata> & { id: string }
+    >;
+
+export type FieldComparatorResult =
+  | ComparatorSkipResult
+  | ComparatorCreateResult<ComputedPartialFieldMetadata>
+  | ComparatorUpdateResult<
+      Partial<ComputedPartialFieldMetadata> & { id: string }
+    >
+  | ComparatorDeleteResult<FieldMetadataEntity>;
+
+export type RelationComparatorResult =
+  | ComparatorCreateResult<Partial<RelationMetadataEntity>>
+  | ComparatorDeleteResult<RelationMetadataEntity>
+  | ComparatorUpdateResult<Partial<RelationMetadataEntity>>;
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/gate-decorator.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/gate-decorator.interface.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/gate-decorator.interface.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/gate-decorator.interface.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/mapped-metadata.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/mapped-metadata.interface.ts
new file mode 100644
index 000000000000..fc4f329fa712
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/mapped-metadata.interface.ts
@@ -0,0 +1,19 @@
+import { PartialFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
+import { PartialObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-object-metadata.interface';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+export type MappedFieldMetadata = Record<string, PartialFieldMetadata>;
+
+export interface MappedObjectMetadata
+  extends Omit<PartialObjectMetadata, 'fields'> {
+  fields: MappedFieldMetadata;
+}
+
+export type MappedFieldMetadataEntity = Record<string, FieldMetadataEntity>;
+
+export interface MappedObjectMetadataEntity
+  extends Omit<ObjectMetadataEntity, 'fields'> {
+  fields: MappedFieldMetadataEntity;
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface.ts
new file mode 100644
index 000000000000..c8698c375329
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface.ts
@@ -0,0 +1,20 @@
+import { ReflectDynamicRelationFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-computed-relation-field-metadata.interface';
+import { ReflectFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-field-metadata.interface';
+
+export type PartialFieldMetadata = Omit<
+  ReflectFieldMetadata[string],
+  'joinColumn'
+> & {
+  workspaceId: string;
+  objectMetadataId?: string;
+};
+
+export type PartialComputedFieldMetadata =
+  ReflectDynamicRelationFieldMetadata & {
+    workspaceId: string;
+    objectMetadataId?: string;
+  };
+
+export type ComputedPartialFieldMetadata = {
+  [K in keyof PartialFieldMetadata]: ExcludeFunctions<PartialFieldMetadata[K]>;
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-object-metadata.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-object-metadata.interface.ts
new file mode 100644
index 000000000000..747cae43eb2b
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-object-metadata.interface.ts
@@ -0,0 +1,21 @@
+import {
+  ComputedPartialFieldMetadata,
+  PartialComputedFieldMetadata,
+  PartialFieldMetadata,
+} from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
+import { ReflectObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-object-metadata.interface';
+
+export type PartialObjectMetadata = ReflectObjectMetadata & {
+  id?: string;
+  workspaceId: string;
+  dataSourceId: string;
+  fields: (PartialFieldMetadata | PartialComputedFieldMetadata)[];
+};
+
+export type ComputedPartialObjectMetadata = Omit<
+  PartialObjectMetadata,
+  'standardId' | 'fields'
+> & {
+  standardId: string | null;
+  fields: ComputedPartialFieldMetadata[];
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-relation-metadata.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-relation-metadata.interface.ts
new file mode 100644
index 000000000000..d4286277e9af
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-relation-metadata.interface.ts
@@ -0,0 +1,10 @@
+import { ReflectRelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-relation-metadata.interface';
+
+export type PartialRelationMetadata = ReflectRelationMetadata & {
+  id: string;
+  workspaceId: string;
+  fromObjectMetadataId: string;
+  toObjectMetadataId: string;
+  fromFieldMetadataId: string;
+  toFieldMetadataId: string;
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-computed-relation-field-metadata.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-computed-relation-field-metadata.interface.ts
new file mode 100644
index 000000000000..01b2fd3c01b6
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-computed-relation-field-metadata.interface.ts
@@ -0,0 +1,24 @@
+import { GateDecoratorParams } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/gate-decorator.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+
+export type DynamicRelationFieldMetadataDecoratorParams = (
+  oppositeObjectMetadata: ObjectMetadataEntity,
+) => {
+  standardId: string;
+  name: string;
+  label: string;
+  joinColumn: string;
+  description?: string;
+  icon?: string;
+};
+
+export interface ReflectDynamicRelationFieldMetadata {
+  type: FieldMetadataType.RELATION;
+  paramsFactory: DynamicRelationFieldMetadataDecoratorParams;
+  isNullable: boolean;
+  isSystem: boolean;
+  isCustom: boolean;
+  gate?: GateDecoratorParams;
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-custom-object-metadata.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-custom-object-metadata.interface.ts
new file mode 100644
index 000000000000..cb009ca652c7
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-custom-object-metadata.interface.ts
@@ -0,0 +1,10 @@
+import { GateDecoratorParams } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/gate-decorator.interface';
+
+export type BaseCustomObjectMetadataDecoratorParams =
+  | { allowObjectNameList?: string[] }
+  | { denyObjectNameList?: string[] };
+
+export type ReflectBaseCustomObjectMetadata =
+  BaseCustomObjectMetadataDecoratorParams & {
+    gate?: GateDecoratorParams;
+  };
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-field-metadata.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-field-metadata.interface.ts
new file mode 100644
index 000000000000..e126c65817f9
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-field-metadata.interface.ts
@@ -0,0 +1,35 @@
+import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
+import { GateDecoratorParams } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/gate-decorator.interface';
+import { FieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+
+export interface FieldMetadataDecoratorParams<
+  T extends FieldMetadataType | 'default',
+> {
+  standardId: string;
+  type: T;
+  label: string | ((objectMetadata: ObjectMetadataEntity) => string);
+  description?: string | ((objectMetadata: ObjectMetadataEntity) => string);
+  icon?: string;
+  defaultValue?: FieldMetadataDefaultValue<T>;
+  joinColumn?: string;
+  options?: FieldMetadataOptions<T>;
+}
+
+export interface ReflectFieldMetadata {
+  [key: string]: Omit<
+    FieldMetadataDecoratorParams<'default'>,
+    'defaultValue' | 'type' | 'options'
+  > & {
+    name: string;
+    type: FieldMetadataType;
+    isNullable: boolean;
+    isSystem: boolean;
+    isCustom: boolean;
+    defaultValue: FieldMetadataDefaultValue<'default'> | null;
+    gate?: GateDecoratorParams;
+    options?: FieldMetadataOptions<'default'> | null;
+  };
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-object-metadata.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-object-metadata.interface.ts
new file mode 100644
index 000000000000..26a17b9135d5
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-object-metadata.interface.ts
@@ -0,0 +1,19 @@
+import { GateDecoratorParams } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/gate-decorator.interface';
+
+export interface ObjectMetadataDecoratorParams {
+  standardId: string;
+  namePlural: string;
+  labelSingular: string;
+  labelPlural: string;
+  description?: string;
+  icon?: string;
+}
+
+export interface ReflectObjectMetadata extends ObjectMetadataDecoratorParams {
+  nameSingular: string;
+  targetTableName: string;
+  isSystem: boolean;
+  isCustom: boolean;
+  isRemote: boolean;
+  gate?: GateDecoratorParams;
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-relation-metadata.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-relation-metadata.interface.ts
new file mode 100644
index 000000000000..13f8c1a0d740
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-relation-metadata.interface.ts
@@ -0,0 +1,23 @@
+import { ObjectType } from 'typeorm';
+
+import { GateDecoratorParams } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/gate-decorator.interface';
+
+import {
+  RelationOnDeleteAction,
+  RelationMetadataType,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+
+export interface RelationMetadataDecoratorParams<T> {
+  type: RelationMetadataType;
+  inverseSideTarget: () => ObjectType<T>;
+  inverseSideFieldKey?: keyof T;
+  onDelete: RelationOnDeleteAction;
+}
+
+export interface ReflectRelationMetadata
+  extends RelationMetadataDecoratorParams<any> {
+  target: object;
+  fieldKey: string;
+  gate?: GateDecoratorParams;
+  onDelete: RelationOnDeleteAction;
+}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/workspace-sync-context.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/workspace-sync-context.interface.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-metadata-updater.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-metadata-updater.service.ts
new file mode 100644
index 000000000000..6eb43d92586a
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-metadata-updater.service.ts
@@ -0,0 +1,310 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import {
+  EntityManager,
+  EntityTarget,
+  FindOptionsWhere,
+  In,
+  ObjectLiteral,
+} from 'typeorm';
+import { v4 as uuidV4 } from 'uuid';
+
+import { PartialFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import {
+  FieldMetadataEntity,
+  FieldMetadataType,
+} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { FieldMetadataComplexOption } from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
+import { WorkspaceSyncStorage } from 'src/engine/workspace-manager/workspace-sync-metadata/storage/workspace-sync.storage';
+import { FieldMetadataUpdate } from 'src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-field.factory';
+import { ObjectMetadataUpdate } from 'src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-object.factory';
+
+@Injectable()
+export class WorkspaceMetadataUpdaterService {
+  private readonly logger = new Logger(WorkspaceMetadataUpdaterService.name);
+
+  async updateObjectMetadata(
+    manager: EntityManager,
+    storage: WorkspaceSyncStorage,
+  ): Promise<{
+    createdObjectMetadataCollection: ObjectMetadataEntity[];
+    updatedObjectMetadataCollection: ObjectMetadataUpdate[];
+  }> {
+    const objectMetadataRepository =
+      manager.getRepository(ObjectMetadataEntity);
+
+    /**
+     * Create object metadata
+     */
+    const createdPartialObjectMetadataCollection =
+      await objectMetadataRepository.save(
+        storage.objectMetadataCreateCollection.map((objectMetadata) => ({
+          ...objectMetadata,
+          isActive: true,
+          fields: objectMetadata.fields.map((field) =>
+            this.prepareFieldMetadataForCreation(field),
+          ),
+        })) as DeepPartial<ObjectMetadataEntity>[],
+      );
+    const identifiers = createdPartialObjectMetadataCollection.map(
+      (object) => object.id,
+    );
+    const createdObjectMetadataCollection = await manager.find(
+      ObjectMetadataEntity,
+      {
+        where: { id: In(identifiers) },
+        relations: ['dataSource', 'fields'],
+      },
+    );
+
+    /**
+     * Update object metadata
+     */
+    const updatedObjectMetadataCollection = await this.updateEntities(
+      manager,
+      ObjectMetadataEntity,
+      storage.objectMetadataUpdateCollection,
+      [
+        'fields',
+        'dataSourceId',
+        'workspaceId',
+        'labelIdentifierFieldMetadataId',
+        'imageIdentifierFieldMetadataId',
+      ],
+    );
+
+    /**
+     * Delete object metadata
+     */
+    if (storage.objectMetadataDeleteCollection.length > 0) {
+      await objectMetadataRepository.delete(
+        storage.objectMetadataDeleteCollection.map((object) => object.id),
+      );
+    }
+
+    return {
+      createdObjectMetadataCollection,
+      updatedObjectMetadataCollection,
+    };
+  }
+
+  /**
+   * TODO: Refactor this
+   */
+  private prepareFieldMetadataForCreation(field: PartialFieldMetadata) {
+    return {
+      ...field,
+      ...(field.type === FieldMetadataType.SELECT && field.options
+        ? {
+            options: this.generateUUIDForNewSelectFieldOptions(
+              field.options as FieldMetadataComplexOption[],
+            ),
+          }
+        : {}),
+      isActive: true,
+    };
+  }
+
+  private generateUUIDForNewSelectFieldOptions(
+    options: FieldMetadataComplexOption[],
+  ): FieldMetadataComplexOption[] {
+    return options.map((option) => ({
+      ...option,
+      id: uuidV4(),
+    }));
+  }
+
+  async updateFieldMetadata(
+    manager: EntityManager,
+    storage: WorkspaceSyncStorage,
+  ): Promise<{
+    createdFieldMetadataCollection: FieldMetadataEntity[];
+    updatedFieldMetadataCollection: FieldMetadataUpdate[];
+  }> {
+    const fieldMetadataRepository = manager.getRepository(FieldMetadataEntity);
+
+    /**
+     * Create field metadata
+     */
+    const createdFieldMetadataCollection = await fieldMetadataRepository.save(
+      storage.fieldMetadataCreateCollection.map((field) =>
+        this.prepareFieldMetadataForCreation(field),
+      ) as DeepPartial<FieldMetadataEntity>[],
+    );
+
+    /**
+     * Update field metadata
+     */
+    const updatedFieldMetadataCollection = await this.updateEntities<
+      FieldMetadataEntity<'default'>
+    >(manager, FieldMetadataEntity, storage.objectMetadataUpdateCollection, [
+      'objectMetadataId',
+      'workspaceId',
+    ]);
+
+    /**
+     * Delete field metadata
+     */
+    // TODO: handle relation fields deletion. We need to delete the relation metadata first due to the DB constraint.
+    const fieldMetadataDeleteCollectionWithoutRelationType =
+      storage.fieldMetadataDeleteCollection.filter(
+        (field) => field.type !== FieldMetadataType.RELATION,
+      );
+
+    if (fieldMetadataDeleteCollectionWithoutRelationType.length > 0) {
+      await fieldMetadataRepository.delete(
+        fieldMetadataDeleteCollectionWithoutRelationType.map(
+          (field) => field.id,
+        ),
+      );
+    }
+
+    return {
+      createdFieldMetadataCollection:
+        createdFieldMetadataCollection as FieldMetadataEntity[],
+      updatedFieldMetadataCollection,
+    };
+  }
+
+  async updateRelationMetadata(
+    manager: EntityManager,
+    storage: WorkspaceSyncStorage,
+  ): Promise<{
+    createdRelationMetadataCollection: RelationMetadataEntity[];
+    updatedRelationMetadataCollection: RelationMetadataEntity[];
+  }> {
+    const relationMetadataRepository = manager.getRepository(
+      RelationMetadataEntity,
+    );
+    const fieldMetadataRepository = manager.getRepository(FieldMetadataEntity);
+
+    /**
+     * Create relation metadata
+     */
+    const createdRelationMetadataCollection =
+      await relationMetadataRepository.save(
+        storage.relationMetadataCreateCollection,
+      );
+
+    /**
+     * Update relation metadata
+     */
+
+    const updatedRelationMetadataCollection =
+      await relationMetadataRepository.save(
+        storage.relationMetadataUpdateCollection,
+      );
+
+    /**
+     * Delete relation metadata
+     */
+    if (storage.relationMetadataDeleteCollection.length > 0) {
+      await relationMetadataRepository.delete(
+        storage.relationMetadataDeleteCollection.map(
+          (relationMetadata) => relationMetadata.id,
+        ),
+      );
+    }
+
+    /**
+     * Delete related field metadata
+     */
+    const fieldMetadataDeleteCollectionOnlyRelation =
+      storage.fieldMetadataDeleteCollection.filter(
+        (field) => field.type === FieldMetadataType.RELATION,
+      );
+
+    if (fieldMetadataDeleteCollectionOnlyRelation.length > 0) {
+      await fieldMetadataRepository.delete(
+        fieldMetadataDeleteCollectionOnlyRelation.map((field) => field.id),
+      );
+    }
+
+    return {
+      createdRelationMetadataCollection,
+      updatedRelationMetadataCollection,
+    };
+  }
+
+  /**
+   * Update entities in the database
+   * @param manager EntityManager
+   * @param entityClass Entity class
+   * @param updateCollection Update collection
+   * @param keysToOmit keys to omit in the merge process
+   * @returns Promise<{ current: Entity; altered: Entity }[]>
+   */
+  private async updateEntities<Entity extends ObjectLiteral & { id: string }>(
+    manager: EntityManager,
+    entityClass: EntityTarget<Entity>,
+    updateCollection: Array<
+      DeepPartial<Omit<Entity, 'fields'>> & { id: string }
+    >,
+    keysToOmit: (keyof Entity)[] = [],
+  ): Promise<{ current: Entity; altered: Entity }[]> {
+    const repository = manager.getRepository(entityClass);
+
+    const oldEntities = await repository.findBy({
+      id: In(updateCollection.map((updateItem) => updateItem.id)),
+    } as FindOptionsWhere<Entity>);
+
+    // Pre-process old collection into a mapping for quick access
+    const oldEntitiesMap = new Map(
+      oldEntities.map((oldEntity) => [oldEntity.id, oldEntity]),
+    );
+
+    // Combine old and new field metadata to get whole updated entities
+    const entityUpdateCollection = updateCollection.map((updateItem) => {
+      const oldEntity = oldEntitiesMap.get(updateItem.id);
+
+      if (!oldEntity) {
+        throw new Error(`
+              Entity ${updateItem.id} not found in oldEntities`);
+      }
+
+      // TypeORM 😢
+      // If we didn't provide the old value, it will be set to null objects that are not in the updateObjectMetadata
+      // and override the old value with null in the DB.
+      // Also save method doesn't return the whole entity if you give a partial one.
+      // https://github.com/typeorm/typeorm/issues/3490
+      // To avoid calling update in a for loop, we did this hack.
+      const mergedUpdate = {
+        ...oldEntity,
+        ...updateItem,
+      };
+
+      // Omit keys that we don't want to override
+      keysToOmit.forEach((key) => {
+        delete mergedUpdate[key];
+      });
+
+      return mergedUpdate;
+    });
+
+    const updatedEntities = await repository.save(entityUpdateCollection);
+
+    return updatedEntities.map((updatedEntity) => {
+      const oldEntity = oldEntitiesMap.get(updatedEntity.id);
+
+      if (!oldEntity) {
+        throw new Error(`
+            Entity ${updatedEntity.id} not found in oldEntitiesMap
+          `);
+      }
+
+      return {
+        current: oldEntity,
+        altered: {
+          ...updatedEntity,
+          ...keysToOmit.reduce(
+            (acc, key) => ({ ...acc, [key]: oldEntity[key] }),
+            {},
+          ),
+        },
+      };
+    });
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-field-metadata.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-field-metadata.service.ts
new file mode 100644
index 000000000000..049e8c689385
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-field-metadata.service.ts
@@ -0,0 +1,140 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
+import { ComparatorAction } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface';
+import { FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';
+import { WorkspaceMigrationBuilderAction } from 'src/engine/workspace-manager/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { WorkspaceFieldComparator } from 'src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator';
+import { WorkspaceMetadataUpdaterService } from 'src/engine/workspace-manager/workspace-sync-metadata/services/workspace-metadata-updater.service';
+import { WorkspaceSyncStorage } from 'src/engine/workspace-manager/workspace-sync-metadata/storage/workspace-sync.storage';
+import { WorkspaceMigrationFieldFactory } from 'src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-field.factory';
+import { StandardFieldFactory } from 'src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory';
+import { CustomObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/custom-objects/custom.object-metadata';
+import { computeStandardObject } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/compute-standard-object.util';
+
+@Injectable()
+export class WorkspaceSyncFieldMetadataService {
+  private readonly logger = new Logger(WorkspaceSyncFieldMetadataService.name);
+
+  constructor(
+    private readonly standardFieldFactory: StandardFieldFactory,
+    private readonly workspaceFieldComparator: WorkspaceFieldComparator,
+    private readonly workspaceMetadataUpdaterService: WorkspaceMetadataUpdaterService,
+    private readonly workspaceMigrationFieldFactory: WorkspaceMigrationFieldFactory,
+  ) {}
+
+  async synchronize(
+    context: WorkspaceSyncContext,
+    manager: EntityManager,
+    storage: WorkspaceSyncStorage,
+    workspaceFeatureFlagsMap: FeatureFlagMap,
+  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
+    const objectMetadataRepository =
+      manager.getRepository(ObjectMetadataEntity);
+
+    // Retrieve object metadata collection from DB
+    const originalObjectMetadataCollection =
+      await objectMetadataRepository.find({
+        where: {
+          workspaceId: context.workspaceId,
+          // We're only interested in standard fields
+          fields: { isCustom: false },
+        },
+        relations: ['dataSource', 'fields'],
+      });
+
+    // Filter out custom objects
+    const customObjectMetadataCollection =
+      originalObjectMetadataCollection.filter(
+        (objectMetadata) => objectMetadata.isCustom,
+      );
+
+    // Create standard field metadata collection
+    const standardFieldMetadataCollection = this.standardFieldFactory.create(
+      CustomObjectMetadata,
+      context,
+      workspaceFeatureFlagsMap,
+    );
+
+    // Loop over all standard objects and compare them with the objects in DB
+    for (const customObjectMetadata of customObjectMetadataCollection) {
+      // Also, maybe it's better to refactor a bit and move generation part into a separate module ?
+      const standardObjectMetadata = computeStandardObject(
+        {
+          ...customObjectMetadata,
+          fields: standardFieldMetadataCollection,
+        },
+        customObjectMetadata,
+      );
+
+      /**
+       * COMPARE FIELD METADATA
+       */
+      const fieldComparatorResults = this.workspaceFieldComparator.compare(
+        customObjectMetadata,
+        standardObjectMetadata,
+      );
+
+      for (const fieldComparatorResult of fieldComparatorResults) {
+        switch (fieldComparatorResult.action) {
+          case ComparatorAction.CREATE: {
+            storage.addCreateFieldMetadata(fieldComparatorResult.object);
+            break;
+          }
+          case ComparatorAction.UPDATE: {
+            storage.addUpdateFieldMetadata(fieldComparatorResult.object);
+            break;
+          }
+          case ComparatorAction.DELETE: {
+            storage.addDeleteFieldMetadata(fieldComparatorResult.object);
+            break;
+          }
+        }
+      }
+    }
+
+    this.logger.log('Updating workspace metadata');
+
+    const metadataFieldUpdaterResult =
+      await this.workspaceMetadataUpdaterService.updateFieldMetadata(
+        manager,
+        storage,
+      );
+
+    this.logger.log('Generating migrations');
+
+    const createFieldWorkspaceMigrations =
+      await this.workspaceMigrationFieldFactory.create(
+        originalObjectMetadataCollection,
+        metadataFieldUpdaterResult.createdFieldMetadataCollection,
+        WorkspaceMigrationBuilderAction.CREATE,
+      );
+
+    const updateFieldWorkspaceMigrations =
+      await this.workspaceMigrationFieldFactory.create(
+        originalObjectMetadataCollection,
+        metadataFieldUpdaterResult.updatedFieldMetadataCollection,
+        WorkspaceMigrationBuilderAction.UPDATE,
+      );
+
+    const deleteFieldWorkspaceMigrations =
+      await this.workspaceMigrationFieldFactory.create(
+        originalObjectMetadataCollection,
+        storage.fieldMetadataDeleteCollection,
+        WorkspaceMigrationBuilderAction.DELETE,
+      );
+
+    this.logger.log('Saving migrations');
+
+    return [
+      ...createFieldWorkspaceMigrations,
+      ...updateFieldWorkspaceMigrations,
+      ...deleteFieldWorkspaceMigrations,
+    ];
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-object-metadata.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-object-metadata.service.ts
new file mode 100644
index 000000000000..147389b18918
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-object-metadata.service.ts
@@ -0,0 +1,177 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
+import { ComparatorAction } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface';
+import { FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';
+import { WorkspaceMigrationBuilderAction } from 'src/engine/workspace-manager/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { mapObjectMetadataByUniqueIdentifier } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/sync-metadata.util';
+import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { StandardObjectFactory } from 'src/engine/workspace-manager/workspace-sync-metadata/factories/standard-object.factory';
+import { WorkspaceObjectComparator } from 'src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-object.comparator';
+import { WorkspaceFieldComparator } from 'src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator';
+import { WorkspaceMetadataUpdaterService } from 'src/engine/workspace-manager/workspace-sync-metadata/services/workspace-metadata-updater.service';
+import { WorkspaceSyncStorage } from 'src/engine/workspace-manager/workspace-sync-metadata/storage/workspace-sync.storage';
+import { WorkspaceMigrationObjectFactory } from 'src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-object.factory';
+import { computeStandardObject } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/compute-standard-object.util';
+import { standardObjectMetadataDefinitions } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects';
+
+@Injectable()
+export class WorkspaceSyncObjectMetadataService {
+  private readonly logger = new Logger(WorkspaceSyncObjectMetadataService.name);
+
+  constructor(
+    private readonly standardObjectFactory: StandardObjectFactory,
+    private readonly workspaceObjectComparator: WorkspaceObjectComparator,
+    private readonly workspaceFieldComparator: WorkspaceFieldComparator,
+    private readonly workspaceMetadataUpdaterService: WorkspaceMetadataUpdaterService,
+    private readonly workspaceMigrationObjectFactory: WorkspaceMigrationObjectFactory,
+  ) {}
+
+  async synchronize(
+    context: WorkspaceSyncContext,
+    manager: EntityManager,
+    storage: WorkspaceSyncStorage,
+    workspaceFeatureFlagsMap: FeatureFlagMap,
+  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
+    const objectMetadataRepository =
+      manager.getRepository(ObjectMetadataEntity);
+
+    // Retrieve object metadata collection from DB
+    const originalObjectMetadataCollection =
+      await objectMetadataRepository.find({
+        where: {
+          workspaceId: context.workspaceId,
+          fields: { isCustom: false },
+        },
+        relations: ['dataSource', 'fields'],
+      });
+    const customObjectMetadataCollection =
+      originalObjectMetadataCollection.filter(
+        (objectMetadata) => objectMetadata.isCustom,
+      );
+
+    // Create standard object metadata collection
+    const standardObjectMetadataCollection = this.standardObjectFactory.create(
+      standardObjectMetadataDefinitions,
+      context,
+      workspaceFeatureFlagsMap,
+    );
+
+    // Create map of original and standard object metadata by standard ids
+    const originalObjectMetadataMap = mapObjectMetadataByUniqueIdentifier(
+      originalObjectMetadataCollection,
+    );
+    const standardObjectMetadataMap = mapObjectMetadataByUniqueIdentifier(
+      standardObjectMetadataCollection,
+    );
+
+    this.logger.log('Comparing standard objects and fields metadata');
+
+    // Store object that need to be deleted
+    for (const originalObjectMetadata of originalObjectMetadataCollection.filter(
+      (object) => !object.isCustom,
+    )) {
+      if (
+        originalObjectMetadata.standardId &&
+        !standardObjectMetadataMap[originalObjectMetadata.standardId]
+      ) {
+        storage.addDeleteObjectMetadata(originalObjectMetadata);
+      }
+    }
+
+    // Loop over all standard objects and compare them with the objects in DB
+    for (const standardObjectId in standardObjectMetadataMap) {
+      const originalObjectMetadata =
+        originalObjectMetadataMap[standardObjectId];
+      const standardObjectMetadata = computeStandardObject(
+        standardObjectMetadataMap[standardObjectId],
+        originalObjectMetadata,
+        customObjectMetadataCollection,
+      );
+
+      /**
+       * COMPARE OBJECT METADATA
+       */
+      const objectComparatorResult = this.workspaceObjectComparator.compare(
+        originalObjectMetadata,
+        standardObjectMetadata,
+      );
+
+      if (objectComparatorResult.action === ComparatorAction.CREATE) {
+        storage.addCreateObjectMetadata(standardObjectMetadata);
+        continue;
+      }
+
+      if (objectComparatorResult.action === ComparatorAction.UPDATE) {
+        storage.addUpdateObjectMetadata(objectComparatorResult.object);
+      }
+
+      /**
+       * COMPARE FIELD METADATA
+       */
+      const fieldComparatorResults = this.workspaceFieldComparator.compare(
+        originalObjectMetadata,
+        standardObjectMetadata,
+      );
+
+      for (const fieldComparatorResult of fieldComparatorResults) {
+        switch (fieldComparatorResult.action) {
+          case ComparatorAction.CREATE: {
+            storage.addCreateFieldMetadata(fieldComparatorResult.object);
+            break;
+          }
+          case ComparatorAction.UPDATE: {
+            storage.addUpdateFieldMetadata(fieldComparatorResult.object);
+            break;
+          }
+          case ComparatorAction.DELETE: {
+            storage.addDeleteFieldMetadata(fieldComparatorResult.object);
+            break;
+          }
+        }
+      }
+    }
+
+    this.logger.log('Updating workspace metadata');
+
+    // Apply changes to DB
+    const metadataObjectUpdaterResult =
+      await this.workspaceMetadataUpdaterService.updateObjectMetadata(
+        manager,
+        storage,
+      );
+
+    this.logger.log('Generating migrations');
+
+    // Create migrations
+    const createObjectWorkspaceMigrations =
+      await this.workspaceMigrationObjectFactory.create(
+        metadataObjectUpdaterResult.createdObjectMetadataCollection,
+        WorkspaceMigrationBuilderAction.CREATE,
+      );
+
+    const updateObjectWorkspaceMigrations =
+      await this.workspaceMigrationObjectFactory.create(
+        metadataObjectUpdaterResult.updatedObjectMetadataCollection,
+        WorkspaceMigrationBuilderAction.UPDATE,
+      );
+
+    const deleteObjectWorkspaceMigrations =
+      await this.workspaceMigrationObjectFactory.create(
+        storage.objectMetadataDeleteCollection,
+        WorkspaceMigrationBuilderAction.DELETE,
+      );
+
+    this.logger.log('Saving migrations');
+
+    return [
+      ...createObjectWorkspaceMigrations,
+      ...updateObjectWorkspaceMigrations,
+      ...deleteObjectWorkspaceMigrations,
+    ];
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-relation-metadata.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-relation-metadata.service.ts
new file mode 100644
index 000000000000..9f89d19498aa
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-relation-metadata.service.ts
@@ -0,0 +1,142 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
+import { FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';
+import { ComparatorAction } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface';
+import { WorkspaceMigrationBuilderAction } from 'src/engine/workspace-manager/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { mapObjectMetadataByUniqueIdentifier } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/sync-metadata.util';
+import { StandardRelationFactory } from 'src/engine/workspace-manager/workspace-sync-metadata/factories/standard-relation.factory';
+import { WorkspaceRelationComparator } from 'src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-relation.comparator';
+import { WorkspaceMetadataUpdaterService } from 'src/engine/workspace-manager/workspace-sync-metadata/services/workspace-metadata-updater.service';
+import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { WorkspaceSyncStorage } from 'src/engine/workspace-manager/workspace-sync-metadata/storage/workspace-sync.storage';
+import { WorkspaceMigrationRelationFactory } from 'src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-relation.factory';
+import { standardObjectMetadataDefinitions } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects';
+import { CustomObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/custom-objects/custom.object-metadata';
+
+@Injectable()
+export class WorkspaceSyncRelationMetadataService {
+  private readonly logger = new Logger(
+    WorkspaceSyncRelationMetadataService.name,
+  );
+
+  constructor(
+    private readonly standardRelationFactory: StandardRelationFactory,
+    private readonly workspaceRelationComparator: WorkspaceRelationComparator,
+    private readonly workspaceMetadataUpdaterService: WorkspaceMetadataUpdaterService,
+    private readonly workspaceMigrationRelationFactory: WorkspaceMigrationRelationFactory,
+  ) {}
+
+  async synchronize(
+    context: WorkspaceSyncContext,
+    manager: EntityManager,
+    storage: WorkspaceSyncStorage,
+    workspaceFeatureFlagsMap: FeatureFlagMap,
+  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
+    const objectMetadataRepository =
+      manager.getRepository(ObjectMetadataEntity);
+
+    // Retrieve object metadata collection from DB
+    const originalObjectMetadataCollection =
+      await objectMetadataRepository.find({
+        where: {
+          workspaceId: context.workspaceId,
+          fields: { isCustom: false },
+        },
+        relations: ['dataSource', 'fields'],
+      });
+    const customObjectMetadataCollection =
+      originalObjectMetadataCollection.filter(
+        (objectMetadata) => objectMetadata.isCustom,
+      );
+
+    // Create map of object metadata & field metadata by unique identifier
+    const originalObjectMetadataMap = mapObjectMetadataByUniqueIdentifier(
+      originalObjectMetadataCollection,
+      // Relation are based on the singular name
+      (objectMetadata) => objectMetadata.nameSingular,
+    );
+
+    const relationMetadataRepository = manager.getRepository(
+      RelationMetadataEntity,
+    );
+
+    // Retrieve relation metadata collection from DB
+    const originalRelationMetadataCollection =
+      await relationMetadataRepository.find({
+        where: {
+          workspaceId: context.workspaceId,
+          fromFieldMetadata: { isCustom: false },
+        },
+      });
+
+    // Create standard relation metadata collection
+    const standardRelationMetadataCollection =
+      this.standardRelationFactory.create(
+        standardObjectMetadataDefinitions,
+        context,
+        originalObjectMetadataMap,
+        workspaceFeatureFlagsMap,
+      );
+
+    const customRelationMetadataCollection =
+      this.standardRelationFactory.create(
+        customObjectMetadataCollection.map((objectMetadata) => ({
+          object: objectMetadata,
+          metadata: CustomObjectMetadata,
+        })),
+        context,
+        originalObjectMetadataMap,
+        workspaceFeatureFlagsMap,
+      );
+
+    const relationComparatorResults = this.workspaceRelationComparator.compare(
+      originalRelationMetadataCollection,
+      [
+        ...standardRelationMetadataCollection,
+        ...customRelationMetadataCollection,
+      ],
+    );
+
+    for (const relationComparatorResult of relationComparatorResults) {
+      if (relationComparatorResult.action === ComparatorAction.CREATE) {
+        storage.addCreateRelationMetadata(relationComparatorResult.object);
+      } else if (relationComparatorResult.action === ComparatorAction.UPDATE) {
+        storage.addUpdateRelationMetadata(relationComparatorResult.object);
+      } else if (relationComparatorResult.action === ComparatorAction.DELETE) {
+        storage.addDeleteRelationMetadata(relationComparatorResult.object);
+      }
+    }
+
+    const metadataRelationUpdaterResult =
+      await this.workspaceMetadataUpdaterService.updateRelationMetadata(
+        manager,
+        storage,
+      );
+
+    // Create migrations
+    const createRelationWorkspaceMigrations =
+      await this.workspaceMigrationRelationFactory.create(
+        originalObjectMetadataCollection,
+        metadataRelationUpdaterResult.createdRelationMetadataCollection,
+        WorkspaceMigrationBuilderAction.CREATE,
+      );
+
+    const updateRelationWorkspaceMigrations =
+      await this.workspaceMigrationRelationFactory.create(
+        originalObjectMetadataCollection,
+        metadataRelationUpdaterResult.updatedRelationMetadataCollection,
+        WorkspaceMigrationBuilderAction.UPDATE,
+      );
+
+    return [
+      ...createRelationWorkspaceMigrations,
+      ...updateRelationWorkspaceMigrations,
+    ];
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata.ts
new file mode 100644
index 000000000000..533431ffa5f3
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata.ts
@@ -0,0 +1,38 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { baseObjectStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+
+export abstract class BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: baseObjectStandardFieldIds.id,
+    type: FieldMetadataType.UUID,
+    label: 'Id',
+    description: 'Id',
+    defaultValue: 'uuid',
+    icon: 'Icon123',
+  })
+  @IsSystem()
+  id: string;
+
+  @FieldMetadata({
+    standardId: baseObjectStandardFieldIds.createdAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Creation date',
+    description: 'Creation date',
+    icon: 'IconCalendar',
+    defaultValue: 'now',
+  })
+  createdAt: Date;
+
+  @FieldMetadata({
+    standardId: baseObjectStandardFieldIds.updatedAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Update date',
+    description: 'Update date',
+    icon: 'IconCalendar',
+    defaultValue: 'now',
+  })
+  @IsSystem()
+  updatedAt: Date;
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-objects/index.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-objects/index.ts
new file mode 100644
index 000000000000..f0eba612c0ea
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-objects/index.ts
@@ -0,0 +1,57 @@
+import { ActivityTargetObjectMetadata } from 'src/modules/activity/standard-objects/activity-target.object-metadata';
+import { ActivityObjectMetadata } from 'src/modules/activity/standard-objects/activity.object-metadata';
+import { ApiKeyObjectMetadata } from 'src/modules/api-key/standard-objects/api-key.object-metadata';
+import { AttachmentObjectMetadata } from 'src/modules/attachment/standard-objects/attachment.object-metadata';
+import { BlocklistObjectMetadata } from 'src/modules/connected-account/standard-objects/blocklist.object-metadata';
+import { CalendarEventObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event.object-metadata';
+import { CalendarChannelObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
+import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+import { CommentObjectMetadata } from 'src/modules/activity/standard-objects/comment.object-metadata';
+import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { FavoriteObjectMetadata } from 'src/modules/favorite/standard-objects/favorite.object-metadata';
+import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { MessageParticipantObjectMetadata } from 'src/modules/messaging/standard-objects/message-participant.object-metadata';
+import { MessageThreadObjectMetadata } from 'src/modules/messaging/standard-objects/message-thread.object-metadata';
+import { MessageObjectMetadata } from 'src/modules/messaging/standard-objects/message.object-metadata';
+import { OpportunityObjectMetadata } from 'src/modules/opportunity/standard-objects/opportunity.object-metadata';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+import { ViewFieldObjectMetadata } from 'src/modules/view/standard-objects/view-field.object-metadata';
+import { ViewFilterObjectMetadata } from 'src/modules/view/standard-objects/view-filter.object-metadata';
+import { ViewSortObjectMetadata } from 'src/modules/view/standard-objects/view-sort.object-metadata';
+import { ViewObjectMetadata } from 'src/modules/view/standard-objects/view.object-metadata';
+import { WebhookObjectMetadata } from 'src/modules/webhook/standard-objects/webhook.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata';
+import { EventObjectMetadata } from 'src/modules/event/standard-objects/event.object-metadata';
+
+export const standardObjectMetadataDefinitions = [
+  ActivityTargetObjectMetadata,
+  ActivityObjectMetadata,
+  ApiKeyObjectMetadata,
+  AttachmentObjectMetadata,
+  BlocklistObjectMetadata,
+  CommentObjectMetadata,
+  CompanyObjectMetadata,
+  ConnectedAccountObjectMetadata,
+  EventObjectMetadata,
+  FavoriteObjectMetadata,
+  OpportunityObjectMetadata,
+  PersonObjectMetadata,
+  ViewFieldObjectMetadata,
+  ViewFilterObjectMetadata,
+  ViewSortObjectMetadata,
+  ViewObjectMetadata,
+  WebhookObjectMetadata,
+  WorkspaceMemberObjectMetadata,
+  MessageThreadObjectMetadata,
+  MessageObjectMetadata,
+  MessageChannelObjectMetadata,
+  MessageParticipantObjectMetadata,
+  MessageChannelMessageAssociationObjectMetadata,
+  CalendarEventObjectMetadata,
+  CalendarChannelObjectMetadata,
+  CalendarChannelEventAssociationObjectMetadata,
+  CalendarEventParticipantObjectMetadata,
+];
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/storage/workspace-sync.storage.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/storage/workspace-sync.storage.ts
new file mode 100644
index 000000000000..4aa5c5a08694
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/storage/workspace-sync.storage.ts
@@ -0,0 +1,111 @@
+import { ComputedPartialObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-object-metadata.interface';
+import { ComputedPartialFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
+import { PartialRelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-relation-metadata.interface';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+
+export class WorkspaceSyncStorage {
+  // Object metadata
+  private readonly _objectMetadataCreateCollection: ComputedPartialObjectMetadata[] =
+    [];
+  private readonly _objectMetadataUpdateCollection: (Partial<ComputedPartialObjectMetadata> & {
+    id: string;
+  })[] = [];
+  private readonly _objectMetadataDeleteCollection: ObjectMetadataEntity[] = [];
+
+  // Field metadata
+  private readonly _fieldMetadataCreateCollection: ComputedPartialFieldMetadata[] =
+    [];
+  private readonly _fieldMetadataUpdateCollection: (Partial<ComputedPartialFieldMetadata> & {
+    id: string;
+  })[] = [];
+  private readonly _fieldMetadataDeleteCollection: FieldMetadataEntity[] = [];
+
+  // Relation metadata
+  private readonly _relationMetadataCreateCollection: Partial<RelationMetadataEntity>[] =
+    [];
+  private readonly _relationMetadataDeleteCollection: RelationMetadataEntity[] =
+    [];
+  private readonly _relationMetadataUpdateCollection: Partial<PartialRelationMetadata>[] =
+    [];
+
+  constructor() {}
+
+  get objectMetadataCreateCollection() {
+    return this._objectMetadataCreateCollection;
+  }
+
+  get objectMetadataUpdateCollection() {
+    return this._objectMetadataUpdateCollection;
+  }
+
+  get objectMetadataDeleteCollection() {
+    return this._objectMetadataDeleteCollection;
+  }
+
+  get fieldMetadataCreateCollection() {
+    return this._fieldMetadataCreateCollection;
+  }
+
+  get fieldMetadataUpdateCollection() {
+    return this._fieldMetadataUpdateCollection;
+  }
+
+  get fieldMetadataDeleteCollection() {
+    return this._fieldMetadataDeleteCollection;
+  }
+
+  get relationMetadataCreateCollection() {
+    return this._relationMetadataCreateCollection;
+  }
+
+  get relationMetadataUpdateCollection() {
+    return this._relationMetadataUpdateCollection;
+  }
+
+  get relationMetadataDeleteCollection() {
+    return this._relationMetadataDeleteCollection;
+  }
+
+  addCreateObjectMetadata(object: ComputedPartialObjectMetadata) {
+    this._objectMetadataCreateCollection.push(object);
+  }
+
+  addUpdateObjectMetadata(
+    object: Partial<ComputedPartialObjectMetadata> & { id: string },
+  ) {
+    this._objectMetadataUpdateCollection.push(object);
+  }
+
+  addDeleteObjectMetadata(object: ObjectMetadataEntity) {
+    this._objectMetadataDeleteCollection.push(object);
+  }
+
+  addCreateFieldMetadata(field: ComputedPartialFieldMetadata) {
+    this._fieldMetadataCreateCollection.push(field);
+  }
+
+  addUpdateFieldMetadata(
+    field: Partial<ComputedPartialFieldMetadata> & { id: string },
+  ) {
+    this._fieldMetadataUpdateCollection.push(field);
+  }
+
+  addDeleteFieldMetadata(field: FieldMetadataEntity) {
+    this._fieldMetadataDeleteCollection.push(field);
+  }
+
+  addCreateRelationMetadata(relation: Partial<RelationMetadataEntity>) {
+    this._relationMetadataCreateCollection.push(relation);
+  }
+
+  addUpdateRelationMetadata(relation: Partial<PartialRelationMetadata>) {
+    this._relationMetadataUpdateCollection.push(relation);
+  }
+
+  addDeleteRelationMetadata(relation: RelationMetadataEntity) {
+    this._relationMetadataDeleteCollection.push(relation);
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/types/object-record.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/types/object-record.ts
new file mode 100644
index 000000000000..f99f0e080239
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/types/object-record.ts
@@ -0,0 +1,9 @@
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+
+export type ObjectRecord<T extends BaseObjectMetadata> = {
+  [K in keyof T as T[K] extends BaseObjectMetadata
+    ? `${Extract<K, string>}Id`
+    : K]: T[K] extends BaseObjectMetadata ? string : T[K];
+} & {
+  [K in keyof T]: T[K] extends BaseObjectMetadata ? ObjectRecord<T[K]> : T[K];
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/compute-standard-object.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/compute-standard-object.util.ts
new file mode 100644
index 000000000000..69dcbfbb3e42
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/compute-standard-object.util.ts
@@ -0,0 +1,81 @@
+import {
+  ComputedPartialObjectMetadata,
+  PartialObjectMetadata,
+} from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-object-metadata.interface';
+import { ComputedPartialFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
+
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  createForeignKeyDeterministicUuid,
+  createRelationDeterministicUuid,
+} from 'src/engine/workspace-manager/workspace-sync-metadata/utils/create-deterministic-uuid.util';
+
+export const computeStandardObject = (
+  standardObjectMetadata: Omit<PartialObjectMetadata, 'standardId'> & {
+    standardId: string | null;
+  },
+  originalObjectMetadata: ObjectMetadataEntity,
+  customObjectMetadataCollection: ObjectMetadataEntity[] = [],
+): ComputedPartialObjectMetadata => {
+  const fields: ComputedPartialFieldMetadata[] = [];
+
+  for (const partialFieldMetadata of standardObjectMetadata.fields) {
+    if ('paramsFactory' in partialFieldMetadata) {
+      // Compute standard fields of custom object
+      for (const customObjectMetadata of customObjectMetadataCollection) {
+        const { paramsFactory, ...rest } = partialFieldMetadata;
+        const { joinColumn, ...data } = paramsFactory(customObjectMetadata);
+        const relationStandardId = createRelationDeterministicUuid({
+          objectId: customObjectMetadata.id,
+          standardId: data.standardId,
+        });
+        const foreignKeyStandardId = createForeignKeyDeterministicUuid({
+          objectId: customObjectMetadata.id,
+          standardId: data.standardId,
+        });
+
+        // Relation
+        fields.push({
+          ...data,
+          ...rest,
+          standardId: relationStandardId,
+          defaultValue: null,
+        });
+
+        // Foreign key
+        fields.push({
+          ...rest,
+          standardId: foreignKeyStandardId,
+          name: joinColumn,
+          type: FieldMetadataType.UUID,
+          label: `${data.label} ID (foreign key)`,
+          description: `${data.description} id foreign key`,
+          defaultValue: null,
+          icon: undefined,
+          isSystem: true,
+        });
+      }
+    } else {
+      const labelText =
+        typeof partialFieldMetadata.label === 'function'
+          ? partialFieldMetadata.label(originalObjectMetadata)
+          : partialFieldMetadata.label;
+      const descriptionText =
+        typeof partialFieldMetadata.description === 'function'
+          ? partialFieldMetadata.description(originalObjectMetadata)
+          : partialFieldMetadata.description;
+
+      fields.push({
+        ...partialFieldMetadata,
+        label: labelText,
+        description: descriptionText,
+      });
+    }
+  }
+
+  return {
+    ...standardObjectMetadata,
+    fields,
+  };
+};
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/utils/convert-class-to-object-metadata-name.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/convert-class-to-object-metadata-name.util.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/utils/convert-class-to-object-metadata-name.util.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/convert-class-to-object-metadata-name.util.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/create-deterministic-uuid.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/create-deterministic-uuid.util.ts
new file mode 100644
index 000000000000..0efddfc12ada
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/create-deterministic-uuid.util.ts
@@ -0,0 +1,35 @@
+import { createHash } from 'crypto';
+
+export function createDeterministicUuid(uuid: string): string;
+export function createDeterministicUuid(uuids: string[]): string;
+
+export function createDeterministicUuid(
+  uuidOrUuids: string[] | string,
+): string {
+  const inputForHash = Array.isArray(uuidOrUuids)
+    ? uuidOrUuids.join('-')
+    : uuidOrUuids;
+  const hash = createHash('sha256').update(inputForHash).digest('hex');
+
+  return `20202020-${hash.substring(0, 4)}-4${hash.substring(
+    4,
+    7,
+  )}-8${hash.substring(7, 10)}-${hash.substring(10, 22)}`;
+}
+
+type UuidPair = {
+  objectId: string;
+  standardId: string;
+};
+
+export const createRelationDeterministicUuid = (uuidPair: UuidPair): string => {
+  // Chaging the order in the array will result in different UUIDs
+  return createDeterministicUuid([uuidPair.objectId, uuidPair.standardId]);
+};
+
+export const createForeignKeyDeterministicUuid = (
+  uuidPair: UuidPair,
+): string => {
+  // Chaging the order in the array will result in different UUIDs
+  return createDeterministicUuid([uuidPair.standardId, uuidPair.objectId]);
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/is-gate-and-not-enabled.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/is-gate-and-not-enabled.util.ts
new file mode 100644
index 000000000000..adff20533dc2
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/is-gate-and-not-enabled.util.ts
@@ -0,0 +1,11 @@
+import { GateDecoratorParams } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/gate-decorator.interface';
+
+export const isGatedAndNotEnabled = (
+  gate: GateDecoratorParams | undefined,
+  workspaceFeatureFlagsMap: Record<string, boolean>,
+): boolean => {
+  const featureFlagValue =
+    gate?.featureFlag && workspaceFeatureFlagsMap[gate.featureFlag];
+
+  return gate?.featureFlag !== undefined && !featureFlagValue;
+};
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/utils/sync-metadata.util.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/sync-metadata.util.spec.ts
similarity index 82%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/utils/sync-metadata.util.spec.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/sync-metadata.util.spec.ts
index 153d92dc871b..3ab01cd8e3da 100644
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/utils/sync-metadata.util.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/sync-metadata.util.spec.ts
@@ -1,5 +1,5 @@
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 
 import { mapObjectMetadataByUniqueIdentifier } from './sync-metadata.util';
 
@@ -7,6 +7,7 @@ describe('mapObjectMetadataByUniqueIdentifier', () => {
   it('should convert an array of ObjectMetadataEntity objects into a map', () => {
     const arr: DeepPartial<ObjectMetadataEntity>[] = [
       {
+        standardId: 'user',
         nameSingular: 'user',
         fields: [
           { name: 'id', type: FieldMetadataType.UUID },
@@ -14,6 +15,7 @@ describe('mapObjectMetadataByUniqueIdentifier', () => {
         ],
       },
       {
+        standardId: 'product',
         nameSingular: 'product',
         fields: [
           { name: 'id', type: FieldMetadataType.UUID },
@@ -29,6 +31,7 @@ describe('mapObjectMetadataByUniqueIdentifier', () => {
 
     expect(mappedObject).toEqual({
       user: {
+        standardId: 'user',
         nameSingular: 'user',
         fields: [
           { name: 'id', type: FieldMetadataType.UUID },
@@ -36,6 +39,7 @@ describe('mapObjectMetadataByUniqueIdentifier', () => {
         ],
       },
       product: {
+        standardId: 'product',
         nameSingular: 'product',
         fields: [
           { name: 'id', type: FieldMetadataType.UUID },
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/utils/sync-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/sync-metadata.util.ts
similarity index 75%
rename from packages/twenty-server/src/workspace/workspace-sync-metadata/utils/sync-metadata.util.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/sync-metadata.util.ts
index b095c297e3f6..9fb60169930b 100644
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/utils/sync-metadata.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/sync-metadata.util.ts
@@ -7,13 +7,20 @@
  * @returns A map of object metadata, with nameSingular as the key and the object as the value.
  */
 export const mapObjectMetadataByUniqueIdentifier = <
-  T extends { nameSingular: string },
+  T extends { standardId: string | null },
 >(
   arr: T[],
+  keyFactory: (obj: T) => string | null = (obj) => obj.standardId,
 ): Record<string, T> => {
   return arr.reduce(
     (acc, curr) => {
-      acc[curr.nameSingular] = {
+      const key = keyFactory(curr);
+
+      if (!key) {
+        return acc;
+      }
+
+      acc[key] = {
         ...curr,
       };
 
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts
new file mode 100644
index 000000000000..fe2634b78e88
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts
@@ -0,0 +1,45 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
+import { WorkspaceSyncMetadataService } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service';
+import { workspaceSyncMetadataFactories } from 'src/engine/workspace-manager/workspace-sync-metadata/factories';
+import { workspaceSyncMetadataComparators } from 'src/engine/workspace-manager/workspace-sync-metadata/comparators';
+import { WorkspaceMetadataUpdaterService } from 'src/engine/workspace-manager/workspace-sync-metadata/services/workspace-metadata-updater.service';
+import { WorkspaceSyncObjectMetadataService } from 'src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-object-metadata.service';
+import { WorkspaceSyncRelationMetadataService } from 'src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-relation-metadata.service';
+import { WorkspaceSyncFieldMetadataService } from 'src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-field-metadata.service';
+import { WorkspaceMigrationBuilderModule } from 'src/engine/workspace-manager/workspace-migration-builder/workspace-migration-builder.module';
+
+@Module({
+  imports: [
+    WorkspaceMigrationBuilderModule,
+    WorkspaceMigrationRunnerModule,
+    TypeOrmModule.forFeature(
+      [
+        FieldMetadataEntity,
+        ObjectMetadataEntity,
+        RelationMetadataEntity,
+        WorkspaceMigrationEntity,
+      ],
+      'metadata',
+    ),
+    TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
+  ],
+  providers: [
+    ...workspaceSyncMetadataFactories,
+    ...workspaceSyncMetadataComparators,
+    WorkspaceMetadataUpdaterService,
+    WorkspaceSyncObjectMetadataService,
+    WorkspaceSyncRelationMetadataService,
+    WorkspaceSyncFieldMetadataService,
+    WorkspaceSyncMetadataService,
+  ],
+  exports: [...workspaceSyncMetadataFactories, WorkspaceSyncMetadataService],
+})
+export class WorkspaceSyncMetadataModule {}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service.ts
new file mode 100644
index 000000000000..8f908b637546
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service.ts
@@ -0,0 +1,137 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { InjectDataSource } from '@nestjs/typeorm';
+
+import { DataSource } from 'typeorm';
+
+import { WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
+
+import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service';
+import { FeatureFlagFactory } from 'src/engine/workspace-manager/workspace-sync-metadata/factories/feature-flags.factory';
+import { WorkspaceSyncObjectMetadataService } from 'src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-object-metadata.service';
+import { WorkspaceSyncRelationMetadataService } from 'src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-relation-metadata.service';
+import { WorkspaceSyncFieldMetadataService } from 'src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-field-metadata.service';
+import { WorkspaceSyncStorage } from 'src/engine/workspace-manager/workspace-sync-metadata/storage/workspace-sync.storage';
+import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+
+interface SynchronizeOptions {
+  applyChanges?: boolean;
+}
+
+@Injectable()
+export class WorkspaceSyncMetadataService {
+  private readonly logger = new Logger(WorkspaceSyncMetadataService.name);
+
+  constructor(
+    @InjectDataSource('metadata')
+    private readonly metadataDataSource: DataSource,
+    private readonly featureFlagFactory: FeatureFlagFactory,
+    private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
+    private readonly workspaceSyncObjectMetadataService: WorkspaceSyncObjectMetadataService,
+    private readonly workspaceSyncRelationMetadataService: WorkspaceSyncRelationMetadataService,
+    private readonly workspaceSyncFieldMetadataService: WorkspaceSyncFieldMetadataService,
+  ) {}
+
+  /**
+   *
+   * Sync all standard objects and fields metadata for a given workspace and data source
+   * This will update the metadata if it has changed and generate migrations based on the diff.
+   *
+   * @param dataSourceId
+   * @param workspaceId
+   */
+  public async synchronize(
+    context: WorkspaceSyncContext,
+    options: SynchronizeOptions = { applyChanges: true },
+  ): Promise<{
+    workspaceMigrations: WorkspaceMigrationEntity[];
+    storage: WorkspaceSyncStorage;
+  }> {
+    let workspaceMigrations: WorkspaceMigrationEntity[] = [];
+    const storage = new WorkspaceSyncStorage();
+    const queryRunner = this.metadataDataSource.createQueryRunner();
+
+    this.logger.log('Syncing standard objects and fields metadata');
+
+    await queryRunner.connect();
+    await queryRunner.startTransaction();
+
+    const manager = queryRunner.manager;
+
+    try {
+      const workspaceMigrationRepository = manager.getRepository(
+        WorkspaceMigrationEntity,
+      );
+
+      // Retrieve feature flags
+      const workspaceFeatureFlagsMap =
+        await this.featureFlagFactory.create(context);
+
+      this.logger.log('Syncing standard objects and fields metadata');
+
+      // 1 - Sync standard objects
+      const workspaceObjectMigrations =
+        await this.workspaceSyncObjectMetadataService.synchronize(
+          context,
+          manager,
+          storage,
+          workspaceFeatureFlagsMap,
+        );
+
+      // 2 - Sync standard fields on custom objects
+      const workspaceFieldMigrations =
+        await this.workspaceSyncFieldMetadataService.synchronize(
+          context,
+          manager,
+          storage,
+          workspaceFeatureFlagsMap,
+        );
+
+      // 3 - Sync standard relations on standard and custom objects
+      const workspaceRelationMigrations =
+        await this.workspaceSyncRelationMetadataService.synchronize(
+          context,
+          manager,
+          storage,
+          workspaceFeatureFlagsMap,
+        );
+
+      // Save workspace migrations into the database
+      workspaceMigrations = await workspaceMigrationRepository.save([
+        ...workspaceObjectMigrations,
+        ...workspaceFieldMigrations,
+        ...workspaceRelationMigrations,
+      ]);
+
+      // If we're running a dry run, rollback the transaction and do not execute migrations
+      if (!options.applyChanges) {
+        this.logger.log('Running in dry run mode, rolling back transaction');
+
+        await queryRunner.rollbackTransaction();
+
+        await queryRunner.release();
+
+        return {
+          workspaceMigrations,
+          storage,
+        };
+      }
+
+      await queryRunner.commitTransaction();
+
+      // Execute migrations
+      await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
+        context.workspaceId,
+      );
+    } catch (error) {
+      console.error('Sync of standard objects failed with:', error);
+      await queryRunner.rollbackTransaction();
+    } finally {
+      await queryRunner.release();
+    }
+
+    return {
+      workspaceMigrations,
+      storage,
+    };
+  }
+}
diff --git a/packages/twenty-server/src/graphql-config/factories/create-context.factory.ts b/packages/twenty-server/src/graphql-config/factories/create-context.factory.ts
deleted file mode 100644
index 1186898cc754..000000000000
--- a/packages/twenty-server/src/graphql-config/factories/create-context.factory.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { YogaDriverServerContext } from '@graphql-yoga/nestjs';
-
-import { GraphQLContext } from 'src/graphql-config/interfaces/graphql-context.interface';
-
-import { TokenService } from 'src/core/auth/services/token.service';
-
-@Injectable()
-export class CreateContextFactory {
-  constructor(private readonly tokenService: TokenService) {}
-
-  async create(
-    context: YogaDriverServerContext<'express'>,
-  ): Promise<GraphQLContext> {
-    // Check if token is present in the request
-    if (this.tokenService.isTokenPresent(context.req)) {
-      const data = await this.tokenService.validateToken(context.req);
-
-      // Inject user and workspace into the context
-      return { ...context, ...data };
-    }
-
-    return context;
-  }
-}
diff --git a/packages/twenty-server/src/graphql-config/factories/index.ts b/packages/twenty-server/src/graphql-config/factories/index.ts
deleted file mode 100644
index c81ec577e8af..000000000000
--- a/packages/twenty-server/src/graphql-config/factories/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { CreateContextFactory } from './create-context.factory';
-
-export const graphQLFactories = [CreateContextFactory];
diff --git a/packages/twenty-server/src/graphql-config/graphql-config.module.ts b/packages/twenty-server/src/graphql-config/graphql-config.module.ts
deleted file mode 100644
index 64290089e922..000000000000
--- a/packages/twenty-server/src/graphql-config/graphql-config.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { CoreModule } from 'src/core/core.module';
-import { graphQLFactories } from 'src/graphql-config/factories';
-
-@Module({
-  imports: [CoreModule],
-  providers: [...graphQLFactories],
-  exports: [...graphQLFactories],
-})
-export class GraphQLConfigModule {}
diff --git a/packages/twenty-server/src/graphql-config/graphql-config.service.ts b/packages/twenty-server/src/graphql-config/graphql-config.service.ts
deleted file mode 100644
index f999ee639378..000000000000
--- a/packages/twenty-server/src/graphql-config/graphql-config.service.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import { Injectable, UnauthorizedException } from '@nestjs/common';
-import { ContextIdFactory, ModuleRef } from '@nestjs/core';
-import { GqlOptionsFactory } from '@nestjs/graphql';
-
-import {
-  YogaDriverConfig,
-  YogaDriverServerContext,
-} from '@graphql-yoga/nestjs';
-import { GraphQLSchema, GraphQLError } from 'graphql';
-import GraphQLJSON from 'graphql-type-json';
-import { JsonWebTokenError, TokenExpiredError } from 'jsonwebtoken';
-import { GraphQLSchemaWithContext, YogaInitialContext } from 'graphql-yoga';
-
-import { TokenService } from 'src/core/auth/services/token.service';
-import { CoreModule } from 'src/core/core.module';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { WorkspaceFactory } from 'src/workspace/workspace.factory';
-import { ExceptionHandlerService } from 'src/integrations/exception-handler/exception-handler.service';
-import { handleExceptionAndConvertToGraphQLError } from 'src/filters/utils/global-exception-handler.util';
-import { renderApolloPlayground } from 'src/workspace/utils/render-apollo-playground.util';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { useExceptionHandler } from 'src/integrations/exception-handler/hooks/use-exception-handler.hook';
-import { User } from 'src/core/user/user.entity';
-import { useThrottler } from 'src/integrations/throttler/hooks/use-throttler';
-import { JwtData } from 'src/core/auth/types/jwt-data.type';
-
-import { CreateContextFactory } from './factories/create-context.factory';
-
-export interface GraphQLContext extends YogaDriverServerContext<'express'> {
-  user?: User;
-  workspace?: Workspace;
-}
-
-@Injectable()
-export class GraphQLConfigService
-  implements GqlOptionsFactory<YogaDriverConfig<'express'>>
-{
-  constructor(
-    private readonly createContextFactory: CreateContextFactory,
-    private readonly tokenService: TokenService,
-    private readonly exceptionHandlerService: ExceptionHandlerService,
-    private readonly environmentService: EnvironmentService,
-    private readonly moduleRef: ModuleRef,
-  ) {}
-
-  createGqlOptions(): YogaDriverConfig {
-    const isDebugMode = this.environmentService.isDebugMode();
-    const config: YogaDriverConfig = {
-      context: (context) => this.createContextFactory.create(context),
-      autoSchemaFile: true,
-      include: [CoreModule],
-      conditionalSchema: async (context) => {
-        let user: User | undefined;
-
-        try {
-          if (!this.tokenService.isTokenPresent(context.req)) {
-            return new GraphQLSchema({});
-          }
-
-          const data = await this.tokenService.validateToken(context.req);
-
-          user = data.user;
-
-          return await this.createSchema(context, data);
-        } catch (error) {
-          if (error instanceof UnauthorizedException) {
-            throw new GraphQLError('Unauthenticated', {
-              extensions: {
-                code: 'UNAUTHENTICATED',
-              },
-            });
-          }
-
-          if (error instanceof JsonWebTokenError) {
-            //mockedUserJWT
-            throw new GraphQLError('Unauthenticated', {
-              extensions: {
-                code: 'UNAUTHENTICATED',
-              },
-            });
-          }
-
-          if (error instanceof TokenExpiredError) {
-            throw new GraphQLError('Unauthenticated', {
-              extensions: {
-                code: 'UNAUTHENTICATED',
-              },
-            });
-          }
-
-          throw handleExceptionAndConvertToGraphQLError(
-            error,
-            this.exceptionHandlerService,
-            user
-              ? {
-                  id: user.id,
-                  email: user.email,
-                }
-              : undefined,
-          );
-        }
-      },
-      resolvers: { JSON: GraphQLJSON },
-      plugins: [
-        useThrottler({
-          ttl: this.environmentService.getApiRateLimitingTtl(),
-          limit: this.environmentService.getApiRateLimitingLimit(),
-          identifyFn: (context) => {
-            return context.user?.id ?? context.req.ip ?? 'anonymous';
-          },
-        }),
-        useExceptionHandler({
-          exceptionHandlerService: this.exceptionHandlerService,
-        }),
-      ],
-    };
-
-    if (isDebugMode) {
-      config.renderGraphiQL = () => {
-        return renderApolloPlayground();
-      };
-    }
-
-    return config;
-  }
-
-  async createSchema(
-    context: YogaDriverServerContext<'express'> & YogaInitialContext,
-    data: JwtData,
-  ): Promise<GraphQLSchemaWithContext<YogaDriverServerContext<'express'>>> {
-    // Create a new contextId for each request
-    const contextId = ContextIdFactory.create();
-
-    // Register the request in the contextId
-    this.moduleRef.registerRequestByContextId(context.req, contextId);
-
-    // Resolve the WorkspaceFactory for the contextId
-    const workspaceFactory = await this.moduleRef.resolve(
-      WorkspaceFactory,
-      contextId,
-      {
-        strict: false,
-      },
-    );
-
-    return await workspaceFactory.createGraphQLSchema(
-      data.workspace.id,
-      data.user?.id,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/graphql-config/interfaces/graphql-context.interface.ts b/packages/twenty-server/src/graphql-config/interfaces/graphql-context.interface.ts
deleted file mode 100644
index ab5a5d3c831e..000000000000
--- a/packages/twenty-server/src/graphql-config/interfaces/graphql-context.interface.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { YogaDriverServerContext } from '@graphql-yoga/nestjs';
-
-import { User } from 'src/core/user/user.entity';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-
-export interface GraphQLContext extends YogaDriverServerContext<'express'> {
-  user?: User;
-  workspace?: Workspace;
-}
diff --git a/packages/twenty-server/src/health/health.module.ts b/packages/twenty-server/src/health/health.module.ts
deleted file mode 100644
index bbdb3511469b..000000000000
--- a/packages/twenty-server/src/health/health.module.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TerminusModule } from '@nestjs/terminus';
-
-import { HealthController } from 'src/health/health.controller';
-
-@Module({
-  imports: [TerminusModule],
-  controllers: [HealthController],
-})
-export class HealthModule {}
diff --git a/packages/twenty-server/src/integrations/email/email-sender.job.ts b/packages/twenty-server/src/integrations/email/email-sender.job.ts
deleted file mode 100644
index 1162f4ca0646..000000000000
--- a/packages/twenty-server/src/integrations/email/email-sender.job.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { SendMailOptions } from 'nodemailer';
-
-import { MessageQueueJob } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
-
-import { EmailSenderService } from 'src/integrations/email/email-sender.service';
-
-@Injectable()
-export class EmailSenderJob implements MessageQueueJob<SendMailOptions> {
-  constructor(private readonly emailSenderService: EmailSenderService) {}
-
-  async handle(data: SendMailOptions): Promise<void> {
-    await this.emailSenderService.send(data);
-  }
-}
diff --git a/packages/twenty-server/src/integrations/email/email-sender.service.ts b/packages/twenty-server/src/integrations/email/email-sender.service.ts
deleted file mode 100644
index 58b6c4a9c183..000000000000
--- a/packages/twenty-server/src/integrations/email/email-sender.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-
-import { SendMailOptions } from 'nodemailer';
-
-import { EmailDriver } from 'src/integrations/email/drivers/interfaces/email-driver.interface';
-
-import { EMAIL_DRIVER } from 'src/integrations/email/email.constants';
-
-@Injectable()
-export class EmailSenderService implements EmailDriver {
-  constructor(@Inject(EMAIL_DRIVER) private driver: EmailDriver) {}
-
-  async send(sendMailOptions: SendMailOptions): Promise<void> {
-    await this.driver.send(sendMailOptions);
-  }
-}
diff --git a/packages/twenty-server/src/integrations/email/email.module-factory.ts b/packages/twenty-server/src/integrations/email/email.module-factory.ts
deleted file mode 100644
index c7da0d8d8c41..000000000000
--- a/packages/twenty-server/src/integrations/email/email.module-factory.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import {
-  EmailDriver,
-  EmailModuleOptions,
-} from 'src/integrations/email/interfaces/email.interface';
-
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-
-export const emailModuleFactory = (
-  environmentService: EnvironmentService,
-): EmailModuleOptions => {
-  const driver = environmentService.getEmailDriver();
-
-  switch (driver) {
-    case EmailDriver.Logger: {
-      return;
-    }
-    case EmailDriver.Smtp: {
-      const host = environmentService.getEmailHost();
-      const port = environmentService.getEmailPort();
-      const user = environmentService.getEmailUser();
-      const pass = environmentService.getEmailPassword();
-
-      if (!(host && port)) {
-        throw new Error(
-          `${driver} email driver requires host: ${host} and port: ${port} to be defined, check your .env file`,
-        );
-      }
-
-      const auth = user && pass ? { user, pass } : undefined;
-
-      if (auth) {
-        return { host, port, auth };
-      }
-
-      return { host, port };
-    }
-    default:
-      throw new Error(`Invalid email driver (${driver}), check your .env file`);
-  }
-};
diff --git a/packages/twenty-server/src/integrations/email/email.module.ts b/packages/twenty-server/src/integrations/email/email.module.ts
deleted file mode 100644
index d18fa71fdbc9..000000000000
--- a/packages/twenty-server/src/integrations/email/email.module.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { DynamicModule, Global } from '@nestjs/common';
-
-import { EmailModuleAsyncOptions } from 'src/integrations/email/interfaces/email.interface';
-
-import { EMAIL_DRIVER } from 'src/integrations/email/email.constants';
-import { LoggerDriver } from 'src/integrations/email/drivers/logger.driver';
-import { SmtpDriver } from 'src/integrations/email/drivers/smtp.driver';
-import { EmailService } from 'src/integrations/email/email.service';
-import { EmailSenderService } from 'src/integrations/email/email-sender.service';
-
-@Global()
-export class EmailModule {
-  static forRoot(options: EmailModuleAsyncOptions): DynamicModule {
-    const provider = {
-      provide: EMAIL_DRIVER,
-      useFactory: (...args: any[]) => {
-        const config = options.useFactory(...args);
-
-        return config ? new SmtpDriver(config) : new LoggerDriver();
-      },
-      inject: options.inject || [],
-    };
-
-    return {
-      module: EmailModule,
-      providers: [EmailSenderService, EmailService, provider],
-      exports: [EmailSenderService, EmailService],
-    };
-  }
-}
diff --git a/packages/twenty-server/src/integrations/email/email.service.ts b/packages/twenty-server/src/integrations/email/email.service.ts
deleted file mode 100644
index 8963ce74d9c6..000000000000
--- a/packages/twenty-server/src/integrations/email/email.service.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-
-import { SendMailOptions } from 'nodemailer';
-
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import { EmailSenderJob } from 'src/integrations/email/email-sender.job';
-
-@Injectable()
-export class EmailService {
-  constructor(
-    @Inject(MessageQueue.emailQueue)
-    private readonly messageQueueService: MessageQueueService,
-  ) {}
-
-  async send(sendMailOptions: SendMailOptions): Promise<void> {
-    await this.messageQueueService.add<SendMailOptions>(
-      EmailSenderJob.name,
-      sendMailOptions,
-      { retryLimit: 3 },
-    );
-  }
-}
diff --git a/packages/twenty-server/src/integrations/environment/environment.service.ts b/packages/twenty-server/src/integrations/environment/environment.service.ts
deleted file mode 100644
index e2bce5cba976..000000000000
--- a/packages/twenty-server/src/integrations/environment/environment.service.ts
+++ /dev/null
@@ -1,331 +0,0 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { Injectable, LogLevel } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-
-import { EmailDriver } from 'src/integrations/email/interfaces/email.interface';
-
-import { LoggerDriverType } from 'src/integrations/logger/interfaces';
-import { ExceptionHandlerDriver } from 'src/integrations/exception-handler/interfaces';
-import { StorageDriverType } from 'src/integrations/file-storage/interfaces';
-import { MessageQueueDriverType } from 'src/integrations/message-queue/interfaces';
-
-import { AwsRegion } from './interfaces/aws-region.interface';
-import { SupportDriver } from './interfaces/support.interface';
-
-@Injectable()
-export class EnvironmentService {
-  constructor(private configService: ConfigService) {}
-
-  isDebugMode(): boolean {
-    return this.configService.get<boolean>('DEBUG_MODE') ?? false;
-  }
-
-  isSignInPrefilled(): boolean {
-    return this.configService.get<boolean>('SIGN_IN_PREFILLED') ?? false;
-  }
-
-  isBillingEnabled() {
-    return this.configService.get<boolean>('IS_BILLING_ENABLED') ?? false;
-  }
-
-  getBillingUrl() {
-    return this.configService.get<string>('BILLING_PLAN_REQUIRED_LINK') ?? '';
-  }
-
-  getBillingStripeBasePlanProductId(): string {
-    return (
-      this.configService.get<string>('BILLING_STRIPE_BASE_PLAN_PRODUCT_ID') ??
-      ''
-    );
-  }
-
-  getBillingStripeApiKey(): string {
-    return this.configService.get<string>('BILLING_STRIPE_API_KEY') ?? '';
-  }
-
-  getBillingStripeWebhookSecret(): string {
-    return (
-      this.configService.get<string>('BILLING_STRIPE_WEBHOOK_SECRET') ?? ''
-    );
-  }
-
-  getBillingFreeTrialDurationInDays(): number {
-    return (
-      this.configService.get<number>('BILLING_FREE_TRIAL_DURATION_IN_DAYS') ?? 7
-    );
-  }
-
-  isTelemetryEnabled(): boolean {
-    return this.configService.get<boolean>('TELEMETRY_ENABLED') ?? true;
-  }
-
-  isTelemetryAnonymizationEnabled(): boolean {
-    return (
-      this.configService.get<boolean>('TELEMETRY_ANONYMIZATION_ENABLED') ?? true
-    );
-  }
-
-  getPort(): number {
-    return this.configService.get<number>('PORT') ?? 3000;
-  }
-
-  getPGDatabaseUrl(): string {
-    return this.configService.get<string>('PG_DATABASE_URL')!;
-  }
-
-  getRedisHost(): string {
-    return this.configService.get<string>('REDIS_HOST') ?? '127.0.0.1';
-  }
-
-  getRedisPort(): number {
-    return +(this.configService.get<string>('REDIS_PORT') ?? 6379);
-  }
-
-  getFrontBaseUrl(): string {
-    return this.configService.get<string>('FRONT_BASE_URL')!;
-  }
-
-  getServerUrl(): string {
-    return this.configService.get<string>('SERVER_URL')!;
-  }
-
-  getAccessTokenSecret(): string {
-    return this.configService.get<string>('ACCESS_TOKEN_SECRET')!;
-  }
-
-  getAccessTokenExpiresIn(): string {
-    return this.configService.get<string>('ACCESS_TOKEN_EXPIRES_IN') ?? '30m';
-  }
-
-  getRefreshTokenSecret(): string {
-    return this.configService.get<string>('REFRESH_TOKEN_SECRET')!;
-  }
-
-  getRefreshTokenExpiresIn(): string {
-    return this.configService.get<string>('REFRESH_TOKEN_EXPIRES_IN') ?? '90d';
-  }
-
-  getRefreshTokenCoolDown(): string {
-    return this.configService.get<string>('REFRESH_TOKEN_COOL_DOWN') ?? '1m';
-  }
-
-  getLoginTokenSecret(): string {
-    return this.configService.get<string>('LOGIN_TOKEN_SECRET')!;
-  }
-
-  getLoginTokenExpiresIn(): string {
-    return this.configService.get<string>('LOGIN_TOKEN_EXPIRES_IN') ?? '15m';
-  }
-
-  getTransientTokenExpiresIn(): string {
-    return (
-      this.configService.get<string>('SHORT_TERM_TOKEN_EXPIRES_IN') ?? '5m'
-    );
-  }
-
-  getApiTokenExpiresIn(): string {
-    return this.configService.get<string>('API_TOKEN_EXPIRES_IN') ?? '1000y';
-  }
-
-  getFrontAuthCallbackUrl(): string {
-    return (
-      this.configService.get<string>('FRONT_AUTH_CALLBACK_URL') ??
-      this.getFrontBaseUrl() + '/verify'
-    );
-  }
-
-  isMessagingProviderGmailEnabled(): boolean {
-    return (
-      this.configService.get<boolean>('MESSAGING_PROVIDER_GMAIL_ENABLED') ??
-      false
-    );
-  }
-
-  getMessagingProviderGmailCallbackUrl(): string | undefined {
-    return this.configService.get<string>(
-      'MESSAGING_PROVIDER_GMAIL_CALLBACK_URL',
-    );
-  }
-
-  isAuthGoogleEnabled(): boolean {
-    return this.configService.get<boolean>('AUTH_GOOGLE_ENABLED') ?? false;
-  }
-
-  getAuthGoogleClientId(): string | undefined {
-    return this.configService.get<string>('AUTH_GOOGLE_CLIENT_ID');
-  }
-
-  getAuthGoogleClientSecret(): string | undefined {
-    return this.configService.get<string>('AUTH_GOOGLE_CLIENT_SECRET');
-  }
-
-  getAuthGoogleCallbackUrl(): string | undefined {
-    return this.configService.get<string>('AUTH_GOOGLE_CALLBACK_URL');
-  }
-
-  getStorageDriverType(): StorageDriverType {
-    return (
-      this.configService.get<StorageDriverType>('STORAGE_TYPE') ??
-      StorageDriverType.Local
-    );
-  }
-
-  getMessageQueueDriverType(): MessageQueueDriverType {
-    return (
-      this.configService.get<MessageQueueDriverType>('MESSAGE_QUEUE_TYPE') ??
-      MessageQueueDriverType.Sync
-    );
-  }
-
-  getStorageS3Region(): AwsRegion | undefined {
-    return this.configService.get<AwsRegion>('STORAGE_S3_REGION');
-  }
-
-  getStorageS3Name(): string | undefined {
-    return this.configService.get<string>('STORAGE_S3_NAME');
-  }
-
-  getStorageS3Endpoint(): string | undefined {
-    return this.configService.get<string>('STORAGE_S3_ENDPOINT');
-  }
-
-  getStorageLocalPath(): string {
-    return (
-      this.configService.get<string>('STORAGE_LOCAL_PATH') ?? '.local-storage'
-    );
-  }
-
-  getEmailFromAddress(): string {
-    return (
-      this.configService.get<string>('EMAIL_FROM_ADDRESS') ??
-      'noreply@yourdomain.com'
-    );
-  }
-
-  getEmailSystemAddress(): string {
-    return (
-      this.configService.get<string>('EMAIL_SYSTEM_ADDRESS') ??
-      'system@yourdomain.com'
-    );
-  }
-
-  getEmailFromName(): string {
-    return (
-      this.configService.get<string>('EMAIL_FROM_NAME') ??
-      'John from YourDomain'
-    );
-  }
-
-  getEmailDriver(): EmailDriver {
-    return (
-      this.configService.get<EmailDriver>('EMAIL_DRIVER') ?? EmailDriver.Logger
-    );
-  }
-
-  getEmailHost(): string | undefined {
-    return this.configService.get<string>('EMAIL_SMTP_HOST');
-  }
-
-  getEmailPort(): number | undefined {
-    return this.configService.get<number>('EMAIL_SMTP_PORT');
-  }
-
-  getEmailUser(): string | undefined {
-    return this.configService.get<string>('EMAIL_SMTP_USER');
-  }
-
-  getEmailPassword(): string | undefined {
-    return this.configService.get<string>('EMAIL_SMTP_PASSWORD');
-  }
-
-  getSupportDriver(): string {
-    return (
-      this.configService.get<string>('SUPPORT_DRIVER') ?? SupportDriver.None
-    );
-  }
-
-  getSupportFrontChatId(): string | undefined {
-    return this.configService.get<string>('SUPPORT_FRONT_CHAT_ID');
-  }
-
-  getSupportFrontHMACKey(): string | undefined {
-    return this.configService.get<string>('SUPPORT_FRONT_HMAC_KEY');
-  }
-
-  getLoggerDriverType(): LoggerDriverType {
-    return (
-      this.configService.get<LoggerDriverType>('LOGGER_DRIVER') ??
-      LoggerDriverType.Console
-    );
-  }
-
-  getLoggerIsBufferEnabled(): boolean | undefined {
-    return this.configService.get<boolean>('LOGGER_IS_BUFFER_ENABLED') ?? true;
-  }
-
-  getExceptionHandlerDriverType(): ExceptionHandlerDriver {
-    return (
-      this.configService.get<ExceptionHandlerDriver>(
-        'EXCEPTION_HANDLER_DRIVER',
-      ) ?? ExceptionHandlerDriver.Console
-    );
-  }
-
-  getLogLevels(): LogLevel[] {
-    return (
-      this.configService.get<LogLevel[]>('LOG_LEVELS') ?? [
-        'log',
-        'error',
-        'warn',
-      ]
-    );
-  }
-
-  getSentryDSN(): string | undefined {
-    return this.configService.get<string | undefined>('SENTRY_DSN');
-  }
-
-  getDemoWorkspaceIds(): string[] {
-    return this.configService.get<string[]>('DEMO_WORKSPACE_IDS') ?? [];
-  }
-
-  getOpenRouterApiKey(): string | undefined {
-    return this.configService.get<string | undefined>('OPENROUTER_API_KEY');
-  }
-
-  getPasswordResetTokenExpiresIn(): string {
-    return (
-      this.configService.get<string>('PASSWORD_RESET_TOKEN_EXPIRES_IN') ?? '5m'
-    );
-  }
-
-  getInactiveDaysBeforeEmail(): number | undefined {
-    return this.configService.get<number | undefined>(
-      'WORKSPACE_INACTIVE_DAYS_BEFORE_NOTIFICATION',
-    );
-  }
-
-  getInactiveDaysBeforeDelete(): number | undefined {
-    return this.configService.get<number | undefined>(
-      'WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION',
-    );
-  }
-
-  isSignUpDisabled(): boolean {
-    return this.configService.get<boolean>('IS_SIGN_UP_DISABLED') ?? false;
-  }
-
-  getApiRateLimitingTtl(): number {
-    return this.configService.get<number>('API_RATE_LIMITING_TTL') ?? 100;
-  }
-
-  getApiRateLimitingLimit(): number {
-    return this.configService.get<number>('API_RATE_LIMITING_LIMIT') ?? 500;
-  }
-
-  getMutationMaximumRecordAffected(): number {
-    return (
-      this.configService.get<number>('MUTATION_MAXIMUM_RECORD_AFFECTED') ?? 100
-    );
-  }
-}
diff --git a/packages/twenty-server/src/integrations/environment/environment.validation.ts b/packages/twenty-server/src/integrations/environment/environment.validation.ts
deleted file mode 100644
index e64df45c6868..000000000000
--- a/packages/twenty-server/src/integrations/environment/environment.validation.ts
+++ /dev/null
@@ -1,238 +0,0 @@
-import { LogLevel } from '@nestjs/common';
-
-import { plainToClass } from 'class-transformer';
-import {
-  IsEnum,
-  IsOptional,
-  IsString,
-  IsUrl,
-  ValidateIf,
-  validateSync,
-  IsBoolean,
-  IsNumber,
-} from 'class-validator';
-
-import { assert } from 'src/utils/assert';
-import { CastToStringArray } from 'src/integrations/environment/decorators/cast-to-string-array.decorator';
-import { ExceptionHandlerDriver } from 'src/integrations/exception-handler/interfaces';
-import { StorageDriverType } from 'src/integrations/file-storage/interfaces';
-import { LoggerDriverType } from 'src/integrations/logger/interfaces';
-import { IsStrictlyLowerThan } from 'src/integrations/environment/decorators/is-strictly-lower-than.decorator';
-
-import { IsDuration } from './decorators/is-duration.decorator';
-import { AwsRegion } from './interfaces/aws-region.interface';
-import { IsAWSRegion } from './decorators/is-aws-region.decorator';
-import { CastToBoolean } from './decorators/cast-to-boolean.decorator';
-import { SupportDriver } from './interfaces/support.interface';
-import { CastToPositiveNumber } from './decorators/cast-to-positive-number.decorator';
-import { CastToLogLevelArray } from './decorators/cast-to-log-level-array.decorator';
-
-export class EnvironmentVariables {
-  // Misc
-  @CastToBoolean()
-  @IsOptional()
-  @IsBoolean()
-  DEBUG_MODE?: boolean;
-
-  @CastToBoolean()
-  @IsOptional()
-  @IsBoolean()
-  SIGN_IN_PREFILLED?: boolean;
-
-  @CastToBoolean()
-  @IsOptional()
-  @IsBoolean()
-  IS_BILLING_ENABLED?: boolean;
-
-  @IsString()
-  @ValidateIf((env) => env.IS_BILLING_ENABLED === true)
-  BILLING_PLAN_REQUIRED_LINK?: string;
-
-  @IsString()
-  @ValidateIf((env) => env.IS_BILLING_ENABLED === true)
-  BILLING_STRIPE_BASE_PLAN_PRODUCT_ID?: string;
-
-  @IsNumber()
-  @CastToPositiveNumber()
-  @IsOptional()
-  @ValidateIf((env) => env.IS_BILLING_ENABLED === true)
-  BILLING_FREE_TRIAL_DURATION_IN_DAYS?: number;
-
-  @IsString()
-  @ValidateIf((env) => env.IS_BILLING_ENABLED === true)
-  BILLING_STRIPE_API_KEY?: string;
-
-  @IsString()
-  @ValidateIf((env) => env.IS_BILLING_ENABLED === true)
-  BILLING_STRIPE_WEBHOOK_SECRET?: string;
-
-  @CastToBoolean()
-  @IsOptional()
-  @IsBoolean()
-  TELEMETRY_ENABLED?: boolean;
-
-  @CastToBoolean()
-  @IsOptional()
-  @IsBoolean()
-  TELEMETRY_ANONYMIZATION_ENABLED?: boolean;
-
-  @CastToPositiveNumber()
-  @IsNumber()
-  @IsOptional()
-  PORT: number;
-
-  // Database
-  @IsUrl({
-    protocols: ['postgres'],
-    require_tld: false,
-    allow_underscores: true,
-  })
-  PG_DATABASE_URL: string;
-
-  // Frontend URL
-  @IsUrl({ require_tld: false })
-  FRONT_BASE_URL: string;
-
-  // Server URL
-  @IsUrl({ require_tld: false })
-  @IsOptional()
-  SERVER_URL: string;
-
-  // Json Web Token
-  @IsString()
-  ACCESS_TOKEN_SECRET: string;
-
-  @IsDuration()
-  @IsOptional()
-  ACCESS_TOKEN_EXPIRES_IN: string;
-
-  @IsString()
-  REFRESH_TOKEN_SECRET: string;
-
-  @IsDuration()
-  @IsOptional()
-  REFRESH_TOKEN_EXPIRES_IN: string;
-
-  @IsDuration()
-  @IsOptional()
-  REFRESH_TOKEN_COOL_DOWN: string;
-
-  @IsString()
-  LOGIN_TOKEN_SECRET: string;
-
-  @IsDuration()
-  @IsOptional()
-  LOGIN_TOKEN_EXPIRES_IN: string;
-
-  // Auth
-  @IsUrl({ require_tld: false })
-  @IsOptional()
-  FRONT_AUTH_CALLBACK_URL: string;
-
-  @CastToBoolean()
-  @IsOptional()
-  @IsBoolean()
-  AUTH_GOOGLE_ENABLED?: boolean;
-
-  @IsString()
-  @ValidateIf((env) => env.AUTH_GOOGLE_ENABLED === true)
-  AUTH_GOOGLE_CLIENT_ID?: string;
-
-  @IsString()
-  @ValidateIf((env) => env.AUTH_GOOGLE_ENABLED === true)
-  AUTH_GOOGLE_CLIENT_SECRET?: string;
-
-  @IsUrl({ require_tld: false })
-  @ValidateIf((env) => env.AUTH_GOOGLE_ENABLED === true)
-  AUTH_GOOGLE_CALLBACK_URL?: string;
-
-  // Storage
-  @IsEnum(StorageDriverType)
-  @IsOptional()
-  STORAGE_TYPE?: StorageDriverType;
-
-  @ValidateIf((env) => env.STORAGE_TYPE === StorageDriverType.S3)
-  @IsAWSRegion()
-  STORAGE_S3_REGION?: AwsRegion;
-
-  @ValidateIf((env) => env.STORAGE_TYPE === StorageDriverType.S3)
-  @IsString()
-  STORAGE_S3_NAME?: string;
-
-  @IsString()
-  @ValidateIf((env) => env.STORAGE_TYPE === StorageDriverType.Local)
-  STORAGE_LOCAL_PATH?: string;
-
-  // Support
-  @IsEnum(SupportDriver)
-  @IsOptional()
-  SUPPORT_DRIVER?: SupportDriver;
-
-  @ValidateIf((env) => env.SUPPORT_DRIVER === SupportDriver.Front)
-  @IsString()
-  SUPPORT_FRONT_CHAT_ID?: string;
-
-  @ValidateIf((env) => env.SUPPORT_DRIVER === SupportDriver.Front)
-  @IsString()
-  SUPPORT_FRONT_HMAC_KEY?: string;
-
-  @IsEnum(LoggerDriverType)
-  @IsOptional()
-  LOGGER_DRIVER?: LoggerDriverType;
-
-  @IsEnum(ExceptionHandlerDriver)
-  @IsOptional()
-  EXCEPTION_HANDLER_DRIVER?: ExceptionHandlerDriver;
-
-  @CastToLogLevelArray()
-  @IsOptional()
-  LOG_LEVELS?: LogLevel[];
-
-  @CastToStringArray()
-  @IsOptional()
-  DEMO_WORKSPACE_IDS?: string[];
-
-  @ValidateIf(
-    (env) => env.EXCEPTION_HANDLER_DRIVER === ExceptionHandlerDriver.Sentry,
-  )
-  @IsString()
-  SENTRY_DSN?: string;
-
-  @IsDuration()
-  @IsOptional()
-  PASSWORD_RESET_TOKEN_EXPIRES_IN?: number;
-
-  @CastToPositiveNumber()
-  @IsNumber()
-  @ValidateIf((env) => env.WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION > 0)
-  @IsStrictlyLowerThan('WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION', {
-    message:
-      '"WORKSPACE_INACTIVE_DAYS_BEFORE_NOTIFICATION" should be strictly lower that "WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION"',
-  })
-  @ValidateIf((env) => env.WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION > 0)
-  WORKSPACE_INACTIVE_DAYS_BEFORE_NOTIFICATION: number;
-
-  @CastToPositiveNumber()
-  @IsNumber()
-  @ValidateIf((env) => env.WORKSPACE_INACTIVE_DAYS_BEFORE_NOTIFICATION > 0)
-  WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION: number;
-
-  @CastToBoolean()
-  @IsOptional()
-  @IsBoolean()
-  IS_SIGN_UP_DISABLED?: boolean;
-
-  @CastToPositiveNumber()
-  @IsOptional()
-  @IsNumber()
-  MUTATION_MAXIMUM_RECORD_AFFECTED: number;
-}
-export const validate = (config: Record<string, unknown>) => {
-  const validatedConfig = plainToClass(EnvironmentVariables, config);
-
-  const errors = validateSync(validatedConfig);
-
-  assert(!errors.length, errors.toString());
-
-  return validatedConfig;
-};
diff --git a/packages/twenty-server/src/integrations/event-emitter/types/object-record-create.event.ts b/packages/twenty-server/src/integrations/event-emitter/types/object-record-create.event.ts
deleted file mode 100644
index d9dbbeb2342b..000000000000
--- a/packages/twenty-server/src/integrations/event-emitter/types/object-record-create.event.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-
-export class ObjectRecordCreateEvent<T extends BaseObjectMetadata> {
-  workspaceId: string;
-  createdRecord: T;
-}
diff --git a/packages/twenty-server/src/integrations/event-emitter/types/object-record-delete.event.ts b/packages/twenty-server/src/integrations/event-emitter/types/object-record-delete.event.ts
deleted file mode 100644
index 82b93ebbd92e..000000000000
--- a/packages/twenty-server/src/integrations/event-emitter/types/object-record-delete.event.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-
-export declare class ObjectRecordDeleteEvent<T extends BaseObjectMetadata> {
-  workspaceId: string;
-  deletedRecord: T;
-}
diff --git a/packages/twenty-server/src/integrations/event-emitter/types/object-record-update.event.ts b/packages/twenty-server/src/integrations/event-emitter/types/object-record-update.event.ts
deleted file mode 100644
index d577f246c704..000000000000
--- a/packages/twenty-server/src/integrations/event-emitter/types/object-record-update.event.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-
-export class ObjectRecordUpdateEvent<T extends BaseObjectMetadata> {
-  workspaceId: string;
-  previousRecord: T;
-  updatedRecord: T;
-}
diff --git a/packages/twenty-server/src/integrations/exception-handler/drivers/console.driver.ts b/packages/twenty-server/src/integrations/exception-handler/drivers/console.driver.ts
deleted file mode 100644
index cd38ef827a07..000000000000
--- a/packages/twenty-server/src/integrations/exception-handler/drivers/console.driver.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { ExceptionHandlerUser } from 'src/integrations/exception-handler/interfaces/exception-handler-user.interface';
-import { ExceptionHandlerOptions } from 'src/integrations/exception-handler/interfaces/exception-handler-options.interface';
-
-import { ExceptionHandlerDriverInterface } from 'src/integrations/exception-handler/interfaces';
-
-export class ExceptionHandlerConsoleDriver
-  implements ExceptionHandlerDriverInterface
-{
-  captureExceptions(
-    exceptions: ReadonlyArray<any>,
-    options?: ExceptionHandlerOptions,
-  ) {
-    console.group('Exception Captured');
-    console.info(options);
-    console.error(exceptions);
-    console.groupEnd();
-
-    return [];
-  }
-
-  captureMessage(message: string, user?: ExceptionHandlerUser): void {
-    console.group('Message Captured');
-    console.info(user);
-    console.info(message);
-    console.groupEnd();
-  }
-}
diff --git a/packages/twenty-server/src/integrations/exception-handler/drivers/sentry.driver.ts b/packages/twenty-server/src/integrations/exception-handler/drivers/sentry.driver.ts
deleted file mode 100644
index a843fb27b9c1..000000000000
--- a/packages/twenty-server/src/integrations/exception-handler/drivers/sentry.driver.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import * as Sentry from '@sentry/node';
-import { ProfilingIntegration } from '@sentry/profiling-node';
-
-import { ExceptionHandlerUser } from 'src/integrations/exception-handler/interfaces/exception-handler-user.interface';
-import { ExceptionHandlerOptions } from 'src/integrations/exception-handler/interfaces/exception-handler-options.interface';
-
-import {
-  ExceptionHandlerDriverInterface,
-  ExceptionHandlerSentryDriverFactoryOptions,
-} from 'src/integrations/exception-handler/interfaces';
-
-export class ExceptionHandlerSentryDriver
-  implements ExceptionHandlerDriverInterface
-{
-  constructor(options: ExceptionHandlerSentryDriverFactoryOptions['options']) {
-    Sentry.init({
-      dsn: options.dsn,
-      integrations: [
-        // enable HTTP calls tracing
-        new Sentry.Integrations.Http({ tracing: true }),
-        // enable Express.js middleware tracing
-        new Sentry.Integrations.Express({ app: options.serverInstance }),
-        new Sentry.Integrations.GraphQL(),
-        new Sentry.Integrations.Postgres({
-          usePgNative: true,
-        }),
-        new ProfilingIntegration(),
-      ],
-      tracesSampleRate: 1.0,
-      profilesSampleRate: 1.0,
-      environment: options.debug ? 'development' : 'production',
-      debug: options.debug,
-    });
-  }
-
-  captureExceptions(
-    exceptions: ReadonlyArray<any>,
-    options?: ExceptionHandlerOptions,
-  ) {
-    const eventIds: string[] = [];
-
-    Sentry.withScope((scope) => {
-      if (options?.operation) {
-        scope.setTag('operation', options.operation.name);
-        scope.setTag('operationName', options.operation.name);
-      }
-
-      if (options?.document) {
-        scope.setExtra('document', options.document);
-      }
-
-      if (options?.user) {
-        scope.setUser({
-          id: options.user.id,
-          ip_address: options.user.ipAddress,
-          email: options.user.email,
-          username: options.user.username,
-        });
-      }
-
-      for (const exception of exceptions) {
-        const errorPath = (exception.path ?? [])
-          .map((v: string | number) => (typeof v === 'number' ? '$index' : v))
-          .join(' > ');
-
-        if (errorPath) {
-          scope.addBreadcrumb({
-            category: 'execution-path',
-            message: errorPath,
-            level: 'debug',
-          });
-        }
-
-        const eventId = Sentry.captureException(exception, {
-          fingerprint: [
-            'graphql',
-            errorPath,
-            options?.operation?.name,
-            options?.operation?.type,
-          ],
-          contexts: {
-            GraphQL: {
-              operationName: options?.operation?.name,
-              operationType: options?.operation?.type,
-            },
-          },
-        });
-
-        eventIds.push(eventId);
-      }
-    });
-
-    return eventIds;
-  }
-
-  captureMessage(message: string, user?: ExceptionHandlerUser) {
-    Sentry.captureMessage(message, (scope) => {
-      if (user) {
-        scope.setUser({
-          id: user.id,
-          ip_address: user.ipAddress,
-          email: user.email,
-          username: user.username,
-        });
-      }
-
-      return scope;
-    });
-  }
-}
diff --git a/packages/twenty-server/src/integrations/exception-handler/exception-handler.module-factory.ts b/packages/twenty-server/src/integrations/exception-handler/exception-handler.module-factory.ts
deleted file mode 100644
index c8d601d224d1..000000000000
--- a/packages/twenty-server/src/integrations/exception-handler/exception-handler.module-factory.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { HttpAdapterHost } from '@nestjs/core';
-
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { OPTIONS_TYPE } from 'src/integrations/exception-handler/exception-handler.module-definition';
-import { ExceptionHandlerDriver } from 'src/integrations/exception-handler/interfaces';
-
-/**
- * ExceptionHandler Module factory
- * @param environment
- * @returns ExceptionHandlerModuleOptions
- */
-export const exceptionHandlerModuleFactory = async (
-  environmentService: EnvironmentService,
-  adapterHost: HttpAdapterHost,
-): Promise<typeof OPTIONS_TYPE> => {
-  const driverType = environmentService.getExceptionHandlerDriverType();
-
-  switch (driverType) {
-    case ExceptionHandlerDriver.Console: {
-      return {
-        type: ExceptionHandlerDriver.Console,
-      };
-    }
-    case ExceptionHandlerDriver.Sentry: {
-      return {
-        type: ExceptionHandlerDriver.Sentry,
-        options: {
-          dsn: environmentService.getSentryDSN() ?? '',
-          serverInstance: adapterHost.httpAdapter?.getInstance(),
-          debug: environmentService.isDebugMode(),
-        },
-      };
-    }
-    default:
-      throw new Error(
-        `Invalid exception capturer driver type (${driverType}), check your .env file`,
-      );
-  }
-};
diff --git a/packages/twenty-server/src/integrations/exception-handler/exception-handler.service.spec.ts b/packages/twenty-server/src/integrations/exception-handler/exception-handler.service.spec.ts
deleted file mode 100644
index f9d1e19b9691..000000000000
--- a/packages/twenty-server/src/integrations/exception-handler/exception-handler.service.spec.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-
-import { ExceptionHandlerService } from 'src/integrations/exception-handler/exception-handler.service';
-
-import { EXCEPTION_HANDLER_DRIVER } from './exception-handler.constants';
-
-describe('ExceptionHandlerService', () => {
-  let service: ExceptionHandlerService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        ExceptionHandlerService,
-        {
-          provide: EXCEPTION_HANDLER_DRIVER,
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    service = module.get<ExceptionHandlerService>(ExceptionHandlerService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/integrations/exception-handler/exception-handler.service.ts b/packages/twenty-server/src/integrations/exception-handler/exception-handler.service.ts
deleted file mode 100644
index 3dc02cad8284..000000000000
--- a/packages/twenty-server/src/integrations/exception-handler/exception-handler.service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-
-import { ExceptionHandlerOptions } from 'src/integrations/exception-handler/interfaces/exception-handler-options.interface';
-
-import { ExceptionHandlerDriverInterface } from 'src/integrations/exception-handler/interfaces';
-import { EXCEPTION_HANDLER_DRIVER } from 'src/integrations/exception-handler/exception-handler.constants';
-
-@Injectable()
-export class ExceptionHandlerService {
-  constructor(
-    @Inject(EXCEPTION_HANDLER_DRIVER)
-    private driver: ExceptionHandlerDriverInterface,
-  ) {}
-
-  captureExceptions(
-    exceptions: ReadonlyArray<any>,
-    options?: ExceptionHandlerOptions,
-  ): string[] {
-    return this.driver.captureExceptions(exceptions, options);
-  }
-}
diff --git a/packages/twenty-server/src/integrations/exception-handler/interfaces/exception-handler-user.interface.ts b/packages/twenty-server/src/integrations/exception-handler/interfaces/exception-handler-user.interface.ts
deleted file mode 100644
index eec20ddfe187..000000000000
--- a/packages/twenty-server/src/integrations/exception-handler/interfaces/exception-handler-user.interface.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface ExceptionHandlerUser {
-  id?: string;
-  ipAddress?: string;
-  email?: string;
-  username?: string;
-}
diff --git a/packages/twenty-server/src/integrations/file-storage/file-storage.module-factory.ts b/packages/twenty-server/src/integrations/file-storage/file-storage.module-factory.ts
deleted file mode 100644
index c4a8e266ec52..000000000000
--- a/packages/twenty-server/src/integrations/file-storage/file-storage.module-factory.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
-
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import {
-  FileStorageModuleOptions,
-  StorageDriverType,
-} from 'src/integrations/file-storage/interfaces';
-
-/**
- * FileStorage Module factory
- * @param environment
- * @returns FileStorageModuleOptions
- */
-export const fileStorageModuleFactory = async (
-  environmentService: EnvironmentService,
-): Promise<FileStorageModuleOptions> => {
-  const driverType = environmentService.getStorageDriverType();
-
-  switch (driverType) {
-    case StorageDriverType.Local: {
-      const storagePath = environmentService.getStorageLocalPath();
-
-      return {
-        type: StorageDriverType.Local,
-        options: {
-          storagePath: process.cwd() + '/' + storagePath,
-        },
-      };
-    }
-    case StorageDriverType.S3: {
-      const bucketName = environmentService.getStorageS3Name();
-      const endpoint = environmentService.getStorageS3Endpoint();
-      const region = environmentService.getStorageS3Region();
-
-      return {
-        type: StorageDriverType.S3,
-        options: {
-          bucketName: bucketName ?? '',
-          endpoint: endpoint,
-          credentials: fromNodeProviderChain({
-            clientConfig: { region },
-          }),
-          forcePathStyle: true,
-          region: region ?? '',
-        },
-      };
-    }
-    default:
-      throw new Error(
-        `Invalid storage driver type (${driverType}), check your .env file`,
-      );
-  }
-};
diff --git a/packages/twenty-server/src/integrations/file-storage/file-storage.service.spec.ts b/packages/twenty-server/src/integrations/file-storage/file-storage.service.spec.ts
deleted file mode 100644
index cc30e564b2f0..000000000000
--- a/packages/twenty-server/src/integrations/file-storage/file-storage.service.spec.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-
-import { FileStorageService } from './file-storage.service';
-import { STORAGE_DRIVER } from './file-storage.constants';
-
-describe('FileStorageService', () => {
-  let service: FileStorageService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        FileStorageService,
-        {
-          provide: STORAGE_DRIVER,
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    service = module.get<FileStorageService>(FileStorageService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/integrations/integrations.module.ts b/packages/twenty-server/src/integrations/integrations.module.ts
deleted file mode 100644
index febbbb716c7e..000000000000
--- a/packages/twenty-server/src/integrations/integrations.module.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Module } from '@nestjs/common';
-import { HttpAdapterHost } from '@nestjs/core';
-import { EventEmitterModule } from '@nestjs/event-emitter';
-
-import { ExceptionHandlerModule } from 'src/integrations/exception-handler/exception-handler.module';
-import { exceptionHandlerModuleFactory } from 'src/integrations/exception-handler/exception-handler.module-factory';
-import { fileStorageModuleFactory } from 'src/integrations/file-storage/file-storage.module-factory';
-import { loggerModuleFactory } from 'src/integrations/logger/logger.module-factory';
-import { messageQueueModuleFactory } from 'src/integrations/message-queue/message-queue.module-factory';
-import { EmailModule } from 'src/integrations/email/email.module';
-import { emailModuleFactory } from 'src/integrations/email/email.module-factory';
-
-import { EnvironmentModule } from './environment/environment.module';
-import { EnvironmentService } from './environment/environment.service';
-import { FileStorageModule } from './file-storage/file-storage.module';
-import { LoggerModule } from './logger/logger.module';
-import { MessageQueueModule } from './message-queue/message-queue.module';
-
-@Module({
-  imports: [
-    EnvironmentModule.forRoot({}),
-    FileStorageModule.forRootAsync({
-      useFactory: fileStorageModuleFactory,
-      inject: [EnvironmentService],
-    }),
-    LoggerModule.forRootAsync({
-      useFactory: loggerModuleFactory,
-      inject: [EnvironmentService],
-    }),
-    MessageQueueModule.forRoot({
-      useFactory: messageQueueModuleFactory,
-      inject: [EnvironmentService],
-    }),
-    ExceptionHandlerModule.forRootAsync({
-      useFactory: exceptionHandlerModuleFactory,
-      inject: [EnvironmentService, HttpAdapterHost],
-    }),
-    EmailModule.forRoot({
-      useFactory: emailModuleFactory,
-      inject: [EnvironmentService],
-    }),
-    EventEmitterModule.forRoot(),
-  ],
-  exports: [],
-  providers: [],
-})
-export class IntegrationsModule {}
diff --git a/packages/twenty-server/src/integrations/logger/logger.module-factory.ts b/packages/twenty-server/src/integrations/logger/logger.module-factory.ts
deleted file mode 100644
index 2e4ec8cd0ee9..000000000000
--- a/packages/twenty-server/src/integrations/logger/logger.module-factory.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import {
-  LoggerModuleOptions,
-  LoggerDriverType,
-} from 'src/integrations/logger/interfaces';
-
-/**
- * Logger Module factory
- * @param environment
- * @returns LoggerModuleOptions
- */
-export const loggerModuleFactory = async (
-  environmentService: EnvironmentService,
-): Promise<LoggerModuleOptions> => {
-  const driverType = environmentService.getLoggerDriverType();
-  const logLevels = environmentService.getLogLevels();
-
-  switch (driverType) {
-    case LoggerDriverType.Console: {
-      return {
-        type: LoggerDriverType.Console,
-        logLevels: logLevels,
-      };
-    }
-    default:
-      throw new Error(
-        `Invalid logger driver type (${driverType}), check your .env file`,
-      );
-  }
-};
diff --git a/packages/twenty-server/src/integrations/memory-storage/decorators/inject-memory-storage.decorator.ts b/packages/twenty-server/src/integrations/memory-storage/decorators/inject-memory-storage.decorator.ts
deleted file mode 100644
index c4d807087735..000000000000
--- a/packages/twenty-server/src/integrations/memory-storage/decorators/inject-memory-storage.decorator.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Inject } from '@nestjs/common';
-
-import { createMemoryStorageInjectionToken } from 'src/integrations/memory-storage/memory-storage.util';
-
-export const InjectMemoryStorage = (identifier: string) => {
-  const injectionToken = createMemoryStorageInjectionToken(identifier);
-
-  return Inject(injectionToken);
-};
diff --git a/packages/twenty-server/src/integrations/memory-storage/drivers/interfaces/memory-storage-driver.interface.ts b/packages/twenty-server/src/integrations/memory-storage/drivers/interfaces/memory-storage-driver.interface.ts
deleted file mode 100644
index a2f52e8ade9b..000000000000
--- a/packages/twenty-server/src/integrations/memory-storage/drivers/interfaces/memory-storage-driver.interface.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface MemoryStorageDriver<T> {
-  read(params: { key: string }): Promise<T | null>;
-  write(params: { key: string; data: T }): Promise<void>;
-  delete(params: { key: string }): Promise<void>;
-}
diff --git a/packages/twenty-server/src/integrations/memory-storage/drivers/local.driver.ts b/packages/twenty-server/src/integrations/memory-storage/drivers/local.driver.ts
deleted file mode 100644
index aed409997567..000000000000
--- a/packages/twenty-server/src/integrations/memory-storage/drivers/local.driver.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { MemoryStorageSerializer } from 'src/integrations/memory-storage/serializers/interfaces/memory-storage-serializer.interface';
-
-import { MemoryStorageDriver } from './interfaces/memory-storage-driver.interface';
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface LocalMemoryDriverOptions {}
-
-export class LocalMemoryDriver<T> implements MemoryStorageDriver<T> {
-  private identifier: string;
-  private options: LocalMemoryDriverOptions;
-  private serializer: MemoryStorageSerializer<T>;
-  private storage: Map<string, string> = new Map();
-
-  constructor(
-    identifier: string,
-    options: LocalMemoryDriverOptions,
-    serializer: MemoryStorageSerializer<T>,
-  ) {
-    this.identifier = identifier;
-    this.options = options;
-    this.serializer = serializer;
-  }
-
-  async write(params: { key: string; data: T }): Promise<void> {
-    const compositeKey = this.generateCompositeKey(params.key);
-    const serializedData = this.serializer.serialize(params.data);
-
-    this.storage.set(compositeKey, serializedData);
-  }
-
-  async read(params: { key: string }): Promise<T | null> {
-    const compositeKey = this.generateCompositeKey(params.key);
-
-    if (!this.storage.has(compositeKey)) {
-      return null;
-    }
-
-    const data = this.storage.get(compositeKey);
-
-    if (!data) {
-      return null;
-    }
-
-    const deserializeData = this.serializer.deserialize(data);
-
-    return deserializeData;
-  }
-
-  async delete(params: { key: string }): Promise<void> {
-    const compositeKey = this.generateCompositeKey(params.key);
-
-    if (!this.storage.has(compositeKey)) {
-      return;
-    }
-
-    this.storage.delete(compositeKey);
-  }
-
-  private generateCompositeKey(key: string): string {
-    return `${this.identifier}:${key}`;
-  }
-}
diff --git a/packages/twenty-server/src/integrations/memory-storage/interfaces/index.ts b/packages/twenty-server/src/integrations/memory-storage/interfaces/index.ts
deleted file mode 100644
index 05ba64022127..000000000000
--- a/packages/twenty-server/src/integrations/memory-storage/interfaces/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './memory-storage.interface';
diff --git a/packages/twenty-server/src/integrations/memory-storage/interfaces/memory-storage.interface.ts b/packages/twenty-server/src/integrations/memory-storage/interfaces/memory-storage.interface.ts
deleted file mode 100644
index eca29d1d29d3..000000000000
--- a/packages/twenty-server/src/integrations/memory-storage/interfaces/memory-storage.interface.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { FactoryProvider, ModuleMetadata } from '@nestjs/common';
-
-import { MemoryStorageSerializer } from 'src/integrations/memory-storage/serializers/interfaces/memory-storage-serializer.interface';
-
-import { LocalMemoryDriverOptions } from 'src/integrations/memory-storage/drivers/local.driver';
-
-export enum MemoryStorageDriverType {
-  Local = 'local',
-}
-
-export interface LocalMemoryDriverFactoryOptions {
-  type: MemoryStorageDriverType.Local;
-  options: LocalMemoryDriverOptions;
-}
-
-interface MemoryStorageModuleBaseOptions {
-  identifier: string;
-  serializer?: MemoryStorageSerializer<any>;
-}
-
-export type MemoryStorageModuleOptions = MemoryStorageModuleBaseOptions &
-  LocalMemoryDriverFactoryOptions;
-
-export type MemoryStorageModuleAsyncOptions = {
-  identifier: string;
-  useFactory: (
-    ...args: any[]
-  ) =>
-    | Omit<MemoryStorageModuleOptions, 'identifier'>
-    | Promise<Omit<MemoryStorageModuleOptions, 'identifier'>>;
-} & Pick<ModuleMetadata, 'imports'> &
-  Pick<FactoryProvider, 'inject'>;
diff --git a/packages/twenty-server/src/integrations/memory-storage/memory-storage.constants.ts b/packages/twenty-server/src/integrations/memory-storage/memory-storage.constants.ts
deleted file mode 100644
index 68881644b7fa..000000000000
--- a/packages/twenty-server/src/integrations/memory-storage/memory-storage.constants.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const MEMORY_STORAGE_SERVICE = 'MEMORY_STORAGE_SERVICE';
diff --git a/packages/twenty-server/src/integrations/memory-storage/memory-storage.module.ts b/packages/twenty-server/src/integrations/memory-storage/memory-storage.module.ts
deleted file mode 100644
index 74e9944525c7..000000000000
--- a/packages/twenty-server/src/integrations/memory-storage/memory-storage.module.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { DynamicModule, Global } from '@nestjs/common';
-
-import { MemoryStorageDefaultSerializer } from 'src/integrations/memory-storage/serializers/default.serializer';
-import { createMemoryStorageInjectionToken } from 'src/integrations/memory-storage/memory-storage.util';
-
-import {
-  MemoryStorageDriverType,
-  MemoryStorageModuleAsyncOptions,
-  MemoryStorageModuleOptions,
-} from './interfaces';
-
-import { LocalMemoryDriver } from './drivers/local.driver';
-
-@Global()
-export class MemoryStorageModule {
-  static forRoot(options: MemoryStorageModuleOptions): DynamicModule {
-    // Dynamic injection token to allow multiple instances of the same driver
-    const injectionToken = createMemoryStorageInjectionToken(
-      options.identifier,
-    );
-    const provider = {
-      provide: injectionToken,
-      useValue: this.createStorageDriver(options),
-    };
-
-    return {
-      module: MemoryStorageModule,
-      providers: [provider],
-      exports: [provider],
-    };
-  }
-
-  static forRootAsync(options: MemoryStorageModuleAsyncOptions): DynamicModule {
-    // Dynamic injection token to allow multiple instances of the same driver
-    const injectionToken = createMemoryStorageInjectionToken(
-      options.identifier,
-    );
-    const provider = {
-      provide: injectionToken,
-      useFactory: async (...args: any[]) => {
-        const config = await options.useFactory(...args);
-
-        return this.createStorageDriver({
-          identifier: options.identifier,
-          ...config,
-        });
-      },
-      inject: options.inject || [],
-    };
-
-    return {
-      module: MemoryStorageModule,
-      imports: options.imports || [],
-      providers: [provider],
-      exports: [provider],
-    };
-  }
-
-  private static createStorageDriver(options: MemoryStorageModuleOptions) {
-    switch (options.type) {
-      case MemoryStorageDriverType.Local:
-        return new LocalMemoryDriver(
-          options.identifier,
-          options.options,
-          options.serializer ?? new MemoryStorageDefaultSerializer<string>(),
-        );
-      // Future case for Redis or other types
-      default:
-        throw new Error(`Unsupported storage type: ${options.type}`);
-    }
-  }
-}
diff --git a/packages/twenty-server/src/integrations/memory-storage/memory-storage.service.spec.ts b/packages/twenty-server/src/integrations/memory-storage/memory-storage.service.spec.ts
deleted file mode 100644
index b9e4ef90e397..000000000000
--- a/packages/twenty-server/src/integrations/memory-storage/memory-storage.service.spec.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-
-import { MemoryStorageService } from './memory-storage.service';
-
-describe('MemoryStorageService', () => {
-  let service: MemoryStorageService<any>;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [MemoryStorageService],
-    }).compile();
-
-    service = module.get<MemoryStorageService<any>>(MemoryStorageService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/integrations/memory-storage/memory-storage.service.ts b/packages/twenty-server/src/integrations/memory-storage/memory-storage.service.ts
deleted file mode 100644
index 89fdf0bbd255..000000000000
--- a/packages/twenty-server/src/integrations/memory-storage/memory-storage.service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { MemoryStorageDriver } from 'src/integrations/memory-storage/drivers/interfaces/memory-storage-driver.interface';
-
-export class MemoryStorageService<T> implements MemoryStorageDriver<T> {
-  private driver: MemoryStorageDriver<T>;
-
-  constructor(driver: MemoryStorageDriver<T>) {
-    this.driver = driver;
-  }
-
-  write(params: { key: string; data: T }): Promise<void> {
-    return this.driver.write(params);
-  }
-
-  read(params: { key: string }): Promise<T | null> {
-    return this.driver.read(params);
-  }
-
-  delete(params: { key: string }): Promise<void> {
-    return this.driver.delete(params);
-  }
-}
diff --git a/packages/twenty-server/src/integrations/memory-storage/memory-storage.util.ts b/packages/twenty-server/src/integrations/memory-storage/memory-storage.util.ts
deleted file mode 100644
index 6fea200de0d7..000000000000
--- a/packages/twenty-server/src/integrations/memory-storage/memory-storage.util.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { MEMORY_STORAGE_SERVICE } from 'src/integrations/memory-storage/memory-storage.constants';
-
-export const createMemoryStorageInjectionToken = (identifier: string) => {
-  return `${MEMORY_STORAGE_SERVICE}_${identifier}`;
-};
diff --git a/packages/twenty-server/src/integrations/memory-storage/serializers/default.serializer.ts b/packages/twenty-server/src/integrations/memory-storage/serializers/default.serializer.ts
deleted file mode 100644
index 06475f71eb10..000000000000
--- a/packages/twenty-server/src/integrations/memory-storage/serializers/default.serializer.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { MemoryStorageSerializer } from 'src/integrations/memory-storage/serializers/interfaces/memory-storage-serializer.interface';
-
-export class MemoryStorageDefaultSerializer<T>
-  implements MemoryStorageSerializer<T>
-{
-  serialize(item: T): string {
-    if (typeof item !== 'string') {
-      throw new Error('DefaultSerializer can only serialize strings');
-    }
-
-    return item;
-  }
-
-  deserialize(data: string): T {
-    return data as unknown as T;
-  }
-}
diff --git a/packages/twenty-server/src/integrations/memory-storage/serializers/interfaces/memory-storage-serializer.interface.ts b/packages/twenty-server/src/integrations/memory-storage/serializers/interfaces/memory-storage-serializer.interface.ts
deleted file mode 100644
index 838de317d0b3..000000000000
--- a/packages/twenty-server/src/integrations/memory-storage/serializers/interfaces/memory-storage-serializer.interface.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface MemoryStorageSerializer<T> {
-  serialize(item: T): string;
-  deserialize(data: string): T;
-}
diff --git a/packages/twenty-server/src/integrations/memory-storage/serializers/json.serializer.ts b/packages/twenty-server/src/integrations/memory-storage/serializers/json.serializer.ts
deleted file mode 100644
index ef0b3e436e10..000000000000
--- a/packages/twenty-server/src/integrations/memory-storage/serializers/json.serializer.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { MemoryStorageSerializer } from 'src/integrations/memory-storage/serializers/interfaces/memory-storage-serializer.interface';
-
-export class MemoryStorageJsonSerializer<T>
-  implements MemoryStorageSerializer<T>
-{
-  serialize(item: T): string {
-    return JSON.stringify(item);
-  }
-
-  deserialize(data: string): T {
-    return JSON.parse(data) as T;
-  }
-}
diff --git a/packages/twenty-server/src/integrations/message-queue/drivers/interfaces/job-options.interface.ts b/packages/twenty-server/src/integrations/message-queue/drivers/interfaces/job-options.interface.ts
deleted file mode 100644
index 304c0648ac90..000000000000
--- a/packages/twenty-server/src/integrations/message-queue/drivers/interfaces/job-options.interface.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface QueueJobOptions {
-  id?: string;
-  priority?: number;
-  retryLimit?: number;
-}
diff --git a/packages/twenty-server/src/integrations/message-queue/drivers/interfaces/message-queue-driver.interface.ts b/packages/twenty-server/src/integrations/message-queue/drivers/interfaces/message-queue-driver.interface.ts
deleted file mode 100644
index a0136672ac97..000000000000
--- a/packages/twenty-server/src/integrations/message-queue/drivers/interfaces/message-queue-driver.interface.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { QueueJobOptions } from 'src/integrations/message-queue/drivers/interfaces/job-options.interface';
-import { MessageQueueJobData } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
-
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-
-export interface MessageQueueDriver {
-  add<T extends MessageQueueJobData>(
-    queueName: MessageQueue,
-    jobName: string,
-    data: T,
-    options?: QueueJobOptions,
-  ): Promise<void>;
-  work<T extends MessageQueueJobData>(
-    queueName: MessageQueue,
-    handler: ({ data, id }: { data: T; id: string }) => Promise<void> | void,
-  );
-  addCron<T extends MessageQueueJobData | undefined>(
-    queueName: MessageQueue,
-    jobName: string,
-    data: T,
-    pattern: string,
-    options?: QueueJobOptions,
-  );
-  removeCron(queueName: MessageQueue, jobName: string, pattern?: string);
-  stop?(): Promise<void>;
-  register?(queueName: MessageQueue): void;
-}
diff --git a/packages/twenty-server/src/integrations/message-queue/drivers/sync.driver.ts b/packages/twenty-server/src/integrations/message-queue/drivers/sync.driver.ts
deleted file mode 100644
index 03515a103476..000000000000
--- a/packages/twenty-server/src/integrations/message-queue/drivers/sync.driver.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { ModuleRef } from '@nestjs/core';
-import { Logger } from '@nestjs/common';
-
-import { MessageQueueDriver } from 'src/integrations/message-queue/drivers/interfaces/message-queue-driver.interface';
-import {
-  MessageQueueCronJobData,
-  MessageQueueJob,
-  MessageQueueJobData,
-} from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
-
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { getJobClassName } from 'src/integrations/message-queue/utils/get-job-class-name.util';
-
-export class SyncDriver implements MessageQueueDriver {
-  private readonly logger = new Logger(SyncDriver.name);
-  constructor(private readonly jobsModuleRef: ModuleRef) {}
-
-  async add<T extends MessageQueueJobData>(
-    _queueName: MessageQueue,
-    jobName: string,
-    data: T,
-  ): Promise<void> {
-    const jobClassName = getJobClassName(jobName);
-    const job: MessageQueueJob<MessageQueueJobData> = this.jobsModuleRef.get(
-      jobClassName,
-      { strict: true },
-    );
-
-    await job.handle(data);
-  }
-
-  async addCron<T extends MessageQueueJobData | undefined>(
-    _queueName: MessageQueue,
-    jobName: string,
-    data: T,
-    pattern: string,
-  ): Promise<void> {
-    this.logger.log(`Running '${pattern}' cron job with SyncDriver`);
-
-    const jobClassName = getJobClassName(jobName);
-    const job: MessageQueueCronJobData<MessageQueueJobData | undefined> =
-      this.jobsModuleRef.get(jobClassName, {
-        strict: true,
-      });
-
-    await job.handle(data);
-  }
-
-  async removeCron(_queueName: MessageQueue, jobName: string) {
-    this.logger.log(`Removing '${jobName}' cron job with SyncDriver`);
-
-    return;
-  }
-
-  work() {
-    return;
-  }
-}
diff --git a/packages/twenty-server/src/integrations/message-queue/jobs.module.ts b/packages/twenty-server/src/integrations/message-queue/jobs.module.ts
deleted file mode 100644
index d38b47fab4a2..000000000000
--- a/packages/twenty-server/src/integrations/message-queue/jobs.module.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { Module } from '@nestjs/common';
-import { ModuleRef } from '@nestjs/core';
-import { HttpModule } from '@nestjs/axios';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { GmailFullSyncJob } from 'src/workspace/messaging/jobs/gmail-full-sync.job';
-import { CallWebhookJobsJob } from 'src/workspace/workspace-query-runner/jobs/call-webhook-jobs.job';
-import { CallWebhookJob } from 'src/workspace/workspace-query-runner/jobs/call-webhook.job';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
-import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
-import { CleanInactiveWorkspaceJob } from 'src/workspace/workspace-cleaner/crons/clean-inactive-workspace.job';
-import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { MessagingModule } from 'src/workspace/messaging/messaging.module';
-import { GmailPartialSyncJob } from 'src/workspace/messaging/jobs/gmail-partial-sync.job';
-import { EmailSenderJob } from 'src/integrations/email/email-sender.job';
-import { UserModule } from 'src/core/user/user.module';
-import { EnvironmentModule } from 'src/integrations/environment/environment.module';
-import { FetchAllWorkspacesMessagesJob } from 'src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.job';
-import { ConnectedAccountModule } from 'src/workspace/messaging/repositories/connected-account/connected-account.module';
-import { MatchMessageParticipantJob } from 'src/workspace/messaging/jobs/match-message-participant.job';
-import { CreateCompaniesAndContactsAfterSyncJob } from 'src/workspace/messaging/jobs/create-companies-and-contacts-after-sync.job';
-import { CreateCompaniesAndContactsModule } from 'src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.module';
-import { MessageChannelModule } from 'src/workspace/messaging/repositories/message-channel/message-channel.module';
-import { MessageParticipantModule } from 'src/workspace/messaging/repositories/message-participant/message-participant.module';
-import { DataSeedDemoWorkspaceModule } from 'src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace.module';
-import { DataSeedDemoWorkspaceJob } from 'src/database/commands/data-seed-demo-workspace/jobs/data-seed-demo-workspace.job';
-import { DeleteConnectedAccountAssociatedDataJob } from 'src/workspace/messaging/jobs/delete-connected-acount-associated-data.job';
-import { ThreadCleanerModule } from 'src/workspace/messaging/services/thread-cleaner/thread-cleaner.module';
-import { UpdateSubscriptionJob } from 'src/core/billing/jobs/update-subscription.job';
-import { BillingModule } from 'src/core/billing/billing.module';
-import { UserWorkspaceModule } from 'src/core/user-workspace/user-workspace.module';
-import { StripeModule } from 'src/core/billing/stripe/stripe.module';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { FeatureFlagEntity } from 'src/core/feature-flag/feature-flag.entity';
-
-@Module({
-  imports: [
-    BillingModule,
-    DataSourceModule,
-    ConnectedAccountModule,
-    CreateCompaniesAndContactsModule,
-    DataSeedDemoWorkspaceModule,
-    EnvironmentModule,
-    HttpModule,
-    MessagingModule,
-    MessageParticipantModule,
-    MessageChannelModule,
-    ObjectMetadataModule,
-    StripeModule,
-    ThreadCleanerModule,
-    TypeORMModule,
-    TypeOrmModule.forFeature([Workspace, FeatureFlagEntity], 'core'),
-    UserModule,
-    UserWorkspaceModule,
-    WorkspaceDataSourceModule,
-  ],
-  providers: [
-    {
-      provide: GmailFullSyncJob.name,
-      useClass: GmailFullSyncJob,
-    },
-    {
-      provide: GmailPartialSyncJob.name,
-      useClass: GmailPartialSyncJob,
-    },
-    {
-      provide: CallWebhookJobsJob.name,
-      useClass: CallWebhookJobsJob,
-    },
-    {
-      provide: CallWebhookJob.name,
-      useClass: CallWebhookJob,
-    },
-    {
-      provide: CleanInactiveWorkspaceJob.name,
-      useClass: CleanInactiveWorkspaceJob,
-    },
-    { provide: EmailSenderJob.name, useClass: EmailSenderJob },
-    {
-      provide: FetchAllWorkspacesMessagesJob.name,
-      useClass: FetchAllWorkspacesMessagesJob,
-    },
-    {
-      provide: MatchMessageParticipantJob.name,
-      useClass: MatchMessageParticipantJob,
-    },
-    {
-      provide: CreateCompaniesAndContactsAfterSyncJob.name,
-      useClass: CreateCompaniesAndContactsAfterSyncJob,
-    },
-    {
-      provide: DataSeedDemoWorkspaceJob.name,
-      useClass: DataSeedDemoWorkspaceJob,
-    },
-    {
-      provide: DeleteConnectedAccountAssociatedDataJob.name,
-      useClass: DeleteConnectedAccountAssociatedDataJob,
-    },
-    { provide: UpdateSubscriptionJob.name, useClass: UpdateSubscriptionJob },
-  ],
-})
-export class JobsModule {
-  static moduleRef: ModuleRef;
-
-  constructor(private moduleRef: ModuleRef) {
-    JobsModule.moduleRef = this.moduleRef;
-  }
-}
diff --git a/packages/twenty-server/src/integrations/message-queue/message-queue.constants.ts b/packages/twenty-server/src/integrations/message-queue/message-queue.constants.ts
deleted file mode 100644
index 56af4ba6f46e..000000000000
--- a/packages/twenty-server/src/integrations/message-queue/message-queue.constants.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export const QUEUE_DRIVER = Symbol('QUEUE_DRIVER');
-
-export enum MessageQueue {
-  taskAssignedQueue = 'task-assigned-queue',
-  messagingQueue = 'messaging-queue',
-  webhookQueue = 'webhook-queue',
-  cronQueue = 'cron-queue',
-  emailQueue = 'email-queue',
-  billingQueue = 'billing-queue',
-}
diff --git a/packages/twenty-server/src/integrations/message-queue/message-queue.module-factory.ts b/packages/twenty-server/src/integrations/message-queue/message-queue.module-factory.ts
deleted file mode 100644
index 689368342422..000000000000
--- a/packages/twenty-server/src/integrations/message-queue/message-queue.module-factory.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import {
-  MessageQueueDriverType,
-  MessageQueueModuleOptions,
-} from 'src/integrations/message-queue/interfaces';
-
-/**
- * MessageQueue Module factory
- * @param environment
- * @returns MessageQueueModuleOptions
- */
-export const messageQueueModuleFactory = async (
-  environmentService: EnvironmentService,
-): Promise<MessageQueueModuleOptions> => {
-  const driverType = environmentService.getMessageQueueDriverType();
-
-  switch (driverType) {
-    case MessageQueueDriverType.Sync: {
-      return {
-        type: MessageQueueDriverType.Sync,
-        options: {},
-      };
-    }
-    case MessageQueueDriverType.PgBoss: {
-      const connectionString = environmentService.getPGDatabaseUrl();
-
-      return {
-        type: MessageQueueDriverType.PgBoss,
-        options: {
-          connectionString,
-        },
-      };
-    }
-    case MessageQueueDriverType.BullMQ: {
-      const host = environmentService.getRedisHost();
-      const port = environmentService.getRedisPort();
-
-      return {
-        type: MessageQueueDriverType.BullMQ,
-        options: {
-          connection: {
-            host,
-            port,
-          },
-        },
-      };
-    }
-    default:
-      throw new Error(
-        `Invalid message queue driver type (${driverType}), check your .env file`,
-      );
-  }
-};
diff --git a/packages/twenty-server/src/integrations/message-queue/message-queue.module.ts b/packages/twenty-server/src/integrations/message-queue/message-queue.module.ts
deleted file mode 100644
index 29f86895b372..000000000000
--- a/packages/twenty-server/src/integrations/message-queue/message-queue.module.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { DynamicModule, Global } from '@nestjs/common';
-
-import { MessageQueueDriver } from 'src/integrations/message-queue/drivers/interfaces/message-queue-driver.interface';
-
-import {
-  MessageQueueDriverType,
-  MessageQueueModuleAsyncOptions,
-} from 'src/integrations/message-queue/interfaces';
-import {
-  MessageQueue,
-  QUEUE_DRIVER,
-} from 'src/integrations/message-queue/message-queue.constants';
-import { PgBossDriver } from 'src/integrations/message-queue/drivers/pg-boss.driver';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import { BullMQDriver } from 'src/integrations/message-queue/drivers/bullmq.driver';
-import { SyncDriver } from 'src/integrations/message-queue/drivers/sync.driver';
-import { JobsModule } from 'src/integrations/message-queue/jobs.module';
-
-@Global()
-export class MessageQueueModule {
-  static forRoot(options: MessageQueueModuleAsyncOptions): DynamicModule {
-    const providers = [
-      ...Object.values(MessageQueue).map((queue) => ({
-        provide: queue,
-        useFactory: (driver: MessageQueueDriver) => {
-          return new MessageQueueService(driver, queue);
-        },
-        inject: [QUEUE_DRIVER],
-      })),
-      {
-        provide: QUEUE_DRIVER,
-        useFactory: async (...args: any[]) => {
-          const config = await options.useFactory(...args);
-
-          switch (config.type) {
-            case MessageQueueDriverType.PgBoss:
-              const boss = new PgBossDriver(config.options);
-
-              await boss.init();
-
-              return boss;
-
-            case MessageQueueDriverType.BullMQ:
-              return new BullMQDriver(config.options);
-
-            default:
-              return new SyncDriver(JobsModule.moduleRef);
-          }
-        },
-        inject: options.inject || [],
-      },
-    ];
-
-    return {
-      module: MessageQueueModule,
-      imports: [JobsModule, ...(options.imports || [])],
-      providers,
-      exports: Object.values(MessageQueue),
-    };
-  }
-}
diff --git a/packages/twenty-server/src/integrations/message-queue/services/message-queue.service.ts b/packages/twenty-server/src/integrations/message-queue/services/message-queue.service.ts
deleted file mode 100644
index 44c2d5121105..000000000000
--- a/packages/twenty-server/src/integrations/message-queue/services/message-queue.service.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Inject, Injectable, OnModuleDestroy } from '@nestjs/common';
-
-import { QueueJobOptions } from 'src/integrations/message-queue/drivers/interfaces/job-options.interface';
-import { MessageQueueDriver } from 'src/integrations/message-queue/drivers/interfaces/message-queue-driver.interface';
-import { MessageQueueJobData } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
-
-import {
-  MessageQueue,
-  QUEUE_DRIVER,
-} from 'src/integrations/message-queue/message-queue.constants';
-
-@Injectable()
-export class MessageQueueService implements OnModuleDestroy {
-  constructor(
-    @Inject(QUEUE_DRIVER) protected driver: MessageQueueDriver,
-    protected queueName: MessageQueue,
-  ) {
-    if (typeof this.driver.register === 'function') {
-      this.driver.register(queueName);
-    }
-  }
-
-  async onModuleDestroy() {
-    if (typeof this.driver.stop === 'function') {
-      await this.driver.stop();
-    }
-  }
-
-  add<T extends MessageQueueJobData>(
-    jobName: string,
-    data: T,
-    options?: QueueJobOptions,
-  ): Promise<void> {
-    return this.driver.add(this.queueName, jobName, data, options);
-  }
-
-  addCron<T extends MessageQueueJobData | undefined>(
-    jobName: string,
-    data: T,
-    pattern: string,
-    options?: QueueJobOptions,
-  ): Promise<void> {
-    return this.driver.addCron(this.queueName, jobName, data, pattern, options);
-  }
-
-  removeCron(jobName: string, pattern: string): Promise<void> {
-    return this.driver.removeCron(this.queueName, jobName, pattern);
-  }
-
-  work<T extends MessageQueueJobData>(
-    handler: ({ data, id }: { data: T; id: string }) => Promise<void> | void,
-  ) {
-    return this.driver.work(this.queueName, handler);
-  }
-}
diff --git a/packages/twenty-server/src/main.ts b/packages/twenty-server/src/main.ts
index 8bba5ce2b03d..a4d51925341c 100644
--- a/packages/twenty-server/src/main.ts
+++ b/packages/twenty-server/src/main.ts
@@ -2,6 +2,7 @@ import { NestFactory } from '@nestjs/core';
 import { ValidationPipe } from '@nestjs/common';
 import { NestExpressApplication } from '@nestjs/platform-express';
 
+import * as Sentry from '@sentry/node';
 import { graphqlUploadExpress } from 'graphql-upload';
 import bytes from 'bytes';
 import { useContainer } from 'class-validator';
@@ -9,24 +10,34 @@ import '@sentry/tracing';
 
 import { AppModule } from './app.module';
 
-import { settings } from './constants/settings';
-import { LoggerService } from './integrations/logger/logger.service';
-import { EnvironmentService } from './integrations/environment/environment.service';
+import { generateFrontConfig } from './utils/generate-front-config';
+import { settings } from './engine/constants/settings';
+import { LoggerService } from './engine/integrations/logger/logger.service';
 
 const bootstrap = async () => {
   const app = await NestFactory.create<NestExpressApplication>(AppModule, {
     cors: true,
     bufferLogs: process.env.LOGGER_IS_BUFFER_ENABLED === 'true',
     rawBody: true,
+    snapshot: process.env.DEBUG_MODE === 'true',
   });
   const logger = app.get(LoggerService);
 
+  // TODO: Double check this as it's not working for now, it's going to be heplful for durable trees in twenty "orm"
+  // // Apply context id strategy for durable trees
+  // ContextIdFactory.apply(new AggregateByWorkspaceContextIdStrategy());
+
   // Apply class-validator container so that we can use injection in validators
   useContainer(app.select(AppModule), { fallbackOnErrors: true });
 
   // Use our logger
   app.useLogger(logger);
 
+  if (Sentry.isInitialized()) {
+    app.use(Sentry.Handlers.requestHandler());
+    app.use(Sentry.Handlers.tracingHandler());
+  }
+
   // Apply validation pipes globally
   app.useGlobalPipes(
     new ValidationPipe({
@@ -47,7 +58,10 @@ const bootstrap = async () => {
     }),
   );
 
-  await app.listen(app.get(EnvironmentService).getPort());
+  // Create the env-config.js of the front at runtime
+  generateFrontConfig();
+
+  await app.listen(process.env.PORT ?? 3000);
 };
 
 bootstrap();
diff --git a/packages/twenty-server/src/metadata/data-source/data-source.service.ts b/packages/twenty-server/src/metadata/data-source/data-source.service.ts
deleted file mode 100644
index 3b644f11faf3..000000000000
--- a/packages/twenty-server/src/metadata/data-source/data-source.service.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { FindManyOptions, Repository } from 'typeorm';
-
-import { DataSourceEntity } from './data-source.entity';
-
-@Injectable()
-export class DataSourceService {
-  constructor(
-    @InjectRepository(DataSourceEntity, 'metadata')
-    private readonly dataSourceMetadataRepository: Repository<DataSourceEntity>,
-  ) {}
-
-  async createDataSourceMetadata(workspaceId: string, workspaceSchema: string) {
-    // TODO: Double check if this is the correct way to do this
-    const dataSource = await this.dataSourceMetadataRepository.findOne({
-      where: { workspaceId },
-    });
-
-    if (dataSource) {
-      return dataSource;
-    }
-
-    return this.dataSourceMetadataRepository.save({
-      workspaceId,
-      schema: workspaceSchema,
-    });
-  }
-
-  async getManyDataSourceMetadata(
-    options: FindManyOptions<DataSourceEntity> = {},
-  ) {
-    return this.dataSourceMetadataRepository.find(options);
-  }
-
-  async getDataSourcesMetadataFromWorkspaceId(workspaceId: string) {
-    return this.dataSourceMetadataRepository.find({
-      where: { workspaceId },
-      order: { createdAt: 'DESC' },
-    });
-  }
-
-  async getLastDataSourceMetadataFromWorkspaceIdOrFail(workspaceId: string) {
-    return this.dataSourceMetadataRepository.findOneOrFail({
-      where: { workspaceId },
-      order: { createdAt: 'DESC' },
-    });
-  }
-
-  async delete(workspaceId: string) {
-    await this.dataSourceMetadataRepository.delete({ workspaceId });
-  }
-}
diff --git a/packages/twenty-server/src/metadata/decorators/is-valid-name.decorator.ts b/packages/twenty-server/src/metadata/decorators/is-valid-name.decorator.ts
deleted file mode 100644
index 8bb2ac60de4e..000000000000
--- a/packages/twenty-server/src/metadata/decorators/is-valid-name.decorator.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import {
-  registerDecorator,
-  ValidationOptions,
-  ValidationArguments,
-} from 'class-validator';
-
-export function IsValidName(validationOptions?: ValidationOptions) {
-  return function (object: object, propertyName: string) {
-    registerDecorator({
-      name: 'IsValidName',
-      target: object.constructor,
-      propertyName: propertyName,
-      options: validationOptions,
-      validator: {
-        validate(value: any) {
-          return /^(?!(?:not|or|and)$)[^'\"\\;.=*/]+$/.test(value);
-        },
-        defaultMessage(args: ValidationArguments) {
-          return `${args.property} has failed the name validation check`;
-        },
-      },
-    });
-  };
-}
diff --git a/packages/twenty-server/src/metadata/field-metadata/composite-types/currency.composite-type.ts b/packages/twenty-server/src/metadata/field-metadata/composite-types/currency.composite-type.ts
deleted file mode 100644
index c88f38de8e02..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/composite-types/currency.composite-type.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { generateTargetColumnMap } from 'src/metadata/field-metadata/utils/generate-target-column-map.util';
-
-export const currencyFields = (
-  fieldMetadata?: FieldMetadataInterface,
-): FieldMetadataInterface[] => {
-  const inferredFieldMetadata = fieldMetadata as
-    | FieldMetadataInterface<FieldMetadataType.CURRENCY>
-    | undefined;
-  const targetColumnMap = inferredFieldMetadata
-    ? generateTargetColumnMap(
-        inferredFieldMetadata.type,
-        inferredFieldMetadata.isCustom ?? false,
-        inferredFieldMetadata.name,
-      )
-    : {
-        amountMicros: 'amountMicros',
-        currencyCode: 'currencyCode',
-      };
-
-  return [
-    {
-      id: 'amountMicros',
-      type: FieldMetadataType.NUMERIC,
-      objectMetadataId: FieldMetadataType.CURRENCY.toString(),
-      name: 'amountMicros',
-      label: 'AmountMicros',
-      targetColumnMap: {
-        value: targetColumnMap.amountMicros,
-      },
-      isNullable: true,
-      ...(inferredFieldMetadata
-        ? {
-            defaultValue: {
-              value: inferredFieldMetadata.defaultValue?.amountMicros ?? null,
-            },
-          }
-        : {}),
-    } satisfies FieldMetadataInterface<FieldMetadataType.NUMERIC>,
-    {
-      id: 'currencyCode',
-      type: FieldMetadataType.TEXT,
-      objectMetadataId: FieldMetadataType.CURRENCY.toString(),
-      name: 'currencyCode',
-      label: 'Currency Code',
-      targetColumnMap: {
-        value: targetColumnMap.currencyCode,
-      },
-      isNullable: true,
-      ...(inferredFieldMetadata
-        ? {
-            defaultValue: {
-              value: inferredFieldMetadata.defaultValue?.currencyCode ?? null,
-            },
-          }
-        : {}),
-    } satisfies FieldMetadataInterface<FieldMetadataType.TEXT>,
-  ];
-};
-
-export const currencyObjectDefinition = {
-  id: FieldMetadataType.CURRENCY.toString(),
-  nameSingular: 'currency',
-  namePlural: 'currency',
-  labelSingular: 'Currency',
-  labelPlural: 'Currency',
-  targetTableName: '',
-  fields: currencyFields(),
-  fromRelations: [],
-  toRelations: [],
-  isActive: true,
-  isSystem: true,
-  isCustom: false,
-} satisfies ObjectMetadataInterface;
-
-export type CurrencyMetadata = {
-  amountMicros: number;
-  currencyCode: string;
-};
diff --git a/packages/twenty-server/src/metadata/field-metadata/composite-types/full-name.composite-type.ts b/packages/twenty-server/src/metadata/field-metadata/composite-types/full-name.composite-type.ts
deleted file mode 100644
index 5417e5e4c72f..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/composite-types/full-name.composite-type.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { generateTargetColumnMap } from 'src/metadata/field-metadata/utils/generate-target-column-map.util';
-
-export const fullNameFields = (
-  fieldMetadata?: FieldMetadataInterface,
-): FieldMetadataInterface[] => {
-  const inferredFieldMetadata = fieldMetadata as
-    | FieldMetadataInterface<FieldMetadataType.FULL_NAME>
-    | undefined;
-  const targetColumnMap = inferredFieldMetadata
-    ? generateTargetColumnMap(
-        inferredFieldMetadata.type,
-        inferredFieldMetadata.isCustom ?? false,
-        inferredFieldMetadata.name,
-      )
-    : {
-        firstName: 'firstName',
-        lastName: 'lastName',
-      };
-
-  return [
-    {
-      id: 'firstName',
-      type: FieldMetadataType.TEXT,
-      objectMetadataId: FieldMetadataType.FULL_NAME.toString(),
-      name: 'firstName',
-      label: 'First Name',
-      targetColumnMap: {
-        value: targetColumnMap.firstName,
-      },
-      isNullable: true,
-      ...(inferredFieldMetadata
-        ? {
-            defaultValue: {
-              value: inferredFieldMetadata.defaultValue?.firstName ?? null,
-            },
-          }
-        : {}),
-    } satisfies FieldMetadataInterface<FieldMetadataType.TEXT>,
-    {
-      id: 'lastName',
-      type: FieldMetadataType.TEXT,
-      objectMetadataId: FieldMetadataType.FULL_NAME.toString(),
-      name: 'lastName',
-      label: 'Last Name',
-      targetColumnMap: {
-        value: targetColumnMap.lastName,
-      },
-      isNullable: true,
-      ...(inferredFieldMetadata
-        ? {
-            defaultValue: {
-              value: inferredFieldMetadata.defaultValue?.lastName ?? null,
-            },
-          }
-        : {}),
-    } satisfies FieldMetadataInterface<FieldMetadataType.TEXT>,
-  ];
-};
-
-export const fullNameObjectDefinition = {
-  id: FieldMetadataType.FULL_NAME.toString(),
-  nameSingular: 'fullName',
-  namePlural: 'fullName',
-  labelSingular: 'FullName',
-  labelPlural: 'FullName',
-  targetTableName: '',
-  fields: fullNameFields(),
-  fromRelations: [],
-  toRelations: [],
-  isActive: true,
-  isSystem: true,
-  isCustom: false,
-} satisfies ObjectMetadataInterface;
-
-export type FullNameMetadata = {
-  firstName: string;
-  lastName: string;
-};
diff --git a/packages/twenty-server/src/metadata/field-metadata/composite-types/index.ts b/packages/twenty-server/src/metadata/field-metadata/composite-types/index.ts
deleted file mode 100644
index 7667055d4a8b..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/composite-types/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-
-import { currencyFields } from 'src/metadata/field-metadata/composite-types/currency.composite-type';
-import { fullNameFields } from 'src/metadata/field-metadata/composite-types/full-name.composite-type';
-import { linkFields } from 'src/metadata/field-metadata/composite-types/link.composite-type';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-export type CompositeFieldsDefinitionFunction = (
-  fieldMetadata?: FieldMetadataInterface,
-) => FieldMetadataInterface[];
-
-export const compositeDefinitions = new Map<
-  string,
-  CompositeFieldsDefinitionFunction
->([
-  [FieldMetadataType.LINK, linkFields],
-  [FieldMetadataType.CURRENCY, currencyFields],
-  [FieldMetadataType.FULL_NAME, fullNameFields],
-]);
diff --git a/packages/twenty-server/src/metadata/field-metadata/composite-types/link.composite-type.ts b/packages/twenty-server/src/metadata/field-metadata/composite-types/link.composite-type.ts
deleted file mode 100644
index c642b2446e3b..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/composite-types/link.composite-type.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { generateTargetColumnMap } from 'src/metadata/field-metadata/utils/generate-target-column-map.util';
-
-export const linkFields = (
-  fieldMetadata?: FieldMetadataInterface,
-): FieldMetadataInterface[] => {
-  const inferredFieldMetadata = fieldMetadata as
-    | FieldMetadataInterface<FieldMetadataType.LINK>
-    | undefined;
-  const targetColumnMap = inferredFieldMetadata
-    ? generateTargetColumnMap(
-        inferredFieldMetadata.type,
-        inferredFieldMetadata.isCustom ?? false,
-        inferredFieldMetadata.name,
-      )
-    : {
-        label: 'label',
-        url: 'url',
-      };
-
-  return [
-    {
-      id: 'label',
-      type: FieldMetadataType.TEXT,
-      objectMetadataId: FieldMetadataType.LINK.toString(),
-      name: 'label',
-      label: 'Label',
-      targetColumnMap: {
-        value: targetColumnMap.label,
-      },
-      isNullable: true,
-      ...(inferredFieldMetadata
-        ? {
-            defaultValue: {
-              value: inferredFieldMetadata.defaultValue?.label ?? null,
-            },
-          }
-        : {}),
-    } satisfies FieldMetadataInterface<FieldMetadataType.TEXT>,
-    {
-      id: 'url',
-      type: FieldMetadataType.TEXT,
-      objectMetadataId: FieldMetadataType.LINK.toString(),
-      name: 'url',
-      label: 'Url',
-      targetColumnMap: {
-        value: targetColumnMap.url,
-      },
-      isNullable: true,
-      ...(inferredFieldMetadata
-        ? {
-            defaultValue: {
-              value: inferredFieldMetadata.defaultValue?.url ?? null,
-            },
-          }
-        : {}),
-    } satisfies FieldMetadataInterface<FieldMetadataType.TEXT>,
-  ];
-};
-
-export const linkObjectDefinition = {
-  id: FieldMetadataType.LINK.toString(),
-  nameSingular: 'link',
-  namePlural: 'link',
-  labelSingular: 'Link',
-  labelPlural: 'Link',
-  targetTableName: '',
-  fields: linkFields(),
-  fromRelations: [],
-  toRelations: [],
-  isActive: true,
-  isSystem: true,
-  isCustom: false,
-} satisfies ObjectMetadataInterface;
-
-export type LinkMetadata = {
-  label: string;
-  url: string;
-};
diff --git a/packages/twenty-server/src/metadata/field-metadata/dtos/create-field.input.ts b/packages/twenty-server/src/metadata/field-metadata/dtos/create-field.input.ts
deleted file mode 100644
index 1929bb4b5dba..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/dtos/create-field.input.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Field, InputType, OmitType } from '@nestjs/graphql';
-
-import { IsUUID, ValidateNested } from 'class-validator';
-import { Type } from 'class-transformer';
-
-import { FieldMetadataDTO } from 'src/metadata/field-metadata/dtos/field-metadata.dto';
-
-@InputType()
-export class CreateFieldInput extends OmitType(
-  FieldMetadataDTO,
-  ['id', 'createdAt', 'updatedAt'] as const,
-  InputType,
-) {
-  @IsUUID()
-  @Field()
-  objectMetadataId: string;
-}
-
-@InputType()
-export class CreateOneFieldMetadataInput {
-  @Type(() => CreateFieldInput)
-  @ValidateNested()
-  @Field(() => CreateFieldInput, {
-    description: 'The record to create',
-  })
-  field!: CreateFieldInput;
-}
diff --git a/packages/twenty-server/src/metadata/field-metadata/dtos/default-value.input.ts b/packages/twenty-server/src/metadata/field-metadata/dtos/default-value.input.ts
deleted file mode 100644
index 812ff65910c7..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/dtos/default-value.input.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import {
-  IsArray,
-  IsBoolean,
-  IsDate,
-  IsNotEmpty,
-  IsNumber,
-  IsNumberString,
-  IsString,
-  Matches,
-  ValidateIf,
-} from 'class-validator';
-
-export class FieldMetadataDefaultValueString {
-  @ValidateIf((_object, value) => value !== null)
-  @IsString()
-  value: string | null;
-}
-
-export class FieldMetadataDefaultValueNumber {
-  @ValidateIf((_object, value) => value !== null)
-  @IsNumber()
-  value: number | null;
-}
-
-export class FieldMetadataDefaultValueBoolean {
-  @ValidateIf((_object, value) => value !== null)
-  @IsBoolean()
-  value: boolean | null;
-}
-
-export class FieldMetadataDefaultValueStringArray {
-  @ValidateIf((_object, value) => value !== null)
-  @IsArray()
-  @IsString({ each: true })
-  value: string[] | null;
-}
-
-export class FieldMetadataDefaultValueDateTime {
-  @ValidateIf((_object, value) => value !== null)
-  @IsDate()
-  value: Date | null;
-}
-
-export class FieldMetadataDefaultValueLink {
-  @ValidateIf((_object, value) => value !== null)
-  @IsString()
-  label: string | null;
-
-  @ValidateIf((_object, value) => value !== null)
-  @IsString()
-  url: string | null;
-}
-
-export class FieldMetadataDefaultValueCurrency {
-  @ValidateIf((_object, value) => value !== null)
-  @IsNumberString()
-  amountMicros: string | null;
-
-  @ValidateIf((_object, value) => value !== null)
-  @IsString()
-  currencyCode: string | null;
-}
-
-export class FieldMetadataDefaultValueFullName {
-  @ValidateIf((_object, value) => value !== null)
-  @IsString()
-  firstName: string | null;
-
-  @ValidateIf((_object, value) => value !== null)
-  @IsString()
-  lastName: string | null;
-}
-
-export class FieldMetadataDynamicDefaultValueUuid {
-  @Matches('uuid')
-  @IsNotEmpty()
-  @IsString()
-  type: 'uuid';
-}
-
-export class FieldMetadataDynamicDefaultValueNow {
-  @Matches('now')
-  @IsNotEmpty()
-  @IsString()
-  type: 'now';
-}
diff --git a/packages/twenty-server/src/metadata/field-metadata/dtos/field-metadata.dto.ts b/packages/twenty-server/src/metadata/field-metadata/dtos/field-metadata.dto.ts
deleted file mode 100644
index 2b3ffa7e0d42..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/dtos/field-metadata.dto.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import {
-  Field,
-  HideField,
-  ID,
-  ObjectType,
-  registerEnumType,
-} from '@nestjs/graphql';
-
-import { GraphQLJSON } from 'graphql-type-json';
-import {
-  Authorize,
-  BeforeDeleteOne,
-  FilterableField,
-  IDField,
-  QueryOptions,
-  Relation,
-} from '@ptc-org/nestjs-query-graphql';
-import {
-  IsBoolean,
-  IsDateString,
-  IsEnum,
-  IsNotEmpty,
-  IsOptional,
-  IsString,
-  IsUUID,
-  Validate,
-} from 'class-validator';
-
-import { FieldMetadataOptions } from 'src/metadata/field-metadata/interfaces/field-metadata-options.interface';
-import { FieldMetadataDefaultValue } from 'src/metadata/field-metadata/interfaces/field-metadata-default-value.interface';
-
-import { RelationMetadataDTO } from 'src/metadata/relation-metadata/dtos/relation-metadata.dto';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { BeforeDeleteOneField } from 'src/metadata/field-metadata/hooks/before-delete-one-field.hook';
-import { IsFieldMetadataDefaultValue } from 'src/metadata/field-metadata/validators/is-field-metadata-default-value.validator';
-import { IsFieldMetadataOptions } from 'src/metadata/field-metadata/validators/is-field-metadata-options.validator';
-import { IsValidName } from 'src/metadata/decorators/is-valid-name.decorator';
-
-registerEnumType(FieldMetadataType, {
-  name: 'FieldMetadataType',
-  description: 'Type of the field',
-});
-
-@ObjectType('field')
-@Authorize({
-  authorize: (context: any) => ({
-    workspaceId: { eq: context?.req?.user?.workspace?.id },
-  }),
-})
-@QueryOptions({
-  defaultResultSize: 10,
-  disableSort: true,
-  maxResultsSize: 1000,
-})
-@BeforeDeleteOne(BeforeDeleteOneField)
-@Relation('toRelationMetadata', () => RelationMetadataDTO, {
-  nullable: true,
-})
-@Relation('fromRelationMetadata', () => RelationMetadataDTO, {
-  nullable: true,
-})
-export class FieldMetadataDTO<
-  T extends FieldMetadataType | 'default' = 'default',
-> {
-  @IsUUID()
-  @IsNotEmpty()
-  @IDField(() => ID)
-  id: string;
-
-  @IsEnum(FieldMetadataType)
-  @IsNotEmpty()
-  @Field(() => FieldMetadataType)
-  type: FieldMetadataType;
-
-  @IsString()
-  @IsNotEmpty()
-  @Field()
-  @IsValidName()
-  name: string;
-
-  @IsString()
-  @IsNotEmpty()
-  @Field()
-  label: string;
-
-  @IsString()
-  @IsOptional()
-  @Field({ nullable: true })
-  description?: string;
-
-  @IsString()
-  @IsOptional()
-  @Field({ nullable: true })
-  icon?: string;
-
-  @IsBoolean()
-  @IsOptional()
-  @FilterableField({ nullable: true })
-  isCustom?: boolean;
-
-  @IsBoolean()
-  @IsOptional()
-  @FilterableField({ nullable: true })
-  isActive?: boolean;
-
-  @IsBoolean()
-  @IsOptional()
-  @FilterableField({ nullable: true })
-  isSystem?: boolean;
-
-  @IsBoolean()
-  @IsOptional()
-  @Field({ nullable: true })
-  isNullable?: boolean;
-
-  @Validate(IsFieldMetadataDefaultValue)
-  @IsOptional()
-  @Field(() => GraphQLJSON, { nullable: true })
-  defaultValue?: FieldMetadataDefaultValue<T>;
-
-  @Validate(IsFieldMetadataOptions)
-  @IsOptional()
-  @Field(() => GraphQLJSON, { nullable: true })
-  options?: FieldMetadataOptions<T>;
-
-  @HideField()
-  workspaceId: string;
-
-  @IsDateString()
-  @Field()
-  createdAt: Date;
-
-  @IsDateString()
-  @Field()
-  updatedAt: Date;
-}
diff --git a/packages/twenty-server/src/metadata/field-metadata/dtos/update-field.input.ts b/packages/twenty-server/src/metadata/field-metadata/dtos/update-field.input.ts
deleted file mode 100644
index 2395c9ba888f..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/dtos/update-field.input.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import {
-  Field,
-  HideField,
-  ID,
-  InputType,
-  OmitType,
-  PartialType,
-} from '@nestjs/graphql';
-
-import { Type } from 'class-transformer';
-import { IsNotEmpty, IsUUID, ValidateNested } from 'class-validator';
-
-import { FieldMetadataDTO } from 'src/metadata/field-metadata/dtos/field-metadata.dto';
-
-@InputType()
-export class UpdateFieldInput extends OmitType(
-  PartialType(FieldMetadataDTO, InputType),
-  ['id', 'type', 'createdAt', 'updatedAt'] as const,
-) {
-  @HideField()
-  id: string;
-
-  @HideField()
-  workspaceId: string;
-}
-
-@InputType()
-export class UpdateOneFieldMetadataInput {
-  @IsUUID()
-  @IsNotEmpty()
-  @Field(() => ID, { description: 'The id of the record to update' })
-  id!: string;
-
-  @Type(() => UpdateFieldInput)
-  @ValidateNested()
-  @Field(() => UpdateFieldInput, {
-    description: 'The record to update',
-  })
-  update!: UpdateFieldInput;
-}
diff --git a/packages/twenty-server/src/metadata/field-metadata/field-metadata.entity.ts b/packages/twenty-server/src/metadata/field-metadata/field-metadata.entity.ts
deleted file mode 100644
index 6def6bad7b6d..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/field-metadata.entity.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import {
-  Entity,
-  Unique,
-  PrimaryGeneratedColumn,
-  Column,
-  ManyToOne,
-  JoinColumn,
-  OneToOne,
-  CreateDateColumn,
-  UpdateDateColumn,
-} from 'typeorm';
-
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-import { FieldMetadataTargetColumnMap } from 'src/metadata/field-metadata/interfaces/field-metadata-target-column-map.interface';
-import { FieldMetadataDefaultValue } from 'src/metadata/field-metadata/interfaces/field-metadata-default-value.interface';
-import { FieldMetadataOptions } from 'src/metadata/field-metadata/interfaces/field-metadata-options.interface';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { RelationMetadataEntity } from 'src/metadata/relation-metadata/relation-metadata.entity';
-
-export enum FieldMetadataType {
-  UUID = 'UUID',
-  TEXT = 'TEXT',
-  PHONE = 'PHONE',
-  EMAIL = 'EMAIL',
-  DATE_TIME = 'DATE_TIME',
-  BOOLEAN = 'BOOLEAN',
-  NUMBER = 'NUMBER',
-  NUMERIC = 'NUMERIC',
-  PROBABILITY = 'PROBABILITY',
-  LINK = 'LINK',
-  CURRENCY = 'CURRENCY',
-  FULL_NAME = 'FULL_NAME',
-  RATING = 'RATING',
-  SELECT = 'SELECT',
-  MULTI_SELECT = 'MULTI_SELECT',
-  RELATION = 'RELATION',
-}
-
-@Entity('fieldMetadata')
-@Unique('IndexOnNameObjectMetadataIdAndWorkspaceIdUnique', [
-  'name',
-  'objectMetadataId',
-  'workspaceId',
-])
-export class FieldMetadataEntity<
-  T extends FieldMetadataType | 'default' = 'default',
-> implements FieldMetadataInterface<T>
-{
-  @PrimaryGeneratedColumn('uuid')
-  id: string;
-
-  @Column({ nullable: false, type: 'uuid' })
-  objectMetadataId: string;
-
-  @ManyToOne(() => ObjectMetadataEntity, (object) => object.fields, {
-    onDelete: 'CASCADE',
-  })
-  @JoinColumn({ name: 'objectMetadataId' })
-  object: ObjectMetadataEntity;
-
-  @Column({ nullable: false })
-  type: FieldMetadataType;
-
-  @Column({ nullable: false })
-  name: string;
-
-  @Column({ nullable: false })
-  label: string;
-
-  @Column({ nullable: false, type: 'jsonb' })
-  targetColumnMap: FieldMetadataTargetColumnMap<T>;
-
-  @Column({ nullable: true, type: 'jsonb' })
-  defaultValue: FieldMetadataDefaultValue<T>;
-
-  @Column({ nullable: true, type: 'text' })
-  description: string;
-
-  @Column({ nullable: true })
-  icon: string;
-
-  @Column('jsonb', { nullable: true })
-  options: FieldMetadataOptions<T>;
-
-  @Column({ default: false })
-  isCustom: boolean;
-
-  @Column({ default: false })
-  isActive: boolean;
-
-  @Column({ default: false })
-  isSystem: boolean;
-
-  @Column({ nullable: true, default: true })
-  isNullable: boolean;
-
-  @Column({ nullable: false, type: 'uuid' })
-  workspaceId: string;
-
-  @OneToOne(
-    () => RelationMetadataEntity,
-    (relation: RelationMetadataEntity) => relation.fromFieldMetadata,
-  )
-  fromRelationMetadata: RelationMetadataEntity;
-
-  @OneToOne(
-    () => RelationMetadataEntity,
-    (relation: RelationMetadataEntity) => relation.toFieldMetadata,
-  )
-  toRelationMetadata: RelationMetadataEntity;
-
-  @CreateDateColumn()
-  createdAt: Date;
-
-  @UpdateDateColumn()
-  updatedAt: Date;
-}
diff --git a/packages/twenty-server/src/metadata/field-metadata/field-metadata.module.ts b/packages/twenty-server/src/metadata/field-metadata/field-metadata.module.ts
deleted file mode 100644
index f332a8480d50..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/field-metadata.module.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import {
-  NestjsQueryGraphQLModule,
-  PagingStrategies,
-} from '@ptc-org/nestjs-query-graphql';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-import { SortDirection } from '@ptc-org/nestjs-query-core';
-
-import { WorkspaceMigrationRunnerModule } from 'src/workspace/workspace-migration-runner/workspace-migration-runner.module';
-import { WorkspaceMigrationModule } from 'src/metadata/workspace-migration/workspace-migration.module';
-import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
-import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { IsFieldMetadataDefaultValue } from 'src/metadata/field-metadata/validators/is-field-metadata-default-value.validator';
-import { FieldMetadataResolver } from 'src/metadata/field-metadata/field-metadata.resolver';
-import { FieldMetadataDTO } from 'src/metadata/field-metadata/dtos/field-metadata.dto';
-import { IsFieldMetadataOptions } from 'src/metadata/field-metadata/validators/is-field-metadata-options.validator';
-
-import { FieldMetadataService } from './field-metadata.service';
-import { FieldMetadataEntity } from './field-metadata.entity';
-
-import { CreateFieldInput } from './dtos/create-field.input';
-import { UpdateFieldInput } from './dtos/update-field.input';
-
-@Module({
-  imports: [
-    NestjsQueryGraphQLModule.forFeature({
-      imports: [
-        NestjsQueryTypeOrmModule.forFeature([FieldMetadataEntity], 'metadata'),
-        WorkspaceMigrationModule,
-        WorkspaceMigrationRunnerModule,
-        ObjectMetadataModule,
-        DataSourceModule,
-        TypeORMModule,
-      ],
-      services: [IsFieldMetadataDefaultValue, FieldMetadataService],
-      resolvers: [
-        {
-          EntityClass: FieldMetadataEntity,
-          DTOClass: FieldMetadataDTO,
-          CreateDTOClass: CreateFieldInput,
-          UpdateDTOClass: UpdateFieldInput,
-          ServiceClass: FieldMetadataService,
-          enableTotalCount: true,
-          pagingStrategy: PagingStrategies.CURSOR,
-          read: {
-            defaultSort: [{ field: 'id', direction: SortDirection.DESC }],
-          },
-          create: {
-            // Manually created because of the async validation
-            one: { disabled: true },
-            many: { disabled: true },
-          },
-          update: {
-            // Manually created because of the async validation
-            one: { disabled: true },
-            many: { disabled: true },
-          },
-          delete: { many: { disabled: true } },
-          guards: [JwtAuthGuard],
-        },
-      ],
-    }),
-  ],
-  providers: [
-    IsFieldMetadataDefaultValue,
-    IsFieldMetadataOptions,
-    FieldMetadataService,
-    FieldMetadataResolver,
-  ],
-  exports: [FieldMetadataService],
-})
-export class FieldMetadataModule {}
diff --git a/packages/twenty-server/src/metadata/field-metadata/field-metadata.resolver.ts b/packages/twenty-server/src/metadata/field-metadata/field-metadata.resolver.ts
deleted file mode 100644
index 91b7dd61300a..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/field-metadata.resolver.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { UseGuards } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
-
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { AuthWorkspace } from 'src/decorators/auth/auth-workspace.decorator';
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-import { CreateOneFieldMetadataInput } from 'src/metadata/field-metadata/dtos/create-field.input';
-import { FieldMetadataDTO } from 'src/metadata/field-metadata/dtos/field-metadata.dto';
-import { UpdateOneFieldMetadataInput } from 'src/metadata/field-metadata/dtos/update-field.input';
-import { FieldMetadataService } from 'src/metadata/field-metadata/field-metadata.service';
-
-@UseGuards(JwtAuthGuard)
-@Resolver(() => FieldMetadataDTO)
-export class FieldMetadataResolver {
-  constructor(private readonly fieldMetadataService: FieldMetadataService) {}
-
-  @Mutation(() => FieldMetadataDTO)
-  createOneField(
-    @Args('input') input: CreateOneFieldMetadataInput,
-    @AuthWorkspace() { id: workspaceId }: Workspace,
-  ) {
-    return this.fieldMetadataService.createOne({
-      ...input.field,
-      workspaceId,
-    });
-  }
-
-  @Mutation(() => FieldMetadataDTO)
-  updateOneField(
-    @Args('input') input: UpdateOneFieldMetadataInput,
-    @AuthWorkspace() { id: workspaceId }: Workspace,
-  ) {
-    return this.fieldMetadataService.updateOne(input.id, {
-      ...input.update,
-      workspaceId,
-    });
-  }
-}
diff --git a/packages/twenty-server/src/metadata/field-metadata/field-metadata.service.ts b/packages/twenty-server/src/metadata/field-metadata/field-metadata.service.ts
deleted file mode 100644
index ce17833e8941..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/field-metadata.service.ts
+++ /dev/null
@@ -1,343 +0,0 @@
-import {
-  BadRequestException,
-  ConflictException,
-  Injectable,
-  NotFoundException,
-} from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { v4 as uuidV4 } from 'uuid';
-import { FindOneOptions, Repository } from 'typeorm';
-import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
-
-import { WorkspaceMigrationRunnerService } from 'src/workspace/workspace-migration-runner/workspace-migration-runner.service';
-import { WorkspaceMigrationService } from 'src/metadata/workspace-migration/workspace-migration.service';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
-import { CreateFieldInput } from 'src/metadata/field-metadata/dtos/create-field.input';
-import {
-  WorkspaceMigrationColumnActionType,
-  WorkspaceMigrationTableAction,
-} from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { generateTargetColumnMap } from 'src/metadata/field-metadata/utils/generate-target-column-map.util';
-import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
-import { UpdateFieldInput } from 'src/metadata/field-metadata/dtos/update-field.input';
-import { WorkspaceMigrationFactory } from 'src/metadata/workspace-migration/workspace-migration.factory';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-import { generateMigrationName } from 'src/metadata/workspace-migration/utils/generate-migration-name.util';
-import { generateNullable } from 'src/metadata/field-metadata/utils/generate-nullable';
-
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from './field-metadata.entity';
-
-import { isEnumFieldMetadataType } from './utils/is-enum-field-metadata-type.util';
-import { generateRatingOptions } from './utils/generate-rating-optionts.util';
-import { generateDefaultValue } from './utils/generate-default-value';
-
-@Injectable()
-export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntity> {
-  constructor(
-    @InjectRepository(FieldMetadataEntity, 'metadata')
-    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
-
-    private readonly objectMetadataService: ObjectMetadataService,
-    private readonly workspaceMigrationFactory: WorkspaceMigrationFactory,
-    private readonly workspaceMigrationService: WorkspaceMigrationService,
-    private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
-    private readonly dataSourceService: DataSourceService,
-    private readonly typeORMService: TypeORMService,
-  ) {
-    super(fieldMetadataRepository);
-  }
-
-  override async createOne(
-    fieldMetadataInput: CreateFieldInput,
-  ): Promise<FieldMetadataEntity> {
-    const objectMetadata =
-      await this.objectMetadataService.findOneWithinWorkspace(
-        fieldMetadataInput.workspaceId,
-        {
-          where: {
-            id: fieldMetadataInput.objectMetadataId,
-          },
-        },
-      );
-
-    if (!objectMetadata) {
-      throw new NotFoundException('Object does not exist');
-    }
-
-    // Double check in case the service is directly called
-    if (isEnumFieldMetadataType(fieldMetadataInput.type)) {
-      if (
-        !fieldMetadataInput.options &&
-        fieldMetadataInput.type !== FieldMetadataType.RATING
-      ) {
-        throw new BadRequestException('Options are required for enum fields');
-      }
-    }
-
-    // Generate options for rating fields
-    if (fieldMetadataInput.type === FieldMetadataType.RATING) {
-      fieldMetadataInput.options = generateRatingOptions();
-    }
-
-    const fieldAlreadyExists = await this.fieldMetadataRepository.findOne({
-      where: {
-        name: fieldMetadataInput.name,
-        objectMetadataId: fieldMetadataInput.objectMetadataId,
-        workspaceId: fieldMetadataInput.workspaceId,
-      },
-    });
-
-    if (fieldAlreadyExists) {
-      throw new ConflictException('Field already exists');
-    }
-
-    const createdFieldMetadata = await super.createOne({
-      ...fieldMetadataInput,
-      targetColumnMap: generateTargetColumnMap(
-        fieldMetadataInput.type,
-        true,
-        fieldMetadataInput.name,
-      ),
-      isNullable: generateNullable(
-        fieldMetadataInput.type,
-        fieldMetadataInput.isNullable,
-      ),
-      defaultValue:
-        fieldMetadataInput.defaultValue ??
-        generateDefaultValue(fieldMetadataInput.type),
-      options: fieldMetadataInput.options
-        ? fieldMetadataInput.options.map((option) => ({
-            ...option,
-            id: uuidV4(),
-          }))
-        : undefined,
-      isActive: true,
-      isCustom: true,
-    });
-
-    await this.workspaceMigrationService.createCustomMigration(
-      generateMigrationName(`create-${createdFieldMetadata.name}`),
-      fieldMetadataInput.workspaceId,
-      [
-        {
-          name: computeObjectTargetTable(objectMetadata),
-          action: 'alter',
-          columns: this.workspaceMigrationFactory.createColumnActions(
-            WorkspaceMigrationColumnActionType.CREATE,
-            createdFieldMetadata,
-          ),
-        } satisfies WorkspaceMigrationTableAction,
-      ],
-    );
-
-    await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
-      fieldMetadataInput.workspaceId,
-    );
-
-    // TODO: Move viewField creation to a cdc scheduler
-    const dataSourceMetadata =
-      await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
-        fieldMetadataInput.workspaceId,
-      );
-
-    const workspaceDataSource =
-      await this.typeORMService.connectToDataSource(dataSourceMetadata);
-
-    // TODO: use typeorm repository
-    const view = await workspaceDataSource?.query(
-      `SELECT id FROM ${dataSourceMetadata.schema}."view"
-      WHERE "objectMetadataId" = '${createdFieldMetadata.objectMetadataId}'`,
-    );
-
-    const existingViewFields = await workspaceDataSource?.query(
-      `SELECT * FROM ${dataSourceMetadata.schema}."viewField"
-      WHERE "viewId" = '${view[0].id}'`,
-    );
-
-    const lastPosition = existingViewFields
-      .map((viewField) => viewField.position)
-      .reduce((acc, position) => {
-        if (position > acc) {
-          return position;
-        }
-
-        return acc;
-      }, -1);
-
-    await workspaceDataSource?.query(
-      `INSERT INTO ${dataSourceMetadata.schema}."viewField"
-    ("fieldMetadataId", "position", "isVisible", "size", "viewId")
-    VALUES ('${createdFieldMetadata.id}', '${lastPosition + 1}', true, 180, '${
-      view[0].id
-    }')`,
-    );
-
-    return createdFieldMetadata;
-  }
-
-  override async updateOne(
-    id: string,
-    fieldMetadataInput: UpdateFieldInput,
-  ): Promise<FieldMetadataEntity> {
-    const existingFieldMetadata = await this.fieldMetadataRepository.findOne({
-      where: {
-        id,
-        workspaceId: fieldMetadataInput.workspaceId,
-      },
-    });
-
-    if (!existingFieldMetadata) {
-      throw new NotFoundException('Field does not exist');
-    }
-
-    const objectMetadata =
-      await this.objectMetadataService.findOneWithinWorkspace(
-        fieldMetadataInput.workspaceId,
-        {
-          where: {
-            id: existingFieldMetadata?.objectMetadataId,
-          },
-        },
-      );
-
-    if (!objectMetadata) {
-      throw new NotFoundException('Object does not exist');
-    }
-
-    if (
-      objectMetadata.labelIdentifierFieldMetadataId ===
-        existingFieldMetadata.id &&
-      fieldMetadataInput.isActive === false
-    ) {
-      throw new BadRequestException('Cannot deactivate label identifier field');
-    }
-
-    if (fieldMetadataInput.options) {
-      for (const option of fieldMetadataInput.options) {
-        if (!option.id) {
-          throw new BadRequestException('Option id is required');
-        }
-      }
-    }
-
-    const updatableFieldInput =
-      existingFieldMetadata.isCustom === false
-        ? this.buildUpdatableStandardFieldInput(
-            fieldMetadataInput,
-            existingFieldMetadata,
-          )
-        : fieldMetadataInput;
-
-    const updatedFieldMetadata = await super.updateOne(id, {
-      ...updatableFieldInput,
-      defaultValue:
-        // Todo: we need to handle default value for all field types. Right now we are only allowing update for SELECt
-        existingFieldMetadata.type !== FieldMetadataType.SELECT
-          ? existingFieldMetadata.defaultValue
-          : updatableFieldInput.defaultValue
-            ? // Todo: we need to rework DefaultValue typing and format to be simpler, there is no need to have this complexity
-              { value: updatableFieldInput.defaultValue as unknown as string }
-            : null,
-      // If the name is updated, the targetColumnMap should be updated as well
-      targetColumnMap: updatableFieldInput.name
-        ? generateTargetColumnMap(
-            existingFieldMetadata.type,
-            existingFieldMetadata.isCustom,
-            updatableFieldInput.name,
-          )
-        : existingFieldMetadata.targetColumnMap,
-    });
-
-    if (
-      fieldMetadataInput.name ||
-      updatableFieldInput.options ||
-      updatableFieldInput.defaultValue
-    ) {
-      await this.workspaceMigrationService.createCustomMigration(
-        generateMigrationName(`update-${updatedFieldMetadata.name}`),
-        existingFieldMetadata.workspaceId,
-        [
-          {
-            name: computeObjectTargetTable(objectMetadata),
-            action: 'alter',
-            columns: this.workspaceMigrationFactory.createColumnActions(
-              WorkspaceMigrationColumnActionType.ALTER,
-              existingFieldMetadata,
-              updatedFieldMetadata,
-            ),
-          } satisfies WorkspaceMigrationTableAction,
-        ],
-      );
-
-      await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
-        updatedFieldMetadata.workspaceId,
-      );
-    }
-
-    return updatedFieldMetadata;
-  }
-
-  public async findOneOrFail(
-    id: string,
-    options?: FindOneOptions<FieldMetadataEntity>,
-  ) {
-    const fieldMetadata = await this.fieldMetadataRepository.findOne({
-      ...options,
-      where: {
-        ...options?.where,
-        id,
-      },
-    });
-
-    if (!fieldMetadata) {
-      throw new NotFoundException('Field does not exist');
-    }
-
-    return fieldMetadata;
-  }
-
-  public async findOneWithinWorkspace(
-    workspaceId: string,
-    options: FindOneOptions<FieldMetadataEntity>,
-  ) {
-    return this.fieldMetadataRepository.findOne({
-      ...options,
-      where: {
-        ...options.where,
-        workspaceId,
-      },
-    });
-  }
-
-  public async deleteFieldsMetadata(workspaceId: string) {
-    await this.fieldMetadataRepository.delete({ workspaceId });
-  }
-
-  private buildUpdatableStandardFieldInput(
-    fieldMetadataInput: UpdateFieldInput,
-    existingFieldMetadata: FieldMetadataEntity,
-  ) {
-    let fieldMetadataInputOverrided = {};
-
-    fieldMetadataInputOverrided = {
-      id: fieldMetadataInput.id,
-      isActive: fieldMetadataInput.isActive,
-      workspaceId: fieldMetadataInput.workspaceId,
-      defaultValue: fieldMetadataInput.defaultValue,
-    };
-
-    if (existingFieldMetadata.type === FieldMetadataType.SELECT) {
-      fieldMetadataInputOverrided = {
-        ...fieldMetadataInputOverrided,
-        options: fieldMetadataInput.options,
-      };
-    }
-
-    return fieldMetadataInputOverrided as UpdateFieldInput;
-  }
-}
diff --git a/packages/twenty-server/src/metadata/field-metadata/hooks/before-delete-one-field.hook.ts b/packages/twenty-server/src/metadata/field-metadata/hooks/before-delete-one-field.hook.ts
deleted file mode 100644
index 1e3ae4dce748..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/hooks/before-delete-one-field.hook.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import {
-  BadRequestException,
-  Injectable,
-  UnauthorizedException,
-} from '@nestjs/common';
-
-import {
-  BeforeDeleteOneHook,
-  DeleteOneInputType,
-} from '@ptc-org/nestjs-query-graphql';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { FieldMetadataService } from 'src/metadata/field-metadata/field-metadata.service';
-
-@Injectable()
-export class BeforeDeleteOneField implements BeforeDeleteOneHook<any> {
-  constructor(readonly fieldMetadataService: FieldMetadataService) {}
-
-  async run(
-    instance: DeleteOneInputType,
-    context: any,
-  ): Promise<DeleteOneInputType> {
-    const workspaceId = context?.req?.user?.workspace?.id;
-
-    if (!workspaceId) {
-      throw new UnauthorizedException();
-    }
-
-    const fieldMetadata =
-      await this.fieldMetadataService.findOneWithinWorkspace(workspaceId, {
-        where: {
-          id: instance.id.toString(),
-        },
-      });
-
-    if (!fieldMetadata) {
-      throw new BadRequestException('Field does not exist');
-    }
-
-    if (!fieldMetadata.isCustom) {
-      throw new BadRequestException("Standard Fields can't be deleted");
-    }
-
-    if (fieldMetadata.isActive) {
-      throw new BadRequestException("Active fields can't be deleted");
-    }
-
-    if (fieldMetadata.type === FieldMetadataType.RELATION) {
-      throw new BadRequestException(
-        "Relation fields can't be deleted, you need to delete the RelationMetadata instead",
-      );
-    }
-
-    return instance;
-  }
-}
diff --git a/packages/twenty-server/src/metadata/field-metadata/interfaces/field-metadata-default-value.interface.ts b/packages/twenty-server/src/metadata/field-metadata/interfaces/field-metadata-default-value.interface.ts
deleted file mode 100644
index b86064271f78..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/interfaces/field-metadata-default-value.interface.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import {
-  FieldMetadataDefaultValueBoolean,
-  FieldMetadataDefaultValueCurrency,
-  FieldMetadataDefaultValueDateTime,
-  FieldMetadataDefaultValueFullName,
-  FieldMetadataDefaultValueLink,
-  FieldMetadataDefaultValueNumber,
-  FieldMetadataDefaultValueString,
-  FieldMetadataDefaultValueStringArray,
-  FieldMetadataDynamicDefaultValueNow,
-  FieldMetadataDynamicDefaultValueUuid,
-} from 'src/metadata/field-metadata/dtos/default-value.input';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-type FieldMetadataScalarDefaultValue =
-  | FieldMetadataDefaultValueString
-  | FieldMetadataDefaultValueNumber
-  | FieldMetadataDefaultValueBoolean
-  | FieldMetadataDefaultValueDateTime;
-
-export type FieldMetadataDynamicDefaultValue =
-  | FieldMetadataDynamicDefaultValueUuid
-  | FieldMetadataDynamicDefaultValueNow;
-
-type AllFieldMetadataDefaultValueTypes =
-  | FieldMetadataScalarDefaultValue
-  | FieldMetadataDynamicDefaultValue
-  | FieldMetadataDefaultValueLink
-  | FieldMetadataDefaultValueCurrency
-  | FieldMetadataDefaultValueFullName;
-
-type FieldMetadataDefaultValueMapping = {
-  [FieldMetadataType.UUID]:
-    | FieldMetadataDefaultValueString
-    | FieldMetadataDynamicDefaultValueUuid;
-  [FieldMetadataType.TEXT]: FieldMetadataDefaultValueString;
-  [FieldMetadataType.PHONE]: FieldMetadataDefaultValueString;
-  [FieldMetadataType.EMAIL]: FieldMetadataDefaultValueString;
-  [FieldMetadataType.DATE_TIME]:
-    | FieldMetadataDefaultValueDateTime
-    | FieldMetadataDynamicDefaultValueNow;
-  [FieldMetadataType.BOOLEAN]: FieldMetadataDefaultValueBoolean;
-  [FieldMetadataType.NUMBER]: FieldMetadataDefaultValueNumber;
-  [FieldMetadataType.NUMERIC]: FieldMetadataDefaultValueString;
-  [FieldMetadataType.PROBABILITY]: FieldMetadataDefaultValueNumber;
-  [FieldMetadataType.LINK]: FieldMetadataDefaultValueLink;
-  [FieldMetadataType.CURRENCY]: FieldMetadataDefaultValueCurrency;
-  [FieldMetadataType.FULL_NAME]: FieldMetadataDefaultValueFullName;
-  [FieldMetadataType.RATING]: FieldMetadataDefaultValueString;
-  [FieldMetadataType.SELECT]: FieldMetadataDefaultValueString;
-  [FieldMetadataType.MULTI_SELECT]: FieldMetadataDefaultValueStringArray;
-};
-
-type DefaultValueByFieldMetadata<T extends FieldMetadataType | 'default'> = [
-  T,
-] extends [keyof FieldMetadataDefaultValueMapping]
-  ? FieldMetadataDefaultValueMapping[T] | null
-  : T extends 'default'
-    ? AllFieldMetadataDefaultValueTypes | null
-    : never;
-
-export type FieldMetadataDefaultValue<
-  T extends FieldMetadataType | 'default' = 'default',
-> = DefaultValueByFieldMetadata<T>;
-
-type FieldMetadataDefaultValueExtractNestedType<T> = T extends {
-  value: infer U;
-}
-  ? U
-  : T extends object
-    ? { [K in keyof T]: T[K] } extends { value: infer V }
-      ? V
-      : T[keyof T]
-    : never;
-
-type FieldMetadataDefaultValueExtractedTypes = {
-  [K in keyof FieldMetadataDefaultValueMapping]: FieldMetadataDefaultValueExtractNestedType<
-    FieldMetadataDefaultValueMapping[K]
-  >;
-};
-
-export type FieldMetadataDefaultSerializableValue =
-  | FieldMetadataDefaultValueExtractedTypes[keyof FieldMetadataDefaultValueExtractedTypes]
-  | FieldMetadataDynamicDefaultValue
-  | null;
diff --git a/packages/twenty-server/src/metadata/field-metadata/interfaces/field-metadata-target-column-map.interface.ts b/packages/twenty-server/src/metadata/field-metadata/interfaces/field-metadata-target-column-map.interface.ts
deleted file mode 100644
index cf6d7992b4f8..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/interfaces/field-metadata-target-column-map.interface.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-export interface FieldMetadataTargetColumnMapValue {
-  value: string;
-}
-
-export interface FieldMetadataTargetColumnMapLink {
-  label: string;
-  url: string;
-}
-
-export interface FieldMetadataTargetColumnMapCurrency {
-  amountMicros: string;
-  currencyCode: string;
-}
-
-export interface FieldMetadataTargetColumnMapFullName {
-  firstName: string;
-  lastName: string;
-}
-
-type AllFieldMetadataTypes = {
-  [key: string]: string;
-};
-
-type FieldMetadataTypeMapping = {
-  [FieldMetadataType.LINK]: FieldMetadataTargetColumnMapLink;
-  [FieldMetadataType.CURRENCY]: FieldMetadataTargetColumnMapCurrency;
-  [FieldMetadataType.FULL_NAME]: FieldMetadataTargetColumnMapFullName;
-};
-
-type TypeByFieldMetadata<T extends FieldMetadataType | 'default'> = [
-  T,
-] extends [keyof FieldMetadataTypeMapping]
-  ? FieldMetadataTypeMapping[T]
-  : T extends 'default'
-    ? AllFieldMetadataTypes
-    : FieldMetadataTargetColumnMapValue;
-
-export type FieldMetadataTargetColumnMap<
-  T extends FieldMetadataType | 'default' = 'default',
-> = TypeByFieldMetadata<T>;
diff --git a/packages/twenty-server/src/metadata/field-metadata/interfaces/field-metadata.interface.ts b/packages/twenty-server/src/metadata/field-metadata/interfaces/field-metadata.interface.ts
deleted file mode 100644
index 80413a6a80cf..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/interfaces/field-metadata.interface.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { FieldMetadataTargetColumnMap } from 'src/metadata/field-metadata/interfaces/field-metadata-target-column-map.interface';
-import { FieldMetadataDefaultValue } from 'src/metadata/field-metadata/interfaces/field-metadata-default-value.interface';
-import { FieldMetadataOptions } from 'src/metadata/field-metadata/interfaces/field-metadata-options.interface';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { RelationMetadataEntity } from 'src/metadata/relation-metadata/relation-metadata.entity';
-
-export interface FieldMetadataInterface<
-  T extends FieldMetadataType | 'default' = 'default',
-> {
-  id: string;
-  type: FieldMetadataType;
-  name: string;
-  label: string;
-  targetColumnMap: FieldMetadataTargetColumnMap<T>;
-  defaultValue?: FieldMetadataDefaultValue<T>;
-  options?: FieldMetadataOptions<T>;
-  objectMetadataId: string;
-  workspaceId?: string;
-  description?: string;
-  isNullable?: boolean;
-  fromRelationMetadata?: RelationMetadataEntity;
-  toRelationMetadata?: RelationMetadataEntity;
-  isCustom?: boolean;
-}
diff --git a/packages/twenty-server/src/metadata/field-metadata/utils/__tests__/generate-target-column-map.spec.ts b/packages/twenty-server/src/metadata/field-metadata/utils/__tests__/generate-target-column-map.spec.ts
deleted file mode 100644
index dbedbe8bea22..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/utils/__tests__/generate-target-column-map.spec.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { BadRequestException } from '@nestjs/common';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { generateTargetColumnMap } from 'src/metadata/field-metadata/utils/generate-target-column-map.util';
-
-describe('generateTargetColumnMap', () => {
-  it('should generate a target column map for a given type', () => {
-    const textMap = generateTargetColumnMap(
-      FieldMetadataType.TEXT,
-      false,
-      'name',
-    );
-
-    expect(textMap).toEqual({ value: 'name' });
-
-    const linkMap = generateTargetColumnMap(
-      FieldMetadataType.LINK,
-      false,
-      'website',
-    );
-
-    expect(linkMap).toEqual({ label: 'websiteLabel', url: 'websiteUrl' });
-
-    const currencyMap = generateTargetColumnMap(
-      FieldMetadataType.CURRENCY,
-      true,
-      'price',
-    );
-
-    expect(currencyMap).toEqual({
-      amountMicros: '_priceAmountMicros',
-      currencyCode: '_priceCurrencyCode',
-    });
-  });
-
-  it('should throw an error for an unknown type', () => {
-    expect(() =>
-      generateTargetColumnMap('invalid' as FieldMetadataType, false, 'name'),
-    ).toThrow(BadRequestException);
-  });
-});
diff --git a/packages/twenty-server/src/metadata/field-metadata/utils/__tests__/serialize-default-value.spec.ts b/packages/twenty-server/src/metadata/field-metadata/utils/__tests__/serialize-default-value.spec.ts
deleted file mode 100644
index 5df7b031937e..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/utils/__tests__/serialize-default-value.spec.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { BadRequestException } from '@nestjs/common';
-
-import { serializeDefaultValue } from 'src/metadata/field-metadata/utils/serialize-default-value';
-
-describe('serializeDefaultValue', () => {
-  it('should return null for undefined defaultValue', () => {
-    expect(serializeDefaultValue()).toBeNull();
-  });
-
-  it('should handle uuid dynamic default value', () => {
-    expect(serializeDefaultValue({ type: 'uuid' })).toBe(
-      'public.uuid_generate_v4()',
-    );
-  });
-
-  it('should handle now dynamic default value', () => {
-    expect(serializeDefaultValue({ type: 'now' })).toBe('now()');
-  });
-
-  it('should throw BadRequestException for invalid dynamic default value type', () => {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-expect-error Just for testing purposes
-    expect(() => serializeDefaultValue({ type: 'invalid' })).toThrow(
-      BadRequestException,
-    );
-  });
-
-  it('should handle string static default value', () => {
-    expect(serializeDefaultValue('test')).toBe("'test'");
-  });
-
-  it('should handle number static default value', () => {
-    expect(serializeDefaultValue(123)).toBe(123);
-  });
-
-  it('should handle boolean static default value', () => {
-    expect(serializeDefaultValue(true)).toBe(true);
-    expect(serializeDefaultValue(false)).toBe(false);
-  });
-
-  it('should handle Date static default value', () => {
-    const date = new Date('2023-01-01');
-
-    expect(serializeDefaultValue(date)).toBe(`'${date.toISOString()}'`);
-  });
-});
diff --git a/packages/twenty-server/src/metadata/field-metadata/utils/__tests__/validate-default-value-based-on-type.spec.ts b/packages/twenty-server/src/metadata/field-metadata/utils/__tests__/validate-default-value-based-on-type.spec.ts
deleted file mode 100644
index 8e7f9eea95d1..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/utils/__tests__/validate-default-value-based-on-type.spec.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { validateDefaultValueForType } from 'src/metadata/field-metadata/utils/validate-default-value-for-type.util';
-
-describe('validateDefaultValueForType', () => {
-  it('should return true for null defaultValue', () => {
-    expect(validateDefaultValueForType(FieldMetadataType.TEXT, null)).toBe(
-      true,
-    );
-  });
-
-  // Dynamic default values
-  it('should validate uuid dynamic default value for UUID type', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.UUID, { type: 'uuid' }),
-    ).toBe(true);
-  });
-
-  it('should validate now dynamic default value for DATE_TIME type', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.DATE_TIME, { type: 'now' }),
-    ).toBe(true);
-  });
-
-  it('should return false for mismatched dynamic default value', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.UUID, { type: 'now' }),
-    ).toBe(false);
-  });
-
-  // Static default values
-  it('should validate string default value for TEXT type', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.TEXT, { value: 'test' }),
-    ).toBe(true);
-  });
-
-  it('should return false for invalid string default value for TEXT type', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.TEXT, { value: 123 }),
-    ).toBe(false);
-  });
-
-  it('should validate string default value for PHONE type', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.PHONE, {
-        value: '+123456789',
-      }),
-    ).toBe(true);
-  });
-
-  it('should return false for invalid string default value for PHONE type', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.PHONE, { value: 123 }),
-    ).toBe(false);
-  });
-
-  it('should validate string default value for EMAIL type', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.EMAIL, {
-        value: 'test@example.com',
-      }),
-    ).toBe(true);
-  });
-
-  it('should return false for invalid string default value for EMAIL type', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.EMAIL, { value: 123 }),
-    ).toBe(false);
-  });
-
-  it('should validate number default value for NUMBER type', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.NUMBER, { value: 100 }),
-    ).toBe(true);
-  });
-
-  it('should return false for invalid number default value for NUMBER type', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.NUMBER, { value: '100' }),
-    ).toBe(false);
-  });
-
-  it('should validate number default value for PROBABILITY type', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.PROBABILITY, {
-        value: 0.5,
-      }),
-    ).toBe(true);
-  });
-
-  it('should return false for invalid number default value for PROBABILITY type', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.PROBABILITY, {
-        value: '50%',
-      }),
-    ).toBe(false);
-  });
-
-  it('should validate boolean default value for BOOLEAN type', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.BOOLEAN, { value: true }),
-    ).toBe(true);
-  });
-
-  it('should return false for invalid boolean default value for BOOLEAN type', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.BOOLEAN, { value: 'true' }),
-    ).toBe(false);
-  });
-
-  // LINK type
-  it('should validate LINK default value', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.LINK, {
-        label: 'http://example.com',
-        url: 'Example',
-      }),
-    ).toBe(true);
-  });
-
-  it('should return false for invalid LINK default value', () => {
-    expect(
-      validateDefaultValueForType(
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error Just for testing purposes
-        { label: 123, url: {} },
-        FieldMetadataType.LINK,
-      ),
-    ).toBe(false);
-  });
-
-  // CURRENCY type
-  it('should validate CURRENCY default value', () => {
-    expect(
-      validateDefaultValueForType(FieldMetadataType.CURRENCY, {
-        amountMicros: '100',
-        currencyCode: 'USD',
-      }),
-    ).toBe(true);
-  });
-
-  it('should return false for invalid CURRENCY default value', () => {
-    expect(
-      validateDefaultValueForType(
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error Just for testing purposes
-        { amountMicros: 100, currencyCode: 'USD' },
-        FieldMetadataType.CURRENCY,
-      ),
-    ).toBe(false);
-  });
-
-  // Unknown type
-  it('should return false for unknown type', () => {
-    expect(
-      validateDefaultValueForType('unknown' as FieldMetadataType, {
-        value: 'test',
-      }),
-    ).toBe(false);
-  });
-});
diff --git a/packages/twenty-server/src/metadata/field-metadata/utils/generate-default-value.ts b/packages/twenty-server/src/metadata/field-metadata/utils/generate-default-value.ts
deleted file mode 100644
index 91d733c8090b..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/utils/generate-default-value.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { FieldMetadataDefaultValue } from 'src/metadata/field-metadata/interfaces/field-metadata-default-value.interface';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-export function generateDefaultValue(
-  type: FieldMetadataType,
-): FieldMetadataDefaultValue {
-  switch (type) {
-    case FieldMetadataType.TEXT:
-    case FieldMetadataType.PHONE:
-    case FieldMetadataType.EMAIL:
-      return {
-        value: '',
-      };
-    case FieldMetadataType.FULL_NAME:
-      return {
-        firstName: '',
-        lastName: '',
-      };
-    case FieldMetadataType.LINK:
-      return {
-        url: '',
-        label: '',
-      };
-    case FieldMetadataType.CURRENCY:
-      return {
-        amountMicros: null,
-        currencyCode: '',
-      };
-    default:
-      return null;
-  }
-}
diff --git a/packages/twenty-server/src/metadata/field-metadata/utils/generate-nullable.ts b/packages/twenty-server/src/metadata/field-metadata/utils/generate-nullable.ts
deleted file mode 100644
index 4f0c0c94ef6b..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/utils/generate-nullable.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-export function generateNullable(
-  type: FieldMetadataType,
-  inputNullableValue?: boolean,
-): boolean {
-  switch (type) {
-    case FieldMetadataType.TEXT:
-    case FieldMetadataType.PHONE:
-    case FieldMetadataType.EMAIL:
-      return false;
-    default:
-      return inputNullableValue ?? true;
-  }
-}
diff --git a/packages/twenty-server/src/metadata/field-metadata/utils/generate-target-column-map.util.ts b/packages/twenty-server/src/metadata/field-metadata/utils/generate-target-column-map.util.ts
deleted file mode 100644
index 78abf2ef0592..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/utils/generate-target-column-map.util.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { BadRequestException } from '@nestjs/common';
-
-import { FieldMetadataTargetColumnMap } from 'src/metadata/field-metadata/interfaces/field-metadata-target-column-map.interface';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { createCustomColumnName } from 'src/metadata/utils/create-custom-column-name.util';
-
-/**
- * Generate a target column map for a given type, this is used to map the field to the correct column(s) in the database.
- * This is used to support fields that map to multiple columns in the database.
- *
- * @param type string
- * @returns FieldMetadataTargetColumnMap
- */
-export function generateTargetColumnMap(
-  type: FieldMetadataType,
-  isCustomField: boolean,
-  fieldName: string,
-): FieldMetadataTargetColumnMap {
-  const columnName = isCustomField
-    ? createCustomColumnName(fieldName)
-    : fieldName;
-
-  switch (type) {
-    case FieldMetadataType.UUID:
-    case FieldMetadataType.TEXT:
-    case FieldMetadataType.PHONE:
-    case FieldMetadataType.EMAIL:
-    case FieldMetadataType.NUMBER:
-    case FieldMetadataType.NUMERIC:
-    case FieldMetadataType.PROBABILITY:
-    case FieldMetadataType.BOOLEAN:
-    case FieldMetadataType.DATE_TIME:
-    case FieldMetadataType.RATING:
-    case FieldMetadataType.SELECT:
-    case FieldMetadataType.MULTI_SELECT:
-      return {
-        value: columnName,
-      };
-    case FieldMetadataType.LINK:
-      return {
-        label: `${columnName}Label`,
-        url: `${columnName}Url`,
-      };
-    case FieldMetadataType.CURRENCY:
-      return {
-        amountMicros: `${columnName}AmountMicros`,
-        currencyCode: `${columnName}CurrencyCode`,
-      };
-    case FieldMetadataType.FULL_NAME:
-      return {
-        firstName: `${columnName}FirstName`,
-        lastName: `${columnName}LastName`,
-      };
-    case FieldMetadataType.RELATION:
-      return {};
-    default:
-      throw new BadRequestException(`Unknown type ${type}`);
-  }
-}
diff --git a/packages/twenty-server/src/metadata/field-metadata/utils/is-composite-field-metadata-type.util.ts b/packages/twenty-server/src/metadata/field-metadata/utils/is-composite-field-metadata-type.util.ts
deleted file mode 100644
index bc8dd6a55e11..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/utils/is-composite-field-metadata-type.util.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-export const isCompositeFieldMetadataType = (
-  type: FieldMetadataType,
-): type is
-  | FieldMetadataType.LINK
-  | FieldMetadataType.CURRENCY
-  | FieldMetadataType.FULL_NAME => {
-  return (
-    type === FieldMetadataType.LINK ||
-    type === FieldMetadataType.CURRENCY ||
-    type === FieldMetadataType.FULL_NAME
-  );
-};
diff --git a/packages/twenty-server/src/metadata/field-metadata/utils/serialize-default-value.ts b/packages/twenty-server/src/metadata/field-metadata/utils/serialize-default-value.ts
deleted file mode 100644
index 8c48c1abfe80..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/utils/serialize-default-value.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { BadRequestException } from '@nestjs/common';
-
-import { FieldMetadataDefaultSerializableValue } from 'src/metadata/field-metadata/interfaces/field-metadata-default-value.interface';
-
-import { serializeTypeDefaultValue } from 'src/metadata/field-metadata/utils/serialize-type-default-value.util';
-
-export const serializeDefaultValue = (
-  defaultValue?: FieldMetadataDefaultSerializableValue,
-) => {
-  if (defaultValue === undefined || defaultValue === null) {
-    return null;
-  }
-
-  // Dynamic default values
-  if (
-    !Array.isArray(defaultValue) &&
-    typeof defaultValue === 'object' &&
-    'type' in defaultValue
-  ) {
-    const serializedTypeDefaultValue = serializeTypeDefaultValue(defaultValue);
-
-    if (!serializedTypeDefaultValue) {
-      throw new BadRequestException('Invalid default value');
-    }
-
-    return serializedTypeDefaultValue;
-  }
-
-  // Static default values
-  if (typeof defaultValue === 'string') {
-    return `'${defaultValue}'`;
-  }
-
-  if (typeof defaultValue === 'number') {
-    return defaultValue;
-  }
-
-  if (typeof defaultValue === 'boolean') {
-    return defaultValue;
-  }
-
-  if (defaultValue instanceof Date) {
-    return `'${defaultValue.toISOString()}'`;
-  }
-
-  if (Array.isArray(defaultValue)) {
-    return defaultValue;
-  }
-
-  if (typeof defaultValue === 'object') {
-    return `'${JSON.stringify(defaultValue)}'`;
-  }
-
-  throw new BadRequestException('Invalid default value');
-};
diff --git a/packages/twenty-server/src/metadata/field-metadata/utils/serialize-type-default-value.util.ts b/packages/twenty-server/src/metadata/field-metadata/utils/serialize-type-default-value.util.ts
deleted file mode 100644
index 1dd606ac10cd..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/utils/serialize-type-default-value.util.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { FieldMetadataDynamicDefaultValue } from 'src/metadata/field-metadata/interfaces/field-metadata-default-value.interface';
-
-export const serializeTypeDefaultValue = (
-  defaultValue?: FieldMetadataDynamicDefaultValue,
-) => {
-  if (!defaultValue?.type) {
-    return null;
-  }
-
-  switch (defaultValue.type) {
-    case 'uuid':
-      return 'public.uuid_generate_v4()';
-    case 'now':
-      return 'now()';
-    default:
-      return null;
-  }
-};
diff --git a/packages/twenty-server/src/metadata/field-metadata/utils/validate-default-value-for-type.util.ts b/packages/twenty-server/src/metadata/field-metadata/utils/validate-default-value-for-type.util.ts
deleted file mode 100644
index 1735544d9b1c..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/utils/validate-default-value-for-type.util.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { plainToInstance } from 'class-transformer';
-import { validateSync } from 'class-validator';
-
-import { FieldMetadataDefaultValue } from 'src/metadata/field-metadata/interfaces/field-metadata-default-value.interface';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import {
-  FieldMetadataDefaultValueBoolean,
-  FieldMetadataDefaultValueCurrency,
-  FieldMetadataDefaultValueDateTime,
-  FieldMetadataDefaultValueFullName,
-  FieldMetadataDefaultValueLink,
-  FieldMetadataDefaultValueNumber,
-  FieldMetadataDefaultValueString,
-  FieldMetadataDefaultValueStringArray,
-  FieldMetadataDynamicDefaultValueNow,
-  FieldMetadataDynamicDefaultValueUuid,
-} from 'src/metadata/field-metadata/dtos/default-value.input';
-
-export const defaultValueValidatorsMap = {
-  [FieldMetadataType.UUID]: [
-    FieldMetadataDefaultValueString,
-    FieldMetadataDynamicDefaultValueUuid,
-  ],
-  [FieldMetadataType.TEXT]: [FieldMetadataDefaultValueString],
-  [FieldMetadataType.PHONE]: [FieldMetadataDefaultValueString],
-  [FieldMetadataType.EMAIL]: [FieldMetadataDefaultValueString],
-  [FieldMetadataType.DATE_TIME]: [
-    FieldMetadataDefaultValueDateTime,
-    FieldMetadataDynamicDefaultValueNow,
-  ],
-  [FieldMetadataType.BOOLEAN]: [FieldMetadataDefaultValueBoolean],
-  [FieldMetadataType.NUMBER]: [FieldMetadataDefaultValueNumber],
-  [FieldMetadataType.NUMERIC]: [FieldMetadataDefaultValueString],
-  [FieldMetadataType.PROBABILITY]: [FieldMetadataDefaultValueNumber],
-  [FieldMetadataType.LINK]: [FieldMetadataDefaultValueLink],
-  [FieldMetadataType.CURRENCY]: [FieldMetadataDefaultValueCurrency],
-  [FieldMetadataType.FULL_NAME]: [FieldMetadataDefaultValueFullName],
-  [FieldMetadataType.RATING]: [FieldMetadataDefaultValueString],
-  [FieldMetadataType.SELECT]: [FieldMetadataDefaultValueString],
-  [FieldMetadataType.MULTI_SELECT]: [FieldMetadataDefaultValueStringArray],
-};
-
-export const validateDefaultValueForType = (
-  type: FieldMetadataType,
-  defaultValue: FieldMetadataDefaultValue,
-): boolean => {
-  if (defaultValue === null) return true;
-
-  const validators = defaultValueValidatorsMap[type];
-
-  if (!validators) return false;
-
-  const isValid = validators.some((validator) => {
-    const defaultValueInstance = plainToInstance<
-      any,
-      FieldMetadataDefaultValue
-    >(validator, defaultValue);
-
-    return (
-      validateSync(defaultValueInstance, {
-        whitelist: true,
-        forbidNonWhitelisted: true,
-        forbidUnknownValues: true,
-      }).length === 0
-    );
-  });
-
-  return isValid;
-};
diff --git a/packages/twenty-server/src/metadata/field-metadata/utils/validate-options-for-type.util.ts b/packages/twenty-server/src/metadata/field-metadata/utils/validate-options-for-type.util.ts
deleted file mode 100644
index 5cd778c82120..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/utils/validate-options-for-type.util.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { plainToInstance } from 'class-transformer';
-import { validateSync } from 'class-validator';
-
-import { FieldMetadataOptions } from 'src/metadata/field-metadata/interfaces/field-metadata-options.interface';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import {
-  FieldMetadataComplexOption,
-  FieldMetadataDefaultOption,
-} from 'src/metadata/field-metadata/dtos/options.input';
-
-import { isEnumFieldMetadataType } from './is-enum-field-metadata-type.util';
-
-export const optionsValidatorsMap = {
-  // RATING doesn't need to be provided as it's the backend that will generate the options
-  [FieldMetadataType.SELECT]: [FieldMetadataComplexOption],
-  [FieldMetadataType.MULTI_SELECT]: [FieldMetadataComplexOption],
-};
-
-export const validateOptionsForType = (
-  type: FieldMetadataType,
-  options: FieldMetadataOptions,
-): boolean => {
-  if (options === null) return true;
-
-  if (!Array.isArray(options)) {
-    return false;
-  }
-
-  if (!isEnumFieldMetadataType(type)) {
-    return true;
-  }
-
-  if (type === FieldMetadataType.RATING) {
-    return true;
-  }
-
-  const validators = optionsValidatorsMap[type];
-
-  if (!validators) return false;
-
-  const isValid = options.every((option) => {
-    return validators.some((validator) => {
-      const optionsInstance = plainToInstance<
-        any,
-        FieldMetadataDefaultOption | FieldMetadataComplexOption
-      >(validator, option);
-
-      return (
-        validateSync(optionsInstance, {
-          whitelist: true,
-          forbidNonWhitelisted: true,
-          forbidUnknownValues: true,
-        }).length === 0
-      );
-    });
-  });
-
-  return isValid;
-};
diff --git a/packages/twenty-server/src/metadata/field-metadata/validators/is-field-metadata-default-value.validator.ts b/packages/twenty-server/src/metadata/field-metadata/validators/is-field-metadata-default-value.validator.ts
deleted file mode 100644
index 0eeea4f4e162..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/validators/is-field-metadata-default-value.validator.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import {
-  ValidationArguments,
-  ValidatorConstraint,
-  ValidatorConstraintInterface,
-} from 'class-validator';
-
-import { FieldMetadataDefaultValue } from 'src/metadata/field-metadata/interfaces/field-metadata-default-value.interface';
-
-import { FieldMetadataService } from 'src/metadata/field-metadata/field-metadata.service';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/metadata/field-metadata/field-metadata.entity';
-import { validateDefaultValueForType } from 'src/metadata/field-metadata/utils/validate-default-value-for-type.util';
-
-@Injectable()
-@ValidatorConstraint({ name: 'isFieldMetadataDefaultValue', async: true })
-export class IsFieldMetadataDefaultValue
-  implements ValidatorConstraintInterface
-{
-  constructor(private readonly fieldMetadataService: FieldMetadataService) {}
-
-  async validate(
-    value: FieldMetadataDefaultValue,
-    args: ValidationArguments,
-  ): Promise<boolean> {
-    // Try to extract type value from the object
-    let type: FieldMetadataType | null = args.object['type'];
-
-    if (!type) {
-      // Extract id value from the instance, should happen only when updating
-      const id: string | undefined = args.instance?.['id'];
-
-      if (!id) {
-        return false;
-      }
-
-      let fieldMetadata: FieldMetadataEntity;
-
-      try {
-        fieldMetadata = await this.fieldMetadataService.findOneOrFail(id);
-      } catch {
-        return false;
-      }
-
-      type = fieldMetadata.type;
-    }
-
-    return validateDefaultValueForType(type, value);
-  }
-
-  defaultMessage(): string {
-    return 'FieldMetadataDefaultValue is not valid';
-  }
-}
diff --git a/packages/twenty-server/src/metadata/field-metadata/validators/is-field-metadata-options.validator.ts b/packages/twenty-server/src/metadata/field-metadata/validators/is-field-metadata-options.validator.ts
deleted file mode 100644
index 74051cb1ff78..000000000000
--- a/packages/twenty-server/src/metadata/field-metadata/validators/is-field-metadata-options.validator.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { ValidationArguments, ValidatorConstraint } from 'class-validator';
-
-import { FieldMetadataOptions } from 'src/metadata/field-metadata/interfaces/field-metadata-options.interface';
-
-import { FieldMetadataService } from 'src/metadata/field-metadata/field-metadata.service';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/metadata/field-metadata/field-metadata.entity';
-import { validateOptionsForType } from 'src/metadata/field-metadata/utils/validate-options-for-type.util';
-
-@Injectable()
-@ValidatorConstraint({ name: 'isFieldMetadataOptions', async: true })
-export class IsFieldMetadataOptions {
-  constructor(private readonly fieldMetadataService: FieldMetadataService) {}
-
-  async validate(
-    value: FieldMetadataOptions,
-    args: ValidationArguments,
-  ): Promise<boolean> {
-    // Try to extract type value from the object
-    let type: FieldMetadataType | null = args.object['type'];
-
-    if (!type) {
-      // Extract id value from the instance, should happen only when updating
-      const id: string | undefined = args.instance?.['id'];
-
-      if (!id) {
-        return false;
-      }
-
-      let fieldMetadata: FieldMetadataEntity;
-
-      try {
-        fieldMetadata = await this.fieldMetadataService.findOneOrFail(id);
-      } catch {
-        return false;
-      }
-
-      type = fieldMetadata.type;
-    }
-
-    return validateOptionsForType(type, value);
-  }
-
-  defaultMessage(): string {
-    return 'FieldMetadataOptions is not valid';
-  }
-}
diff --git a/packages/twenty-server/src/metadata/metadata.module-factory.ts b/packages/twenty-server/src/metadata/metadata.module-factory.ts
deleted file mode 100644
index 7dd0dafede7b..000000000000
--- a/packages/twenty-server/src/metadata/metadata.module-factory.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { YogaDriverConfig } from '@graphql-yoga/nestjs';
-import GraphQLJSON from 'graphql-type-json';
-
-import { CreateContextFactory } from 'src/graphql-config/factories/create-context.factory';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { ExceptionHandlerService } from 'src/integrations/exception-handler/exception-handler.service';
-import { useExceptionHandler } from 'src/integrations/exception-handler/hooks/use-exception-handler.hook';
-import { useThrottler } from 'src/integrations/throttler/hooks/use-throttler';
-import { MetadataModule } from 'src/metadata/metadata.module';
-import { renderApolloPlayground } from 'src/workspace/utils/render-apollo-playground.util';
-
-export const metadataModuleFactory = async (
-  environmentService: EnvironmentService,
-  exceptionHandlerService: ExceptionHandlerService,
-  createContextFactory: CreateContextFactory,
-): Promise<YogaDriverConfig> => {
-  const config: YogaDriverConfig = {
-    context(context) {
-      return createContextFactory.create(context);
-    },
-    autoSchemaFile: true,
-    include: [MetadataModule],
-    renderGraphiQL() {
-      return renderApolloPlayground({ path: 'metadata' });
-    },
-    resolvers: { JSON: GraphQLJSON },
-    plugins: [
-      useThrottler({
-        ttl: environmentService.getApiRateLimitingTtl(),
-        limit: environmentService.getApiRateLimitingLimit(),
-        identifyFn: (context) => {
-          return context.user?.id ?? context.req.ip ?? 'anonymous';
-        },
-      }),
-      useExceptionHandler({
-        exceptionHandlerService,
-      }),
-    ],
-    path: '/metadata',
-  };
-
-  if (environmentService.isDebugMode()) {
-    config.renderGraphiQL = () => {
-      return renderApolloPlayground({ path: 'metadata' });
-    };
-  }
-
-  return config;
-};
diff --git a/packages/twenty-server/src/metadata/metadata.module.ts b/packages/twenty-server/src/metadata/metadata.module.ts
deleted file mode 100644
index 19bade105b32..000000000000
--- a/packages/twenty-server/src/metadata/metadata.module.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Module } from '@nestjs/common';
-import { GraphQLModule } from '@nestjs/graphql';
-
-import { YogaDriverConfig, YogaDriver } from '@graphql-yoga/nestjs';
-
-import { WorkspaceMigrationRunnerModule } from 'src/workspace/workspace-migration-runner/workspace-migration-runner.module';
-import { WorkspaceMigrationModule } from 'src/metadata/workspace-migration/workspace-migration.module';
-import { metadataModuleFactory } from 'src/metadata/metadata.module-factory';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { ExceptionHandlerService } from 'src/integrations/exception-handler/exception-handler.service';
-import { GraphQLConfigModule } from 'src/graphql-config/graphql-config.module';
-import { CreateContextFactory } from 'src/graphql-config/factories/create-context.factory';
-
-import { DataSourceModule } from './data-source/data-source.module';
-import { FieldMetadataModule } from './field-metadata/field-metadata.module';
-import { ObjectMetadataModule } from './object-metadata/object-metadata.module';
-import { RelationMetadataModule } from './relation-metadata/relation-metadata.module';
-
-@Module({
-  imports: [
-    GraphQLModule.forRootAsync<YogaDriverConfig>({
-      driver: YogaDriver,
-      useFactory: metadataModuleFactory,
-      imports: [GraphQLConfigModule],
-      inject: [
-        EnvironmentService,
-        ExceptionHandlerService,
-        CreateContextFactory,
-      ],
-    }),
-    DataSourceModule,
-    FieldMetadataModule,
-    ObjectMetadataModule,
-    WorkspaceMigrationRunnerModule,
-    WorkspaceMigrationModule,
-    RelationMetadataModule,
-  ],
-})
-export class MetadataModule {}
diff --git a/packages/twenty-server/src/metadata/object-metadata/dtos/create-object.input.ts b/packages/twenty-server/src/metadata/object-metadata/dtos/create-object.input.ts
deleted file mode 100644
index 7691925307d1..000000000000
--- a/packages/twenty-server/src/metadata/object-metadata/dtos/create-object.input.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Field, HideField, InputType } from '@nestjs/graphql';
-
-import { BeforeCreateOne } from '@ptc-org/nestjs-query-graphql';
-import { IsNotEmpty, IsOptional, IsString, IsUUID } from 'class-validator';
-
-import { IsValidName } from 'src/metadata/decorators/is-valid-name.decorator';
-import { BeforeCreateOneObject } from 'src/metadata/object-metadata/hooks/before-create-one-object.hook';
-
-@InputType()
-@BeforeCreateOne(BeforeCreateOneObject)
-export class CreateObjectInput {
-  @IsString()
-  @IsNotEmpty()
-  @Field()
-  @IsValidName()
-  nameSingular: string;
-
-  @IsString()
-  @IsNotEmpty()
-  @Field()
-  @IsValidName()
-  namePlural: string;
-
-  @IsString()
-  @IsNotEmpty()
-  @Field()
-  labelSingular: string;
-
-  @IsString()
-  @IsNotEmpty()
-  @Field()
-  labelPlural: string;
-
-  @IsString()
-  @IsOptional()
-  @Field({ nullable: true })
-  description?: string;
-
-  @IsString()
-  @IsOptional()
-  @Field({ nullable: true })
-  icon?: string;
-
-  @HideField()
-  dataSourceId: string;
-
-  @HideField()
-  workspaceId: string;
-
-  @IsUUID()
-  @IsOptional()
-  @Field({ nullable: true })
-  labelIdentifierFieldMetadataId?: string;
-
-  @IsUUID()
-  @IsOptional()
-  @Field({ nullable: true })
-  imageIdentifierFieldMetadataId?: string;
-}
diff --git a/packages/twenty-server/src/metadata/object-metadata/dtos/delete-object.input.ts b/packages/twenty-server/src/metadata/object-metadata/dtos/delete-object.input.ts
deleted file mode 100644
index 9fea1518d2a9..000000000000
--- a/packages/twenty-server/src/metadata/object-metadata/dtos/delete-object.input.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { ID, InputType } from '@nestjs/graphql';
-
-import { BeforeDeleteOne, IDField } from '@ptc-org/nestjs-query-graphql';
-
-import { BeforeDeleteOneObject } from 'src/metadata/object-metadata/hooks/before-delete-one-object.hook';
-
-@InputType()
-@BeforeDeleteOne(BeforeDeleteOneObject)
-export class DeleteOneObjectInput {
-  @IDField(() => ID, { description: 'The id of the record to delete.' })
-  id!: string;
-}
diff --git a/packages/twenty-server/src/metadata/object-metadata/dtos/object-metadata.dto.ts b/packages/twenty-server/src/metadata/object-metadata/dtos/object-metadata.dto.ts
deleted file mode 100644
index 857ff0d64881..000000000000
--- a/packages/twenty-server/src/metadata/object-metadata/dtos/object-metadata.dto.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { ObjectType, ID, Field, HideField } from '@nestjs/graphql';
-
-import {
-  Authorize,
-  BeforeDeleteOne,
-  CursorConnection,
-  FilterableField,
-  IDField,
-  QueryOptions,
-} from '@ptc-org/nestjs-query-graphql';
-
-import { FieldMetadataDTO } from 'src/metadata/field-metadata/dtos/field-metadata.dto';
-import { BeforeDeleteOneObject } from 'src/metadata/object-metadata/hooks/before-delete-one-object.hook';
-
-@ObjectType('object')
-@Authorize({
-  authorize: (context: any) => ({
-    workspaceId: { eq: context?.req?.user?.workspace?.id },
-  }),
-})
-@QueryOptions({
-  defaultResultSize: 10,
-  disableSort: true,
-  maxResultsSize: 1000,
-})
-@BeforeDeleteOne(BeforeDeleteOneObject)
-@CursorConnection('fields', () => FieldMetadataDTO)
-export class ObjectMetadataDTO {
-  @IDField(() => ID)
-  id: string;
-
-  @Field()
-  dataSourceId: string;
-
-  @Field()
-  nameSingular: string;
-
-  @Field()
-  namePlural: string;
-
-  @Field()
-  labelSingular: string;
-
-  @Field()
-  labelPlural: string;
-
-  @Field({ nullable: true })
-  description: string;
-
-  @Field({ nullable: true })
-  icon: string;
-
-  @FilterableField()
-  isCustom: boolean;
-
-  @FilterableField()
-  isActive: boolean;
-
-  @FilterableField()
-  isSystem: boolean;
-
-  @HideField()
-  workspaceId: string;
-
-  @Field()
-  createdAt: Date;
-
-  @Field()
-  updatedAt: Date;
-
-  @Field({ nullable: true })
-  labelIdentifierFieldMetadataId: string;
-
-  @Field({ nullable: true })
-  imageIdentifierFieldMetadataId: string;
-}
diff --git a/packages/twenty-server/src/metadata/object-metadata/object-metadata.module.ts b/packages/twenty-server/src/metadata/object-metadata/object-metadata.module.ts
deleted file mode 100644
index abf4013388ba..000000000000
--- a/packages/twenty-server/src/metadata/object-metadata/object-metadata.module.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import {
-  NestjsQueryGraphQLModule,
-  PagingStrategies,
-} from '@ptc-org/nestjs-query-graphql';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-import { SortDirection } from '@ptc-org/nestjs-query-core';
-
-import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
-import { WorkspaceMigrationRunnerModule } from 'src/workspace/workspace-migration-runner/workspace-migration-runner.module';
-import { WorkspaceMigrationModule } from 'src/metadata/workspace-migration/workspace-migration.module';
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { FieldMetadataEntity } from 'src/metadata/field-metadata/field-metadata.entity';
-import { RelationMetadataEntity } from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { ObjectMetadataResolver } from 'src/metadata/object-metadata/object-metadata.resolver';
-
-import { ObjectMetadataService } from './object-metadata.service';
-import { ObjectMetadataEntity } from './object-metadata.entity';
-
-import { CreateObjectInput } from './dtos/create-object.input';
-import { UpdateObjectInput } from './dtos/update-object.input';
-import { ObjectMetadataDTO } from './dtos/object-metadata.dto';
-
-@Module({
-  imports: [
-    NestjsQueryGraphQLModule.forFeature({
-      imports: [
-        TypeORMModule,
-        NestjsQueryTypeOrmModule.forFeature(
-          [ObjectMetadataEntity, FieldMetadataEntity, RelationMetadataEntity],
-          'metadata',
-        ),
-        DataSourceModule,
-        WorkspaceMigrationModule,
-        WorkspaceMigrationRunnerModule,
-      ],
-      services: [ObjectMetadataService],
-      resolvers: [
-        {
-          EntityClass: ObjectMetadataEntity,
-          DTOClass: ObjectMetadataDTO,
-          CreateDTOClass: CreateObjectInput,
-          UpdateDTOClass: UpdateObjectInput,
-          ServiceClass: ObjectMetadataService,
-          enableTotalCount: true,
-          pagingStrategy: PagingStrategies.CURSOR,
-          read: {
-            defaultSort: [{ field: 'id', direction: SortDirection.DESC }],
-          },
-          create: {
-            many: { disabled: true },
-          },
-          update: {
-            many: { disabled: true },
-          },
-          delete: { disabled: true },
-          guards: [JwtAuthGuard],
-        },
-      ],
-    }),
-  ],
-  providers: [ObjectMetadataService, ObjectMetadataResolver],
-  exports: [ObjectMetadataService],
-})
-export class ObjectMetadataModule {}
diff --git a/packages/twenty-server/src/metadata/object-metadata/object-metadata.resolver.ts b/packages/twenty-server/src/metadata/object-metadata/object-metadata.resolver.ts
deleted file mode 100644
index bb5f050f8dda..000000000000
--- a/packages/twenty-server/src/metadata/object-metadata/object-metadata.resolver.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { UseGuards } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
-
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { AuthWorkspace } from 'src/decorators/auth/auth-workspace.decorator';
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-import { ObjectMetadataDTO } from 'src/metadata/object-metadata/dtos/object-metadata.dto';
-import { DeleteOneObjectInput } from 'src/metadata/object-metadata/dtos/delete-object.input';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
-
-@UseGuards(JwtAuthGuard)
-@Resolver(() => ObjectMetadataDTO)
-export class ObjectMetadataResolver {
-  constructor(private readonly objectMetadataService: ObjectMetadataService) {}
-
-  @Mutation(() => ObjectMetadataDTO)
-  deleteOneObject(
-    @Args('input') input: DeleteOneObjectInput,
-    @AuthWorkspace() { id: workspaceId }: Workspace,
-  ) {
-    return this.objectMetadataService.deleteOneObject(input, workspaceId);
-  }
-}
diff --git a/packages/twenty-server/src/metadata/object-metadata/object-metadata.service.ts b/packages/twenty-server/src/metadata/object-metadata/object-metadata.service.ts
deleted file mode 100644
index e18056139033..000000000000
--- a/packages/twenty-server/src/metadata/object-metadata/object-metadata.service.ts
+++ /dev/null
@@ -1,836 +0,0 @@
-import {
-  BadRequestException,
-  Injectable,
-  NotFoundException,
-} from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import console from 'console';
-
-import { FindManyOptions, FindOneOptions, Repository } from 'typeorm';
-import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
-import { Query, QueryOptions } from '@ptc-org/nestjs-query-core';
-
-import { WorkspaceMigrationService } from 'src/metadata/workspace-migration/workspace-migration.service';
-import { WorkspaceMigrationRunnerService } from 'src/workspace/workspace-migration-runner/workspace-migration-runner.service';
-import {
-  WorkspaceMigrationColumnActionType,
-  WorkspaceMigrationColumnCreate,
-  WorkspaceMigrationColumnDrop,
-  WorkspaceMigrationTableAction,
-} from 'src/metadata/workspace-migration/workspace-migration.entity';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/metadata/field-metadata/field-metadata.entity';
-import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
-import {
-  RelationMetadataEntity,
-  RelationMetadataType,
-  RelationOnDeleteAction,
-} from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { computeCustomName } from 'src/workspace/utils/compute-custom-name.util';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-import { DeleteOneObjectInput } from 'src/metadata/object-metadata/dtos/delete-object.input';
-import { RelationToDelete } from 'src/metadata/relation-metadata/types/relation-to-delete';
-import { generateMigrationName } from 'src/metadata/workspace-migration/utils/generate-migration-name.util';
-
-import { ObjectMetadataEntity } from './object-metadata.entity';
-
-import { CreateObjectInput } from './dtos/create-object.input';
-
-@Injectable()
-export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEntity> {
-  constructor(
-    @InjectRepository(ObjectMetadataEntity, 'metadata')
-    private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
-
-    @InjectRepository(FieldMetadataEntity, 'metadata')
-    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
-
-    @InjectRepository(RelationMetadataEntity, 'metadata')
-    private readonly relationMetadataRepository: Repository<RelationMetadataEntity>,
-
-    private readonly dataSourceService: DataSourceService,
-    private readonly typeORMService: TypeORMService,
-    private readonly workspaceMigrationService: WorkspaceMigrationService,
-    private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
-  ) {
-    super(objectMetadataRepository);
-  }
-
-  override async query(
-    query: Query<ObjectMetadataEntity>,
-    opts?: QueryOptions<ObjectMetadataEntity> | undefined,
-  ): Promise<ObjectMetadataEntity[]> {
-    const start = performance.now();
-
-    const result = super.query(query, opts);
-
-    const end = performance.now();
-
-    console.log(`metadata query time: ${end - start} ms`);
-
-    return result;
-  }
-
-  public async deleteOneObject(
-    input: DeleteOneObjectInput,
-    workspaceId: string,
-  ): Promise<ObjectMetadataEntity> {
-    const objectMetadata = await this.objectMetadataRepository.findOne({
-      relations: [
-        'fromRelations.fromFieldMetadata',
-        'fromRelations.toFieldMetadata',
-        'toRelations.fromFieldMetadata',
-        'toRelations.toFieldMetadata',
-        'fromRelations.fromObjectMetadata',
-        'fromRelations.toObjectMetadata',
-        'toRelations.fromObjectMetadata',
-        'toRelations.toObjectMetadata',
-      ],
-      where: {
-        id: input.id,
-        workspaceId,
-      },
-    });
-
-    if (!objectMetadata) {
-      throw new NotFoundException('Object does not exist');
-    }
-
-    const relationsToDelete: RelationToDelete[] = [];
-
-    // TODO: Most of this logic should be moved to relation-metadata.service.ts
-    for (const relation of [
-      ...objectMetadata.fromRelations,
-      ...objectMetadata.toRelations,
-    ]) {
-      relationsToDelete.push({
-        id: relation.id,
-        fromFieldMetadataId: relation.fromFieldMetadata.id,
-        toFieldMetadataId: relation.toFieldMetadata.id,
-        fromFieldMetadataName: relation.fromFieldMetadata.name,
-        toFieldMetadataName: relation.toFieldMetadata.name,
-        fromObjectMetadataId: relation.fromObjectMetadata.id,
-        toObjectMetadataId: relation.toObjectMetadata.id,
-        fromObjectName: relation.fromObjectMetadata.nameSingular,
-        toObjectName: relation.toObjectMetadata.nameSingular,
-        toFieldMetadataIsCustom: relation.toFieldMetadata.isCustom,
-        toObjectMetadataIsCustom: relation.toObjectMetadata.isCustom,
-        direction:
-          relation.fromObjectMetadata.nameSingular ===
-          objectMetadata.nameSingular
-            ? 'from'
-            : 'to',
-      });
-    }
-
-    await this.relationMetadataRepository.delete(
-      relationsToDelete.map((relation) => relation.id),
-    );
-
-    for (const relationToDelete of relationsToDelete) {
-      const foreignKeyFieldsToDelete = await this.fieldMetadataRepository.find({
-        where: {
-          name: `${relationToDelete.toFieldMetadataName}Id`,
-          objectMetadataId: relationToDelete.toObjectMetadataId,
-          workspaceId,
-        },
-      });
-
-      const foreignKeyFieldsToDeleteIds = foreignKeyFieldsToDelete.map(
-        (field) => field.id,
-      );
-
-      await this.fieldMetadataRepository.delete([
-        ...foreignKeyFieldsToDeleteIds,
-        relationToDelete.fromFieldMetadataId,
-        relationToDelete.toFieldMetadataId,
-      ]);
-
-      if (relationToDelete.direction === 'from') {
-        await this.workspaceMigrationService.createCustomMigration(
-          generateMigrationName(
-            `delete-${relationToDelete.fromObjectName}-${relationToDelete.toObjectName}`,
-          ),
-          workspaceId,
-          [
-            {
-              name: computeCustomName(
-                relationToDelete.toObjectName,
-                relationToDelete.toObjectMetadataIsCustom,
-              ),
-              action: 'alter',
-              columns: [
-                {
-                  action: WorkspaceMigrationColumnActionType.DROP,
-                  columnName: computeCustomName(
-                    `${relationToDelete.toFieldMetadataName}Id`,
-                    relationToDelete.toFieldMetadataIsCustom,
-                  ),
-                } satisfies WorkspaceMigrationColumnDrop,
-              ],
-            },
-          ],
-        );
-      }
-    }
-
-    await this.objectMetadataRepository.delete(objectMetadata.id);
-
-    // DROP TABLE
-    await this.workspaceMigrationService.createCustomMigration(
-      generateMigrationName(`delete-${objectMetadata.nameSingular}`),
-      workspaceId,
-      [
-        {
-          name: computeObjectTargetTable(objectMetadata),
-          action: 'drop',
-        },
-      ],
-    );
-
-    await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
-      workspaceId,
-    );
-
-    return objectMetadata;
-  }
-
-  override async createOne(
-    objectMetadataInput: CreateObjectInput,
-  ): Promise<ObjectMetadataEntity> {
-    const lastDataSourceMetadata =
-      await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
-        objectMetadataInput.workspaceId,
-      );
-
-    if (
-      objectMetadataInput.nameSingular.toLowerCase() ===
-      objectMetadataInput.namePlural.toLowerCase()
-    ) {
-      throw new BadRequestException(
-        'The singular and plural name cannot be the same for an object',
-      );
-    }
-
-    const createdObjectMetadata = await super.createOne({
-      ...objectMetadataInput,
-      dataSourceId: lastDataSourceMetadata.id,
-      targetTableName: 'DEPRECATED',
-      isActive: true,
-      isCustom: true,
-      isSystem: false,
-      fields:
-        // Creating default fields.
-        // No need to create a custom migration for this though as the default columns are already
-        // created with default values which is not supported yet by workspace migrations.
-        [
-          {
-            type: FieldMetadataType.UUID,
-            name: 'id',
-            label: 'Id',
-            targetColumnMap: {
-              value: 'id',
-            },
-            icon: 'Icon123',
-            description: 'Id',
-            isNullable: false,
-            isActive: true,
-            isCustom: false,
-            isSystem: true,
-            workspaceId: objectMetadataInput.workspaceId,
-            defaultValue: { type: 'uuid' },
-          },
-          {
-            type: FieldMetadataType.TEXT,
-            name: 'name',
-            label: 'Name',
-            targetColumnMap: {
-              value: 'name',
-            },
-            icon: 'IconAbc',
-            description: 'Name',
-            isNullable: false,
-            isActive: true,
-            isCustom: false,
-            workspaceId: objectMetadataInput.workspaceId,
-            defaultValue: { value: 'Untitled' },
-          },
-          {
-            type: FieldMetadataType.DATE_TIME,
-            name: 'createdAt',
-            label: 'Creation date',
-            targetColumnMap: {
-              value: 'createdAt',
-            },
-            icon: 'IconCalendar',
-            description: 'Creation date',
-            isNullable: false,
-            isActive: true,
-            isCustom: false,
-            workspaceId: objectMetadataInput.workspaceId,
-            defaultValue: { type: 'now' },
-          },
-          {
-            type: FieldMetadataType.DATE_TIME,
-            name: 'updatedAt',
-            label: 'Update date',
-            targetColumnMap: {
-              value: 'updatedAt',
-            },
-            icon: 'IconCalendar',
-            description: 'Update date',
-            isNullable: false,
-            isActive: true,
-            isCustom: false,
-            isSystem: true,
-            workspaceId: objectMetadataInput.workspaceId,
-            defaultValue: { type: 'now' },
-          },
-          {
-            type: FieldMetadataType.NUMBER,
-            name: 'position',
-            label: 'Position',
-            targetColumnMap: {
-              value: 'position',
-            },
-            icon: 'IconHierarchy2',
-            description: 'Position',
-            isNullable: true,
-            isActive: true,
-            isCustom: false,
-            isSystem: true,
-            workspaceId: objectMetadataInput.workspaceId,
-            defaultValue: null,
-          },
-        ],
-    });
-
-    const { activityTargetObjectMetadata } =
-      await this.createActivityTargetRelation(
-        objectMetadataInput.workspaceId,
-        createdObjectMetadata,
-      );
-
-    const { favoriteObjectMetadata } = await this.createFavoriteRelation(
-      objectMetadataInput.workspaceId,
-      createdObjectMetadata,
-    );
-
-    const { attachmentObjectMetadata } = await this.createAttachmentRelation(
-      objectMetadataInput.workspaceId,
-      createdObjectMetadata,
-    );
-
-    await this.workspaceMigrationService.createCustomMigration(
-      generateMigrationName(`create-${createdObjectMetadata.nameSingular}`),
-      createdObjectMetadata.workspaceId,
-      [
-        {
-          name: computeObjectTargetTable(createdObjectMetadata),
-          action: 'create',
-        } satisfies WorkspaceMigrationTableAction,
-        // Add activity target relation
-        {
-          name: computeObjectTargetTable(activityTargetObjectMetadata),
-          action: 'alter',
-          columns: [
-            {
-              action: WorkspaceMigrationColumnActionType.CREATE,
-              columnName: `${computeObjectTargetTable(
-                createdObjectMetadata,
-              )}Id`,
-              columnType: 'uuid',
-              isNullable: true,
-            } satisfies WorkspaceMigrationColumnCreate,
-          ],
-        },
-        {
-          name: computeObjectTargetTable(activityTargetObjectMetadata),
-          action: 'alter',
-          columns: [
-            {
-              action: WorkspaceMigrationColumnActionType.CREATE_FOREIGN_KEY,
-              columnName: `${computeObjectTargetTable(
-                createdObjectMetadata,
-              )}Id`,
-              referencedTableName: computeObjectTargetTable(
-                createdObjectMetadata,
-              ),
-              referencedTableColumnName: 'id',
-              onDelete: RelationOnDeleteAction.CASCADE,
-            },
-          ],
-        },
-        // Add attachment relation
-        {
-          name: computeObjectTargetTable(attachmentObjectMetadata),
-          action: 'alter',
-          columns: [
-            {
-              action: WorkspaceMigrationColumnActionType.CREATE,
-              columnName: `${computeObjectTargetTable(
-                createdObjectMetadata,
-              )}Id`,
-              columnType: 'uuid',
-              isNullable: true,
-            } satisfies WorkspaceMigrationColumnCreate,
-          ],
-        },
-        {
-          name: computeObjectTargetTable(attachmentObjectMetadata),
-          action: 'alter',
-          columns: [
-            {
-              action: WorkspaceMigrationColumnActionType.CREATE_FOREIGN_KEY,
-              columnName: `${computeObjectTargetTable(
-                createdObjectMetadata,
-              )}Id`,
-              referencedTableName: computeObjectTargetTable(
-                createdObjectMetadata,
-              ),
-              referencedTableColumnName: 'id',
-            },
-          ],
-        },
-        // Add favorite relation
-        {
-          name: computeObjectTargetTable(favoriteObjectMetadata),
-          action: 'alter',
-          columns: [
-            {
-              action: WorkspaceMigrationColumnActionType.CREATE,
-              columnName: `${computeObjectTargetTable(
-                createdObjectMetadata,
-              )}Id`,
-              columnType: 'uuid',
-              isNullable: true,
-            } satisfies WorkspaceMigrationColumnCreate,
-          ],
-        },
-        {
-          name: computeObjectTargetTable(favoriteObjectMetadata),
-          action: 'alter',
-          columns: [
-            {
-              action: WorkspaceMigrationColumnActionType.CREATE_FOREIGN_KEY,
-              columnName: `${computeObjectTargetTable(
-                createdObjectMetadata,
-              )}Id`,
-              referencedTableName: computeObjectTargetTable(
-                createdObjectMetadata,
-              ),
-              referencedTableColumnName: 'id',
-              onDelete: RelationOnDeleteAction.CASCADE,
-            },
-          ],
-        },
-        {
-          name: computeObjectTargetTable(createdObjectMetadata),
-          action: 'alter',
-          columns: [
-            {
-              action: WorkspaceMigrationColumnActionType.CREATE,
-              columnName: 'position',
-              columnType: 'float',
-              isNullable: true,
-            } satisfies WorkspaceMigrationColumnCreate,
-          ],
-        } satisfies WorkspaceMigrationTableAction,
-        // This is temporary until we implement mainIdentifier
-        {
-          name: computeObjectTargetTable(createdObjectMetadata),
-          action: 'alter',
-          columns: [
-            {
-              action: WorkspaceMigrationColumnActionType.CREATE,
-              columnName: 'name',
-              columnType: 'text',
-              defaultValue: "'Untitled'",
-            } satisfies WorkspaceMigrationColumnCreate,
-          ],
-        } satisfies WorkspaceMigrationTableAction,
-      ],
-    );
-
-    await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
-      createdObjectMetadata.workspaceId,
-    );
-
-    const dataSourceMetadata =
-      await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
-        createdObjectMetadata.workspaceId,
-      );
-
-    const workspaceDataSource =
-      await this.typeORMService.connectToDataSource(dataSourceMetadata);
-
-    const view = await workspaceDataSource?.query(
-      `INSERT INTO ${dataSourceMetadata.schema}."view"
-      ("objectMetadataId", "type", "name")
-      VALUES ('${createdObjectMetadata.id}', 'table', 'All ${createdObjectMetadata.namePlural}') RETURNING *`,
-    );
-
-    createdObjectMetadata.fields.map(async (field, index) => {
-      if (field.name === 'id') {
-        return;
-      }
-
-      await workspaceDataSource?.query(
-        `INSERT INTO ${dataSourceMetadata.schema}."viewField"
-      ("fieldMetadataId", "position", "isVisible", "size", "viewId")
-      VALUES ('${field.id}', '${index - 1}', true, 180, '${
-        view[0].id
-      }') RETURNING *`,
-      );
-    });
-
-    return createdObjectMetadata;
-  }
-
-  public async findOneWithinWorkspace(
-    workspaceId: string,
-    options: FindOneOptions<ObjectMetadataEntity>,
-  ): Promise<ObjectMetadataEntity | null> {
-    return this.objectMetadataRepository.findOne({
-      relations: [
-        'fields',
-        'fields.fromRelationMetadata',
-        'fields.toRelationMetadata',
-      ],
-      ...options,
-      where: {
-        ...options.where,
-        workspaceId,
-      },
-    });
-  }
-
-  public async findOneOrFailWithinWorkspace(
-    workspaceId: string,
-    options: FindOneOptions<ObjectMetadataEntity>,
-  ): Promise<ObjectMetadataEntity> {
-    return this.objectMetadataRepository.findOneOrFail({
-      relations: [
-        'fields',
-        'fields.fromRelationMetadata',
-        'fields.toRelationMetadata',
-      ],
-      ...options,
-      where: {
-        ...options.where,
-        workspaceId,
-      },
-    });
-  }
-
-  public async findManyWithinWorkspace(
-    workspaceId: string,
-    options?: FindManyOptions<ObjectMetadataEntity>,
-  ) {
-    return this.objectMetadataRepository.find({
-      relations: [
-        'fields.object',
-        'fields',
-        'fields.fromRelationMetadata',
-        'fields.toRelationMetadata',
-        'fields.fromRelationMetadata.toObjectMetadata',
-      ],
-      ...options,
-      where: {
-        ...options?.where,
-        workspaceId,
-      },
-    });
-  }
-
-  public async findMany(options?: FindManyOptions<ObjectMetadataEntity>) {
-    return this.objectMetadataRepository.find({
-      relations: [
-        'fields',
-        'fields.fromRelationMetadata',
-        'fields.toRelationMetadata',
-        'fields.fromRelationMetadata.toObjectMetadata',
-      ],
-      ...options,
-      where: {
-        ...options?.where,
-      },
-    });
-  }
-
-  public async deleteObjectsMetadata(workspaceId: string) {
-    await this.objectMetadataRepository.delete({ workspaceId });
-  }
-
-  private async createActivityTargetRelation(
-    workspaceId: string,
-    createdObjectMetadata: ObjectMetadataEntity,
-  ) {
-    const activityTargetObjectMetadata =
-      await this.objectMetadataRepository.findOneByOrFail({
-        nameSingular: 'activityTarget',
-        workspaceId: workspaceId,
-      });
-
-    const activityTargetRelationFieldMetadata =
-      await this.fieldMetadataRepository.save([
-        // FROM
-        {
-          objectMetadataId: createdObjectMetadata.id,
-          workspaceId: workspaceId,
-          isCustom: true,
-          isActive: true,
-          type: FieldMetadataType.RELATION,
-          name: 'activityTargets',
-          label: 'Activities',
-          targetColumnMap: {},
-          description: `Activities tied to the ${createdObjectMetadata.labelSingular}`,
-          icon: 'IconCheckbox',
-          isNullable: true,
-        },
-        // TO
-        {
-          objectMetadataId: activityTargetObjectMetadata.id,
-          workspaceId: workspaceId,
-          isCustom: true,
-          isActive: true,
-          type: FieldMetadataType.RELATION,
-          name: createdObjectMetadata.nameSingular,
-          label: createdObjectMetadata.labelSingular,
-          targetColumnMap: {},
-          description: `ActivityTarget ${createdObjectMetadata.labelSingular}`,
-          icon: 'IconBuildingSkyscraper',
-          isNullable: true,
-        },
-        // Foreign key
-        {
-          objectMetadataId: activityTargetObjectMetadata.id,
-          workspaceId: workspaceId,
-          isCustom: true,
-          isActive: true,
-          type: FieldMetadataType.UUID,
-          name: `${createdObjectMetadata.nameSingular}Id`,
-          label: `${createdObjectMetadata.labelSingular} ID (foreign key)`,
-          targetColumnMap: {
-            value: `${computeObjectTargetTable(createdObjectMetadata)}Id`,
-          },
-          description: `ActivityTarget ${createdObjectMetadata.labelSingular} id foreign key`,
-          icon: undefined,
-          isNullable: true,
-          isSystem: true,
-          defaultValue: undefined,
-        },
-      ]);
-
-    const activityTargetRelationFieldMetadataMap =
-      activityTargetRelationFieldMetadata.reduce(
-        (acc, fieldMetadata: FieldMetadataEntity) => {
-          if (fieldMetadata.type === FieldMetadataType.RELATION) {
-            acc[fieldMetadata.objectMetadataId] = fieldMetadata;
-          }
-
-          return acc;
-        },
-        {},
-      );
-
-    await this.relationMetadataRepository.save([
-      {
-        workspaceId: workspaceId,
-        relationType: RelationMetadataType.ONE_TO_MANY,
-        fromObjectMetadataId: createdObjectMetadata.id,
-        toObjectMetadataId: activityTargetObjectMetadata.id,
-        fromFieldMetadataId:
-          activityTargetRelationFieldMetadataMap[createdObjectMetadata.id].id,
-        toFieldMetadataId:
-          activityTargetRelationFieldMetadataMap[
-            activityTargetObjectMetadata.id
-          ].id,
-        onDeleteAction: RelationOnDeleteAction.CASCADE,
-      },
-    ]);
-
-    return { activityTargetObjectMetadata };
-  }
-
-  private async createAttachmentRelation(
-    workspaceId: string,
-    createdObjectMetadata: ObjectMetadataEntity,
-  ) {
-    const attachmentObjectMetadata =
-      await this.objectMetadataRepository.findOneByOrFail({
-        nameSingular: 'attachment',
-        workspaceId: workspaceId,
-      });
-
-    const attachmentRelationFieldMetadata =
-      await this.fieldMetadataRepository.save([
-        // FROM
-        {
-          objectMetadataId: createdObjectMetadata.id,
-          workspaceId: workspaceId,
-          isCustom: true,
-          isActive: true,
-          type: FieldMetadataType.RELATION,
-          name: 'attachments',
-          label: 'Attachments',
-          targetColumnMap: {},
-          description: `Attachments tied to the ${createdObjectMetadata.labelSingular}`,
-          icon: 'IconFileImport',
-          isNullable: true,
-        },
-        // TO
-        {
-          objectMetadataId: attachmentObjectMetadata.id,
-          workspaceId: workspaceId,
-          isCustom: true,
-          isActive: true,
-          type: FieldMetadataType.RELATION,
-          name: createdObjectMetadata.nameSingular,
-          label: createdObjectMetadata.labelSingular,
-          targetColumnMap: {},
-          description: `Attachment ${createdObjectMetadata.labelSingular}`,
-          icon: 'IconBuildingSkyscraper',
-          isNullable: true,
-        },
-        // Foreign key
-        {
-          objectMetadataId: attachmentObjectMetadata.id,
-          workspaceId: workspaceId,
-          isCustom: true,
-          isActive: true,
-          type: FieldMetadataType.UUID,
-          name: `${createdObjectMetadata.nameSingular}Id`,
-          label: `${createdObjectMetadata.labelSingular} ID (foreign key)`,
-          targetColumnMap: {
-            value: `${computeObjectTargetTable(createdObjectMetadata)}Id`,
-          },
-          description: `Attachment ${createdObjectMetadata.labelSingular} id foreign key`,
-          icon: undefined,
-          isNullable: true,
-          isSystem: true,
-          defaultValue: undefined,
-        },
-      ]);
-
-    const attachmentRelationFieldMetadataMap =
-      attachmentRelationFieldMetadata.reduce(
-        (acc, fieldMetadata: FieldMetadataEntity) => {
-          if (fieldMetadata.type === FieldMetadataType.RELATION) {
-            acc[fieldMetadata.objectMetadataId] = fieldMetadata;
-          }
-
-          return acc;
-        },
-        {},
-      );
-
-    await this.relationMetadataRepository.save([
-      {
-        workspaceId: workspaceId,
-        relationType: RelationMetadataType.ONE_TO_MANY,
-        fromObjectMetadataId: createdObjectMetadata.id,
-        toObjectMetadataId: attachmentObjectMetadata.id,
-        fromFieldMetadataId:
-          attachmentRelationFieldMetadataMap[createdObjectMetadata.id].id,
-        toFieldMetadataId:
-          attachmentRelationFieldMetadataMap[attachmentObjectMetadata.id].id,
-      },
-    ]);
-
-    return { attachmentObjectMetadata };
-  }
-
-  private async createFavoriteRelation(
-    workspaceId: string,
-    createdObjectMetadata: ObjectMetadataEntity,
-  ) {
-    const favoriteObjectMetadata =
-      await this.objectMetadataRepository.findOneByOrFail({
-        nameSingular: 'favorite',
-        workspaceId: workspaceId,
-      });
-
-    const favoriteRelationFieldMetadata =
-      await this.fieldMetadataRepository.save([
-        // FROM
-        {
-          objectMetadataId: createdObjectMetadata.id,
-          workspaceId: workspaceId,
-          isCustom: true,
-          isActive: true,
-          type: FieldMetadataType.RELATION,
-          name: 'favorites',
-          label: 'Favorites',
-          targetColumnMap: {},
-          description: `Favorites tied to the ${createdObjectMetadata.labelSingular}`,
-          icon: 'IconHeart',
-          isNullable: true,
-        },
-        // TO
-        {
-          objectMetadataId: favoriteObjectMetadata.id,
-          workspaceId: workspaceId,
-          isCustom: true,
-          isActive: true,
-          type: FieldMetadataType.RELATION,
-          name: createdObjectMetadata.nameSingular,
-          label: createdObjectMetadata.labelSingular,
-          targetColumnMap: {},
-          description: `Favorite ${createdObjectMetadata.labelSingular}`,
-          icon: 'IconBuildingSkyscraper',
-          isNullable: true,
-        },
-        // Foreign key
-        {
-          objectMetadataId: favoriteObjectMetadata.id,
-          workspaceId: workspaceId,
-          isCustom: true,
-          isActive: true,
-          type: FieldMetadataType.UUID,
-          name: `${createdObjectMetadata.nameSingular}Id`,
-          label: `${createdObjectMetadata.labelSingular} ID (foreign key)`,
-          targetColumnMap: {
-            value: `${computeObjectTargetTable(createdObjectMetadata)}Id`,
-          },
-          description: `Favorite ${createdObjectMetadata.labelSingular} id foreign key`,
-          icon: undefined,
-          isNullable: true,
-          isSystem: true,
-          defaultValue: undefined,
-        },
-      ]);
-
-    const favoriteRelationFieldMetadataMap =
-      favoriteRelationFieldMetadata.reduce(
-        (acc, fieldMetadata: FieldMetadataEntity) => {
-          if (fieldMetadata.type === FieldMetadataType.RELATION) {
-            acc[fieldMetadata.objectMetadataId] = fieldMetadata;
-          }
-
-          return acc;
-        },
-        {},
-      );
-
-    await this.relationMetadataRepository.save([
-      {
-        workspaceId: workspaceId,
-        relationType: RelationMetadataType.ONE_TO_MANY,
-        fromObjectMetadataId: createdObjectMetadata.id,
-        toObjectMetadataId: favoriteObjectMetadata.id,
-        fromFieldMetadataId:
-          favoriteRelationFieldMetadataMap[createdObjectMetadata.id].id,
-        toFieldMetadataId:
-          favoriteRelationFieldMetadataMap[favoriteObjectMetadata.id].id,
-        onDeleteAction: RelationOnDeleteAction.CASCADE,
-      },
-    ]);
-
-    return { favoriteObjectMetadata };
-  }
-}
diff --git a/packages/twenty-server/src/metadata/relation-metadata/dtos/relation-metadata.dto.ts b/packages/twenty-server/src/metadata/relation-metadata/dtos/relation-metadata.dto.ts
deleted file mode 100644
index c4ebe77b712d..000000000000
--- a/packages/twenty-server/src/metadata/relation-metadata/dtos/relation-metadata.dto.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import {
-  ObjectType,
-  ID,
-  Field,
-  HideField,
-  registerEnumType,
-} from '@nestjs/graphql';
-
-import { CreateDateColumn, UpdateDateColumn } from 'typeorm';
-import {
-  Authorize,
-  BeforeDeleteOne,
-  IDField,
-  QueryOptions,
-  Relation,
-} from '@ptc-org/nestjs-query-graphql';
-
-import { ObjectMetadataDTO } from 'src/metadata/object-metadata/dtos/object-metadata.dto';
-import { RelationMetadataType } from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { BeforeDeleteOneRelation } from 'src/metadata/relation-metadata/hooks/before-delete-one-field.hook';
-
-registerEnumType(RelationMetadataType, {
-  name: 'RelationMetadataType',
-  description: 'Type of the relation',
-});
-
-@ObjectType('relation')
-@Authorize({
-  authorize: (context: any) => ({
-    workspaceId: { eq: context?.req?.user?.workspace?.id },
-  }),
-})
-@QueryOptions({
-  defaultResultSize: 10,
-  disableFilter: true,
-  disableSort: true,
-  maxResultsSize: 1000,
-})
-@BeforeDeleteOne(BeforeDeleteOneRelation)
-@Relation('fromObjectMetadata', () => ObjectMetadataDTO)
-@Relation('toObjectMetadata', () => ObjectMetadataDTO)
-export class RelationMetadataDTO {
-  @IDField(() => ID)
-  id: string;
-
-  @Field(() => RelationMetadataType)
-  relationType: RelationMetadataType;
-
-  @Field()
-  fromObjectMetadataId: string;
-
-  @Field()
-  toObjectMetadataId: string;
-
-  @Field()
-  fromFieldMetadataId: string;
-
-  @Field()
-  toFieldMetadataId: string;
-
-  @HideField()
-  workspaceId: string;
-
-  @Field()
-  @CreateDateColumn()
-  createdAt: Date;
-
-  @Field()
-  @UpdateDateColumn()
-  updatedAt: Date;
-}
diff --git a/packages/twenty-server/src/metadata/relation-metadata/hooks/before-delete-one-field.hook.ts b/packages/twenty-server/src/metadata/relation-metadata/hooks/before-delete-one-field.hook.ts
deleted file mode 100644
index 457796aedba0..000000000000
--- a/packages/twenty-server/src/metadata/relation-metadata/hooks/before-delete-one-field.hook.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import {
-  BadRequestException,
-  Injectable,
-  UnauthorizedException,
-} from '@nestjs/common';
-
-import {
-  BeforeDeleteOneHook,
-  DeleteOneInputType,
-} from '@ptc-org/nestjs-query-graphql';
-
-import { RelationMetadataService } from 'src/metadata/relation-metadata/relation-metadata.service';
-
-@Injectable()
-export class BeforeDeleteOneRelation implements BeforeDeleteOneHook<any> {
-  constructor(readonly relationMetadataService: RelationMetadataService) {}
-
-  async run(
-    instance: DeleteOneInputType,
-    context: any,
-  ): Promise<DeleteOneInputType> {
-    const workspaceId = context?.req?.user?.workspace?.id;
-
-    if (!workspaceId) {
-      throw new UnauthorizedException();
-    }
-
-    const relationMetadata =
-      await this.relationMetadataService.findOneWithinWorkspace(workspaceId, {
-        where: {
-          id: instance.id.toString(),
-        },
-      });
-
-    if (!relationMetadata) {
-      throw new BadRequestException('Relation does not exist');
-    }
-
-    if (
-      !relationMetadata.toFieldMetadata.isCustom ||
-      !relationMetadata.fromFieldMetadata.isCustom
-    ) {
-      throw new BadRequestException("Standard Relations can't be deleted");
-    }
-
-    if (
-      relationMetadata.toFieldMetadata.isActive ||
-      relationMetadata.fromFieldMetadata.isActive
-    ) {
-      throw new BadRequestException("Active relations can't be deleted");
-    }
-
-    return instance;
-  }
-}
diff --git a/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.module.ts b/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.module.ts
deleted file mode 100644
index 7b2b7b9ef40d..000000000000
--- a/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.module.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import {
-  NestjsQueryGraphQLModule,
-  PagingStrategies,
-} from '@ptc-org/nestjs-query-graphql';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-import { FieldMetadataModule } from 'src/metadata/field-metadata/field-metadata.module';
-import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
-import { WorkspaceMigrationModule } from 'src/metadata/workspace-migration/workspace-migration.module';
-import { WorkspaceMigrationRunnerModule } from 'src/workspace/workspace-migration-runner/workspace-migration-runner.module';
-
-import { RelationMetadataService } from './relation-metadata.service';
-import { RelationMetadataEntity } from './relation-metadata.entity';
-
-import { CreateRelationInput } from './dtos/create-relation.input';
-import { RelationMetadataDTO } from './dtos/relation-metadata.dto';
-
-@Module({
-  imports: [
-    NestjsQueryGraphQLModule.forFeature({
-      imports: [
-        NestjsQueryTypeOrmModule.forFeature(
-          [RelationMetadataEntity],
-          'metadata',
-        ),
-        ObjectMetadataModule,
-        FieldMetadataModule,
-        WorkspaceMigrationRunnerModule,
-        WorkspaceMigrationModule,
-      ],
-      services: [RelationMetadataService],
-      resolvers: [
-        {
-          EntityClass: RelationMetadataEntity,
-          DTOClass: RelationMetadataDTO,
-          ServiceClass: RelationMetadataService,
-          CreateDTOClass: CreateRelationInput,
-          enableTotalCount: true,
-          pagingStrategy: PagingStrategies.CURSOR,
-          create: { many: { disabled: true } },
-          update: { disabled: true },
-          delete: { many: { disabled: true } },
-          guards: [JwtAuthGuard],
-        },
-      ],
-    }),
-  ],
-  providers: [RelationMetadataService],
-  exports: [RelationMetadataService],
-})
-export class RelationMetadataModule {}
diff --git a/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.service.ts b/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.service.ts
deleted file mode 100644
index 44201a362533..000000000000
--- a/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.service.ts
+++ /dev/null
@@ -1,333 +0,0 @@
-import {
-  BadRequestException,
-  ConflictException,
-  Injectable,
-  NotFoundException,
-} from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
-import { FindOneOptions, In, Repository } from 'typeorm';
-import camelCase from 'lodash.camelcase';
-
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
-import { FieldMetadataService } from 'src/metadata/field-metadata/field-metadata.service';
-import { CreateRelationInput } from 'src/metadata/relation-metadata/dtos/create-relation.input';
-import { WorkspaceMigrationRunnerService } from 'src/workspace/workspace-migration-runner/workspace-migration-runner.service';
-import { WorkspaceMigrationService } from 'src/metadata/workspace-migration/workspace-migration.service';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { WorkspaceMigrationColumnActionType } from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { createCustomColumnName } from 'src/metadata/utils/create-custom-column-name.util';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-import { createRelationForeignKeyColumnName } from 'src/metadata/relation-metadata/utils/create-relation-foreign-key-column-name.util';
-import { generateMigrationName } from 'src/metadata/workspace-migration/utils/generate-migration-name.util';
-
-import {
-  RelationMetadataEntity,
-  RelationMetadataType,
-} from './relation-metadata.entity';
-
-@Injectable()
-export class RelationMetadataService extends TypeOrmQueryService<RelationMetadataEntity> {
-  constructor(
-    @InjectRepository(RelationMetadataEntity, 'metadata')
-    private readonly relationMetadataRepository: Repository<RelationMetadataEntity>,
-    private readonly objectMetadataService: ObjectMetadataService,
-    private readonly fieldMetadataService: FieldMetadataService,
-    private readonly workspaceMigrationService: WorkspaceMigrationService,
-    private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
-  ) {
-    super(relationMetadataRepository);
-  }
-
-  override async createOne(
-    relationMetadataInput: CreateRelationInput,
-  ): Promise<RelationMetadataEntity> {
-    const objectMetadataMap = await this.getObjectMetadataMap(
-      relationMetadataInput,
-    );
-
-    await this.validateCreateRelationMetadataInput(
-      relationMetadataInput,
-      objectMetadataMap,
-    );
-
-    // NOTE: this logic is called to create relation through metadata graphql endpoint (so only for custom field relations)
-    const isCustom = true;
-    const baseColumnName = `${camelCase(relationMetadataInput.toName)}Id`;
-    const foreignKeyColumnName = createRelationForeignKeyColumnName(
-      relationMetadataInput.toName,
-      isCustom,
-    );
-
-    const createdFields = await this.fieldMetadataService.createMany([
-      this.createFieldMetadataForRelationMetadata(
-        relationMetadataInput,
-        'from',
-        isCustom,
-      ),
-      this.createFieldMetadataForRelationMetadata(
-        relationMetadataInput,
-        'to',
-        isCustom,
-      ),
-      this.createForeignKeyFieldMetadata(
-        relationMetadataInput,
-        baseColumnName,
-        foreignKeyColumnName,
-      ),
-    ]);
-
-    const createdFieldMap = createdFields.reduce((acc, fieldMetadata) => {
-      if (fieldMetadata.type === FieldMetadataType.RELATION) {
-        acc[fieldMetadata.name] = fieldMetadata;
-      }
-
-      return acc;
-    }, {});
-
-    const createdRelationMetadata = await super.createOne({
-      ...relationMetadataInput,
-      fromFieldMetadataId: createdFieldMap[relationMetadataInput.fromName].id,
-      toFieldMetadataId: createdFieldMap[relationMetadataInput.toName].id,
-    });
-
-    await this.createWorkspaceCustomMigration(
-      relationMetadataInput,
-      objectMetadataMap,
-      foreignKeyColumnName,
-    );
-
-    await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
-      relationMetadataInput.workspaceId,
-    );
-
-    return createdRelationMetadata;
-  }
-
-  private async validateCreateRelationMetadataInput(
-    relationMetadataInput: CreateRelationInput,
-    objectMetadataMap: { [key: string]: ObjectMetadataEntity },
-  ) {
-    if (
-      relationMetadataInput.relationType === RelationMetadataType.MANY_TO_MANY
-    ) {
-      throw new BadRequestException(
-        'Many to many relations are not supported yet',
-      );
-    }
-
-    if (
-      objectMetadataMap[relationMetadataInput.fromObjectMetadataId] ===
-        undefined ||
-      objectMetadataMap[relationMetadataInput.toObjectMetadataId] === undefined
-    ) {
-      throw new NotFoundException(
-        'Can\t find an existing object matching with fromObjectMetadataId or toObjectMetadataId',
-      );
-    }
-
-    await this.checkIfFieldMetadataRelationNameExists(
-      relationMetadataInput,
-      objectMetadataMap,
-      'from',
-    );
-    await this.checkIfFieldMetadataRelationNameExists(
-      relationMetadataInput,
-      objectMetadataMap,
-      'to',
-    );
-  }
-
-  private async checkIfFieldMetadataRelationNameExists(
-    relationMetadataInput: CreateRelationInput,
-    objectMetadataMap: { [key: string]: ObjectMetadataEntity },
-    relationDirection: 'from' | 'to',
-  ) {
-    const fieldAlreadyExists =
-      await this.fieldMetadataService.findOneWithinWorkspace(
-        relationMetadataInput.workspaceId,
-        {
-          where: {
-            name: relationMetadataInput[`${relationDirection}Name`],
-            objectMetadataId:
-              relationMetadataInput[`${relationDirection}ObjectMetadataId`],
-          },
-        },
-      );
-
-    if (fieldAlreadyExists) {
-      throw new ConflictException(
-        `Field on ${
-          objectMetadataMap[
-            relationMetadataInput[`${relationDirection}ObjectMetadataId`]
-          ].nameSingular
-        } already exists`,
-      );
-    }
-  }
-
-  private async createWorkspaceCustomMigration(
-    relationMetadataInput: CreateRelationInput,
-    objectMetadataMap: { [key: string]: ObjectMetadataEntity },
-    foreignKeyColumnName: string,
-  ) {
-    await this.workspaceMigrationService.createCustomMigration(
-      generateMigrationName(`create-${relationMetadataInput.fromName}`),
-      relationMetadataInput.workspaceId,
-      [
-        // Create the column
-        {
-          name: computeObjectTargetTable(
-            objectMetadataMap[relationMetadataInput.toObjectMetadataId],
-          ),
-          action: 'alter',
-          columns: [
-            {
-              action: WorkspaceMigrationColumnActionType.CREATE,
-              columnName: foreignKeyColumnName,
-              columnType: 'uuid',
-              isNullable: true,
-            },
-          ],
-        },
-        // Create the foreignKey
-        {
-          name: computeObjectTargetTable(
-            objectMetadataMap[relationMetadataInput.toObjectMetadataId],
-          ),
-          action: 'alter',
-          columns: [
-            {
-              action: WorkspaceMigrationColumnActionType.CREATE_FOREIGN_KEY,
-              columnName: foreignKeyColumnName,
-              referencedTableName: computeObjectTargetTable(
-                objectMetadataMap[relationMetadataInput.fromObjectMetadataId],
-              ),
-              referencedTableColumnName: 'id',
-              isUnique:
-                relationMetadataInput.relationType ===
-                RelationMetadataType.ONE_TO_ONE,
-            },
-          ],
-        },
-      ],
-    );
-  }
-
-  private createFieldMetadataForRelationMetadata(
-    relationMetadataInput: CreateRelationInput,
-    relationDirection: 'from' | 'to',
-    isCustom: boolean,
-  ) {
-    return {
-      name: relationMetadataInput[`${relationDirection}Name`],
-      label: relationMetadataInput[`${relationDirection}Label`],
-      description: relationMetadataInput[`${relationDirection}Description`],
-      icon: relationMetadataInput[`${relationDirection}Icon`],
-      isCustom: true,
-      targetColumnMap:
-        relationDirection === 'to'
-          ? isCustom
-            ? createCustomColumnName(relationMetadataInput.toName)
-            : relationMetadataInput.toName
-          : {},
-      isActive: true,
-      isNullable: true,
-      type: FieldMetadataType.RELATION,
-      objectMetadataId:
-        relationMetadataInput[`${relationDirection}ObjectMetadataId`],
-      workspaceId: relationMetadataInput.workspaceId,
-    };
-  }
-
-  private createForeignKeyFieldMetadata(
-    relationMetadataInput: CreateRelationInput,
-    baseColumnName: string,
-    foreignKeyColumnName: string,
-  ) {
-    return {
-      name: baseColumnName,
-      label: `${relationMetadataInput.toLabel} Foreign Key`,
-      description: relationMetadataInput.toDescription
-        ? `${relationMetadataInput.toDescription} Foreign Key`
-        : undefined,
-      icon: undefined,
-      isCustom: true,
-      targetColumnMap: { value: foreignKeyColumnName },
-      isActive: true,
-      isNullable: true,
-      isSystem: true,
-      type: FieldMetadataType.UUID,
-      objectMetadataId: relationMetadataInput.toObjectMetadataId,
-      workspaceId: relationMetadataInput.workspaceId,
-    };
-  }
-
-  private async getObjectMetadataMap(
-    relationMetadataInput: CreateRelationInput,
-  ): Promise<{ [key: string]: ObjectMetadataEntity }> {
-    const objectMetadataEntries =
-      await this.objectMetadataService.findManyWithinWorkspace(
-        relationMetadataInput.workspaceId,
-        {
-          where: {
-            id: In([
-              relationMetadataInput.fromObjectMetadataId,
-              relationMetadataInput.toObjectMetadataId,
-            ]),
-          },
-        },
-      );
-
-    return objectMetadataEntries.reduce(
-      (acc, curr) => {
-        acc[curr.id] = curr;
-
-        return acc;
-      },
-      {} as { [key: string]: ObjectMetadataEntity },
-    );
-  }
-
-  public async findOneWithinWorkspace(
-    workspaceId: string,
-    options: FindOneOptions<RelationMetadataEntity>,
-  ) {
-    return this.relationMetadataRepository.findOne({
-      ...options,
-      where: {
-        ...options.where,
-        workspaceId,
-      },
-      relations: ['fromFieldMetadata', 'toFieldMetadata'],
-    });
-  }
-
-  override async deleteOne(id: string): Promise<RelationMetadataEntity> {
-    // TODO: This logic is duplicated with the BeforeDeleteOneRelation hook
-    const relationMetadata = await this.relationMetadataRepository.findOne({
-      where: { id },
-      relations: ['fromFieldMetadata', 'toFieldMetadata'],
-    });
-
-    if (!relationMetadata) {
-      throw new NotFoundException('Relation does not exist');
-    }
-
-    const deletedRelationMetadata = super.deleteOne(id);
-
-    // TODO: Move to a cdc scheduler
-    this.fieldMetadataService.deleteMany({
-      id: {
-        in: [
-          relationMetadata.fromFieldMetadataId,
-          relationMetadata.toFieldMetadataId,
-        ],
-      },
-    });
-
-    return deletedRelationMetadata;
-  }
-}
diff --git a/packages/twenty-server/src/metadata/relation-metadata/utils/create-relation-foreign-key-column-name.util.ts b/packages/twenty-server/src/metadata/relation-metadata/utils/create-relation-foreign-key-column-name.util.ts
deleted file mode 100644
index efd5278cb234..000000000000
--- a/packages/twenty-server/src/metadata/relation-metadata/utils/create-relation-foreign-key-column-name.util.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { createCustomColumnName } from 'src/metadata/utils/create-custom-column-name.util';
-import { camelCase } from 'src/utils/camel-case';
-
-export const createRelationForeignKeyColumnName = (
-  name: string,
-  isCustom: boolean,
-) => {
-  const baseColumnName = `${camelCase(name)}Id`;
-
-  const foreignKeyColumnName = isCustom
-    ? createCustomColumnName(baseColumnName)
-    : baseColumnName;
-
-  return foreignKeyColumnName;
-};
diff --git a/packages/twenty-server/src/metadata/utils/create-custom-column-name.util.ts b/packages/twenty-server/src/metadata/utils/create-custom-column-name.util.ts
deleted file mode 100644
index 2eb4674e44b7..000000000000
--- a/packages/twenty-server/src/metadata/utils/create-custom-column-name.util.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const createCustomColumnName = (name: string) => {
-  return `_${name}`;
-};
diff --git a/packages/twenty-server/src/metadata/workspace-cache-version/workspace-cache-version.module.ts b/packages/twenty-server/src/metadata/workspace-cache-version/workspace-cache-version.module.ts
deleted file mode 100644
index 3eaa886ec2ac..000000000000
--- a/packages/twenty-server/src/metadata/workspace-cache-version/workspace-cache-version.module.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { WorkspaceCacheVersionEntity } from 'src/metadata/workspace-cache-version/workspace-cache-version.entity';
-import { WorkspaceCacheVersionService } from 'src/metadata/workspace-cache-version/workspace-cache-version.service';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([WorkspaceCacheVersionEntity], 'metadata'),
-  ],
-  exports: [WorkspaceCacheVersionService],
-  providers: [WorkspaceCacheVersionService],
-})
-export class WorkspaceCacheVersionModule {}
diff --git a/packages/twenty-server/src/metadata/workspace-migration/factories/basic-column-action.factory.ts b/packages/twenty-server/src/metadata/workspace-migration/factories/basic-column-action.factory.ts
deleted file mode 100644
index 46d515adbccc..000000000000
--- a/packages/twenty-server/src/metadata/workspace-migration/factories/basic-column-action.factory.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { WorkspaceColumnActionOptions } from 'src/metadata/workspace-migration/interfaces/workspace-column-action-options.interface';
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-import { FieldMetadataDefaultValue } from 'src/metadata/field-metadata/interfaces/field-metadata-default-value.interface';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import {
-  WorkspaceMigrationColumnActionType,
-  WorkspaceMigrationColumnAlter,
-  WorkspaceMigrationColumnCreate,
-} from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { serializeDefaultValue } from 'src/metadata/field-metadata/utils/serialize-default-value';
-import { fieldMetadataTypeToColumnType } from 'src/metadata/workspace-migration/utils/field-metadata-type-to-column-type.util';
-import { ColumnActionAbstractFactory } from 'src/metadata/workspace-migration/factories/column-action-abstract.factory';
-
-export type BasicFieldMetadataType =
-  | FieldMetadataType.UUID
-  | FieldMetadataType.TEXT
-  | FieldMetadataType.PHONE
-  | FieldMetadataType.EMAIL
-  | FieldMetadataType.NUMERIC
-  | FieldMetadataType.NUMBER
-  | FieldMetadataType.PROBABILITY
-  | FieldMetadataType.BOOLEAN
-  | FieldMetadataType.DATE_TIME;
-
-@Injectable()
-export class BasicColumnActionFactory extends ColumnActionAbstractFactory<BasicFieldMetadataType> {
-  protected readonly logger = new Logger(BasicColumnActionFactory.name);
-
-  protected handleCreateAction(
-    fieldMetadata: FieldMetadataInterface<BasicFieldMetadataType>,
-    options?: WorkspaceColumnActionOptions,
-  ): WorkspaceMigrationColumnCreate {
-    const defaultValue =
-      this.getDefaultValue(fieldMetadata.defaultValue) ?? options?.defaultValue;
-    const serializedDefaultValue = serializeDefaultValue(defaultValue);
-
-    return {
-      action: WorkspaceMigrationColumnActionType.CREATE,
-      columnName: fieldMetadata.targetColumnMap.value,
-      columnType: fieldMetadataTypeToColumnType(fieldMetadata.type),
-      isNullable: fieldMetadata.isNullable,
-      defaultValue: serializedDefaultValue,
-    };
-  }
-
-  protected handleAlterAction(
-    currentFieldMetadata: FieldMetadataInterface<BasicFieldMetadataType>,
-    alteredFieldMetadata: FieldMetadataInterface<BasicFieldMetadataType>,
-    options?: WorkspaceColumnActionOptions,
-  ): WorkspaceMigrationColumnAlter {
-    const defaultValue =
-      this.getDefaultValue(alteredFieldMetadata.defaultValue) ??
-      options?.defaultValue;
-    const serializedDefaultValue = serializeDefaultValue(defaultValue);
-    const currentColumnName = currentFieldMetadata.targetColumnMap.value;
-    const alteredColumnName = alteredFieldMetadata.targetColumnMap.value;
-
-    if (!currentColumnName || !alteredColumnName) {
-      this.logger.error(
-        `Column name not found for current or altered field metadata, can be due to a missing or an invalid target column map. Current column name: ${currentColumnName}, Altered column name: ${alteredColumnName}.`,
-      );
-      throw new Error(
-        `Column name not found for current or altered field metadata`,
-      );
-    }
-
-    return {
-      action: WorkspaceMigrationColumnActionType.ALTER,
-      currentColumnDefinition: {
-        columnName: currentColumnName,
-        columnType: fieldMetadataTypeToColumnType(currentFieldMetadata.type),
-        isNullable: currentFieldMetadata.isNullable,
-        defaultValue: serializeDefaultValue(
-          this.getDefaultValue(currentFieldMetadata.defaultValue),
-        ),
-      },
-      alteredColumnDefinition: {
-        columnName: alteredColumnName,
-        columnType: fieldMetadataTypeToColumnType(alteredFieldMetadata.type),
-        isNullable: alteredFieldMetadata.isNullable,
-        defaultValue: serializedDefaultValue,
-      },
-    };
-  }
-
-  private getDefaultValue(
-    defaultValue:
-      | FieldMetadataDefaultValue<BasicFieldMetadataType>
-      | undefined
-      | null,
-  ) {
-    if (!defaultValue) return null;
-
-    if ('type' in defaultValue) {
-      return defaultValue;
-    } else {
-      return defaultValue?.value;
-    }
-  }
-}
diff --git a/packages/twenty-server/src/metadata/workspace-migration/factories/column-action-abstract.factory.ts b/packages/twenty-server/src/metadata/workspace-migration/factories/column-action-abstract.factory.ts
deleted file mode 100644
index b4e4bbac2d16..000000000000
--- a/packages/twenty-server/src/metadata/workspace-migration/factories/column-action-abstract.factory.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import { Logger } from '@nestjs/common';
-
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-import { WorkspaceColumnActionOptions } from 'src/metadata/workspace-migration/interfaces/workspace-column-action-options.interface';
-import { WorkspaceColumnActionFactory } from 'src/metadata/workspace-migration/interfaces/workspace-column-action-factory.interface';
-
-import {
-  WorkspaceMigrationColumnActionType,
-  WorkspaceMigrationColumnAction,
-  WorkspaceMigrationColumnCreate,
-  WorkspaceMigrationColumnAlter,
-} from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-export class ColumnActionAbstractFactory<
-  T extends FieldMetadataType | 'default',
-> implements WorkspaceColumnActionFactory<T>
-{
-  protected readonly logger = new Logger(ColumnActionAbstractFactory.name);
-
-  create(
-    action:
-      | WorkspaceMigrationColumnActionType.CREATE
-      | WorkspaceMigrationColumnActionType.ALTER,
-    currentFieldMetadata: FieldMetadataInterface<T> | undefined,
-    alteredFieldMetadata: FieldMetadataInterface<T>,
-    options?: WorkspaceColumnActionOptions,
-  ): WorkspaceMigrationColumnAction {
-    switch (action) {
-      case WorkspaceMigrationColumnActionType.CREATE:
-        return this.handleCreateAction(alteredFieldMetadata, options);
-      case WorkspaceMigrationColumnActionType.ALTER: {
-        if (!currentFieldMetadata) {
-          throw new Error('current field metadata is required for alter');
-        }
-
-        return this.handleAlterAction(
-          currentFieldMetadata,
-          alteredFieldMetadata,
-          options,
-        );
-      }
-      default: {
-        this.logger.error(`Invalid action: ${action}`);
-
-        throw new Error('[AbstractFactory]: invalid action');
-      }
-    }
-  }
-
-  protected handleCreateAction(
-    _fieldMetadata: FieldMetadataInterface<T>,
-    _options?: WorkspaceColumnActionOptions,
-  ): WorkspaceMigrationColumnCreate {
-    throw new Error('handleCreateAction method not implemented.');
-  }
-
-  protected handleAlterAction(
-    _currentFieldMetadata: FieldMetadataInterface<T>,
-    _alteredFieldMetadata: FieldMetadataInterface<T>,
-    _options?: WorkspaceColumnActionOptions,
-  ): WorkspaceMigrationColumnAlter {
-    throw new Error('handleAlterAction method not implemented.');
-  }
-}
diff --git a/packages/twenty-server/src/metadata/workspace-migration/factories/enum-column-action.factory.ts b/packages/twenty-server/src/metadata/workspace-migration/factories/enum-column-action.factory.ts
deleted file mode 100644
index 991899e45d7c..000000000000
--- a/packages/twenty-server/src/metadata/workspace-migration/factories/enum-column-action.factory.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { WorkspaceColumnActionOptions } from 'src/metadata/workspace-migration/interfaces/workspace-column-action-options.interface';
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import {
-  WorkspaceMigrationColumnActionType,
-  WorkspaceMigrationColumnAlter,
-  WorkspaceMigrationColumnCreate,
-} from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { serializeDefaultValue } from 'src/metadata/field-metadata/utils/serialize-default-value';
-import { fieldMetadataTypeToColumnType } from 'src/metadata/workspace-migration/utils/field-metadata-type-to-column-type.util';
-import { ColumnActionAbstractFactory } from 'src/metadata/workspace-migration/factories/column-action-abstract.factory';
-
-export type EnumFieldMetadataType =
-  | FieldMetadataType.RATING
-  | FieldMetadataType.SELECT
-  | FieldMetadataType.MULTI_SELECT;
-
-@Injectable()
-export class EnumColumnActionFactory extends ColumnActionAbstractFactory<EnumFieldMetadataType> {
-  protected readonly logger = new Logger(EnumColumnActionFactory.name);
-
-  protected handleCreateAction(
-    fieldMetadata: FieldMetadataInterface<EnumFieldMetadataType>,
-    options: WorkspaceColumnActionOptions,
-  ): WorkspaceMigrationColumnCreate {
-    const defaultValue =
-      fieldMetadata.defaultValue?.value ?? options?.defaultValue;
-    const serializedDefaultValue = serializeDefaultValue(defaultValue);
-    const enumOptions = fieldMetadata.options
-      ? [...fieldMetadata.options.map((option) => option.value)]
-      : undefined;
-
-    return {
-      action: WorkspaceMigrationColumnActionType.CREATE,
-      columnName: fieldMetadata.targetColumnMap.value,
-      columnType: fieldMetadataTypeToColumnType(fieldMetadata.type),
-      enum: enumOptions,
-      isArray: fieldMetadata.type === FieldMetadataType.MULTI_SELECT,
-      isNullable: fieldMetadata.isNullable,
-      defaultValue: serializedDefaultValue,
-    };
-  }
-
-  protected handleAlterAction(
-    currentFieldMetadata: FieldMetadataInterface<EnumFieldMetadataType>,
-    alteredFieldMetadata: FieldMetadataInterface<EnumFieldMetadataType>,
-    options: WorkspaceColumnActionOptions,
-  ): WorkspaceMigrationColumnAlter {
-    const defaultValue =
-      alteredFieldMetadata.defaultValue?.value ?? options?.defaultValue;
-    const serializedDefaultValue = serializeDefaultValue(defaultValue);
-
-    const enumOptions = alteredFieldMetadata.options
-      ? [
-          ...alteredFieldMetadata.options.map((option) => {
-            const currentOption = currentFieldMetadata.options?.find(
-              (currentOption) => currentOption.id === option.id,
-            );
-
-            // The id is the same, but the value is different, so we need to alter the enum
-            if (currentOption && currentOption.value !== option.value) {
-              return {
-                from: currentOption.value,
-                to: option.value,
-              };
-            }
-
-            return option.value;
-          }),
-        ]
-      : undefined;
-    const currentColumnName = currentFieldMetadata.targetColumnMap.value;
-    const alteredColumnName = alteredFieldMetadata.targetColumnMap.value;
-
-    if (!currentColumnName || !alteredColumnName) {
-      this.logger.error(
-        `Column name not found for current or altered field metadata, can be due to a missing or an invalid target column map. Current column name: ${currentColumnName}, Altered column name: ${alteredColumnName}.`,
-      );
-      throw new Error(
-        `Column name not found for current or altered field metadata`,
-      );
-    }
-
-    return {
-      action: WorkspaceMigrationColumnActionType.ALTER,
-      currentColumnDefinition: {
-        columnName: currentColumnName,
-        columnType: fieldMetadataTypeToColumnType(currentFieldMetadata.type),
-        enum: currentFieldMetadata.options
-          ? [...currentFieldMetadata.options.map((option) => option.value)]
-          : undefined,
-        isArray: currentFieldMetadata.type === FieldMetadataType.MULTI_SELECT,
-        isNullable: currentFieldMetadata.isNullable,
-        defaultValue: serializeDefaultValue(
-          currentFieldMetadata.defaultValue?.value,
-        ),
-      },
-      alteredColumnDefinition: {
-        columnName: alteredColumnName,
-        columnType: fieldMetadataTypeToColumnType(alteredFieldMetadata.type),
-        enum: enumOptions,
-        isArray: alteredFieldMetadata.type === FieldMetadataType.MULTI_SELECT,
-        isNullable: alteredFieldMetadata.isNullable,
-        defaultValue: serializedDefaultValue,
-      },
-    };
-  }
-}
diff --git a/packages/twenty-server/src/metadata/workspace-migration/factories/factories.ts b/packages/twenty-server/src/metadata/workspace-migration/factories/factories.ts
deleted file mode 100644
index 6083cd0ebe8a..000000000000
--- a/packages/twenty-server/src/metadata/workspace-migration/factories/factories.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { BasicColumnActionFactory } from 'src/metadata/workspace-migration/factories/basic-column-action.factory';
-import { EnumColumnActionFactory } from 'src/metadata/workspace-migration/factories/enum-column-action.factory';
-
-export const workspaceColumnActionFactories = [
-  BasicColumnActionFactory,
-  EnumColumnActionFactory,
-];
diff --git a/packages/twenty-server/src/metadata/workspace-migration/interfaces/workspace-column-action-factory.interface.ts b/packages/twenty-server/src/metadata/workspace-migration/interfaces/workspace-column-action-factory.interface.ts
deleted file mode 100644
index 44c05d029472..000000000000
--- a/packages/twenty-server/src/metadata/workspace-migration/interfaces/workspace-column-action-factory.interface.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { WorkspaceColumnActionOptions } from 'src/metadata/workspace-migration/interfaces/workspace-column-action-options.interface';
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import {
-  WorkspaceMigrationColumnActionType,
-  WorkspaceMigrationColumnAction,
-} from 'src/metadata/workspace-migration/workspace-migration.entity';
-
-export interface WorkspaceColumnActionFactory<
-  T extends FieldMetadataType | 'default',
-> {
-  create(
-    action:
-      | WorkspaceMigrationColumnActionType.CREATE
-      | WorkspaceMigrationColumnActionType.ALTER,
-    currentFieldMetadata: FieldMetadataInterface<T> | undefined,
-    alteredFieldMetadata: FieldMetadataInterface<T>,
-    options?: WorkspaceColumnActionOptions,
-  ): WorkspaceMigrationColumnAction;
-}
diff --git a/packages/twenty-server/src/metadata/workspace-migration/workspace-migration.entity.ts b/packages/twenty-server/src/metadata/workspace-migration/workspace-migration.entity.ts
deleted file mode 100644
index e47bd2ecfbd9..000000000000
--- a/packages/twenty-server/src/metadata/workspace-migration/workspace-migration.entity.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  PrimaryGeneratedColumn,
-} from 'typeorm';
-
-import { RelationOnDeleteAction } from 'src/metadata/relation-metadata/relation-metadata.entity';
-
-export enum WorkspaceMigrationColumnActionType {
-  CREATE = 'CREATE',
-  ALTER = 'ALTER',
-  CREATE_FOREIGN_KEY = 'CREATE_FOREIGN_KEY',
-  DROP_FOREIGN_KEY = 'DROP_FOREIGN_KEY',
-  DROP = 'DROP',
-}
-
-export type WorkspaceMigrationEnum = string | { from: string; to: string };
-
-export interface WorkspaceMigrationColumnDefinition {
-  columnName: string;
-  columnType: string;
-  enum?: WorkspaceMigrationEnum[];
-  isArray?: boolean;
-  isNullable?: boolean;
-  defaultValue?: any;
-}
-
-export interface WorkspaceMigrationColumnCreate
-  extends WorkspaceMigrationColumnDefinition {
-  action: WorkspaceMigrationColumnActionType.CREATE;
-}
-
-export type WorkspaceMigrationColumnAlter = {
-  action: WorkspaceMigrationColumnActionType.ALTER;
-  currentColumnDefinition: WorkspaceMigrationColumnDefinition;
-  alteredColumnDefinition: WorkspaceMigrationColumnDefinition;
-};
-
-export type WorkspaceMigrationColumnCreateRelation = {
-  action: WorkspaceMigrationColumnActionType.CREATE_FOREIGN_KEY;
-  columnName: string;
-  referencedTableName: string;
-  referencedTableColumnName: string;
-  isUnique?: boolean;
-  onDelete?: RelationOnDeleteAction;
-};
-
-export type WorkspaceMigrationColumnDropRelation = {
-  action: WorkspaceMigrationColumnActionType.DROP_FOREIGN_KEY;
-  columnName: string;
-};
-
-export type WorkspaceMigrationColumnDrop = {
-  action: WorkspaceMigrationColumnActionType.DROP;
-  columnName: string;
-};
-
-export type WorkspaceMigrationColumnAction = {
-  action: WorkspaceMigrationColumnActionType;
-} & (
-  | WorkspaceMigrationColumnCreate
-  | WorkspaceMigrationColumnAlter
-  | WorkspaceMigrationColumnCreateRelation
-  | WorkspaceMigrationColumnDropRelation
-  | WorkspaceMigrationColumnDrop
-);
-
-export type WorkspaceMigrationTableAction = {
-  name: string;
-  action: 'create' | 'alter' | 'drop';
-  columns?: WorkspaceMigrationColumnAction[];
-};
-
-@Entity('workspaceMigration')
-export class WorkspaceMigrationEntity {
-  @PrimaryGeneratedColumn('uuid')
-  id: string;
-
-  @Column({ nullable: true, type: 'jsonb' })
-  migrations: WorkspaceMigrationTableAction[];
-
-  @Column({ nullable: false })
-  name: string;
-
-  @Column({ default: false })
-  isCustom: boolean;
-
-  @Column({ nullable: true })
-  appliedAt?: Date;
-
-  @Column({ nullable: false, type: 'uuid' })
-  workspaceId: string;
-
-  @CreateDateColumn()
-  createdAt: Date;
-}
diff --git a/packages/twenty-server/src/metadata/workspace-migration/workspace-migration.factory.ts b/packages/twenty-server/src/metadata/workspace-migration/workspace-migration.factory.ts
deleted file mode 100644
index 8d2aa7ba8099..000000000000
--- a/packages/twenty-server/src/metadata/workspace-migration/workspace-migration.factory.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { WorkspaceColumnActionFactory } from 'src/metadata/workspace-migration/interfaces/workspace-column-action-factory.interface';
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-import { WorkspaceColumnActionOptions } from 'src/metadata/workspace-migration/interfaces/workspace-column-action-options.interface';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { BasicColumnActionFactory } from 'src/metadata/workspace-migration/factories/basic-column-action.factory';
-import { EnumColumnActionFactory } from 'src/metadata/workspace-migration/factories/enum-column-action.factory';
-import {
-  WorkspaceMigrationColumnAction,
-  WorkspaceMigrationColumnActionType,
-} from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { isCompositeFieldMetadataType } from 'src/metadata/field-metadata/utils/is-composite-field-metadata-type.util';
-import { compositeDefinitions } from 'src/metadata/field-metadata/composite-types';
-
-@Injectable()
-export class WorkspaceMigrationFactory {
-  private readonly logger = new Logger(WorkspaceMigrationFactory.name);
-  private factoriesMap: Map<
-    FieldMetadataType,
-    {
-      factory: WorkspaceColumnActionFactory<any>;
-      options?: WorkspaceColumnActionOptions;
-    }
-  >;
-
-  constructor(
-    private readonly basicColumnActionFactory: BasicColumnActionFactory,
-    private readonly enumColumnActionFactory: EnumColumnActionFactory,
-  ) {
-    this.factoriesMap = new Map<
-      FieldMetadataType,
-      {
-        factory: WorkspaceColumnActionFactory<any>;
-        options?: WorkspaceColumnActionOptions;
-      }
-    >([
-      [FieldMetadataType.UUID, { factory: this.basicColumnActionFactory }],
-      [
-        FieldMetadataType.TEXT,
-        {
-          factory: this.basicColumnActionFactory,
-          options: {
-            defaultValue: '',
-          },
-        },
-      ],
-      [
-        FieldMetadataType.PHONE,
-        {
-          factory: this.basicColumnActionFactory,
-          options: {
-            defaultValue: '',
-          },
-        },
-      ],
-      [
-        FieldMetadataType.EMAIL,
-        {
-          factory: this.basicColumnActionFactory,
-          options: {
-            defaultValue: '',
-          },
-        },
-      ],
-      [FieldMetadataType.NUMERIC, { factory: this.basicColumnActionFactory }],
-      [FieldMetadataType.NUMBER, { factory: this.basicColumnActionFactory }],
-      [
-        FieldMetadataType.PROBABILITY,
-        { factory: this.basicColumnActionFactory },
-      ],
-      [FieldMetadataType.BOOLEAN, { factory: this.basicColumnActionFactory }],
-      [FieldMetadataType.DATE_TIME, { factory: this.basicColumnActionFactory }],
-      [FieldMetadataType.RATING, { factory: this.enumColumnActionFactory }],
-      [FieldMetadataType.SELECT, { factory: this.enumColumnActionFactory }],
-      [
-        FieldMetadataType.MULTI_SELECT,
-        { factory: this.enumColumnActionFactory },
-      ],
-    ]);
-  }
-
-  createColumnActions(
-    action: WorkspaceMigrationColumnActionType.CREATE,
-    fieldMetadata: FieldMetadataInterface,
-  ): WorkspaceMigrationColumnAction[];
-
-  createColumnActions(
-    action: WorkspaceMigrationColumnActionType.ALTER,
-    currentFieldMetadata: FieldMetadataInterface,
-    alteredFieldMetadata: FieldMetadataInterface,
-  ): WorkspaceMigrationColumnAction[];
-
-  createColumnActions(
-    action:
-      | WorkspaceMigrationColumnActionType.CREATE
-      | WorkspaceMigrationColumnActionType.ALTER,
-    fieldMetadataOrCurrentFieldMetadata: FieldMetadataInterface,
-    undefinedOrAlteredFieldMetadata?: FieldMetadataInterface,
-  ): WorkspaceMigrationColumnAction[] {
-    const currentFieldMetadata =
-      action === WorkspaceMigrationColumnActionType.ALTER
-        ? fieldMetadataOrCurrentFieldMetadata
-        : undefined;
-    const alteredFieldMetadata =
-      action === WorkspaceMigrationColumnActionType.CREATE
-        ? fieldMetadataOrCurrentFieldMetadata
-        : undefinedOrAlteredFieldMetadata;
-
-    if (!alteredFieldMetadata) {
-      this.logger.error(
-        `No field metadata provided for action ${action}`,
-        undefinedOrAlteredFieldMetadata,
-      );
-
-      throw new Error(`No field metadata provided for action ${action}`);
-    }
-
-    // If it's a composite field type, we need to create a column action for each of the fields
-    if (isCompositeFieldMetadataType(alteredFieldMetadata.type)) {
-      const fieldMetadataSplitterFunction = compositeDefinitions.get(
-        alteredFieldMetadata.type,
-      );
-
-      if (!fieldMetadataSplitterFunction) {
-        this.logger.error(
-          `No composite definition found for type ${alteredFieldMetadata.type}`,
-          {
-            alteredFieldMetadata,
-          },
-        );
-
-        throw new Error(
-          `No composite definition found for type ${alteredFieldMetadata.type}`,
-        );
-      }
-
-      const fieldMetadataCollection =
-        fieldMetadataSplitterFunction(alteredFieldMetadata);
-
-      return fieldMetadataCollection.map((fieldMetadata) =>
-        this.createColumnAction(action, fieldMetadata, fieldMetadata),
-      );
-    }
-
-    // Otherwise, we create a single column action
-    const columnAction = this.createColumnAction(
-      action,
-      currentFieldMetadata,
-      alteredFieldMetadata,
-    );
-
-    return [columnAction];
-  }
-
-  private createColumnAction(
-    action:
-      | WorkspaceMigrationColumnActionType.CREATE
-      | WorkspaceMigrationColumnActionType.ALTER,
-    currentFieldMetadata: FieldMetadataInterface | undefined,
-    alteredFieldMetadata: FieldMetadataInterface,
-  ): WorkspaceMigrationColumnAction {
-    const { factory, options } =
-      this.factoriesMap.get(alteredFieldMetadata.type) ?? {};
-
-    if (!factory) {
-      this.logger.error(
-        `No factory found for type ${alteredFieldMetadata.type}`,
-        {
-          alteredFieldMetadata,
-        },
-      );
-
-      throw new Error(`No factory found for type ${alteredFieldMetadata.type}`);
-    }
-
-    return factory.create(
-      action,
-      currentFieldMetadata,
-      alteredFieldMetadata,
-      options,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/metadata/workspace-migration/workspace-migration.module.ts b/packages/twenty-server/src/metadata/workspace-migration/workspace-migration.module.ts
deleted file mode 100644
index 50661b2e8c55..000000000000
--- a/packages/twenty-server/src/metadata/workspace-migration/workspace-migration.module.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { workspaceColumnActionFactories } from 'src/metadata/workspace-migration/factories/factories';
-import { WorkspaceMigrationFactory } from 'src/metadata/workspace-migration/workspace-migration.factory';
-
-import { WorkspaceMigrationService } from './workspace-migration.service';
-import { WorkspaceMigrationEntity } from './workspace-migration.entity';
-
-@Module({
-  imports: [TypeOrmModule.forFeature([WorkspaceMigrationEntity], 'metadata')],
-  providers: [
-    ...workspaceColumnActionFactories,
-    WorkspaceMigrationFactory,
-    WorkspaceMigrationService,
-  ],
-  exports: [WorkspaceMigrationFactory, WorkspaceMigrationService],
-})
-export class WorkspaceMigrationModule {}
diff --git a/packages/twenty-server/src/modules/activity/standard-objects/activity-target.object-metadata.ts b/packages/twenty-server/src/modules/activity/standard-objects/activity-target.object-metadata.ts
new file mode 100644
index 000000000000..69986a503188
--- /dev/null
+++ b/packages/twenty-server/src/modules/activity/standard-objects/activity-target.object-metadata.ts
@@ -0,0 +1,79 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { activityTargetStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { CustomObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/custom-objects/custom.object-metadata';
+import { DynamicRelationFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/dynamic-field-metadata.interface';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { ActivityObjectMetadata } from 'src/modules/activity/standard-objects/activity.object-metadata';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
+import { OpportunityObjectMetadata } from 'src/modules/opportunity/standard-objects/opportunity.object-metadata';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.activityTarget,
+  namePlural: 'activityTargets',
+  labelSingular: 'Activity Target',
+  labelPlural: 'Activity Targets',
+  description: 'An activity target',
+  icon: 'IconCheckbox',
+})
+@IsSystem()
+export class ActivityTargetObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: activityTargetStandardFieldIds.activity,
+    type: FieldMetadataType.RELATION,
+    label: 'Activity',
+    description: 'ActivityTarget activity',
+    icon: 'IconNotes',
+    joinColumn: 'activityId',
+  })
+  @IsNullable()
+  activity: ActivityObjectMetadata;
+
+  @FieldMetadata({
+    standardId: activityTargetStandardFieldIds.person,
+    type: FieldMetadataType.RELATION,
+    label: 'Person',
+    description: 'ActivityTarget person',
+    icon: 'IconUser',
+    joinColumn: 'personId',
+  })
+  @IsNullable()
+  person: PersonObjectMetadata;
+
+  @FieldMetadata({
+    standardId: activityTargetStandardFieldIds.company,
+    type: FieldMetadataType.RELATION,
+    label: 'Company',
+    description: 'ActivityTarget company',
+    icon: 'IconBuildingSkyscraper',
+    joinColumn: 'companyId',
+  })
+  @IsNullable()
+  company: CompanyObjectMetadata;
+
+  @FieldMetadata({
+    standardId: activityTargetStandardFieldIds.opportunity,
+    type: FieldMetadataType.RELATION,
+    label: 'Opportunity',
+    description: 'ActivityTarget opportunity',
+    icon: 'IconTargetArrow',
+    joinColumn: 'opportunityId',
+  })
+  @IsNullable()
+  opportunity: OpportunityObjectMetadata;
+
+  @DynamicRelationFieldMetadata((oppositeObjectMetadata) => ({
+    standardId: activityTargetStandardFieldIds.custom,
+    name: oppositeObjectMetadata.nameSingular,
+    label: oppositeObjectMetadata.labelSingular,
+    description: `ActivityTarget ${oppositeObjectMetadata.labelSingular}`,
+    joinColumn: `${oppositeObjectMetadata.nameSingular}Id`,
+    icon: 'IconBuildingSkyscraper',
+  }))
+  custom: CustomObjectMetadata;
+}
diff --git a/packages/twenty-server/src/modules/activity/standard-objects/activity.object-metadata.ts b/packages/twenty-server/src/modules/activity/standard-objects/activity.object-metadata.ts
new file mode 100644
index 000000000000..8a49be75f45d
--- /dev/null
+++ b/packages/twenty-server/src/modules/activity/standard-objects/activity.object-metadata.ts
@@ -0,0 +1,153 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { activityStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
+import { ActivityTargetObjectMetadata } from 'src/modules/activity/standard-objects/activity-target.object-metadata';
+import { AttachmentObjectMetadata } from 'src/modules/attachment/standard-objects/attachment.object-metadata';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { CommentObjectMetadata } from 'src/modules/activity/standard-objects/comment.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.activity,
+  namePlural: 'activities',
+  labelSingular: 'Activity',
+  labelPlural: 'Activities',
+  description: 'An activity',
+  icon: 'IconCheckbox',
+})
+@IsSystem()
+export class ActivityObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: activityStandardFieldIds.title,
+    type: FieldMetadataType.TEXT,
+    label: 'Title',
+    description: 'Activity title',
+    icon: 'IconNotes',
+  })
+  title: string;
+
+  @FieldMetadata({
+    standardId: activityStandardFieldIds.body,
+    type: FieldMetadataType.TEXT,
+    label: 'Body',
+    description: 'Activity body',
+    icon: 'IconList',
+  })
+  body: string;
+
+  @FieldMetadata({
+    standardId: activityStandardFieldIds.type,
+    type: FieldMetadataType.TEXT,
+    label: 'Type',
+    description: 'Activity type',
+    icon: 'IconCheckbox',
+    defaultValue: "'Note'",
+  })
+  type: string;
+
+  @FieldMetadata({
+    standardId: activityStandardFieldIds.reminderAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Reminder Date',
+    description: 'Activity reminder date',
+    icon: 'IconCalendarEvent',
+  })
+  @IsNullable()
+  reminderAt: Date;
+
+  @FieldMetadata({
+    standardId: activityStandardFieldIds.dueAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Due Date',
+    description: 'Activity due date',
+    icon: 'IconCalendarEvent',
+  })
+  @IsNullable()
+  dueAt: Date;
+
+  @FieldMetadata({
+    standardId: activityStandardFieldIds.completedAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Completion Date',
+    description: 'Activity completion date',
+    icon: 'IconCheck',
+  })
+  @IsNullable()
+  completedAt: Date;
+
+  @FieldMetadata({
+    standardId: activityStandardFieldIds.activityTargets,
+    type: FieldMetadataType.RELATION,
+    label: 'Targets',
+    description: 'Activity targets',
+    icon: 'IconCheckbox',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => ActivityTargetObjectMetadata,
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  @IsNullable()
+  activityTargets: ActivityTargetObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: activityStandardFieldIds.attachments,
+    type: FieldMetadataType.RELATION,
+    label: 'Attachments',
+    description: 'Activity attachments',
+    icon: 'IconFileImport',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => AttachmentObjectMetadata,
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  @IsNullable()
+  attachments: AttachmentObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: activityStandardFieldIds.comments,
+    type: FieldMetadataType.RELATION,
+    label: 'Comments',
+    description: 'Activity comments',
+    icon: 'IconComment',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => CommentObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  comments: CommentObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: activityStandardFieldIds.author,
+    type: FieldMetadataType.RELATION,
+    label: 'Author',
+    description: 'Activity author',
+    icon: 'IconUserCircle',
+    joinColumn: 'authorId',
+  })
+  @IsNullable()
+  author: WorkspaceMemberObjectMetadata;
+
+  @FieldMetadata({
+    standardId: activityStandardFieldIds.assignee,
+    type: FieldMetadataType.RELATION,
+    label: 'Assignee',
+    description: 'Activity assignee',
+    icon: 'IconUserCircle',
+    joinColumn: 'assigneeId',
+  })
+  @IsNullable()
+  assignee: WorkspaceMemberObjectMetadata;
+}
diff --git a/packages/twenty-server/src/modules/activity/standard-objects/comment.object-metadata.ts b/packages/twenty-server/src/modules/activity/standard-objects/comment.object-metadata.ts
new file mode 100644
index 000000000000..374751a21813
--- /dev/null
+++ b/packages/twenty-server/src/modules/activity/standard-objects/comment.object-metadata.ts
@@ -0,0 +1,49 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { commentStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { ActivityObjectMetadata } from 'src/modules/activity/standard-objects/activity.object-metadata';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.comment,
+  namePlural: 'comments',
+  labelSingular: 'Comment',
+  labelPlural: 'Comments',
+  description: 'A comment',
+  icon: 'IconMessageCircle',
+})
+@IsSystem()
+export class CommentObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: commentStandardFieldIds.body,
+    type: FieldMetadataType.TEXT,
+    label: 'Body',
+    description: 'Comment body',
+    icon: 'IconLink',
+  })
+  body: string;
+
+  @FieldMetadata({
+    standardId: commentStandardFieldIds.author,
+    type: FieldMetadataType.RELATION,
+    label: 'Author',
+    description: 'Comment author',
+    icon: 'IconCircleUser',
+    joinColumn: 'authorId',
+  })
+  author: WorkspaceMemberObjectMetadata;
+
+  @FieldMetadata({
+    standardId: commentStandardFieldIds.activity,
+    type: FieldMetadataType.RELATION,
+    label: 'Activity',
+    description: 'Comment activity',
+    icon: 'IconNotes',
+    joinColumn: 'activityId',
+  })
+  activity: ActivityObjectMetadata;
+}
diff --git a/packages/twenty-server/src/modules/api-key/standard-objects/api-key.object-metadata.ts b/packages/twenty-server/src/modules/api-key/standard-objects/api-key.object-metadata.ts
new file mode 100644
index 000000000000..cc62e90a6c7d
--- /dev/null
+++ b/packages/twenty-server/src/modules/api-key/standard-objects/api-key.object-metadata.ts
@@ -0,0 +1,47 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { apiKeyStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.apiKey,
+  namePlural: 'apiKeys',
+  labelSingular: 'Api Key',
+  labelPlural: 'Api Keys',
+  description: 'An api key',
+  icon: 'IconRobot',
+})
+@IsSystem()
+export class ApiKeyObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: apiKeyStandardFieldIds.name,
+    type: FieldMetadataType.TEXT,
+    label: 'Name',
+    description: 'ApiKey name',
+    icon: 'IconLink',
+  })
+  name: string;
+
+  @FieldMetadata({
+    standardId: apiKeyStandardFieldIds.expiresAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Expiration date',
+    description: 'ApiKey expiration date',
+    icon: 'IconCalendar',
+  })
+  expiresAt: Date;
+
+  @FieldMetadata({
+    standardId: apiKeyStandardFieldIds.revokedAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Revocation date',
+    description: 'ApiKey revocation date',
+    icon: 'IconCalendar',
+  })
+  @IsNullable()
+  revokedAt?: Date;
+}
diff --git a/packages/twenty-server/src/modules/attachment/standard-objects/attachment.object-metadata.ts b/packages/twenty-server/src/modules/attachment/standard-objects/attachment.object-metadata.ts
new file mode 100644
index 000000000000..26f410665e6d
--- /dev/null
+++ b/packages/twenty-server/src/modules/attachment/standard-objects/attachment.object-metadata.ts
@@ -0,0 +1,117 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { attachmentStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { CustomObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/custom-objects/custom.object-metadata';
+import { DynamicRelationFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/dynamic-field-metadata.interface';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { ActivityObjectMetadata } from 'src/modules/activity/standard-objects/activity.object-metadata';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
+import { OpportunityObjectMetadata } from 'src/modules/opportunity/standard-objects/opportunity.object-metadata';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.attachment,
+  namePlural: 'attachments',
+  labelSingular: 'Attachment',
+  labelPlural: 'Attachments',
+  description: 'An attachment',
+  icon: 'IconFileImport',
+})
+@IsSystem()
+export class AttachmentObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: attachmentStandardFieldIds.name,
+    type: FieldMetadataType.TEXT,
+    label: 'Name',
+    description: 'Attachment name',
+    icon: 'IconFileUpload',
+  })
+  name: string;
+
+  @FieldMetadata({
+    standardId: attachmentStandardFieldIds.fullPath,
+    type: FieldMetadataType.TEXT,
+    label: 'Full path',
+    description: 'Attachment full path',
+    icon: 'IconLink',
+  })
+  fullPath: string;
+
+  @FieldMetadata({
+    standardId: attachmentStandardFieldIds.type,
+    type: FieldMetadataType.TEXT,
+    label: 'Type',
+    description: 'Attachment type',
+    icon: 'IconList',
+  })
+  type: string;
+
+  @FieldMetadata({
+    standardId: attachmentStandardFieldIds.author,
+    type: FieldMetadataType.RELATION,
+    label: 'Author',
+    description: 'Attachment author',
+    icon: 'IconCircleUser',
+    joinColumn: 'authorId',
+  })
+  author: WorkspaceMemberObjectMetadata;
+
+  @FieldMetadata({
+    standardId: attachmentStandardFieldIds.activity,
+    type: FieldMetadataType.RELATION,
+    label: 'Activity',
+    description: 'Attachment activity',
+    icon: 'IconNotes',
+    joinColumn: 'activityId',
+  })
+  @IsNullable()
+  activity: ActivityObjectMetadata;
+
+  @FieldMetadata({
+    standardId: attachmentStandardFieldIds.person,
+    type: FieldMetadataType.RELATION,
+    label: 'Person',
+    description: 'Attachment person',
+    icon: 'IconUser',
+    joinColumn: 'personId',
+  })
+  @IsNullable()
+  person: PersonObjectMetadata;
+
+  @FieldMetadata({
+    standardId: attachmentStandardFieldIds.company,
+    type: FieldMetadataType.RELATION,
+    label: 'Company',
+    description: 'Attachment company',
+    icon: 'IconBuildingSkyscraper',
+    joinColumn: 'companyId',
+  })
+  @IsNullable()
+  company: CompanyObjectMetadata;
+
+  @FieldMetadata({
+    standardId: attachmentStandardFieldIds.opportunity,
+    type: FieldMetadataType.RELATION,
+    label: 'Opportunity',
+    description: 'Attachment opportunity',
+    icon: 'IconBuildingSkyscraper',
+    joinColumn: 'opportunityId',
+  })
+  @IsNullable()
+  opportunity: OpportunityObjectMetadata;
+
+  @DynamicRelationFieldMetadata((oppositeObjectMetadata) => ({
+    standardId: attachmentStandardFieldIds.custom,
+    name: oppositeObjectMetadata.nameSingular,
+    label: oppositeObjectMetadata.labelSingular,
+    description: `Attachment ${oppositeObjectMetadata.labelSingular}`,
+    joinColumn: `${oppositeObjectMetadata.nameSingular}Id`,
+    icon: 'IconBuildingSkyscraper',
+  }))
+  custom: CustomObjectMetadata;
+}
diff --git a/packages/twenty-server/src/modules/calendar/calendar.module.ts b/packages/twenty-server/src/modules/calendar/calendar.module.ts
new file mode 100644
index 000000000000..a41cda848cd6
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/calendar.module.ts
@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+
+import { CalendarChannelListener } from 'src/modules/calendar/listeners/calendar-channel.listener';
+
+@Module({
+  imports: [],
+  providers: [CalendarChannelListener],
+  exports: [],
+})
+export class CalendarModule {}
diff --git a/packages/twenty-server/src/modules/calendar/commands/google-calendar-sync.command.ts b/packages/twenty-server/src/modules/calendar/commands/google-calendar-sync.command.ts
new file mode 100644
index 000000000000..fcd11fe349f9
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/commands/google-calendar-sync.command.ts
@@ -0,0 +1,83 @@
+import { Inject } from '@nestjs/common';
+
+import { Command, CommandRunner, Option } from 'nest-commander';
+
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
+import {
+  GoogleCalendarSyncJobData,
+  GoogleCalendarSyncJob,
+} from 'src/modules/calendar/jobs/google-calendar-sync.job';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { CalendarChannelRepository } from 'src/modules/calendar/repositories/calendar-channel.repository';
+import { CalendarChannelObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
+
+interface GoogleCalendarSyncOptions {
+  workspaceId: string;
+}
+
+@Command({
+  name: 'workspace:google-calendar-sync',
+  description:
+    'Start google calendar sync for all workspaceMembers in a workspace.',
+})
+export class GoogleCalendarSyncCommand extends CommandRunner {
+  constructor(
+    @Inject(MessageQueue.messagingQueue)
+    private readonly messageQueueService: MessageQueueService,
+    @InjectObjectMetadataRepository(ConnectedAccountObjectMetadata)
+    private readonly connectedAccountRepository: ConnectedAccountRepository,
+    @InjectObjectMetadataRepository(CalendarChannelObjectMetadata)
+    private readonly calendarChannelRepository: CalendarChannelRepository,
+  ) {
+    super();
+  }
+
+  async run(
+    _passedParam: string[],
+    options: GoogleCalendarSyncOptions,
+  ): Promise<void> {
+    await this.fetchWorkspaceCalendars(options.workspaceId);
+
+    return;
+  }
+
+  @Option({
+    flags: '-w, --workspace-id [workspace_id]',
+    description: 'workspace id',
+    required: true,
+  })
+  parseWorkspaceId(value: string): string {
+    return value;
+  }
+
+  private async fetchWorkspaceCalendars(workspaceId: string): Promise<void> {
+    const connectedAccounts =
+      await this.connectedAccountRepository.getAll(workspaceId);
+
+    for (const connectedAccount of connectedAccounts) {
+      const calendarChannel =
+        await this.calendarChannelRepository.getFirstByConnectedAccountId(
+          connectedAccount.id,
+          workspaceId,
+        );
+
+      if (!calendarChannel?.isSyncEnabled) {
+        continue;
+      }
+
+      await this.messageQueueService.add<GoogleCalendarSyncJobData>(
+        GoogleCalendarSyncJob.name,
+        {
+          workspaceId,
+          connectedAccountId: connectedAccount.id,
+        },
+        {
+          retryLimit: 2,
+        },
+      );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/commands/start-google-calendar-sync.cron.command.ts b/packages/twenty-server/src/modules/calendar/commands/start-google-calendar-sync.cron.command.ts
new file mode 100644
index 000000000000..a0f867659a0a
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/commands/start-google-calendar-sync.cron.command.ts
@@ -0,0 +1,31 @@
+import { Inject } from '@nestjs/common';
+
+import { Command, CommandRunner } from 'nest-commander';
+
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { GoogleCalendarSyncCronJob } from 'src/modules/calendar/jobs/crons/google-calendar-sync.cron.job';
+import { googleCalendarSyncCronPattern } from 'src/modules/calendar/jobs/crons/pattern/google-calendar-sync.cron.pattern';
+
+@Command({
+  name: 'cron:calendar:google-calendar-sync',
+  description: 'Starts a cron job to sync google calendar for all workspaces.',
+})
+export class StartGoogleCalendarSyncCronJobCommand extends CommandRunner {
+  constructor(
+    @Inject(MessageQueue.cronQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {
+    super();
+  }
+
+  async run(): Promise<void> {
+    await this.messageQueueService.addCron<undefined>(
+      GoogleCalendarSyncCronJob.name,
+      undefined,
+      {
+        repeat: { pattern: googleCalendarSyncCronPattern },
+      },
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/commands/workspace-calendar-sync-commands.module.ts b/packages/twenty-server/src/modules/calendar/commands/workspace-calendar-sync-commands.module.ts
new file mode 100644
index 000000000000..c3fa4544f04b
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/commands/workspace-calendar-sync-commands.module.ts
@@ -0,0 +1,14 @@
+import { Module } from '@nestjs/common';
+
+import { GoogleCalendarSyncCommand } from 'src/modules/calendar/commands/google-calendar-sync.command';
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { StartGoogleCalendarSyncCronJobCommand } from 'src/modules/calendar/commands/start-google-calendar-sync.cron.command';
+
+@Module({
+  imports: [
+    ObjectMetadataRepositoryModule.forFeature([ConnectedAccountObjectMetadata]),
+  ],
+  providers: [GoogleCalendarSyncCommand, StartGoogleCalendarSyncCronJobCommand],
+})
+export class WorkspaceCalendarSyncCommandsModule {}
diff --git a/packages/twenty-server/src/modules/calendar/jobs/calendar-create-company-and-contact-after-sync.job.ts b/packages/twenty-server/src/modules/calendar/jobs/calendar-create-company-and-contact-after-sync.job.ts
new file mode 100644
index 000000000000..4220a2443e72
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/jobs/calendar-create-company-and-contact-after-sync.job.ts
@@ -0,0 +1,73 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { CalendarChannelRepository } from 'src/modules/calendar/repositories/calendar-channel.repository';
+import { CalendarEventParticipantRepository } from 'src/modules/calendar/repositories/calendar-event-participant.repository';
+import { CalendarChannelObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
+import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+import { CreateCompanyAndContactService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/services/create-company-and-contact.service';
+
+export type CalendarCreateCompanyAndContactAfterSyncJobData = {
+  workspaceId: string;
+  calendarChannelId: string;
+};
+
+@Injectable()
+export class CalendarCreateCompanyAndContactAfterSyncJob
+  implements MessageQueueJob<CalendarCreateCompanyAndContactAfterSyncJobData>
+{
+  private readonly logger = new Logger(
+    CalendarCreateCompanyAndContactAfterSyncJob.name,
+  );
+  constructor(
+    private readonly createCompanyAndContactService: CreateCompanyAndContactService,
+    @InjectObjectMetadataRepository(CalendarChannelObjectMetadata)
+    private readonly calendarChannelService: CalendarChannelRepository,
+    @InjectObjectMetadataRepository(CalendarEventParticipantObjectMetadata)
+    private readonly calendarEventParticipantRepository: CalendarEventParticipantRepository,
+  ) {}
+
+  async handle(
+    data: CalendarCreateCompanyAndContactAfterSyncJobData,
+  ): Promise<void> {
+    this.logger.log(
+      `create contacts and companies after sync for workspace ${data.workspaceId} and calendarChannel ${data.calendarChannelId}`,
+    );
+    const { workspaceId, calendarChannelId } = data;
+
+    const calendarChannels = await this.calendarChannelService.getByIds(
+      [calendarChannelId],
+      workspaceId,
+    );
+
+    if (calendarChannels.length === 0) {
+      throw new Error(
+        `Calendar channel with id ${calendarChannelId} not found in workspace ${workspaceId}`,
+      );
+    }
+
+    const { handle, isContactAutoCreationEnabled } = calendarChannels[0];
+
+    if (!isContactAutoCreationEnabled || !handle) {
+      return;
+    }
+
+    const calendarEventParticipantsWithoutPersonIdAndWorkspaceMemberId =
+      await this.calendarEventParticipantRepository.getByCalendarChannelIdWithoutPersonIdAndWorkspaceMemberId(
+        calendarChannelId,
+        workspaceId,
+      );
+
+    await this.createCompanyAndContactService.createCompaniesAndContactsAndUpdateParticipants(
+      handle,
+      calendarEventParticipantsWithoutPersonIdAndWorkspaceMemberId,
+      workspaceId,
+    );
+
+    this.logger.log(
+      `create contacts and companies after sync for workspace ${data.workspaceId} and calendarChannel ${data.calendarChannelId} done`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/jobs/crons/google-calendar-sync.cron.job.ts b/packages/twenty-server/src/modules/calendar/jobs/crons/google-calendar-sync.cron.job.ts
new file mode 100644
index 000000000000..3db394f82804
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/jobs/crons/google-calendar-sync.cron.job.ts
@@ -0,0 +1,82 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository, In } from 'typeorm';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import {
+  FeatureFlagEntity,
+  FeatureFlagKeys,
+} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { CalendarChannelRepository } from 'src/modules/calendar/repositories/calendar-channel.repository';
+import { CalendarChannelObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
+import { GoogleCalendarSyncService } from 'src/modules/calendar/services/google-calendar-sync.service';
+
+@Injectable()
+export class GoogleCalendarSyncCronJob implements MessageQueueJob<undefined> {
+  constructor(
+    @InjectRepository(Workspace, 'core')
+    private readonly workspaceRepository: Repository<Workspace>,
+    @InjectRepository(DataSourceEntity, 'metadata')
+    private readonly dataSourceRepository: Repository<DataSourceEntity>,
+    @InjectObjectMetadataRepository(CalendarChannelObjectMetadata)
+    private readonly calendarChannelRepository: CalendarChannelRepository,
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+    private readonly googleCalendarSyncService: GoogleCalendarSyncService,
+  ) {}
+
+  async handle(): Promise<void> {
+    const workspaceIds = (
+      await this.workspaceRepository.find({
+        where: {
+          subscriptionStatus: 'active',
+        },
+        select: ['id'],
+      })
+    ).map((workspace) => workspace.id);
+
+    const workspacesWithFeatureFlagActive =
+      await this.featureFlagRepository.find({
+        where: {
+          workspaceId: In(workspaceIds),
+          key: FeatureFlagKeys.IsCalendarEnabled,
+          value: true,
+        },
+      });
+
+    const dataSources = await this.dataSourceRepository.find({
+      where: {
+        workspaceId: In(
+          workspacesWithFeatureFlagActive.map((w) => w.workspaceId),
+        ),
+      },
+    });
+
+    const workspaceIdsWithDataSources = new Set(
+      dataSources.map((dataSource) => dataSource.workspaceId),
+    );
+
+    for (const workspaceId of workspaceIdsWithDataSources) {
+      await this.startWorkspaceGoogleCalendarSync(workspaceId);
+    }
+  }
+
+  private async startWorkspaceGoogleCalendarSync(
+    workspaceId: string,
+  ): Promise<void> {
+    const calendarChannels =
+      await this.calendarChannelRepository.getAll(workspaceId);
+
+    for (const calendarChannel of calendarChannels) {
+      await this.googleCalendarSyncService.startGoogleCalendarSync(
+        workspaceId,
+        calendarChannel.connectedAccountId,
+      );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/jobs/crons/pattern/google-calendar-sync.cron.pattern.ts b/packages/twenty-server/src/modules/calendar/jobs/crons/pattern/google-calendar-sync.cron.pattern.ts
new file mode 100644
index 000000000000..2a0d3f7449df
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/jobs/crons/pattern/google-calendar-sync.cron.pattern.ts
@@ -0,0 +1 @@
+export const googleCalendarSyncCronPattern = '*/5 * * * *';
diff --git a/packages/twenty-server/src/modules/calendar/jobs/delete-connected-account-associated-calendar-data.job.ts b/packages/twenty-server/src/modules/calendar/jobs/delete-connected-account-associated-calendar-data.job.ts
new file mode 100644
index 000000000000..2d41ada2fa43
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/jobs/delete-connected-account-associated-calendar-data.job.ts
@@ -0,0 +1,40 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { CalendarEventCleanerService } from 'src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.service';
+
+export type DeleteConnectedAccountAssociatedCalendarDataJobData = {
+  workspaceId: string;
+  connectedAccountId: string;
+};
+
+@Injectable()
+export class DeleteConnectedAccountAssociatedCalendarDataJob
+  implements
+    MessageQueueJob<DeleteConnectedAccountAssociatedCalendarDataJobData>
+{
+  private readonly logger = new Logger(
+    DeleteConnectedAccountAssociatedCalendarDataJob.name,
+  );
+
+  constructor(
+    private readonly calendarEventCleanerService: CalendarEventCleanerService,
+  ) {}
+
+  async handle(
+    data: DeleteConnectedAccountAssociatedCalendarDataJobData,
+  ): Promise<void> {
+    this.logger.log(
+      `Deleting connected account ${data.connectedAccountId} associated calendar data in workspace ${data.workspaceId}`,
+    );
+
+    await this.calendarEventCleanerService.cleanWorkspaceCalendarEvents(
+      data.workspaceId,
+    );
+
+    this.logger.log(
+      `Deleted connected account ${data.connectedAccountId} associated calendar data in workspace ${data.workspaceId}`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/jobs/google-calendar-sync.job.ts b/packages/twenty-server/src/modules/calendar/jobs/google-calendar-sync.job.ts
new file mode 100644
index 000000000000..08019f4201b5
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/jobs/google-calendar-sync.job.ts
@@ -0,0 +1,47 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { GoogleAPIRefreshAccessTokenService } from 'src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.service';
+import { GoogleCalendarSyncService } from 'src/modules/calendar/services/google-calendar-sync.service';
+
+export type GoogleCalendarSyncJobData = {
+  workspaceId: string;
+  connectedAccountId: string;
+};
+
+@Injectable()
+export class GoogleCalendarSyncJob
+  implements MessageQueueJob<GoogleCalendarSyncJobData>
+{
+  private readonly logger = new Logger(GoogleCalendarSyncJob.name);
+
+  constructor(
+    private readonly googleAPIsRefreshAccessTokenService: GoogleAPIRefreshAccessTokenService,
+    private readonly googleCalendarSyncService: GoogleCalendarSyncService,
+  ) {}
+
+  async handle(data: GoogleCalendarSyncJobData): Promise<void> {
+    this.logger.log(
+      `google calendar sync for workspace ${data.workspaceId} and account ${data.connectedAccountId}`,
+    );
+    try {
+      await this.googleAPIsRefreshAccessTokenService.refreshAndSaveAccessToken(
+        data.workspaceId,
+        data.connectedAccountId,
+      );
+    } catch (e) {
+      this.logger.error(
+        `Error refreshing access token for connected account ${data.connectedAccountId} in workspace ${data.workspaceId}`,
+        e,
+      );
+
+      return;
+    }
+
+    await this.googleCalendarSyncService.startGoogleCalendarSync(
+      data.workspaceId,
+      data.connectedAccountId,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/listeners/calendar-channel.listener.ts b/packages/twenty-server/src/modules/calendar/listeners/calendar-channel.listener.ts
new file mode 100644
index 000000000000..5d1ee4e212c4
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/listeners/calendar-channel.listener.ts
@@ -0,0 +1,41 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+
+import { ObjectRecordUpdateEvent } from 'src/engine/integrations/event-emitter/types/object-record-update.event';
+import { objectRecordChangedProperties } from 'src/engine/integrations/event-emitter/utils/object-record-changed-properties.util';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import {
+  CalendarCreateCompanyAndContactAfterSyncJobData,
+  CalendarCreateCompanyAndContactAfterSyncJob,
+} from 'src/modules/calendar/jobs/calendar-create-company-and-contact-after-sync.job';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+
+@Injectable()
+export class CalendarChannelListener {
+  constructor(
+    @Inject(MessageQueue.messagingQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {}
+
+  @OnEvent('calendarChannel.updated')
+  async handleUpdatedEvent(
+    payload: ObjectRecordUpdateEvent<MessageChannelObjectMetadata>,
+  ) {
+    if (
+      objectRecordChangedProperties(
+        payload.details.before,
+        payload.details.after,
+      ).includes('isContactAutoCreationEnabled') &&
+      payload.details.after.isContactAutoCreationEnabled
+    ) {
+      await this.messageQueueService.add<CalendarCreateCompanyAndContactAfterSyncJobData>(
+        CalendarCreateCompanyAndContactAfterSyncJob.name,
+        {
+          workspaceId: payload.workspaceId,
+          calendarChannelId: payload.recordId,
+        },
+      );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/query-hooks/calendar-event/calendar-event-find-many.pre-query.hook.ts b/packages/twenty-server/src/modules/calendar/query-hooks/calendar-event/calendar-event-find-many.pre-query.hook.ts
new file mode 100644
index 000000000000..115d4cbe3f3d
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/query-hooks/calendar-event/calendar-event-find-many.pre-query.hook.ts
@@ -0,0 +1,52 @@
+import {
+  BadRequestException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+
+import { WorkspacePreQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface';
+import { FindManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata';
+import { CalendarChannelEventAssociationRepository } from 'src/modules/calendar/repositories/calendar-channel-event-association.repository';
+import { CanAccessCalendarEventService } from 'src/modules/calendar/query-hooks/calendar-event/services/can-access-calendar-event.service';
+
+@Injectable()
+export class CalendarEventFindManyPreQueryHook
+  implements WorkspacePreQueryHook
+{
+  constructor(
+    @InjectObjectMetadataRepository(
+      CalendarChannelEventAssociationObjectMetadata,
+    )
+    private readonly calendarChannelEventAssociationRepository: CalendarChannelEventAssociationRepository,
+    private readonly canAccessCalendarEventService: CanAccessCalendarEventService,
+  ) {}
+
+  async execute(
+    userId: string,
+    workspaceId: string,
+    payload: FindManyResolverArgs,
+  ): Promise<void> {
+    if (!payload?.filter?.id?.eq) {
+      throw new BadRequestException('id filter is required');
+    }
+
+    const calendarChannelCalendarEventAssociations =
+      await this.calendarChannelEventAssociationRepository.getByCalendarEventIds(
+        [payload?.filter?.id?.eq],
+        workspaceId,
+      );
+
+    if (calendarChannelCalendarEventAssociations.length === 0) {
+      throw new NotFoundException();
+    }
+
+    await this.canAccessCalendarEventService.canAccessCalendarEvent(
+      userId,
+      workspaceId,
+      calendarChannelCalendarEventAssociations,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/query-hooks/calendar-event/calendar-event-find-one.pre-query-hook.ts b/packages/twenty-server/src/modules/calendar/query-hooks/calendar-event/calendar-event-find-one.pre-query-hook.ts
new file mode 100644
index 000000000000..cac0b8f88707
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/query-hooks/calendar-event/calendar-event-find-one.pre-query-hook.ts
@@ -0,0 +1,50 @@
+import {
+  BadRequestException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+
+import { WorkspacePreQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface';
+import { FindOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { CanAccessCalendarEventService } from 'src/modules/calendar/query-hooks/calendar-event/services/can-access-calendar-event.service';
+import { CalendarChannelEventAssociationRepository } from 'src/modules/calendar/repositories/calendar-channel-event-association.repository';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata';
+
+@Injectable()
+export class CalendarEventFindOnePreQueryHook implements WorkspacePreQueryHook {
+  constructor(
+    @InjectObjectMetadataRepository(
+      CalendarChannelEventAssociationObjectMetadata,
+    )
+    private readonly calendarChannelEventAssociationRepository: CalendarChannelEventAssociationRepository,
+    private readonly canAccessCalendarEventService: CanAccessCalendarEventService,
+  ) {}
+
+  async execute(
+    userId: string,
+    workspaceId: string,
+    payload: FindOneResolverArgs,
+  ): Promise<void> {
+    if (!payload?.filter?.id?.eq) {
+      throw new BadRequestException('id filter is required');
+    }
+
+    const calendarChannelCalendarEventAssociations =
+      await this.calendarChannelEventAssociationRepository.getByCalendarEventIds(
+        [payload?.filter?.id?.eq],
+        workspaceId,
+      );
+
+    if (calendarChannelCalendarEventAssociations.length === 0) {
+      throw new NotFoundException();
+    }
+
+    await this.canAccessCalendarEventService.canAccessCalendarEvent(
+      userId,
+      workspaceId,
+      calendarChannelCalendarEventAssociations,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/query-hooks/calendar-event/services/can-access-calendar-event.service.ts b/packages/twenty-server/src/modules/calendar/query-hooks/calendar-event/services/can-access-calendar-event.service.ts
new file mode 100644
index 000000000000..8008db95a32c
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/query-hooks/calendar-event/services/can-access-calendar-event.service.ts
@@ -0,0 +1,76 @@
+import { ForbiddenException, Injectable } from '@nestjs/common';
+
+import groupBy from 'lodash.groupby';
+
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+import { CalendarChannelRepository } from 'src/modules/calendar/repositories/calendar-channel.repository';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata';
+import {
+  CalendarChannelObjectMetadata,
+  CalendarChannelVisibility,
+} from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
+import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+@Injectable()
+export class CanAccessCalendarEventService {
+  constructor(
+    @InjectObjectMetadataRepository(CalendarChannelObjectMetadata)
+    private readonly calendarChannelRepository: CalendarChannelRepository,
+    @InjectObjectMetadataRepository(ConnectedAccountObjectMetadata)
+    private readonly connectedAccountRepository: ConnectedAccountRepository,
+    @InjectObjectMetadataRepository(WorkspaceMemberObjectMetadata)
+    private readonly workspaceMemberService: WorkspaceMemberRepository,
+  ) {}
+
+  public async canAccessCalendarEvent(
+    userId: string,
+    workspaceId: string,
+    calendarChannelCalendarEventAssociations: ObjectRecord<CalendarChannelEventAssociationObjectMetadata>[],
+  ) {
+    const calendarChannels = await this.calendarChannelRepository.getByIds(
+      calendarChannelCalendarEventAssociations.map(
+        (association) => association.calendarChannelId,
+      ),
+      workspaceId,
+    );
+
+    const calendarChannelsGroupByVisibility = groupBy(
+      calendarChannels,
+      (channel) => channel.visibility,
+    );
+
+    if (
+      calendarChannelsGroupByVisibility[
+        CalendarChannelVisibility.SHARE_EVERYTHING
+      ]
+    ) {
+      return;
+    }
+
+    const currentWorkspaceMember =
+      await this.workspaceMemberService.getByIdOrFail(userId, workspaceId);
+
+    const calendarChannelsConnectedAccounts =
+      await this.connectedAccountRepository.getByIds(
+        calendarChannels.map((channel) => channel.connectedAccountId),
+        workspaceId,
+      );
+
+    const calendarChannelsWorkspaceMemberIds =
+      calendarChannelsConnectedAccounts.map(
+        (connectedAccount) => connectedAccount.accountOwnerId,
+      );
+
+    if (
+      calendarChannelsWorkspaceMemberIds.includes(currentWorkspaceMember.id)
+    ) {
+      return;
+    }
+
+    throw new ForbiddenException();
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/query-hooks/calendar-query-hook.module.ts b/packages/twenty-server/src/modules/calendar/query-hooks/calendar-query-hook.module.ts
new file mode 100644
index 000000000000..1e116c00e3df
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/query-hooks/calendar-query-hook.module.ts
@@ -0,0 +1,33 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata';
+import { CalendarChannelObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
+import { CalendarEventFindManyPreQueryHook } from 'src/modules/calendar/query-hooks/calendar-event/calendar-event-find-many.pre-query.hook';
+import { CalendarEventFindOnePreQueryHook } from 'src/modules/calendar/query-hooks/calendar-event/calendar-event-find-one.pre-query-hook';
+import { CanAccessCalendarEventService } from 'src/modules/calendar/query-hooks/calendar-event/services/can-access-calendar-event.service';
+
+@Module({
+  imports: [
+    ObjectMetadataRepositoryModule.forFeature([
+      CalendarChannelEventAssociationObjectMetadata,
+      CalendarChannelObjectMetadata,
+      ConnectedAccountObjectMetadata,
+      WorkspaceMemberObjectMetadata,
+    ]),
+  ],
+  providers: [
+    CanAccessCalendarEventService,
+    {
+      provide: CalendarEventFindOnePreQueryHook.name,
+      useClass: CalendarEventFindOnePreQueryHook,
+    },
+    {
+      provide: CalendarEventFindManyPreQueryHook.name,
+      useClass: CalendarEventFindManyPreQueryHook,
+    },
+  ],
+})
+export class CalendarQueryHookModule {}
diff --git a/packages/twenty-server/src/modules/calendar/repositories/calendar-channel-event-association.repository.ts b/packages/twenty-server/src/modules/calendar/repositories/calendar-channel-event-association.repository.ts
new file mode 100644
index 000000000000..5162c37bfe28
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/repositories/calendar-channel-event-association.repository.ts
@@ -0,0 +1,172 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata';
+import { getFlattenedValuesAndValuesStringForBatchRawQuery } from 'src/modules/calendar/utils/getFlattenedValuesAndValuesStringForBatchRawQuery.util';
+
+@Injectable()
+export class CalendarChannelEventAssociationRepository {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async getByEventExternalIdsAndCalendarChannelId(
+    eventExternalIds: string[],
+    calendarChannelId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<CalendarChannelEventAssociationObjectMetadata>[]> {
+    if (eventExternalIds.length === 0) {
+      return [];
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."calendarChannelEventAssociation"
+    WHERE "eventExternalId" = ANY($1) AND "calendarChannelId" = $2`,
+      [eventExternalIds, calendarChannelId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async deleteByEventExternalIdsAndCalendarChannelId(
+    eventExternalIds: string[],
+    calendarChannelId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `DELETE FROM ${dataSourceSchema}."calendarChannelEventAssociation" WHERE "eventExternalId" = ANY($1) AND "calendarChannelId" = $2`,
+      [eventExternalIds, calendarChannelId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getByCalendarChannelIds(
+    calendarChannelIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<CalendarChannelEventAssociationObjectMetadata>[]> {
+    if (calendarChannelIds.length === 0) {
+      return [];
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."calendarChannelEventAssociation"
+    WHERE "calendarChannelId" = ANY($1)`,
+      [calendarChannelIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async deleteByCalendarChannelIds(
+    calendarChannelIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    if (calendarChannelIds.length === 0) {
+      return;
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `DELETE FROM ${dataSourceSchema}."calendarChannelEventAssociation" WHERE "calendarChannelId" = ANY($1)`,
+      [calendarChannelIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async deleteByIds(
+    ids: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    if (ids.length === 0) {
+      return;
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `DELETE FROM ${dataSourceSchema}."calendarChannelEventAssociation" WHERE "id" = ANY($1)`,
+      [ids],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getByCalendarEventIds(
+    calendarEventIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<CalendarChannelEventAssociationObjectMetadata>[]> {
+    if (calendarEventIds.length === 0) {
+      return [];
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."calendarChannelEventAssociation"
+    WHERE "calendarEventId" = ANY($1)`,
+      [calendarEventIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async saveCalendarChannelEventAssociations(
+    calendarChannelEventAssociations: Omit<
+      ObjectRecord<CalendarChannelEventAssociationObjectMetadata>,
+      'id' | 'createdAt' | 'updatedAt' | 'calendarChannel' | 'calendarEvent'
+    >[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    if (calendarChannelEventAssociations.length === 0) {
+      return;
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const {
+      flattenedValues: calendarChannelEventAssociationValues,
+      valuesString,
+    } = getFlattenedValuesAndValuesStringForBatchRawQuery(
+      calendarChannelEventAssociations,
+      {
+        calendarChannelId: 'uuid',
+        calendarEventId: 'uuid',
+        eventExternalId: 'text',
+      },
+    );
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `INSERT INTO ${dataSourceSchema}."calendarChannelEventAssociation" ("calendarChannelId", "calendarEventId", "eventExternalId")
+      VALUES ${valuesString}`,
+      calendarChannelEventAssociationValues,
+      workspaceId,
+      transactionManager,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/repositories/calendar-channel.repository.ts b/packages/twenty-server/src/modules/calendar/repositories/calendar-channel.repository.ts
new file mode 100644
index 000000000000..12a94410df2f
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/repositories/calendar-channel.repository.ts
@@ -0,0 +1,114 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { CalendarChannelObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+
+@Injectable()
+export class CalendarChannelRepository {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async getAll(
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<CalendarChannelObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."calendarChannel"`,
+      [],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async create(
+    calendarChannel: Pick<
+      ObjectRecord<CalendarChannelObjectMetadata>,
+      'id' | 'connectedAccountId' | 'handle' | 'visibility'
+    >,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `INSERT INTO ${dataSourceSchema}."calendarChannel" (id, "connectedAccountId", "handle", "visibility") VALUES ($1, $2, $3, $4)`,
+      [
+        calendarChannel.id,
+        calendarChannel.connectedAccountId,
+        calendarChannel.handle,
+        calendarChannel.visibility,
+      ],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getByConnectedAccountId(
+    connectedAccountId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<CalendarChannelObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."calendarChannel" WHERE "connectedAccountId" = $1 LIMIT 1`,
+      [connectedAccountId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getFirstByConnectedAccountId(
+    connectedAccountId: string,
+    workspaceId: string,
+  ): Promise<ObjectRecord<CalendarChannelObjectMetadata> | undefined> {
+    const calendarChannels = await this.getByConnectedAccountId(
+      connectedAccountId,
+      workspaceId,
+    );
+
+    return calendarChannels[0];
+  }
+
+  public async getByIds(
+    ids: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<CalendarChannelObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."calendarChannel" WHERE "id" = ANY($1)`,
+      [ids],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async updateSyncCursor(
+    syncCursor: string,
+    calendarChannelId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."calendarChannel" SET "syncCursor" = $1 WHERE "id" = $2`,
+      [syncCursor, calendarChannelId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/repositories/calendar-event-participant.repository.ts b/packages/twenty-server/src/modules/calendar/repositories/calendar-event-participant.repository.ts
new file mode 100644
index 000000000000..b3dc3dad231c
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/repositories/calendar-event-participant.repository.ts
@@ -0,0 +1,295 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+import differenceWith from 'lodash.differencewith';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+import { getFlattenedValuesAndValuesStringForBatchRawQuery } from 'src/modules/calendar/utils/getFlattenedValuesAndValuesStringForBatchRawQuery.util';
+import {
+  CalendarEventParticipant,
+  CalendarEventParticipantWithId,
+} from 'src/modules/calendar/types/calendar-event';
+
+@Injectable()
+export class CalendarEventParticipantRepository {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async getByHandles(
+    handles: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<CalendarEventParticipantObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."calendarEventParticipant" WHERE "handle" = ANY($1)`,
+      [handles],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async updateParticipantsPersonId(
+    participantIds: string[],
+    personId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."calendarEventParticipant" SET "personId" = $1 WHERE "id" = ANY($2)`,
+      [personId, participantIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async updateParticipantsWorkspaceMemberId(
+    participantIds: string[],
+    workspaceMemberId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."calendarEventParticipant" SET "workspaceMemberId" = $1 WHERE "id" = ANY($2)`,
+      [workspaceMemberId, participantIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async removePersonIdByHandle(
+    handle: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."calendarEventParticipant" SET "personId" = NULL WHERE "handle" = $1`,
+      [handle],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async removeWorkspaceMemberIdByHandle(
+    handle: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."calendarEventParticipant" SET "workspaceMemberId" = NULL WHERE "handle" = $1`,
+      [handle],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getByIds(
+    calendarEventParticipantIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<CalendarEventParticipantObjectMetadata>[]> {
+    if (calendarEventParticipantIds.length === 0) {
+      return [];
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."calendarEventParticipant" WHERE "id" = ANY($1)`,
+      [calendarEventParticipantIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getByCalendarEventIds(
+    calendarEventIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<CalendarEventParticipantObjectMetadata>[]> {
+    if (calendarEventIds.length === 0) {
+      return [];
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."calendarEventParticipant" WHERE "calendarEventId" = ANY($1)`,
+      [calendarEventIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async deleteByIds(
+    calendarEventParticipantIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    if (calendarEventParticipantIds.length === 0) {
+      return;
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `DELETE FROM ${dataSourceSchema}."calendarEventParticipant" WHERE "id" = ANY($1)`,
+      [calendarEventParticipantIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async updateCalendarEventParticipantsAndReturnNewOnes(
+    calendarEventParticipants: CalendarEventParticipant[],
+    iCalUIDCalendarEventIdMap: Map<string, string>,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<CalendarEventParticipant[]> {
+    if (calendarEventParticipants.length === 0) {
+      return [];
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const calendarEventIds = Array.from(iCalUIDCalendarEventIdMap.values());
+
+    const existingCalendarEventParticipants = await this.getByCalendarEventIds(
+      calendarEventIds,
+      workspaceId,
+      transactionManager,
+    );
+
+    const calendarEventParticipantsToDelete = differenceWith(
+      existingCalendarEventParticipants,
+      calendarEventParticipants,
+      (existingCalendarEventParticipant, calendarEventParticipant) =>
+        existingCalendarEventParticipant.handle ===
+        calendarEventParticipant.handle,
+    );
+
+    const newCalendarEventParticipants = differenceWith(
+      calendarEventParticipants,
+      existingCalendarEventParticipants,
+      (calendarEventParticipant, existingCalendarEventParticipant) =>
+        calendarEventParticipant.handle ===
+        existingCalendarEventParticipant.handle,
+    );
+
+    await this.deleteByIds(
+      calendarEventParticipantsToDelete.map(
+        (calendarEventParticipant) => calendarEventParticipant.id,
+      ),
+      workspaceId,
+      transactionManager,
+    );
+
+    const values = calendarEventParticipants.map(
+      (calendarEventParticipant) => ({
+        ...calendarEventParticipant,
+        calendarEventId: iCalUIDCalendarEventIdMap.get(
+          calendarEventParticipant.iCalUID,
+        ),
+      }),
+    );
+
+    const { flattenedValues, valuesString } =
+      getFlattenedValuesAndValuesStringForBatchRawQuery(values, {
+        calendarEventId: 'uuid',
+        handle: 'text',
+        displayName: 'text',
+        isOrganizer: 'boolean',
+        responseStatus: `${dataSourceSchema}."calendarEventParticipant_responsestatus_enum"`,
+      });
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."calendarEventParticipant" AS "calendarEventParticipant"
+      SET "displayName" = "newValues"."displayName",
+      "isOrganizer" = "newValues"."isOrganizer",
+      "responseStatus" = "newValues"."responseStatus"
+      FROM (VALUES ${valuesString}) AS "newValues"("calendarEventId", "handle", "displayName", "isOrganizer", "responseStatus")
+      WHERE "calendarEventParticipant"."handle" = "newValues"."handle"
+      AND "calendarEventParticipant"."calendarEventId" = "newValues"."calendarEventId"`,
+      flattenedValues,
+      workspaceId,
+      transactionManager,
+    );
+
+    return newCalendarEventParticipants;
+  }
+
+  public async getWithoutPersonIdAndWorkspaceMemberId(
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<CalendarEventParticipantWithId[]> {
+    if (!workspaceId) {
+      throw new Error('WorkspaceId is required');
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const calendarEventParticipants: CalendarEventParticipantWithId[] =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `SELECT "calendarEventParticipant".*
+        FROM ${dataSourceSchema}."calendarEventParticipant" AS "calendarEventParticipant"
+        WHERE "calendarEventParticipant"."personId" IS NULL
+        AND "calendarEventParticipant"."workspaceMemberId" IS NULL`,
+        [],
+        workspaceId,
+        transactionManager,
+      );
+
+    return calendarEventParticipants;
+  }
+
+  public async getByCalendarChannelIdWithoutPersonIdAndWorkspaceMemberId(
+    calendarChannelId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<CalendarEventParticipantWithId[]> {
+    if (!workspaceId) {
+      throw new Error('WorkspaceId is required');
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const calendarEventParticipants: CalendarEventParticipantWithId[] =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `SELECT "calendarEventParticipant".*
+        FROM ${dataSourceSchema}."calendarEventParticipant" AS "calendarEventParticipant"
+        LEFT JOIN ${dataSourceSchema}."calendarEvent" AS "calendarEvent" ON "calendarEventParticipant"."calendarEventId" = "calendarEvent"."id"
+        LEFT JOIN ${dataSourceSchema}."calendarChannelEventAssociation" AS "calendarChannelEventAssociation" ON "calendarEvent"."id" = "calendarChannelEventAssociation"."calendarEventId"
+        WHERE "calendarChannelEventAssociation"."calendarChannelId" = $1
+        AND "calendarEventParticipant"."personId" IS NULL
+        AND "calendarEventParticipant"."workspaceMemberId" IS NULL`,
+        [calendarChannelId],
+        workspaceId,
+        transactionManager,
+      );
+
+    return calendarEventParticipants;
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/repositories/calendar-event.repository.ts b/packages/twenty-server/src/modules/calendar/repositories/calendar-event.repository.ts
new file mode 100644
index 000000000000..8da12f27d555
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/repositories/calendar-event.repository.ts
@@ -0,0 +1,207 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+import { CalendarEventObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event.object-metadata';
+import { getFlattenedValuesAndValuesStringForBatchRawQuery } from 'src/modules/calendar/utils/getFlattenedValuesAndValuesStringForBatchRawQuery.util';
+import { CalendarEvent } from 'src/modules/calendar/types/calendar-event';
+import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+
+@Injectable()
+export class CalendarEventRepository {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async getByIds(
+    calendarEventIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<CalendarEventObjectMetadata>[]> {
+    if (calendarEventIds.length === 0) {
+      return [];
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."calendarEvent" WHERE "id" = ANY($1)`,
+      [calendarEventIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async deleteByIds(
+    calendarEventIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    if (calendarEventIds.length === 0) {
+      return;
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `DELETE FROM ${dataSourceSchema}."calendarEvent" WHERE "id" = ANY($1)`,
+      [calendarEventIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getNonAssociatedCalendarEventIdsPaginated(
+    limit: number,
+    offset: number,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<CalendarEventParticipantObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const nonAssociatedCalendarEvents =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `SELECT m.id FROM ${dataSourceSchema}."calendarEvent" m
+        LEFT JOIN ${dataSourceSchema}."calendarChannelEventAssociation" ccea
+        ON m.id = ccea."calendarEventId"
+        WHERE ccea.id IS NULL
+        LIMIT $1 OFFSET $2`,
+        [limit, offset],
+        workspaceId,
+        transactionManager,
+      );
+
+    return nonAssociatedCalendarEvents.map(({ id }) => id);
+  }
+
+  public async getICalUIDCalendarEventIdMap(
+    calendarEventIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<Map<string, string>> {
+    if (calendarEventIds.length === 0) {
+      return new Map();
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const calendarEvents:
+      | {
+          id: string;
+          iCalUID: string;
+        }[]
+      | undefined = await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT id, "iCalUID" FROM ${dataSourceSchema}."calendarEvent" WHERE "id" = ANY($1)`,
+      [calendarEventIds],
+      workspaceId,
+      transactionManager,
+    );
+
+    const iCalUIDsCalendarEventIdsMap = new Map<string, string>();
+
+    calendarEvents?.forEach((calendarEvent) => {
+      iCalUIDsCalendarEventIdsMap.set(calendarEvent.iCalUID, calendarEvent.id);
+    });
+
+    return iCalUIDsCalendarEventIdsMap;
+  }
+
+  public async saveCalendarEvents(
+    calendarEvents: CalendarEvent[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    if (calendarEvents.length === 0) {
+      return;
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const { flattenedValues, valuesString } =
+      getFlattenedValuesAndValuesStringForBatchRawQuery(calendarEvents, {
+        id: 'uuid',
+        title: 'text',
+        isCanceled: 'boolean',
+        isFullDay: 'boolean',
+        startsAt: 'timestamptz',
+        endsAt: 'timestamptz',
+        externalCreatedAt: 'timestamptz',
+        externalUpdatedAt: 'timestamptz',
+        description: 'text',
+        location: 'text',
+        iCalUID: 'text',
+        conferenceSolution: 'text',
+        conferenceLinkLabel: 'text',
+        conferenceLinkUrl: 'text',
+        recurringEventExternalId: 'text',
+      });
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `INSERT INTO ${dataSourceSchema}."calendarEvent" ("id", "title", "isCanceled", "isFullDay", "startsAt", "endsAt", "externalCreatedAt", "externalUpdatedAt", "description", "location", "iCalUID", "conferenceSolution", "conferenceLinkLabel", "conferenceLinkUrl", "recurringEventExternalId") VALUES ${valuesString}`,
+      flattenedValues,
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async updateCalendarEvents(
+    calendarEvents: CalendarEvent[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    if (calendarEvents.length === 0) {
+      return;
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const { flattenedValues, valuesString } =
+      getFlattenedValuesAndValuesStringForBatchRawQuery(calendarEvents, {
+        title: 'text',
+        isCanceled: 'boolean',
+        isFullDay: 'boolean',
+        startsAt: 'timestamptz',
+        endsAt: 'timestamptz',
+        externalCreatedAt: 'timestamptz',
+        externalUpdatedAt: 'timestamptz',
+        description: 'text',
+        location: 'text',
+        iCalUID: 'text',
+        conferenceSolution: 'text',
+        conferenceLinkLabel: 'text',
+        conferenceLinkUrl: 'text',
+        recurringEventExternalId: 'text',
+      });
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."calendarEvent" AS "calendarEvent"
+      SET "title" = "newData"."title",
+      "isCanceled" = "newData"."isCanceled",
+      "isFullDay" = "newData"."isFullDay",
+      "startsAt" = "newData"."startsAt",
+      "endsAt" = "newData"."endsAt",
+      "externalCreatedAt" = "newData"."externalCreatedAt",
+      "externalUpdatedAt" = "newData"."externalUpdatedAt",
+      "description" = "newData"."description",
+      "location" = "newData"."location",
+      "conferenceSolution" = "newData"."conferenceSolution",
+      "conferenceLinkLabel" = "newData"."conferenceLinkLabel",
+      "conferenceLinkUrl" = "newData"."conferenceLinkUrl",
+      "recurringEventExternalId" = "newData"."recurringEventExternalId"
+      FROM (VALUES ${valuesString})
+      AS "newData"("title", "isCanceled", "isFullDay", "startsAt", "endsAt", "externalCreatedAt", "externalUpdatedAt", "description", "location", "iCalUID", "conferenceSolution", "conferenceLinkLabel", "conferenceLinkUrl", "recurringEventExternalId")
+      WHERE "calendarEvent"."iCalUID" = "newData"."iCalUID"`,
+      flattenedValues,
+      workspaceId,
+      transactionManager,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.module.ts b/packages/twenty-server/src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.module.ts
new file mode 100644
index 000000000000..2f0d4977aa6d
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.module.ts
@@ -0,0 +1,14 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { CalendarEventCleanerService } from 'src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.service';
+import { CalendarEventObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event.object-metadata';
+
+@Module({
+  imports: [
+    ObjectMetadataRepositoryModule.forFeature([CalendarEventObjectMetadata]),
+  ],
+  providers: [CalendarEventCleanerService],
+  exports: [CalendarEventCleanerService],
+})
+export class CalendarEventCleanerModule {}
diff --git a/packages/twenty-server/src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.service.ts b/packages/twenty-server/src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.service.ts
new file mode 100644
index 000000000000..c56e046a7f12
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.service.ts
@@ -0,0 +1,27 @@
+import { Injectable } from '@nestjs/common';
+
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { CalendarEventRepository } from 'src/modules/calendar/repositories/calendar-event.repository';
+import { CalendarEventObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event.object-metadata';
+import { deleteUsingPagination } from 'src/modules/messaging/services/thread-cleaner/utils/delete-using-pagination.util';
+
+@Injectable()
+export class CalendarEventCleanerService {
+  constructor(
+    @InjectObjectMetadataRepository(CalendarEventObjectMetadata)
+    private readonly calendarEventRepository: CalendarEventRepository,
+  ) {}
+
+  public async cleanWorkspaceCalendarEvents(workspaceId: string) {
+    await deleteUsingPagination(
+      workspaceId,
+      500,
+      this.calendarEventRepository.getNonAssociatedCalendarEventIdsPaginated.bind(
+        this.calendarEventRepository,
+      ),
+      this.calendarEventRepository.deleteByIds.bind(
+        this.calendarEventRepository,
+      ),
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/services/calendar-event-participant/calendar-event-participant.module.ts b/packages/twenty-server/src/modules/calendar/services/calendar-event-participant/calendar-event-participant.module.ts
new file mode 100644
index 000000000000..785826ff10db
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/services/calendar-event-participant/calendar-event-participant.module.ts
@@ -0,0 +1,18 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { CalendarEventParticipantService } from 'src/modules/calendar/services/calendar-event-participant/calendar-event-participant.service';
+import { AddPersonIdAndWorkspaceMemberIdModule } from 'src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.module';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+
+@Module({
+  imports: [
+    WorkspaceDataSourceModule,
+    ObjectMetadataRepositoryModule.forFeature([PersonObjectMetadata]),
+    AddPersonIdAndWorkspaceMemberIdModule,
+  ],
+  providers: [CalendarEventParticipantService],
+  exports: [CalendarEventParticipantService],
+})
+export class CalendarEventParticipantModule {}
diff --git a/packages/twenty-server/src/modules/calendar/services/calendar-event-participant/calendar-event-participant.service.ts b/packages/twenty-server/src/modules/calendar/services/calendar-event-participant/calendar-event-participant.service.ts
new file mode 100644
index 000000000000..b6d2f8440983
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/services/calendar-event-participant/calendar-event-participant.service.ts
@@ -0,0 +1,169 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { PersonRepository } from 'src/modules/person/repositories/person.repository';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { getFlattenedValuesAndValuesStringForBatchRawQuery } from 'src/modules/calendar/utils/getFlattenedValuesAndValuesStringForBatchRawQuery.util';
+import { CalendarEventParticipant } from 'src/modules/calendar/types/calendar-event';
+import { AddPersonIdAndWorkspaceMemberIdService } from 'src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.service';
+import { CalendarEventParticipantRepository } from 'src/modules/calendar/repositories/calendar-event-participant.repository';
+import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+
+@Injectable()
+export class CalendarEventParticipantService {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+    @InjectObjectMetadataRepository(CalendarEventParticipantObjectMetadata)
+    private readonly calendarEventParticipantRepository: CalendarEventParticipantRepository,
+    @InjectObjectMetadataRepository(PersonObjectMetadata)
+    private readonly personRepository: PersonRepository,
+    private readonly addPersonIdAndWorkspaceMemberIdService: AddPersonIdAndWorkspaceMemberIdService,
+  ) {}
+
+  public async updateCalendarEventParticipantsAfterPeopleCreation(
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    const participants =
+      await this.calendarEventParticipantRepository.getWithoutPersonIdAndWorkspaceMemberId(
+        workspaceId,
+      );
+
+    if (!participants) return;
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const handles = participants.map((participant) => participant.handle);
+
+    const participantPersonIds = await this.personRepository.getByEmails(
+      handles,
+      workspaceId,
+      transactionManager,
+    );
+
+    const calendarEventParticipantsToUpdate = participants.map(
+      (participant) => ({
+        id: participant.id,
+        personId: participantPersonIds.find(
+          (e: { id: string; email: string }) => e.email === participant.handle,
+        )?.id,
+      }),
+    );
+
+    if (calendarEventParticipantsToUpdate.length === 0) return;
+
+    const { flattenedValues, valuesString } =
+      getFlattenedValuesAndValuesStringForBatchRawQuery(
+        calendarEventParticipantsToUpdate,
+        {
+          id: 'uuid',
+          personId: 'uuid',
+        },
+      );
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."calendarEventParticipant" AS "calendarEventParticipant" SET "personId" = "data"."personId"
+      FROM (VALUES ${valuesString}) AS "data"("id", "personId")
+      WHERE "calendarEventParticipant"."id" = "data"."id"`,
+      flattenedValues,
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async saveCalendarEventParticipants(
+    calendarEventParticipants: CalendarEventParticipant[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    if (calendarEventParticipants.length === 0) {
+      return;
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const calendarEventParticipantsToSave =
+      await this.addPersonIdAndWorkspaceMemberIdService.addPersonIdAndWorkspaceMemberId(
+        calendarEventParticipants,
+        workspaceId,
+        transactionManager,
+      );
+
+    const { flattenedValues, valuesString } =
+      getFlattenedValuesAndValuesStringForBatchRawQuery(
+        calendarEventParticipantsToSave,
+        {
+          calendarEventId: 'uuid',
+          handle: 'text',
+          displayName: 'text',
+          isOrganizer: 'boolean',
+          responseStatus: `${dataSourceSchema}."calendarEventParticipant_responsestatus_enum"`,
+          personId: 'uuid',
+          workspaceMemberId: 'uuid',
+        },
+      );
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `INSERT INTO ${dataSourceSchema}."calendarEventParticipant" ("calendarEventId", "handle", "displayName", "isOrganizer", "responseStatus", "personId", "workspaceMemberId") VALUES ${valuesString}`,
+      flattenedValues,
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async matchCalendarEventParticipants(
+    workspaceId: string,
+    email: string,
+    personId?: string,
+    workspaceMemberId?: string,
+  ) {
+    const calendarEventParticipantsToUpdate =
+      await this.calendarEventParticipantRepository.getByHandles(
+        [email],
+        workspaceId,
+      );
+
+    const calendarEventParticipantIdsToUpdate =
+      calendarEventParticipantsToUpdate.map((participant) => participant.id);
+
+    if (personId) {
+      await this.calendarEventParticipantRepository.updateParticipantsPersonId(
+        calendarEventParticipantIdsToUpdate,
+        personId,
+        workspaceId,
+      );
+    }
+    if (workspaceMemberId) {
+      await this.calendarEventParticipantRepository.updateParticipantsWorkspaceMemberId(
+        calendarEventParticipantIdsToUpdate,
+        workspaceMemberId,
+        workspaceId,
+      );
+    }
+  }
+
+  public async unmatchCalendarEventParticipants(
+    workspaceId: string,
+    handle: string,
+    personId?: string,
+    workspaceMemberId?: string,
+  ) {
+    if (personId) {
+      await this.calendarEventParticipantRepository.removePersonIdByHandle(
+        handle,
+        workspaceId,
+      );
+    }
+    if (workspaceMemberId) {
+      await this.calendarEventParticipantRepository.removeWorkspaceMemberIdByHandle(
+        handle,
+        workspaceId,
+      );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/services/google-calendar-sync.module.ts b/packages/twenty-server/src/modules/calendar/services/google-calendar-sync.module.ts
new file mode 100644
index 000000000000..476950ec4f64
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/services/google-calendar-sync.module.ts
@@ -0,0 +1,41 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { CalendarEventCleanerModule } from 'src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.module';
+import { CalendarEventParticipantModule } from 'src/modules/calendar/services/calendar-event-participant/calendar-event-participant.module';
+import { GoogleCalendarSyncService } from 'src/modules/calendar/services/google-calendar-sync.service';
+import { CalendarProvidersModule } from 'src/modules/calendar/services/providers/calendar-providers.module';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata';
+import { CalendarChannelObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
+import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+import { CalendarEventObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event.object-metadata';
+import { BlocklistObjectMetadata } from 'src/modules/connected-account/standard-objects/blocklist.object-metadata';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+@Module({
+  imports: [
+    CalendarProvidersModule,
+    ObjectMetadataRepositoryModule.forFeature([
+      ConnectedAccountObjectMetadata,
+      CalendarEventObjectMetadata,
+      CalendarChannelObjectMetadata,
+      CalendarChannelEventAssociationObjectMetadata,
+      CalendarEventParticipantObjectMetadata,
+      BlocklistObjectMetadata,
+      PersonObjectMetadata,
+      WorkspaceMemberObjectMetadata,
+    ]),
+    CalendarEventParticipantModule,
+    TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
+    WorkspaceDataSourceModule,
+    CalendarEventCleanerModule,
+  ],
+  providers: [GoogleCalendarSyncService],
+  exports: [GoogleCalendarSyncService],
+})
+export class GoogleCalendarSyncModule {}
diff --git a/packages/twenty-server/src/modules/calendar/services/google-calendar-sync.service.ts b/packages/twenty-server/src/modules/calendar/services/google-calendar-sync.service.ts
new file mode 100644
index 000000000000..c1c1f01a01ef
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/services/google-calendar-sync.service.ts
@@ -0,0 +1,411 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+
+import { Repository } from 'typeorm';
+import { calendar_v3 as calendarV3 } from 'googleapis';
+
+import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
+import { BlocklistRepository } from 'src/modules/connected-account/repositories/blocklist.repository';
+import {
+  FeatureFlagEntity,
+  FeatureFlagKeys,
+} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { GoogleCalendarClientProvider } from 'src/modules/calendar/services/providers/google-calendar/google-calendar.provider';
+import { googleCalendarSearchFilterExcludeEmails } from 'src/modules/calendar/utils/google-calendar-search-filter.util';
+import { CalendarChannelEventAssociationRepository } from 'src/modules/calendar/repositories/calendar-channel-event-association.repository';
+import { CalendarChannelRepository } from 'src/modules/calendar/repositories/calendar-channel.repository';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { CalendarEventRepository } from 'src/modules/calendar/repositories/calendar-event.repository';
+import { formatGoogleCalendarEvent } from 'src/modules/calendar/utils/format-google-calendar-event.util';
+import { CalendarEventParticipantRepository } from 'src/modules/calendar/repositories/calendar-event-participant.repository';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { CalendarEventObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event.object-metadata';
+import { CalendarChannelObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata';
+import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+import { BlocklistObjectMetadata } from 'src/modules/connected-account/standard-objects/blocklist.object-metadata';
+import { CalendarEventCleanerService } from 'src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.service';
+import { CalendarEventParticipantService } from 'src/modules/calendar/services/calendar-event-participant/calendar-event-participant.service';
+import { CalendarEventParticipant } from 'src/modules/calendar/types/calendar-event';
+
+@Injectable()
+export class GoogleCalendarSyncService {
+  private readonly logger = new Logger(GoogleCalendarSyncService.name);
+
+  constructor(
+    private readonly googleCalendarClientProvider: GoogleCalendarClientProvider,
+    @InjectObjectMetadataRepository(ConnectedAccountObjectMetadata)
+    private readonly connectedAccountRepository: ConnectedAccountRepository,
+    @InjectObjectMetadataRepository(CalendarEventObjectMetadata)
+    private readonly calendarEventRepository: CalendarEventRepository,
+    @InjectObjectMetadataRepository(CalendarChannelObjectMetadata)
+    private readonly calendarChannelRepository: CalendarChannelRepository,
+    @InjectObjectMetadataRepository(
+      CalendarChannelEventAssociationObjectMetadata,
+    )
+    private readonly calendarChannelEventAssociationRepository: CalendarChannelEventAssociationRepository,
+    @InjectObjectMetadataRepository(CalendarEventParticipantObjectMetadata)
+    private readonly calendarEventParticipantsRepository: CalendarEventParticipantRepository,
+    @InjectObjectMetadataRepository(BlocklistObjectMetadata)
+    private readonly blocklistRepository: BlocklistRepository,
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+    private readonly eventEmitter: EventEmitter2,
+    private readonly calendarEventCleanerService: CalendarEventCleanerService,
+    private readonly calendarEventParticipantsService: CalendarEventParticipantService,
+  ) {}
+
+  public async startGoogleCalendarSync(
+    workspaceId: string,
+    connectedAccountId: string,
+  ): Promise<void> {
+    const connectedAccount = await this.connectedAccountRepository.getById(
+      connectedAccountId,
+      workspaceId,
+    );
+
+    if (!connectedAccount) {
+      return;
+    }
+
+    const refreshToken = connectedAccount.refreshToken;
+    const workspaceMemberId = connectedAccount.accountOwnerId;
+
+    if (!refreshToken) {
+      throw new Error(
+        `No refresh token found for connected account ${connectedAccountId} in workspace ${workspaceId} during sync`,
+      );
+    }
+
+    const calendarChannel =
+      await this.calendarChannelRepository.getFirstByConnectedAccountId(
+        connectedAccountId,
+        workspaceId,
+      );
+
+    const syncToken = calendarChannel?.syncCursor || undefined;
+
+    if (!calendarChannel) {
+      return;
+    }
+
+    const calendarChannelId = calendarChannel.id;
+
+    const googleCalendarClient =
+      await this.googleCalendarClientProvider.getGoogleCalendarClient(
+        refreshToken,
+      );
+
+    const isBlocklistEnabledFeatureFlag =
+      await this.featureFlagRepository.findOneBy({
+        workspaceId,
+        key: FeatureFlagKeys.IsBlocklistEnabled,
+        value: true,
+      });
+
+    const isBlocklistEnabled =
+      isBlocklistEnabledFeatureFlag && isBlocklistEnabledFeatureFlag.value;
+
+    const blocklist = isBlocklistEnabled
+      ? await this.blocklistRepository.getByWorkspaceMemberId(
+          workspaceMemberId,
+          workspaceId,
+        )
+      : [];
+
+    const blocklistedEmails = blocklist.map((blocklist) => blocklist.handle);
+
+    let startTime = Date.now();
+
+    let nextSyncToken: string | null | undefined;
+    let nextPageToken: string | undefined;
+    const events: calendarV3.Schema$Event[] = [];
+
+    while (true) {
+      const googleCalendarEvents = await googleCalendarClient.events.list({
+        calendarId: 'primary',
+        maxResults: 500,
+        syncToken,
+        pageToken: nextPageToken,
+        showDeleted: true,
+        q: googleCalendarSearchFilterExcludeEmails(blocklistedEmails),
+      });
+
+      nextSyncToken = googleCalendarEvents.data.nextSyncToken;
+      nextPageToken = googleCalendarEvents.data.nextPageToken || undefined;
+
+      const { items } = googleCalendarEvents.data;
+
+      if (!items || items.length === 0) {
+        break;
+      }
+
+      events.push(...items);
+
+      if (!nextPageToken) {
+        break;
+      }
+    }
+
+    let endTime = Date.now();
+
+    this.logger.log(
+      `google calendar sync for workspace ${workspaceId} and account ${connectedAccountId} getting events list in ${
+        endTime - startTime
+      }ms.`,
+    );
+
+    if (!events || events?.length === 0) {
+      this.logger.log(
+        `google calendar sync for workspace ${workspaceId} and account ${connectedAccountId} done with nothing to import.`,
+      );
+
+      return;
+    }
+
+    const eventExternalIds = events.map((event) => event.id as string);
+
+    startTime = Date.now();
+
+    const existingCalendarChannelEventAssociations =
+      await this.calendarChannelEventAssociationRepository.getByEventExternalIdsAndCalendarChannelId(
+        eventExternalIds,
+        calendarChannelId,
+        workspaceId,
+      );
+
+    endTime = Date.now();
+
+    this.logger.log(
+      `google calendar sync for workspace ${workspaceId} and account ${connectedAccountId}: getting existing calendar channel event associations in ${
+        endTime - startTime
+      }ms.`,
+    );
+
+    // TODO: When we will be able to add unicity contraint on iCalUID, we will do a INSERT ON CONFLICT DO UPDATE
+
+    const existingEventExternalIds =
+      existingCalendarChannelEventAssociations.map(
+        (association) => association.eventExternalId,
+      );
+
+    const existingEventsIds = existingCalendarChannelEventAssociations.map(
+      (association) => association.calendarEventId,
+    );
+
+    const iCalUIDCalendarEventIdMap =
+      await this.calendarEventRepository.getICalUIDCalendarEventIdMap(
+        existingEventsIds,
+        workspaceId,
+      );
+
+    const formattedEvents = events
+      .filter((event) => event.status !== 'cancelled')
+      .map((event) =>
+        formatGoogleCalendarEvent(event, iCalUIDCalendarEventIdMap),
+      );
+
+    const eventsToSave = formattedEvents.filter(
+      (event) => !existingEventExternalIds.includes(event.externalId),
+    );
+
+    const eventsToUpdate = formattedEvents.filter((event) =>
+      existingEventExternalIds.includes(event.externalId),
+    );
+
+    const cancelledEventExternalIds = events
+      .filter((event) => event.status === 'cancelled')
+      .map((event) => event.id as string);
+
+    const calendarChannelEventAssociationsToSave = eventsToSave.map(
+      (event) => ({
+        calendarEventId: event.id,
+        eventExternalId: event.externalId,
+        calendarChannelId,
+      }),
+    );
+
+    const participantsToSave = eventsToSave.flatMap(
+      (event) => event.participants,
+    );
+
+    const participantsToUpdate = eventsToUpdate.flatMap(
+      (event) => event.participants,
+    );
+
+    let newCalendarEventParticipants: CalendarEventParticipant[] = [];
+
+    if (events.length > 0) {
+      const dataSourceMetadata =
+        await this.workspaceDataSourceService.connectToWorkspaceDataSource(
+          workspaceId,
+        );
+
+      try {
+        dataSourceMetadata?.transaction(async (transactionManager) => {
+          startTime = Date.now();
+
+          await this.calendarEventRepository.saveCalendarEvents(
+            eventsToSave,
+            workspaceId,
+            transactionManager,
+          );
+
+          endTime = Date.now();
+
+          this.logger.log(
+            `google calendar sync for workspace ${workspaceId} and account ${connectedAccountId}: saving ${
+              eventsToSave.length
+            } events in ${endTime - startTime}ms.`,
+          );
+
+          startTime = Date.now();
+
+          await this.calendarEventRepository.updateCalendarEvents(
+            eventsToUpdate,
+            workspaceId,
+            transactionManager,
+          );
+
+          endTime = Date.now();
+
+          this.logger.log(
+            `google calendar sync for workspace ${workspaceId} and account ${connectedAccountId}: updating ${
+              eventsToUpdate.length
+            } events in ${endTime - startTime}ms.`,
+          );
+
+          startTime = Date.now();
+
+          await this.calendarChannelEventAssociationRepository.saveCalendarChannelEventAssociations(
+            calendarChannelEventAssociationsToSave,
+            workspaceId,
+            transactionManager,
+          );
+
+          endTime = Date.now();
+
+          this.logger.log(
+            `google calendar sync for workspace ${workspaceId} and account ${connectedAccountId}: saving calendar channel event associations in ${
+              endTime - startTime
+            }ms.`,
+          );
+
+          startTime = Date.now();
+
+          newCalendarEventParticipants =
+            await this.calendarEventParticipantsRepository.updateCalendarEventParticipantsAndReturnNewOnes(
+              participantsToUpdate,
+              iCalUIDCalendarEventIdMap,
+              workspaceId,
+              transactionManager,
+            );
+
+          endTime = Date.now();
+
+          participantsToSave.push(...newCalendarEventParticipants);
+
+          this.logger.log(
+            `google calendar sync for workspace ${workspaceId} and account ${connectedAccountId}: updating participants in ${
+              endTime - startTime
+            }ms.`,
+          );
+
+          startTime = Date.now();
+
+          await this.calendarEventParticipantsService.saveCalendarEventParticipants(
+            participantsToSave,
+            workspaceId,
+            transactionManager,
+          );
+
+          endTime = Date.now();
+
+          this.logger.log(
+            `google calendar sync for workspace ${workspaceId} and account ${connectedAccountId}: saving participants in ${
+              endTime - startTime
+            }ms.`,
+          );
+
+          startTime = Date.now();
+
+          await this.calendarChannelEventAssociationRepository.deleteByEventExternalIdsAndCalendarChannelId(
+            cancelledEventExternalIds,
+            calendarChannelId,
+            workspaceId,
+            transactionManager,
+          );
+
+          endTime = Date.now();
+
+          this.logger.log(
+            `google calendar sync for workspace ${workspaceId} and account ${connectedAccountId}: deleting calendar channel event associations in ${
+              endTime - startTime
+            }ms.`,
+          );
+        });
+
+        startTime = Date.now();
+
+        await this.calendarEventCleanerService.cleanWorkspaceCalendarEvents(
+          workspaceId,
+        );
+
+        endTime = Date.now();
+
+        this.logger.log(
+          `google calendar sync for workspace ${workspaceId} and account ${connectedAccountId}: cleaning calendar events in ${
+            endTime - startTime
+          }ms.`,
+        );
+
+        if (calendarChannel.isContactAutoCreationEnabled) {
+          this.eventEmitter.emit(`createContacts`, {
+            workspaceId,
+            connectedAccountHandle: connectedAccount.handle,
+            contactsToCreate: participantsToSave,
+          });
+        }
+      } catch (error) {
+        this.logger.error(
+          `Error during google calendar sync for workspace ${workspaceId} and account ${connectedAccountId}: ${error.message}`,
+        );
+      }
+    } else {
+      this.logger.log(
+        `google calendar sync for workspace ${workspaceId} and account ${connectedAccountId} done with nothing to import.`,
+      );
+    }
+
+    if (!nextSyncToken) {
+      throw new Error(
+        `No next sync token found for connected account ${connectedAccountId} in workspace ${workspaceId} during sync`,
+      );
+    }
+
+    startTime = Date.now();
+
+    await this.calendarChannelRepository.updateSyncCursor(
+      nextSyncToken,
+      calendarChannel.id,
+      workspaceId,
+    );
+
+    endTime = Date.now();
+
+    this.logger.log(
+      `google calendar sync for workspace ${workspaceId} and account ${connectedAccountId}: updating sync cursor in ${
+        endTime - startTime
+      }ms.`,
+    );
+
+    this.logger.log(
+      `google calendar sync for workspace ${workspaceId} and account ${connectedAccountId} ${
+        syncToken ? `and ${syncToken} syncToken ` : ''
+      }done.`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/services/providers/calendar-providers.module.ts b/packages/twenty-server/src/modules/calendar/services/providers/calendar-providers.module.ts
new file mode 100644
index 000000000000..67f8064f7adf
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/services/providers/calendar-providers.module.ts
@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+
+import { EnvironmentModule } from 'src/engine/integrations/environment/environment.module';
+import { GoogleCalendarClientProvider } from 'src/modules/calendar/services/providers/google-calendar/google-calendar.provider';
+
+@Module({
+  imports: [EnvironmentModule],
+  providers: [GoogleCalendarClientProvider],
+  exports: [GoogleCalendarClientProvider],
+})
+export class CalendarProvidersModule {}
diff --git a/packages/twenty-server/src/modules/calendar/services/providers/google-calendar/google-calendar.provider.ts b/packages/twenty-server/src/modules/calendar/services/providers/google-calendar/google-calendar.provider.ts
new file mode 100644
index 000000000000..6e2faa04e613
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/services/providers/google-calendar/google-calendar.provider.ts
@@ -0,0 +1,44 @@
+import { Injectable } from '@nestjs/common';
+
+import { OAuth2Client } from 'google-auth-library';
+import { calendar_v3 as calendarV3, google } from 'googleapis';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+
+@Injectable()
+export class GoogleCalendarClientProvider {
+  constructor(private readonly environmentService: EnvironmentService) {}
+
+  public async getGoogleCalendarClient(
+    refreshToken: string,
+  ): Promise<calendarV3.Calendar> {
+    const oAuth2Client = await this.getOAuth2Client(refreshToken);
+
+    const googleCalendarClient = google.calendar({
+      version: 'v3',
+      auth: oAuth2Client,
+    });
+
+    return googleCalendarClient;
+  }
+
+  private async getOAuth2Client(refreshToken: string): Promise<OAuth2Client> {
+    const googleCalendarClientId = this.environmentService.get(
+      'AUTH_GOOGLE_CLIENT_ID',
+    );
+    const googleCalendarClientSecret = this.environmentService.get(
+      'AUTH_GOOGLE_CLIENT_SECRET',
+    );
+
+    const oAuth2Client = new google.auth.OAuth2(
+      googleCalendarClientId,
+      googleCalendarClientSecret,
+    );
+
+    oAuth2Client.setCredentials({
+      refresh_token: refreshToken,
+    });
+
+    return oAuth2Client;
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata.ts b/packages/twenty-server/src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata.ts
new file mode 100644
index 000000000000..ca5d82590355
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata.ts
@@ -0,0 +1,53 @@
+import { FeatureFlagKeys } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { calendarChannelEventAssociationStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { Gate } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/gate.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { CalendarEventObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.calendarChannelEventAssociation,
+  namePlural: 'calendarChannelEventAssociations',
+  labelSingular: 'Calendar Channel Event Association',
+  labelPlural: 'Calendar Channel Event Associations',
+  description: 'Calendar Channel Event Associations',
+  icon: 'IconCalendar',
+})
+@IsSystem()
+@Gate({
+  featureFlag: FeatureFlagKeys.IsCalendarEnabled,
+})
+export class CalendarChannelEventAssociationObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: calendarChannelEventAssociationStandardFieldIds.calendarChannel,
+    type: FieldMetadataType.RELATION,
+    label: 'Channel ID',
+    description: 'Channel ID',
+    icon: 'IconCalendar',
+    joinColumn: 'calendarChannelId',
+  })
+  calendarChannel: CalendarEventObjectMetadata;
+
+  @FieldMetadata({
+    standardId: calendarChannelEventAssociationStandardFieldIds.calendarEvent,
+    type: FieldMetadataType.RELATION,
+    label: 'Event ID',
+    description: 'Event ID',
+    icon: 'IconCalendar',
+    joinColumn: 'calendarEventId',
+  })
+  calendarEvent: CalendarEventObjectMetadata;
+
+  @FieldMetadata({
+    standardId: calendarChannelEventAssociationStandardFieldIds.eventExternalId,
+    type: FieldMetadataType.TEXT,
+    label: 'Event external ID',
+    description: 'Event external ID',
+    icon: 'IconCalendar',
+  })
+  eventExternalId: string;
+}
diff --git a/packages/twenty-server/src/modules/calendar/standard-objects/calendar-channel.object-metadata.ts b/packages/twenty-server/src/modules/calendar/standard-objects/calendar-channel.object-metadata.ts
new file mode 100644
index 000000000000..d5ec0c1dd4a8
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/standard-objects/calendar-channel.object-metadata.ts
@@ -0,0 +1,123 @@
+import {
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { FeatureFlagKeys } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { calendarChannelStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { Gate } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/gate.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata';
+import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
+
+export enum CalendarChannelVisibility {
+  METADATA = 'METADATA',
+  SHARE_EVERYTHING = 'SHARE_EVERYTHING',
+}
+
+@ObjectMetadata({
+  standardId: standardObjectIds.calendarChannel,
+  namePlural: 'calendarChannels',
+  labelSingular: 'Calendar Channel',
+  labelPlural: 'Calendar Channels',
+  description: 'Calendar Channels',
+  icon: 'IconCalendar',
+})
+@IsSystem()
+@Gate({
+  featureFlag: FeatureFlagKeys.IsCalendarEnabled,
+})
+export class CalendarChannelObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: calendarChannelStandardFieldIds.connectedAccount,
+    type: FieldMetadataType.RELATION,
+    label: 'Connected Account',
+    description: 'Connected Account',
+    icon: 'IconUserCircle',
+    joinColumn: 'connectedAccountId',
+  })
+  connectedAccount: ConnectedAccountObjectMetadata;
+
+  @FieldMetadata({
+    standardId: calendarChannelStandardFieldIds.handle,
+    type: FieldMetadataType.TEXT,
+    label: 'Handle',
+    description: 'Handle',
+    icon: 'IconAt',
+  })
+  handle: string;
+
+  @FieldMetadata({
+    standardId: calendarChannelStandardFieldIds.visibility,
+    type: FieldMetadataType.SELECT,
+    label: 'Visibility',
+    description: 'Visibility',
+    icon: 'IconEyeglass',
+    options: [
+      {
+        value: CalendarChannelVisibility.METADATA,
+        label: 'Metadata',
+        position: 0,
+        color: 'green',
+      },
+      {
+        value: CalendarChannelVisibility.SHARE_EVERYTHING,
+        label: 'Share Everything',
+        position: 1,
+        color: 'orange',
+      },
+    ],
+    defaultValue: `'${CalendarChannelVisibility.SHARE_EVERYTHING}'`,
+  })
+  visibility: string;
+
+  @FieldMetadata({
+    standardId: calendarChannelStandardFieldIds.isContactAutoCreationEnabled,
+    type: FieldMetadataType.BOOLEAN,
+    label: 'Is Contact Auto Creation Enabled',
+    description: 'Is Contact Auto Creation Enabled',
+    icon: 'IconUserCircle',
+    defaultValue: true,
+  })
+  isContactAutoCreationEnabled: boolean;
+
+  @FieldMetadata({
+    standardId: calendarChannelStandardFieldIds.isSyncEnabled,
+    type: FieldMetadataType.BOOLEAN,
+    label: 'Is Sync Enabled',
+    description: 'Is Sync Enabled',
+    icon: 'IconRefresh',
+    defaultValue: true,
+  })
+  isSyncEnabled: boolean;
+
+  @FieldMetadata({
+    standardId: calendarChannelStandardFieldIds.syncCursor,
+    type: FieldMetadataType.TEXT,
+    label: 'Sync Cursor',
+    description:
+      'Sync Cursor. Used for syncing events from the calendar provider',
+    icon: 'IconReload',
+  })
+  syncCursor: string;
+
+  @FieldMetadata({
+    standardId:
+      calendarChannelStandardFieldIds.calendarChannelEventAssociations,
+    type: FieldMetadataType.RELATION,
+    label: 'Calendar Channel Event Associations',
+    description: 'Calendar Channel Event Associations',
+    icon: 'IconCalendar',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => CalendarChannelEventAssociationObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  calendarChannelEventAssociations: CalendarChannelEventAssociationObjectMetadata[];
+}
diff --git a/packages/twenty-server/src/modules/calendar/standard-objects/calendar-event-participant.object-metadata.ts b/packages/twenty-server/src/modules/calendar/standard-objects/calendar-event-participant.object-metadata.ts
new file mode 100644
index 000000000000..7de170d9f68f
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/standard-objects/calendar-event-participant.object-metadata.ts
@@ -0,0 +1,129 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { calendarEventParticipantStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { Gate } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/gate.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { CalendarEventObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event.object-metadata';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+export enum CalendarEventParticipantResponseStatus {
+  NEEDS_ACTION = 'NEEDS_ACTION',
+  DECLINED = 'DECLINED',
+  TENTATIVE = 'TENTATIVE',
+  ACCEPTED = 'ACCEPTED',
+}
+
+@ObjectMetadata({
+  standardId: standardObjectIds.calendarEventParticipant,
+  namePlural: 'calendarEventParticipants',
+  labelSingular: 'Calendar event participant',
+  labelPlural: 'Calendar event participants',
+  description: 'Calendar event participants',
+  icon: 'IconCalendar',
+})
+@IsSystem()
+@Gate({
+  featureFlag: 'IS_CALENDAR_ENABLED',
+})
+export class CalendarEventParticipantObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: calendarEventParticipantStandardFieldIds.calendarEvent,
+    type: FieldMetadataType.RELATION,
+    label: 'Event ID',
+    description: 'Event ID',
+    icon: 'IconCalendar',
+    joinColumn: 'calendarEventId',
+  })
+  calendarEvent: CalendarEventObjectMetadata;
+
+  @FieldMetadata({
+    standardId: calendarEventParticipantStandardFieldIds.handle,
+    type: FieldMetadataType.TEXT,
+    label: 'Handle',
+    description: 'Handle',
+    icon: 'IconMail',
+  })
+  handle: string;
+
+  @FieldMetadata({
+    standardId: calendarEventParticipantStandardFieldIds.displayName,
+    type: FieldMetadataType.TEXT,
+    label: 'Display Name',
+    description: 'Display Name',
+    icon: 'IconUser',
+  })
+  displayName: string;
+
+  @FieldMetadata({
+    standardId: calendarEventParticipantStandardFieldIds.isOrganizer,
+    type: FieldMetadataType.BOOLEAN,
+    label: 'Is Organizer',
+    description: 'Is Organizer',
+    icon: 'IconUser',
+    defaultValue: false,
+  })
+  isOrganizer: boolean;
+
+  @FieldMetadata({
+    standardId: calendarEventParticipantStandardFieldIds.responseStatus,
+    type: FieldMetadataType.SELECT,
+    label: 'Response Status',
+    description: 'Response Status',
+    icon: 'IconUser',
+    options: [
+      {
+        value: CalendarEventParticipantResponseStatus.NEEDS_ACTION,
+        label: 'Needs Action',
+        position: 0,
+        color: 'orange',
+      },
+      {
+        value: CalendarEventParticipantResponseStatus.DECLINED,
+        label: 'Declined',
+        position: 1,
+        color: 'red',
+      },
+      {
+        value: CalendarEventParticipantResponseStatus.TENTATIVE,
+        label: 'Tentative',
+        position: 2,
+        color: 'yellow',
+      },
+      {
+        value: CalendarEventParticipantResponseStatus.ACCEPTED,
+        label: 'Accepted',
+        position: 3,
+        color: 'green',
+      },
+    ],
+    defaultValue: `'${CalendarEventParticipantResponseStatus.NEEDS_ACTION}'`,
+  })
+  responseStatus: string;
+
+  @FieldMetadata({
+    standardId: calendarEventParticipantStandardFieldIds.person,
+    type: FieldMetadataType.RELATION,
+    label: 'Person',
+    description: 'Person',
+    icon: 'IconUser',
+    joinColumn: 'personId',
+  })
+  @IsNullable()
+  person: PersonObjectMetadata;
+
+  @FieldMetadata({
+    standardId: calendarEventParticipantStandardFieldIds.workspaceMember,
+    type: FieldMetadataType.RELATION,
+    label: 'Workspace Member',
+    description: 'Workspace Member',
+    icon: 'IconUser',
+    joinColumn: 'workspaceMemberId',
+  })
+  @IsNullable()
+  workspaceMember: WorkspaceMemberObjectMetadata;
+}
diff --git a/packages/twenty-server/src/modules/calendar/standard-objects/calendar-event.object-metadata.ts b/packages/twenty-server/src/modules/calendar/standard-objects/calendar-event.object-metadata.ts
new file mode 100644
index 000000000000..14c8b509a4e3
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/standard-objects/calendar-event.object-metadata.ts
@@ -0,0 +1,186 @@
+import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
+import { FeatureFlagKeys } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { Gate } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/gate.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata';
+import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { calendarEventStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { LinkMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/link.composite-type';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.calendarEvent,
+  namePlural: 'calendarEvents',
+  labelSingular: 'Calendar event',
+  labelPlural: 'Calendar events',
+  description: 'Calendar events',
+  icon: 'IconCalendar',
+})
+@IsSystem()
+@Gate({
+  featureFlag: FeatureFlagKeys.IsCalendarEnabled,
+})
+export class CalendarEventObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: calendarEventStandardFieldIds.title,
+    type: FieldMetadataType.TEXT,
+    label: 'Title',
+    description: 'Title',
+    icon: 'IconH1',
+  })
+  title: string;
+
+  @FieldMetadata({
+    standardId: calendarEventStandardFieldIds.isCanceled,
+    type: FieldMetadataType.BOOLEAN,
+    label: 'Is canceled',
+    description: 'Is canceled',
+    icon: 'IconCalendarCancel',
+  })
+  isCanceled: boolean;
+
+  @FieldMetadata({
+    standardId: calendarEventStandardFieldIds.isFullDay,
+    type: FieldMetadataType.BOOLEAN,
+    label: 'Is Full Day',
+    description: 'Is Full Day',
+    icon: 'Icon24Hours',
+  })
+  isFullDay: boolean;
+
+  @FieldMetadata({
+    standardId: calendarEventStandardFieldIds.startsAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Start Date',
+    description: 'Start Date',
+    icon: 'IconCalendarClock',
+  })
+  @IsNullable()
+  startsAt: string | null;
+
+  @FieldMetadata({
+    standardId: calendarEventStandardFieldIds.endsAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'End Date',
+    description: 'End Date',
+    icon: 'IconCalendarClock',
+  })
+  @IsNullable()
+  endsAt: string | null;
+
+  @FieldMetadata({
+    standardId: calendarEventStandardFieldIds.externalCreatedAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Creation DateTime',
+    description: 'Creation DateTime',
+    icon: 'IconCalendarPlus',
+  })
+  @IsNullable()
+  externalCreatedAt: string | null;
+
+  @FieldMetadata({
+    standardId: calendarEventStandardFieldIds.externalUpdatedAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Update DateTime',
+    description: 'Update DateTime',
+    icon: 'IconCalendarCog',
+  })
+  @IsNullable()
+  externalUpdatedAt: string | null;
+
+  @FieldMetadata({
+    standardId: calendarEventStandardFieldIds.description,
+    type: FieldMetadataType.TEXT,
+    label: 'Description',
+    description: 'Description',
+    icon: 'IconFileDescription',
+  })
+  description: string;
+
+  @FieldMetadata({
+    standardId: calendarEventStandardFieldIds.location,
+    type: FieldMetadataType.TEXT,
+    label: 'Location',
+    description: 'Location',
+    icon: 'IconMapPin',
+  })
+  location: string;
+
+  @FieldMetadata({
+    standardId: calendarEventStandardFieldIds.iCalUID,
+    type: FieldMetadataType.TEXT,
+    label: 'iCal UID',
+    description: 'iCal UID',
+    icon: 'IconKey',
+  })
+  iCalUID: string;
+
+  @FieldMetadata({
+    standardId: calendarEventStandardFieldIds.conferenceSolution,
+    type: FieldMetadataType.TEXT,
+    label: 'Conference Solution',
+    description: 'Conference Solution',
+    icon: 'IconScreenShare',
+  })
+  conferenceSolution: string;
+
+  @FieldMetadata({
+    standardId: calendarEventStandardFieldIds.conferenceLink,
+    type: FieldMetadataType.LINK,
+    label: 'Meet Link',
+    description: 'Meet Link',
+    icon: 'IconLink',
+  })
+  @IsNullable()
+  conferenceLink: LinkMetadata;
+
+  @FieldMetadata({
+    standardId: calendarEventStandardFieldIds.recurringEventExternalId,
+    type: FieldMetadataType.TEXT,
+    label: 'Recurring Event ID',
+    description: 'Recurring Event ID',
+    icon: 'IconHistory',
+  })
+  recurringEventExternalId: string;
+
+  @FieldMetadata({
+    standardId: calendarEventStandardFieldIds.calendarChannelEventAssociations,
+    type: FieldMetadataType.RELATION,
+    label: 'Calendar Channel Event Associations',
+    description: 'Calendar Channel Event Associations',
+    icon: 'IconCalendar',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => CalendarChannelEventAssociationObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+    inverseSideFieldKey: 'calendarEvent',
+  })
+  @Gate({
+    featureFlag: 'IS_CALENDAR_ENABLED',
+  })
+  calendarChannelEventAssociations: CalendarChannelEventAssociationObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: calendarEventStandardFieldIds.calendarEventParticipants,
+    type: FieldMetadataType.RELATION,
+    label: 'Event Participants',
+    description: 'Event Participants',
+    icon: 'IconUserCircle',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => CalendarEventParticipantObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  calendarEventParticipants: CalendarEventParticipantObjectMetadata[];
+}
diff --git a/packages/twenty-server/src/modules/calendar/types/calendar-event.ts b/packages/twenty-server/src/modules/calendar/types/calendar-event.ts
new file mode 100644
index 000000000000..72818b13110b
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/types/calendar-event.ts
@@ -0,0 +1,38 @@
+import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+import { CalendarEventObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event.object-metadata';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+
+export type CalendarEvent = Omit<
+  ObjectRecord<CalendarEventObjectMetadata>,
+  | 'createdAt'
+  | 'updatedAt'
+  | 'calendarChannelEventAssociations'
+  | 'calendarEventParticipants'
+  | 'conferenceLink'
+> & {
+  conferenceLinkLabel: string;
+  conferenceLinkUrl: string;
+};
+
+export type CalendarEventParticipant = Omit<
+  ObjectRecord<CalendarEventParticipantObjectMetadata>,
+  | 'id'
+  | 'createdAt'
+  | 'updatedAt'
+  | 'personId'
+  | 'workspaceMemberId'
+  | 'person'
+  | 'workspaceMember'
+  | 'calendarEvent'
+> & {
+  iCalUID: string;
+};
+
+export type CalendarEventWithParticipants = CalendarEvent & {
+  externalId: string;
+  participants: CalendarEventParticipant[];
+};
+
+export type CalendarEventParticipantWithId = CalendarEventParticipant & {
+  id: string;
+};
diff --git a/packages/twenty-server/src/modules/calendar/utils/format-google-calendar-event.util.ts b/packages/twenty-server/src/modules/calendar/utils/format-google-calendar-event.util.ts
new file mode 100644
index 000000000000..6636569261a2
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/utils/format-google-calendar-event.util.ts
@@ -0,0 +1,55 @@
+import { calendar_v3 as calendarV3 } from 'googleapis';
+import { v4 } from 'uuid';
+
+import { CalendarEventParticipantResponseStatus } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+import { CalendarEventWithParticipants } from 'src/modules/calendar/types/calendar-event';
+
+export const formatGoogleCalendarEvent = (
+  event: calendarV3.Schema$Event,
+  iCalUIDCalendarEventIdMap: Map<string, string>,
+): CalendarEventWithParticipants => {
+  const id =
+    (event.iCalUID && iCalUIDCalendarEventIdMap.get(event.iCalUID)) ?? v4();
+
+  const formatResponseStatus = (status: string | null | undefined) => {
+    switch (status) {
+      case 'accepted':
+        return CalendarEventParticipantResponseStatus.ACCEPTED;
+      case 'declined':
+        return CalendarEventParticipantResponseStatus.DECLINED;
+      case 'tentative':
+        return CalendarEventParticipantResponseStatus.TENTATIVE;
+      default:
+        return CalendarEventParticipantResponseStatus.NEEDS_ACTION;
+    }
+  };
+
+  return {
+    id,
+    title: event.summary ?? '',
+    isCanceled: event.status === 'cancelled',
+    isFullDay: event.start?.dateTime == null,
+    startsAt: event.start?.dateTime ?? event.start?.date ?? null,
+    endsAt: event.end?.dateTime ?? event.end?.date ?? null,
+    externalId: event.id ?? '',
+    externalCreatedAt: event.created ?? null,
+    externalUpdatedAt: event.updated ?? null,
+    description: event.description ?? '',
+    location: event.location ?? '',
+    iCalUID: event.iCalUID ?? '',
+    conferenceSolution:
+      event.conferenceData?.conferenceSolution?.key?.type ?? '',
+    conferenceLinkLabel: event.conferenceData?.entryPoints?.[0]?.uri ?? '',
+    conferenceLinkUrl: event.conferenceData?.entryPoints?.[0]?.uri ?? '',
+    recurringEventExternalId: event.recurringEventId ?? '',
+    participants:
+      event.attendees?.map((attendee) => ({
+        calendarEventId: id,
+        iCalUID: event.iCalUID ?? '',
+        handle: attendee.email ?? '',
+        displayName: attendee.displayName ?? '',
+        isOrganizer: attendee.organizer === true,
+        responseStatus: formatResponseStatus(attendee.responseStatus),
+      })) ?? [],
+  };
+};
diff --git a/packages/twenty-server/src/modules/calendar/utils/getFlattenedValuesAndValuesStringForBatchRawQuery.util.ts b/packages/twenty-server/src/modules/calendar/utils/getFlattenedValuesAndValuesStringForBatchRawQuery.util.ts
new file mode 100644
index 000000000000..73c7c6eb1bb1
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/utils/getFlattenedValuesAndValuesStringForBatchRawQuery.util.ts
@@ -0,0 +1,56 @@
+export const valuesStringForBatchRawQuery = (
+  values: {
+    [key: string]: any;
+  }[],
+  typesArray: string[] = [],
+) => {
+  const castedValues = values.reduce((acc, _, rowIndex) => {
+    const numberOfColumns = typesArray.length;
+
+    const rowValues = Array.from(
+      { length: numberOfColumns },
+      (_, columnIndex) => {
+        const placeholder = `$${rowIndex * numberOfColumns + columnIndex + 1}`;
+        const typeCast = typesArray[columnIndex]
+          ? `::${typesArray[columnIndex]}`
+          : '';
+
+        return `${placeholder}${typeCast}`;
+      },
+    ).join(', ');
+
+    acc.push(`(${rowValues})`);
+
+    return acc;
+  }, [] as string[]);
+
+  return castedValues.join(', ');
+};
+
+export const getFlattenedValuesAndValuesStringForBatchRawQuery = (
+  values: {
+    [key: string]: any;
+  }[],
+  keyTypeMap: {
+    [key: string]: string;
+  },
+): {
+  flattenedValues: any[];
+  valuesString: string;
+} => {
+  const keysToInsert = Object.keys(keyTypeMap);
+
+  const flattenedValues = values.flatMap((value) =>
+    keysToInsert.map((key) => value[key]),
+  );
+
+  const valuesString = valuesStringForBatchRawQuery(
+    values,
+    Object.values(keyTypeMap),
+  );
+
+  return {
+    flattenedValues,
+    valuesString,
+  };
+};
diff --git a/packages/twenty-server/src/modules/calendar/utils/google-calendar-search-filter.util.ts b/packages/twenty-server/src/modules/calendar/utils/google-calendar-search-filter.util.ts
new file mode 100644
index 000000000000..2563c0d05841
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/utils/google-calendar-search-filter.util.ts
@@ -0,0 +1,9 @@
+export const googleCalendarSearchFilterExcludeEmails = (
+  emails: string[],
+): string | undefined => {
+  if (emails.length === 0) {
+    return undefined;
+  }
+
+  return `email=-${emails.join(', -')}`;
+};
diff --git a/packages/twenty-server/src/modules/company/repositories/company.repository.ts b/packages/twenty-server/src/modules/company/repositories/company.repository.ts
new file mode 100644
index 000000000000..162ee88c84ee
--- /dev/null
+++ b/packages/twenty-server/src/modules/company/repositories/company.repository.ts
@@ -0,0 +1,60 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+
+export type CompanyToCreate = {
+  id: string;
+  domainName: string;
+  name?: string;
+  city?: string;
+};
+
+@Injectable()
+export class CompanyRepository {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async getExistingCompaniesByDomainNames(
+    domainNames: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<{ id: string; domainName: string }[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const existingCompanies =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `SELECT id, "domainName" FROM ${dataSourceSchema}.company WHERE "domainName" = ANY($1)`,
+        [domainNames],
+        workspaceId,
+        transactionManager,
+      );
+
+    return existingCompanies;
+  }
+
+  public async createCompany(
+    workspaceId: string,
+    companyToCreate: CompanyToCreate,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `INSERT INTO ${dataSourceSchema}.company (id, "domainName", name, address)
+      VALUES ($1, $2, $3, $4)`,
+      [
+        companyToCreate.id,
+        companyToCreate.domainName,
+        companyToCreate.name ?? '',
+        companyToCreate.city ?? '',
+      ],
+      workspaceId,
+      transactionManager,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/company/standard-objects/company.object-metadata.ts b/packages/twenty-server/src/modules/company/standard-objects/company.object-metadata.ts
new file mode 100644
index 000000000000..78ebe912efb7
--- /dev/null
+++ b/packages/twenty-server/src/modules/company/standard-objects/company.object-metadata.ts
@@ -0,0 +1,228 @@
+import { CurrencyMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/currency.composite-type';
+import { LinkMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/link.composite-type';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { companyStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
+import { ActivityTargetObjectMetadata } from 'src/modules/activity/standard-objects/activity-target.object-metadata';
+import { AttachmentObjectMetadata } from 'src/modules/attachment/standard-objects/attachment.object-metadata';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { FavoriteObjectMetadata } from 'src/modules/favorite/standard-objects/favorite.object-metadata';
+import { OpportunityObjectMetadata } from 'src/modules/opportunity/standard-objects/opportunity.object-metadata';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+import { EventObjectMetadata } from 'src/modules/event/standard-objects/event.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.company,
+  namePlural: 'companies',
+  labelSingular: 'Company',
+  labelPlural: 'Companies',
+  description: 'A company',
+  icon: 'IconBuildingSkyscraper',
+})
+export class CompanyObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.name,
+    type: FieldMetadataType.TEXT,
+    label: 'Name',
+    description: 'The company name',
+    icon: 'IconBuildingSkyscraper',
+  })
+  name: string;
+
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.domainName,
+    type: FieldMetadataType.TEXT,
+    label: 'Domain Name',
+    description:
+      'The company website URL. We use this url to fetch the company icon',
+    icon: 'IconLink',
+  })
+  domainName?: string;
+
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.address,
+    type: FieldMetadataType.TEXT,
+    label: 'Address',
+    description: 'The company address',
+    icon: 'IconMap',
+  })
+  address: string;
+
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.employees,
+    type: FieldMetadataType.NUMBER,
+    label: 'Employees',
+    description: 'Number of employees in the company',
+    icon: 'IconUsers',
+  })
+  @IsNullable()
+  employees: number;
+
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.linkedinLink,
+    type: FieldMetadataType.LINK,
+    label: 'Linkedin',
+    description: 'The company Linkedin account',
+    icon: 'IconBrandLinkedin',
+  })
+  @IsNullable()
+  linkedinLink: LinkMetadata;
+
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.xLink,
+    type: FieldMetadataType.LINK,
+    label: 'X',
+    description: 'The company Twitter/X account',
+    icon: 'IconBrandX',
+  })
+  @IsNullable()
+  xLink: LinkMetadata;
+
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.annualRecurringRevenue,
+    type: FieldMetadataType.CURRENCY,
+    label: 'ARR',
+    description:
+      'Annual Recurring Revenue: The actual or estimated annual revenue of the company',
+    icon: 'IconMoneybag',
+  })
+  @IsNullable()
+  annualRecurringRevenue: CurrencyMetadata;
+
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.idealCustomerProfile,
+    type: FieldMetadataType.BOOLEAN,
+    label: 'ICP',
+    description:
+      'Ideal Customer Profile:  Indicates whether the company is the most suitable and valuable customer for you',
+    icon: 'IconTarget',
+    defaultValue: false,
+  })
+  idealCustomerProfile: boolean;
+
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.position,
+    type: FieldMetadataType.POSITION,
+    label: 'Position',
+    description: 'Company record position',
+    icon: 'IconHierarchy2',
+  })
+  @IsSystem()
+  @IsNullable()
+  position: number;
+
+  // Relations
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.people,
+    type: FieldMetadataType.RELATION,
+    label: 'People',
+    description: 'People linked to the company.',
+    icon: 'IconUsers',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => PersonObjectMetadata,
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  @IsNullable()
+  people: PersonObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.accountOwner,
+    type: FieldMetadataType.RELATION,
+    label: 'Account Owner',
+    description:
+      'Your team member responsible for managing the company account',
+    icon: 'IconUserCircle',
+    joinColumn: 'accountOwnerId',
+  })
+  @IsNullable()
+  accountOwner: WorkspaceMemberObjectMetadata;
+
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.activityTargets,
+    type: FieldMetadataType.RELATION,
+    label: 'Activities',
+    description: 'Activities tied to the company',
+    icon: 'IconCheckbox',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => ActivityTargetObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  activityTargets: ActivityTargetObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.opportunities,
+    type: FieldMetadataType.RELATION,
+    label: 'Opportunities',
+    description: 'Opportunities linked to the company.',
+    icon: 'IconTargetArrow',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => OpportunityObjectMetadata,
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  @IsNullable()
+  opportunities: OpportunityObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.favorites,
+    type: FieldMetadataType.RELATION,
+    label: 'Favorites',
+    description: 'Favorites linked to the company',
+    icon: 'IconHeart',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => FavoriteObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  @IsSystem()
+  favorites: FavoriteObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.attachments,
+    type: FieldMetadataType.RELATION,
+    label: 'Attachments',
+    description: 'Attachments linked to the company.',
+    icon: 'IconFileImport',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => AttachmentObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  attachments: AttachmentObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: companyStandardFieldIds.events,
+    type: FieldMetadataType.RELATION,
+    label: 'Events',
+    description: 'Events linked to the company',
+    icon: 'IconIconTimelineEvent',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => EventObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  @IsSystem()
+  events: EventObjectMetadata[];
+}
diff --git a/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/auto-companies-and-contacts-creation.module.ts b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/auto-companies-and-contacts-creation.module.ts
new file mode 100644
index 000000000000..9acc759785a5
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/auto-companies-and-contacts-creation.module.ts
@@ -0,0 +1,34 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { CreateCompanyAndContactService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/services/create-company-and-contact.service';
+import { CreateCompanyModule } from 'src/modules/connected-account/auto-companies-and-contacts-creation/create-company/create-company.module';
+import { CreateContactModule } from 'src/modules/connected-account/auto-companies-and-contacts-creation/create-contact/create-contact.module';
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+import { MessageParticipantModule } from 'src/modules/messaging/services/message-participant/message-participant.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { CreateCompanyAndContactListener } from 'src/modules/connected-account/auto-companies-and-contacts-creation/listeners/create-company-and-contact.listener';
+import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+import { CalendarEventParticipantModule } from 'src/modules/calendar/services/calendar-event-participant/calendar-event-participant.module';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+
+@Module({
+  imports: [
+    CreateContactModule,
+    CreateCompanyModule,
+    ObjectMetadataRepositoryModule.forFeature([
+      PersonObjectMetadata,
+      WorkspaceMemberObjectMetadata,
+      CalendarEventParticipantObjectMetadata,
+    ]),
+    MessageParticipantModule,
+    WorkspaceDataSourceModule,
+    CalendarEventParticipantModule,
+    TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
+  ],
+  providers: [CreateCompanyAndContactService, CreateCompanyAndContactListener],
+  exports: [CreateCompanyAndContactService],
+})
+export class AutoCompaniesAndContactsCreationModule {}
diff --git a/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/create-company/create-company.module.ts b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/create-company/create-company.module.ts
new file mode 100644
index 000000000000..c353146d8dcb
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/create-company/create-company.module.ts
@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
+import { CreateCompanyService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/create-company/create-company.service';
+
+@Module({
+  imports: [ObjectMetadataRepositoryModule.forFeature([CompanyObjectMetadata])],
+  providers: [CreateCompanyService],
+  exports: [CreateCompanyService],
+})
+export class CreateCompanyModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/services/create-company/create-company.service.ts b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/create-company/create-company.service.ts
similarity index 76%
rename from packages/twenty-server/src/workspace/messaging/services/create-company/create-company.service.ts
rename to packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/create-company/create-company.service.ts
index aaed6b0de4d6..57397208702d 100644
--- a/packages/twenty-server/src/workspace/messaging/services/create-company/create-company.service.ts
+++ b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/create-company/create-company.service.ts
@@ -4,13 +4,18 @@ import { EntityManager } from 'typeorm';
 import { v4 } from 'uuid';
 import axios, { AxiosInstance } from 'axios';
 
-import { CompanyService } from 'src/workspace/messaging/repositories/company/company.service';
-import { getCompanyNameFromDomainName } from 'src/workspace/messaging/utils/get-company-name-from-domain-name.util';
+import { CompanyRepository } from 'src/modules/company/repositories/company.repository';
+import { getCompanyNameFromDomainName } from 'src/modules/messaging/utils/get-company-name-from-domain-name.util';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
 @Injectable()
 export class CreateCompanyService {
   private readonly httpService: AxiosInstance;
 
-  constructor(private readonly companyService: CompanyService) {
+  constructor(
+    @InjectObjectMetadataRepository(CompanyObjectMetadata)
+    private readonly companyRepository: CompanyRepository,
+  ) {
     this.httpService = axios.create({
       baseURL: 'https://companies.twenty.com',
     });
@@ -23,10 +28,14 @@ export class CreateCompanyService {
   ): Promise<{
     [domainName: string]: string;
   }> {
+    if (domainNames.length === 0) {
+      return {};
+    }
+
     const uniqueDomainNames = [...new Set(domainNames)];
 
     const existingCompanies =
-      await this.companyService.getExistingCompaniesByDomainNames(
+      await this.companyRepository.getExistingCompaniesByDomainNames(
         uniqueDomainNames,
         workspaceId,
         transactionManager,
@@ -76,7 +85,7 @@ export class CreateCompanyService {
 
     const { name, city } = await this.getCompanyInfoFromDomainName(domainName);
 
-    this.companyService.createCompany(
+    this.companyRepository.createCompany(
       workspaceId,
       {
         id: companyId,
diff --git a/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/create-contact/create-contact.module.ts b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/create-contact/create-contact.module.ts
new file mode 100644
index 000000000000..bd3eaa1bde6f
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/create-contact/create-contact.module.ts
@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { CreateContactService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/create-contact/create-contact.service';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+
+@Module({
+  imports: [ObjectMetadataRepositoryModule.forFeature([PersonObjectMetadata])],
+  providers: [CreateContactService],
+  exports: [CreateContactService],
+})
+export class CreateContactModule {}
diff --git a/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/create-contact/create-contact.service.ts b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/create-contact/create-contact.service.ts
new file mode 100644
index 000000000000..be3db3574917
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/create-contact/create-contact.service.ts
@@ -0,0 +1,68 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+import { v4 } from 'uuid';
+
+import { PersonRepository } from 'src/modules/person/repositories/person.repository';
+import { getFirstNameAndLastNameFromHandleAndDisplayName } from 'src/modules/messaging/utils/get-first-name-and-last-name-from-handle-and-display-name.util';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+
+type ContactToCreate = {
+  handle: string;
+  displayName: string;
+  companyId?: string;
+};
+
+type FormattedContactToCreate = {
+  id: string;
+  handle: string;
+  firstName: string;
+  lastName: string;
+  companyId?: string;
+};
+
+@Injectable()
+export class CreateContactService {
+  constructor(
+    @InjectObjectMetadataRepository(PersonObjectMetadata)
+    private readonly personRepository: PersonRepository,
+  ) {}
+
+  public formatContacts(
+    contactsToCreate: ContactToCreate[],
+  ): FormattedContactToCreate[] {
+    return contactsToCreate.map((contact) => {
+      const id = v4();
+
+      const { handle, displayName, companyId } = contact;
+
+      const { firstName, lastName } =
+        getFirstNameAndLastNameFromHandleAndDisplayName(handle, displayName);
+
+      return {
+        id,
+        handle,
+        firstName,
+        lastName,
+        companyId,
+      };
+    });
+  }
+
+  public async createContacts(
+    contactsToCreate: ContactToCreate[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    if (contactsToCreate.length === 0) return;
+
+    const formattedContacts = this.formatContacts(contactsToCreate);
+
+    await this.personRepository.createPeople(
+      formattedContacts,
+      workspaceId,
+      transactionManager,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/jobs/create-company-and-contact.job.ts b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/jobs/create-company-and-contact.job.ts
new file mode 100644
index 000000000000..e9717649c5bc
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/jobs/create-company-and-contact.job.ts
@@ -0,0 +1,36 @@
+import { Injectable } from '@nestjs/common';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { CreateCompanyAndContactService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/services/create-company-and-contact.service';
+
+export type CreateCompanyAndContactJobData = {
+  workspaceId: string;
+  connectedAccountHandle: string;
+  contactsToCreate: {
+    displayName: string;
+    handle: string;
+  }[];
+};
+
+@Injectable()
+export class CreateCompanyAndContactJob
+  implements MessageQueueJob<CreateCompanyAndContactJobData>
+{
+  constructor(
+    private readonly createCompanyAndContactService: CreateCompanyAndContactService,
+  ) {}
+
+  async handle(data: CreateCompanyAndContactJobData): Promise<void> {
+    const { workspaceId, connectedAccountHandle, contactsToCreate } = data;
+
+    await this.createCompanyAndContactService.createCompaniesAndContactsAndUpdateParticipants(
+      connectedAccountHandle,
+      contactsToCreate.map((contact) => ({
+        handle: contact.handle,
+        displayName: contact.displayName,
+      })),
+      workspaceId,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/listeners/create-company-and-contact.listener.ts b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/listeners/create-company-and-contact.listener.ts
new file mode 100644
index 000000000000..40b8741b095d
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/listeners/create-company-and-contact.listener.ts
@@ -0,0 +1,32 @@
+import { Injectable, Inject } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import {
+  CreateCompanyAndContactJobData,
+  CreateCompanyAndContactJob,
+} from 'src/modules/connected-account/auto-companies-and-contacts-creation/jobs/create-company-and-contact.job';
+
+@Injectable()
+export class CreateCompanyAndContactListener {
+  constructor(
+    @Inject(MessageQueue.contactCreationQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {}
+
+  @OnEvent('createContacts')
+  async handleContactCreationEvent(payload: {
+    workspaceId: string;
+    connectedAccountHandle: string;
+    contactsToCreate: {
+      displayName: string;
+      handle: string;
+    }[];
+  }) {
+    await this.messageQueueService.add<CreateCompanyAndContactJobData>(
+      CreateCompanyAndContactJob.name,
+      payload,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/services/create-company-and-contact.service.ts b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/services/create-company-and-contact.service.ts
new file mode 100644
index 000000000000..c205753b08fc
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/services/create-company-and-contact.service.ts
@@ -0,0 +1,174 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { EntityManager, Repository } from 'typeorm';
+import compact from 'lodash/compact';
+
+import { getDomainNameFromHandle } from 'src/modules/messaging/utils/get-domain-name-from-handle.util';
+import { CreateCompanyService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/create-company/create-company.service';
+import { CreateContactService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/create-contact/create-contact.service';
+import { PersonRepository } from 'src/modules/person/repositories/person.repository';
+import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
+import { isWorkEmail } from 'src/utils/is-work-email';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+import { getUniqueContactsAndHandles } from 'src/modules/connected-account/auto-companies-and-contacts-creation/utils/get-unique-contacts-and-handles.util';
+import { Contacts } from 'src/modules/connected-account/auto-companies-and-contacts-creation/types/contact.type';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { MessageParticipantService } from 'src/modules/messaging/services/message-participant/message-participant.service';
+import { CalendarEventParticipantService } from 'src/modules/calendar/services/calendar-event-participant/calendar-event-participant.service';
+import { filterOutContactsFromCompanyOrWorkspace } from 'src/modules/connected-account/auto-companies-and-contacts-creation/utils/filter-out-contacts-from-company-or-workspace.util';
+import {
+  FeatureFlagEntity,
+  FeatureFlagKeys,
+} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+
+@Injectable()
+export class CreateCompanyAndContactService {
+  constructor(
+    private readonly createContactService: CreateContactService,
+    private readonly createCompaniesService: CreateCompanyService,
+    @InjectObjectMetadataRepository(PersonObjectMetadata)
+    private readonly personRepository: PersonRepository,
+    @InjectObjectMetadataRepository(WorkspaceMemberObjectMetadata)
+    private readonly workspaceMemberRepository: WorkspaceMemberRepository,
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+    private readonly messageParticipantService: MessageParticipantService,
+    private readonly calendarEventParticipantService: CalendarEventParticipantService,
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+  ) {}
+
+  async createCompaniesAndContacts(
+    connectedAccountHandle: string,
+    contactsToCreate: Contacts,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    if (!contactsToCreate || contactsToCreate.length === 0) {
+      return;
+    }
+
+    // TODO: This is a feature that may be implemented in the future
+    const isContactAutoCreationForNonWorkEmailsEnabled = false;
+
+    const workspaceMembers =
+      await this.workspaceMemberRepository.getAllByWorkspaceId(
+        workspaceId,
+        transactionManager,
+      );
+
+    const contactsToCreateFromOtherCompanies =
+      filterOutContactsFromCompanyOrWorkspace(
+        contactsToCreate,
+        connectedAccountHandle,
+        workspaceMembers,
+      );
+
+    const { uniqueContacts, uniqueHandles } = getUniqueContactsAndHandles(
+      contactsToCreateFromOtherCompanies,
+    );
+
+    if (uniqueHandles.length === 0) {
+      return;
+    }
+
+    const alreadyCreatedContacts = await this.personRepository.getByEmails(
+      uniqueHandles,
+      workspaceId,
+      transactionManager,
+    );
+
+    const alreadyCreatedContactEmails: string[] = alreadyCreatedContacts?.map(
+      ({ email }) => email,
+    );
+
+    const filteredContactsToCreate = uniqueContacts.filter(
+      (participant) =>
+        !alreadyCreatedContactEmails.includes(participant.handle) &&
+        participant.handle.includes('@') &&
+        (isContactAutoCreationForNonWorkEmailsEnabled ||
+          isWorkEmail(participant.handle)),
+    );
+
+    const filteredContactsToCreateWithCompanyDomainNames =
+      filteredContactsToCreate?.map((participant) => ({
+        handle: participant.handle,
+        displayName: participant.displayName,
+        companyDomainName: isWorkEmail(participant.handle)
+          ? getDomainNameFromHandle(participant.handle)
+          : undefined,
+      }));
+
+    const domainNamesToCreate = compact(
+      filteredContactsToCreateWithCompanyDomainNames.map(
+        (participant) => participant.companyDomainName,
+      ),
+    );
+
+    const companiesObject = await this.createCompaniesService.createCompanies(
+      domainNamesToCreate,
+      workspaceId,
+      transactionManager,
+    );
+
+    const formattedContactsToCreate =
+      filteredContactsToCreateWithCompanyDomainNames.map((contact) => ({
+        handle: contact.handle,
+        displayName: contact.displayName,
+        companyId:
+          contact.companyDomainName && contact.companyDomainName !== ''
+            ? companiesObject[contact.companyDomainName]
+            : undefined,
+      }));
+
+    await this.createContactService.createContacts(
+      formattedContactsToCreate,
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  async createCompaniesAndContactsAndUpdateParticipants(
+    connectedAccountHandle: string,
+    contactsToCreate: Contacts,
+    workspaceId: string,
+  ) {
+    const { dataSource: workspaceDataSource } =
+      await this.workspaceDataSourceService.connectedToWorkspaceDataSourceAndReturnMetadata(
+        workspaceId,
+      );
+
+    await workspaceDataSource?.transaction(
+      async (transactionManager: EntityManager) => {
+        await this.createCompaniesAndContacts(
+          connectedAccountHandle,
+          contactsToCreate,
+          workspaceId,
+          transactionManager,
+        );
+
+        await this.messageParticipantService.updateMessageParticipantsAfterPeopleCreation(
+          workspaceId,
+          transactionManager,
+        );
+
+        const isCalendarEnabled = await this.featureFlagRepository.findOneBy({
+          workspaceId,
+          key: FeatureFlagKeys.IsCalendarEnabled,
+          value: true,
+        });
+
+        if (!isCalendarEnabled || !isCalendarEnabled.value) {
+          return;
+        }
+
+        await this.calendarEventParticipantService.updateCalendarEventParticipantsAfterPeopleCreation(
+          workspaceId,
+          transactionManager,
+        );
+      },
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/types/contact.type.ts b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/types/contact.type.ts
new file mode 100644
index 000000000000..0cd41a5b768c
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/types/contact.type.ts
@@ -0,0 +1,6 @@
+export type Contact = {
+  handle: string;
+  displayName: string;
+};
+
+export type Contacts = Contact[];
diff --git a/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/utils/__tests__/get-unique-contacts-and-handles.spec.ts b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/utils/__tests__/get-unique-contacts-and-handles.spec.ts
new file mode 100644
index 000000000000..87537a8e88b4
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/utils/__tests__/get-unique-contacts-and-handles.spec.ts
@@ -0,0 +1,32 @@
+import { Contacts } from 'src/modules/connected-account/auto-companies-and-contacts-creation/types/contact.type';
+import { getUniqueContactsAndHandles } from 'src/modules/connected-account/auto-companies-and-contacts-creation/utils/get-unique-contacts-and-handles.util';
+
+describe('getUniqueContactsAndHandles', () => {
+  it('should return empty arrays when contacts is empty', () => {
+    const contacts: Contacts = [];
+    const result = getUniqueContactsAndHandles(contacts);
+
+    expect(result.uniqueContacts).toEqual([]);
+    expect(result.uniqueHandles).toEqual([]);
+  });
+
+  it('should return unique contacts and handles', () => {
+    const contacts: Contacts = [
+      { handle: 'john@twenty.com', displayName: 'John Doe' },
+      { handle: 'john@twenty.com', displayName: 'John Doe' },
+      { handle: 'jane@twenty.com', displayName: 'Jane Smith' },
+      { handle: 'jane@twenty.com', displayName: 'Jane Smith' },
+      { handle: 'jane@twenty.com', displayName: 'Jane Smith' },
+    ];
+    const result = getUniqueContactsAndHandles(contacts);
+
+    expect(result.uniqueContacts).toEqual([
+      { handle: 'john@twenty.com', displayName: 'John Doe' },
+      { handle: 'jane@twenty.com', displayName: 'Jane Smith' },
+    ]);
+    expect(result.uniqueHandles).toEqual([
+      'john@twenty.com',
+      'jane@twenty.com',
+    ]);
+  });
+});
diff --git a/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/utils/filter-out-contacts-from-company-or-workspace.util.ts b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/utils/filter-out-contacts-from-company-or-workspace.util.ts
new file mode 100644
index 000000000000..37e52e333da5
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/utils/filter-out-contacts-from-company-or-workspace.util.ts
@@ -0,0 +1,27 @@
+import { getDomainNameFromHandle } from 'src/modules/messaging/utils/get-domain-name-from-handle.util';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+import { Contacts } from 'src/modules/connected-account/auto-companies-and-contacts-creation/types/contact.type';
+
+export function filterOutContactsFromCompanyOrWorkspace(
+  contacts: Contacts,
+  selfHandle: string,
+  workspaceMembers: ObjectRecord<WorkspaceMemberObjectMetadata>[],
+): Contacts {
+  const selfDomainName = getDomainNameFromHandle(selfHandle);
+
+  const workspaceMembersMap = workspaceMembers.reduce(
+    (map, workspaceMember) => {
+      map[workspaceMember.userEmail] = true;
+
+      return map;
+    },
+    new Map<string, boolean>(),
+  );
+
+  return contacts.filter(
+    (contact) =>
+      getDomainNameFromHandle(contact.handle) !== selfDomainName &&
+      !workspaceMembersMap[contact.handle],
+  );
+}
diff --git a/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/utils/get-unique-contacts-and-handles.util.ts b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/utils/get-unique-contacts-and-handles.util.ts
new file mode 100644
index 000000000000..a6296e3d982a
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/utils/get-unique-contacts-and-handles.util.ts
@@ -0,0 +1,19 @@
+import uniq from 'lodash.uniq';
+import uniqBy from 'lodash.uniqby';
+
+import { Contacts } from 'src/modules/connected-account/auto-companies-and-contacts-creation/types/contact.type';
+
+export function getUniqueContactsAndHandles(contacts: Contacts): {
+  uniqueContacts: Contacts;
+  uniqueHandles: string[];
+} {
+  if (contacts.length === 0) {
+    return { uniqueContacts: [], uniqueHandles: [] };
+  }
+
+  const uniqueHandles = uniq(contacts.map((participant) => participant.handle));
+
+  const uniqueContacts = uniqBy(contacts, 'handle');
+
+  return { uniqueContacts, uniqueHandles };
+}
diff --git a/packages/twenty-server/src/modules/connected-account/jobs/match-participant.job.ts b/packages/twenty-server/src/modules/connected-account/jobs/match-participant.job.ts
new file mode 100644
index 000000000000..726a47d7c36f
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/jobs/match-participant.job.ts
@@ -0,0 +1,60 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import {
+  FeatureFlagEntity,
+  FeatureFlagKeys,
+} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { CalendarEventParticipantService } from 'src/modules/calendar/services/calendar-event-participant/calendar-event-participant.service';
+import { MessageParticipantService } from 'src/modules/messaging/services/message-participant/message-participant.service';
+
+export type MatchParticipantJobData = {
+  workspaceId: string;
+  email: string;
+  personId?: string;
+  workspaceMemberId?: string;
+};
+
+@Injectable()
+export class MatchParticipantJob
+  implements MessageQueueJob<MatchParticipantJobData>
+{
+  constructor(
+    private readonly messageParticipantService: MessageParticipantService,
+    private readonly calendarEventParticipantService: CalendarEventParticipantService,
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+  ) {}
+
+  async handle(data: MatchParticipantJobData): Promise<void> {
+    const { workspaceId, email, personId, workspaceMemberId } = data;
+
+    await this.messageParticipantService.matchMessageParticipants(
+      workspaceId,
+      email,
+      personId,
+      workspaceMemberId,
+    );
+
+    const isCalendarEnabled = await this.featureFlagRepository.findOneBy({
+      workspaceId,
+      key: FeatureFlagKeys.IsCalendarEnabled,
+      value: true,
+    });
+
+    if (!isCalendarEnabled || !isCalendarEnabled.value) {
+      return;
+    }
+
+    await this.calendarEventParticipantService.matchCalendarEventParticipants(
+      workspaceId,
+      email,
+      personId,
+      workspaceMemberId,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/connected-account/jobs/unmatch-participant.job.ts b/packages/twenty-server/src/modules/connected-account/jobs/unmatch-participant.job.ts
new file mode 100644
index 000000000000..539d6c38b6a5
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/jobs/unmatch-participant.job.ts
@@ -0,0 +1,60 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import {
+  FeatureFlagEntity,
+  FeatureFlagKeys,
+} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { CalendarEventParticipantService } from 'src/modules/calendar/services/calendar-event-participant/calendar-event-participant.service';
+import { MessageParticipantService } from 'src/modules/messaging/services/message-participant/message-participant.service';
+
+export type UnmatchParticipantJobData = {
+  workspaceId: string;
+  email: string;
+  personId?: string;
+  workspaceMemberId?: string;
+};
+
+@Injectable()
+export class UnmatchParticipantJob
+  implements MessageQueueJob<UnmatchParticipantJobData>
+{
+  constructor(
+    private readonly messageParticipantService: MessageParticipantService,
+    private readonly calendarEventParticipantService: CalendarEventParticipantService,
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+  ) {}
+
+  async handle(data: UnmatchParticipantJobData): Promise<void> {
+    const { workspaceId, email, personId, workspaceMemberId } = data;
+
+    await this.messageParticipantService.unmatchMessageParticipants(
+      workspaceId,
+      email,
+      personId,
+      workspaceMemberId,
+    );
+
+    const isCalendarEnabled = await this.featureFlagRepository.findOneBy({
+      workspaceId,
+      key: FeatureFlagKeys.IsCalendarEnabled,
+      value: true,
+    });
+
+    if (!isCalendarEnabled || !isCalendarEnabled.value) {
+      return;
+    }
+
+    await this.calendarEventParticipantService.unmatchCalendarEventParticipants(
+      workspaceId,
+      email,
+      personId,
+      workspaceMemberId,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/connected-account/listeners/participant-person.listener.ts b/packages/twenty-server/src/modules/connected-account/listeners/participant-person.listener.ts
new file mode 100644
index 000000000000..2bd0e61096e5
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/listeners/participant-person.listener.ts
@@ -0,0 +1,73 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+
+import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/types/object-record-create.event';
+import { ObjectRecordUpdateEvent } from 'src/engine/integrations/event-emitter/types/object-record-update.event';
+import { objectRecordChangedProperties as objectRecordUpdateEventChangedProperties } from 'src/engine/integrations/event-emitter/utils/object-record-changed-properties.util';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import {
+  MatchParticipantJob,
+  MatchParticipantJobData,
+} from 'src/modules/connected-account/jobs/match-participant.job';
+import {
+  UnmatchParticipantJobData,
+  UnmatchParticipantJob,
+} from 'src/modules/connected-account/jobs/unmatch-participant.job';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+
+@Injectable()
+export class ParticipantPersonListener {
+  constructor(
+    @Inject(MessageQueue.messagingQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {}
+
+  @OnEvent('person.created')
+  async handleCreatedEvent(
+    payload: ObjectRecordCreateEvent<PersonObjectMetadata>,
+  ) {
+    if (payload.details.after.email === null) {
+      return;
+    }
+
+    await this.messageQueueService.add<MatchParticipantJobData>(
+      MatchParticipantJob.name,
+      {
+        workspaceId: payload.workspaceId,
+        email: payload.details.after.email,
+        personId: payload.recordId,
+      },
+    );
+  }
+
+  @OnEvent('person.updated')
+  async handleUpdatedEvent(
+    payload: ObjectRecordUpdateEvent<PersonObjectMetadata>,
+  ) {
+    if (
+      objectRecordUpdateEventChangedProperties(
+        payload.details.before,
+        payload.details.after,
+      ).includes('email')
+    ) {
+      await this.messageQueueService.add<UnmatchParticipantJobData>(
+        UnmatchParticipantJob.name,
+        {
+          workspaceId: payload.workspaceId,
+          email: payload.details.before.email,
+          personId: payload.recordId,
+        },
+      );
+
+      await this.messageQueueService.add<MatchParticipantJobData>(
+        MatchParticipantJob.name,
+        {
+          workspaceId: payload.workspaceId,
+          email: payload.details.after.email,
+          personId: payload.recordId,
+        },
+      );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/modules/connected-account/listeners/participant-workspace-member.listener.ts b/packages/twenty-server/src/modules/connected-account/listeners/participant-workspace-member.listener.ts
new file mode 100644
index 000000000000..d0610402c787
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/listeners/participant-workspace-member.listener.ts
@@ -0,0 +1,73 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+
+import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/types/object-record-create.event';
+import { ObjectRecordUpdateEvent } from 'src/engine/integrations/event-emitter/types/object-record-update.event';
+import { objectRecordChangedProperties as objectRecordUpdateEventChangedProperties } from 'src/engine/integrations/event-emitter/utils/object-record-changed-properties.util';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import {
+  MatchParticipantJob,
+  MatchParticipantJobData,
+} from 'src/modules/connected-account/jobs/match-participant.job';
+import {
+  UnmatchParticipantJobData,
+  UnmatchParticipantJob,
+} from 'src/modules/connected-account/jobs/unmatch-participant.job';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+@Injectable()
+export class ParticipantWorkspaceMemberListener {
+  constructor(
+    @Inject(MessageQueue.messagingQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {}
+
+  @OnEvent('workspaceMember.created')
+  async handleCreatedEvent(
+    payload: ObjectRecordCreateEvent<WorkspaceMemberObjectMetadata>,
+  ) {
+    if (payload.details.after.userEmail === null) {
+      return;
+    }
+
+    await this.messageQueueService.add<MatchParticipantJobData>(
+      MatchParticipantJob.name,
+      {
+        workspaceId: payload.workspaceId,
+        email: payload.details.after.userEmail,
+        workspaceMemberId: payload.details.after.id,
+      },
+    );
+  }
+
+  @OnEvent('workspaceMember.updated')
+  async handleUpdatedEvent(
+    payload: ObjectRecordUpdateEvent<WorkspaceMemberObjectMetadata>,
+  ) {
+    if (
+      objectRecordUpdateEventChangedProperties(
+        payload.details.before,
+        payload.details.after,
+      ).includes('userEmail')
+    ) {
+      await this.messageQueueService.add<UnmatchParticipantJobData>(
+        UnmatchParticipantJob.name,
+        {
+          workspaceId: payload.workspaceId,
+          email: payload.details.before.userEmail,
+          personId: payload.recordId,
+        },
+      );
+
+      await this.messageQueueService.add<MatchParticipantJobData>(
+        MatchParticipantJob.name,
+        {
+          workspaceId: payload.workspaceId,
+          email: payload.details.after.userEmail,
+          workspaceMemberId: payload.recordId,
+        },
+      );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/modules/connected-account/repositories/blocklist.repository.ts b/packages/twenty-server/src/modules/connected-account/repositories/blocklist.repository.ts
new file mode 100644
index 000000000000..5b7fa2f1f608
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/repositories/blocklist.repository.ts
@@ -0,0 +1,30 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+import { BlocklistObjectMetadata } from 'src/modules/connected-account/standard-objects/blocklist.object-metadata';
+
+@Injectable()
+export class BlocklistRepository {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async getByWorkspaceMemberId(
+    workspaceMemberId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<BlocklistObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."blocklist" WHERE "workspaceMemberId" = $1`,
+      [workspaceMemberId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/connected-account/repositories/connected-account.repository.ts b/packages/twenty-server/src/modules/connected-account/repositories/connected-account.repository.ts
new file mode 100644
index 000000000000..e2288cf94bde
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/repositories/connected-account.repository.ts
@@ -0,0 +1,238 @@
+import { Injectable, NotFoundException } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+
+@Injectable()
+export class ConnectedAccountRepository {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async getAll(
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<ConnectedAccountObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."connectedAccount" WHERE "provider" = 'google'`,
+      [],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getByIds(
+    connectedAccountIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<ConnectedAccountObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."connectedAccount" WHERE "id" = ANY($1)`,
+      [connectedAccountIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getAllByHandleAndWorkspaceMemberId(
+    handle: string,
+    workspaceMemberId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<ConnectedAccountObjectMetadata>[] | undefined> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const connectedAccounts =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `SELECT * FROM ${dataSourceSchema}."connectedAccount" WHERE "handle" = $1 AND "accountOwnerId" = $2 LIMIT 1`,
+        [handle, workspaceMemberId],
+        workspaceId,
+        transactionManager,
+      );
+
+    return connectedAccounts;
+  }
+
+  public async create(
+    connectedAccount: Pick<
+      ObjectRecord<ConnectedAccountObjectMetadata>,
+      | 'id'
+      | 'handle'
+      | 'provider'
+      | 'accessToken'
+      | 'refreshToken'
+      | 'accountOwnerId'
+    >,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<ConnectedAccountObjectMetadata>> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `INSERT INTO ${dataSourceSchema}."connectedAccount" ("id", "handle", "provider", "accessToken", "refreshToken", "accountOwnerId") VALUES ($1, $2, $3, $4, $5, $6)`,
+      [
+        connectedAccount.id,
+        connectedAccount.handle,
+        connectedAccount.provider,
+        connectedAccount.accessToken,
+        connectedAccount.refreshToken,
+        connectedAccount.accountOwnerId,
+      ],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async updateAccessTokenAndRefreshToken(
+    accessToken: string,
+    refreshToken: string,
+    connectedAccountId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."connectedAccount" SET "accessToken" = $1, "refreshToken" = $2 WHERE "id" = $3`,
+      [accessToken, refreshToken, connectedAccountId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getById(
+    connectedAccountId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<ConnectedAccountObjectMetadata> | undefined> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const connectedAccounts =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `SELECT * FROM ${dataSourceSchema}."connectedAccount" WHERE "id" = $1 LIMIT 1`,
+        [connectedAccountId],
+        workspaceId,
+        transactionManager,
+      );
+
+    return connectedAccounts[0];
+  }
+
+  public async getByIdOrFail(
+    connectedAccountId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<ConnectedAccountObjectMetadata>> {
+    const connectedAccount = await this.getById(
+      connectedAccountId,
+      workspaceId,
+      transactionManager,
+    );
+
+    if (!connectedAccount) {
+      throw new NotFoundException(
+        `Connected account with id ${connectedAccountId} not found in workspace ${workspaceId}`,
+      );
+    }
+
+    return connectedAccount;
+  }
+
+  public async updateLastSyncHistoryId(
+    historyId: string,
+    connectedAccountId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."connectedAccount" SET "lastSyncHistoryId" = $1 WHERE "id" = $2`,
+      [historyId, connectedAccountId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async updateLastSyncHistoryIdIfHigher(
+    historyId: string,
+    connectedAccountId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."connectedAccount" SET "lastSyncHistoryId" = $1
+      WHERE "id" = $2
+      AND ("lastSyncHistoryId" < $1 OR "lastSyncHistoryId" = '')`,
+      [historyId, connectedAccountId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async deleteHistoryId(
+    connectedAccountId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."connectedAccount" SET "lastSyncHistoryId" = '' WHERE "id" = $1`,
+      [connectedAccountId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async updateAccessToken(
+    accessToken: string,
+    connectedAccountId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."connectedAccount" SET "accessToken" = $1, "authFailedAt" = NULL WHERE "id" = $2`,
+      [accessToken, connectedAccountId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async updateAuthFailedAt(
+    connectedAccountId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."connectedAccount" SET "authFailedAt" = NOW() WHERE "id" = $1`,
+      [connectedAccountId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.module.ts b/packages/twenty-server/src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.module.ts
new file mode 100644
index 000000000000..288f0c797bce
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.module.ts
@@ -0,0 +1,16 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { AddPersonIdAndWorkspaceMemberIdService } from 'src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.service';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+
+@Module({
+  imports: [
+    WorkspaceDataSourceModule,
+    ObjectMetadataRepositoryModule.forFeature([PersonObjectMetadata]),
+  ],
+  providers: [AddPersonIdAndWorkspaceMemberIdService],
+  exports: [AddPersonIdAndWorkspaceMemberIdService],
+})
+export class AddPersonIdAndWorkspaceMemberIdModule {}
diff --git a/packages/twenty-server/src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.service.ts b/packages/twenty-server/src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.service.ts
new file mode 100644
index 000000000000..8aa9a6d95f75
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.service.ts
@@ -0,0 +1,90 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { PersonRepository } from 'src/modules/person/repositories/person.repository';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+
+@Injectable()
+export class AddPersonIdAndWorkspaceMemberIdService {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+    @InjectObjectMetadataRepository(PersonObjectMetadata)
+    private readonly personRepository: PersonRepository,
+  ) {}
+
+  private async getEmailPersonIdMap(
+    handles: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<Map<string, string>> {
+    const personIds = await this.personRepository.getByEmails(
+      handles,
+      workspaceId,
+      transactionManager,
+    );
+
+    return new Map(personIds.map((person) => [person.email, person.id]));
+  }
+
+  private async getEmailWorkspaceMemberIdMap(
+    handles: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<Map<string, string>> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const workspaceMemberIds: {
+      id: string;
+      email: string;
+    }[] = await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT "workspaceMember"."id", "connectedAccount"."handle" AS email FROM ${dataSourceSchema}."workspaceMember"
+              JOIN ${dataSourceSchema}."connectedAccount" ON ${dataSourceSchema}."workspaceMember"."id" = ${dataSourceSchema}."connectedAccount"."accountOwnerId"
+              WHERE ${dataSourceSchema}."connectedAccount"."handle" = ANY($1)`,
+      [handles],
+      workspaceId,
+      transactionManager,
+    );
+
+    return new Map(
+      workspaceMemberIds.map((workspaceMember) => [
+        workspaceMember.email,
+        workspaceMember.id,
+      ]),
+    );
+  }
+
+  public async addPersonIdAndWorkspaceMemberId<T extends { handle: string }>(
+    objects: T[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<
+    (T & {
+      personId: string | null;
+      workspaceMemberId: string | null;
+    })[]
+  > {
+    const handles = objects.map((object) => object.handle);
+
+    const personIdMap = await this.getEmailPersonIdMap(
+      handles,
+      workspaceId,
+      transactionManager,
+    );
+
+    const workspaceMemberIdMap = await this.getEmailWorkspaceMemberIdMap(
+      handles,
+      workspaceId,
+      transactionManager,
+    );
+
+    return objects.map((object) => ({
+      ...object,
+      personId: personIdMap.get(object.handle) || null,
+      workspaceMemberId: workspaceMemberIdMap.get(object.handle) || null,
+    }));
+  }
+}
diff --git a/packages/twenty-server/src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.module.ts b/packages/twenty-server/src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.module.ts
new file mode 100644
index 000000000000..29db89400d02
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.module.ts
@@ -0,0 +1,14 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { GoogleAPIRefreshAccessTokenService } from 'src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.service';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+
+@Module({
+  imports: [
+    ObjectMetadataRepositoryModule.forFeature([ConnectedAccountObjectMetadata]),
+  ],
+  providers: [GoogleAPIRefreshAccessTokenService],
+  exports: [GoogleAPIRefreshAccessTokenService],
+})
+export class GoogleAPIRefreshAccessTokenModule {}
diff --git a/packages/twenty-server/src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.service.ts b/packages/twenty-server/src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.service.ts
new file mode 100644
index 000000000000..72239c3d1f18
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.service.ts
@@ -0,0 +1,93 @@
+import { Injectable } from '@nestjs/common';
+
+import axios from 'axios';
+
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+
+@Injectable()
+export class GoogleAPIRefreshAccessTokenService {
+  constructor(
+    private readonly environmentService: EnvironmentService,
+    @InjectObjectMetadataRepository(ConnectedAccountObjectMetadata)
+    private readonly connectedAccountRepository: ConnectedAccountRepository,
+  ) {}
+
+  async refreshAndSaveAccessToken(
+    workspaceId: string,
+    connectedAccountId: string,
+  ): Promise<void> {
+    const connectedAccount = await this.connectedAccountRepository.getById(
+      connectedAccountId,
+      workspaceId,
+    );
+
+    if (!connectedAccount) {
+      throw new Error(
+        `No connected account found for ${connectedAccountId} in workspace ${workspaceId}`,
+      );
+    }
+
+    if (connectedAccount.authFailedAt) {
+      throw new Error(
+        `Skipping refresh of access token for connected account ${connectedAccountId} in workspace ${workspaceId} because auth already failed, a new refresh token is needed`,
+      );
+    }
+
+    const refreshToken = connectedAccount.refreshToken;
+
+    if (!refreshToken) {
+      throw new Error(
+        `No refresh token found for connected account ${connectedAccountId} in workspace ${workspaceId}`,
+      );
+    }
+
+    const accessToken = await this.refreshAccessToken(
+      refreshToken,
+      connectedAccountId,
+      workspaceId,
+    );
+
+    await this.connectedAccountRepository.updateAccessToken(
+      accessToken,
+      connectedAccountId,
+      workspaceId,
+    );
+  }
+
+  async refreshAccessToken(
+    refreshToken: string,
+    connectedAccountId: string,
+    workspaceId: string,
+  ): Promise<string> {
+    try {
+      const response = await axios.post(
+        'https://oauth2.googleapis.com/token',
+        {
+          client_id: this.environmentService.get('AUTH_GOOGLE_CLIENT_ID'),
+          client_secret: this.environmentService.get(
+            'AUTH_GOOGLE_CLIENT_SECRET',
+          ),
+          refresh_token: refreshToken,
+          grant_type: 'refresh_token',
+        },
+        {
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        },
+      );
+
+      return response.data.access_token;
+    } catch (error) {
+      await this.connectedAccountRepository.updateAuthFailedAt(
+        connectedAccountId,
+        workspaceId,
+      );
+
+      throw new Error(`Error refreshing access token: ${error.message}`);
+    }
+  }
+}
diff --git a/packages/twenty-server/src/modules/connected-account/standard-objects/blocklist.object-metadata.ts b/packages/twenty-server/src/modules/connected-account/standard-objects/blocklist.object-metadata.ts
new file mode 100644
index 000000000000..089da894effe
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/standard-objects/blocklist.object-metadata.ts
@@ -0,0 +1,38 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { blocklistStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.blocklist,
+  namePlural: 'blocklists',
+  labelSingular: 'Blocklist',
+  labelPlural: 'Blocklists',
+  description: 'Blocklist',
+  icon: 'IconForbid2',
+})
+@IsSystem()
+export class BlocklistObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: blocklistStandardFieldIds.handle,
+    type: FieldMetadataType.TEXT,
+    label: 'Handle',
+    description: 'Handle',
+    icon: 'IconAt',
+  })
+  handle: string;
+
+  @FieldMetadata({
+    standardId: blocklistStandardFieldIds.workspaceMember,
+    type: FieldMetadataType.RELATION,
+    label: 'WorkspaceMember',
+    description: 'WorkspaceMember',
+    icon: 'IconCircleUser',
+    joinColumn: 'workspaceMemberId',
+  })
+  workspaceMember: WorkspaceMemberObjectMetadata;
+}
diff --git a/packages/twenty-server/src/modules/connected-account/standard-objects/connected-account.object-metadata.ts b/packages/twenty-server/src/modules/connected-account/standard-objects/connected-account.object-metadata.ts
new file mode 100644
index 000000000000..5f2fa98a9bf0
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/standard-objects/connected-account.object-metadata.ts
@@ -0,0 +1,129 @@
+import { FeatureFlagKeys } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { connectedAccountStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { Gate } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/gate.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { CalendarChannelObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+export enum ConnectedAccountProvider {
+  GOOGLE = 'google',
+}
+
+@ObjectMetadata({
+  standardId: standardObjectIds.connectedAccount,
+  namePlural: 'connectedAccounts',
+  labelSingular: 'Connected Account',
+  labelPlural: 'Connected Accounts',
+  description: 'A connected account',
+  icon: 'IconAt',
+})
+@IsSystem()
+export class ConnectedAccountObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: connectedAccountStandardFieldIds.handle,
+    type: FieldMetadataType.TEXT,
+    label: 'handle',
+    description: 'The account handle (email, username, phone number, etc.)',
+    icon: 'IconMail',
+  })
+  handle: string;
+
+  @FieldMetadata({
+    standardId: connectedAccountStandardFieldIds.provider,
+    type: FieldMetadataType.TEXT,
+    label: 'provider',
+    description: 'The account provider',
+    icon: 'IconSettings',
+  })
+  provider: ConnectedAccountProvider; // field metadata should be a SELECT
+
+  @FieldMetadata({
+    standardId: connectedAccountStandardFieldIds.accessToken,
+    type: FieldMetadataType.TEXT,
+    label: 'Access Token',
+    description: 'Messaging provider access token',
+    icon: 'IconKey',
+  })
+  accessToken: string;
+
+  @FieldMetadata({
+    standardId: connectedAccountStandardFieldIds.refreshToken,
+    type: FieldMetadataType.TEXT,
+    label: 'Refresh Token',
+    description: 'Messaging provider refresh token',
+    icon: 'IconKey',
+  })
+  refreshToken: string;
+
+  @FieldMetadata({
+    standardId: connectedAccountStandardFieldIds.accountOwner,
+    type: FieldMetadataType.RELATION,
+    label: 'Account Owner',
+    description: 'Account Owner',
+    icon: 'IconUserCircle',
+    joinColumn: 'accountOwnerId',
+  })
+  accountOwner: WorkspaceMemberObjectMetadata;
+
+  @FieldMetadata({
+    standardId: connectedAccountStandardFieldIds.lastSyncHistoryId,
+    type: FieldMetadataType.TEXT,
+    label: 'Last sync history ID',
+    description: 'Last sync history ID',
+    icon: 'IconHistory',
+  })
+  lastSyncHistoryId: string;
+
+  @FieldMetadata({
+    standardId: connectedAccountStandardFieldIds.authFailedAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Auth failed at',
+    description: 'Auth failed at',
+    icon: 'IconX',
+  })
+  @IsNullable()
+  authFailedAt: Date;
+
+  @FieldMetadata({
+    standardId: connectedAccountStandardFieldIds.messageChannels,
+    type: FieldMetadataType.RELATION,
+    label: 'Message Channel',
+    description: 'Message Channel',
+    icon: 'IconMessage',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => MessageChannelObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  messageChannels: MessageChannelObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: connectedAccountStandardFieldIds.calendarChannels,
+    type: FieldMetadataType.RELATION,
+    label: 'Calendar Channel',
+    description: 'Calendar Channel',
+    icon: 'IconCalendar',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => CalendarChannelObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @Gate({
+    featureFlag: FeatureFlagKeys.IsCalendarEnabled,
+  })
+  calendarChannels: CalendarChannelObjectMetadata[];
+}
diff --git a/packages/twenty-server/src/modules/event/repositiories/event.repository.ts b/packages/twenty-server/src/modules/event/repositiories/event.repository.ts
new file mode 100644
index 000000000000..1da98ee590be
--- /dev/null
+++ b/packages/twenty-server/src/modules/event/repositiories/event.repository.ts
@@ -0,0 +1,30 @@
+import { Injectable } from '@nestjs/common';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+
+@Injectable()
+export class EventRepository {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async insert(
+    name: string,
+    properties: string,
+    workspaceMemberId: string | null,
+    objectName: string,
+    objectId: string,
+    workspaceId: string,
+  ): Promise<void> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `INSERT INTO ${dataSourceSchema}."event"
+      ("name", "properties", "workspaceMemberId", "${objectName}Id")
+      VALUES ($1, $2, $3, $4)`,
+      [name, properties, workspaceMemberId, objectId],
+      workspaceId,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/event/standard-objects/event.object-metadata.ts b/packages/twenty-server/src/modules/event/standard-objects/event.object-metadata.ts
new file mode 100644
index 000000000000..fe5d9e7f9e91
--- /dev/null
+++ b/packages/twenty-server/src/modules/event/standard-objects/event.object-metadata.ts
@@ -0,0 +1,98 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { eventStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { CustomObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/custom-objects/custom.object-metadata';
+import { DynamicRelationFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/dynamic-field-metadata.interface';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
+import { OpportunityObjectMetadata } from 'src/modules/opportunity/standard-objects/opportunity.object-metadata';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.event,
+  namePlural: 'events',
+  labelSingular: 'Event',
+  labelPlural: 'Events',
+  description: 'An event',
+  icon: 'IconJson',
+})
+@IsSystem()
+export class EventObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: eventStandardFieldIds.properties,
+    type: FieldMetadataType.TEXT,
+    label: 'Event name',
+    description: 'Event name/type',
+    icon: 'IconAbc',
+  })
+  name: string;
+
+  @FieldMetadata({
+    standardId: eventStandardFieldIds.properties,
+    type: FieldMetadataType.RAW_JSON,
+    label: 'Event details',
+    description: 'Json value for event details',
+    icon: 'IconListDetails',
+  })
+  @IsNullable()
+  properties: JSON;
+
+  @FieldMetadata({
+    standardId: eventStandardFieldIds.workspaceMember,
+    type: FieldMetadataType.RELATION,
+    label: 'Workspace Member',
+    description: 'Event workspace member',
+    icon: 'IconCircleUser',
+    joinColumn: 'workspaceMemberId',
+  })
+  @IsNullable()
+  workspaceMember: WorkspaceMemberObjectMetadata;
+
+  @FieldMetadata({
+    standardId: eventStandardFieldIds.person,
+    type: FieldMetadataType.RELATION,
+    label: 'Person',
+    description: 'Event person',
+    icon: 'IconUser',
+    joinColumn: 'personId',
+  })
+  @IsNullable()
+  person: PersonObjectMetadata;
+
+  @FieldMetadata({
+    standardId: eventStandardFieldIds.company,
+    type: FieldMetadataType.RELATION,
+    label: 'Company',
+    description: 'Event company',
+    icon: 'IconBuildingSkyscraper',
+    joinColumn: 'companyId',
+  })
+  @IsNullable()
+  company: CompanyObjectMetadata;
+
+  @FieldMetadata({
+    standardId: eventStandardFieldIds.opportunity,
+    type: FieldMetadataType.RELATION,
+    label: 'Opportunity',
+    description: 'Events opportunity',
+    icon: 'IconTargetArrow',
+    joinColumn: 'opportunityId',
+  })
+  @IsNullable()
+  opportunity: OpportunityObjectMetadata;
+
+  @DynamicRelationFieldMetadata((oppositeObjectMetadata) => ({
+    standardId: eventStandardFieldIds.custom,
+    name: oppositeObjectMetadata.nameSingular,
+    label: oppositeObjectMetadata.labelSingular,
+    description: `Event ${oppositeObjectMetadata.labelSingular}`,
+    joinColumn: `${oppositeObjectMetadata.nameSingular}Id`,
+    icon: 'IconBuildingSkyscraper',
+  }))
+  custom: CustomObjectMetadata;
+}
diff --git a/packages/twenty-server/src/modules/favorite/standard-objects/favorite.object-metadata.ts b/packages/twenty-server/src/modules/favorite/standard-objects/favorite.object-metadata.ts
new file mode 100644
index 000000000000..104f9406c41d
--- /dev/null
+++ b/packages/twenty-server/src/modules/favorite/standard-objects/favorite.object-metadata.ts
@@ -0,0 +1,89 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { favoriteStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { CustomObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/custom-objects/custom.object-metadata';
+import { DynamicRelationFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/dynamic-field-metadata.interface';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
+import { OpportunityObjectMetadata } from 'src/modules/opportunity/standard-objects/opportunity.object-metadata';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.favorite,
+  namePlural: 'favorites',
+  labelSingular: 'Favorite',
+  labelPlural: 'Favorites',
+  description: 'A favorite',
+  icon: 'IconHeart',
+})
+@IsSystem()
+export class FavoriteObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: favoriteStandardFieldIds.position,
+    type: FieldMetadataType.NUMBER,
+    label: 'Position',
+    description: 'Favorite position',
+    icon: 'IconList',
+    defaultValue: 0,
+  })
+  position: number;
+
+  // Relations
+  @FieldMetadata({
+    standardId: favoriteStandardFieldIds.workspaceMember,
+    type: FieldMetadataType.RELATION,
+    label: 'Workspace Member',
+    description: 'Favorite workspace member',
+    icon: 'IconCircleUser',
+    joinColumn: 'workspaceMemberId',
+  })
+  workspaceMember: WorkspaceMemberObjectMetadata;
+
+  @FieldMetadata({
+    standardId: favoriteStandardFieldIds.person,
+    type: FieldMetadataType.RELATION,
+    label: 'Person',
+    description: 'Favorite person',
+    icon: 'IconUser',
+    joinColumn: 'personId',
+  })
+  @IsNullable()
+  person: PersonObjectMetadata;
+
+  @FieldMetadata({
+    standardId: favoriteStandardFieldIds.company,
+    type: FieldMetadataType.RELATION,
+    label: 'Company',
+    description: 'Favorite company',
+    icon: 'IconBuildingSkyscraper',
+    joinColumn: 'companyId',
+  })
+  @IsNullable()
+  company: CompanyObjectMetadata;
+
+  @FieldMetadata({
+    standardId: favoriteStandardFieldIds.opportunity,
+    type: FieldMetadataType.RELATION,
+    label: 'Opportunity',
+    description: 'Favorite opportunity',
+    icon: 'IconTargetArrow',
+    joinColumn: 'opportunityId',
+  })
+  @IsNullable()
+  opportunity: OpportunityObjectMetadata;
+
+  @DynamicRelationFieldMetadata((oppositeObjectMetadata) => ({
+    standardId: favoriteStandardFieldIds.custom,
+    name: oppositeObjectMetadata.nameSingular,
+    label: oppositeObjectMetadata.labelSingular,
+    description: `Favorite ${oppositeObjectMetadata.labelSingular}`,
+    joinColumn: `${oppositeObjectMetadata.nameSingular}Id`,
+    icon: 'IconBuildingSkyscraper',
+  }))
+  custom: CustomObjectMetadata;
+}
diff --git a/packages/twenty-server/src/modules/messaging/commands/messaging-command.module.ts b/packages/twenty-server/src/modules/messaging/commands/messaging-command.module.ts
new file mode 100644
index 000000000000..48e3c6636402
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/commands/messaging-command.module.ts
@@ -0,0 +1,16 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { GmailFetchMessagesFromCacheCronCommand } from 'src/modules/messaging/jobs/crons/gmail-fetch-messages-from-cache.cron.command';
+import { GmailPartialSyncCronCommand } from 'src/modules/messaging/jobs/crons/gmail-partial-sync.cron.command';
+@Module({
+  imports: [
+    ObjectMetadataRepositoryModule.forFeature([ConnectedAccountObjectMetadata]),
+  ],
+  providers: [
+    GmailPartialSyncCronCommand,
+    GmailFetchMessagesFromCacheCronCommand,
+  ],
+})
+export class MessagingCommandModule {}
diff --git a/packages/twenty-server/src/modules/messaging/constants/gmail-ongoing-sync-timeout.constant.ts b/packages/twenty-server/src/modules/messaging/constants/gmail-ongoing-sync-timeout.constant.ts
new file mode 100644
index 000000000000..c4c67700d932
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/constants/gmail-ongoing-sync-timeout.constant.ts
@@ -0,0 +1 @@
+export const GMAIL_ONGOING_SYNC_TIMEOUT = 1000 * 60 * 60; // 1 hour
diff --git a/packages/twenty-server/src/modules/messaging/constants/gmail-users-history-max-result.constant.ts b/packages/twenty-server/src/modules/messaging/constants/gmail-users-history-max-result.constant.ts
new file mode 100644
index 000000000000..d208d7d247e5
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/constants/gmail-users-history-max-result.constant.ts
@@ -0,0 +1 @@
+export const GMAIL_USERS_HISTORY_MAX_RESULT = 500;
diff --git a/packages/twenty-server/src/modules/messaging/constants/gmail-users-messages-get-batch-size.constant.ts b/packages/twenty-server/src/modules/messaging/constants/gmail-users-messages-get-batch-size.constant.ts
new file mode 100644
index 000000000000..a883ab0d4cc5
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/constants/gmail-users-messages-get-batch-size.constant.ts
@@ -0,0 +1 @@
+export const GMAIL_USERS_MESSAGES_GET_BATCH_SIZE = 50;
diff --git a/packages/twenty-server/src/modules/messaging/constants/gmail-users-messages-list-max-result.constant.ts b/packages/twenty-server/src/modules/messaging/constants/gmail-users-messages-list-max-result.constant.ts
new file mode 100644
index 000000000000..29b30121555e
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/constants/gmail-users-messages-list-max-result.constant.ts
@@ -0,0 +1 @@
+export const GMAIL_USERS_MESSAGES_LIST_MAX_RESULT = 500;
diff --git a/packages/twenty-server/src/modules/messaging/constants/messages-to-delete-from-cache-batch-size.constant.ts b/packages/twenty-server/src/modules/messaging/constants/messages-to-delete-from-cache-batch-size.constant.ts
new file mode 100644
index 000000000000..1f8a59b88ff4
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/constants/messages-to-delete-from-cache-batch-size.constant.ts
@@ -0,0 +1 @@
+export const MESSAGES_TO_DELETE_FROM_CACHE_BATCH_SIZE = 1000;
diff --git a/packages/twenty-server/src/modules/messaging/jobs/crons/fetch-all-messages-from-cache.cron.job.ts b/packages/twenty-server/src/modules/messaging/jobs/crons/fetch-all-messages-from-cache.cron.job.ts
new file mode 100644
index 000000000000..8ed5ea6107e4
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/jobs/crons/fetch-all-messages-from-cache.cron.job.ts
@@ -0,0 +1,65 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository, In } from 'typeorm';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { MessageChannelRepository } from 'src/modules/messaging/repositories/message-channel.repository';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { GmailFetchMessageContentFromCacheService } from 'src/modules/messaging/services/gmail-fetch-message-content-from-cache/gmail-fetch-message-content-from-cache.service';
+
+@Injectable()
+export class FetchAllMessagesFromCacheCronJob
+  implements MessageQueueJob<undefined>
+{
+  constructor(
+    @InjectRepository(Workspace, 'core')
+    private readonly workspaceRepository: Repository<Workspace>,
+    @InjectRepository(DataSourceEntity, 'metadata')
+    private readonly dataSourceRepository: Repository<DataSourceEntity>,
+    @InjectObjectMetadataRepository(MessageChannelObjectMetadata)
+    private readonly messageChannelRepository: MessageChannelRepository,
+    private readonly gmailFetchMessageContentFromCacheService: GmailFetchMessageContentFromCacheService,
+  ) {}
+
+  async handle(): Promise<void> {
+    const workspaceIds = (
+      await this.workspaceRepository.find({
+        where: {
+          subscriptionStatus: 'active',
+        },
+        select: ['id'],
+      })
+    ).map((workspace) => workspace.id);
+
+    const dataSources = await this.dataSourceRepository.find({
+      where: {
+        workspaceId: In(workspaceIds),
+      },
+    });
+
+    const workspaceIdsWithDataSources = new Set(
+      dataSources.map((dataSource) => dataSource.workspaceId),
+    );
+
+    for (const workspaceId of workspaceIdsWithDataSources) {
+      await this.fetchWorkspaceMessages(workspaceId);
+    }
+  }
+
+  private async fetchWorkspaceMessages(workspaceId: string): Promise<void> {
+    const messageChannels =
+      await this.messageChannelRepository.getAll(workspaceId);
+
+    for (const messageChannel of messageChannels) {
+      await this.gmailFetchMessageContentFromCacheService.fetchMessageContentFromCache(
+        workspaceId,
+        messageChannel.connectedAccountId,
+      );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/jobs/crons/gmail-fetch-messages-from-cache.cron.command.ts b/packages/twenty-server/src/modules/messaging/jobs/crons/gmail-fetch-messages-from-cache.cron.command.ts
new file mode 100644
index 000000000000..9f0013f9cbbb
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/jobs/crons/gmail-fetch-messages-from-cache.cron.command.ts
@@ -0,0 +1,32 @@
+import { Inject } from '@nestjs/common';
+
+import { Command, CommandRunner } from 'nest-commander';
+
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { FetchAllMessagesFromCacheCronJob } from 'src/modules/messaging/jobs/crons/fetch-all-messages-from-cache.cron.job';
+
+@Command({
+  name: 'cron:messaging:gmail-fetch-messages-from-cache',
+  description: 'Starts a cron job to fetch all messages from cache',
+})
+export class GmailFetchMessagesFromCacheCronCommand extends CommandRunner {
+  constructor(
+    @Inject(MessageQueue.cronQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {
+    super();
+  }
+
+  async run(): Promise<void> {
+    await this.messageQueueService.addCron<undefined>(
+      FetchAllMessagesFromCacheCronJob.name,
+      undefined,
+      {
+        repeat: {
+          every: 5000,
+        },
+      },
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/jobs/crons/gmail-partial-sync.cron.command.ts b/packages/twenty-server/src/modules/messaging/jobs/crons/gmail-partial-sync.cron.command.ts
new file mode 100644
index 000000000000..2cfe7be30777
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/jobs/crons/gmail-partial-sync.cron.command.ts
@@ -0,0 +1,32 @@
+import { Inject } from '@nestjs/common';
+
+import { Command, CommandRunner } from 'nest-commander';
+
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { GmailPartialSyncCronJob } from 'src/modules/messaging/jobs/crons/gmail-partial-sync.cron.job';
+import { fetchAllWorkspacesMessagesCronPattern } from 'src/modules/messaging/jobs/crons/patterns/fetch-all-workspaces-messages.cron.pattern';
+
+@Command({
+  name: 'cron:messaging:gmail-partial-sync',
+  description:
+    'Starts a cron job to sync existing connected account messages and store them in the cache',
+})
+export class GmailPartialSyncCronCommand extends CommandRunner {
+  constructor(
+    @Inject(MessageQueue.cronQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {
+    super();
+  }
+
+  async run(): Promise<void> {
+    await this.messageQueueService.addCron<undefined>(
+      GmailPartialSyncCronJob.name,
+      undefined,
+      {
+        repeat: { pattern: fetchAllWorkspacesMessagesCronPattern },
+      },
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/jobs/crons/gmail-partial-sync.cron.job.ts b/packages/twenty-server/src/modules/messaging/jobs/crons/gmail-partial-sync.cron.job.ts
new file mode 100644
index 000000000000..905a84d2290e
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/jobs/crons/gmail-partial-sync.cron.job.ts
@@ -0,0 +1,83 @@
+import { Inject, Injectable, Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository, In } from 'typeorm';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import {
+  GmailPartialSyncV2Job as GmailPartialSyncV2Job,
+  GmailPartialSyncV2JobData as GmailPartialSyncV2JobData,
+} from 'src/modules/messaging/jobs/gmail-partial-sync-v2.job';
+
+@Injectable()
+export class GmailPartialSyncCronJob implements MessageQueueJob<undefined> {
+  private readonly logger = new Logger(GmailPartialSyncCronJob.name);
+
+  constructor(
+    @InjectRepository(Workspace, 'core')
+    private readonly workspaceRepository: Repository<Workspace>,
+    @InjectRepository(DataSourceEntity, 'metadata')
+    private readonly dataSourceRepository: Repository<DataSourceEntity>,
+    @Inject(MessageQueue.messagingQueue)
+    private readonly messageQueueService: MessageQueueService,
+    @InjectObjectMetadataRepository(ConnectedAccountObjectMetadata)
+    private readonly connectedAccountRepository: ConnectedAccountRepository,
+  ) {}
+
+  async handle(): Promise<void> {
+    const workspaceIds = (
+      await this.workspaceRepository.find({
+        where: {
+          subscriptionStatus: 'active',
+        },
+        select: ['id'],
+      })
+    ).map((workspace) => workspace.id);
+
+    const dataSources = await this.dataSourceRepository.find({
+      where: {
+        workspaceId: In(workspaceIds),
+      },
+    });
+
+    const workspaceIdsWithDataSources = new Set(
+      dataSources.map((dataSource) => dataSource.workspaceId),
+    );
+
+    for (const workspaceId of workspaceIdsWithDataSources) {
+      await this.enqueuePartialSyncs(workspaceId);
+    }
+  }
+
+  private async enqueuePartialSyncs(workspaceId: string): Promise<void> {
+    try {
+      const connectedAccounts =
+        await this.connectedAccountRepository.getAll(workspaceId);
+
+      for (const connectedAccount of connectedAccounts) {
+        await this.messageQueueService.add<GmailPartialSyncV2JobData>(
+          GmailPartialSyncV2Job.name,
+          {
+            workspaceId,
+            connectedAccountId: connectedAccount.id,
+          },
+        );
+      }
+    } catch (error) {
+      this.logger.error(
+        `Error while fetching workspace messages for workspace ${workspaceId}`,
+      );
+      this.logger.error(error);
+
+      return;
+    }
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/jobs/crons/patterns/fetch-all-workspaces-messages.cron.pattern.ts b/packages/twenty-server/src/modules/messaging/jobs/crons/patterns/fetch-all-workspaces-messages.cron.pattern.ts
new file mode 100644
index 000000000000..83d6b6db0449
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/jobs/crons/patterns/fetch-all-workspaces-messages.cron.pattern.ts
@@ -0,0 +1 @@
+export const fetchAllWorkspacesMessagesCronPattern = '*/5 * * * *';
diff --git a/packages/twenty-server/src/modules/messaging/jobs/delete-connected-account-associated-messaging-data.job.ts b/packages/twenty-server/src/modules/messaging/jobs/delete-connected-account-associated-messaging-data.job.ts
new file mode 100644
index 000000000000..eacef905ba18
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/jobs/delete-connected-account-associated-messaging-data.job.ts
@@ -0,0 +1,36 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { ThreadCleanerService } from 'src/modules/messaging/services/thread-cleaner/thread-cleaner.service';
+
+export type DeleteConnectedAccountAssociatedMessagingDataJobData = {
+  workspaceId: string;
+  connectedAccountId: string;
+};
+
+@Injectable()
+export class DeleteConnectedAccountAssociatedMessagingDataJob
+  implements
+    MessageQueueJob<DeleteConnectedAccountAssociatedMessagingDataJobData>
+{
+  private readonly logger = new Logger(
+    DeleteConnectedAccountAssociatedMessagingDataJob.name,
+  );
+
+  constructor(private readonly threadCleanerService: ThreadCleanerService) {}
+
+  async handle(
+    data: DeleteConnectedAccountAssociatedMessagingDataJobData,
+  ): Promise<void> {
+    this.logger.log(
+      `Deleting connected account ${data.connectedAccountId} associated messaging data in workspace ${data.workspaceId}`,
+    );
+
+    await this.threadCleanerService.cleanWorkspaceThreads(data.workspaceId);
+
+    this.logger.log(
+      `Deleted connected account ${data.connectedAccountId} associated messaging data in workspace ${data.workspaceId}`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/jobs/gmail-full-sync-v2.job.ts b/packages/twenty-server/src/modules/messaging/jobs/gmail-full-sync-v2.job.ts
new file mode 100644
index 000000000000..ac90589f5a88
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/jobs/gmail-full-sync-v2.job.ts
@@ -0,0 +1,48 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { GoogleAPIRefreshAccessTokenService } from 'src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.service';
+import { GmailFullSyncV2Service } from 'src/modules/messaging/services/gmail-full-sync-v2/gmail-full-sync.v2.service';
+
+export type GmailFullSyncV2JobData = {
+  workspaceId: string;
+  connectedAccountId: string;
+};
+
+@Injectable()
+export class GmailFullSyncV2Job
+  implements MessageQueueJob<GmailFullSyncV2JobData>
+{
+  private readonly logger = new Logger(GmailFullSyncV2Job.name);
+
+  constructor(
+    private readonly googleAPIsRefreshAccessTokenService: GoogleAPIRefreshAccessTokenService,
+    private readonly gmailFullSyncV2Service: GmailFullSyncV2Service,
+  ) {}
+
+  async handle(data: GmailFullSyncV2JobData): Promise<void> {
+    this.logger.log(
+      `gmail full-sync for workspace ${data.workspaceId} and account ${data.connectedAccountId}`,
+    );
+
+    try {
+      await this.googleAPIsRefreshAccessTokenService.refreshAndSaveAccessToken(
+        data.workspaceId,
+        data.connectedAccountId,
+      );
+    } catch (e) {
+      this.logger.error(
+        `Error refreshing access token for connected account ${data.connectedAccountId} in workspace ${data.workspaceId}`,
+        e,
+      );
+
+      return;
+    }
+
+    await this.gmailFullSyncV2Service.fetchConnectedAccountThreads(
+      data.workspaceId,
+      data.connectedAccountId,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/jobs/gmail-partial-sync-v2.job.ts b/packages/twenty-server/src/modules/messaging/jobs/gmail-partial-sync-v2.job.ts
new file mode 100644
index 000000000000..d327e0ebc3a5
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/jobs/gmail-partial-sync-v2.job.ts
@@ -0,0 +1,48 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { GoogleAPIRefreshAccessTokenService } from 'src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.service';
+import { GmailPartialSyncV2Service } from 'src/modules/messaging/services/gmail-partial-sync-v2/gmail-partial-sync-v2.service';
+
+export type GmailPartialSyncV2JobData = {
+  workspaceId: string;
+  connectedAccountId: string;
+};
+
+@Injectable()
+export class GmailPartialSyncV2Job
+  implements MessageQueueJob<GmailPartialSyncV2JobData>
+{
+  private readonly logger = new Logger(GmailPartialSyncV2Job.name);
+
+  constructor(
+    private readonly googleAPIsRefreshAccessTokenService: GoogleAPIRefreshAccessTokenService,
+    private readonly gmailPartialSyncV2Service: GmailPartialSyncV2Service,
+  ) {}
+
+  async handle(data: GmailPartialSyncV2JobData): Promise<void> {
+    this.logger.log(
+      `gmail partial-sync for workspace ${data.workspaceId} and account ${data.connectedAccountId}`,
+    );
+
+    try {
+      await this.googleAPIsRefreshAccessTokenService.refreshAndSaveAccessToken(
+        data.workspaceId,
+        data.connectedAccountId,
+      );
+    } catch (e) {
+      this.logger.error(
+        `Error refreshing access token for connected account ${data.connectedAccountId} in workspace ${data.workspaceId}`,
+        e,
+      );
+
+      return;
+    }
+
+    await this.gmailPartialSyncV2Service.fetchConnectedAccountThreads(
+      data.workspaceId,
+      data.connectedAccountId,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/jobs/messaging-create-company-and-contact-after-sync.job.ts b/packages/twenty-server/src/modules/messaging/jobs/messaging-create-company-and-contact-after-sync.job.ts
new file mode 100644
index 000000000000..876ae9766b35
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/jobs/messaging-create-company-and-contact-after-sync.job.ts
@@ -0,0 +1,67 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { CreateCompanyAndContactService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/services/create-company-and-contact.service';
+import { MessageChannelRepository } from 'src/modules/messaging/repositories/message-channel.repository';
+import { MessageParticipantRepository } from 'src/modules/messaging/repositories/message-participant.repository';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { MessageParticipantObjectMetadata } from 'src/modules/messaging/standard-objects/message-participant.object-metadata';
+
+export type MessagingCreateCompanyAndContactAfterSyncJobData = {
+  workspaceId: string;
+  messageChannelId: string;
+};
+
+@Injectable()
+export class MessagingCreateCompanyAndContactAfterSyncJob
+  implements MessageQueueJob<MessagingCreateCompanyAndContactAfterSyncJobData>
+{
+  private readonly logger = new Logger(
+    MessagingCreateCompanyAndContactAfterSyncJob.name,
+  );
+  constructor(
+    private readonly createCompanyAndContactService: CreateCompanyAndContactService,
+    @InjectObjectMetadataRepository(MessageChannelObjectMetadata)
+    private readonly messageChannelService: MessageChannelRepository,
+    @InjectObjectMetadataRepository(MessageParticipantObjectMetadata)
+    private readonly messageParticipantRepository: MessageParticipantRepository,
+  ) {}
+
+  async handle(
+    data: MessagingCreateCompanyAndContactAfterSyncJobData,
+  ): Promise<void> {
+    this.logger.log(
+      `create contacts and companies after sync for workspace ${data.workspaceId} and messageChannel ${data.messageChannelId}`,
+    );
+    const { workspaceId, messageChannelId } = data;
+
+    const messageChannel = await this.messageChannelService.getByIds(
+      [messageChannelId],
+      workspaceId,
+    );
+
+    const { handle, isContactAutoCreationEnabled } = messageChannel[0];
+
+    if (!isContactAutoCreationEnabled) {
+      return;
+    }
+
+    const contactsToCreate =
+      await this.messageParticipantRepository.getByMessageChannelIdWithoutPersonIdAndWorkspaceMemberIdAndMessageOutgoing(
+        messageChannelId,
+        workspaceId,
+      );
+
+    await this.createCompanyAndContactService.createCompaniesAndContactsAndUpdateParticipants(
+      handle,
+      contactsToCreate,
+      workspaceId,
+    );
+
+    this.logger.log(
+      `create contacts and companies after sync for workspace ${data.workspaceId} and messageChannel ${data.messageChannelId} done`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/listeners/messaging-connected-account.listener.ts b/packages/twenty-server/src/modules/messaging/listeners/messaging-connected-account.listener.ts
new file mode 100644
index 000000000000..7b53248a1989
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/listeners/messaging-connected-account.listener.ts
@@ -0,0 +1,63 @@
+import { Injectable, Inject } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import { ObjectRecordDeleteEvent } from 'src/engine/integrations/event-emitter/types/object-record-delete.event';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import {
+  DeleteConnectedAccountAssociatedCalendarDataJobData,
+  DeleteConnectedAccountAssociatedCalendarDataJob,
+} from 'src/modules/calendar/jobs/delete-connected-account-associated-calendar-data.job';
+import {
+  DeleteConnectedAccountAssociatedMessagingDataJobData,
+  DeleteConnectedAccountAssociatedMessagingDataJob,
+} from 'src/modules/messaging/jobs/delete-connected-account-associated-messaging-data.job';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import {
+  FeatureFlagEntity,
+  FeatureFlagKeys,
+} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+
+@Injectable()
+export class MessagingConnectedAccountListener {
+  constructor(
+    @Inject(MessageQueue.messagingQueue)
+    private readonly messageQueueService: MessageQueueService,
+    @Inject(MessageQueue.calendarQueue)
+    private readonly calendarQueueService: MessageQueueService,
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+  ) {}
+
+  @OnEvent('connectedAccount.deleted')
+  async handleDeletedEvent(
+    payload: ObjectRecordDeleteEvent<ConnectedAccountObjectMetadata>,
+  ) {
+    const isCalendarEnabled = await this.featureFlagRepository.findOneBy({
+      workspaceId: payload.workspaceId,
+      key: FeatureFlagKeys.IsCalendarEnabled,
+      value: true,
+    });
+
+    await this.messageQueueService.add<DeleteConnectedAccountAssociatedMessagingDataJobData>(
+      DeleteConnectedAccountAssociatedMessagingDataJob.name,
+      {
+        workspaceId: payload.workspaceId,
+        connectedAccountId: payload.recordId,
+      },
+    );
+
+    if (isCalendarEnabled) {
+      await this.calendarQueueService.add<DeleteConnectedAccountAssociatedCalendarDataJobData>(
+        DeleteConnectedAccountAssociatedCalendarDataJob.name,
+        {
+          workspaceId: payload.workspaceId,
+          connectedAccountId: payload.recordId,
+        },
+      );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/listeners/messaging-message-channel.listener.ts b/packages/twenty-server/src/modules/messaging/listeners/messaging-message-channel.listener.ts
new file mode 100644
index 000000000000..0af01d281f62
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/listeners/messaging-message-channel.listener.ts
@@ -0,0 +1,41 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+
+import { ObjectRecordUpdateEvent } from 'src/engine/integrations/event-emitter/types/object-record-update.event';
+import { objectRecordChangedProperties } from 'src/engine/integrations/event-emitter/utils/object-record-changed-properties.util';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import {
+  MessagingCreateCompanyAndContactAfterSyncJobData,
+  MessagingCreateCompanyAndContactAfterSyncJob,
+} from 'src/modules/messaging/jobs/messaging-create-company-and-contact-after-sync.job';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+
+@Injectable()
+export class MessagingMessageChannelListener {
+  constructor(
+    @Inject(MessageQueue.messagingQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {}
+
+  @OnEvent('messageChannel.updated')
+  async handleUpdatedEvent(
+    payload: ObjectRecordUpdateEvent<MessageChannelObjectMetadata>,
+  ) {
+    if (
+      objectRecordChangedProperties(
+        payload.details.before,
+        payload.details.after,
+      ).includes('isContactAutoCreationEnabled') &&
+      payload.details.after.isContactAutoCreationEnabled
+    ) {
+      await this.messageQueueService.add<MessagingCreateCompanyAndContactAfterSyncJobData>(
+        MessagingCreateCompanyAndContactAfterSyncJob.name,
+        {
+          workspaceId: payload.workspaceId,
+          messageChannelId: payload.recordId,
+        },
+      );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/messaging.module.ts b/packages/twenty-server/src/modules/messaging/messaging.module.ts
new file mode 100644
index 000000000000..82954a3dac6b
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/messaging.module.ts
@@ -0,0 +1,20 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { ParticipantPersonListener } from 'src/modules/connected-account/listeners/participant-person.listener';
+import { ParticipantWorkspaceMemberListener } from 'src/modules/connected-account/listeners/participant-workspace-member.listener';
+import { MessagingMessageChannelListener } from 'src/modules/messaging/listeners/messaging-message-channel.listener';
+import { MessagingConnectedAccountListener } from 'src/modules/messaging/listeners/messaging-connected-account.listener';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([FeatureFlagEntity], 'core')],
+  providers: [
+    ParticipantPersonListener,
+    ParticipantWorkspaceMemberListener,
+    MessagingMessageChannelListener,
+    MessagingConnectedAccountListener,
+  ],
+  exports: [],
+})
+export class MessagingModule {}
diff --git a/packages/twenty-server/src/modules/messaging/query-hooks/message/message-find-many.pre-query.hook.ts b/packages/twenty-server/src/modules/messaging/query-hooks/message/message-find-many.pre-query.hook.ts
new file mode 100644
index 000000000000..5824e536b6cf
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/query-hooks/message/message-find-many.pre-query.hook.ts
@@ -0,0 +1,105 @@
+import {
+  BadRequestException,
+  ForbiddenException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+
+import { groupBy } from 'lodash';
+
+import { WorkspacePreQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface';
+import { FindManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+
+import { MessageChannelMessageAssociationRepository } from 'src/modules/messaging/repositories/message-channel-message-association.repository';
+import { MessageChannelRepository } from 'src/modules/messaging/repositories/message-channel.repository';
+import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
+import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+@Injectable()
+export class MessageFindManyPreQueryHook implements WorkspacePreQueryHook {
+  constructor(
+    @InjectObjectMetadataRepository(
+      MessageChannelMessageAssociationObjectMetadata,
+    )
+    private readonly messageChannelMessageAssociationService: MessageChannelMessageAssociationRepository,
+    @InjectObjectMetadataRepository(MessageChannelObjectMetadata)
+    private readonly messageChannelService: MessageChannelRepository,
+    @InjectObjectMetadataRepository(ConnectedAccountObjectMetadata)
+    private readonly connectedAccountRepository: ConnectedAccountRepository,
+    @InjectObjectMetadataRepository(WorkspaceMemberObjectMetadata)
+    private readonly workspaceMemberService: WorkspaceMemberRepository,
+  ) {}
+
+  async execute(
+    userId: string,
+    workspaceId: string,
+    payload: FindManyResolverArgs,
+  ): Promise<void> {
+    if (!payload?.filter?.messageThreadId?.eq) {
+      throw new BadRequestException('messageThreadId filter is required');
+    }
+
+    const messageChannelMessageAssociations =
+      await this.messageChannelMessageAssociationService.getByMessageThreadId(
+        payload?.filter?.messageThreadId?.eq,
+        workspaceId,
+      );
+
+    if (messageChannelMessageAssociations.length === 0) {
+      throw new NotFoundException();
+    }
+
+    await this.canAccessMessageThread(
+      userId,
+      workspaceId,
+      messageChannelMessageAssociations,
+    );
+  }
+
+  private async canAccessMessageThread(
+    userId: string,
+    workspaceId: string,
+    messageChannelMessageAssociations: any[],
+  ) {
+    const messageChannels = await this.messageChannelService.getByIds(
+      messageChannelMessageAssociations.map(
+        (association) => association.messageChannelId,
+      ),
+      workspaceId,
+    );
+
+    const messageChannelsGroupByVisibility = groupBy(
+      messageChannels,
+      (channel) => channel.visibility,
+    );
+
+    if (messageChannelsGroupByVisibility.share_everything) {
+      return;
+    }
+
+    const currentWorkspaceMember =
+      await this.workspaceMemberService.getByIdOrFail(userId, workspaceId);
+
+    const messageChannelsConnectedAccounts =
+      await this.connectedAccountRepository.getByIds(
+        messageChannels.map((channel) => channel.connectedAccountId),
+        workspaceId,
+      );
+
+    const messageChannelsWorkspaceMemberIds =
+      messageChannelsConnectedAccounts.map(
+        (connectedAccount) => connectedAccount.accountOwnerId,
+      );
+
+    if (messageChannelsWorkspaceMemberIds.includes(currentWorkspaceMember.id)) {
+      return;
+    }
+
+    throw new ForbiddenException();
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/query-hooks/message/message-find-one.pre-query-hook.ts b/packages/twenty-server/src/modules/messaging/query-hooks/message/message-find-one.pre-query-hook.ts
new file mode 100644
index 000000000000..fb8585815d7c
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/query-hooks/message/message-find-one.pre-query-hook.ts
@@ -0,0 +1,16 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import { BadRequestException, Injectable } from '@nestjs/common';
+
+import { WorkspacePreQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface';
+import { FindOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+
+@Injectable()
+export class MessageFindOnePreQueryHook implements WorkspacePreQueryHook {
+  async execute(
+    _userId: string,
+    _workspaceId: string,
+    _payload: FindOneResolverArgs,
+  ): Promise<void> {
+    throw new BadRequestException('Method not implemented.');
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/query-hooks/messaging-query-hook.module.ts b/packages/twenty-server/src/modules/messaging/query-hooks/messaging-query-hook.module.ts
new file mode 100644
index 000000000000..2570a7f2bc63
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/query-hooks/messaging-query-hook.module.ts
@@ -0,0 +1,31 @@
+import { Module } from '@nestjs/common';
+
+import { MessageFindManyPreQueryHook } from 'src/modules/messaging/query-hooks/message/message-find-many.pre-query.hook';
+import { MessageFindOnePreQueryHook } from 'src/modules/messaging/query-hooks/message/message-find-one.pre-query-hook';
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+
+@Module({
+  imports: [
+    ObjectMetadataRepositoryModule.forFeature([
+      MessageChannelMessageAssociationObjectMetadata,
+      MessageChannelObjectMetadata,
+      ConnectedAccountObjectMetadata,
+      WorkspaceMemberObjectMetadata,
+    ]),
+  ],
+  providers: [
+    {
+      provide: MessageFindOnePreQueryHook.name,
+      useClass: MessageFindOnePreQueryHook,
+    },
+    {
+      provide: MessageFindManyPreQueryHook.name,
+      useClass: MessageFindManyPreQueryHook,
+    },
+  ],
+})
+export class MessagingQueryHookModule {}
diff --git a/packages/twenty-server/src/modules/messaging/repositories/message-channel-message-association.repository.ts b/packages/twenty-server/src/modules/messaging/repositories/message-channel-message-association.repository.ts
new file mode 100644
index 000000000000..eb5f283e2d07
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/repositories/message-channel-message-association.repository.ts
@@ -0,0 +1,221 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+
+@Injectable()
+export class MessageChannelMessageAssociationRepository {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async getByMessageExternalIdsAndMessageChannelId(
+    messageExternalIds: string[],
+    messageChannelId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageChannelMessageAssociationObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
+    WHERE "messageExternalId" = ANY($1) AND "messageChannelId" = $2`,
+      [messageExternalIds, messageChannelId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async countByMessageExternalIdsAndMessageChannelId(
+    messageExternalIds: string[],
+    messageChannelId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<number> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const result = await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT COUNT(*) FROM ${dataSourceSchema}."messageChannelMessageAssociation"
+    WHERE "messageExternalId" = ANY($1) AND "messageChannelId" = $2`,
+      [messageExternalIds, messageChannelId],
+      workspaceId,
+      transactionManager,
+    );
+
+    return result[0]?.count;
+  }
+
+  public async deleteByMessageExternalIdsAndMessageChannelId(
+    messageExternalIds: string[],
+    messageChannelId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `DELETE FROM ${dataSourceSchema}."messageChannelMessageAssociation" WHERE "messageExternalId" = ANY($1) AND "messageChannelId" = $2`,
+      [messageExternalIds, messageChannelId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getByMessageChannelIds(
+    messageChannelIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageChannelMessageAssociationObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
+    WHERE "messageChannelId" = ANY($1)`,
+      [messageChannelIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async deleteByMessageChannelIds(
+    messageChannelIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    if (messageChannelIds.length === 0) {
+      return;
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `DELETE FROM ${dataSourceSchema}."messageChannelMessageAssociation" WHERE "messageChannelId" = ANY($1)`,
+      [messageChannelIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async deleteByIds(
+    ids: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `DELETE FROM ${dataSourceSchema}."messageChannelMessageAssociation" WHERE "id" = ANY($1)`,
+      [ids],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getByMessageThreadExternalIds(
+    messageThreadExternalIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageChannelMessageAssociationObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
+    WHERE "messageThreadExternalId" = ANY($1)`,
+      [messageThreadExternalIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getFirstByMessageThreadExternalId(
+    messageThreadExternalId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageChannelMessageAssociationObjectMetadata> | null> {
+    const existingMessageChannelMessageAssociations =
+      await this.getByMessageThreadExternalIds(
+        [messageThreadExternalId],
+        workspaceId,
+        transactionManager,
+      );
+
+    if (
+      !existingMessageChannelMessageAssociations ||
+      existingMessageChannelMessageAssociations.length === 0
+    ) {
+      return null;
+    }
+
+    return existingMessageChannelMessageAssociations[0];
+  }
+
+  public async getByMessageIds(
+    messageIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageChannelMessageAssociationObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
+    WHERE "messageId" = ANY($1)`,
+      [messageIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getByMessageThreadId(
+    messageThreadId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageChannelMessageAssociationObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
+    WHERE "messageThreadId" = $1`,
+      [messageThreadId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async insert(
+    messageChannelId: string,
+    messageId: string,
+    messageExternalId: string,
+    messageThreadId: string,
+    messageThreadExternalId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `INSERT INTO ${dataSourceSchema}."messageChannelMessageAssociation" ("messageChannelId", "messageId", "messageExternalId", "messageThreadId", "messageThreadExternalId") VALUES ($1, $2, $3, $4, $5)`,
+      [
+        messageChannelId,
+        messageId,
+        messageExternalId,
+        messageThreadId,
+        messageThreadExternalId,
+      ],
+      workspaceId,
+      transactionManager,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/repositories/message-channel.repository.ts b/packages/twenty-server/src/modules/messaging/repositories/message-channel.repository.ts
new file mode 100644
index 000000000000..35a33473f401
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/repositories/message-channel.repository.ts
@@ -0,0 +1,204 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import {
+  MessageChannelObjectMetadata,
+  MessageChannelSyncStatus,
+} from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+
+@Injectable()
+export class MessageChannelRepository {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async create(
+    messageChannel: Pick<
+      ObjectRecord<MessageChannelObjectMetadata>,
+      'id' | 'connectedAccountId' | 'type' | 'handle' | 'visibility'
+    >,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `INSERT INTO ${dataSourceSchema}."messageChannel" ("id", "connectedAccountId", "type", "handle", "visibility")
+      VALUES ($1, $2, $3, $4, $5)`,
+      [
+        messageChannel.id,
+        messageChannel.connectedAccountId,
+        messageChannel.type,
+        messageChannel.handle,
+        messageChannel.visibility,
+      ],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async resetSync(
+    connectedAccountId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."messageChannel" SET "syncStatus" = NULL, "syncCursor" = '', "ongoingSyncStartedAt" = NULL
+      WHERE "connectedAccountId" = $1`,
+      [connectedAccountId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getAll(
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageChannelObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."messageChannel"`,
+      [],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getByConnectedAccountId(
+    connectedAccountId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageChannelObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."messageChannel" WHERE "connectedAccountId" = $1 AND "type" = 'email' LIMIT 1`,
+      [connectedAccountId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getFirstByConnectedAccountIdOrFail(
+    connectedAccountId: string,
+    workspaceId: string,
+  ): Promise<ObjectRecord<MessageChannelObjectMetadata>> {
+    const messageChannel = await this.getFirstByConnectedAccountId(
+      connectedAccountId,
+      workspaceId,
+    );
+
+    if (!messageChannel) {
+      throw new Error(
+        `Message channel for connected account ${connectedAccountId} not found in workspace ${workspaceId}`,
+      );
+    }
+
+    return messageChannel;
+  }
+
+  public async getFirstByConnectedAccountId(
+    connectedAccountId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageChannelObjectMetadata> | undefined> {
+    const messageChannels = await this.getByConnectedAccountId(
+      connectedAccountId,
+      workspaceId,
+      transactionManager,
+    );
+
+    return messageChannels[0];
+  }
+
+  public async getByIds(
+    ids: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageChannelObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."messageChannel" WHERE "id" = ANY($1)`,
+      [ids],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async updateSyncStatus(
+    id: string,
+    syncStatus: MessageChannelSyncStatus,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const needsToUpdateSyncedAt =
+      syncStatus === MessageChannelSyncStatus.SUCCEEDED;
+
+    const needsToUpdateOngoingSyncStartedAt =
+      syncStatus === MessageChannelSyncStatus.ONGOING;
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."messageChannel" SET "syncStatus" = $1 ${
+        needsToUpdateSyncedAt ? `, "syncedAt" = NOW()` : ''
+      } ${
+        needsToUpdateOngoingSyncStartedAt
+          ? `, "ongoingSyncStartedAt" = NOW()`
+          : `, "ongoingSyncStartedAt" = NULL`
+      } WHERE "id" = $2`,
+      [syncStatus, id],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async updateLastSyncCursorIfHigher(
+    id: string,
+    syncCursor: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."messageChannel" SET "syncCursor" = $1
+      WHERE "id" = $2
+      AND ("syncCursor" < $1 OR "syncCursor" = '')`,
+      [syncCursor, id],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async resetSyncCursor(
+    id: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."messageChannel" SET "syncCursor" = ''
+      WHERE "id" = $1`,
+      [id],
+      workspaceId,
+      transactionManager,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/repositories/message-participant.repository.ts b/packages/twenty-server/src/modules/messaging/repositories/message-participant.repository.ts
new file mode 100644
index 000000000000..d8c45f07ba00
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/repositories/message-participant.repository.ts
@@ -0,0 +1,158 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { MessageParticipantObjectMetadata } from 'src/modules/messaging/standard-objects/message-participant.object-metadata';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+import { ParticipantWithId } from 'src/modules/messaging/types/gmail-message';
+
+@Injectable()
+export class MessageParticipantRepository {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async getByHandles(
+    handles: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageParticipantObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."messageParticipant" WHERE "handle" = ANY($1)`,
+      [handles],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async updateParticipantsPersonId(
+    participantIds: string[],
+    personId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."messageParticipant" SET "personId" = $1 WHERE "id" = ANY($2)`,
+      [personId, participantIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async updateParticipantsWorkspaceMemberId(
+    participantIds: string[],
+    workspaceMemberId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."messageParticipant" SET "workspaceMemberId" = $1 WHERE "id" = ANY($2)`,
+      [workspaceMemberId, participantIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async removePersonIdByHandle(
+    handle: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."messageParticipant" SET "personId" = NULL WHERE "handle" = $1`,
+      [handle],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async removeWorkspaceMemberIdByHandle(
+    handle: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."messageParticipant" SET "workspaceMemberId" = NULL WHERE "handle" = $1`,
+      [handle],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getByMessageChannelIdWithoutPersonIdAndWorkspaceMemberIdAndMessageOutgoing(
+    messageChannelId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ParticipantWithId[]> {
+    if (!messageChannelId || !workspaceId) {
+      return [];
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const messageParticipants: ParticipantWithId[] =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `SELECT "messageParticipant".id,
+        "messageParticipant"."role",
+        "messageParticipant"."handle",
+        "messageParticipant"."displayName",
+        "messageParticipant"."personId",
+        "messageParticipant"."workspaceMemberId",
+        "messageParticipant"."messageId"
+        FROM ${dataSourceSchema}."messageParticipant" "messageParticipant"
+        LEFT JOIN ${dataSourceSchema}."message" ON "messageParticipant"."messageId" = ${dataSourceSchema}."message"."id" 
+        LEFT JOIN ${dataSourceSchema}."messageChannelMessageAssociation" ON ${dataSourceSchema}."messageChannelMessageAssociation"."messageId" = ${dataSourceSchema}."message"."id"
+        WHERE ${dataSourceSchema}."messageChannelMessageAssociation"."messageChannelId" = $1
+        AND "messageParticipant"."personId" IS NULL
+        AND "messageParticipant"."workspaceMemberId" IS NULL
+        AND ${dataSourceSchema}."message"."direction" = 'outgoing'`,
+        [messageChannelId],
+        workspaceId,
+        transactionManager,
+      );
+
+    return messageParticipants;
+  }
+
+  public async getWithoutPersonIdAndWorkspaceMemberId(
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ParticipantWithId[]> {
+    if (!workspaceId) {
+      throw new Error('WorkspaceId is required');
+    }
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const messageParticipants: ParticipantWithId[] =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `SELECT "messageParticipant".*
+        FROM ${dataSourceSchema}."messageParticipant" "messageParticipant"
+        WHERE "messageParticipant"."personId" IS NULL
+        AND "messageParticipant"."workspaceMemberId" IS NULL`,
+        [],
+        workspaceId,
+        transactionManager,
+      );
+
+    return messageParticipants;
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/repositories/message-thread.repository.ts b/packages/twenty-server/src/modules/messaging/repositories/message-thread.repository.ts
new file mode 100644
index 000000000000..bf0e9d7c90af
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/repositories/message-thread.repository.ts
@@ -0,0 +1,67 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+
+@Injectable()
+export class MessageThreadRepository {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async getOrphanThreadIdsPaginated(
+    limit: number,
+    offset: number,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<string[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const orphanThreads = await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT mt.id
+      FROM ${dataSourceSchema}."messageThread" mt
+      LEFT JOIN ${dataSourceSchema}."message" m ON mt.id = m."messageThreadId"
+      WHERE m."messageThreadId" IS NULL
+      LIMIT $1 OFFSET $2`,
+      [limit, offset],
+      workspaceId,
+      transactionManager,
+    );
+
+    return orphanThreads.map(({ id }) => id);
+  }
+
+  public async deleteByIds(
+    messageThreadIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `DELETE FROM ${dataSourceSchema}."messageThread" WHERE id = ANY($1)`,
+      [messageThreadIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async insert(
+    messageThreadId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `INSERT INTO ${dataSourceSchema}."messageThread" (id) VALUES ($1)`,
+      [messageThreadId],
+      workspaceId,
+      transactionManager,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/repositories/message.repository.ts b/packages/twenty-server/src/modules/messaging/repositories/message.repository.ts
new file mode 100644
index 000000000000..b884f4458ee0
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/repositories/message.repository.ts
@@ -0,0 +1,138 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { MessageObjectMetadata } from 'src/modules/messaging/standard-objects/message.object-metadata';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+
+@Injectable()
+export class MessageRepository {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async getNonAssociatedMessageIdsPaginated(
+    limit: number,
+    offset: number,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<string[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const nonAssociatedMessages =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `SELECT m.id FROM ${dataSourceSchema}."message" m
+        LEFT JOIN ${dataSourceSchema}."messageChannelMessageAssociation" mcma
+        ON m.id = mcma."messageId"
+        WHERE mcma.id IS NULL
+        LIMIT $1 OFFSET $2`,
+        [limit, offset],
+        workspaceId,
+        transactionManager,
+      );
+
+    return nonAssociatedMessages.map(({ id }) => id);
+  }
+
+  public async getFirstOrNullByHeaderMessageId(
+    headerMessageId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageObjectMetadata> | null> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const messages = await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."message" WHERE "headerMessageId" = $1 LIMIT 1`,
+      [headerMessageId],
+      workspaceId,
+      transactionManager,
+    );
+
+    if (!messages || messages.length === 0) {
+      return null;
+    }
+
+    return messages[0];
+  }
+
+  public async getByIds(
+    messageIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."message" WHERE "id" = ANY($1)`,
+      [messageIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async deleteByIds(
+    messageIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `DELETE FROM ${dataSourceSchema}."message" WHERE "id" = ANY($1)`,
+      [messageIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async getByMessageThreadIds(
+    messageThreadIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."message" WHERE "messageThreadId" = ANY($1)`,
+      [messageThreadIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async insert(
+    id: string,
+    headerMessageId: string,
+    subject: string,
+    receivedAt: Date,
+    messageDirection: string,
+    messageThreadId: string,
+    text: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `INSERT INTO ${dataSourceSchema}."message" ("id", "headerMessageId", "subject", "receivedAt", "direction", "messageThreadId", "text") VALUES ($1, $2, $3, $4, $5, $6, $7)`,
+      [
+        id,
+        headerMessageId,
+        subject,
+        receivedAt,
+        messageDirection,
+        messageThreadId,
+        text,
+      ],
+      workspaceId,
+      transactionManager,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/services/fetch-by-batch/fetch-by-batch.module.ts b/packages/twenty-server/src/modules/messaging/services/fetch-by-batch/fetch-by-batch.module.ts
new file mode 100644
index 000000000000..0535c95caf87
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/fetch-by-batch/fetch-by-batch.module.ts
@@ -0,0 +1,15 @@
+import { HttpModule } from '@nestjs/axios';
+import { Module } from '@nestjs/common';
+
+import { FetchByBatchesService } from 'src/modules/messaging/services/fetch-by-batch/fetch-by-batch.service';
+
+@Module({
+  imports: [
+    HttpModule.register({
+      baseURL: 'https://www.googleapis.com/batch/gmail/v1',
+    }),
+  ],
+  providers: [FetchByBatchesService],
+  exports: [FetchByBatchesService],
+})
+export class FetchByBatchModule {}
diff --git a/packages/twenty-server/src/modules/messaging/services/fetch-by-batch/fetch-by-batch.service.ts b/packages/twenty-server/src/modules/messaging/services/fetch-by-batch/fetch-by-batch.service.ts
new file mode 100644
index 000000000000..4d12b306b01d
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/fetch-by-batch/fetch-by-batch.service.ts
@@ -0,0 +1,128 @@
+import { HttpService } from '@nestjs/axios';
+import { Injectable } from '@nestjs/common';
+
+import { AxiosResponse } from 'axios';
+
+import { BatchQueries } from 'src/modules/messaging/types/batch-queries';
+import { GmailMessageParsedResponse } from 'src/modules/messaging/types/gmail-message-parsed-response';
+
+@Injectable()
+export class FetchByBatchesService {
+  constructor(private readonly httpService: HttpService) {}
+
+  async fetchAllByBatches(
+    queries: BatchQueries,
+    accessToken: string,
+    boundary: string,
+  ): Promise<AxiosResponse<any, any>[]> {
+    const batchLimit = 50;
+
+    let batchOffset = 0;
+
+    let batchResponses: AxiosResponse<any, any>[] = [];
+
+    while (batchOffset < queries.length) {
+      const batchResponse = await this.fetchBatch(
+        queries,
+        accessToken,
+        batchOffset,
+        batchLimit,
+        boundary,
+      );
+
+      batchResponses = batchResponses.concat(batchResponse);
+
+      batchOffset += batchLimit;
+    }
+
+    return batchResponses;
+  }
+
+  async fetchBatch(
+    queries: BatchQueries,
+    accessToken: string,
+    batchOffset: number,
+    batchLimit: number,
+    boundary: string,
+  ): Promise<AxiosResponse<any, any>> {
+    const limitedQueries = queries.slice(batchOffset, batchOffset + batchLimit);
+
+    const response = await this.httpService.axiosRef.post(
+      '/',
+      this.createBatchBody(limitedQueries, boundary),
+      {
+        headers: {
+          'Content-Type': 'multipart/mixed; boundary=' + boundary,
+          Authorization: 'Bearer ' + accessToken,
+        },
+      },
+    );
+
+    return response;
+  }
+
+  createBatchBody(queries: BatchQueries, boundary: string): string {
+    let batchBody: string[] = [];
+
+    queries.forEach(function (call) {
+      const method = 'GET';
+      const uri = call.uri;
+
+      batchBody = batchBody.concat([
+        '--',
+        boundary,
+        '\r\n',
+        'Content-Type: application/http',
+        '\r\n\r\n',
+
+        method,
+        ' ',
+        uri,
+        '\r\n\r\n',
+      ]);
+    });
+
+    return batchBody.concat(['--', boundary, '--']).join('');
+  }
+
+  parseBatch(
+    responseCollection: AxiosResponse<any, any>,
+  ): GmailMessageParsedResponse[] {
+    const responseItems: GmailMessageParsedResponse[] = [];
+
+    const boundary = this.getBatchSeparator(responseCollection);
+
+    const responseLines: string[] = responseCollection.data.split(
+      '--' + boundary,
+    );
+
+    responseLines.forEach(function (response) {
+      const startJson = response.indexOf('{');
+      const endJson = response.lastIndexOf('}');
+
+      if (startJson < 0 || endJson < 0) return;
+
+      const responseJson = response.substring(startJson, endJson + 1);
+
+      const item = JSON.parse(responseJson);
+
+      responseItems.push(item);
+    });
+
+    return responseItems;
+  }
+
+  getBatchSeparator(responseCollection: AxiosResponse<any, any>): string {
+    const headers = responseCollection.headers;
+
+    const contentType: string = headers['content-type'];
+
+    if (!contentType) return '';
+
+    const components = contentType.split('; ');
+
+    const boundary = components.find((item) => item.startsWith('boundary='));
+
+    return boundary?.replace('boundary=', '').trim() || '';
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/services/fetch-messages-by-batches/fetch-messages-by-batches.module.ts b/packages/twenty-server/src/modules/messaging/services/fetch-messages-by-batches/fetch-messages-by-batches.module.ts
new file mode 100644
index 000000000000..9bcb913718b6
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/fetch-messages-by-batches/fetch-messages-by-batches.module.ts
@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+
+import { FetchByBatchModule } from 'src/modules/messaging/services/fetch-by-batch/fetch-by-batch.module';
+import { FetchMessagesByBatchesService } from 'src/modules/messaging/services/fetch-messages-by-batches/fetch-messages-by-batches.service';
+
+@Module({
+  imports: [FetchByBatchModule],
+  providers: [FetchMessagesByBatchesService],
+  exports: [FetchMessagesByBatchesService],
+})
+export class FetchMessagesByBatchesModule {}
diff --git a/packages/twenty-server/src/modules/messaging/services/fetch-messages-by-batches/fetch-messages-by-batches.service.ts b/packages/twenty-server/src/modules/messaging/services/fetch-messages-by-batches/fetch-messages-by-batches.service.ts
new file mode 100644
index 000000000000..cde2d7dccd99
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/fetch-messages-by-batches/fetch-messages-by-batches.service.ts
@@ -0,0 +1,160 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { AxiosResponse } from 'axios';
+import { simpleParser } from 'mailparser';
+import planer from 'planer';
+
+import { GmailMessage } from 'src/modules/messaging/types/gmail-message';
+import { MessageQuery } from 'src/modules/messaging/types/message-or-thread-query';
+import { GmailMessageParsedResponse } from 'src/modules/messaging/types/gmail-message-parsed-response';
+import { FetchByBatchesService } from 'src/modules/messaging/services/fetch-by-batch/fetch-by-batch.service';
+import { formatAddressObjectAsParticipants } from 'src/modules/messaging/services/utils/format-address-object-as-participants.util';
+
+@Injectable()
+export class FetchMessagesByBatchesService {
+  private readonly logger = new Logger(FetchMessagesByBatchesService.name);
+
+  constructor(private readonly fetchByBatchesService: FetchByBatchesService) {}
+
+  async fetchAllMessages(
+    queries: MessageQuery[],
+    accessToken: string,
+    workspaceId?: string,
+    connectedAccountId?: string,
+  ): Promise<{ messages: GmailMessage[]; errors: any[] }> {
+    let startTime = Date.now();
+    const batchResponses = await this.fetchByBatchesService.fetchAllByBatches(
+      queries,
+      accessToken,
+      'batch_gmail_messages',
+    );
+    let endTime = Date.now();
+
+    this.logger.log(
+      `Messaging import for workspace ${workspaceId} and account ${connectedAccountId} fetching ${
+        queries.length
+      } messages in ${endTime - startTime}ms`,
+    );
+
+    startTime = Date.now();
+
+    const formattedResponse =
+      await this.formatBatchResponsesAsGmailMessages(batchResponses);
+
+    endTime = Date.now();
+
+    this.logger.log(
+      `Messaging import for workspace ${workspaceId} and account ${connectedAccountId} formatting ${
+        queries.length
+      } messages in ${endTime - startTime}ms`,
+    );
+
+    return formattedResponse;
+  }
+
+  async formatBatchResponseAsGmailMessage(
+    responseCollection: AxiosResponse<any, any>,
+  ): Promise<{ messages: GmailMessage[]; errors: any[] }> {
+    const parsedResponses = this.fetchByBatchesService.parseBatch(
+      responseCollection,
+    ) as GmailMessageParsedResponse[];
+
+    const errors: any = [];
+
+    const sanitizeString = (str: string) => {
+      return str.replace(/\0/g, '');
+    };
+
+    const formattedResponse = Promise.all(
+      parsedResponses.map(async (message: GmailMessageParsedResponse) => {
+        if (message.error) {
+          errors.push(message.error);
+
+          return;
+        }
+
+        const { historyId, id, threadId, internalDate, raw } = message;
+
+        const body = atob(raw?.replace(/-/g, '+').replace(/_/g, '/'));
+
+        try {
+          const parsed = await simpleParser(body, {
+            skipHtmlToText: true,
+            skipImageLinks: true,
+            skipTextToHtml: true,
+            maxHtmlLengthToParse: 0,
+          });
+
+          const { subject, messageId, from, to, cc, bcc, text, attachments } =
+            parsed;
+
+          if (!from) throw new Error('From value is missing');
+
+          const participants = [
+            ...formatAddressObjectAsParticipants(from, 'from'),
+            ...formatAddressObjectAsParticipants(to, 'to'),
+            ...formatAddressObjectAsParticipants(cc, 'cc'),
+            ...formatAddressObjectAsParticipants(bcc, 'bcc'),
+          ];
+
+          let textWithoutReplyQuotations = text;
+
+          if (text)
+            try {
+              textWithoutReplyQuotations = planer.extractFrom(
+                text,
+                'text/plain',
+              );
+            } catch (error) {
+              console.log(
+                'Error while trying to remove reply quotations',
+                error,
+              );
+            }
+
+          const messageFromGmail: GmailMessage = {
+            historyId,
+            externalId: id,
+            headerMessageId: messageId || '',
+            subject: subject || '',
+            messageThreadExternalId: threadId,
+            internalDate,
+            fromHandle: from.value[0].address || '',
+            fromDisplayName: from.value[0].name || '',
+            participants,
+            text: sanitizeString(textWithoutReplyQuotations || ''),
+            attachments,
+          };
+
+          return messageFromGmail;
+        } catch (error) {
+          console.log('Error', error);
+
+          errors.push(error);
+        }
+      }),
+    );
+
+    const filteredMessages = (await formattedResponse).filter(
+      (message) => message,
+    ) as GmailMessage[];
+
+    return { messages: filteredMessages, errors };
+  }
+
+  async formatBatchResponsesAsGmailMessages(
+    batchResponses: AxiosResponse<any, any>[],
+  ): Promise<{ messages: GmailMessage[]; errors: any[] }> {
+    const messagesAndErrors = await Promise.all(
+      batchResponses.map(async (response) => {
+        return this.formatBatchResponseAsGmailMessage(response);
+      }),
+    );
+
+    const messages = messagesAndErrors.map((item) => item.messages).flat();
+
+    const errors = messagesAndErrors.map((item) => item.errors).flat();
+
+    return { messages, errors };
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/services/gmail-fetch-message-content-from-cache/gmail-fetch-message-content-from-cache.module.ts b/packages/twenty-server/src/modules/messaging/services/gmail-fetch-message-content-from-cache/gmail-fetch-message-content-from-cache.module.ts
new file mode 100644
index 000000000000..587619793d13
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/gmail-fetch-message-content-from-cache/gmail-fetch-message-content-from-cache.module.ts
@@ -0,0 +1,26 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { FetchMessagesByBatchesModule } from 'src/modules/messaging/services/fetch-messages-by-batches/fetch-messages-by-batches.module';
+import { GmailFetchMessageContentFromCacheService } from 'src/modules/messaging/services/gmail-fetch-message-content-from-cache/gmail-fetch-message-content-from-cache.service';
+import { MessageModule } from 'src/modules/messaging/services/message/message.module';
+import { SaveMessageAndEmitContactCreationEventModule } from 'src/modules/messaging/services/save-message-and-emit-contact-creation-event/save-message-and-emit-contact-creation-event.module';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+
+@Module({
+  imports: [
+    FetchMessagesByBatchesModule,
+    ObjectMetadataRepositoryModule.forFeature([
+      ConnectedAccountObjectMetadata,
+      MessageChannelObjectMetadata,
+    ]),
+    SaveMessageAndEmitContactCreationEventModule,
+    MessageModule,
+    WorkspaceDataSourceModule,
+  ],
+  providers: [GmailFetchMessageContentFromCacheService],
+  exports: [GmailFetchMessageContentFromCacheService],
+})
+export class GmailFetchMessageContentFromCacheModule {}
diff --git a/packages/twenty-server/src/modules/messaging/services/gmail-fetch-message-content-from-cache/gmail-fetch-message-content-from-cache.service.ts b/packages/twenty-server/src/modules/messaging/services/gmail-fetch-message-content-from-cache/gmail-fetch-message-content-from-cache.service.ts
new file mode 100644
index 000000000000..e4e6d4cd117b
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/gmail-fetch-message-content-from-cache/gmail-fetch-message-content-from-cache.service.ts
@@ -0,0 +1,273 @@
+import { Inject, Injectable, Logger } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { MessageChannelRepository } from 'src/modules/messaging/repositories/message-channel.repository';
+import { FetchMessagesByBatchesService } from 'src/modules/messaging/services/fetch-messages-by-batches/fetch-messages-by-batches.service';
+import {
+  MessageChannelObjectMetadata,
+  MessageChannelSyncStatus,
+} from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { createQueriesFromMessageIds } from 'src/modules/messaging/utils/create-queries-from-message-ids.util';
+import { InjectCacheStorage } from 'src/engine/integrations/cache-storage/decorators/cache-storage.decorator';
+import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
+import { CacheStorageService } from 'src/engine/integrations/cache-storage/cache-storage.service';
+import { GMAIL_USERS_MESSAGES_GET_BATCH_SIZE } from 'src/modules/messaging/constants/gmail-users-messages-get-batch-size.constant';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { SaveMessageAndEmitContactCreationEventService } from 'src/modules/messaging/services/save-message-and-emit-contact-creation-event/save-message-and-emit-contact-creation-event.service';
+import {
+  GmailFullSyncV2JobData,
+  GmailFullSyncV2Job,
+} from 'src/modules/messaging/jobs/gmail-full-sync-v2.job';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { GMAIL_ONGOING_SYNC_TIMEOUT } from 'src/modules/messaging/constants/gmail-ongoing-sync-timeout.constant';
+
+@Injectable()
+export class GmailFetchMessageContentFromCacheService {
+  private readonly logger = new Logger(
+    GmailFetchMessageContentFromCacheService.name,
+  );
+
+  constructor(
+    private readonly fetchMessagesByBatchesService: FetchMessagesByBatchesService,
+    @InjectObjectMetadataRepository(ConnectedAccountObjectMetadata)
+    private readonly connectedAccountRepository: ConnectedAccountRepository,
+    @InjectObjectMetadataRepository(MessageChannelObjectMetadata)
+    private readonly messageChannelRepository: MessageChannelRepository,
+    private readonly saveMessageAndEmitContactCreationEventService: SaveMessageAndEmitContactCreationEventService,
+    @InjectCacheStorage(CacheStorageNamespace.Messaging)
+    private readonly cacheStorage: CacheStorageService,
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+    @Inject(MessageQueue.messagingQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {}
+
+  async fetchMessageContentFromCache(
+    workspaceId: string,
+    connectedAccountId: string,
+  ) {
+    const connectedAccount = await this.connectedAccountRepository.getById(
+      connectedAccountId,
+      workspaceId,
+    );
+
+    if (!connectedAccount) {
+      this.logger.error(
+        `Connected account ${connectedAccountId} not found in workspace ${workspaceId}`,
+      );
+
+      return;
+    }
+
+    if (connectedAccount.authFailedAt) {
+      this.logger.error(
+        `Connected account ${connectedAccountId} in workspace ${workspaceId} is in a failed state. Skipping...`,
+      );
+
+      return;
+    }
+
+    const accessToken = connectedAccount.accessToken;
+    const refreshToken = connectedAccount.refreshToken;
+
+    if (!refreshToken) {
+      throw new Error(
+        `No refresh token found for connected account ${connectedAccountId} in workspace ${workspaceId}`,
+      );
+    }
+
+    const gmailMessageChannel =
+      await this.messageChannelRepository.getFirstByConnectedAccountId(
+        connectedAccountId,
+        workspaceId,
+      );
+
+    if (!gmailMessageChannel) {
+      this.logger.error(
+        `No message channel found for connected account ${connectedAccountId} in workspace ${workspaceId}`,
+      );
+
+      return;
+    }
+
+    if (gmailMessageChannel.syncStatus !== MessageChannelSyncStatus.PENDING) {
+      this.logger.log(
+        `Messaging import for workspace ${workspaceId} and account ${connectedAccountId} is not pending.`,
+      );
+
+      if (gmailMessageChannel.syncStatus !== MessageChannelSyncStatus.ONGOING) {
+        return;
+      }
+
+      const ongoingSyncStartedAt = new Date(
+        gmailMessageChannel.ongoingSyncStartedAt,
+      );
+
+      if (
+        ongoingSyncStartedAt < new Date(Date.now() - GMAIL_ONGOING_SYNC_TIMEOUT)
+      ) {
+        this.logger.log(
+          `Messaging import for workspace ${workspaceId} and account ${connectedAccountId} failed due to ongoing sync timeout. Restarting full-sync...`,
+        );
+
+        await this.messageChannelRepository.updateSyncStatus(
+          gmailMessageChannel.id,
+          MessageChannelSyncStatus.FAILED,
+          workspaceId,
+        );
+
+        await this.fallbackToFullSync(workspaceId, connectedAccountId);
+
+        return;
+      }
+
+      return;
+    }
+
+    const gmailMessageChannelId = gmailMessageChannel.id;
+
+    const messageIdsToFetch =
+      (await this.cacheStorage.setPop(
+        `messages-to-import:${workspaceId}:gmail:${gmailMessageChannelId}`,
+        GMAIL_USERS_MESSAGES_GET_BATCH_SIZE,
+      )) ?? [];
+
+    if (!messageIdsToFetch?.length) {
+      await this.messageChannelRepository.updateSyncStatus(
+        gmailMessageChannelId,
+        MessageChannelSyncStatus.SUCCEEDED,
+        workspaceId,
+      );
+
+      this.logger.log(
+        `Messaging import for workspace ${workspaceId} and account ${connectedAccountId} done with nothing to import or delete.`,
+      );
+
+      return;
+    }
+
+    await this.messageChannelRepository.updateSyncStatus(
+      gmailMessageChannelId,
+      MessageChannelSyncStatus.ONGOING,
+      workspaceId,
+    );
+
+    this.logger.log(
+      `Messaging import for workspace ${workspaceId} and account ${connectedAccountId} starting...`,
+    );
+
+    const workspaceDataSource =
+      await this.workspaceDataSourceService.connectToWorkspaceDataSource(
+        workspaceId,
+      );
+
+    await workspaceDataSource
+      ?.transaction(async (transactionManager: EntityManager) => {
+        const messageQueries = createQueriesFromMessageIds(messageIdsToFetch);
+
+        const { messages: messagesToSave, errors } =
+          await this.fetchMessagesByBatchesService.fetchAllMessages(
+            messageQueries,
+            accessToken,
+            workspaceId,
+            connectedAccountId,
+          );
+
+        if (!messagesToSave.length) {
+          await this.messageChannelRepository.updateSyncStatus(
+            gmailMessageChannelId,
+            MessageChannelSyncStatus.PENDING,
+            workspaceId,
+          );
+
+          return;
+        }
+
+        if (errors.length) {
+          const errorsCanBeIgnored = errors.every(
+            (error) => error.code === 404,
+          );
+
+          if (!errorsCanBeIgnored) {
+            throw new Error(
+              `Error fetching messages for ${connectedAccountId} in workspace ${workspaceId}: ${JSON.stringify(
+                errors,
+                null,
+                2,
+              )}`,
+            );
+          }
+        }
+
+        await this.saveMessageAndEmitContactCreationEventService.saveMessagesAndEmitContactCreationEventWithinTransaction(
+          messagesToSave,
+          connectedAccount,
+          workspaceId,
+          gmailMessageChannel,
+          transactionManager,
+        );
+
+        if (messageIdsToFetch.length < GMAIL_USERS_MESSAGES_GET_BATCH_SIZE) {
+          await this.messageChannelRepository.updateSyncStatus(
+            gmailMessageChannelId,
+            MessageChannelSyncStatus.SUCCEEDED,
+            workspaceId,
+            transactionManager,
+          );
+
+          this.logger.log(
+            `Messaging import for workspace ${workspaceId} and account ${connectedAccountId} done with no more messages to import.`,
+          );
+        } else {
+          await this.messageChannelRepository.updateSyncStatus(
+            gmailMessageChannelId,
+            MessageChannelSyncStatus.PENDING,
+            workspaceId,
+            transactionManager,
+          );
+
+          this.logger.log(
+            `Messaging import for workspace ${workspaceId} and account ${connectedAccountId} done with more messages to import.`,
+          );
+        }
+      })
+      .catch(async (error) => {
+        await this.cacheStorage.setAdd(
+          `messages-to-import:${workspaceId}:gmail:${gmailMessageChannelId}`,
+          messageIdsToFetch,
+        );
+
+        if (error?.message?.code === 429) {
+          this.logger.error(
+            `Error fetching messages for ${connectedAccountId} in workspace ${workspaceId}: Resource has been exhausted, locking for ${GMAIL_ONGOING_SYNC_TIMEOUT}ms...`,
+          );
+
+          return;
+        }
+
+        await this.messageChannelRepository.updateSyncStatus(
+          gmailMessageChannelId,
+          MessageChannelSyncStatus.FAILED,
+          workspaceId,
+        );
+
+        throw new Error(
+          `Error fetching messages for ${connectedAccountId} in workspace ${workspaceId}: ${error.message}`,
+        );
+      });
+  }
+
+  private async fallbackToFullSync(
+    workspaceId: string,
+    connectedAccountId: string,
+  ) {
+    await this.messageQueueService.add<GmailFullSyncV2JobData>(
+      GmailFullSyncV2Job.name,
+      { workspaceId, connectedAccountId },
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/services/gmail-full-sync-v2/gmail-full-sync.v2.module.ts b/packages/twenty-server/src/modules/messaging/services/gmail-full-sync-v2/gmail-full-sync.v2.module.ts
new file mode 100644
index 000000000000..c0bc6bc731b7
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/gmail-full-sync-v2/gmail-full-sync.v2.module.ts
@@ -0,0 +1,31 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { BlocklistObjectMetadata } from 'src/modules/connected-account/standard-objects/blocklist.object-metadata';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { FetchMessagesByBatchesModule } from 'src/modules/messaging/services/fetch-messages-by-batches/fetch-messages-by-batches.module';
+import { GmailFullSyncV2Service } from 'src/modules/messaging/services/gmail-full-sync-v2/gmail-full-sync.v2.service';
+import { MessagingProvidersModule } from 'src/modules/messaging/services/providers/messaging-providers.module';
+import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+
+@Module({
+  imports: [
+    MessagingProvidersModule,
+    FetchMessagesByBatchesModule,
+    ObjectMetadataRepositoryModule.forFeature([
+      ConnectedAccountObjectMetadata,
+      MessageChannelObjectMetadata,
+      MessageChannelMessageAssociationObjectMetadata,
+      BlocklistObjectMetadata,
+    ]),
+    TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
+    WorkspaceDataSourceModule,
+  ],
+  providers: [GmailFullSyncV2Service],
+  exports: [GmailFullSyncV2Service],
+})
+export class GmailFullSynV2Module {}
diff --git a/packages/twenty-server/src/modules/messaging/services/gmail-full-sync-v2/gmail-full-sync.v2.service.ts b/packages/twenty-server/src/modules/messaging/services/gmail-full-sync-v2/gmail-full-sync.v2.service.ts
new file mode 100644
index 000000000000..e6c98e1f7e59
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/gmail-full-sync-v2/gmail-full-sync.v2.service.ts
@@ -0,0 +1,302 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { EntityManager, Repository } from 'typeorm';
+import { gmail_v1 } from 'googleapis';
+
+import {
+  FeatureFlagEntity,
+  FeatureFlagKeys,
+} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { CacheStorageService } from 'src/engine/integrations/cache-storage/cache-storage.service';
+import { InjectCacheStorage } from 'src/engine/integrations/cache-storage/decorators/cache-storage.decorator';
+import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { BlocklistRepository } from 'src/modules/connected-account/repositories/blocklist.repository';
+import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
+import { BlocklistObjectMetadata } from 'src/modules/connected-account/standard-objects/blocklist.object-metadata';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { GMAIL_USERS_MESSAGES_LIST_MAX_RESULT } from 'src/modules/messaging/constants/gmail-users-messages-list-max-result.constant';
+import { MessageChannelMessageAssociationRepository } from 'src/modules/messaging/repositories/message-channel-message-association.repository';
+import { MessageChannelRepository } from 'src/modules/messaging/repositories/message-channel.repository';
+import { GmailClientProvider } from 'src/modules/messaging/services/providers/gmail/gmail-client.provider';
+import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
+import {
+  MessageChannelObjectMetadata,
+  MessageChannelSyncStatus,
+} from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { gmailSearchFilterExcludeEmails } from 'src/modules/messaging/utils/gmail-search-filter.util';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+
+@Injectable()
+export class GmailFullSyncV2Service {
+  private readonly logger = new Logger(GmailFullSyncV2Service.name);
+
+  constructor(
+    private readonly gmailClientProvider: GmailClientProvider,
+    @InjectObjectMetadataRepository(ConnectedAccountObjectMetadata)
+    private readonly connectedAccountRepository: ConnectedAccountRepository,
+    @InjectObjectMetadataRepository(MessageChannelObjectMetadata)
+    private readonly messageChannelRepository: MessageChannelRepository,
+    @InjectObjectMetadataRepository(BlocklistObjectMetadata)
+    private readonly blocklistRepository: BlocklistRepository,
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+    @InjectCacheStorage(CacheStorageNamespace.Messaging)
+    private readonly cacheStorage: CacheStorageService,
+    @InjectObjectMetadataRepository(
+      MessageChannelMessageAssociationObjectMetadata,
+    )
+    private readonly messageChannelMessageAssociationRepository: MessageChannelMessageAssociationRepository,
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async fetchConnectedAccountThreads(
+    workspaceId: string,
+    connectedAccountId: string,
+  ) {
+    const connectedAccount = await this.connectedAccountRepository.getById(
+      connectedAccountId,
+      workspaceId,
+    );
+
+    if (!connectedAccount) {
+      this.logger.error(
+        `Connected account ${connectedAccountId} not found in workspace ${workspaceId}`,
+      );
+
+      return;
+    }
+
+    const refreshToken = connectedAccount.refreshToken;
+
+    if (!refreshToken) {
+      throw new Error(
+        `No refresh token found for connected account ${connectedAccountId} in workspace ${workspaceId}`,
+      );
+    }
+
+    const gmailMessageChannel =
+      await this.messageChannelRepository.getFirstByConnectedAccountId(
+        connectedAccountId,
+        workspaceId,
+      );
+
+    if (!gmailMessageChannel) {
+      this.logger.error(
+        `No message channel found for connected account ${connectedAccountId} in workspace ${workspaceId}`,
+      );
+
+      return;
+    }
+
+    if (gmailMessageChannel.syncStatus === MessageChannelSyncStatus.ONGOING) {
+      this.logger.log(
+        `Messaging import for workspace ${workspaceId} and account ${connectedAccountId} is locked, import will be retried later.`,
+      );
+
+      return;
+    }
+
+    await this.messageChannelRepository.updateSyncStatus(
+      gmailMessageChannel.id,
+      MessageChannelSyncStatus.ONGOING,
+      workspaceId,
+    );
+
+    const workspaceDataSource =
+      await this.workspaceDataSourceService.connectToWorkspaceDataSource(
+        workspaceId,
+      );
+
+    await workspaceDataSource
+      ?.transaction(async (transactionManager) => {
+        const gmailClient: gmail_v1.Gmail =
+          await this.gmailClientProvider.getGmailClient(refreshToken);
+
+        const blocklistedEmails = await this.fetchBlocklistEmails(
+          connectedAccount.accountOwnerId,
+          workspaceId,
+        );
+
+        await this.fetchAllMessageIdsFromGmailAndStoreInCache(
+          gmailClient,
+          gmailMessageChannel.id,
+          blocklistedEmails,
+          workspaceId,
+          transactionManager,
+        );
+
+        await this.messageChannelRepository.updateSyncStatus(
+          gmailMessageChannel.id,
+          MessageChannelSyncStatus.PENDING,
+          workspaceId,
+          transactionManager,
+        );
+      })
+      .catch(async (error) => {
+        await this.messageChannelRepository.updateSyncStatus(
+          gmailMessageChannel.id,
+          MessageChannelSyncStatus.FAILED,
+          workspaceId,
+        );
+
+        throw new Error(
+          `Error fetching messages for ${connectedAccountId} in workspace ${workspaceId}: ${error.message}`,
+        );
+      });
+  }
+
+  public async fetchAllMessageIdsFromGmailAndStoreInCache(
+    gmailClient: gmail_v1.Gmail,
+    messageChannelId: string,
+    blocklistedEmails: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    let pageToken: string | undefined;
+    let hasMoreMessages = true;
+    let messageIdsToFetch = 0;
+    let firstMessageExternalId;
+
+    while (hasMoreMessages) {
+      const response = await gmailClient.users.messages.list({
+        userId: 'me',
+        maxResults: GMAIL_USERS_MESSAGES_LIST_MAX_RESULT,
+        pageToken,
+        q: gmailSearchFilterExcludeEmails(blocklistedEmails),
+      });
+
+      if (response.data?.messages) {
+        const messageExternalIds = response.data.messages
+          .filter((message): message is { id: string } => message.id != null)
+          .map((message) => message.id);
+
+        if (!firstMessageExternalId) {
+          firstMessageExternalId = messageExternalIds[0];
+        }
+
+        const existingMessageChannelMessageAssociations =
+          await this.messageChannelMessageAssociationRepository.getByMessageExternalIdsAndMessageChannelId(
+            messageExternalIds,
+            messageChannelId,
+            workspaceId,
+            transactionManager,
+          );
+
+        const existingMessageChannelMessageAssociationsExternalIds =
+          existingMessageChannelMessageAssociations.map(
+            (messageChannelMessageAssociation) =>
+              messageChannelMessageAssociation.messageExternalId,
+          );
+
+        const messageIdsToImport = messageExternalIds.filter(
+          (messageExternalId) =>
+            !existingMessageChannelMessageAssociationsExternalIds.includes(
+              messageExternalId,
+            ),
+        );
+
+        if (messageIdsToImport && messageIdsToImport.length) {
+          await this.cacheStorage.setAdd(
+            `messages-to-import:${workspaceId}:gmail:${messageChannelId}`,
+            messageIdsToImport,
+          );
+
+          messageIdsToFetch += messageIdsToImport.length;
+        }
+      }
+
+      pageToken = response.data.nextPageToken ?? undefined;
+      hasMoreMessages = !!pageToken;
+    }
+
+    if (!messageIdsToFetch) {
+      this.logger.log(
+        `No messages found in Gmail for messageChannel ${messageChannelId} in workspace ${workspaceId}`,
+      );
+
+      return;
+    }
+
+    this.logger.log(
+      `Fetched all ${messageIdsToFetch} message ids from Gmail for messageChannel ${messageChannelId} in workspace ${workspaceId} and added to cache for import`,
+    );
+
+    await this.updateLastSyncCursor(
+      gmailClient,
+      messageChannelId,
+      firstMessageExternalId,
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async fetchBlocklistEmails(
+    workspaceMemberId: string,
+    workspaceId: string,
+  ) {
+    const isBlocklistEnabledFeatureFlag =
+      await this.featureFlagRepository.findOneBy({
+        workspaceId,
+        key: FeatureFlagKeys.IsBlocklistEnabled,
+        value: true,
+      });
+
+    const isBlocklistEnabled =
+      isBlocklistEnabledFeatureFlag && isBlocklistEnabledFeatureFlag.value;
+
+    const blocklist = isBlocklistEnabled
+      ? await this.blocklistRepository.getByWorkspaceMemberId(
+          workspaceMemberId,
+          workspaceId,
+        )
+      : [];
+
+    return blocklist.map((blocklist) => blocklist.handle);
+  }
+
+  private async updateLastSyncCursor(
+    gmailClient: gmail_v1.Gmail,
+    messageChannelId: string,
+    firstMessageExternalId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) {
+    if (!firstMessageExternalId) {
+      throw new Error(
+        `No first message found for workspace ${workspaceId} and account ${messageChannelId}, can't update sync external id`,
+      );
+    }
+
+    const firstMessageContent = await gmailClient.users.messages.get({
+      userId: 'me',
+      id: firstMessageExternalId,
+    });
+
+    if (!firstMessageContent?.data) {
+      throw new Error(
+        `No first message content found for message ${firstMessageExternalId} in workspace ${workspaceId}`,
+      );
+    }
+
+    const historyId = firstMessageContent?.data?.historyId;
+
+    if (!historyId) {
+      throw new Error(
+        `No historyId found for message ${firstMessageExternalId} in workspace ${workspaceId}`,
+      );
+    }
+
+    this.logger.log(
+      `Updating last external id: ${historyId} for workspace ${workspaceId} and account ${messageChannelId} succeeded.`,
+    );
+
+    await this.messageChannelRepository.updateLastSyncCursorIfHigher(
+      messageChannelId,
+      historyId,
+      workspaceId,
+      transactionManager,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/services/gmail-partial-sync-v2/gmail-partial-sync-v2.module.ts b/packages/twenty-server/src/modules/messaging/services/gmail-partial-sync-v2/gmail-partial-sync-v2.module.ts
new file mode 100644
index 000000000000..dcd759d8005c
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/gmail-partial-sync-v2/gmail-partial-sync-v2.module.ts
@@ -0,0 +1,33 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { BlocklistObjectMetadata } from 'src/modules/connected-account/standard-objects/blocklist.object-metadata';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { FetchMessagesByBatchesModule } from 'src/modules/messaging/services/fetch-messages-by-batches/fetch-messages-by-batches.module';
+import { GmailPartialSyncV2Service } from 'src/modules/messaging/services/gmail-partial-sync-v2/gmail-partial-sync-v2.service';
+import { MessageModule } from 'src/modules/messaging/services/message/message.module';
+import { MessagingProvidersModule } from 'src/modules/messaging/services/providers/messaging-providers.module';
+import { SaveMessageAndEmitContactCreationEventModule } from 'src/modules/messaging/services/save-message-and-emit-contact-creation-event/save-message-and-emit-contact-creation-event.module';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+
+@Module({
+  imports: [
+    MessagingProvidersModule,
+    FetchMessagesByBatchesModule,
+    ObjectMetadataRepositoryModule.forFeature([
+      ConnectedAccountObjectMetadata,
+      MessageChannelObjectMetadata,
+      BlocklistObjectMetadata,
+    ]),
+    MessageModule,
+    SaveMessageAndEmitContactCreationEventModule,
+    TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
+    WorkspaceDataSourceModule,
+  ],
+  providers: [GmailPartialSyncV2Service],
+  exports: [GmailPartialSyncV2Service],
+})
+export class GmailPartialSyncV2Module {}
diff --git a/packages/twenty-server/src/modules/messaging/services/gmail-partial-sync-v2/gmail-partial-sync-v2.service.ts b/packages/twenty-server/src/modules/messaging/services/gmail-partial-sync-v2/gmail-partial-sync-v2.service.ts
new file mode 100644
index 000000000000..3bba4c43c4ab
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/gmail-partial-sync-v2/gmail-partial-sync-v2.service.ts
@@ -0,0 +1,338 @@
+import { Inject, Injectable, Logger } from '@nestjs/common';
+
+import { gmail_v1 } from 'googleapis';
+import { EntityManager } from 'typeorm';
+
+import { GmailClientProvider } from 'src/modules/messaging/services/providers/gmail/gmail-client.provider';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
+import { MessageChannelRepository } from 'src/modules/messaging/repositories/message-channel.repository';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import {
+  MessageChannelObjectMetadata,
+  MessageChannelSyncStatus,
+} from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { GMAIL_USERS_HISTORY_MAX_RESULT } from 'src/modules/messaging/constants/gmail-users-history-max-result.constant';
+import { GmailError } from 'src/modules/messaging/types/gmail-error';
+import { CacheStorageService } from 'src/engine/integrations/cache-storage/cache-storage.service';
+import { InjectCacheStorage } from 'src/engine/integrations/cache-storage/decorators/cache-storage.decorator';
+import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import {
+  GmailFullSyncV2Job,
+  GmailFullSyncV2JobData,
+} from 'src/modules/messaging/jobs/gmail-full-sync-v2.job';
+
+@Injectable()
+export class GmailPartialSyncV2Service {
+  private readonly logger = new Logger(GmailPartialSyncV2Service.name);
+
+  constructor(
+    private readonly gmailClientProvider: GmailClientProvider,
+    @Inject(MessageQueue.messagingQueue)
+    private readonly messageQueueService: MessageQueueService,
+    @InjectObjectMetadataRepository(ConnectedAccountObjectMetadata)
+    private readonly connectedAccountRepository: ConnectedAccountRepository,
+    @InjectObjectMetadataRepository(MessageChannelObjectMetadata)
+    private readonly messageChannelRepository: MessageChannelRepository,
+    @InjectCacheStorage(CacheStorageNamespace.Messaging)
+    private readonly cacheStorage: CacheStorageService,
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async fetchConnectedAccountThreads(
+    workspaceId: string,
+    connectedAccountId: string,
+  ): Promise<void> {
+    const connectedAccount = await this.connectedAccountRepository.getById(
+      connectedAccountId,
+      workspaceId,
+    );
+
+    if (!connectedAccount) {
+      this.logger.error(
+        `Connected account ${connectedAccountId} not found in workspace ${workspaceId}`,
+      );
+
+      return;
+    }
+
+    const refreshToken = connectedAccount.refreshToken;
+
+    if (!refreshToken) {
+      throw new Error(
+        `No refresh token found for connected account ${connectedAccountId} in workspace ${workspaceId}`,
+      );
+    }
+
+    const gmailMessageChannel =
+      await this.messageChannelRepository.getFirstByConnectedAccountId(
+        connectedAccountId,
+        workspaceId,
+      );
+
+    if (!gmailMessageChannel) {
+      this.logger.error(
+        `No message channel found for connected account ${connectedAccountId} in workspace ${workspaceId}`,
+      );
+
+      return;
+    }
+
+    if (gmailMessageChannel.syncStatus !== MessageChannelSyncStatus.SUCCEEDED) {
+      this.logger.log(
+        `Messaging import for workspace ${workspaceId} and account ${connectedAccountId} is locked, import will be retried later.`,
+      );
+
+      return;
+    }
+
+    await this.messageChannelRepository.updateSyncStatus(
+      gmailMessageChannel.id,
+      MessageChannelSyncStatus.ONGOING,
+      workspaceId,
+    );
+
+    const workspaceDataSource =
+      await this.workspaceDataSourceService.connectToWorkspaceDataSource(
+        workspaceId,
+      );
+
+    await workspaceDataSource
+      ?.transaction(async (transactionManager: EntityManager) => {
+        const lastSyncHistoryId = gmailMessageChannel.syncCursor;
+
+        if (!lastSyncHistoryId) {
+          this.logger.log(
+            `No lastSyncHistoryId for workspace ${workspaceId} and account ${connectedAccountId}, falling back to full sync.`,
+          );
+
+          await this.messageChannelRepository.updateSyncStatus(
+            gmailMessageChannel.id,
+            MessageChannelSyncStatus.PENDING,
+            workspaceId,
+            transactionManager,
+          );
+
+          await this.fallbackToFullSync(workspaceId, connectedAccountId);
+
+          return;
+        }
+
+        const gmailClient: gmail_v1.Gmail =
+          await this.gmailClientProvider.getGmailClient(refreshToken);
+
+        const { history, historyId, error } = await this.getHistoryFromGmail(
+          gmailClient,
+          lastSyncHistoryId,
+        );
+
+        if (error?.code === 404) {
+          this.logger.log(
+            `404: Invalid lastSyncHistoryId: ${lastSyncHistoryId} for workspace ${workspaceId} and account ${connectedAccountId}, falling back to full sync.`,
+          );
+
+          await this.messageChannelRepository.resetSyncCursor(
+            gmailMessageChannel.id,
+            workspaceId,
+            transactionManager,
+          );
+
+          await this.messageChannelRepository.updateSyncStatus(
+            gmailMessageChannel.id,
+            MessageChannelSyncStatus.PENDING,
+            workspaceId,
+            transactionManager,
+          );
+
+          await this.fallbackToFullSync(workspaceId, connectedAccountId);
+
+          return;
+        }
+
+        if (error?.code === 429) {
+          this.logger.log(
+            `429: rate limit reached for workspace ${workspaceId} and account ${connectedAccountId}: ${error.message}, import will be retried later.`,
+          );
+
+          await this.messageChannelRepository.updateSyncStatus(
+            gmailMessageChannel.id,
+            MessageChannelSyncStatus.PENDING,
+            workspaceId,
+            transactionManager,
+          );
+
+          return;
+        }
+
+        if (error) {
+          throw new Error(
+            `Error fetching messages for ${connectedAccountId} in workspace ${workspaceId}: ${error.message}`,
+          );
+        }
+
+        if (!historyId) {
+          throw new Error(
+            `No historyId found for ${connectedAccountId} in workspace ${workspaceId} in gmail history response.`,
+          );
+        }
+
+        if (historyId === lastSyncHistoryId || !history?.length) {
+          this.logger.log(
+            `Messaging import done with history ${historyId} and nothing to update for workspace ${workspaceId} and account ${connectedAccountId}`,
+          );
+
+          await this.messageChannelRepository.updateSyncStatus(
+            gmailMessageChannel.id,
+            MessageChannelSyncStatus.PENDING,
+            workspaceId,
+          );
+
+          return;
+        }
+
+        const { messagesAdded, messagesDeleted } =
+          await this.getMessageIdsFromHistory(history);
+
+        await this.cacheStorage.setAdd(
+          `messages-to-import:${workspaceId}:gmail:${gmailMessageChannel.id}`,
+          messagesAdded,
+        );
+
+        await this.cacheStorage.setAdd(
+          `messages-to-delete:${workspaceId}:gmail:${gmailMessageChannel.id}`,
+          messagesDeleted,
+        );
+
+        await this.messageChannelRepository.updateLastSyncCursorIfHigher(
+          gmailMessageChannel.id,
+          historyId,
+          workspaceId,
+          transactionManager,
+        );
+
+        await this.messageChannelRepository.updateSyncStatus(
+          gmailMessageChannel.id,
+          MessageChannelSyncStatus.PENDING,
+          workspaceId,
+          transactionManager,
+        );
+      })
+      .catch(async (error) => {
+        await this.messageChannelRepository.updateSyncStatus(
+          gmailMessageChannel.id,
+          MessageChannelSyncStatus.FAILED,
+          workspaceId,
+        );
+
+        throw new Error(
+          `Error fetching messages for ${connectedAccountId} in workspace ${workspaceId}: ${error.message}`,
+        );
+      });
+  }
+
+  private async getMessageIdsFromHistory(
+    history: gmail_v1.Schema$History[],
+  ): Promise<{
+    messagesAdded: string[];
+    messagesDeleted: string[];
+  }> {
+    const { messagesAdded, messagesDeleted } = history.reduce(
+      (
+        acc: {
+          messagesAdded: string[];
+          messagesDeleted: string[];
+        },
+        history,
+      ) => {
+        const messagesAdded = history.messagesAdded?.map(
+          (messageAdded) => messageAdded.message?.id || '',
+        );
+
+        const messagesDeleted = history.messagesDeleted?.map(
+          (messageDeleted) => messageDeleted.message?.id || '',
+        );
+
+        if (messagesAdded) acc.messagesAdded.push(...messagesAdded);
+        if (messagesDeleted) acc.messagesDeleted.push(...messagesDeleted);
+
+        return acc;
+      },
+      { messagesAdded: [], messagesDeleted: [] },
+    );
+
+    const uniqueMessagesAdded = messagesAdded.filter(
+      (messageId) => !messagesDeleted.includes(messageId),
+    );
+
+    const uniqueMessagesDeleted = messagesDeleted.filter(
+      (messageId) => !messagesAdded.includes(messageId),
+    );
+
+    return {
+      messagesAdded: uniqueMessagesAdded,
+      messagesDeleted: uniqueMessagesDeleted,
+    };
+  }
+
+  private async getHistoryFromGmail(
+    gmailClient: gmail_v1.Gmail,
+    lastSyncHistoryId: string,
+  ): Promise<{
+    history: gmail_v1.Schema$History[];
+    historyId?: string | null;
+    error?: GmailError;
+  }> {
+    const fullHistory: gmail_v1.Schema$History[] = [];
+    let pageToken: string | undefined;
+    let hasMoreMessages = true;
+    let nextHistoryId: string | undefined;
+
+    while (hasMoreMessages) {
+      try {
+        const response = await gmailClient.users.history.list({
+          userId: 'me',
+          maxResults: GMAIL_USERS_HISTORY_MAX_RESULT,
+          pageToken,
+          startHistoryId: lastSyncHistoryId,
+          historyTypes: ['messageAdded', 'messageDeleted'],
+        });
+
+        nextHistoryId = response?.data?.historyId ?? undefined;
+
+        if (response?.data?.history) {
+          fullHistory.push(...response.data.history);
+        }
+
+        pageToken = response?.data?.nextPageToken ?? undefined;
+        hasMoreMessages = !!pageToken;
+      } catch (error) {
+        const errorData = error?.response?.data?.error;
+
+        if (errorData) {
+          return {
+            history: [],
+            error: errorData,
+            historyId: lastSyncHistoryId,
+          };
+        }
+
+        throw error;
+      }
+    }
+
+    return { history: fullHistory, historyId: nextHistoryId };
+  }
+
+  private async fallbackToFullSync(
+    workspaceId: string,
+    connectedAccountId: string,
+  ) {
+    await this.messageQueueService.add<GmailFullSyncV2JobData>(
+      GmailFullSyncV2Job.name,
+      { workspaceId, connectedAccountId },
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/services/message-participant/message-participant.module.ts b/packages/twenty-server/src/modules/messaging/services/message-participant/message-participant.module.ts
new file mode 100644
index 000000000000..202a782f1276
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/message-participant/message-participant.module.ts
@@ -0,0 +1,22 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { AddPersonIdAndWorkspaceMemberIdModule } from 'src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.module';
+import { MessageParticipantService } from 'src/modules/messaging/services/message-participant/message-participant.service';
+import { MessageParticipantObjectMetadata } from 'src/modules/messaging/standard-objects/message-participant.object-metadata';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+
+@Module({
+  imports: [
+    WorkspaceDataSourceModule,
+    ObjectMetadataRepositoryModule.forFeature([
+      PersonObjectMetadata,
+      MessageParticipantObjectMetadata,
+    ]),
+    AddPersonIdAndWorkspaceMemberIdModule,
+  ],
+  providers: [MessageParticipantService],
+  exports: [MessageParticipantService],
+})
+export class MessageParticipantModule {}
diff --git a/packages/twenty-server/src/modules/messaging/services/message-participant/message-participant.service.ts b/packages/twenty-server/src/modules/messaging/services/message-participant/message-participant.service.ts
new file mode 100644
index 000000000000..c6fc1e2ce13e
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/message-participant/message-participant.service.ts
@@ -0,0 +1,167 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { ParticipantWithMessageId } from 'src/modules/messaging/types/gmail-message';
+import { PersonRepository } from 'src/modules/person/repositories/person.repository';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { getFlattenedValuesAndValuesStringForBatchRawQuery } from 'src/modules/calendar/utils/getFlattenedValuesAndValuesStringForBatchRawQuery.util';
+import { AddPersonIdAndWorkspaceMemberIdService } from 'src/modules/connected-account/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.service';
+import { MessageParticipantRepository } from 'src/modules/messaging/repositories/message-participant.repository';
+import { MessageParticipantObjectMetadata } from 'src/modules/messaging/standard-objects/message-participant.object-metadata';
+
+@Injectable()
+export class MessageParticipantService {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+    @InjectObjectMetadataRepository(MessageParticipantObjectMetadata)
+    private readonly messageParticipantRepository: MessageParticipantRepository,
+    @InjectObjectMetadataRepository(PersonObjectMetadata)
+    private readonly personRepository: PersonRepository,
+    private readonly addPersonIdAndWorkspaceMemberIdService: AddPersonIdAndWorkspaceMemberIdService,
+  ) {}
+
+  public async updateMessageParticipantsAfterPeopleCreation(
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    const participants =
+      await this.messageParticipantRepository.getWithoutPersonIdAndWorkspaceMemberId(
+        workspaceId,
+      );
+
+    if (!participants) return;
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const handles = participants.map((participant) => participant.handle);
+
+    const participantPersonIds = await this.personRepository.getByEmails(
+      handles,
+      workspaceId,
+      transactionManager,
+    );
+
+    const messageParticipantsToUpdate = participants.map((participant) => ({
+      id: participant.id,
+      personId: participantPersonIds.find(
+        (e: { id: string; email: string }) => e.email === participant.handle,
+      )?.id,
+    }));
+
+    if (messageParticipantsToUpdate.length === 0) return;
+
+    const { flattenedValues, valuesString } =
+      getFlattenedValuesAndValuesStringForBatchRawQuery(
+        messageParticipantsToUpdate,
+        {
+          id: 'uuid',
+          personId: 'uuid',
+        },
+      );
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `UPDATE ${dataSourceSchema}."messageParticipant" AS "messageParticipant" SET "personId" = "data"."personId"
+      FROM (VALUES ${valuesString}) AS "data"("id", "personId")
+      WHERE "messageParticipant"."id" = "data"."id"`,
+      flattenedValues,
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async saveMessageParticipants(
+    participants: ParticipantWithMessageId[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    if (!participants) return;
+
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const messageParticipantsToSave =
+      await this.addPersonIdAndWorkspaceMemberIdService.addPersonIdAndWorkspaceMemberId(
+        participants,
+        workspaceId,
+        transactionManager,
+      );
+
+    const { flattenedValues, valuesString } =
+      getFlattenedValuesAndValuesStringForBatchRawQuery(
+        messageParticipantsToSave,
+        {
+          messageId: 'uuid',
+          role: `${dataSourceSchema}."messageParticipant_role_enum"`,
+          handle: 'text',
+          displayName: 'text',
+          personId: 'uuid',
+          workspaceMemberId: 'uuid',
+        },
+      );
+
+    if (messageParticipantsToSave.length === 0) return;
+
+    await this.workspaceDataSourceService.executeRawQuery(
+      `INSERT INTO ${dataSourceSchema}."messageParticipant" ("messageId", "role", "handle", "displayName", "personId", "workspaceMemberId") VALUES ${valuesString}`,
+      flattenedValues,
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  public async matchMessageParticipants(
+    workspaceId: string,
+    email: string,
+    personId?: string,
+    workspaceMemberId?: string,
+  ) {
+    const messageParticipantsToUpdate =
+      await this.messageParticipantRepository.getByHandles(
+        [email],
+        workspaceId,
+      );
+
+    const messageParticipantIdsToUpdate = messageParticipantsToUpdate.map(
+      (participant) => participant.id,
+    );
+
+    if (personId) {
+      await this.messageParticipantRepository.updateParticipantsPersonId(
+        messageParticipantIdsToUpdate,
+        personId,
+        workspaceId,
+      );
+    }
+    if (workspaceMemberId) {
+      await this.messageParticipantRepository.updateParticipantsWorkspaceMemberId(
+        messageParticipantIdsToUpdate,
+        workspaceMemberId,
+        workspaceId,
+      );
+    }
+  }
+
+  public async unmatchMessageParticipants(
+    workspaceId: string,
+    handle: string,
+    personId?: string,
+    workspaceMemberId?: string,
+  ) {
+    if (personId) {
+      await this.messageParticipantRepository.removePersonIdByHandle(
+        handle,
+        workspaceId,
+      );
+    }
+    if (workspaceMemberId) {
+      await this.messageParticipantRepository.removeWorkspaceMemberIdByHandle(
+        handle,
+        workspaceId,
+      );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/services/message-thread/message-thread.module.ts b/packages/twenty-server/src/modules/messaging/services/message-thread/message-thread.module.ts
new file mode 100644
index 000000000000..c06f474db6b8
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/message-thread/message-thread.module.ts
@@ -0,0 +1,20 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { MessageThreadService } from 'src/modules/messaging/services/message-thread/message-thread.service';
+import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
+import { MessageThreadObjectMetadata } from 'src/modules/messaging/standard-objects/message-thread.object-metadata';
+import { MessageObjectMetadata } from 'src/modules/messaging/standard-objects/message.object-metadata';
+
+@Module({
+  imports: [
+    ObjectMetadataRepositoryModule.forFeature([
+      MessageChannelMessageAssociationObjectMetadata,
+      MessageObjectMetadata,
+      MessageThreadObjectMetadata,
+    ]),
+  ],
+  providers: [MessageThreadService],
+  exports: [MessageThreadService],
+})
+export class MessageThreadModule {}
diff --git a/packages/twenty-server/src/modules/messaging/services/message-thread/message-thread.service.ts b/packages/twenty-server/src/modules/messaging/services/message-thread/message-thread.service.ts
new file mode 100644
index 000000000000..01fa411a3f99
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/message-thread/message-thread.service.ts
@@ -0,0 +1,73 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+import { v4 } from 'uuid';
+
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { MessageChannelMessageAssociationRepository } from 'src/modules/messaging/repositories/message-channel-message-association.repository';
+import { MessageRepository } from 'src/modules/messaging/repositories/message.repository';
+import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
+import { MessageThreadObjectMetadata } from 'src/modules/messaging/standard-objects/message-thread.object-metadata';
+import { MessageThreadRepository } from 'src/modules/messaging/repositories/message-thread.repository';
+import { MessageObjectMetadata } from 'src/modules/messaging/standard-objects/message.object-metadata';
+
+@Injectable()
+export class MessageThreadService {
+  constructor(
+    @InjectObjectMetadataRepository(
+      MessageChannelMessageAssociationObjectMetadata,
+    )
+    private readonly messageChannelMessageAssociationRepository: MessageChannelMessageAssociationRepository,
+    @InjectObjectMetadataRepository(MessageObjectMetadata)
+    private readonly messageRepository: MessageRepository,
+    @InjectObjectMetadataRepository(MessageThreadObjectMetadata)
+    private readonly messageThreadRepository: MessageThreadRepository,
+  ) {}
+
+  public async saveMessageThreadOrReturnExistingMessageThread(
+    headerMessageId: string,
+    messageThreadExternalId: string,
+    workspaceId: string,
+    manager: EntityManager,
+  ) {
+    // Check if message thread already exists via threadExternalId
+    const existingMessageChannelMessageAssociationByMessageThreadExternalId =
+      await this.messageChannelMessageAssociationRepository.getFirstByMessageThreadExternalId(
+        messageThreadExternalId,
+        workspaceId,
+        manager,
+      );
+
+    const existingMessageThread =
+      existingMessageChannelMessageAssociationByMessageThreadExternalId?.messageThreadId;
+
+    if (existingMessageThread) {
+      return Promise.resolve(existingMessageThread);
+    }
+
+    // Check if message thread already exists via existing message headerMessageId
+    const existingMessageWithSameHeaderMessageId =
+      await this.messageRepository.getFirstOrNullByHeaderMessageId(
+        headerMessageId,
+        workspaceId,
+        manager,
+      );
+
+    if (existingMessageWithSameHeaderMessageId) {
+      return Promise.resolve(
+        existingMessageWithSameHeaderMessageId.messageThreadId,
+      );
+    }
+
+    // If message thread does not exist, create new message thread
+    const newMessageThreadId = v4();
+
+    await this.messageThreadRepository.insert(
+      newMessageThreadId,
+      workspaceId,
+      manager,
+    );
+
+    return Promise.resolve(newMessageThreadId);
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/services/message/message.module.ts b/packages/twenty-server/src/modules/messaging/services/message/message.module.ts
new file mode 100644
index 000000000000..9a2bb8abd7e4
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/message/message.module.ts
@@ -0,0 +1,26 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { MessageThreadModule } from 'src/modules/messaging/services/message-thread/message-thread.module';
+import { MessageService } from 'src/modules/messaging/services/message/message.service';
+import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { MessageThreadObjectMetadata } from 'src/modules/messaging/standard-objects/message-thread.object-metadata';
+import { MessageObjectMetadata } from 'src/modules/messaging/standard-objects/message.object-metadata';
+
+@Module({
+  imports: [
+    WorkspaceDataSourceModule,
+    ObjectMetadataRepositoryModule.forFeature([
+      MessageChannelMessageAssociationObjectMetadata,
+      MessageObjectMetadata,
+      MessageChannelObjectMetadata,
+      MessageThreadObjectMetadata,
+    ]),
+    MessageThreadModule,
+  ],
+  providers: [MessageService],
+  exports: [MessageService],
+})
+export class MessageModule {}
diff --git a/packages/twenty-server/src/modules/messaging/services/message/message.service.ts b/packages/twenty-server/src/modules/messaging/services/message/message.service.ts
new file mode 100644
index 000000000000..f3cc41c9f199
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/message/message.service.ts
@@ -0,0 +1,323 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { DataSource, EntityManager } from 'typeorm';
+import { v4 } from 'uuid';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { MessageObjectMetadata } from 'src/modules/messaging/standard-objects/message.object-metadata';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+import { GmailMessage } from 'src/modules/messaging/types/gmail-message';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { MessageChannelMessageAssociationRepository } from 'src/modules/messaging/repositories/message-channel-message-association.repository';
+import { MessageRepository } from 'src/modules/messaging/repositories/message.repository';
+import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { MessageChannelRepository } from 'src/modules/messaging/repositories/message-channel.repository';
+import { MessageThreadService } from 'src/modules/messaging/services/message-thread/message-thread.service';
+import { MessageThreadObjectMetadata } from 'src/modules/messaging/standard-objects/message-thread.object-metadata';
+import { MessageThreadRepository } from 'src/modules/messaging/repositories/message-thread.repository';
+
+@Injectable()
+export class MessageService {
+  private readonly logger = new Logger(MessageService.name);
+
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+    @InjectObjectMetadataRepository(
+      MessageChannelMessageAssociationObjectMetadata,
+    )
+    private readonly messageChannelMessageAssociationRepository: MessageChannelMessageAssociationRepository,
+    @InjectObjectMetadataRepository(MessageObjectMetadata)
+    private readonly messageRepository: MessageRepository,
+    @InjectObjectMetadataRepository(MessageChannelObjectMetadata)
+    private readonly messageChannelRepository: MessageChannelRepository,
+    @InjectObjectMetadataRepository(MessageThreadObjectMetadata)
+    private readonly messageThreadRepository: MessageThreadRepository,
+    private readonly messageThreadService: MessageThreadService,
+  ) {}
+
+  public async saveMessagesWithinTransaction(
+    messages: GmailMessage[],
+    connectedAccount: ObjectRecord<ConnectedAccountObjectMetadata>,
+    gmailMessageChannelId: string,
+    workspaceId: string,
+    transactionManager: EntityManager,
+  ): Promise<Map<string, string>> {
+    const messageExternalIdsAndIdsMap = new Map<string, string>();
+
+    for (const message of messages) {
+      const existingMessageChannelMessageAssociationsCount =
+        await this.messageChannelMessageAssociationRepository.countByMessageExternalIdsAndMessageChannelId(
+          [message.externalId],
+          gmailMessageChannelId,
+          workspaceId,
+          transactionManager,
+        );
+
+      if (existingMessageChannelMessageAssociationsCount > 0) {
+        continue;
+      }
+
+      // TODO: This does not handle all thread merging use cases and might create orphan threads.
+      const savedOrExistingMessageThreadId =
+        await this.messageThreadService.saveMessageThreadOrReturnExistingMessageThread(
+          message.headerMessageId,
+          message.messageThreadExternalId,
+          workspaceId,
+          transactionManager,
+        );
+
+      const savedOrExistingMessageId =
+        await this.saveMessageOrReturnExistingMessage(
+          message,
+          savedOrExistingMessageThreadId,
+          connectedAccount,
+          workspaceId,
+          transactionManager,
+        );
+
+      messageExternalIdsAndIdsMap.set(
+        message.externalId,
+        savedOrExistingMessageId,
+      );
+
+      await this.messageChannelMessageAssociationRepository.insert(
+        gmailMessageChannelId,
+        savedOrExistingMessageId,
+        message.externalId,
+        savedOrExistingMessageThreadId,
+        message.messageThreadExternalId,
+        workspaceId,
+        transactionManager,
+      );
+    }
+
+    return messageExternalIdsAndIdsMap;
+  }
+
+  public async saveMessages(
+    messages: GmailMessage[],
+    workspaceDataSource: DataSource,
+    connectedAccount: ObjectRecord<ConnectedAccountObjectMetadata>,
+    gmailMessageChannelId: string,
+    workspaceId: string,
+  ): Promise<Map<string, string>> {
+    const messageExternalIdsAndIdsMap = new Map<string, string>();
+
+    try {
+      let keepImporting = true;
+
+      for (const message of messages) {
+        if (!keepImporting) {
+          break;
+        }
+
+        await workspaceDataSource?.transaction(
+          async (manager: EntityManager) => {
+            const gmailMessageChannel =
+              await this.messageChannelRepository.getByIds(
+                [gmailMessageChannelId],
+                workspaceId,
+                manager,
+              );
+
+            if (gmailMessageChannel.length === 0) {
+              this.logger.error(
+                `No message channel found for connected account ${connectedAccount.id} in workspace ${workspaceId} in saveMessages`,
+              );
+
+              keepImporting = false;
+
+              return;
+            }
+
+            const existingMessageChannelMessageAssociationsCount =
+              await this.messageChannelMessageAssociationRepository.countByMessageExternalIdsAndMessageChannelId(
+                [message.externalId],
+                gmailMessageChannelId,
+                workspaceId,
+                manager,
+              );
+
+            if (existingMessageChannelMessageAssociationsCount > 0) {
+              return;
+            }
+
+            // TODO: This does not handle all thread merging use cases and might create orphan threads.
+            const savedOrExistingMessageThreadId =
+              await this.messageThreadService.saveMessageThreadOrReturnExistingMessageThread(
+                message.headerMessageId,
+                message.messageThreadExternalId,
+                workspaceId,
+                manager,
+              );
+
+            const savedOrExistingMessageId =
+              await this.saveMessageOrReturnExistingMessage(
+                message,
+                savedOrExistingMessageThreadId,
+                connectedAccount,
+                workspaceId,
+                manager,
+              );
+
+            messageExternalIdsAndIdsMap.set(
+              message.externalId,
+              savedOrExistingMessageId,
+            );
+
+            await this.messageChannelMessageAssociationRepository.insert(
+              gmailMessageChannelId,
+              savedOrExistingMessageId,
+              message.externalId,
+              savedOrExistingMessageThreadId,
+              message.messageThreadExternalId,
+              workspaceId,
+              manager,
+            );
+          },
+        );
+      }
+    } catch (error) {
+      throw new Error(
+        `Error saving connected account ${connectedAccount.id} messages to workspace ${workspaceId}: ${error.message}`,
+      );
+    }
+
+    return messageExternalIdsAndIdsMap;
+  }
+
+  private async saveMessageOrReturnExistingMessage(
+    message: GmailMessage,
+    messageThreadId: string,
+    connectedAccount: ObjectRecord<ConnectedAccountObjectMetadata>,
+    workspaceId: string,
+    manager: EntityManager,
+  ): Promise<string> {
+    const existingMessage =
+      await this.messageRepository.getFirstOrNullByHeaderMessageId(
+        message.headerMessageId,
+        workspaceId,
+      );
+    const existingMessageId = existingMessage?.id;
+
+    if (existingMessageId) {
+      return Promise.resolve(existingMessageId);
+    }
+
+    const newMessageId = v4();
+
+    const messageDirection =
+      connectedAccount.handle === message.fromHandle ? 'outgoing' : 'incoming';
+
+    const receivedAt = new Date(parseInt(message.internalDate));
+
+    await this.messageRepository.insert(
+      newMessageId,
+      message.headerMessageId,
+      message.subject,
+      receivedAt,
+      messageDirection,
+      messageThreadId,
+      message.text,
+      workspaceId,
+      manager,
+    );
+
+    return Promise.resolve(newMessageId);
+  }
+
+  public async deleteMessages(
+    messagesDeletedMessageExternalIds: string[],
+    gmailMessageChannelId: string,
+    workspaceId: string,
+  ) {
+    const workspaceDataSource =
+      await this.workspaceDataSourceService.connectToWorkspaceDataSource(
+        workspaceId,
+      );
+
+    await workspaceDataSource?.transaction(async (manager: EntityManager) => {
+      const messageChannelMessageAssociationsToDelete =
+        await this.messageChannelMessageAssociationRepository.getByMessageExternalIdsAndMessageChannelId(
+          messagesDeletedMessageExternalIds,
+          gmailMessageChannelId,
+          workspaceId,
+          manager,
+        );
+
+      const messageChannelMessageAssociationIdsToDeleteIds =
+        messageChannelMessageAssociationsToDelete.map(
+          (messageChannelMessageAssociationToDelete) =>
+            messageChannelMessageAssociationToDelete.id,
+        );
+
+      await this.messageChannelMessageAssociationRepository.deleteByIds(
+        messageChannelMessageAssociationIdsToDeleteIds,
+        workspaceId,
+        manager,
+      );
+
+      const messageIdsFromMessageChannelMessageAssociationsToDelete =
+        messageChannelMessageAssociationsToDelete.map(
+          (messageChannelMessageAssociationToDelete) =>
+            messageChannelMessageAssociationToDelete.messageId,
+        );
+
+      const messageChannelMessageAssociationByMessageIds =
+        await this.messageChannelMessageAssociationRepository.getByMessageIds(
+          messageIdsFromMessageChannelMessageAssociationsToDelete,
+          workspaceId,
+          manager,
+        );
+
+      const messageIdsFromMessageChannelMessageAssociationByMessageIds =
+        messageChannelMessageAssociationByMessageIds.map(
+          (messageChannelMessageAssociation) =>
+            messageChannelMessageAssociation.messageId,
+        );
+
+      const messageIdsToDelete =
+        messageIdsFromMessageChannelMessageAssociationsToDelete.filter(
+          (messageId) =>
+            !messageIdsFromMessageChannelMessageAssociationByMessageIds.includes(
+              messageId,
+            ),
+        );
+
+      await this.messageRepository.deleteByIds(
+        messageIdsToDelete,
+        workspaceId,
+        manager,
+      );
+
+      const messageThreadIdsFromMessageChannelMessageAssociationsToDelete =
+        messageChannelMessageAssociationsToDelete.map(
+          (messageChannelMessageAssociationToDelete) =>
+            messageChannelMessageAssociationToDelete.messageThreadId,
+        );
+
+      const messagesByThreadIds =
+        await this.messageRepository.getByMessageThreadIds(
+          messageThreadIdsFromMessageChannelMessageAssociationsToDelete,
+          workspaceId,
+          manager,
+        );
+
+      const threadIdsToDelete =
+        messageThreadIdsFromMessageChannelMessageAssociationsToDelete.filter(
+          (threadId) =>
+            !messagesByThreadIds.find(
+              (message) => message.messageThreadId === threadId,
+            ),
+        );
+
+      await this.messageThreadRepository.deleteByIds(
+        threadIdsToDelete,
+        workspaceId,
+        manager,
+      );
+    });
+  }
+}
diff --git a/packages/twenty-server/src/workspace/messaging/services/providers/gmail/gmail-client.provider.ts b/packages/twenty-server/src/modules/messaging/services/providers/gmail/gmail-client.provider.ts
similarity index 75%
rename from packages/twenty-server/src/workspace/messaging/services/providers/gmail/gmail-client.provider.ts
rename to packages/twenty-server/src/modules/messaging/services/providers/gmail/gmail-client.provider.ts
index 2573df4352a4..3b5e591ac546 100644
--- a/packages/twenty-server/src/workspace/messaging/services/providers/gmail/gmail-client.provider.ts
+++ b/packages/twenty-server/src/modules/messaging/services/providers/gmail/gmail-client.provider.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
 import { OAuth2Client } from 'google-auth-library';
 import { gmail_v1, google } from 'googleapis';
 
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 
 @Injectable()
 export class GmailClientProvider {
@@ -21,9 +21,10 @@ export class GmailClientProvider {
   }
 
   private async getOAuth2Client(refreshToken: string): Promise<OAuth2Client> {
-    const gmailClientId = this.environmentService.getAuthGoogleClientId();
-    const gmailClientSecret =
-      this.environmentService.getAuthGoogleClientSecret();
+    const gmailClientId = this.environmentService.get('AUTH_GOOGLE_CLIENT_ID');
+    const gmailClientSecret = this.environmentService.get(
+      'AUTH_GOOGLE_CLIENT_SECRET',
+    );
 
     const oAuth2Client = new google.auth.OAuth2(
       gmailClientId,
diff --git a/packages/twenty-server/src/modules/messaging/services/providers/messaging-providers.module.ts b/packages/twenty-server/src/modules/messaging/services/providers/messaging-providers.module.ts
new file mode 100644
index 000000000000..fc0cb1c178d9
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/providers/messaging-providers.module.ts
@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+
+import { EnvironmentModule } from 'src/engine/integrations/environment/environment.module';
+import { GmailClientProvider } from 'src/modules/messaging/services/providers/gmail/gmail-client.provider';
+
+@Module({
+  imports: [EnvironmentModule],
+  providers: [GmailClientProvider],
+  exports: [GmailClientProvider],
+})
+export class MessagingProvidersModule {}
diff --git a/packages/twenty-server/src/modules/messaging/services/save-message-and-emit-contact-creation-event/save-message-and-emit-contact-creation-event.module.ts b/packages/twenty-server/src/modules/messaging/services/save-message-and-emit-contact-creation-event/save-message-and-emit-contact-creation-event.module.ts
new file mode 100644
index 000000000000..22740ba9c464
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/save-message-and-emit-contact-creation-event/save-message-and-emit-contact-creation-event.module.ts
@@ -0,0 +1,22 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { AutoCompaniesAndContactsCreationModule } from 'src/modules/connected-account/auto-companies-and-contacts-creation/auto-companies-and-contacts-creation.module';
+import { MessageParticipantModule } from 'src/modules/messaging/services/message-participant/message-participant.module';
+import { MessageModule } from 'src/modules/messaging/services/message/message.module';
+import { SaveMessageAndEmitContactCreationEventService } from 'src/modules/messaging/services/save-message-and-emit-contact-creation-event/save-message-and-emit-contact-creation-event.service';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+
+@Module({
+  imports: [
+    MessageModule,
+    ObjectMetadataRepositoryModule.forFeature([MessageChannelObjectMetadata]),
+    AutoCompaniesAndContactsCreationModule,
+    MessageParticipantModule,
+    WorkspaceDataSourceModule,
+  ],
+  providers: [SaveMessageAndEmitContactCreationEventService],
+  exports: [SaveMessageAndEmitContactCreationEventService],
+})
+export class SaveMessageAndEmitContactCreationEventModule {}
diff --git a/packages/twenty-server/src/modules/messaging/services/save-message-and-emit-contact-creation-event/save-message-and-emit-contact-creation-event.service.ts b/packages/twenty-server/src/modules/messaging/services/save-message-and-emit-contact-creation-event/save-message-and-emit-contact-creation-event.service.ts
new file mode 100644
index 000000000000..8a609b108410
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/save-message-and-emit-contact-creation-event/save-message-and-emit-contact-creation-event.service.ts
@@ -0,0 +1,206 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+
+import { EntityManager } from 'typeorm';
+
+import { MessageChannelRepository } from 'src/modules/messaging/repositories/message-channel.repository';
+import {
+  GmailMessage,
+  ParticipantWithMessageId,
+} from 'src/modules/messaging/types/gmail-message';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { MessageService } from 'src/modules/messaging/services/message/message.service';
+import { MessageParticipantService } from 'src/modules/messaging/services/message-participant/message-participant.service';
+
+@Injectable()
+export class SaveMessageAndEmitContactCreationEventService {
+  private readonly logger = new Logger(
+    SaveMessageAndEmitContactCreationEventService.name,
+  );
+
+  constructor(
+    private readonly messageService: MessageService,
+    @InjectObjectMetadataRepository(MessageChannelObjectMetadata)
+    private readonly messageChannelRepository: MessageChannelRepository,
+    private readonly eventEmitter: EventEmitter2,
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+    private readonly messageParticipantService: MessageParticipantService,
+  ) {}
+
+  public async saveMessagesAndEmitContactCreationEventWithinTransaction(
+    messagesToSave: GmailMessage[],
+    connectedAccount: ObjectRecord<ConnectedAccountObjectMetadata>,
+    workspaceId: string,
+    gmailMessageChannel: ObjectRecord<MessageChannelObjectMetadata>,
+    transactionManager: EntityManager,
+  ) {
+    const messageExternalIdsAndIdsMap =
+      await this.messageService.saveMessagesWithinTransaction(
+        messagesToSave,
+        connectedAccount,
+        gmailMessageChannel.id,
+        workspaceId,
+        transactionManager,
+      );
+
+    const participantsWithMessageId: (ParticipantWithMessageId & {
+      shouldCreateContact: boolean;
+    })[] = messagesToSave.flatMap((message) => {
+      const messageId = messageExternalIdsAndIdsMap.get(message.externalId);
+
+      return messageId
+        ? message.participants.map((participant) => ({
+            ...participant,
+            messageId,
+            shouldCreateContact:
+              gmailMessageChannel.isContactAutoCreationEnabled &&
+              message.participants.find((p) => p.role === 'from')?.handle ===
+                connectedAccount.handle,
+          }))
+        : [];
+    });
+
+    await this.messageParticipantService.saveMessageParticipants(
+      participantsWithMessageId,
+      workspaceId,
+      transactionManager,
+    );
+
+    if (gmailMessageChannel.isContactAutoCreationEnabled) {
+      const contactsToCreate = participantsWithMessageId.filter(
+        (participant) => participant.shouldCreateContact,
+      );
+
+      this.eventEmitter.emit(`createContacts`, {
+        workspaceId,
+        connectedAccountHandle: connectedAccount.handle,
+        contactsToCreate,
+      });
+    }
+  }
+
+  async saveMessagesAndEmitContactCreation(
+    messagesToSave: GmailMessage[],
+    connectedAccount: ObjectRecord<ConnectedAccountObjectMetadata>,
+    workspaceId: string,
+    gmailMessageChannelId: string,
+  ) {
+    const { dataSource: workspaceDataSource } =
+      await this.workspaceDataSourceService.connectedToWorkspaceDataSourceAndReturnMetadata(
+        workspaceId,
+      );
+
+    let startTime = Date.now();
+
+    const messageExternalIdsAndIdsMap = await this.messageService.saveMessages(
+      messagesToSave,
+      workspaceDataSource,
+      connectedAccount,
+      gmailMessageChannelId,
+      workspaceId,
+    );
+
+    let endTime = Date.now();
+
+    this.logger.log(
+      `Saving messages for workspace ${workspaceId} and account ${
+        connectedAccount.id
+      } in ${endTime - startTime}ms`,
+    );
+
+    const gmailMessageChannel =
+      await this.messageChannelRepository.getFirstByConnectedAccountId(
+        connectedAccount.id,
+        workspaceId,
+      );
+
+    if (!gmailMessageChannel) {
+      this.logger.error(
+        `No message channel found for connected account ${connectedAccount.id} in workspace ${workspaceId} in saveMessagesAndCreateContacts`,
+      );
+
+      return;
+    }
+
+    const participantsWithMessageId: (ParticipantWithMessageId & {
+      shouldCreateContact: boolean;
+    })[] = messagesToSave.flatMap((message) => {
+      const messageId = messageExternalIdsAndIdsMap.get(message.externalId);
+
+      return messageId
+        ? message.participants.map((participant) => ({
+            ...participant,
+            messageId,
+            shouldCreateContact:
+              gmailMessageChannel.isContactAutoCreationEnabled &&
+              message.participants.find((p) => p.role === 'from')?.handle ===
+                connectedAccount.handle,
+          }))
+        : [];
+    });
+
+    startTime = Date.now();
+
+    await this.tryToSaveMessageParticipantsOrDeleteMessagesIfError(
+      participantsWithMessageId,
+      gmailMessageChannel,
+      workspaceId,
+      connectedAccount,
+    );
+
+    endTime = Date.now();
+
+    this.logger.log(
+      `Saving message participants for workspace ${workspaceId} and account in ${
+        connectedAccount.id
+      } ${endTime - startTime}ms`,
+    );
+  }
+
+  private async tryToSaveMessageParticipantsOrDeleteMessagesIfError(
+    participantsWithMessageId: (ParticipantWithMessageId & {
+      shouldCreateContact: boolean;
+    })[],
+    gmailMessageChannel: ObjectRecord<MessageChannelObjectMetadata>,
+    workspaceId: string,
+    connectedAccount: ObjectRecord<ConnectedAccountObjectMetadata>,
+  ) {
+    try {
+      await this.messageParticipantService.saveMessageParticipants(
+        participantsWithMessageId,
+        workspaceId,
+      );
+
+      if (gmailMessageChannel.isContactAutoCreationEnabled) {
+        const contactsToCreate = participantsWithMessageId.filter(
+          (participant) => participant.shouldCreateContact,
+        );
+
+        this.eventEmitter.emit(`createContacts`, {
+          workspaceId,
+          connectedAccountHandle: connectedAccount.handle,
+          contactsToCreate,
+        });
+      }
+    } catch (error) {
+      this.logger.error(
+        `Error saving message participants for workspace ${workspaceId} and account ${connectedAccount.id}`,
+        error,
+      );
+
+      const messagesToDelete = participantsWithMessageId.map(
+        (participant) => participant.messageId,
+      );
+
+      await this.messageService.deleteMessages(
+        messagesToDelete,
+        gmailMessageChannel.id,
+        workspaceId,
+      );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/services/thread-cleaner/thread-cleaner.module.ts b/packages/twenty-server/src/modules/messaging/services/thread-cleaner/thread-cleaner.module.ts
new file mode 100644
index 000000000000..33b43ab4360e
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/thread-cleaner/thread-cleaner.module.ts
@@ -0,0 +1,18 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { ThreadCleanerService } from 'src/modules/messaging/services/thread-cleaner/thread-cleaner.service';
+import { MessageThreadObjectMetadata } from 'src/modules/messaging/standard-objects/message-thread.object-metadata';
+import { MessageObjectMetadata } from 'src/modules/messaging/standard-objects/message.object-metadata';
+
+@Module({
+  imports: [
+    ObjectMetadataRepositoryModule.forFeature([
+      MessageObjectMetadata,
+      MessageThreadObjectMetadata,
+    ]),
+  ],
+  providers: [ThreadCleanerService],
+  exports: [ThreadCleanerService],
+})
+export class ThreadCleanerModule {}
diff --git a/packages/twenty-server/src/modules/messaging/services/thread-cleaner/thread-cleaner.service.ts b/packages/twenty-server/src/modules/messaging/services/thread-cleaner/thread-cleaner.service.ts
new file mode 100644
index 000000000000..f370674dc762
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/thread-cleaner/thread-cleaner.service.ts
@@ -0,0 +1,40 @@
+import { Injectable } from '@nestjs/common';
+
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { MessageThreadRepository } from 'src/modules/messaging/repositories/message-thread.repository';
+import { MessageRepository } from 'src/modules/messaging/repositories/message.repository';
+import { deleteUsingPagination } from 'src/modules/messaging/services/thread-cleaner/utils/delete-using-pagination.util';
+import { MessageThreadObjectMetadata } from 'src/modules/messaging/standard-objects/message-thread.object-metadata';
+import { MessageObjectMetadata } from 'src/modules/messaging/standard-objects/message.object-metadata';
+
+@Injectable()
+export class ThreadCleanerService {
+  constructor(
+    @InjectObjectMetadataRepository(MessageObjectMetadata)
+    private readonly messageRepository: MessageRepository,
+    @InjectObjectMetadataRepository(MessageThreadObjectMetadata)
+    private readonly messageThreadRepository: MessageThreadRepository,
+  ) {}
+
+  public async cleanWorkspaceThreads(workspaceId: string) {
+    await deleteUsingPagination(
+      workspaceId,
+      500,
+      this.messageRepository.getNonAssociatedMessageIdsPaginated.bind(
+        this.messageRepository,
+      ),
+      this.messageRepository.deleteByIds.bind(this.messageRepository),
+    );
+
+    await deleteUsingPagination(
+      workspaceId,
+      500,
+      this.messageThreadRepository.getOrphanThreadIdsPaginated.bind(
+        this.messageThreadRepository,
+      ),
+      this.messageThreadRepository.deleteByIds.bind(
+        this.messageThreadRepository,
+      ),
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/services/thread-cleaner/utils/delete-using-pagination.util.spec.ts b/packages/twenty-server/src/modules/messaging/services/thread-cleaner/utils/delete-using-pagination.util.spec.ts
new file mode 100644
index 000000000000..cca39a8d6ed9
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/thread-cleaner/utils/delete-using-pagination.util.spec.ts
@@ -0,0 +1,44 @@
+import { deleteUsingPagination } from './delete-using-pagination.util';
+
+describe('deleteUsingPagination', () => {
+  it('should delete items using pagination', async () => {
+    const workspaceId = 'workspace123';
+    const batchSize = 10;
+    const getterPaginated = jest
+      .fn()
+      .mockResolvedValueOnce(['id1', 'id2'])
+      .mockResolvedValueOnce([]);
+    const deleter = jest.fn();
+    const transactionManager = undefined;
+
+    await deleteUsingPagination(
+      workspaceId,
+      batchSize,
+      getterPaginated,
+      deleter,
+      transactionManager,
+    );
+
+    expect(getterPaginated).toHaveBeenNthCalledWith(
+      1,
+      batchSize,
+      0,
+      workspaceId,
+      transactionManager,
+    );
+    expect(getterPaginated).toHaveBeenNthCalledWith(
+      2,
+      batchSize,
+      batchSize,
+      workspaceId,
+      transactionManager,
+    );
+    expect(deleter).toHaveBeenNthCalledWith(
+      1,
+      ['id1', 'id2'],
+      workspaceId,
+      transactionManager,
+    );
+    expect(deleter).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/packages/twenty-server/src/modules/messaging/services/thread-cleaner/utils/delete-using-pagination.util.ts b/packages/twenty-server/src/modules/messaging/services/thread-cleaner/utils/delete-using-pagination.util.ts
new file mode 100644
index 000000000000..86564bd4374d
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/thread-cleaner/utils/delete-using-pagination.util.ts
@@ -0,0 +1,38 @@
+import { EntityManager } from 'typeorm';
+
+export const deleteUsingPagination = async (
+  workspaceId: string,
+  batchSize: number,
+  getterPaginated: (
+    limit: number,
+    offset: number,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) => Promise<string[]>,
+  deleter: (
+    ids: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ) => Promise<void>,
+  transactionManager?: EntityManager,
+) => {
+  let offset = 0;
+  let hasMoreData = true;
+
+  while (hasMoreData) {
+    const idsToDelete = await getterPaginated(
+      batchSize,
+      offset,
+      workspaceId,
+      transactionManager,
+    );
+
+    if (idsToDelete.length > 0) {
+      await deleter(idsToDelete, workspaceId, transactionManager);
+    } else {
+      hasMoreData = false;
+    }
+
+    offset += batchSize;
+  }
+};
diff --git a/packages/twenty-server/src/modules/messaging/services/utils/__tests__/format-address-object-as-participants.util.spec.ts b/packages/twenty-server/src/modules/messaging/services/utils/__tests__/format-address-object-as-participants.util.spec.ts
new file mode 100644
index 000000000000..03d52b91d03a
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/utils/__tests__/format-address-object-as-participants.util.spec.ts
@@ -0,0 +1,37 @@
+import { formatAddressObjectAsParticipants } from 'src/modules/messaging/services/utils/format-address-object-as-participants.util';
+
+describe('formatAddressObjectAsParticipants', () => {
+  it('should format address object as participants', () => {
+    const addressObject = {
+      value: [
+        { name: 'John Doe', address: 'john.doe @example.com' },
+        { name: 'Jane Smith', address: 'jane.smith@example.com ' },
+      ],
+      html: '',
+      text: '',
+    };
+
+    const result = formatAddressObjectAsParticipants(addressObject, 'from');
+
+    expect(result).toEqual([
+      {
+        role: 'from',
+        handle: 'john.doe@example.com',
+        displayName: 'John Doe',
+      },
+      {
+        role: 'from',
+        handle: 'jane.smith@example.com',
+        displayName: 'Jane Smith',
+      },
+    ]);
+  });
+
+  it('should return an empty array if address object is undefined', () => {
+    const addressObject = undefined;
+
+    const result = formatAddressObjectAsParticipants(addressObject, 'to');
+
+    expect(result).toEqual([]);
+  });
+});
diff --git a/packages/twenty-server/src/modules/messaging/services/utils/format-address-object-as-participants.util.ts b/packages/twenty-server/src/modules/messaging/services/utils/format-address-object-as-participants.util.ts
new file mode 100644
index 000000000000..674bfa2c7d44
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/services/utils/format-address-object-as-participants.util.ts
@@ -0,0 +1,37 @@
+import { AddressObject } from 'mailparser';
+
+import { Participant } from 'src/modules/messaging/types/gmail-message';
+
+const formatAddressObjectAsArray = (
+  addressObject: AddressObject | AddressObject[],
+): AddressObject[] => {
+  return Array.isArray(addressObject) ? addressObject : [addressObject];
+};
+
+const removeSpacesAndLowerCase = (email: string): string => {
+  return email.replace(/\s/g, '').toLowerCase();
+};
+
+export const formatAddressObjectAsParticipants = (
+  addressObject: AddressObject | AddressObject[] | undefined,
+  role: 'from' | 'to' | 'cc' | 'bcc',
+): Participant[] => {
+  if (!addressObject) return [];
+  const addressObjects = formatAddressObjectAsArray(addressObject);
+
+  const participants = addressObjects.map((addressObject) => {
+    const emailAdresses = addressObject.value;
+
+    return emailAdresses.map((emailAddress) => {
+      const { name, address } = emailAddress;
+
+      return {
+        role,
+        handle: address ? removeSpacesAndLowerCase(address) : '',
+        displayName: name || '',
+      };
+    });
+  });
+
+  return participants.flat();
+};
diff --git a/packages/twenty-server/src/modules/messaging/standard-objects/message-channel-message-association.object-metadata.ts b/packages/twenty-server/src/modules/messaging/standard-objects/message-channel-message-association.object-metadata.ts
new file mode 100644
index 000000000000..19e946bbc047
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/standard-objects/message-channel-message-association.object-metadata.ts
@@ -0,0 +1,77 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { messageChannelMessageAssociationStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { MessageThreadObjectMetadata } from 'src/modules/messaging/standard-objects/message-thread.object-metadata';
+import { MessageObjectMetadata } from 'src/modules/messaging/standard-objects/message.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.messageChannelMessageAssociation,
+  namePlural: 'messageChannelMessageAssociations',
+  labelSingular: 'Message Channel Message Association',
+  labelPlural: 'Message Channel Message Associations',
+  description: 'Message Synced with a Message Channel',
+  icon: 'IconMessage',
+})
+@IsSystem()
+export class MessageChannelMessageAssociationObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: messageChannelMessageAssociationStandardFieldIds.messageChannel,
+    type: FieldMetadataType.RELATION,
+    label: 'Message Channel Id',
+    description: 'Message Channel Id',
+    icon: 'IconHash',
+    joinColumn: 'messageChannelId',
+  })
+  @IsNullable()
+  messageChannel: MessageChannelObjectMetadata;
+
+  @FieldMetadata({
+    standardId: messageChannelMessageAssociationStandardFieldIds.message,
+    type: FieldMetadataType.RELATION,
+    label: 'Message Id',
+    description: 'Message Id',
+    icon: 'IconHash',
+    joinColumn: 'messageId',
+  })
+  @IsNullable()
+  message: MessageObjectMetadata;
+
+  @FieldMetadata({
+    standardId:
+      messageChannelMessageAssociationStandardFieldIds.messageExternalId,
+    type: FieldMetadataType.TEXT,
+    label: 'Message External Id',
+    description: 'Message id from the messaging provider',
+    icon: 'IconHash',
+  })
+  @IsNullable()
+  messageExternalId: string;
+
+  @FieldMetadata({
+    standardId: messageChannelMessageAssociationStandardFieldIds.messageThread,
+    type: FieldMetadataType.RELATION,
+    label: 'Message Thread Id',
+    description: 'Message Thread Id',
+    icon: 'IconHash',
+    joinColumn: 'messageThreadId',
+  })
+  @IsNullable()
+  messageThread: MessageThreadObjectMetadata;
+
+  @FieldMetadata({
+    standardId:
+      messageChannelMessageAssociationStandardFieldIds.messageThreadExternalId,
+    type: FieldMetadataType.TEXT,
+    label: 'Thread External Id',
+    description: 'Thread id from the messaging provider',
+    icon: 'IconHash',
+  })
+  @IsNullable()
+  messageThreadExternalId: string;
+}
diff --git a/packages/twenty-server/src/modules/messaging/standard-objects/message-channel.object-metadata.ts b/packages/twenty-server/src/modules/messaging/standard-objects/message-channel.object-metadata.ts
new file mode 100644
index 000000000000..5164e9b3773a
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/standard-objects/message-channel.object-metadata.ts
@@ -0,0 +1,208 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { messageChannelStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
+
+export enum MessageChannelSyncStatus {
+  PENDING = 'PENDING',
+  ONGOING = 'ONGOING',
+  SUCCEEDED = 'SUCCEEDED',
+  FAILED = 'FAILED',
+}
+
+export enum MessageChannelVisibility {
+  METADATA = 'metadata',
+  SUBJECT = 'subject',
+  SHARE_EVERYTHING = 'share_everything',
+}
+
+export enum MessageChannelType {
+  EMAIL = 'email',
+  SMS = 'sms',
+}
+
+@ObjectMetadata({
+  standardId: standardObjectIds.messageChannel,
+  namePlural: 'messageChannels',
+  labelSingular: 'Message Channel',
+  labelPlural: 'Message Channels',
+  description: 'Message Channels',
+  icon: 'IconMessage',
+})
+@IsSystem()
+export class MessageChannelObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: messageChannelStandardFieldIds.visibility,
+    type: FieldMetadataType.SELECT,
+    label: 'Visibility',
+    description: 'Visibility',
+    icon: 'IconEyeglass',
+    options: [
+      {
+        value: MessageChannelVisibility.METADATA,
+        label: 'Metadata',
+        position: 0,
+        color: 'green',
+      },
+      {
+        value: MessageChannelVisibility.SUBJECT,
+        label: 'Subject',
+        position: 1,
+        color: 'blue',
+      },
+      {
+        value: MessageChannelVisibility.SHARE_EVERYTHING,
+        label: 'Share Everything',
+        position: 2,
+        color: 'orange',
+      },
+    ],
+    defaultValue: `'${MessageChannelVisibility.SHARE_EVERYTHING}'`,
+  })
+  visibility: string;
+
+  @FieldMetadata({
+    standardId: messageChannelStandardFieldIds.handle,
+    type: FieldMetadataType.TEXT,
+    label: 'Handle',
+    description: 'Handle',
+    icon: 'IconAt',
+  })
+  handle: string;
+
+  @FieldMetadata({
+    standardId: messageChannelStandardFieldIds.connectedAccount,
+    type: FieldMetadataType.RELATION,
+    label: 'Connected Account',
+    description: 'Connected Account',
+    icon: 'IconUserCircle',
+    joinColumn: 'connectedAccountId',
+  })
+  connectedAccount: ConnectedAccountObjectMetadata;
+
+  @FieldMetadata({
+    standardId: messageChannelStandardFieldIds.type,
+    type: FieldMetadataType.SELECT,
+    label: 'Type',
+    description: 'Channel Type',
+    icon: 'IconMessage',
+    options: [
+      {
+        value: MessageChannelType.EMAIL,
+        label: 'Email',
+        position: 0,
+        color: 'green',
+      },
+      {
+        value: MessageChannelType.SMS,
+        label: 'SMS',
+        position: 1,
+        color: 'blue',
+      },
+    ],
+    defaultValue: `'${MessageChannelType.EMAIL}'`,
+  })
+  type: string;
+
+  @FieldMetadata({
+    standardId: messageChannelStandardFieldIds.isContactAutoCreationEnabled,
+    type: FieldMetadataType.BOOLEAN,
+    label: 'Is Contact Auto Creation Enabled',
+    description: 'Is Contact Auto Creation Enabled',
+    icon: 'IconUserCircle',
+    defaultValue: true,
+  })
+  isContactAutoCreationEnabled: boolean;
+
+  @FieldMetadata({
+    standardId:
+      messageChannelStandardFieldIds.messageChannelMessageAssociations,
+    type: FieldMetadataType.RELATION,
+    label: 'Message Channel Association',
+    description: 'Messages from the channel.',
+    icon: 'IconMessage',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => MessageChannelMessageAssociationObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  messageChannelMessageAssociations: MessageChannelMessageAssociationObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: messageChannelStandardFieldIds.syncCursor,
+    type: FieldMetadataType.TEXT,
+    label: 'Last sync cursor',
+    description: 'Last sync cursor',
+    icon: 'IconHistory',
+  })
+  syncCursor: string;
+
+  @FieldMetadata({
+    standardId: messageChannelStandardFieldIds.syncedAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Last sync date',
+    description: 'Last sync date',
+    icon: 'IconHistory',
+  })
+  @IsNullable()
+  syncedAt: string;
+
+  @FieldMetadata({
+    standardId: messageChannelStandardFieldIds.syncStatus,
+    type: FieldMetadataType.SELECT,
+    label: 'Last sync status',
+    description: 'Last sync status',
+    icon: 'IconHistory',
+    options: [
+      {
+        value: MessageChannelSyncStatus.PENDING,
+        label: 'Pending',
+        position: 0,
+        color: 'blue',
+      },
+      {
+        value: MessageChannelSyncStatus.ONGOING,
+        label: 'Ongoing',
+        position: 1,
+        color: 'yellow',
+      },
+      {
+        value: MessageChannelSyncStatus.SUCCEEDED,
+        label: 'Succeeded',
+        position: 2,
+        color: 'green',
+      },
+      {
+        value: MessageChannelSyncStatus.FAILED,
+        label: 'Failed',
+        position: 3,
+        color: 'red',
+      },
+    ],
+  })
+  @IsNullable()
+  syncStatus: MessageChannelSyncStatus;
+
+  @FieldMetadata({
+    standardId: messageChannelStandardFieldIds.ongoingSyncStartedAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Ongoing sync started at',
+    description: 'Ongoing sync started at',
+    icon: 'IconHistory',
+  })
+  @IsNullable()
+  ongoingSyncStartedAt: string;
+}
diff --git a/packages/twenty-server/src/modules/messaging/standard-objects/message-participant.object-metadata.ts b/packages/twenty-server/src/modules/messaging/standard-objects/message-participant.object-metadata.ts
new file mode 100644
index 000000000000..6c0e39c6f5cd
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/standard-objects/message-participant.object-metadata.ts
@@ -0,0 +1,88 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { messageParticipantStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { MessageObjectMetadata } from 'src/modules/messaging/standard-objects/message.object-metadata';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.messageParticipant,
+  namePlural: 'messageParticipants',
+  labelSingular: 'Message Participant',
+  labelPlural: 'Message Participants',
+  description: 'Message Participants',
+  icon: 'IconUserCircle',
+})
+@IsSystem()
+export class MessageParticipantObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: messageParticipantStandardFieldIds.message,
+    type: FieldMetadataType.RELATION,
+    label: 'Message',
+    description: 'Message',
+    icon: 'IconMessage',
+    joinColumn: 'messageId',
+  })
+  message: MessageObjectMetadata;
+
+  @FieldMetadata({
+    standardId: messageParticipantStandardFieldIds.role,
+    type: FieldMetadataType.SELECT,
+    label: 'Role',
+    description: 'Role',
+    icon: 'IconAt',
+    options: [
+      { value: 'from', label: 'From', position: 0, color: 'green' },
+      { value: 'to', label: 'To', position: 1, color: 'blue' },
+      { value: 'cc', label: 'Cc', position: 2, color: 'orange' },
+      { value: 'bcc', label: 'Bcc', position: 3, color: 'red' },
+    ],
+    defaultValue: "'from'",
+  })
+  role: string;
+
+  @FieldMetadata({
+    standardId: messageParticipantStandardFieldIds.handle,
+    type: FieldMetadataType.TEXT,
+    label: 'Handle',
+    description: 'Handle',
+    icon: 'IconAt',
+  })
+  handle: string;
+
+  @FieldMetadata({
+    standardId: messageParticipantStandardFieldIds.displayName,
+    type: FieldMetadataType.TEXT,
+    label: 'Display Name',
+    description: 'Display Name',
+    icon: 'IconUser',
+  })
+  displayName: string;
+
+  @FieldMetadata({
+    standardId: messageParticipantStandardFieldIds.person,
+    type: FieldMetadataType.RELATION,
+    label: 'Person',
+    description: 'Person',
+    icon: 'IconUser',
+    joinColumn: 'personId',
+  })
+  @IsNullable()
+  person: PersonObjectMetadata;
+
+  @FieldMetadata({
+    standardId: messageParticipantStandardFieldIds.workspaceMember,
+    type: FieldMetadataType.RELATION,
+    label: 'Workspace Member',
+    description: 'Workspace member',
+    icon: 'IconCircleUser',
+    joinColumn: 'workspaceMemberId',
+  })
+  @IsNullable()
+  workspaceMember: WorkspaceMemberObjectMetadata;
+}
diff --git a/packages/twenty-server/src/modules/messaging/standard-objects/message-thread.object-metadata.ts b/packages/twenty-server/src/modules/messaging/standard-objects/message-thread.object-metadata.ts
new file mode 100644
index 000000000000..a6c934c917ad
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/standard-objects/message-thread.object-metadata.ts
@@ -0,0 +1,56 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { messageThreadStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
+import { MessageObjectMetadata } from 'src/modules/messaging/standard-objects/message.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.messageThread,
+  namePlural: 'messageThreads',
+  labelSingular: 'Message Thread',
+  labelPlural: 'Message Threads',
+  description: 'Message Thread',
+  icon: 'IconMessage',
+})
+@IsSystem()
+export class MessageThreadObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: messageThreadStandardFieldIds.messages,
+    type: FieldMetadataType.RELATION,
+    label: 'Messages',
+    description: 'Messages from the thread.',
+    icon: 'IconMessage',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => MessageObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  messages: MessageObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: messageThreadStandardFieldIds.messageChannelMessageAssociations,
+    type: FieldMetadataType.RELATION,
+    label: 'Message Channel Association',
+    description: 'Messages from the channel.',
+    icon: 'IconMessage',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => MessageChannelMessageAssociationObjectMetadata,
+    onDelete: RelationOnDeleteAction.RESTRICT,
+  })
+  @IsNullable()
+  messageChannelMessageAssociations: MessageChannelMessageAssociationObjectMetadata[];
+}
diff --git a/packages/twenty-server/src/modules/messaging/standard-objects/message.object-metadata.ts b/packages/twenty-server/src/modules/messaging/standard-objects/message.object-metadata.ts
new file mode 100644
index 000000000000..f7d944e2161e
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/standard-objects/message.object-metadata.ts
@@ -0,0 +1,120 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { messageStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
+import { MessageParticipantObjectMetadata } from 'src/modules/messaging/standard-objects/message-participant.object-metadata';
+import { MessageThreadObjectMetadata } from 'src/modules/messaging/standard-objects/message-thread.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.message,
+  namePlural: 'messages',
+  labelSingular: 'Message',
+  labelPlural: 'Messages',
+  description: 'Message',
+  icon: 'IconMessage',
+})
+@IsSystem()
+export class MessageObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: messageStandardFieldIds.headerMessageId,
+    type: FieldMetadataType.TEXT,
+    label: 'Header message Id',
+    description: 'Message id from the message header',
+    icon: 'IconHash',
+  })
+  headerMessageId: string;
+
+  @FieldMetadata({
+    standardId: messageStandardFieldIds.messageThread,
+    type: FieldMetadataType.RELATION,
+    label: 'Message Thread Id',
+    description: 'Message Thread Id',
+    icon: 'IconHash',
+    joinColumn: 'messageThreadId',
+  })
+  @IsNullable()
+  messageThread: MessageThreadObjectMetadata;
+
+  @FieldMetadata({
+    standardId: messageStandardFieldIds.direction,
+    type: FieldMetadataType.SELECT,
+    label: 'Direction',
+    description: 'Message Direction',
+    icon: 'IconDirection',
+    options: [
+      { value: 'incoming', label: 'Incoming', position: 0, color: 'green' },
+      { value: 'outgoing', label: 'Outgoing', position: 1, color: 'blue' },
+    ],
+    defaultValue: "'incoming'",
+  })
+  direction: string;
+
+  @FieldMetadata({
+    standardId: messageStandardFieldIds.subject,
+    type: FieldMetadataType.TEXT,
+    label: 'Subject',
+    description: 'Subject',
+    icon: 'IconMessage',
+  })
+  subject: string;
+
+  @FieldMetadata({
+    standardId: messageStandardFieldIds.text,
+    type: FieldMetadataType.TEXT,
+    label: 'Text',
+    description: 'Text',
+    icon: 'IconMessage',
+  })
+  text: string;
+
+  @FieldMetadata({
+    standardId: messageStandardFieldIds.receivedAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Received At',
+    description: 'The date the message was received',
+    icon: 'IconCalendar',
+  })
+  @IsNullable()
+  receivedAt: string;
+
+  @FieldMetadata({
+    standardId: messageStandardFieldIds.messageParticipants,
+    type: FieldMetadataType.RELATION,
+    label: 'Message Participants',
+    description: 'Message Participants',
+    icon: 'IconUserCircle',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => MessageParticipantObjectMetadata,
+    inverseSideFieldKey: 'message',
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  messageParticipants: MessageParticipantObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: messageStandardFieldIds.messageChannelMessageAssociations,
+    type: FieldMetadataType.RELATION,
+    label: 'Message Channel Association',
+    description: 'Messages from the channel.',
+    icon: 'IconMessage',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => MessageChannelMessageAssociationObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  messageChannelMessageAssociations: MessageChannelMessageAssociationObjectMetadata[];
+}
diff --git a/packages/twenty-server/src/modules/messaging/types/batch-queries.ts b/packages/twenty-server/src/modules/messaging/types/batch-queries.ts
new file mode 100644
index 000000000000..c072a6e71883
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/types/batch-queries.ts
@@ -0,0 +1,5 @@
+type Query = {
+  uri: string;
+};
+
+export type BatchQueries = Query[];
diff --git a/packages/twenty-server/src/modules/messaging/types/gmail-error.ts b/packages/twenty-server/src/modules/messaging/types/gmail-error.ts
new file mode 100644
index 000000000000..ff715e217a66
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/types/gmail-error.ts
@@ -0,0 +1,11 @@
+export type GmailError = {
+  code: number;
+  errors: {
+    domain: string;
+    reason: string;
+    message: string;
+    locationType?: string;
+    location?: string;
+  }[];
+  message: string;
+};
diff --git a/packages/twenty-server/src/workspace/messaging/types/gmail-message-parsed-response.ts b/packages/twenty-server/src/modules/messaging/types/gmail-message-parsed-response.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/messaging/types/gmail-message-parsed-response.ts
rename to packages/twenty-server/src/modules/messaging/types/gmail-message-parsed-response.ts
diff --git a/packages/twenty-server/src/workspace/messaging/types/gmail-message.ts b/packages/twenty-server/src/modules/messaging/types/gmail-message.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/messaging/types/gmail-message.ts
rename to packages/twenty-server/src/modules/messaging/types/gmail-message.ts
diff --git a/packages/twenty-server/src/workspace/messaging/types/gmail-thread.ts b/packages/twenty-server/src/modules/messaging/types/gmail-thread.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/messaging/types/gmail-thread.ts
rename to packages/twenty-server/src/modules/messaging/types/gmail-thread.ts
diff --git a/packages/twenty-server/src/workspace/messaging/types/message-or-thread-query.ts b/packages/twenty-server/src/modules/messaging/types/message-or-thread-query.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/messaging/types/message-or-thread-query.ts
rename to packages/twenty-server/src/modules/messaging/types/message-or-thread-query.ts
diff --git a/packages/twenty-server/src/modules/messaging/utils/create-queries-from-message-ids.util.ts b/packages/twenty-server/src/modules/messaging/utils/create-queries-from-message-ids.util.ts
new file mode 100644
index 000000000000..304454488f15
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/utils/create-queries-from-message-ids.util.ts
@@ -0,0 +1,9 @@
+import { MessageQuery } from 'src/modules/messaging/types/message-or-thread-query';
+
+export const createQueriesFromMessageIds = (
+  messageExternalIds: string[],
+): MessageQuery[] => {
+  return messageExternalIds.map((messageId) => ({
+    uri: '/gmail/v1/users/me/messages/' + messageId + '?format=RAW',
+  }));
+};
diff --git a/packages/twenty-server/src/modules/messaging/utils/get-company-name-from-domain-name.util.ts b/packages/twenty-server/src/modules/messaging/utils/get-company-name-from-domain-name.util.ts
new file mode 100644
index 000000000000..596807249a8a
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/utils/get-company-name-from-domain-name.util.ts
@@ -0,0 +1,9 @@
+import psl from 'psl';
+
+import { capitalize } from 'src/utils/capitalize';
+
+export const getCompanyNameFromDomainName = (domainName: string) => {
+  const { sld } = psl.parse(domainName);
+
+  return sld ? capitalize(sld) : '';
+};
diff --git a/packages/twenty-server/src/modules/messaging/utils/get-domain-name-from-handle.util.ts b/packages/twenty-server/src/modules/messaging/utils/get-domain-name-from-handle.util.ts
new file mode 100644
index 000000000000..7642835971a5
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/utils/get-domain-name-from-handle.util.ts
@@ -0,0 +1,9 @@
+import psl from 'psl';
+
+export const getDomainNameFromHandle = (handle: string): string => {
+  const wholeDomain = handle?.split('@')?.[1] || '';
+
+  const { domain } = psl.parse(wholeDomain);
+
+  return domain || '';
+};
diff --git a/packages/twenty-server/src/workspace/messaging/utils/get-first-name-and-last-name-from-handle-and-display-name.util.ts b/packages/twenty-server/src/modules/messaging/utils/get-first-name-and-last-name-from-handle-and-display-name.util.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/messaging/utils/get-first-name-and-last-name-from-handle-and-display-name.util.ts
rename to packages/twenty-server/src/modules/messaging/utils/get-first-name-and-last-name-from-handle-and-display-name.util.ts
diff --git a/packages/twenty-server/src/workspace/messaging/utils/gmail-search-filter.ts b/packages/twenty-server/src/modules/messaging/utils/gmail-search-filter.util.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/messaging/utils/gmail-search-filter.ts
rename to packages/twenty-server/src/modules/messaging/utils/gmail-search-filter.util.ts
diff --git a/packages/twenty-server/src/workspace/messaging/utils/is-person-email.util.ts b/packages/twenty-server/src/modules/messaging/utils/is-person-email.util.ts
similarity index 100%
rename from packages/twenty-server/src/workspace/messaging/utils/is-person-email.util.ts
rename to packages/twenty-server/src/modules/messaging/utils/is-person-email.util.ts
diff --git a/packages/twenty-server/src/modules/modules.module.ts b/packages/twenty-server/src/modules/modules.module.ts
new file mode 100644
index 000000000000..2d966e073296
--- /dev/null
+++ b/packages/twenty-server/src/modules/modules.module.ts
@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+
+import { CalendarModule } from 'src/modules/calendar/calendar.module';
+import { MessagingModule } from 'src/modules/messaging/messaging.module';
+
+@Module({
+  imports: [MessagingModule, CalendarModule],
+  providers: [],
+  exports: [],
+})
+export class ModulesModule {}
diff --git a/packages/twenty-server/src/modules/opportunity/standard-objects/opportunity.object-metadata.ts b/packages/twenty-server/src/modules/opportunity/standard-objects/opportunity.object-metadata.ts
new file mode 100644
index 000000000000..c8353dd13217
--- /dev/null
+++ b/packages/twenty-server/src/modules/opportunity/standard-objects/opportunity.object-metadata.ts
@@ -0,0 +1,185 @@
+import { CurrencyMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/currency.composite-type';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { opportunityStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
+import { ActivityTargetObjectMetadata } from 'src/modules/activity/standard-objects/activity-target.object-metadata';
+import { AttachmentObjectMetadata } from 'src/modules/attachment/standard-objects/attachment.object-metadata';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
+import { FavoriteObjectMetadata } from 'src/modules/favorite/standard-objects/favorite.object-metadata';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+import { EventObjectMetadata } from 'src/modules/event/standard-objects/event.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.opportunity,
+  namePlural: 'opportunities',
+  labelSingular: 'Opportunity',
+  labelPlural: 'Opportunities',
+  description: 'An opportunity',
+  icon: 'IconTargetArrow',
+})
+export class OpportunityObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: opportunityStandardFieldIds.name,
+    type: FieldMetadataType.TEXT,
+    label: 'Name',
+    description: 'The opportunity name',
+    icon: 'IconTargetArrow',
+  })
+  name: string;
+
+  @FieldMetadata({
+    standardId: opportunityStandardFieldIds.amount,
+    type: FieldMetadataType.CURRENCY,
+    label: 'Amount',
+    description: 'Opportunity amount',
+    icon: 'IconCurrencyDollar',
+  })
+  @IsNullable()
+  amount: CurrencyMetadata;
+
+  @FieldMetadata({
+    standardId: opportunityStandardFieldIds.closeDate,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Close date',
+    description: 'Opportunity close date',
+    icon: 'IconCalendarEvent',
+  })
+  @IsNullable()
+  closeDate: Date;
+
+  @FieldMetadata({
+    standardId: opportunityStandardFieldIds.probability,
+    type: FieldMetadataType.TEXT,
+    label: 'Probability',
+    description: 'Opportunity probability',
+    icon: 'IconProgressCheck',
+    defaultValue: "'0'",
+  })
+  probability: string;
+
+  @FieldMetadata({
+    standardId: opportunityStandardFieldIds.stage,
+    type: FieldMetadataType.SELECT,
+    label: 'Stage',
+    description: 'Opportunity stage',
+    icon: 'IconProgressCheck',
+    options: [
+      { value: 'NEW', label: 'New', position: 0, color: 'red' },
+      { value: 'SCREENING', label: 'Screening', position: 1, color: 'purple' },
+      { value: 'MEETING', label: 'Meeting', position: 2, color: 'sky' },
+      {
+        value: 'PROPOSAL',
+        label: 'Proposal',
+        position: 3,
+        color: 'turquoise',
+      },
+      { value: 'CUSTOMER', label: 'Customer', position: 4, color: 'yellow' },
+    ],
+    defaultValue: "'NEW'",
+  })
+  stage: string;
+
+  @FieldMetadata({
+    standardId: opportunityStandardFieldIds.position,
+    type: FieldMetadataType.POSITION,
+    label: 'Position',
+    description: 'Opportunity record position',
+    icon: 'IconHierarchy2',
+  })
+  @IsSystem()
+  @IsNullable()
+  position: number;
+
+  @FieldMetadata({
+    standardId: opportunityStandardFieldIds.pointOfContact,
+    type: FieldMetadataType.RELATION,
+    label: 'Point of Contact',
+    description: 'Opportunity point of contact',
+    icon: 'IconUser',
+    joinColumn: 'pointOfContactId',
+  })
+  @IsNullable()
+  pointOfContact: PersonObjectMetadata;
+
+  @FieldMetadata({
+    standardId: opportunityStandardFieldIds.company,
+    type: FieldMetadataType.RELATION,
+    label: 'Company',
+    description: 'Opportunity company',
+    icon: 'IconBuildingSkyscraper',
+    joinColumn: 'companyId',
+  })
+  @IsNullable()
+  company: CompanyObjectMetadata;
+
+  @FieldMetadata({
+    standardId: opportunityStandardFieldIds.favorites,
+    type: FieldMetadataType.RELATION,
+    label: 'Favorites',
+    description: 'Favorites linked to the opportunity',
+    icon: 'IconHeart',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => FavoriteObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  @IsSystem()
+  favorites: FavoriteObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: opportunityStandardFieldIds.activityTargets,
+    type: FieldMetadataType.RELATION,
+    label: 'Activities',
+    description: 'Activities tied to the opportunity',
+    icon: 'IconCheckbox',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => ActivityTargetObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  activityTargets: ActivityTargetObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: opportunityStandardFieldIds.attachments,
+    type: FieldMetadataType.RELATION,
+    label: 'Attachments',
+    description: 'Attachments linked to the opportunity.',
+    icon: 'IconFileImport',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => AttachmentObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  attachments: AttachmentObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: opportunityStandardFieldIds.events,
+    type: FieldMetadataType.RELATION,
+    label: 'Events',
+    description: 'Events linked to the opportunity.',
+    icon: 'IconTimelineEvent',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => EventObjectMetadata,
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  @IsNullable()
+  events: EventObjectMetadata[];
+}
diff --git a/packages/twenty-server/src/modules/person/repositories/person.repository.ts b/packages/twenty-server/src/modules/person/repositories/person.repository.ts
new file mode 100644
index 000000000000..656c524fac07
--- /dev/null
+++ b/packages/twenty-server/src/modules/person/repositories/person.repository.ts
@@ -0,0 +1,69 @@
+import { Injectable } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+
+@Injectable()
+export class PersonRepository {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  async getByEmails(
+    emails: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<PersonObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}.person WHERE email = ANY($1)`,
+      [emails],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
+  async createPeople(
+    peopleToCreate: {
+      id: string;
+      handle: string;
+      firstName: string;
+      lastName: string;
+      companyId?: string;
+    }[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<void> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const valuesString = peopleToCreate
+      .map(
+        (_, index) =>
+          `($${index * 5 + 1}, $${index * 5 + 2}, $${index * 5 + 3}, $${
+            index * 5 + 4
+          }, $${index * 5 + 5})`,
+      )
+      .join(', ');
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `INSERT INTO ${dataSourceSchema}.person (id, email, "nameFirstName", "nameLastName", "companyId") VALUES ${valuesString}`,
+      peopleToCreate
+        .map((contact) => [
+          contact.id,
+          contact.handle,
+          contact.firstName,
+          contact.lastName,
+          contact.companyId,
+        ])
+        .flat(),
+      workspaceId,
+      transactionManager,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/person/standard-objects/person.object-metadata.ts b/packages/twenty-server/src/modules/person/standard-objects/person.object-metadata.ts
new file mode 100644
index 000000000000..fdb85138365b
--- /dev/null
+++ b/packages/twenty-server/src/modules/person/standard-objects/person.object-metadata.ts
@@ -0,0 +1,241 @@
+import { FullNameMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/full-name.composite-type';
+import { LinkMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/link.composite-type';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { personStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { Gate } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/gate.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
+import { ActivityTargetObjectMetadata } from 'src/modules/activity/standard-objects/activity-target.object-metadata';
+import { AttachmentObjectMetadata } from 'src/modules/attachment/standard-objects/attachment.object-metadata';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
+import { FavoriteObjectMetadata } from 'src/modules/favorite/standard-objects/favorite.object-metadata';
+import { MessageParticipantObjectMetadata } from 'src/modules/messaging/standard-objects/message-participant.object-metadata';
+import { OpportunityObjectMetadata } from 'src/modules/opportunity/standard-objects/opportunity.object-metadata';
+import { EventObjectMetadata } from 'src/modules/event/standard-objects/event.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.person,
+  namePlural: 'people',
+  labelSingular: 'Person',
+  labelPlural: 'People',
+  description: 'A person',
+  icon: 'IconUser',
+})
+export class PersonObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: personStandardFieldIds.name,
+    type: FieldMetadataType.FULL_NAME,
+    label: 'Name',
+    description: 'Contact’s name',
+    icon: 'IconUser',
+  })
+  @IsNullable()
+  name: FullNameMetadata;
+
+  @FieldMetadata({
+    standardId: personStandardFieldIds.email,
+    type: FieldMetadataType.EMAIL,
+    label: 'Email',
+    description: 'Contact’s Email',
+    icon: 'IconMail',
+  })
+  email: string;
+
+  @FieldMetadata({
+    standardId: personStandardFieldIds.linkedinLink,
+    type: FieldMetadataType.LINK,
+    label: 'Linkedin',
+    description: 'Contact’s Linkedin account',
+    icon: 'IconBrandLinkedin',
+  })
+  @IsNullable()
+  linkedinLink: LinkMetadata;
+
+  @FieldMetadata({
+    standardId: personStandardFieldIds.xLink,
+    type: FieldMetadataType.LINK,
+    label: 'X',
+    description: 'Contact’s X/Twitter account',
+    icon: 'IconBrandX',
+  })
+  @IsNullable()
+  xLink: LinkMetadata;
+
+  @FieldMetadata({
+    standardId: personStandardFieldIds.jobTitle,
+    type: FieldMetadataType.TEXT,
+    label: 'Job Title',
+    description: 'Contact’s job title',
+    icon: 'IconBriefcase',
+  })
+  jobTitle: string;
+
+  @FieldMetadata({
+    standardId: personStandardFieldIds.phone,
+    type: FieldMetadataType.TEXT,
+    label: 'Phone',
+    description: 'Contact’s phone number',
+    icon: 'IconPhone',
+  })
+  phone: string;
+
+  @FieldMetadata({
+    standardId: personStandardFieldIds.city,
+    type: FieldMetadataType.TEXT,
+    label: 'City',
+    description: 'Contact’s city',
+    icon: 'IconMap',
+  })
+  city: string;
+
+  @FieldMetadata({
+    standardId: personStandardFieldIds.avatarUrl,
+    type: FieldMetadataType.TEXT,
+    label: 'Avatar',
+    description: 'Contact’s avatar',
+    icon: 'IconFileUpload',
+  })
+  @IsSystem()
+  avatarUrl: string;
+
+  @FieldMetadata({
+    standardId: personStandardFieldIds.position,
+    type: FieldMetadataType.POSITION,
+    label: 'Position',
+    description: 'Person record Position',
+    icon: 'IconHierarchy2',
+  })
+  @IsSystem()
+  @IsNullable()
+  position: number;
+
+  // Relations
+  @FieldMetadata({
+    standardId: personStandardFieldIds.company,
+    type: FieldMetadataType.RELATION,
+    label: 'Company',
+    description: 'Contact’s company',
+    icon: 'IconBuildingSkyscraper',
+    joinColumn: 'companyId',
+  })
+  @IsNullable()
+  company: CompanyObjectMetadata;
+
+  @FieldMetadata({
+    standardId: personStandardFieldIds.pointOfContactForOpportunities,
+    type: FieldMetadataType.RELATION,
+    label: 'POC for Opportunities',
+    description: 'Point of Contact for Opportunities',
+    icon: 'IconTargetArrow',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => OpportunityObjectMetadata,
+    inverseSideFieldKey: 'pointOfContact',
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  pointOfContactForOpportunities: OpportunityObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: personStandardFieldIds.activityTargets,
+    type: FieldMetadataType.RELATION,
+    label: 'Activities',
+    description: 'Activities tied to the contact',
+    icon: 'IconCheckbox',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => ActivityTargetObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  activityTargets: ActivityTargetObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: personStandardFieldIds.favorites,
+    type: FieldMetadataType.RELATION,
+    label: 'Favorites',
+    description: 'Favorites linked to the contact',
+    icon: 'IconHeart',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => FavoriteObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsSystem()
+  favorites: FavoriteObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: personStandardFieldIds.attachments,
+    type: FieldMetadataType.RELATION,
+    label: 'Attachments',
+    description: 'Attachments linked to the contact.',
+    icon: 'IconFileImport',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => AttachmentObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  attachments: AttachmentObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: personStandardFieldIds.messageParticipants,
+    type: FieldMetadataType.RELATION,
+    label: 'Message Participants',
+    description: 'Message Participants',
+    icon: 'IconUserCircle',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => MessageParticipantObjectMetadata,
+    inverseSideFieldKey: 'person',
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  @IsSystem()
+  messageParticipants: MessageParticipantObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: personStandardFieldIds.calendarEventParticipants,
+    type: FieldMetadataType.RELATION,
+    label: 'Calendar Event Participants',
+    description: 'Calendar Event Participants',
+    icon: 'IconCalendar',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => CalendarEventParticipantObjectMetadata,
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  @Gate({
+    featureFlag: 'IS_CALENDAR_ENABLED',
+  })
+  @IsSystem()
+  calendarEventParticipants: CalendarEventParticipantObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: personStandardFieldIds.events,
+    type: FieldMetadataType.RELATION,
+    label: 'Events',
+    description: 'Events linked to the company',
+    icon: 'IconTimelineEvent',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => EventObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  @IsSystem()
+  events: EventObjectMetadata[];
+}
diff --git a/packages/twenty-server/src/modules/view/standard-objects/view-field.object-metadata.ts b/packages/twenty-server/src/modules/view/standard-objects/view-field.object-metadata.ts
new file mode 100644
index 000000000000..7c363a84eddc
--- /dev/null
+++ b/packages/twenty-server/src/modules/view/standard-objects/view-field.object-metadata.ts
@@ -0,0 +1,70 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { viewFieldStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { ViewObjectMetadata } from 'src/modules/view/standard-objects/view.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.viewField,
+  namePlural: 'viewFields',
+  labelSingular: 'View Field',
+  labelPlural: 'View Fields',
+  description: '(System) View Fields',
+  icon: 'IconTag',
+})
+@IsSystem()
+export class ViewFieldObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: viewFieldStandardFieldIds.fieldMetadataId,
+    type: FieldMetadataType.UUID,
+    label: 'Field Metadata Id',
+    description: 'View Field target field',
+    icon: 'IconTag',
+  })
+  fieldMetadataId: string;
+
+  @FieldMetadata({
+    standardId: viewFieldStandardFieldIds.isVisible,
+    type: FieldMetadataType.BOOLEAN,
+    label: 'Visible',
+    description: 'View Field visibility',
+    icon: 'IconEye',
+    defaultValue: true,
+  })
+  isVisible: boolean;
+
+  @FieldMetadata({
+    standardId: viewFieldStandardFieldIds.size,
+    type: FieldMetadataType.NUMBER,
+    label: 'Size',
+    description: 'View Field size',
+    icon: 'IconEye',
+    defaultValue: 0,
+  })
+  size: number;
+
+  @FieldMetadata({
+    standardId: viewFieldStandardFieldIds.position,
+    type: FieldMetadataType.NUMBER,
+    label: 'Position',
+    description: 'View Field position',
+    icon: 'IconList',
+    defaultValue: 0,
+  })
+  position: number;
+
+  @FieldMetadata({
+    standardId: viewFieldStandardFieldIds.view,
+    type: FieldMetadataType.RELATION,
+    label: 'View',
+    description: 'View Field related view',
+    icon: 'IconLayoutCollage',
+    joinColumn: 'viewId',
+  })
+  @IsNullable()
+  view?: ViewObjectMetadata;
+}
diff --git a/packages/twenty-server/src/modules/view/standard-objects/view-filter.object-metadata.ts b/packages/twenty-server/src/modules/view/standard-objects/view-filter.object-metadata.ts
new file mode 100644
index 000000000000..0912b8ddbd5d
--- /dev/null
+++ b/packages/twenty-server/src/modules/view/standard-objects/view-filter.object-metadata.ts
@@ -0,0 +1,64 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { viewFilterStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { ViewObjectMetadata } from 'src/modules/view/standard-objects/view.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.viewFilter,
+  namePlural: 'viewFilters',
+  labelSingular: 'View Filter',
+  labelPlural: 'View Filters',
+  description: '(System) View Filters',
+  icon: 'IconFilterBolt',
+})
+@IsSystem()
+export class ViewFilterObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: viewFilterStandardFieldIds.fieldMetadataId,
+    type: FieldMetadataType.UUID,
+    label: 'Field Metadata Id',
+    description: 'View Filter target field',
+  })
+  fieldMetadataId: string;
+
+  @FieldMetadata({
+    standardId: viewFilterStandardFieldIds.operand,
+    type: FieldMetadataType.TEXT,
+    label: 'Operand',
+    description: 'View Filter operand',
+    defaultValue: "'Contains'",
+  })
+  operand: string;
+
+  @FieldMetadata({
+    standardId: viewFilterStandardFieldIds.value,
+    type: FieldMetadataType.TEXT,
+    label: 'Value',
+    description: 'View Filter value',
+  })
+  value: string;
+
+  @FieldMetadata({
+    standardId: viewFilterStandardFieldIds.displayValue,
+    type: FieldMetadataType.TEXT,
+    label: 'Display Value',
+    description: 'View Filter Display Value',
+  })
+  displayValue: string;
+
+  @FieldMetadata({
+    standardId: viewFilterStandardFieldIds.view,
+    type: FieldMetadataType.RELATION,
+    label: 'View',
+    description: 'View Filter related view',
+    icon: 'IconLayoutCollage',
+    joinColumn: 'viewId',
+  })
+  @IsNullable()
+  view: ViewObjectMetadata;
+}
diff --git a/packages/twenty-server/src/modules/view/standard-objects/view-sort.object-metadata.ts b/packages/twenty-server/src/modules/view/standard-objects/view-sort.object-metadata.ts
new file mode 100644
index 000000000000..829b479f3b0b
--- /dev/null
+++ b/packages/twenty-server/src/modules/view/standard-objects/view-sort.object-metadata.ts
@@ -0,0 +1,49 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { viewSortStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { ViewObjectMetadata } from 'src/modules/view/standard-objects/view.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.viewSort,
+  namePlural: 'viewSorts',
+  labelSingular: 'View Sort',
+  labelPlural: 'View Sorts',
+  description: '(System) View Sorts',
+  icon: 'IconArrowsSort',
+})
+@IsSystem()
+export class ViewSortObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: viewSortStandardFieldIds.fieldMetadataId,
+    type: FieldMetadataType.UUID,
+    label: 'Field Metadata Id',
+    description: 'View Sort target field',
+    icon: 'IconTag',
+  })
+  fieldMetadataId: string;
+
+  @FieldMetadata({
+    standardId: viewSortStandardFieldIds.direction,
+    type: FieldMetadataType.TEXT,
+    label: 'Direction',
+    description: 'View Sort direction',
+    defaultValue: "'asc'",
+  })
+  direction: string;
+
+  @FieldMetadata({
+    standardId: viewSortStandardFieldIds.view,
+    type: FieldMetadataType.RELATION,
+    label: 'View',
+    description: 'View Sort related view',
+    icon: 'IconLayoutCollage',
+    joinColumn: 'viewId',
+  })
+  @IsNullable()
+  view: ViewObjectMetadata;
+}
diff --git a/packages/twenty-server/src/modules/view/standard-objects/view.object-metadata.ts b/packages/twenty-server/src/modules/view/standard-objects/view.object-metadata.ts
new file mode 100644
index 000000000000..91705f1ea06c
--- /dev/null
+++ b/packages/twenty-server/src/modules/view/standard-objects/view.object-metadata.ts
@@ -0,0 +1,142 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { viewStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { ViewFieldObjectMetadata } from 'src/modules/view/standard-objects/view-field.object-metadata';
+import { ViewFilterObjectMetadata } from 'src/modules/view/standard-objects/view-filter.object-metadata';
+import { ViewSortObjectMetadata } from 'src/modules/view/standard-objects/view-sort.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.view,
+  namePlural: 'views',
+  labelSingular: 'View',
+  labelPlural: 'Views',
+  description: '(System) Views',
+  icon: 'IconLayoutCollage',
+})
+@IsSystem()
+export class ViewObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: viewStandardFieldIds.name,
+    type: FieldMetadataType.TEXT,
+    label: 'Name',
+    description: 'View name',
+  })
+  name: string;
+
+  @FieldMetadata({
+    standardId: viewStandardFieldIds.objectMetadataId,
+    type: FieldMetadataType.UUID,
+    label: 'Object Metadata Id',
+    description: 'View target object',
+  })
+  objectMetadataId: string;
+
+  @FieldMetadata({
+    standardId: viewStandardFieldIds.type,
+    type: FieldMetadataType.TEXT,
+    label: 'Type',
+    description: 'View type',
+    defaultValue: "'table'",
+  })
+  type: string;
+
+  @FieldMetadata({
+    standardId: viewStandardFieldIds.key,
+    type: FieldMetadataType.SELECT,
+    label: 'Key',
+    description: 'View key',
+    options: [{ value: 'INDEX', label: 'Index', position: 0, color: 'red' }],
+    defaultValue: "'INDEX'",
+  })
+  @IsNullable()
+  key: string;
+
+  @FieldMetadata({
+    standardId: viewStandardFieldIds.icon,
+    type: FieldMetadataType.TEXT,
+    label: 'Icon',
+    description: 'View icon',
+  })
+  icon: string;
+
+  @FieldMetadata({
+    standardId: viewStandardFieldIds.kanbanFieldMetadataId,
+    type: FieldMetadataType.TEXT,
+    label: 'kanbanfieldMetadataId',
+    description: 'View Kanban column field',
+  })
+  kanbanFieldMetadataId: string;
+
+  @FieldMetadata({
+    standardId: viewStandardFieldIds.position,
+    type: FieldMetadataType.POSITION,
+    label: 'Position',
+    description: 'View position',
+  })
+  @IsNullable()
+  position: number;
+
+  @FieldMetadata({
+    standardId: viewStandardFieldIds.isCompact,
+    type: FieldMetadataType.BOOLEAN,
+    label: 'Compact View',
+    description: 'Describes if the view is in compact mode',
+    defaultValue: false,
+  })
+  isCompact: boolean;
+
+  @FieldMetadata({
+    standardId: viewStandardFieldIds.viewFields,
+    type: FieldMetadataType.RELATION,
+    label: 'View Fields',
+    description: 'View Fields',
+    icon: 'IconTag',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => ViewFieldObjectMetadata,
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  @IsNullable()
+  viewFields: ViewFieldObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: viewStandardFieldIds.viewFilters,
+    type: FieldMetadataType.RELATION,
+    label: 'View Filters',
+    description: 'View Filters',
+    icon: 'IconFilterBolt',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => ViewFilterObjectMetadata,
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  @IsNullable()
+  viewFilters: ViewFilterObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: viewStandardFieldIds.viewSorts,
+    type: FieldMetadataType.RELATION,
+    label: 'View Sorts',
+    description: 'View Sorts',
+    icon: 'IconArrowsSort',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => ViewSortObjectMetadata,
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  @IsNullable()
+  viewSorts: ViewSortObjectMetadata[];
+}
diff --git a/packages/twenty-server/src/modules/webhook/standard-objects/webhook.object-metadata.ts b/packages/twenty-server/src/modules/webhook/standard-objects/webhook.object-metadata.ts
new file mode 100644
index 000000000000..5d3bdc5a262f
--- /dev/null
+++ b/packages/twenty-server/src/modules/webhook/standard-objects/webhook.object-metadata.ts
@@ -0,0 +1,36 @@
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { webhookStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.webhook,
+  namePlural: 'webhooks',
+  labelSingular: 'Webhook',
+  labelPlural: 'Webhooks',
+  description: 'A webhook',
+  icon: 'IconRobot',
+})
+@IsSystem()
+export class WebhookObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: webhookStandardFieldIds.targetUrl,
+    type: FieldMetadataType.TEXT,
+    label: 'Target Url',
+    description: 'Webhook target url',
+    icon: 'IconLink',
+  })
+  targetUrl: string;
+
+  @FieldMetadata({
+    standardId: webhookStandardFieldIds.operation,
+    type: FieldMetadataType.TEXT,
+    label: 'Operation',
+    description: 'Webhook operation',
+    icon: 'IconCheckbox',
+  })
+  operation: string;
+}
diff --git a/packages/twenty-server/src/modules/workspace-member/repositories/workspace-member.repository.ts b/packages/twenty-server/src/modules/workspace-member/repositories/workspace-member.repository.ts
new file mode 100644
index 000000000000..f2605eb874b9
--- /dev/null
+++ b/packages/twenty-server/src/modules/workspace-member/repositories/workspace-member.repository.ts
@@ -0,0 +1,71 @@
+import { Injectable, NotFoundException } from '@nestjs/common';
+
+import { EntityManager } from 'typeorm';
+
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
+
+@Injectable()
+export class WorkspaceMemberRepository {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async getByIds(
+    userIds: string[],
+    workspaceId: string,
+  ): Promise<ObjectRecord<WorkspaceMemberObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const result = await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."workspaceMember" WHERE "userId" = ANY($1)`,
+      [userIds],
+      workspaceId,
+    );
+
+    return result;
+  }
+
+  public async getByIdOrFail(
+    userId: string,
+    workspaceId: string,
+  ): Promise<ObjectRecord<WorkspaceMemberObjectMetadata>> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const workspaceMembers =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `SELECT * FROM ${dataSourceSchema}."workspaceMember" WHERE "userId" = $1`,
+        [userId],
+        workspaceId,
+      );
+
+    if (!workspaceMembers || workspaceMembers.length === 0) {
+      throw new NotFoundException(
+        `No workspace member found for user ${userId} in workspace ${workspaceId}`,
+      );
+    }
+
+    return workspaceMembers[0];
+  }
+
+  public async getAllByWorkspaceId(
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<WorkspaceMemberObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const workspaceMembers =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `SELECT * FROM ${dataSourceSchema}."workspaceMember"`,
+        [],
+        workspaceId,
+        transactionManager,
+      );
+
+    return workspaceMembers;
+  }
+}
diff --git a/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.object-metadata.ts b/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.object-metadata.ts
new file mode 100644
index 000000000000..0839dbee9dc2
--- /dev/null
+++ b/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.object-metadata.ts
@@ -0,0 +1,261 @@
+import { FullNameMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/full-name.composite-type';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  RelationMetadataType,
+  RelationOnDeleteAction,
+} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { workspaceMemberStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
+import { Gate } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/gate.decorator';
+import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
+import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
+import { ActivityObjectMetadata } from 'src/modules/activity/standard-objects/activity.object-metadata';
+import { AttachmentObjectMetadata } from 'src/modules/attachment/standard-objects/attachment.object-metadata';
+import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { BlocklistObjectMetadata } from 'src/modules/connected-account/standard-objects/blocklist.object-metadata';
+import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+import { CommentObjectMetadata } from 'src/modules/activity/standard-objects/comment.object-metadata';
+import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { FavoriteObjectMetadata } from 'src/modules/favorite/standard-objects/favorite.object-metadata';
+import { MessageParticipantObjectMetadata } from 'src/modules/messaging/standard-objects/message-participant.object-metadata';
+import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
+import { EventObjectMetadata } from 'src/modules/event/standard-objects/event.object-metadata';
+
+@ObjectMetadata({
+  standardId: standardObjectIds.workspaceMember,
+  namePlural: 'workspaceMembers',
+  labelSingular: 'Workspace Member',
+  labelPlural: 'Workspace Members',
+  description: 'A workspace member',
+  icon: 'IconUserCircle',
+})
+@IsSystem()
+export class WorkspaceMemberObjectMetadata extends BaseObjectMetadata {
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.name,
+    type: FieldMetadataType.FULL_NAME,
+    label: 'Name',
+    description: 'Workspace member name',
+    icon: 'IconCircleUser',
+  })
+  name: FullNameMetadata;
+
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.colorScheme,
+    type: FieldMetadataType.TEXT,
+    label: 'Color Scheme',
+    description: 'Preferred color scheme',
+    icon: 'IconColorSwatch',
+    defaultValue: "'Light'",
+  })
+  colorScheme: string;
+
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.locale,
+    type: FieldMetadataType.TEXT,
+    label: 'Language',
+    description: 'Preferred language',
+    icon: 'IconLanguage',
+    defaultValue: "'en'",
+  })
+  locale: string;
+
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.avatarUrl,
+    type: FieldMetadataType.TEXT,
+    label: 'Avatar Url',
+    description: 'Workspace member avatar',
+    icon: 'IconFileUpload',
+  })
+  avatarUrl: string;
+
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.userEmail,
+    type: FieldMetadataType.TEXT,
+    label: 'User Email',
+    description: 'Related user email address',
+    icon: 'IconMail',
+  })
+  userEmail: string;
+
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.userId,
+    type: FieldMetadataType.UUID,
+    label: 'User Id',
+    description: 'Associated User Id',
+    icon: 'IconCircleUsers',
+  })
+  userId: string;
+
+  // Relations
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.authoredActivities,
+    type: FieldMetadataType.RELATION,
+    label: 'Authored activities',
+    description: 'Activities created by the workspace member',
+    icon: 'IconCheckbox',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => ActivityObjectMetadata,
+    inverseSideFieldKey: 'author',
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  authoredActivities: ActivityObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.assignedActivities,
+    type: FieldMetadataType.RELATION,
+    label: 'Assigned activities',
+    description: 'Activities assigned to the workspace member',
+    icon: 'IconCheckbox',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => ActivityObjectMetadata,
+    inverseSideFieldKey: 'assignee',
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  assignedActivities: ActivityObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.favorites,
+    type: FieldMetadataType.RELATION,
+    label: 'Favorites',
+    description: 'Favorites linked to the workspace member',
+    icon: 'IconHeart',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => FavoriteObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  favorites: FavoriteObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.accountOwnerForCompanies,
+    type: FieldMetadataType.RELATION,
+    label: 'Account Owner For Companies',
+    description: 'Account owner for companies',
+    icon: 'IconBriefcase',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => CompanyObjectMetadata,
+    inverseSideFieldKey: 'accountOwner',
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  accountOwnerForCompanies: CompanyObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.authoredAttachments,
+    type: FieldMetadataType.RELATION,
+    label: 'Authored attachments',
+    description: 'Attachments created by the workspace member',
+    icon: 'IconFileImport',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => AttachmentObjectMetadata,
+    inverseSideFieldKey: 'author',
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  authoredAttachments: AttachmentObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.authoredComments,
+    type: FieldMetadataType.RELATION,
+    label: 'Authored comments',
+    description: 'Authored comments',
+    icon: 'IconComment',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => CommentObjectMetadata,
+    inverseSideFieldKey: 'author',
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  authoredComments: CommentObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.connectedAccounts,
+    type: FieldMetadataType.RELATION,
+    label: 'Connected accounts',
+    description: 'Connected accounts',
+    icon: 'IconAt',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => ConnectedAccountObjectMetadata,
+    inverseSideFieldKey: 'accountOwner',
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  connectedAccounts: ConnectedAccountObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.messageParticipants,
+    type: FieldMetadataType.RELATION,
+    label: 'Message Participants',
+    description: 'Message Participants',
+    icon: 'IconUserCircle',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => MessageParticipantObjectMetadata,
+    inverseSideFieldKey: 'workspaceMember',
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  messageParticipants: MessageParticipantObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.blocklist,
+    type: FieldMetadataType.RELATION,
+    label: 'Blocklist',
+    description: 'Blocklisted handles',
+    icon: 'IconForbid2',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => BlocklistObjectMetadata,
+    inverseSideFieldKey: 'workspaceMember',
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  blocklist: BlocklistObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.calendarEventParticipants,
+    type: FieldMetadataType.RELATION,
+    label: 'Calendar Event Participants',
+    description: 'Calendar Event Participants',
+    icon: 'IconCalendar',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => CalendarEventParticipantObjectMetadata,
+    inverseSideFieldKey: 'workspaceMember',
+    onDelete: RelationOnDeleteAction.SET_NULL,
+  })
+  @Gate({
+    featureFlag: 'IS_CALENDAR_ENABLED',
+  })
+  calendarEventParticipants: CalendarEventParticipantObjectMetadata[];
+
+  @FieldMetadata({
+    standardId: workspaceMemberStandardFieldIds.events,
+    type: FieldMetadataType.RELATION,
+    label: 'Events',
+    description: 'Events linked to the workspace member',
+    icon: 'IconTimelineEvent',
+  })
+  @RelationMetadata({
+    type: RelationMetadataType.ONE_TO_MANY,
+    inverseSideTarget: () => EventObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @IsNullable()
+  @IsSystem()
+  events: EventObjectMetadata[];
+}
diff --git a/packages/twenty-server/src/queue-worker.module.ts b/packages/twenty-server/src/queue-worker.module.ts
deleted file mode 100644
index 50d93ea62514..000000000000
--- a/packages/twenty-server/src/queue-worker.module.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { JobsModule } from 'src/integrations/message-queue/jobs.module';
-import { IntegrationsModule } from 'src/integrations/integrations.module';
-
-@Module({
-  imports: [IntegrationsModule, JobsModule],
-})
-export class QueueWorkerModule {}
diff --git a/packages/twenty-server/src/queue-worker.ts b/packages/twenty-server/src/queue-worker.ts
deleted file mode 100644
index b90dc032d51e..000000000000
--- a/packages/twenty-server/src/queue-worker.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { NestFactory } from '@nestjs/core';
-
-import {
-  MessageQueueJob,
-  MessageQueueJobData,
-} from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
-
-import { JobsModule } from 'src/integrations/message-queue/jobs.module';
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import { getJobClassName } from 'src/integrations/message-queue/utils/get-job-class-name.util';
-import { QueueWorkerModule } from 'src/queue-worker.module';
-
-import { LoggerService } from './integrations/logger/logger.service';
-import { ExceptionHandlerService } from './integrations/exception-handler/exception-handler.service';
-import { filterException } from './filters/utils/global-exception-handler.util';
-
-async function bootstrap() {
-  let exceptionHandlerService: ExceptionHandlerService | undefined;
-  let loggerService: LoggerService | undefined;
-
-  try {
-    const app = await NestFactory.createApplicationContext(QueueWorkerModule, {
-      bufferLogs: process.env.LOGGER_IS_BUFFER_ENABLED === 'true',
-    });
-
-    loggerService = app.get(LoggerService);
-    exceptionHandlerService = app.get(ExceptionHandlerService);
-
-    // Inject our logger
-    app.useLogger(loggerService!);
-
-    for (const queueName of Object.values(MessageQueue)) {
-      const messageQueueService: MessageQueueService = app.get(queueName);
-
-      await messageQueueService.work(async (jobData: MessageQueueJobData) => {
-        const jobClassName = getJobClassName(jobData.name);
-        const job: MessageQueueJob<MessageQueueJobData> = app
-          .select(JobsModule)
-          .get(jobClassName, { strict: true });
-
-        try {
-          await job.handle(jobData.data);
-        } catch (err) {
-          exceptionHandlerService?.captureExceptions([
-            new Error(
-              `Error occurred while processing job ${jobClassName} #${jobData.id}`,
-            ),
-            err,
-          ]);
-          throw err;
-        }
-      });
-    }
-  } catch (err) {
-    loggerService?.error(err?.message, err?.name);
-
-    if (!filterException(err)) {
-      exceptionHandlerService?.captureExceptions([err]);
-    }
-
-    throw err;
-  }
-}
-bootstrap();
diff --git a/packages/twenty-server/src/queue-worker/queue-worker.module.ts b/packages/twenty-server/src/queue-worker/queue-worker.module.ts
new file mode 100644
index 000000000000..d6c87b882383
--- /dev/null
+++ b/packages/twenty-server/src/queue-worker/queue-worker.module.ts
@@ -0,0 +1,9 @@
+import { Module } from '@nestjs/common';
+
+import { JobsModule } from 'src/engine/integrations/message-queue/jobs.module';
+import { IntegrationsModule } from 'src/engine/integrations/integrations.module';
+
+@Module({
+  imports: [IntegrationsModule, JobsModule],
+})
+export class QueueWorkerModule {}
diff --git a/packages/twenty-server/src/queue-worker/queue-worker.ts b/packages/twenty-server/src/queue-worker/queue-worker.ts
new file mode 100644
index 000000000000..15e4e9f3a8d9
--- /dev/null
+++ b/packages/twenty-server/src/queue-worker/queue-worker.ts
@@ -0,0 +1,64 @@
+import { NestFactory } from '@nestjs/core';
+
+import {
+  MessageQueueJob,
+  MessageQueueJobData,
+} from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
+
+import { filterException } from 'src/engine/utils/global-exception-handler.util';
+import { ExceptionHandlerService } from 'src/engine/integrations/exception-handler/exception-handler.service';
+import { LoggerService } from 'src/engine/integrations/logger/logger.service';
+import { JobsModule } from 'src/engine/integrations/message-queue/jobs.module';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { getJobClassName } from 'src/engine/integrations/message-queue/utils/get-job-class-name.util';
+import { QueueWorkerModule } from 'src/queue-worker/queue-worker.module';
+
+async function bootstrap() {
+  let exceptionHandlerService: ExceptionHandlerService | undefined;
+  let loggerService: LoggerService | undefined;
+
+  try {
+    const app = await NestFactory.createApplicationContext(QueueWorkerModule, {
+      bufferLogs: process.env.LOGGER_IS_BUFFER_ENABLED === 'true',
+    });
+
+    loggerService = app.get(LoggerService);
+    exceptionHandlerService = app.get(ExceptionHandlerService);
+
+    // Inject our logger
+    app.useLogger(loggerService!);
+
+    for (const queueName of Object.values(MessageQueue)) {
+      const messageQueueService: MessageQueueService = app.get(queueName);
+
+      await messageQueueService.work(async (jobData: MessageQueueJobData) => {
+        const jobClassName = getJobClassName(jobData.name);
+        const job: MessageQueueJob<MessageQueueJobData> = app
+          .select(JobsModule)
+          .get(jobClassName, { strict: true });
+
+        try {
+          await job.handle(jobData.data);
+        } catch (err) {
+          exceptionHandlerService?.captureExceptions([
+            new Error(
+              `Error occurred while processing job ${jobClassName} #${jobData.id}`,
+            ),
+            err,
+          ]);
+          throw err;
+        }
+      });
+    }
+  } catch (err) {
+    loggerService?.error(err?.message, err?.name);
+
+    if (!filterException(err)) {
+      exceptionHandlerService?.captureExceptions([err]);
+    }
+
+    throw err;
+  }
+}
+bootstrap();
diff --git a/packages/twenty-server/src/utils/camel-to-title-case.ts b/packages/twenty-server/src/utils/camel-to-title-case.ts
new file mode 100644
index 000000000000..149298d61234
--- /dev/null
+++ b/packages/twenty-server/src/utils/camel-to-title-case.ts
@@ -0,0 +1,6 @@
+import { capitalize } from 'src/utils/capitalize';
+
+export const camelToTitleCase = (camelCaseText: string) =>
+  capitalize(camelCaseText)
+    .replace(/([A-Z])/g, ' $1')
+    .replace(/^./, (str) => str.toUpperCase());
diff --git a/packages/twenty-server/src/utils/generate-front-config.ts b/packages/twenty-server/src/utils/generate-front-config.ts
new file mode 100644
index 000000000000..5f389e72f50c
--- /dev/null
+++ b/packages/twenty-server/src/utils/generate-front-config.ts
@@ -0,0 +1,29 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+import { config } from 'dotenv';
+config();
+
+export function generateFrontConfig(): void {
+  const configObject = {
+    window: {
+      _env_: {
+        REACT_APP_SERVER_BASE_URL: process.env.SERVER_URL,
+      },
+    },
+  };
+
+  const configString = `window._env_ = ${JSON.stringify(
+    configObject.window._env_,
+    null,
+    2,
+  )};`;
+
+  const distPath = path.join(__dirname, '../..', 'front');
+
+  if (!fs.existsSync(distPath)) {
+    fs.mkdirSync(distPath, { recursive: true });
+  }
+
+  fs.writeFileSync(path.join(distPath, 'env-config.js'), configString, 'utf8');
+}
diff --git a/packages/twenty-server/src/utils/get-server-url.ts b/packages/twenty-server/src/utils/get-server-url.ts
new file mode 100644
index 000000000000..2ab7be3be2f3
--- /dev/null
+++ b/packages/twenty-server/src/utils/get-server-url.ts
@@ -0,0 +1,11 @@
+import { Request } from 'express';
+
+export const getServerUrl = (
+  request: Request,
+  serverUrlEnv: string,
+): string => {
+  if (serverUrlEnv?.endsWith('/'))
+    return serverUrlEnv.substring(0, serverUrlEnv.length - 1);
+
+  return serverUrlEnv || `${request.protocol}://${request.get('host')}`;
+};
diff --git a/packages/twenty-server/src/utils/pagination/find-many-cursor-connection.ts b/packages/twenty-server/src/utils/pagination/find-many-cursor-connection.ts
deleted file mode 100644
index d11e9b6b7c18..000000000000
--- a/packages/twenty-server/src/utils/pagination/find-many-cursor-connection.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import {
-  LessThanOrEqual,
-  MoreThanOrEqual,
-  ObjectLiteral,
-  SelectQueryBuilder,
-} from 'typeorm';
-
-import { IEdge } from './interfaces/edge.interface';
-import { IConnectionArguments } from './interfaces/connection-arguments.interface';
-import { IOptions } from './interfaces/options.interface';
-import { IConnection } from './interfaces/connection.interface';
-import { validateArgs } from './utils/validate-args';
-import { mergeDefaultOptions } from './utils/default-options';
-import {
-  isBackwardPagination,
-  isForwardPagination,
-} from './utils/pagination-direction';
-import { encodeCursor, extractCursorKeyValue } from './utils/cursor';
-
-/**
- * Override cursors options
- */
-export async function findManyCursorConnection<
-  Entity extends ObjectLiteral,
-  Record = Entity,
-  Cursor = { id: string },
-  Node = Record,
-  CustomEdge extends IEdge<Node> = IEdge<Node>,
->(
-  query: SelectQueryBuilder<Entity>,
-  args: IConnectionArguments = {},
-  initialOptions?: IOptions<Entity, Record, Cursor, Node, CustomEdge>,
-): Promise<IConnection<Node, CustomEdge>> {
-  if (!validateArgs(args)) {
-    throw new Error('Should never happen');
-  }
-
-  const options = mergeDefaultOptions(initialOptions);
-  const totalCountQuery = query.clone();
-  const totalCount = await totalCountQuery.getCount();
-  // Only to extract cursor shape
-  const cursorKeys = Object.keys(options.getCursor(undefined) as any);
-
-  let records: Array<Record>;
-  let hasNextPage: boolean;
-  let hasPreviousPage: boolean;
-
-  // Add order by based on the cursor keys
-  for (const key of cursorKeys) {
-    query.addOrderBy(key, 'ASC');
-  }
-
-  if (isForwardPagination(args)) {
-    // Fetch one additional record to determine if there is a next page
-    const take = args.first + 1;
-
-    // Extract cursor map based on the encoded cursor
-    const cursorMap = extractCursorKeyValue(args.after, options);
-    const skip = cursorMap ? 1 : undefined;
-
-    if (cursorMap) {
-      const [keys, values] = cursorMap;
-
-      // Add `cursor` filter in where condition
-      query.andWhere(
-        keys.reduce((acc, key, index) => {
-          return {
-            ...acc,
-            [key]: MoreThanOrEqual(values[index]),
-          };
-        }, {}),
-      );
-    }
-
-    // Add `take` and `skip` to the query
-    query.take(take).skip(skip);
-
-    // Fetch records
-    records = await options.getRecords(query);
-
-    // See if we are "after" another record, indicating a previous page
-    hasPreviousPage = !!args.after;
-
-    // See if we have an additional record, indicating a next page
-    hasNextPage = records.length > args.first;
-
-    // Remove the extra record (last element) from the results
-    if (hasNextPage) records.pop();
-  } else if (isBackwardPagination(args)) {
-    // Fetch one additional record to determine if there is a previous page
-    const take = -1 * (args.last + 1);
-
-    // Extract cursor map based on the encoded cursor
-    const cursorMap = extractCursorKeyValue(args.before, options);
-    const skip = cursorMap ? 1 : undefined;
-
-    if (cursorMap) {
-      const [keys, values] = cursorMap;
-
-      // Add `cursor` filter in where condition
-      query.andWhere(
-        keys.reduce((acc, key, index) => {
-          return {
-            ...acc,
-            [key]: LessThanOrEqual(values[index]),
-          };
-        }, {}),
-      );
-    }
-
-    // Add `take` and `skip` to the query
-    query.take(take).skip(skip);
-
-    // Fetch records
-    records = await options.getRecords(query);
-
-    // See if we are "before" another record, indicating a next page
-    hasNextPage = !!args.before;
-
-    // See if we have an additional record, indicating a previous page
-    hasPreviousPage = records.length > args.last;
-
-    // Remove the extra record (first element) from the results
-    if (hasPreviousPage) records.shift();
-  } else {
-    // Fetch records
-    records = await options.getRecords(query);
-
-    hasNextPage = false;
-    hasPreviousPage = false;
-  }
-
-  // The cursors are always the first & last elements of the result set
-  const startCursor =
-    records.length > 0 ? encodeCursor(records[0], options) : undefined;
-  const endCursor =
-    records.length > 0
-      ? encodeCursor(records[records.length - 1], options)
-      : undefined;
-
-  // Allow the recordToEdge function to return a custom edge type which will be inferred
-  type EdgeExtended = typeof options.recordToEdge extends (
-    record: Record,
-  ) => infer X
-    ? X extends CustomEdge
-      ? X & { cursor: string }
-      : CustomEdge
-    : CustomEdge;
-
-  const edges = records.map((record) => {
-    return {
-      ...options.recordToEdge(record),
-      cursor: encodeCursor(record, options),
-    } as EdgeExtended;
-  });
-
-  return {
-    edges,
-    pageInfo: { hasNextPage, hasPreviousPage, startCursor, endCursor },
-    totalCount,
-  };
-}
diff --git a/packages/twenty-server/src/utils/pagination/index.ts b/packages/twenty-server/src/utils/pagination/index.ts
deleted file mode 100644
index 7708d25c7d6a..000000000000
--- a/packages/twenty-server/src/utils/pagination/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { ConnectionCursor, ConnectionArgs, Paginated } from './paginated';
-export { findManyCursorConnection } from './find-many-cursor-connection';
diff --git a/packages/twenty-server/src/utils/pagination/interfaces/connection-arguments.interface.ts b/packages/twenty-server/src/utils/pagination/interfaces/connection-arguments.interface.ts
deleted file mode 100644
index 45b24052364e..000000000000
--- a/packages/twenty-server/src/utils/pagination/interfaces/connection-arguments.interface.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export interface IConnectionArguments {
-  first?: number | null;
-  after?: string | null;
-  last?: number | null;
-  before?: string | null;
-}
-
-export type ConnectionArgumentsUnion =
-  | ForwardPaginationArguments
-  | BackwardPaginationArguments
-  | NoPaginationArguments;
-
-export type ForwardPaginationArguments = { first: number; after?: string };
-export type BackwardPaginationArguments = { last: number; before?: string };
-export type NoPaginationArguments = Record<string, unknown>;
diff --git a/packages/twenty-server/src/utils/pagination/interfaces/connection-cursor.type.ts b/packages/twenty-server/src/utils/pagination/interfaces/connection-cursor.type.ts
deleted file mode 100644
index 91e8cffc7148..000000000000
--- a/packages/twenty-server/src/utils/pagination/interfaces/connection-cursor.type.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type ConnectionCursor = string;
diff --git a/packages/twenty-server/src/utils/pagination/interfaces/find-many-aguments.interface.ts b/packages/twenty-server/src/utils/pagination/interfaces/find-many-aguments.interface.ts
deleted file mode 100644
index 66063d8541da..000000000000
--- a/packages/twenty-server/src/utils/pagination/interfaces/find-many-aguments.interface.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface IFindManyArguments<Cursor> {
-  cursor?: Cursor;
-  take?: number;
-  skip?: number;
-}
diff --git a/packages/twenty-server/src/utils/pagination/interfaces/options.interface.ts b/packages/twenty-server/src/utils/pagination/interfaces/options.interface.ts
deleted file mode 100644
index 24b430e792bc..000000000000
--- a/packages/twenty-server/src/utils/pagination/interfaces/options.interface.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { GraphQLResolveInfo } from 'graphql';
-import { ObjectLiteral, SelectQueryBuilder } from 'typeorm';
-
-import { IEdge } from './edge.interface';
-
-export interface IOptions<
-  Entity extends ObjectLiteral,
-  Record,
-  Cursor,
-  Node,
-  CustomEdge extends IEdge<Node>,
-> {
-  getRecords?: (args: SelectQueryBuilder<Entity>) => Promise<Record[]>;
-  getCursor?: (record: Record | undefined) => Cursor;
-  encodeCursor?: (cursor: Cursor) => string;
-  decodeCursor?: (cursorString: string) => Cursor;
-  recordToEdge?: (record: Record) => Omit<CustomEdge, 'cursor'>;
-  resolveInfo?: GraphQLResolveInfo | null;
-}
diff --git a/packages/twenty-server/src/utils/pagination/page-info.ts b/packages/twenty-server/src/utils/pagination/page-info.ts
deleted file mode 100644
index 0b9f35e88373..000000000000
--- a/packages/twenty-server/src/utils/pagination/page-info.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Field, ObjectType } from '@nestjs/graphql';
-
-import { IPageInfo } from './interfaces/page-info.interface';
-import { ConnectionCursor } from './interfaces/connection-cursor.type';
-
-@ObjectType({ isAbstract: true })
-export class PageInfo implements IPageInfo {
-  @Field({ nullable: true })
-  public startCursor!: ConnectionCursor;
-
-  @Field({ nullable: true })
-  public endCursor!: ConnectionCursor;
-
-  @Field(() => Boolean)
-  public hasPreviousPage!: boolean;
-
-  @Field(() => Boolean)
-  public hasNextPage!: boolean;
-}
diff --git a/packages/twenty-server/src/utils/pagination/paginated.ts b/packages/twenty-server/src/utils/pagination/paginated.ts
deleted file mode 100644
index 5124ad99a619..000000000000
--- a/packages/twenty-server/src/utils/pagination/paginated.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Type } from '@nestjs/common';
-import { ArgsType, Field, ObjectType } from '@nestjs/graphql';
-
-import { IsNumber, IsOptional, IsString } from 'class-validator';
-
-import { PageInfo } from './page-info';
-
-import { IConnectionArguments } from './interfaces/connection-arguments.interface';
-import { IConnection } from './interfaces/connection.interface';
-import { IEdge } from './interfaces/edge.interface';
-import { IPageInfo } from './interfaces/page-info.interface';
-
-export type ConnectionCursor = string;
-
-/**
- * ConnectionArguments
- */
-@ArgsType()
-export class ConnectionArgs implements IConnectionArguments {
-  @Field({ nullable: true, description: 'Paginate before opaque cursor' })
-  @IsString()
-  @IsOptional()
-  public before?: ConnectionCursor;
-
-  @Field({ nullable: true, description: 'Paginate after opaque cursor' })
-  @IsString()
-  @IsOptional()
-  public after?: ConnectionCursor;
-
-  @Field({ nullable: true, description: 'Paginate first' })
-  @IsNumber()
-  @IsOptional()
-  public first?: number;
-
-  @Field({ nullable: true, description: 'Paginate last' })
-  @IsNumber()
-  @IsOptional()
-  public last?: number;
-}
-
-/**
- * Paginated graphQL class inheritance
- */
-export function Paginated<T>(classRef: Type<T>): Type<IConnection<T>> {
-  @ObjectType(`${classRef.name}Edge`, { isAbstract: true })
-  class Edge implements IEdge<T> {
-    public name = `${classRef.name}Edge`;
-
-    @Field({ nullable: true })
-    public cursor!: ConnectionCursor;
-
-    @Field(() => classRef, { nullable: true })
-    public node!: T;
-  }
-
-  @ObjectType(`${classRef.name}Connection`, { isAbstract: true })
-  class Connection implements IConnection<T> {
-    public name = `${classRef.name}Connection`;
-
-    @Field(() => [Edge], { nullable: true })
-    public edges!: IEdge<T>[];
-
-    @Field(() => PageInfo, { nullable: true })
-    public pageInfo!: IPageInfo;
-
-    @Field()
-    totalCount: number;
-  }
-
-  return Connection as Type<IConnection<T>>;
-}
-
-// export const encodeCursor = <Cursor>(cursor: Cursor) =>
-//   Buffer.from(JSON.stringify(cursor)).toString('base64');
-
-// export const decodeCursor = <Cursor>(cursor: string) =>
-//   JSON.parse(Buffer.from(cursor, 'base64').toString('ascii')) as Cursor;
diff --git a/packages/twenty-server/src/utils/pagination/utils/cursor.ts b/packages/twenty-server/src/utils/pagination/utils/cursor.ts
deleted file mode 100644
index 30f4d61a057c..000000000000
--- a/packages/twenty-server/src/utils/pagination/utils/cursor.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { ObjectLiteral } from 'typeorm';
-
-import { IEdge } from 'src/utils/pagination/interfaces/edge.interface';
-
-import { MergedOptions } from './default-options';
-
-export function decodeCursor<
-  Entity extends ObjectLiteral,
-  Record,
-  Cursor,
-  Node,
-  CustomEdge extends IEdge<Node>,
->(
-  connectionCursor: string | undefined,
-  options: MergedOptions<Entity, Record, Cursor, Node, CustomEdge>,
-): Cursor | undefined {
-  if (!connectionCursor) {
-    return undefined;
-  }
-
-  return options.decodeCursor(connectionCursor);
-}
-
-export function encodeCursor<
-  Entity extends ObjectLiteral,
-  Record,
-  Cursor,
-  Node,
-  CustomEdge extends IEdge<Node>,
->(
-  record: Record,
-  options: MergedOptions<Entity, Record, Cursor, Node, CustomEdge>,
-): string {
-  return options.encodeCursor(options.getCursor(record));
-}
-
-export function extractCursorKeyValue<
-  Entity extends ObjectLiteral,
-  Record,
-  Cursor,
-  Node,
-  CustomEdge extends IEdge<Node>,
->(
-  connectionCursor: string | undefined,
-  options: MergedOptions<Entity, Record, Cursor, Node, CustomEdge>,
-): [string[], unknown[]] | undefined {
-  const cursor = decodeCursor(connectionCursor, options);
-
-  if (!cursor) {
-    return undefined;
-  }
-
-  return [Object.keys(cursor), Object.values(cursor)];
-}
diff --git a/packages/twenty-server/src/utils/pagination/utils/default-options.ts b/packages/twenty-server/src/utils/pagination/utils/default-options.ts
deleted file mode 100644
index eefea206a03e..000000000000
--- a/packages/twenty-server/src/utils/pagination/utils/default-options.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { ObjectLiteral } from 'typeorm';
-
-import { IEdge } from 'src/utils/pagination/interfaces/edge.interface';
-import { IOptions } from 'src/utils/pagination/interfaces/options.interface';
-
-export type MergedOptions<
-  Entity extends ObjectLiteral,
-  Record,
-  Cursor,
-  Node,
-  CustomEdge extends IEdge<Node>,
-> = Required<IOptions<Entity, Record, Cursor, Node, CustomEdge>>;
-
-export function mergeDefaultOptions<
-  Entity extends ObjectLiteral,
-  Record,
-  Cursor,
-  Node,
-  CustomEdge extends IEdge<Node>,
->(
-  pOptions?: IOptions<Entity, Record, Cursor, Node, CustomEdge>,
-): MergedOptions<Entity, Record, Cursor, Node, CustomEdge> {
-  return {
-    getRecords: async (query) => {
-      return query.getRawMany();
-    },
-    getCursor: (record: Record | undefined) =>
-      ({ id: (record as unknown as { id: string })?.id }) as unknown as Cursor,
-    encodeCursor: (cursor: Cursor) =>
-      Buffer.from((cursor as unknown as { id: string }).id.toString()).toString(
-        'base64',
-      ),
-    decodeCursor: (cursorString: string) =>
-      ({
-        id: Buffer.from(cursorString, 'base64').toString(),
-      }) as unknown as Cursor,
-    recordToEdge: (record: Record) =>
-      ({ node: record }) as unknown as Omit<CustomEdge, 'cursor'>,
-    resolveInfo: null,
-    ...pOptions,
-  };
-}
diff --git a/packages/twenty-server/src/utils/pagination/utils/pagination-direction.ts b/packages/twenty-server/src/utils/pagination/utils/pagination-direction.ts
deleted file mode 100644
index e602342b8d35..000000000000
--- a/packages/twenty-server/src/utils/pagination/utils/pagination-direction.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {
-  BackwardPaginationArguments,
-  ConnectionArgumentsUnion,
-  ForwardPaginationArguments,
-} from 'src/utils/pagination/interfaces/connection-arguments.interface';
-
-export function isForwardPagination(
-  args: ConnectionArgumentsUnion,
-): args is ForwardPaginationArguments {
-  return 'first' in args && args.first != null;
-}
-
-export function isBackwardPagination(
-  args: ConnectionArgumentsUnion,
-): args is BackwardPaginationArguments {
-  return 'last' in args && args.last != null;
-}
diff --git a/packages/twenty-server/src/utils/pagination/utils/validate-args.ts b/packages/twenty-server/src/utils/pagination/utils/validate-args.ts
deleted file mode 100644
index 213c452d25c1..000000000000
--- a/packages/twenty-server/src/utils/pagination/utils/validate-args.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import {
-  ConnectionArgumentsUnion,
-  IConnectionArguments,
-} from 'src/utils/pagination/interfaces/connection-arguments.interface';
-
-export function validateArgs(
-  args: IConnectionArguments,
-): args is ConnectionArgumentsUnion {
-  // Only one of `first` and `last` / `after` and `before` can be set
-  if (args.first != null && args.last != null) {
-    throw new Error('Only one of "first" and "last" can be set');
-  }
-
-  if (args.after != null && args.before != null) {
-    throw new Error('Only one of "after" and "before" can be set');
-  }
-
-  // If `after` is set, `first` has to be set
-  if (args.after != null && args.first == null) {
-    throw new Error('"after" needs to be used with "first"');
-  }
-
-  // If `before` is set, `last` has to be set
-  if (args.before != null && args.last == null) {
-    throw new Error('"before" needs to be used with "last"');
-  }
-
-  // `first` and `last` have to be positive
-  if (args.first != null && args.first <= 0) {
-    throw new Error('"first" has to be positive');
-  }
-
-  if (args.last != null && args.last <= 0) {
-    throw new Error('"last" has to be positive');
-  }
-
-  return true;
-}
diff --git a/packages/twenty-server/src/utils/typed-reflect.ts b/packages/twenty-server/src/utils/typed-reflect.ts
index ed33e200fd3e..6ec7a9666ecf 100644
--- a/packages/twenty-server/src/utils/typed-reflect.ts
+++ b/packages/twenty-server/src/utils/typed-reflect.ts
@@ -1,14 +1,18 @@
 import 'reflect-metadata';
 
-import { GateDecoratorParams } from 'src/workspace/workspace-sync-metadata/interfaces/gate-decorator.interface';
-import { ReflectFieldMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/reflect-field-metadata.interface';
-import { ReflectObjectMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/reflect-object-metadata.interface';
-import { ReflectRelationMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/reflect-relation-metadata.interface';
+import { GateDecoratorParams } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/gate-decorator.interface';
+import { ReflectBaseCustomObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-custom-object-metadata.interface';
+import { ReflectDynamicRelationFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-computed-relation-field-metadata.interface';
+import { ReflectFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-field-metadata.interface';
+import { ReflectObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-object-metadata.interface';
+import { ReflectRelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/reflect-relation-metadata.interface';
 
 export interface ReflectMetadataTypeMap {
   objectMetadata: ReflectObjectMetadata;
+  extendObjectMetadata: ReflectBaseCustomObjectMetadata;
   fieldMetadataMap: ReflectFieldMetadata;
-  relationMetadataCollection: ReflectRelationMetadata[];
+  dynamicRelationFieldMetadataMap: ReflectDynamicRelationFieldMetadata;
+  reflectRelationMetadataCollection: ReflectRelationMetadata[];
   gate: GateDecoratorParams;
   isNullable: true;
   isSystem: true;
diff --git a/packages/twenty-server/src/utils/utils-test/object-metadata-item.ts b/packages/twenty-server/src/utils/utils-test/object-metadata-item.ts
deleted file mode 100644
index 700805d22201..000000000000
--- a/packages/twenty-server/src/utils/utils-test/object-metadata-item.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-
-export const fieldNumber = {
-  name: 'fieldNumber',
-  type: FieldMetadataType.NUMBER,
-  isNullable: false,
-  defaultValue: null,
-  targetColumnMap: { value: 'fieldNumber' },
-};
-
-export const fieldString = {
-  name: 'fieldString',
-  type: FieldMetadataType.TEXT,
-  isNullable: true,
-  defaultValue: null,
-  targetColumnMap: { value: 'fieldString' },
-};
-
-export const fieldLink = {
-  name: 'fieldLink',
-  type: FieldMetadataType.LINK,
-  isNullable: false,
-  defaultValue: { label: '', url: '' },
-  targetColumnMap: { label: 'fieldLinkLabel', url: 'fieldLinkUrl' },
-};
-
-export const fieldCurrency = {
-  name: 'fieldCurrency',
-  type: FieldMetadataType.CURRENCY,
-  isNullable: true,
-  defaultValue: null,
-  targetColumnMap: {
-    amountMicros: 'fieldCurrencyAmountMicros',
-    currencyCode: 'fieldCurrencyCurrencyCode',
-  },
-};
-
-export const objectMetadataItem: DeepPartial<ObjectMetadataEntity> = {
-  targetTableName: 'testingObject',
-  nameSingular: 'objectName',
-  namePlural: 'objectsName',
-  fields: [fieldNumber, fieldString, fieldLink, fieldCurrency],
-};
diff --git a/packages/twenty-server/src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.cron.pattern.ts b/packages/twenty-server/src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.cron.pattern.ts
deleted file mode 100644
index 99d9acaa7fbb..000000000000
--- a/packages/twenty-server/src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.cron.pattern.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const fetchAllWorkspacesMessagesCronPattern = '*/10 * * * *';
diff --git a/packages/twenty-server/src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.job.ts b/packages/twenty-server/src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.job.ts
deleted file mode 100644
index 40709500922e..000000000000
--- a/packages/twenty-server/src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.job.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Repository } from 'typeorm';
-
-import { MessageQueueJob } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
-
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
-import {
-  GmailPartialSyncJobData,
-  GmailPartialSyncJob,
-} from 'src/workspace/messaging/jobs/gmail-partial-sync.job';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-
-@Injectable()
-export class FetchAllWorkspacesMessagesJob
-  implements MessageQueueJob<undefined>
-{
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    private readonly workspaceRepository: Repository<Workspace>,
-    @Inject(MessageQueue.messagingQueue)
-    private readonly messageQueueService: MessageQueueService,
-    private readonly connectedAccountService: ConnectedAccountService,
-  ) {}
-
-  async handle(): Promise<void> {
-    const workspaceIds = (
-      await this.workspaceRepository.find({
-        where: {
-          subscriptionStatus: 'active',
-        },
-        select: ['id'],
-      })
-    ).map((workspace) => workspace.id);
-
-    for (const workspaceId of workspaceIds) {
-      await this.fetchWorkspaceMessages(workspaceId);
-    }
-  }
-
-  private async fetchWorkspaceMessages(workspaceId: string): Promise<void> {
-    const connectedAccounts =
-      await this.connectedAccountService.getAll(workspaceId);
-
-    for (const connectedAccount of connectedAccounts) {
-      await this.messageQueueService.add<GmailPartialSyncJobData>(
-        GmailPartialSyncJob.name,
-        {
-          workspaceId,
-          connectedAccountId: connectedAccount.id,
-        },
-        {
-          retryLimit: 2,
-        },
-      );
-    }
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/commands/fetch-workspace-messages-commands.module.ts b/packages/twenty-server/src/workspace/messaging/commands/fetch-workspace-messages-commands.module.ts
deleted file mode 100644
index 9e1dba862496..000000000000
--- a/packages/twenty-server/src/workspace/messaging/commands/fetch-workspace-messages-commands.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { FeatureFlagEntity } from 'src/core/feature-flag/feature-flag.entity';
-import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
-import { GmailFullSyncCommand } from 'src/workspace/messaging/commands/gmail-full-sync.command';
-import { GmailPartialSyncCommand } from 'src/workspace/messaging/commands/gmail-partial-sync.command';
-import { ConnectedAccountModule } from 'src/workspace/messaging/repositories/connected-account/connected-account.module';
-import { StartFetchAllWorkspacesMessagesCronCommand } from 'src/workspace/messaging/commands/start-fetch-all-workspaces-messages.cron.command';
-import { StopFetchAllWorkspacesMessagesCronCommand } from 'src/workspace/messaging/commands/stop-fetch-all-workspaces-messages.cron.command';
-
-@Module({
-  imports: [
-    DataSourceModule,
-    TypeORMModule,
-    TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
-    ConnectedAccountModule,
-  ],
-  providers: [
-    GmailFullSyncCommand,
-    GmailPartialSyncCommand,
-    StartFetchAllWorkspacesMessagesCronCommand,
-    StopFetchAllWorkspacesMessagesCronCommand,
-  ],
-})
-export class FetchWorkspaceMessagesCommandsModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/commands/gmail-full-sync.command.ts b/packages/twenty-server/src/workspace/messaging/commands/gmail-full-sync.command.ts
deleted file mode 100644
index 586570070dac..000000000000
--- a/packages/twenty-server/src/workspace/messaging/commands/gmail-full-sync.command.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Inject } from '@nestjs/common';
-
-import { Command, CommandRunner, Option } from 'nest-commander';
-
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import {
-  GmailFullSyncJobData,
-  GmailFullSyncJob,
-} from 'src/workspace/messaging/jobs/gmail-full-sync.job';
-import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
-
-interface GmailFullSyncOptions {
-  workspaceId: string;
-}
-
-@Command({
-  name: 'workspace:gmail-full-sync',
-  description: 'Fetch messages of all workspaceMembers in a workspace.',
-})
-export class GmailFullSyncCommand extends CommandRunner {
-  constructor(
-    @Inject(MessageQueue.messagingQueue)
-    private readonly messageQueueService: MessageQueueService,
-    private readonly connectedAccountService: ConnectedAccountService,
-  ) {
-    super();
-  }
-
-  async run(
-    _passedParam: string[],
-    options: GmailFullSyncOptions,
-  ): Promise<void> {
-    await this.fetchWorkspaceMessages(options.workspaceId);
-
-    return;
-  }
-
-  @Option({
-    flags: '-w, --workspace-id [workspace_id]',
-    description: 'workspace id',
-    required: true,
-  })
-  parseWorkspaceId(value: string): string {
-    return value;
-  }
-
-  private async fetchWorkspaceMessages(workspaceId: string): Promise<void> {
-    const connectedAccounts =
-      await this.connectedAccountService.getAll(workspaceId);
-
-    for (const connectedAccount of connectedAccounts) {
-      await this.messageQueueService.add<GmailFullSyncJobData>(
-        GmailFullSyncJob.name,
-        {
-          workspaceId,
-          connectedAccountId: connectedAccount.id,
-        },
-        {
-          retryLimit: 2,
-        },
-      );
-    }
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/commands/gmail-partial-sync.command.ts b/packages/twenty-server/src/workspace/messaging/commands/gmail-partial-sync.command.ts
deleted file mode 100644
index b911f6122810..000000000000
--- a/packages/twenty-server/src/workspace/messaging/commands/gmail-partial-sync.command.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Inject } from '@nestjs/common';
-
-import { Command, CommandRunner, Option } from 'nest-commander';
-
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import {
-  GmailPartialSyncJob,
-  GmailPartialSyncJobData,
-} from 'src/workspace/messaging/jobs/gmail-partial-sync.job';
-import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
-
-interface GmailPartialSyncOptions {
-  workspaceId: string;
-}
-
-@Command({
-  name: 'workspace:gmail-partial-sync',
-  description: 'Fetch messages of all workspaceMembers in a workspace.',
-})
-export class GmailPartialSyncCommand extends CommandRunner {
-  constructor(
-    @Inject(MessageQueue.messagingQueue)
-    private readonly messageQueueService: MessageQueueService,
-    private readonly connectedAccountService: ConnectedAccountService,
-  ) {
-    super();
-  }
-
-  async run(
-    _passedParam: string[],
-    options: GmailPartialSyncOptions,
-  ): Promise<void> {
-    await this.fetchWorkspaceMessages(options.workspaceId);
-
-    return;
-  }
-
-  @Option({
-    flags: '-w, --workspace-id [workspace_id]',
-    description: 'workspace id',
-    required: true,
-  })
-  parseWorkspaceId(value: string): string {
-    return value;
-  }
-
-  private async fetchWorkspaceMessages(workspaceId: string): Promise<void> {
-    const connectedAccounts =
-      await this.connectedAccountService.getAll(workspaceId);
-
-    for (const connectedAccount of connectedAccounts) {
-      await this.messageQueueService.add<GmailPartialSyncJobData>(
-        GmailPartialSyncJob.name,
-        {
-          workspaceId,
-          connectedAccountId: connectedAccount.id,
-        },
-        {
-          retryLimit: 2,
-        },
-      );
-    }
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/commands/start-fetch-all-workspaces-messages.cron.command.ts b/packages/twenty-server/src/workspace/messaging/commands/start-fetch-all-workspaces-messages.cron.command.ts
deleted file mode 100644
index 04e4381ba24f..000000000000
--- a/packages/twenty-server/src/workspace/messaging/commands/start-fetch-all-workspaces-messages.cron.command.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Inject } from '@nestjs/common';
-
-import { Command, CommandRunner } from 'nest-commander';
-
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import { fetchAllWorkspacesMessagesCronPattern } from 'src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.cron.pattern';
-import { FetchAllWorkspacesMessagesJob } from 'src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.job';
-
-@Command({
-  name: 'fetch-all-workspaces-messages:cron:start',
-  description: 'Starts a cron job to fetch all workspaces messages',
-})
-export class StartFetchAllWorkspacesMessagesCronCommand extends CommandRunner {
-  constructor(
-    @Inject(MessageQueue.cronQueue)
-    private readonly messageQueueService: MessageQueueService,
-  ) {
-    super();
-  }
-
-  async run(): Promise<void> {
-    await this.messageQueueService.addCron<undefined>(
-      FetchAllWorkspacesMessagesJob.name,
-      undefined,
-      fetchAllWorkspacesMessagesCronPattern,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/commands/stop-fetch-all-workspaces-messages.cron.command.ts b/packages/twenty-server/src/workspace/messaging/commands/stop-fetch-all-workspaces-messages.cron.command.ts
deleted file mode 100644
index 418994c94e29..000000000000
--- a/packages/twenty-server/src/workspace/messaging/commands/stop-fetch-all-workspaces-messages.cron.command.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Inject } from '@nestjs/common';
-
-import { Command, CommandRunner } from 'nest-commander';
-
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import { fetchAllWorkspacesMessagesCronPattern } from 'src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.cron.pattern';
-import { FetchAllWorkspacesMessagesJob } from 'src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.job';
-
-@Command({
-  name: 'fetch-all-workspaces-messages:cron:stop',
-  description: 'Stops the fetch all workspaces messages cron job',
-})
-export class StopFetchAllWorkspacesMessagesCronCommand extends CommandRunner {
-  constructor(
-    @Inject(MessageQueue.cronQueue)
-    private readonly messageQueueService: MessageQueueService,
-  ) {
-    super();
-  }
-
-  async run(): Promise<void> {
-    await this.messageQueueService.removeCron(
-      FetchAllWorkspacesMessagesJob.name,
-      fetchAllWorkspacesMessagesCronPattern,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/jobs/create-companies-and-contacts-after-sync.job.ts b/packages/twenty-server/src/workspace/messaging/jobs/create-companies-and-contacts-after-sync.job.ts
deleted file mode 100644
index a599969d817b..000000000000
--- a/packages/twenty-server/src/workspace/messaging/jobs/create-companies-and-contacts-after-sync.job.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { MessageQueueJob } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
-
-import { CreateCompaniesAndContactsService } from 'src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.service';
-import { MessageChannelService } from 'src/workspace/messaging/repositories/message-channel/message-channel.service';
-import { MessageParticipantService } from 'src/workspace/messaging/repositories/message-participant/message-participant.service';
-
-export type CreateCompaniesAndContactsAfterSyncJobData = {
-  workspaceId: string;
-  messageChannelId: string;
-};
-
-@Injectable()
-export class CreateCompaniesAndContactsAfterSyncJob
-  implements MessageQueueJob<CreateCompaniesAndContactsAfterSyncJobData>
-{
-  private readonly logger = new Logger(
-    CreateCompaniesAndContactsAfterSyncJob.name,
-  );
-  constructor(
-    private readonly createCompaniesAndContactsService: CreateCompaniesAndContactsService,
-    private readonly messageChannelService: MessageChannelService,
-    private readonly messageParticipantService: MessageParticipantService,
-  ) {}
-
-  async handle(
-    data: CreateCompaniesAndContactsAfterSyncJobData,
-  ): Promise<void> {
-    this.logger.log(
-      `create contacts and companies after sync for workspace ${data.workspaceId} and messageChannel ${data.messageChannelId}`,
-    );
-    const { workspaceId, messageChannelId } = data;
-
-    const messageChannel = await this.messageChannelService.getByIds(
-      [messageChannelId],
-      workspaceId,
-    );
-
-    const { handle, isContactAutoCreationEnabled } = messageChannel[0];
-
-    if (!isContactAutoCreationEnabled) {
-      return;
-    }
-
-    const messageParticipantsWithoutPersonIdAndWorkspaceMemberId =
-      await this.messageParticipantService.getByMessageChannelIdWithoutPersonIdAndWorkspaceMemberIdAndMessageOutgoing(
-        messageChannelId,
-        workspaceId,
-      );
-
-    await this.createCompaniesAndContactsService.createCompaniesAndContacts(
-      handle,
-      messageParticipantsWithoutPersonIdAndWorkspaceMemberId,
-      workspaceId,
-    );
-
-    await this.messageParticipantService.updateMessageParticipantsAfterPeopleCreation(
-      messageParticipantsWithoutPersonIdAndWorkspaceMemberId,
-      workspaceId,
-    );
-
-    this.logger.log(
-      `create contacts and companies after sync for workspace ${data.workspaceId} and messageChannel ${data.messageChannelId} done`,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/jobs/delete-connected-acount-associated-data.job.ts b/packages/twenty-server/src/workspace/messaging/jobs/delete-connected-acount-associated-data.job.ts
deleted file mode 100644
index 81c5bb35c9eb..000000000000
--- a/packages/twenty-server/src/workspace/messaging/jobs/delete-connected-acount-associated-data.job.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { MessageQueueJob } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
-
-import { ThreadCleanerService } from 'src/workspace/messaging/services/thread-cleaner/thread-cleaner.service';
-
-export type DeleteConnectedAccountAssociatedDataJobData = {
-  workspaceId: string;
-  connectedAccountId: string;
-};
-
-@Injectable()
-export class DeleteConnectedAccountAssociatedDataJob
-  implements MessageQueueJob<DeleteConnectedAccountAssociatedDataJobData>
-{
-  private readonly logger = new Logger(
-    DeleteConnectedAccountAssociatedDataJob.name,
-  );
-
-  constructor(private readonly threadCleanerService: ThreadCleanerService) {}
-
-  async handle(
-    data: DeleteConnectedAccountAssociatedDataJobData,
-  ): Promise<void> {
-    this.logger.log(
-      `Deleting connected account ${data.connectedAccountId} associated data in workspace ${data.workspaceId}`,
-    );
-
-    await this.threadCleanerService.cleanWorkspaceThreads(data.workspaceId);
-
-    this.logger.log(
-      `Deleted connected account ${data.connectedAccountId} associated data in workspace ${data.workspaceId}`,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/jobs/gmail-full-sync.job.ts b/packages/twenty-server/src/workspace/messaging/jobs/gmail-full-sync.job.ts
deleted file mode 100644
index 3ab9f5bb8ef9..000000000000
--- a/packages/twenty-server/src/workspace/messaging/jobs/gmail-full-sync.job.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { MessageQueueJob } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
-
-import { GmailRefreshAccessTokenService } from 'src/workspace/messaging/services/gmail-refresh-access-token.service';
-import { GmailFullSyncService } from 'src/workspace/messaging/services/gmail-full-sync.service';
-
-export type GmailFullSyncJobData = {
-  workspaceId: string;
-  connectedAccountId: string;
-  nextPageToken?: string;
-};
-
-@Injectable()
-export class GmailFullSyncJob implements MessageQueueJob<GmailFullSyncJobData> {
-  private readonly logger = new Logger(GmailFullSyncJob.name);
-
-  constructor(
-    private readonly gmailRefreshAccessTokenService: GmailRefreshAccessTokenService,
-    private readonly gmailFullSyncService: GmailFullSyncService,
-  ) {}
-
-  async handle(data: GmailFullSyncJobData): Promise<void> {
-    this.logger.log(
-      `gmail full-sync for workspace ${data.workspaceId} and account ${
-        data.connectedAccountId
-      } ${data.nextPageToken ? `and ${data.nextPageToken} pageToken` : ''}`,
-    );
-    await this.gmailRefreshAccessTokenService.refreshAndSaveAccessToken(
-      data.workspaceId,
-      data.connectedAccountId,
-    );
-
-    await this.gmailFullSyncService.fetchConnectedAccountThreads(
-      data.workspaceId,
-      data.connectedAccountId,
-      data.nextPageToken,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/jobs/gmail-partial-sync.job.ts b/packages/twenty-server/src/workspace/messaging/jobs/gmail-partial-sync.job.ts
deleted file mode 100644
index f8169517f700..000000000000
--- a/packages/twenty-server/src/workspace/messaging/jobs/gmail-partial-sync.job.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { MessageQueueJob } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
-
-import { GmailRefreshAccessTokenService } from 'src/workspace/messaging/services/gmail-refresh-access-token.service';
-import { GmailPartialSyncService } from 'src/workspace/messaging/services/gmail-partial-sync.service';
-
-export type GmailPartialSyncJobData = {
-  workspaceId: string;
-  connectedAccountId: string;
-};
-
-@Injectable()
-export class GmailPartialSyncJob
-  implements MessageQueueJob<GmailPartialSyncJobData>
-{
-  private readonly logger = new Logger(GmailPartialSyncJob.name);
-
-  constructor(
-    private readonly gmailRefreshAccessTokenService: GmailRefreshAccessTokenService,
-    private readonly gmailPartialSyncService: GmailPartialSyncService,
-  ) {}
-
-  async handle(data: GmailPartialSyncJobData): Promise<void> {
-    this.logger.log(
-      `gmail partial-sync for workspace ${data.workspaceId} and account ${data.connectedAccountId}`,
-    );
-    await this.gmailRefreshAccessTokenService.refreshAndSaveAccessToken(
-      data.workspaceId,
-      data.connectedAccountId,
-    );
-
-    await this.gmailPartialSyncService.fetchConnectedAccountThreads(
-      data.workspaceId,
-      data.connectedAccountId,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/jobs/match-message-participant.job.ts b/packages/twenty-server/src/workspace/messaging/jobs/match-message-participant.job.ts
deleted file mode 100644
index 04ad5e4ded42..000000000000
--- a/packages/twenty-server/src/workspace/messaging/jobs/match-message-participant.job.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { MessageQueueJob } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
-
-import { MessageParticipantService } from 'src/workspace/messaging/repositories/message-participant/message-participant.service';
-
-export type MatchMessageParticipantsJobData = {
-  workspaceId: string;
-  email: string;
-  personId?: string;
-  workspaceMemberId?: string;
-};
-
-@Injectable()
-export class MatchMessageParticipantJob
-  implements MessageQueueJob<MatchMessageParticipantsJobData>
-{
-  constructor(
-    private readonly messageParticipantService: MessageParticipantService,
-  ) {}
-
-  async handle(data: MatchMessageParticipantsJobData): Promise<void> {
-    const { workspaceId, personId, workspaceMemberId, email } = data;
-
-    const messageParticipantsToUpdate =
-      await this.messageParticipantService.getByHandles([email], workspaceId);
-
-    const messageParticipantIdsToUpdate = messageParticipantsToUpdate.map(
-      (participant) => participant.id,
-    );
-
-    if (personId) {
-      await this.messageParticipantService.updateParticipantsPersonId(
-        messageParticipantIdsToUpdate,
-        personId,
-        workspaceId,
-      );
-    }
-    if (workspaceMemberId) {
-      await this.messageParticipantService.updateParticipantsWorkspaceMemberId(
-        messageParticipantIdsToUpdate,
-        workspaceMemberId,
-        workspaceId,
-      );
-    }
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/listeners/messaging-connected-account.listener.ts b/packages/twenty-server/src/workspace/messaging/listeners/messaging-connected-account.listener.ts
deleted file mode 100644
index 1aeee7dd8c6d..000000000000
--- a/packages/twenty-server/src/workspace/messaging/listeners/messaging-connected-account.listener.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Injectable, Inject } from '@nestjs/common';
-import { OnEvent } from '@nestjs/event-emitter';
-
-import { ObjectRecordDeleteEvent } from 'src/integrations/event-emitter/types/object-record-delete.event';
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import {
-  DeleteConnectedAccountAssociatedDataJobData,
-  DeleteConnectedAccountAssociatedDataJob,
-} from 'src/workspace/messaging/jobs/delete-connected-acount-associated-data.job';
-import { ConnectedAccountObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/connected-account.object-metadata';
-
-@Injectable()
-export class MessagingConnectedAccountListener {
-  constructor(
-    @Inject(MessageQueue.messagingQueue)
-    private readonly messageQueueService: MessageQueueService,
-  ) {}
-
-  @OnEvent('connectedAccount.deleted')
-  handleDeletedEvent(
-    payload: ObjectRecordDeleteEvent<ConnectedAccountObjectMetadata>,
-  ) {
-    this.messageQueueService.add<DeleteConnectedAccountAssociatedDataJobData>(
-      DeleteConnectedAccountAssociatedDataJob.name,
-      {
-        workspaceId: payload.workspaceId,
-        connectedAccountId: payload.deletedRecord.id,
-      },
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/listeners/messaging-message-channel.listener.ts b/packages/twenty-server/src/workspace/messaging/listeners/messaging-message-channel.listener.ts
deleted file mode 100644
index 5dc19f04de26..000000000000
--- a/packages/twenty-server/src/workspace/messaging/listeners/messaging-message-channel.listener.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { OnEvent } from '@nestjs/event-emitter';
-
-import { ObjectRecordUpdateEvent } from 'src/integrations/event-emitter/types/object-record-update.event';
-import { objectRecordChangedProperties } from 'src/integrations/event-emitter/utils/object-record-changed-properties.util';
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import {
-  CreateCompaniesAndContactsAfterSyncJobData,
-  CreateCompaniesAndContactsAfterSyncJob,
-} from 'src/workspace/messaging/jobs/create-companies-and-contacts-after-sync.job';
-import { MessageChannelObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-channel.object-metadata';
-
-@Injectable()
-export class MessagingMessageChannelListener {
-  constructor(
-    @Inject(MessageQueue.messagingQueue)
-    private readonly messageQueueService: MessageQueueService,
-  ) {}
-
-  @OnEvent('messageChannel.updated')
-  handleUpdatedEvent(
-    payload: ObjectRecordUpdateEvent<MessageChannelObjectMetadata>,
-  ) {
-    if (
-      objectRecordChangedProperties(
-        payload.previousRecord,
-        payload.updatedRecord,
-      ).includes('isContactAutoCreationEnabled') &&
-      payload.updatedRecord.isContactAutoCreationEnabled
-    ) {
-      this.messageQueueService.add<CreateCompaniesAndContactsAfterSyncJobData>(
-        CreateCompaniesAndContactsAfterSyncJob.name,
-        {
-          workspaceId: payload.workspaceId,
-          messageChannelId: payload.updatedRecord.id,
-        },
-      );
-    }
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/listeners/messaging-person.listener.ts b/packages/twenty-server/src/workspace/messaging/listeners/messaging-person.listener.ts
deleted file mode 100644
index 43c7fe3c0866..000000000000
--- a/packages/twenty-server/src/workspace/messaging/listeners/messaging-person.listener.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { OnEvent } from '@nestjs/event-emitter';
-
-import { ObjectRecordCreateEvent } from 'src/integrations/event-emitter/types/object-record-create.event';
-import { ObjectRecordUpdateEvent } from 'src/integrations/event-emitter/types/object-record-update.event';
-import { objectRecordChangedProperties as objectRecordUpdateEventChangedProperties } from 'src/integrations/event-emitter/utils/object-record-changed-properties.util';
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import {
-  MatchMessageParticipantJob,
-  MatchMessageParticipantsJobData,
-} from 'src/workspace/messaging/jobs/match-message-participant.job';
-import { PersonObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata';
-
-@Injectable()
-export class MessagingPersonListener {
-  constructor(
-    @Inject(MessageQueue.messagingQueue)
-    private readonly messageQueueService: MessageQueueService,
-  ) {}
-
-  @OnEvent('person.created')
-  async handleCreatedEvent(
-    payload: ObjectRecordCreateEvent<PersonObjectMetadata>,
-  ) {
-    if (payload.createdRecord.email === null) {
-      return;
-    }
-
-    this.messageQueueService.add<MatchMessageParticipantsJobData>(
-      MatchMessageParticipantJob.name,
-      {
-        workspaceId: payload.workspaceId,
-        email: payload.createdRecord.email,
-        personId: payload.createdRecord.id,
-      },
-    );
-  }
-
-  @OnEvent('person.updated')
-  async handleUpdatedEvent(
-    payload: ObjectRecordUpdateEvent<PersonObjectMetadata>,
-  ) {
-    if (
-      objectRecordUpdateEventChangedProperties(
-        payload.previousRecord,
-        payload.updatedRecord,
-      ).includes('email')
-    ) {
-      this.messageQueueService.add<MatchMessageParticipantsJobData>(
-        MatchMessageParticipantJob.name,
-        {
-          workspaceId: payload.workspaceId,
-          email: payload.updatedRecord.email,
-          personId: payload.updatedRecord.id,
-        },
-      );
-    }
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/listeners/messaging-workspace-member.listener.ts b/packages/twenty-server/src/workspace/messaging/listeners/messaging-workspace-member.listener.ts
deleted file mode 100644
index 726ab378a573..000000000000
--- a/packages/twenty-server/src/workspace/messaging/listeners/messaging-workspace-member.listener.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { OnEvent } from '@nestjs/event-emitter';
-
-import { ObjectRecordCreateEvent } from 'src/integrations/event-emitter/types/object-record-create.event';
-import { ObjectRecordUpdateEvent } from 'src/integrations/event-emitter/types/object-record-update.event';
-import { objectRecordChangedProperties as objectRecordUpdateEventChangedProperties } from 'src/integrations/event-emitter/utils/object-record-changed-properties.util';
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import {
-  MatchMessageParticipantJob,
-  MatchMessageParticipantsJobData,
-} from 'src/workspace/messaging/jobs/match-message-participant.job';
-import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
-
-@Injectable()
-export class MessagingWorkspaceMemberListener {
-  constructor(
-    @Inject(MessageQueue.messagingQueue)
-    private readonly messageQueueService: MessageQueueService,
-  ) {}
-
-  @OnEvent('workspaceMember.created')
-  async handleCreatedEvent(
-    payload: ObjectRecordCreateEvent<WorkspaceMemberObjectMetadata>,
-  ) {
-    if (payload.createdRecord.userEmail === null) {
-      return;
-    }
-
-    await this.messageQueueService.add<MatchMessageParticipantsJobData>(
-      MatchMessageParticipantJob.name,
-      {
-        workspaceId: payload.workspaceId,
-        email: payload.createdRecord.userEmail,
-        workspaceMemberId: payload.createdRecord.id,
-      },
-    );
-  }
-
-  @OnEvent('workspaceMember.updated')
-  async handleUpdatedEvent(
-    payload: ObjectRecordUpdateEvent<WorkspaceMemberObjectMetadata>,
-  ) {
-    if (
-      objectRecordUpdateEventChangedProperties(
-        payload.previousRecord,
-        payload.updatedRecord,
-      ).includes('userEmail')
-    ) {
-      await this.messageQueueService.add<MatchMessageParticipantsJobData>(
-        MatchMessageParticipantJob.name,
-        {
-          workspaceId: payload.workspaceId,
-          email: payload.updatedRecord.userEmail,
-          workspaceMemberId: payload.updatedRecord.id,
-        },
-      );
-    }
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/messaging.module.ts b/packages/twenty-server/src/workspace/messaging/messaging.module.ts
deleted file mode 100644
index b15a8b444746..000000000000
--- a/packages/twenty-server/src/workspace/messaging/messaging.module.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { ConnectedAccountModule } from 'src/workspace/messaging/repositories/connected-account/connected-account.module';
-import { MessageChannelMessageAssociationModule } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-assocation.module';
-import { MessageChannelModule } from 'src/workspace/messaging/repositories/message-channel/message-channel.module';
-import { MessageThreadModule } from 'src/workspace/messaging/repositories/message-thread/message-thread.module';
-import { EnvironmentModule } from 'src/integrations/environment/environment.module';
-import { MessagingPersonListener } from 'src/workspace/messaging/listeners/messaging-person.listener';
-import { MessageModule } from 'src/workspace/messaging/repositories/message/message.module';
-import { GmailClientProvider } from 'src/workspace/messaging/services/providers/gmail/gmail-client.provider';
-import { CreateContactService } from 'src/workspace/messaging/services/create-contact/create-contact.service';
-import { CreateCompanyService } from 'src/workspace/messaging/services/create-company/create-company.service';
-import { FetchMessagesByBatchesService } from 'src/workspace/messaging/services/fetch-messages-by-batches.service';
-import { GmailFullSyncService } from 'src/workspace/messaging/services/gmail-full-sync.service';
-import { GmailPartialSyncService } from 'src/workspace/messaging/services/gmail-partial-sync.service';
-import { GmailRefreshAccessTokenService } from 'src/workspace/messaging/services/gmail-refresh-access-token.service';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-import { MessageParticipantModule } from 'src/workspace/messaging/repositories/message-participant/message-participant.module';
-import { MessagingWorkspaceMemberListener } from 'src/workspace/messaging/listeners/messaging-workspace-member.listener';
-import { MessagingMessageChannelListener } from 'src/workspace/messaging/listeners/messaging-message-channel.listener';
-import { MessageService } from 'src/workspace/messaging/repositories/message/message.service';
-import { WorkspaceMemberModule } from 'src/workspace/messaging/repositories/workspace-member/workspace-member.module';
-import { FeatureFlagEntity } from 'src/core/feature-flag/feature-flag.entity';
-import { CreateCompaniesAndContactsModule } from 'src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.module';
-import { CompanyModule } from 'src/workspace/messaging/repositories/company/company.module';
-import { PersonModule } from 'src/workspace/messaging/repositories/person/person.module';
-import { SaveMessagesAndCreateContactsService } from 'src/workspace/messaging/services/save-messages-and-create-contacts.service';
-import { MessagingConnectedAccountListener } from 'src/workspace/messaging/listeners/messaging-connected-account.listener';
-import { BlocklistModule } from 'src/workspace/messaging/repositories/blocklist/blocklist.module';
-@Module({
-  imports: [
-    EnvironmentModule,
-    WorkspaceDataSourceModule,
-    ConnectedAccountModule,
-    MessageChannelModule,
-    MessageChannelMessageAssociationModule,
-    MessageModule,
-    MessageThreadModule,
-    MessageParticipantModule,
-    CreateCompaniesAndContactsModule,
-    WorkspaceMemberModule,
-    TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
-    CompanyModule,
-    PersonModule,
-    BlocklistModule,
-  ],
-  providers: [
-    GmailFullSyncService,
-    GmailPartialSyncService,
-    FetchMessagesByBatchesService,
-    GmailRefreshAccessTokenService,
-    GmailClientProvider,
-    CreateContactService,
-    CreateCompanyService,
-    MessagingPersonListener,
-    MessagingWorkspaceMemberListener,
-    MessagingMessageChannelListener,
-    MessageService,
-    SaveMessagesAndCreateContactsService,
-    MessagingConnectedAccountListener,
-  ],
-  exports: [
-    GmailPartialSyncService,
-    GmailFullSyncService,
-    GmailRefreshAccessTokenService,
-  ],
-})
-export class MessagingModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/query-hooks/message/message-find-many.pre-query.hook.ts b/packages/twenty-server/src/workspace/messaging/query-hooks/message/message-find-many.pre-query.hook.ts
deleted file mode 100644
index b5da50554658..000000000000
--- a/packages/twenty-server/src/workspace/messaging/query-hooks/message/message-find-many.pre-query.hook.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import {
-  BadRequestException,
-  ForbiddenException,
-  Injectable,
-  NotFoundException,
-} from '@nestjs/common';
-
-import { groupBy } from 'lodash';
-
-import { WorkspacePreQueryHook } from 'src/workspace/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface';
-import { FindManyResolverArgs } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-
-import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-association.service';
-import { MessageChannelService } from 'src/workspace/messaging/repositories/message-channel/message-channel.service';
-import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
-import { WorkspaceMemberService } from 'src/workspace/messaging/repositories/workspace-member/workspace-member.service';
-
-@Injectable()
-export class MessageFindManyPreQueryHook implements WorkspacePreQueryHook {
-  constructor(
-    private readonly messageChannelMessageAssociationService: MessageChannelMessageAssociationService,
-    private readonly messageChannelService: MessageChannelService,
-    private readonly connectedAccountService: ConnectedAccountService,
-    private readonly workspaceMemberService: WorkspaceMemberService,
-  ) {}
-
-  async execute(
-    userId: string,
-    workspaceId: string,
-    payload: FindManyResolverArgs,
-  ): Promise<void> {
-    if (!payload?.filter?.messageThreadId?.eq) {
-      throw new BadRequestException('messageThreadId filter is required');
-    }
-
-    const messageChannelMessageAssociations =
-      await this.messageChannelMessageAssociationService.getByMessageThreadId(
-        payload?.filter?.messageThreadId?.eq,
-        workspaceId,
-      );
-
-    if (messageChannelMessageAssociations.length === 0) {
-      throw new NotFoundException();
-    }
-
-    await this.canAccessMessageThread(
-      userId,
-      workspaceId,
-      messageChannelMessageAssociations,
-    );
-  }
-
-  private async canAccessMessageThread(
-    userId: string,
-    workspaceId: string,
-    messageChannelMessageAssociations: any[],
-  ) {
-    const messageChannels = await this.messageChannelService.getByIds(
-      messageChannelMessageAssociations.map(
-        (association) => association.messageChannelId,
-      ),
-      workspaceId,
-    );
-
-    const messageChannelsGroupByVisibility = groupBy(
-      messageChannels,
-      (channel) => channel.visibility,
-    );
-
-    if (messageChannelsGroupByVisibility.share_everything) {
-      return;
-    }
-
-    const currentWorkspaceMember =
-      await this.workspaceMemberService.getByIdOrFail(userId, workspaceId);
-
-    const messageChannelsConnectedAccounts =
-      await this.connectedAccountService.getByIds(
-        messageChannels.map((channel) => channel.connectedAccountId),
-        workspaceId,
-      );
-
-    const messageChannelsWorkspaceMemberIds =
-      messageChannelsConnectedAccounts.map(
-        (connectedAccount) => connectedAccount.accountOwnerId,
-      );
-
-    if (messageChannelsWorkspaceMemberIds.includes(currentWorkspaceMember.id)) {
-      return;
-    }
-
-    throw new ForbiddenException();
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/query-hooks/message/message-find-one.pre-query-hook.ts b/packages/twenty-server/src/workspace/messaging/query-hooks/message/message-find-one.pre-query-hook.ts
deleted file mode 100644
index c5e3fa869622..000000000000
--- a/packages/twenty-server/src/workspace/messaging/query-hooks/message/message-find-one.pre-query-hook.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import { BadRequestException, Injectable } from '@nestjs/common';
-
-import { WorkspacePreQueryHook } from 'src/workspace/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface';
-import { FindOneResolverArgs } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-
-@Injectable()
-export class MessageFindOnePreQueryHook implements WorkspacePreQueryHook {
-  async execute(
-    _userId: string,
-    _workspaceId: string,
-    _payload: FindOneResolverArgs,
-  ): Promise<void> {
-    throw new BadRequestException('Method not implemented.');
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/query-hooks/messaging-query-hook.module.ts b/packages/twenty-server/src/workspace/messaging/query-hooks/messaging-query-hook.module.ts
deleted file mode 100644
index daa52af28e79..000000000000
--- a/packages/twenty-server/src/workspace/messaging/query-hooks/messaging-query-hook.module.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { MessageFindManyPreQueryHook } from 'src/workspace/messaging/query-hooks/message/message-find-many.pre-query.hook';
-import { MessageFindOnePreQueryHook } from 'src/workspace/messaging/query-hooks/message/message-find-one.pre-query-hook';
-import { ConnectedAccountModule } from 'src/workspace/messaging/repositories/connected-account/connected-account.module';
-import { MessageChannelMessageAssociationModule } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-assocation.module';
-import { MessageChannelModule } from 'src/workspace/messaging/repositories/message-channel/message-channel.module';
-import { WorkspaceMemberModule } from 'src/workspace/messaging/repositories/workspace-member/workspace-member.module';
-
-@Module({
-  imports: [
-    MessageChannelMessageAssociationModule,
-    MessageChannelModule,
-    ConnectedAccountModule,
-    WorkspaceMemberModule,
-  ],
-  providers: [
-    {
-      provide: MessageFindOnePreQueryHook.name,
-      useClass: MessageFindOnePreQueryHook,
-    },
-    {
-      provide: MessageFindManyPreQueryHook.name,
-      useClass: MessageFindManyPreQueryHook,
-    },
-  ],
-})
-export class MessagingQueryHookModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/blocklist/blocklist.module.ts b/packages/twenty-server/src/workspace/messaging/repositories/blocklist/blocklist.module.ts
deleted file mode 100644
index 17f434665b8c..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/blocklist/blocklist.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { BlocklistService } from 'src/workspace/messaging/repositories/blocklist/blocklist.service';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-
-@Module({
-  imports: [WorkspaceDataSourceModule],
-  providers: [BlocklistService],
-  exports: [BlocklistService],
-})
-export class BlocklistModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/blocklist/blocklist.service.ts b/packages/twenty-server/src/workspace/messaging/repositories/blocklist/blocklist.service.ts
deleted file mode 100644
index 01c1560667de..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/blocklist/blocklist.service.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { ObjectRecord } from 'src/workspace/workspace-sync-metadata/types/object-record';
-import { BlocklistObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/blocklist.object-metadata';
-
-@Injectable()
-export class BlocklistService {
-  constructor(
-    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
-  ) {}
-
-  public async getByWorkspaceMemberId(
-    workspaceMemberId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<BlocklistObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."blocklist" WHERE "workspaceMemberId" = $1`,
-      [workspaceMemberId],
-      workspaceId,
-      transactionManager,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/company/company.module.ts b/packages/twenty-server/src/workspace/messaging/repositories/company/company.module.ts
deleted file mode 100644
index bab9d7b8230f..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/company/company.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { CompanyService } from 'src/workspace/messaging/repositories/company/company.service';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-
-// TODO: Move outside of the messaging module
-@Module({
-  imports: [WorkspaceDataSourceModule],
-  providers: [CompanyService],
-  exports: [CompanyService],
-})
-export class CompanyModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/company/company.service.ts b/packages/twenty-server/src/workspace/messaging/repositories/company/company.service.ts
deleted file mode 100644
index a3a1698ccf43..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/company/company.service.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-
-export type CompanyToCreate = {
-  id: string;
-  domainName: string;
-  name?: string;
-  city?: string;
-};
-
-// TODO: Move outside of the messaging module
-@Injectable()
-export class CompanyService {
-  constructor(
-    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
-  ) {}
-
-  public async getExistingCompaniesByDomainNames(
-    domainNames: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<{ id: string; domainName: string }[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    const existingCompanies =
-      await this.workspaceDataSourceService.executeRawQuery(
-        `SELECT id, "domainName" FROM ${dataSourceSchema}.company WHERE "domainName" = ANY($1)`,
-        [domainNames],
-        workspaceId,
-        transactionManager,
-      );
-
-    return existingCompanies;
-  }
-
-  public async createCompany(
-    workspaceId: string,
-    companyToCreate: CompanyToCreate,
-    transactionManager?: EntityManager,
-  ): Promise<void> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `INSERT INTO ${dataSourceSchema}.company (id, "domainName", name, address)
-      VALUES ($1, $2, $3, $4)`,
-      [
-        companyToCreate.id,
-        companyToCreate.domainName,
-        companyToCreate.name ?? '',
-        companyToCreate.city ?? '',
-      ],
-      workspaceId,
-      transactionManager,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/connected-account/connected-account.module.ts b/packages/twenty-server/src/workspace/messaging/repositories/connected-account/connected-account.module.ts
deleted file mode 100644
index 12292e445a7a..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/connected-account/connected-account.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-
-@Module({
-  imports: [WorkspaceDataSourceModule],
-  providers: [ConnectedAccountService],
-  exports: [ConnectedAccountService],
-})
-export class ConnectedAccountModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/connected-account/connected-account.service.ts b/packages/twenty-server/src/workspace/messaging/repositories/connected-account/connected-account.service.ts
deleted file mode 100644
index c20fd952992b..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/connected-account/connected-account.service.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import { Injectable, NotFoundException } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { ConnectedAccountObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/connected-account.object-metadata';
-import { ObjectRecord } from 'src/workspace/workspace-sync-metadata/types/object-record';
-
-@Injectable()
-export class ConnectedAccountService {
-  constructor(
-    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
-  ) {}
-
-  public async getAll(
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<ConnectedAccountObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."connectedAccount" WHERE "provider" = 'google'`,
-      [],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async getByIds(
-    connectedAccountIds: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<ConnectedAccountObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."connectedAccount" WHERE "id" = ANY($1)`,
-      [connectedAccountIds],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async getByIdOrFail(
-    connectedAccountId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<ConnectedAccountObjectMetadata>> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    const connectedAccounts =
-      await this.workspaceDataSourceService.executeRawQuery(
-        `SELECT * FROM ${dataSourceSchema}."connectedAccount" WHERE "id" = $1 LIMIT 1`,
-        [connectedAccountId],
-        workspaceId,
-        transactionManager,
-      );
-
-    if (!connectedAccounts || connectedAccounts.length === 0) {
-      throw new NotFoundException(
-        `No connected account found for id ${connectedAccountId} in workspace ${workspaceId}`,
-      );
-    }
-
-    return connectedAccounts[0];
-  }
-
-  public async updateLastSyncHistoryId(
-    historyId: string,
-    connectedAccountId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ) {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `UPDATE ${dataSourceSchema}."connectedAccount" SET "lastSyncHistoryId" = $1 WHERE "id" = $2`,
-      [historyId, connectedAccountId],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async updateLastSyncHistoryIdIfHigher(
-    historyId: string,
-    connectedAccountId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ) {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `UPDATE ${dataSourceSchema}."connectedAccount" SET "lastSyncHistoryId" = $1
-      WHERE "id" = $2
-      AND ("lastSyncHistoryId" < $1 OR "lastSyncHistoryId" = '')`,
-      [historyId, connectedAccountId],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async deleteHistoryId(
-    connectedAccountId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ) {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `UPDATE ${dataSourceSchema}."connectedAccount" SET "lastSyncHistoryId" = '' WHERE "id" = $1`,
-      [connectedAccountId],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async updateAccessToken(
-    accessToken: string,
-    connectedAccountId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ) {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `UPDATE ${dataSourceSchema}."connectedAccount" SET "accessToken" = $1 WHERE "id" = $2`,
-      [accessToken, connectedAccountId],
-      workspaceId,
-      transactionManager,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-assocation.module.ts b/packages/twenty-server/src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-assocation.module.ts
deleted file mode 100644
index 4a4f6c6b7e86..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-assocation.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-association.service';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-
-@Module({
-  imports: [WorkspaceDataSourceModule],
-  providers: [MessageChannelMessageAssociationService],
-  exports: [MessageChannelMessageAssociationService],
-})
-export class MessageChannelMessageAssociationModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-association.service.ts b/packages/twenty-server/src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-association.service.ts
deleted file mode 100644
index 18649d722aef..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-association.service.ts
+++ /dev/null
@@ -1,207 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { MessageChannelMessageAssociationObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-channel-message-association.object-metadata';
-import { ObjectRecord } from 'src/workspace/workspace-sync-metadata/types/object-record';
-
-@Injectable()
-export class MessageChannelMessageAssociationService {
-  constructor(
-    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
-  ) {}
-
-  public async getByMessageExternalIdsAndMessageChannelId(
-    messageExternalIds: string[],
-    messageChannelId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<MessageChannelMessageAssociationObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
-    WHERE "messageExternalId" = ANY($1) AND "messageChannelId" = $2`,
-      [messageExternalIds, messageChannelId],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async countByMessageExternalIdsAndMessageChannelId(
-    messageExternalIds: string[],
-    messageChannelId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<number> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    const result = await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT COUNT(*) FROM ${dataSourceSchema}."messageChannelMessageAssociation"
-    WHERE "messageExternalId" = ANY($1) AND "messageChannelId" = $2`,
-      [messageExternalIds, messageChannelId],
-      workspaceId,
-      transactionManager,
-    );
-
-    return result[0]?.count;
-  }
-
-  public async deleteByMessageExternalIdsAndMessageChannelId(
-    messageExternalIds: string[],
-    messageChannelId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ) {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `DELETE FROM ${dataSourceSchema}."messageChannelMessageAssociation" WHERE "messageExternalId" = ANY($1) AND "messageChannelId" = $2`,
-      [messageExternalIds, messageChannelId],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async getByMessageChannelIds(
-    messageChannelIds: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<MessageChannelMessageAssociationObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
-    WHERE "messageChannelId" = ANY($1)`,
-      [messageChannelIds],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async deleteByMessageChannelId(
-    messageChannelId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ) {
-    this.deleteByMessageChannelIds(
-      [messageChannelId],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async deleteByMessageChannelIds(
-    messageChannelIds: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ) {
-    if (messageChannelIds.length === 0) {
-      return;
-    }
-
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `DELETE FROM ${dataSourceSchema}."messageChannelMessageAssociation" WHERE "messageChannelId" = ANY($1)`,
-      [messageChannelIds],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async deleteByIds(
-    ids: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ) {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `DELETE FROM ${dataSourceSchema}."messageChannelMessageAssociation" WHERE "id" = ANY($1)`,
-      [ids],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async getByMessageThreadExternalIds(
-    messageThreadExternalIds: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<MessageChannelMessageAssociationObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
-    WHERE "messageThreadExternalId" = ANY($1)`,
-      [messageThreadExternalIds],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async getFirstByMessageThreadExternalId(
-    messageThreadExternalId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<MessageChannelMessageAssociationObjectMetadata> | null> {
-    const existingMessageChannelMessageAssociations =
-      await this.getByMessageThreadExternalIds(
-        [messageThreadExternalId],
-        workspaceId,
-        transactionManager,
-      );
-
-    if (
-      !existingMessageChannelMessageAssociations ||
-      existingMessageChannelMessageAssociations.length === 0
-    ) {
-      return null;
-    }
-
-    return existingMessageChannelMessageAssociations[0];
-  }
-
-  public async getByMessageIds(
-    messageIds: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<MessageChannelMessageAssociationObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
-    WHERE "messageId" = ANY($1)`,
-      [messageIds],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async getByMessageThreadId(
-    messageThreadId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<MessageChannelMessageAssociationObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
-    WHERE "messageThreadId" = $1`,
-      [messageThreadId],
-      workspaceId,
-      transactionManager,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/message-channel/message-channel.module.ts b/packages/twenty-server/src/workspace/messaging/repositories/message-channel/message-channel.module.ts
deleted file mode 100644
index f7f017c89417..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/message-channel/message-channel.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { MessageChannelService } from 'src/workspace/messaging/repositories/message-channel/message-channel.service';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-
-@Module({
-  imports: [WorkspaceDataSourceModule],
-  providers: [MessageChannelService],
-  exports: [MessageChannelService],
-})
-export class MessageChannelModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/message-channel/message-channel.service.ts b/packages/twenty-server/src/workspace/messaging/repositories/message-channel/message-channel.service.ts
deleted file mode 100644
index 1ca85c5b1588..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/message-channel/message-channel.service.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { MessageChannelObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-channel.object-metadata';
-import { ObjectRecord } from 'src/workspace/workspace-sync-metadata/types/object-record';
-
-@Injectable()
-export class MessageChannelService {
-  constructor(
-    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
-  ) {}
-
-  public async getByConnectedAccountId(
-    connectedAccountId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<MessageChannelObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."messageChannel" WHERE "connectedAccountId" = $1 AND "type" = 'email' LIMIT 1`,
-      [connectedAccountId],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async getFirstByConnectedAccountIdOrFail(
-    connectedAccountId: string,
-    workspaceId: string,
-  ): Promise<ObjectRecord<MessageChannelObjectMetadata>> {
-    const messageChannels = await this.getByConnectedAccountId(
-      connectedAccountId,
-      workspaceId,
-    );
-
-    if (!messageChannels || messageChannels.length === 0) {
-      throw new Error(
-        `No message channel found for connected account ${connectedAccountId} in workspace ${workspaceId}`,
-      );
-    }
-
-    return messageChannels[0];
-  }
-
-  public async getIsContactAutoCreationEnabledByConnectedAccountIdOrFail(
-    connectedAccountId: string,
-    workspaceId: string,
-  ): Promise<boolean> {
-    const messageChannel = await this.getFirstByConnectedAccountIdOrFail(
-      connectedAccountId,
-      workspaceId,
-    );
-
-    return messageChannel.isContactAutoCreationEnabled;
-  }
-
-  public async getByIds(
-    ids: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<MessageChannelObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."messageChannel" WHERE "id" = ANY($1)`,
-      [ids],
-      workspaceId,
-      transactionManager,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/message-participant/message-participant.module.ts b/packages/twenty-server/src/workspace/messaging/repositories/message-participant/message-participant.module.ts
deleted file mode 100644
index 9f924dc41dc1..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/message-participant/message-participant.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { MessageParticipantService } from 'src/workspace/messaging/repositories/message-participant/message-participant.service';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-import { PersonModule } from 'src/workspace/messaging/repositories/person/person.module';
-
-@Module({
-  imports: [WorkspaceDataSourceModule, PersonModule],
-  providers: [MessageParticipantService],
-  exports: [MessageParticipantService],
-})
-export class MessageParticipantModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/message-participant/message-participant.service.ts b/packages/twenty-server/src/workspace/messaging/repositories/message-participant/message-participant.service.ts
deleted file mode 100644
index aebbf3a3a468..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/message-participant/message-participant.service.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { MessageParticipantObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-participant.object-metadata';
-import { ObjectRecord } from 'src/workspace/workspace-sync-metadata/types/object-record';
-import {
-  ParticipantWithId,
-  ParticipantWithMessageId,
-} from 'src/workspace/messaging/types/gmail-message';
-import { PersonService } from 'src/workspace/messaging/repositories/person/person.service';
-
-@Injectable()
-export class MessageParticipantService {
-  constructor(
-    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
-    private readonly personService: PersonService,
-  ) {}
-
-  public async getByHandles(
-    handles: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<MessageParticipantObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."messageParticipant" WHERE "handle" = ANY($1)`,
-      [handles],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async updateParticipantsPersonId(
-    participantIds: string[],
-    personId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ) {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `UPDATE ${dataSourceSchema}."messageParticipant" SET "personId" = $1 WHERE "id" = ANY($2)`,
-      [personId, participantIds],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async updateParticipantsWorkspaceMemberId(
-    participantIds: string[],
-    workspaceMemberId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ) {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `UPDATE ${dataSourceSchema}."messageParticipant" SET "workspaceMemberId" = $1 WHERE "id" = ANY($2)`,
-      [workspaceMemberId, participantIds],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async getByMessageChannelIdWithoutPersonIdAndWorkspaceMemberIdAndMessageOutgoing(
-    messageChannelId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ParticipantWithId[]> {
-    if (!messageChannelId || !workspaceId) {
-      return [];
-    }
-
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    const messageParticipants: ParticipantWithId[] =
-      await this.workspaceDataSourceService.executeRawQuery(
-        `SELECT "messageParticipant".id,
-        "messageParticipant"."role",
-        "messageParticipant"."handle",
-        "messageParticipant"."displayName",
-        "messageParticipant"."personId",
-        "messageParticipant"."workspaceMemberId",
-        "messageParticipant"."messageId"
-        FROM ${dataSourceSchema}."messageParticipant" "messageParticipant"
-        LEFT JOIN ${dataSourceSchema}."message" ON "messageParticipant"."messageId" = ${dataSourceSchema}."message"."id" 
-        LEFT JOIN ${dataSourceSchema}."messageChannelMessageAssociation" ON ${dataSourceSchema}."messageChannelMessageAssociation"."messageId" = ${dataSourceSchema}."message"."id"
-        WHERE ${dataSourceSchema}."messageChannelMessageAssociation"."messageChannelId" = $1
-        AND "messageParticipant"."personId" IS NULL
-        AND "messageParticipant"."workspaceMemberId" IS NULL
-        AND ${dataSourceSchema}."message"."direction" = 'outgoing'`,
-        [messageChannelId],
-        workspaceId,
-        transactionManager,
-      );
-
-    return messageParticipants;
-  }
-
-  public async getByHandlesWithoutPersonIdAndWorkspaceMemberId(
-    handles: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ParticipantWithId[]> {
-    if (!workspaceId) {
-      throw new Error('WorkspaceId is required');
-    }
-
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    const messageParticipants: ParticipantWithId[] =
-      await this.workspaceDataSourceService.executeRawQuery(
-        `SELECT "messageParticipant".id,
-        "messageParticipant"."role",
-        "messageParticipant"."handle",
-        "messageParticipant"."displayName",
-        "messageParticipant"."personId",
-        "messageParticipant"."workspaceMemberId",
-        "messageParticipant"."messageId"
-        FROM ${dataSourceSchema}."messageParticipant" "messageParticipant"
-        WHERE "messageParticipant"."personId" IS NULL
-        AND "messageParticipant"."workspaceMemberId" IS NULL
-        AND "messageParticipant"."handle" = ANY($1)`,
-        [handles],
-        workspaceId,
-        transactionManager,
-      );
-
-    return messageParticipants;
-  }
-
-  public async saveMessageParticipants(
-    participants: ParticipantWithMessageId[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<void> {
-    if (!participants) return;
-
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    const handles = participants.map((participant) => participant.handle);
-
-    const participantPersonIds =
-      await this.workspaceDataSourceService.executeRawQuery(
-        `SELECT id, email FROM ${dataSourceSchema}."person" WHERE "email" = ANY($1)`,
-        [handles],
-        workspaceId,
-        transactionManager,
-      );
-
-    const participantWorkspaceMemberIds =
-      await this.workspaceDataSourceService.executeRawQuery(
-        `SELECT "workspaceMember"."id", "connectedAccount"."handle" AS email FROM ${dataSourceSchema}."workspaceMember"
-          JOIN ${dataSourceSchema}."connectedAccount" ON ${dataSourceSchema}."workspaceMember"."id" = ${dataSourceSchema}."connectedAccount"."accountOwnerId"
-          WHERE ${dataSourceSchema}."connectedAccount"."handle" = ANY($1)`,
-        [handles],
-        workspaceId,
-        transactionManager,
-      );
-
-    const messageParticipantsToSave = participants.map((participant) => [
-      participant.messageId,
-      participant.role,
-      participant.handle,
-      participant.displayName,
-      participantPersonIds.find((e) => e.email === participant.handle)?.id,
-      participantWorkspaceMemberIds.find((e) => e.email === participant.handle)
-        ?.id,
-    ]);
-
-    const valuesString = messageParticipantsToSave
-      .map(
-        (_, index) =>
-          `($${index * 6 + 1}, $${index * 6 + 2}, $${index * 6 + 3}, $${
-            index * 6 + 4
-          }, $${index * 6 + 5}, $${index * 6 + 6})`,
-      )
-      .join(', ');
-
-    if (messageParticipantsToSave.length === 0) return;
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `INSERT INTO ${dataSourceSchema}."messageParticipant" ("messageId", "role", "handle", "displayName", "personId", "workspaceMemberId") VALUES ${valuesString}`,
-      messageParticipantsToSave.flat(),
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async updateMessageParticipantsAfterPeopleCreation(
-    participants: ParticipantWithId[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<void> {
-    if (!participants) return;
-
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    const handles = participants.map((participant) => participant.handle);
-
-    const participantPersonIds = await this.personService.getByEmails(
-      handles,
-      workspaceId,
-      transactionManager,
-    );
-
-    const messageParticipantsToUpdate = participants.map((participant) => [
-      participant.id,
-      participantPersonIds.find(
-        (e: { id: string; email: string }) => e.email === participant.handle,
-      )?.id,
-    ]);
-
-    if (messageParticipantsToUpdate.length === 0) return;
-
-    const valuesString = messageParticipantsToUpdate
-      .map((_, index) => `($${index * 2 + 1}::uuid, $${index * 2 + 2}::uuid)`)
-      .join(', ');
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `UPDATE ${dataSourceSchema}."messageParticipant" AS "messageParticipant" SET "personId" = "data"."personId"
-      FROM (VALUES ${valuesString}) AS "data"("id", "personId")
-      WHERE "messageParticipant"."id" = "data"."id"`,
-      messageParticipantsToUpdate.flat(),
-      workspaceId,
-      transactionManager,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/message-thread/message-thread.module.ts b/packages/twenty-server/src/workspace/messaging/repositories/message-thread/message-thread.module.ts
deleted file mode 100644
index 4d4cfc932a3c..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/message-thread/message-thread.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { MessageChannelMessageAssociationModule } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-assocation.module';
-import { MessageThreadService } from 'src/workspace/messaging/repositories/message-thread/message-thread.service';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-
-@Module({
-  imports: [WorkspaceDataSourceModule, MessageChannelMessageAssociationModule],
-  providers: [MessageThreadService],
-  exports: [MessageThreadService],
-})
-export class MessageThreadModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/message-thread/message-thread.service.ts b/packages/twenty-server/src/workspace/messaging/repositories/message-thread/message-thread.service.ts
deleted file mode 100644
index eb0b98e9c20d..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/message-thread/message-thread.service.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-import { v4 } from 'uuid';
-
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { DataSourceEntity } from 'src/metadata/data-source/data-source.entity';
-import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-association.service';
-import { MessageThreadObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-thread.object-metadata';
-import { ObjectRecord } from 'src/workspace/workspace-sync-metadata/types/object-record';
-
-@Injectable()
-export class MessageThreadService {
-  constructor(
-    private readonly messageChannelMessageAssociationService: MessageChannelMessageAssociationService,
-    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
-  ) {}
-
-  public async getOrphanThreads(
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<MessageThreadObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT mt.* FROM ${dataSourceSchema}."messageThread" mt
-      WHERE NOT EXISTS (
-          SELECT 1 FROM ${dataSourceSchema}."message" m
-          WHERE m."messageThreadId" = mt.id
-      )`,
-      [],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async deleteByIds(
-    messageThreadIds: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<void> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `DELETE FROM ${dataSourceSchema}."messageThread" WHERE id = ANY($1)`,
-      [messageThreadIds],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async saveMessageThreadOrReturnExistingMessageThread(
-    messageThreadExternalId: string,
-    dataSourceMetadata: DataSourceEntity,
-    workspaceId: string,
-    manager: EntityManager,
-  ) {
-    const existingMessageChannelMessageAssociationByMessageThreadExternalId =
-      await this.messageChannelMessageAssociationService.getFirstByMessageThreadExternalId(
-        messageThreadExternalId,
-        workspaceId,
-        manager,
-      );
-
-    const existingMessageThread =
-      existingMessageChannelMessageAssociationByMessageThreadExternalId?.messageThreadId;
-
-    if (existingMessageThread) {
-      return Promise.resolve(existingMessageThread);
-    }
-
-    const newMessageThreadId = v4();
-
-    await manager.query(
-      `INSERT INTO ${dataSourceMetadata.schema}."messageThread" ("id") VALUES ($1)`,
-      [newMessageThreadId],
-    );
-
-    return Promise.resolve(newMessageThreadId);
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/message/message.module.ts b/packages/twenty-server/src/workspace/messaging/repositories/message/message.module.ts
deleted file mode 100644
index e7b1fed3da4a..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/message/message.module.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { MessageChannelModule } from 'src/workspace/messaging/repositories/message-channel/message-channel.module';
-import { MessageChannelMessageAssociationModule } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-assocation.module';
-import { MessageParticipantModule } from 'src/workspace/messaging/repositories/message-participant/message-participant.module';
-import { MessageThreadModule } from 'src/workspace/messaging/repositories/message-thread/message-thread.module';
-import { MessageService } from 'src/workspace/messaging/repositories/message/message.service';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-import { CreateCompaniesAndContactsModule } from 'src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.module';
-
-@Module({
-  imports: [
-    WorkspaceDataSourceModule,
-    MessageThreadModule,
-    MessageParticipantModule,
-    MessageChannelMessageAssociationModule,
-    MessageChannelModule,
-    CreateCompaniesAndContactsModule,
-  ],
-  providers: [MessageService],
-  exports: [MessageService],
-})
-export class MessageModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/message/message.service.ts b/packages/twenty-server/src/workspace/messaging/repositories/message/message.service.ts
deleted file mode 100644
index 7fb2a6694d96..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/message/message.service.ts
+++ /dev/null
@@ -1,308 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { DataSource, EntityManager } from 'typeorm';
-import { v4 } from 'uuid';
-
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { MessageObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message.object-metadata';
-import { ObjectRecord } from 'src/workspace/workspace-sync-metadata/types/object-record';
-import { DataSourceEntity } from 'src/metadata/data-source/data-source.entity';
-import { GmailMessage } from 'src/workspace/messaging/types/gmail-message';
-import { ConnectedAccountObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/connected-account.object-metadata';
-import { MessageChannelService } from 'src/workspace/messaging/repositories/message-channel/message-channel.service';
-import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-association.service';
-import { MessageParticipantService } from 'src/workspace/messaging/repositories/message-participant/message-participant.service';
-import { MessageThreadService } from 'src/workspace/messaging/repositories/message-thread/message-thread.service';
-import { CreateCompaniesAndContactsService } from 'src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.service';
-@Injectable()
-export class MessageService {
-  constructor(
-    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
-    private readonly messageChannelMessageAssociationService: MessageChannelMessageAssociationService,
-    private readonly messageThreadService: MessageThreadService,
-    private readonly messageParticipantService: MessageParticipantService,
-    private readonly messageChannelService: MessageChannelService,
-    private readonly createCompaniesAndContactsService: CreateCompaniesAndContactsService,
-  ) {}
-
-  public async getNonAssociatedMessages(
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<MessageObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT m.* FROM ${dataSourceSchema}."message" m
-        WHERE NOT EXISTS (
-            SELECT 1 FROM ${dataSourceSchema}."messageChannelMessageAssociation" mcma
-            WHERE mcma."messageId" = m.id
-        )`,
-      [],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async getFirstByHeaderMessageId(
-    headerMessageId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<MessageObjectMetadata> | null> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    const messages = await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."message" WHERE "headerMessageId" = $1 LIMIT 1`,
-      [headerMessageId],
-      workspaceId,
-      transactionManager,
-    );
-
-    if (!messages || messages.length === 0) {
-      return null;
-    }
-
-    return messages[0];
-  }
-
-  public async getByIds(
-    messageIds: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<MessageObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."message" WHERE "id" = ANY($1)`,
-      [messageIds],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async deleteByIds(
-    messageIds: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<void> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `DELETE FROM ${dataSourceSchema}."message" WHERE "id" = ANY($1)`,
-      [messageIds],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async getByMessageThreadIds(
-    messageThreadIds: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<MessageObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."message" WHERE "messageThreadId" = ANY($1)`,
-      [messageThreadIds],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async saveMessages(
-    messages: GmailMessage[],
-    dataSourceMetadata: DataSourceEntity,
-    workspaceDataSource: DataSource,
-    connectedAccount: ObjectRecord<ConnectedAccountObjectMetadata>,
-    gmailMessageChannelId: string,
-    workspaceId: string,
-  ): Promise<Map<string, string>> {
-    const messageExternalIdsAndIdsMap = new Map<string, string>();
-
-    for (const message of messages) {
-      await workspaceDataSource?.transaction(async (manager: EntityManager) => {
-        const existingMessageChannelMessageAssociationsCount =
-          await this.messageChannelMessageAssociationService.countByMessageExternalIdsAndMessageChannelId(
-            [message.externalId],
-            gmailMessageChannelId,
-            workspaceId,
-            manager,
-          );
-
-        if (existingMessageChannelMessageAssociationsCount > 0) {
-          return;
-        }
-
-        const savedOrExistingMessageThreadId =
-          await this.messageThreadService.saveMessageThreadOrReturnExistingMessageThread(
-            message.messageThreadExternalId,
-            dataSourceMetadata,
-            workspaceId,
-            manager,
-          );
-
-        const savedOrExistingMessageId =
-          await this.saveMessageOrReturnExistingMessage(
-            message,
-            savedOrExistingMessageThreadId,
-            connectedAccount,
-            dataSourceMetadata,
-            workspaceId,
-            manager,
-          );
-
-        messageExternalIdsAndIdsMap.set(
-          message.externalId,
-          savedOrExistingMessageId,
-        );
-
-        await manager.query(
-          `INSERT INTO ${dataSourceMetadata.schema}."messageChannelMessageAssociation" ("messageChannelId", "messageId", "messageExternalId", "messageThreadId", "messageThreadExternalId") VALUES ($1, $2, $3, $4, $5)`,
-          [
-            gmailMessageChannelId,
-            savedOrExistingMessageId,
-            message.externalId,
-            savedOrExistingMessageThreadId,
-            message.messageThreadExternalId,
-          ],
-        );
-      });
-    }
-
-    return messageExternalIdsAndIdsMap;
-  }
-
-  private async saveMessageOrReturnExistingMessage(
-    message: GmailMessage,
-    messageThreadId: string,
-    connectedAccount: ObjectRecord<ConnectedAccountObjectMetadata>,
-    dataSourceMetadata: DataSourceEntity,
-    workspaceId: string,
-    manager: EntityManager,
-  ): Promise<string> {
-    const existingMessage = await this.getFirstByHeaderMessageId(
-      message.headerMessageId,
-      workspaceId,
-    );
-    const existingMessageId = existingMessage?.id;
-
-    if (existingMessageId) {
-      return Promise.resolve(existingMessageId);
-    }
-
-    const newMessageId = v4();
-
-    const messageDirection =
-      connectedAccount.handle === message.fromHandle ? 'outgoing' : 'incoming';
-
-    const receivedAt = new Date(parseInt(message.internalDate));
-
-    await manager.query(
-      `INSERT INTO ${dataSourceMetadata.schema}."message" ("id", "headerMessageId", "subject", "receivedAt", "direction", "messageThreadId", "text") VALUES ($1, $2, $3, $4, $5, $6, $7)`,
-      [
-        newMessageId,
-        message.headerMessageId,
-        message.subject,
-        receivedAt,
-        messageDirection,
-        messageThreadId,
-        message.text,
-      ],
-    );
-
-    return Promise.resolve(newMessageId);
-  }
-
-  public async deleteMessages(
-    messagesDeletedMessageExternalIds: string[],
-    gmailMessageChannelId: string,
-    workspaceId: string,
-  ) {
-    const workspaceDataSource =
-      await this.workspaceDataSourceService.connectToWorkspaceDataSource(
-        workspaceId,
-      );
-
-    await workspaceDataSource?.transaction(async (manager: EntityManager) => {
-      const messageChannelMessageAssociationsToDelete =
-        await this.messageChannelMessageAssociationService.getByMessageExternalIdsAndMessageChannelId(
-          messagesDeletedMessageExternalIds,
-          gmailMessageChannelId,
-          workspaceId,
-          manager,
-        );
-
-      const messageChannelMessageAssociationIdsToDeleteIds =
-        messageChannelMessageAssociationsToDelete.map(
-          (messageChannelMessageAssociationToDelete) =>
-            messageChannelMessageAssociationToDelete.id,
-        );
-
-      await this.messageChannelMessageAssociationService.deleteByIds(
-        messageChannelMessageAssociationIdsToDeleteIds,
-        workspaceId,
-        manager,
-      );
-
-      const messageIdsFromMessageChannelMessageAssociationsToDelete =
-        messageChannelMessageAssociationsToDelete.map(
-          (messageChannelMessageAssociationToDelete) =>
-            messageChannelMessageAssociationToDelete.messageId,
-        );
-
-      const messageChannelMessageAssociationByMessageIds =
-        await this.messageChannelMessageAssociationService.getByMessageIds(
-          messageIdsFromMessageChannelMessageAssociationsToDelete,
-          workspaceId,
-          manager,
-        );
-
-      const messageIdsFromMessageChannelMessageAssociationByMessageIds =
-        messageChannelMessageAssociationByMessageIds.map(
-          (messageChannelMessageAssociation) =>
-            messageChannelMessageAssociation.messageId,
-        );
-
-      const messageIdsToDelete =
-        messageIdsFromMessageChannelMessageAssociationsToDelete.filter(
-          (messageId) =>
-            !messageIdsFromMessageChannelMessageAssociationByMessageIds.includes(
-              messageId,
-            ),
-        );
-
-      await this.deleteByIds(messageIdsToDelete, workspaceId, manager);
-
-      const messageThreadIdsFromMessageChannelMessageAssociationsToDelete =
-        messageChannelMessageAssociationsToDelete.map(
-          (messageChannelMessageAssociationToDelete) =>
-            messageChannelMessageAssociationToDelete.messageThreadId,
-        );
-
-      const messagesByThreadIds = await this.getByMessageThreadIds(
-        messageThreadIdsFromMessageChannelMessageAssociationsToDelete,
-        workspaceId,
-        manager,
-      );
-
-      const threadIdsToDelete =
-        messageThreadIdsFromMessageChannelMessageAssociationsToDelete.filter(
-          (threadId) =>
-            !messagesByThreadIds.find(
-              (message) => message.messageThreadId === threadId,
-            ),
-        );
-
-      await this.messageThreadService.deleteByIds(
-        threadIdsToDelete,
-        workspaceId,
-        manager,
-      );
-    });
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/person/person.module.ts b/packages/twenty-server/src/workspace/messaging/repositories/person/person.module.ts
deleted file mode 100644
index d74ef65b13a7..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/person/person.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { PersonService } from 'src/workspace/messaging/repositories/person/person.service';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-
-// TODO: Move outside of the messaging module
-@Module({
-  imports: [WorkspaceDataSourceModule],
-  providers: [PersonService],
-  exports: [PersonService],
-})
-export class PersonModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/person/person.service.ts b/packages/twenty-server/src/workspace/messaging/repositories/person/person.service.ts
deleted file mode 100644
index 912014db5105..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/person/person.service.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { ObjectRecord } from 'src/workspace/workspace-sync-metadata/types/object-record';
-import { PersonObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata';
-
-// TODO: Move outside of the messaging module
-@Injectable()
-export class PersonService {
-  constructor(
-    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
-  ) {}
-
-  async getByEmails(
-    emails: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<PersonObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}.person WHERE email = ANY($1)`,
-      [emails],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  async createPeople(
-    peopleToCreate: {
-      id: string;
-      handle: string;
-      firstName: string;
-      lastName: string;
-      companyId?: string;
-    }[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<void> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    const valuesString = peopleToCreate
-      .map(
-        (_, index) =>
-          `($${index * 5 + 1}, $${index * 5 + 2}, $${index * 5 + 3}, $${
-            index * 5 + 4
-          }, $${index * 5 + 5})`,
-      )
-      .join(', ');
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `INSERT INTO ${dataSourceSchema}.person (id, email, "nameFirstName", "nameLastName", "companyId") VALUES ${valuesString}`,
-      peopleToCreate
-        .map((contact) => [
-          contact.id,
-          contact.handle,
-          contact.firstName,
-          contact.lastName,
-          contact.companyId,
-        ])
-        .flat(),
-      workspaceId,
-      transactionManager,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/workspace-member/workspace-member.module.ts b/packages/twenty-server/src/workspace/messaging/repositories/workspace-member/workspace-member.module.ts
deleted file mode 100644
index cb7538f62ea4..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/workspace-member/workspace-member.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { WorkspaceMemberService } from 'src/workspace/messaging/repositories/workspace-member/workspace-member.service';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-
-// TODO: Move outside of the messaging module
-@Module({
-  imports: [WorkspaceDataSourceModule],
-  providers: [WorkspaceMemberService],
-  exports: [WorkspaceMemberService],
-})
-export class WorkspaceMemberModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/repositories/workspace-member/workspace-member.service.ts b/packages/twenty-server/src/workspace/messaging/repositories/workspace-member/workspace-member.service.ts
deleted file mode 100644
index 42b670599760..000000000000
--- a/packages/twenty-server/src/workspace/messaging/repositories/workspace-member/workspace-member.service.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { Injectable, NotFoundException } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
-import { ObjectRecord } from 'src/workspace/workspace-sync-metadata/types/object-record';
-
-// TODO: Move outside of the messaging module
-@Injectable()
-export class WorkspaceMemberService {
-  constructor(
-    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
-  ) {}
-
-  public async getByIds(
-    userIds: string[],
-    workspaceId: string,
-  ): Promise<ObjectRecord<WorkspaceMemberObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    const result = await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."workspaceMember" WHERE "userId" = ANY($1)`,
-      [userIds],
-      workspaceId,
-    );
-
-    return result;
-  }
-
-  public async getByIdOrFail(
-    userId: string,
-    workspaceId: string,
-  ): Promise<ObjectRecord<WorkspaceMemberObjectMetadata>> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    const workspaceMembers =
-      await this.workspaceDataSourceService.executeRawQuery(
-        `SELECT * FROM ${dataSourceSchema}."workspaceMember" WHERE "userId" = $1`,
-        [userId],
-        workspaceId,
-      );
-
-    if (!workspaceMembers || workspaceMembers.length === 0) {
-      throw new NotFoundException(
-        `No workspace member found for user ${userId} in workspace ${workspaceId}`,
-      );
-    }
-
-    return workspaceMembers[0];
-  }
-
-  public async getAllByWorkspaceId(
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<ObjectRecord<WorkspaceMemberObjectMetadata>[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    const workspaceMembers =
-      await this.workspaceDataSourceService.executeRawQuery(
-        `SELECT * FROM ${dataSourceSchema}."workspaceMember"`,
-        [],
-        workspaceId,
-        transactionManager,
-      );
-
-    return workspaceMembers;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.module.ts b/packages/twenty-server/src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.module.ts
deleted file mode 100644
index 2baba41f098c..000000000000
--- a/packages/twenty-server/src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.module.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { PersonModule } from 'src/workspace/messaging/repositories/person/person.module';
-import { WorkspaceMemberModule } from 'src/workspace/messaging/repositories/workspace-member/workspace-member.module';
-import { CreateCompaniesAndContactsService } from 'src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.service';
-import { CreateCompanyModule } from 'src/workspace/messaging/services/create-company/create-company.module';
-import { CreateContactModule } from 'src/workspace/messaging/services/create-contact/create-contact.module';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-
-@Module({
-  imports: [
-    WorkspaceDataSourceModule,
-    CreateContactModule,
-    CreateCompanyModule,
-    WorkspaceMemberModule,
-    PersonModule,
-  ],
-  providers: [CreateCompaniesAndContactsService],
-  exports: [CreateCompaniesAndContactsService],
-})
-export class CreateCompaniesAndContactsModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.service.ts b/packages/twenty-server/src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.service.ts
deleted file mode 100644
index 1dbd48f43cd1..000000000000
--- a/packages/twenty-server/src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.service.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-import compact from 'lodash/compact';
-
-import { Participant } from 'src/workspace/messaging/types/gmail-message';
-import { getDomainNameFromHandle } from 'src/workspace/messaging/utils/get-domain-name-from-handle.util';
-import { CreateCompanyService } from 'src/workspace/messaging/services/create-company/create-company.service';
-import { CreateContactService } from 'src/workspace/messaging/services/create-contact/create-contact.service';
-import { PersonService } from 'src/workspace/messaging/repositories/person/person.service';
-import { WorkspaceMemberService } from 'src/workspace/messaging/repositories/workspace-member/workspace-member.service';
-import { getUniqueParticipantsAndHandles } from 'src/workspace/messaging/utils/get-unique-participants-and-handles.util';
-import { filterOutParticipantsFromCompanyOrWorkspace } from 'src/workspace/messaging/utils/filter-out-participants-from-company-or-workspace.util';
-import { isWorkEmail } from 'src/utils/is-work-email';
-
-@Injectable()
-export class CreateCompaniesAndContactsService {
-  constructor(
-    private readonly personService: PersonService,
-    private readonly createContactService: CreateContactService,
-    private readonly createCompaniesService: CreateCompanyService,
-    private readonly workspaceMemberService: WorkspaceMemberService,
-  ) {}
-
-  async createCompaniesAndContacts(
-    selfHandle: string,
-    participants: Participant[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ) {
-    if (participants.length === 0) {
-      return;
-    }
-
-    // TODO: This is a feature that may be implemented in the future
-    const isContactAutoCreationForNonWorkEmailsEnabled = false;
-
-    const workspaceMembers =
-      await this.workspaceMemberService.getAllByWorkspaceId(
-        workspaceId,
-        transactionManager,
-      );
-
-    const participantsFromOtherCompanies =
-      filterOutParticipantsFromCompanyOrWorkspace(
-        participants,
-        selfHandle,
-        workspaceMembers,
-      );
-
-    const { uniqueParticipants, uniqueHandles } =
-      getUniqueParticipantsAndHandles(participantsFromOtherCompanies);
-
-    const alreadyCreatedContacts = await this.personService.getByEmails(
-      uniqueHandles,
-      workspaceId,
-    );
-
-    const alreadyCreatedContactEmails: string[] = alreadyCreatedContacts?.map(
-      ({ email }) => email,
-    );
-
-    const filteredParticipants = uniqueParticipants.filter(
-      (participant) =>
-        !alreadyCreatedContactEmails.includes(participant.handle) &&
-        participant.handle.includes('@') &&
-        (isContactAutoCreationForNonWorkEmailsEnabled ||
-          isWorkEmail(participant.handle)),
-    );
-
-    const filteredParticipantsWithCompanyDomainNames =
-      filteredParticipants?.map((participant) => ({
-        handle: participant.handle,
-        displayName: participant.displayName,
-        companyDomainName: isWorkEmail(participant.handle)
-          ? getDomainNameFromHandle(participant.handle)
-          : undefined,
-      }));
-
-    const domainNamesToCreate = compact(
-      filteredParticipantsWithCompanyDomainNames.map(
-        (participant) => participant.companyDomainName,
-      ),
-    );
-
-    const companiesObject = await this.createCompaniesService.createCompanies(
-      domainNamesToCreate,
-      workspaceId,
-      transactionManager,
-    );
-
-    const contactsToCreate = filteredParticipantsWithCompanyDomainNames.map(
-      (participant) => ({
-        handle: participant.handle,
-        displayName: participant.displayName,
-        companyId:
-          participant.companyDomainName &&
-          companiesObject[participant.companyDomainName],
-      }),
-    );
-
-    await this.createContactService.createContacts(
-      contactsToCreate,
-      workspaceId,
-      transactionManager,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/services/create-company/create-company.module.ts b/packages/twenty-server/src/workspace/messaging/services/create-company/create-company.module.ts
deleted file mode 100644
index b9ce318f7b09..000000000000
--- a/packages/twenty-server/src/workspace/messaging/services/create-company/create-company.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-import { CreateCompanyService } from 'src/workspace/messaging/services/create-company/create-company.service';
-import { CompanyModule } from 'src/workspace/messaging/repositories/company/company.module';
-
-@Module({
-  imports: [WorkspaceDataSourceModule, CompanyModule],
-  providers: [CreateCompanyService],
-  exports: [CreateCompanyService],
-})
-export class CreateCompanyModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/services/create-contact/create-contact.module.ts b/packages/twenty-server/src/workspace/messaging/services/create-contact/create-contact.module.ts
deleted file mode 100644
index 6a20b9fe609f..000000000000
--- a/packages/twenty-server/src/workspace/messaging/services/create-contact/create-contact.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-import { CreateContactService } from 'src/workspace/messaging/services/create-contact/create-contact.service';
-import { PersonModule } from 'src/workspace/messaging/repositories/person/person.module';
-
-@Module({
-  imports: [WorkspaceDataSourceModule, PersonModule],
-  providers: [CreateContactService],
-  exports: [CreateContactService],
-})
-export class CreateContactModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/services/create-contact/create-contact.service.ts b/packages/twenty-server/src/workspace/messaging/services/create-contact/create-contact.service.ts
deleted file mode 100644
index 2e23af46bfd4..000000000000
--- a/packages/twenty-server/src/workspace/messaging/services/create-contact/create-contact.service.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-import { v4 } from 'uuid';
-
-import { PersonService } from 'src/workspace/messaging/repositories/person/person.service';
-import { getFirstNameAndLastNameFromHandleAndDisplayName } from 'src/workspace/messaging/utils/get-first-name-and-last-name-from-handle-and-display-name.util';
-
-type ContactToCreate = {
-  handle: string;
-  displayName: string;
-  companyId?: string;
-};
-
-type FormattedContactToCreate = {
-  id: string;
-  handle: string;
-  firstName: string;
-  lastName: string;
-  companyId?: string;
-};
-
-@Injectable()
-export class CreateContactService {
-  constructor(private readonly personService: PersonService) {}
-
-  public formatContacts(
-    contactsToCreate: ContactToCreate[],
-  ): FormattedContactToCreate[] {
-    return contactsToCreate.map((contact) => {
-      const id = v4();
-
-      const { handle, displayName, companyId } = contact;
-
-      const { firstName, lastName } =
-        getFirstNameAndLastNameFromHandleAndDisplayName(handle, displayName);
-
-      return {
-        id,
-        handle,
-        firstName,
-        lastName,
-        companyId,
-      };
-    });
-  }
-
-  public async createContacts(
-    contactsToCreate: ContactToCreate[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<void> {
-    if (contactsToCreate.length === 0) return;
-
-    const formattedContacts = this.formatContacts(contactsToCreate);
-
-    await this.personService.createPeople(
-      formattedContacts,
-      workspaceId,
-      transactionManager,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/services/fetch-messages-by-batches.service.ts b/packages/twenty-server/src/workspace/messaging/services/fetch-messages-by-batches.service.ts
deleted file mode 100644
index bde65dc2a15d..000000000000
--- a/packages/twenty-server/src/workspace/messaging/services/fetch-messages-by-batches.service.ts
+++ /dev/null
@@ -1,311 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import axios, { AxiosInstance, AxiosResponse } from 'axios';
-import { simpleParser, AddressObject } from 'mailparser';
-import planer from 'planer';
-
-import {
-  GmailMessage,
-  Participant,
-} from 'src/workspace/messaging/types/gmail-message';
-import { MessageQuery } from 'src/workspace/messaging/types/message-or-thread-query';
-import { GmailMessageParsedResponse } from 'src/workspace/messaging/types/gmail-message-parsed-response';
-
-@Injectable()
-export class FetchMessagesByBatchesService {
-  private readonly httpService: AxiosInstance;
-  private readonly logger = new Logger(FetchMessagesByBatchesService.name);
-
-  constructor() {
-    this.httpService = axios.create({
-      baseURL: 'https://www.googleapis.com/batch/gmail/v1',
-    });
-  }
-
-  async fetchAllMessages(
-    queries: MessageQuery[],
-    accessToken: string,
-    jobName?: string,
-    workspaceId?: string,
-    connectedAccountId?: string,
-  ): Promise<{ messages: GmailMessage[]; errors: any[] }> {
-    let startTime = Date.now();
-    const batchResponses = await this.fetchAllByBatches(
-      queries,
-      accessToken,
-      'batch_gmail_messages',
-    );
-    let endTime = Date.now();
-
-    this.logger.log(
-      `${jobName} for workspace ${workspaceId} and account ${connectedAccountId} fetching ${
-        queries.length
-      } messages in ${endTime - startTime}ms`,
-    );
-
-    startTime = Date.now();
-
-    const formattedResponse =
-      await this.formatBatchResponsesAsGmailMessages(batchResponses);
-
-    endTime = Date.now();
-
-    this.logger.log(
-      `${jobName} for workspace ${workspaceId} and account ${connectedAccountId} formatting ${
-        queries.length
-      } messages in ${endTime - startTime}ms`,
-    );
-
-    return formattedResponse;
-  }
-
-  async fetchAllByBatches(
-    queries: MessageQuery[],
-    accessToken: string,
-    boundary: string,
-  ): Promise<AxiosResponse<any, any>[]> {
-    const batchLimit = 50;
-
-    let batchOffset = 0;
-
-    let batchResponses: AxiosResponse<any, any>[] = [];
-
-    while (batchOffset < queries.length) {
-      const batchResponse = await this.fetchBatch(
-        queries,
-        accessToken,
-        batchOffset,
-        batchLimit,
-        boundary,
-      );
-
-      batchResponses = batchResponses.concat(batchResponse);
-
-      batchOffset += batchLimit;
-    }
-
-    return batchResponses;
-  }
-
-  async fetchBatch(
-    queries: MessageQuery[],
-    accessToken: string,
-    batchOffset: number,
-    batchLimit: number,
-    boundary: string,
-  ): Promise<AxiosResponse<any, any>> {
-    const limitedQueries = queries.slice(batchOffset, batchOffset + batchLimit);
-
-    const response = await this.httpService.post(
-      '/',
-      this.createBatchBody(limitedQueries, boundary),
-      {
-        headers: {
-          'Content-Type': 'multipart/mixed; boundary=' + boundary,
-          Authorization: 'Bearer ' + accessToken,
-        },
-      },
-    );
-
-    return response;
-  }
-
-  createBatchBody(queries: MessageQuery[], boundary: string): string {
-    let batchBody: string[] = [];
-
-    queries.forEach(function (call) {
-      const method = 'GET';
-      const uri = call.uri;
-
-      batchBody = batchBody.concat([
-        '--',
-        boundary,
-        '\r\n',
-        'Content-Type: application/http',
-        '\r\n\r\n',
-
-        method,
-        ' ',
-        uri,
-        '\r\n\r\n',
-      ]);
-    });
-
-    return batchBody.concat(['--', boundary, '--']).join('');
-  }
-
-  parseBatch(
-    responseCollection: AxiosResponse<any, any>,
-  ): GmailMessageParsedResponse[] {
-    const responseItems: GmailMessageParsedResponse[] = [];
-
-    const boundary = this.getBatchSeparator(responseCollection);
-
-    const responseLines: string[] = responseCollection.data.split(
-      '--' + boundary,
-    );
-
-    responseLines.forEach(function (response) {
-      const startJson = response.indexOf('{');
-      const endJson = response.lastIndexOf('}');
-
-      if (startJson < 0 || endJson < 0) return;
-
-      const responseJson = response.substring(startJson, endJson + 1);
-
-      const item = JSON.parse(responseJson);
-
-      responseItems.push(item);
-    });
-
-    return responseItems;
-  }
-
-  getBatchSeparator(responseCollection: AxiosResponse<any, any>): string {
-    const headers = responseCollection.headers;
-
-    const contentType: string = headers['content-type'];
-
-    if (!contentType) return '';
-
-    const components = contentType.split('; ');
-
-    const boundary = components.find((item) => item.startsWith('boundary='));
-
-    return boundary?.replace('boundary=', '').trim() || '';
-  }
-
-  async formatBatchResponseAsGmailMessage(
-    responseCollection: AxiosResponse<any, any>,
-  ): Promise<{ messages: GmailMessage[]; errors: any[] }> {
-    const parsedResponses = this.parseBatch(
-      responseCollection,
-    ) as GmailMessageParsedResponse[];
-
-    const errors: any = [];
-
-    const formattedResponse = Promise.all(
-      parsedResponses.map(async (message: GmailMessageParsedResponse) => {
-        if (message.error) {
-          console.log('Error', message.error);
-
-          errors.push(message.error);
-
-          return;
-        }
-
-        const { historyId, id, threadId, internalDate, raw } = message;
-
-        const body = atob(raw?.replace(/-/g, '+').replace(/_/g, '/'));
-
-        try {
-          const parsed = await simpleParser(body, {
-            skipHtmlToText: true,
-            skipImageLinks: true,
-            skipTextToHtml: true,
-            maxHtmlLengthToParse: 0,
-          });
-
-          const { subject, messageId, from, to, cc, bcc, text, attachments } =
-            parsed;
-
-          if (!from) throw new Error('From value is missing');
-
-          const participants = [
-            ...this.formatAddressObjectAsParticipants(from, 'from'),
-            ...this.formatAddressObjectAsParticipants(to, 'to'),
-            ...this.formatAddressObjectAsParticipants(cc, 'cc'),
-            ...this.formatAddressObjectAsParticipants(bcc, 'bcc'),
-          ];
-
-          let textWithoutReplyQuotations = text;
-
-          if (text)
-            try {
-              textWithoutReplyQuotations = planer.extractFrom(
-                text,
-                'text/plain',
-              );
-            } catch (error) {
-              console.log(
-                'Error while trying to remove reply quotations',
-                error,
-              );
-            }
-
-          const messageFromGmail: GmailMessage = {
-            historyId,
-            externalId: id,
-            headerMessageId: messageId || '',
-            subject: subject || '',
-            messageThreadExternalId: threadId,
-            internalDate,
-            fromHandle: from.value[0].address || '',
-            fromDisplayName: from.value[0].name || '',
-            participants,
-            text: textWithoutReplyQuotations || '',
-            attachments,
-          };
-
-          return messageFromGmail;
-        } catch (error) {
-          console.log('Error', error);
-
-          errors.push(error);
-        }
-      }),
-    );
-
-    const filteredMessages = (await formattedResponse).filter(
-      (message) => message,
-    ) as GmailMessage[];
-
-    return { messages: filteredMessages, errors };
-  }
-
-  formatAddressObjectAsArray(
-    addressObject: AddressObject | AddressObject[],
-  ): AddressObject[] {
-    return Array.isArray(addressObject) ? addressObject : [addressObject];
-  }
-
-  formatAddressObjectAsParticipants(
-    addressObject: AddressObject | AddressObject[] | undefined,
-    role: 'from' | 'to' | 'cc' | 'bcc',
-  ): Participant[] {
-    if (!addressObject) return [];
-    const addressObjects = this.formatAddressObjectAsArray(addressObject);
-
-    const participants = addressObjects.map((addressObject) => {
-      const emailAdresses = addressObject.value;
-
-      return emailAdresses.map((emailAddress) => {
-        const { name, address } = emailAddress;
-
-        return {
-          role,
-          handle: address?.toLowerCase() || '',
-          displayName: name || '',
-        };
-      });
-    });
-
-    return participants.flat();
-  }
-
-  async formatBatchResponsesAsGmailMessages(
-    batchResponses: AxiosResponse<any, any>[],
-  ): Promise<{ messages: GmailMessage[]; errors: any[] }> {
-    const messagesAndErrors = await Promise.all(
-      batchResponses.map(async (response) => {
-        return this.formatBatchResponseAsGmailMessage(response);
-      }),
-    );
-
-    const messages = messagesAndErrors.map((item) => item.messages).flat();
-
-    const errors = messagesAndErrors.map((item) => item.errors).flat();
-
-    return { messages, errors };
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/services/gmail-full-sync.service.ts b/packages/twenty-server/src/workspace/messaging/services/gmail-full-sync.service.ts
deleted file mode 100644
index 047be4ec8f3a..000000000000
--- a/packages/twenty-server/src/workspace/messaging/services/gmail-full-sync.service.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-import { Inject, Injectable, Logger } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Repository } from 'typeorm';
-
-import { FetchMessagesByBatchesService } from 'src/workspace/messaging/services/fetch-messages-by-batches.service';
-import { GmailClientProvider } from 'src/workspace/messaging/services/providers/gmail/gmail-client.provider';
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import {
-  GmailFullSyncJobData,
-  GmailFullSyncJob,
-} from 'src/workspace/messaging/jobs/gmail-full-sync.job';
-import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
-import { MessageChannelService } from 'src/workspace/messaging/repositories/message-channel/message-channel.service';
-import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-association.service';
-import { createQueriesFromMessageIds } from 'src/workspace/messaging/utils/create-queries-from-message-ids.util';
-import { gmailSearchFilterExcludeEmails } from 'src/workspace/messaging/utils/gmail-search-filter';
-import { BlocklistService } from 'src/workspace/messaging/repositories/blocklist/blocklist.service';
-import { SaveMessagesAndCreateContactsService } from 'src/workspace/messaging/services/save-messages-and-create-contacts.service';
-import {
-  FeatureFlagEntity,
-  FeatureFlagKeys,
-} from 'src/core/feature-flag/feature-flag.entity';
-
-@Injectable()
-export class GmailFullSyncService {
-  private readonly logger = new Logger(GmailFullSyncService.name);
-
-  constructor(
-    private readonly gmailClientProvider: GmailClientProvider,
-    private readonly fetchMessagesByBatchesService: FetchMessagesByBatchesService,
-    @Inject(MessageQueue.messagingQueue)
-    private readonly messageQueueService: MessageQueueService,
-    private readonly connectedAccountService: ConnectedAccountService,
-    private readonly messageChannelService: MessageChannelService,
-    private readonly messageChannelMessageAssociationService: MessageChannelMessageAssociationService,
-    private readonly blocklistService: BlocklistService,
-    private readonly saveMessagesAndCreateContactsService: SaveMessagesAndCreateContactsService,
-    @InjectRepository(FeatureFlagEntity, 'core')
-    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
-  ) {}
-
-  public async fetchConnectedAccountThreads(
-    workspaceId: string,
-    connectedAccountId: string,
-    nextPageToken?: string,
-  ): Promise<void> {
-    const connectedAccount = await this.connectedAccountService.getByIdOrFail(
-      connectedAccountId,
-      workspaceId,
-    );
-
-    const accessToken = connectedAccount.accessToken;
-    const refreshToken = connectedAccount.refreshToken;
-    const workspaceMemberId = connectedAccount.accountOwnerId;
-
-    if (!refreshToken) {
-      throw new Error(
-        `No refresh token found for connected account ${connectedAccountId} in workspace ${workspaceId} during full-sync`,
-      );
-    }
-
-    const gmailMessageChannel =
-      await this.messageChannelService.getFirstByConnectedAccountIdOrFail(
-        connectedAccountId,
-        workspaceId,
-      );
-
-    const gmailMessageChannelId = gmailMessageChannel.id;
-
-    const gmailClient =
-      await this.gmailClientProvider.getGmailClient(refreshToken);
-
-    const isBlocklistEnabledFeatureFlag =
-      await this.featureFlagRepository.findOneBy({
-        workspaceId,
-        key: FeatureFlagKeys.IsBlocklistEnabled,
-        value: true,
-      });
-
-    const isBlocklistEnabled =
-      isBlocklistEnabledFeatureFlag && isBlocklistEnabledFeatureFlag.value;
-
-    const blocklist = isBlocklistEnabled
-      ? await this.blocklistService.getByWorkspaceMemberId(
-          workspaceMemberId,
-          workspaceId,
-        )
-      : [];
-
-    const blocklistedEmails = blocklist.map((blocklist) => blocklist.handle);
-    let startTime = Date.now();
-
-    const messages = await gmailClient.users.messages.list({
-      userId: 'me',
-      maxResults: 500,
-      pageToken: nextPageToken,
-      q: gmailSearchFilterExcludeEmails(blocklistedEmails),
-    });
-
-    let endTime = Date.now();
-
-    this.logger.log(
-      `gmail full-sync for workspace ${workspaceId} and account ${connectedAccountId} getting messages list in ${
-        endTime - startTime
-      }ms.`,
-    );
-
-    const messagesData = messages.data.messages;
-
-    const messageExternalIds = messagesData
-      ? messagesData.map((message) => message.id || '')
-      : [];
-
-    if (!messageExternalIds || messageExternalIds?.length === 0) {
-      this.logger.log(
-        `gmail full-sync for workspace ${workspaceId} and account ${connectedAccountId} done with nothing to import.`,
-      );
-
-      return;
-    }
-
-    startTime = Date.now();
-
-    const existingMessageChannelMessageAssociations =
-      await this.messageChannelMessageAssociationService.getByMessageExternalIdsAndMessageChannelId(
-        messageExternalIds,
-        gmailMessageChannelId,
-        workspaceId,
-      );
-
-    endTime = Date.now();
-
-    this.logger.log(
-      `gmail full-sync for workspace ${workspaceId} and account ${connectedAccountId}: getting existing message channel message associations in ${
-        endTime - startTime
-      }ms.`,
-    );
-
-    const existingMessageChannelMessageAssociationsExternalIds =
-      existingMessageChannelMessageAssociations.map(
-        (messageChannelMessageAssociation) =>
-          messageChannelMessageAssociation.messageExternalId,
-      );
-
-    const messagesToFetch = messageExternalIds.filter(
-      (messageExternalId) =>
-        !existingMessageChannelMessageAssociationsExternalIds.includes(
-          messageExternalId,
-        ),
-    );
-
-    const messageQueries = createQueriesFromMessageIds(messagesToFetch);
-
-    startTime = Date.now();
-
-    const { messages: messagesToSave, errors } =
-      await this.fetchMessagesByBatchesService.fetchAllMessages(
-        messageQueries,
-        accessToken,
-        'gmail full-sync',
-        workspaceId,
-        connectedAccountId,
-      );
-
-    endTime = Date.now();
-
-    this.logger.log(
-      `gmail full-sync for workspace ${workspaceId} and account ${connectedAccountId}: fetching all messages in ${
-        endTime - startTime
-      }ms.`,
-    );
-
-    if (messagesToSave.length > 0) {
-      this.saveMessagesAndCreateContactsService.saveMessagesAndCreateContacts(
-        messagesToSave,
-        connectedAccount,
-        workspaceId,
-        gmailMessageChannelId,
-        'gmail full-sync',
-      );
-    } else {
-      this.logger.log(
-        `gmail full-sync for workspace ${workspaceId} and account ${connectedAccountId} done with nothing to import.`,
-      );
-    }
-
-    if (errors.length) {
-      throw new Error(
-        `Error fetching messages for ${connectedAccountId} in workspace ${workspaceId} during full-sync`,
-      );
-    }
-    const lastModifiedMessageId = messagesToFetch[0];
-
-    const historyId = messagesToSave.find(
-      (message) => message.externalId === lastModifiedMessageId,
-    )?.historyId;
-
-    if (!historyId) {
-      throw new Error(
-        `No historyId found for ${connectedAccountId} in workspace ${workspaceId} during full-sync`,
-      );
-    }
-
-    startTime = Date.now();
-
-    await this.connectedAccountService.updateLastSyncHistoryIdIfHigher(
-      historyId,
-      connectedAccount.id,
-      workspaceId,
-    );
-
-    endTime = Date.now();
-
-    this.logger.log(
-      `gmail full-sync for workspace ${workspaceId} and account ${connectedAccountId}: updating last sync history id in ${
-        endTime - startTime
-      }ms.`,
-    );
-
-    this.logger.log(
-      `gmail full-sync for workspace ${workspaceId} and account ${connectedAccountId} ${
-        nextPageToken ? `and ${nextPageToken} pageToken` : ''
-      }done.`,
-    );
-
-    if (messages.data.nextPageToken) {
-      await this.messageQueueService.add<GmailFullSyncJobData>(
-        GmailFullSyncJob.name,
-        {
-          workspaceId,
-          connectedAccountId,
-          nextPageToken: messages.data.nextPageToken,
-        },
-        {
-          retryLimit: 2,
-        },
-      );
-    }
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/services/gmail-partial-sync.service.ts b/packages/twenty-server/src/workspace/messaging/services/gmail-partial-sync.service.ts
deleted file mode 100644
index fae82f7afbdd..000000000000
--- a/packages/twenty-server/src/workspace/messaging/services/gmail-partial-sync.service.ts
+++ /dev/null
@@ -1,395 +0,0 @@
-import { Inject, Injectable, Logger } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { gmail_v1 } from 'googleapis';
-import { Repository } from 'typeorm';
-
-import { FetchMessagesByBatchesService } from 'src/workspace/messaging/services/fetch-messages-by-batches.service';
-import { GmailClientProvider } from 'src/workspace/messaging/services/providers/gmail/gmail-client.provider';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import {
-  GmailFullSyncJob,
-  GmailFullSyncJobData,
-} from 'src/workspace/messaging/jobs/gmail-full-sync.job';
-import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
-import { MessageChannelService } from 'src/workspace/messaging/repositories/message-channel/message-channel.service';
-import { MessageService } from 'src/workspace/messaging/repositories/message/message.service';
-import { createQueriesFromMessageIds } from 'src/workspace/messaging/utils/create-queries-from-message-ids.util';
-import { GmailMessage } from 'src/workspace/messaging/types/gmail-message';
-import { isPersonEmail } from 'src/workspace/messaging/utils/is-person-email.util';
-import { BlocklistService } from 'src/workspace/messaging/repositories/blocklist/blocklist.service';
-import { SaveMessagesAndCreateContactsService } from 'src/workspace/messaging/services/save-messages-and-create-contacts.service';
-import {
-  FeatureFlagEntity,
-  FeatureFlagKeys,
-} from 'src/core/feature-flag/feature-flag.entity';
-
-@Injectable()
-export class GmailPartialSyncService {
-  private readonly logger = new Logger(GmailPartialSyncService.name);
-
-  constructor(
-    private readonly gmailClientProvider: GmailClientProvider,
-    private readonly fetchMessagesByBatchesService: FetchMessagesByBatchesService,
-    @Inject(MessageQueue.messagingQueue)
-    private readonly messageQueueService: MessageQueueService,
-    private readonly connectedAccountService: ConnectedAccountService,
-    private readonly messageChannelService: MessageChannelService,
-    private readonly messageService: MessageService,
-    private readonly blocklistService: BlocklistService,
-    private readonly saveMessagesAndCreateContactsService: SaveMessagesAndCreateContactsService,
-    @InjectRepository(FeatureFlagEntity, 'core')
-    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
-  ) {}
-
-  public async fetchConnectedAccountThreads(
-    workspaceId: string,
-    connectedAccountId: string,
-    maxResults = 500,
-  ): Promise<void> {
-    const connectedAccount = await this.connectedAccountService.getByIdOrFail(
-      connectedAccountId,
-      workspaceId,
-    );
-
-    const lastSyncHistoryId = connectedAccount.lastSyncHistoryId;
-
-    if (!lastSyncHistoryId) {
-      this.logger.log(
-        `gmail partial-sync for workspace ${workspaceId} and account ${connectedAccountId}: no lastSyncHistoryId, falling back to full sync.`,
-      );
-
-      await this.fallbackToFullSync(workspaceId, connectedAccountId);
-
-      return;
-    }
-
-    const accessToken = connectedAccount.accessToken;
-    const refreshToken = connectedAccount.refreshToken;
-
-    if (!refreshToken) {
-      throw new Error(
-        `No refresh token found for connected account ${connectedAccountId} in workspace ${workspaceId} during partial-sync`,
-      );
-    }
-
-    let startTime = Date.now();
-
-    const { history, historyId, error } = await this.getHistoryFromGmail(
-      refreshToken,
-      lastSyncHistoryId,
-      maxResults,
-    );
-
-    let endTime = Date.now();
-
-    this.logger.log(
-      `gmail partial-sync for workspace ${workspaceId} and account ${connectedAccountId} getting history in ${
-        endTime - startTime
-      }ms.`,
-    );
-
-    if (error && error.code === 404) {
-      this.logger.log(
-        `gmail partial-sync for workspace ${workspaceId} and account ${connectedAccountId}: invalid lastSyncHistoryId, falling back to full sync.`,
-      );
-
-      await this.connectedAccountService.deleteHistoryId(
-        connectedAccountId,
-        workspaceId,
-      );
-
-      await this.fallbackToFullSync(workspaceId, connectedAccountId);
-
-      return;
-    }
-
-    if (error && error.code === 429) {
-      this.logger.log(
-        `gmail partial-sync for workspace ${workspaceId} and account ${connectedAccountId}: Error 429: ${error.message}, partial sync will be retried later.`,
-      );
-
-      return;
-    }
-
-    if (error) {
-      throw new Error(
-        `Error getting history for ${connectedAccountId} in workspace ${workspaceId} during partial-sync:
-        ${JSON.stringify(error)}`,
-      );
-    }
-
-    if (!historyId) {
-      throw new Error(
-        `No historyId found for ${connectedAccountId} in workspace ${workspaceId} during partial-sync`,
-      );
-    }
-
-    if (historyId === lastSyncHistoryId || !history?.length) {
-      this.logger.log(
-        `gmail partial-sync for workspace ${workspaceId} and account ${connectedAccountId} done with nothing to update.`,
-      );
-
-      return;
-    }
-
-    const gmailMessageChannel =
-      await this.messageChannelService.getFirstByConnectedAccountIdOrFail(
-        connectedAccountId,
-        workspaceId,
-      );
-
-    const gmailMessageChannelId = gmailMessageChannel.id;
-
-    const { messagesAdded, messagesDeleted } =
-      await this.getMessageIdsFromHistory(history);
-
-    const messageQueries = createQueriesFromMessageIds(messagesAdded);
-
-    const { messages, errors } =
-      await this.fetchMessagesByBatchesService.fetchAllMessages(
-        messageQueries,
-        accessToken,
-        'gmail partial-sync',
-        workspaceId,
-        connectedAccountId,
-      );
-
-    const isBlocklistEnabledFeatureFlag =
-      await this.featureFlagRepository.findOneBy({
-        workspaceId,
-        key: FeatureFlagKeys.IsBlocklistEnabled,
-        value: true,
-      });
-
-    const isBlocklistEnabled =
-      isBlocklistEnabledFeatureFlag && isBlocklistEnabledFeatureFlag.value;
-
-    const blocklist = isBlocklistEnabled
-      ? await this.blocklistService.getByWorkspaceMemberId(
-          connectedAccount.accountOwnerId,
-          workspaceId,
-        )
-      : [];
-
-    const blocklistedEmails = blocklist.map((blocklist) => blocklist.handle);
-
-    const messagesToSave = messages.filter(
-      (message) =>
-        !this.shouldSkipImport(
-          connectedAccount.handle,
-          message,
-          blocklistedEmails,
-        ),
-    );
-
-    if (messagesToSave.length !== 0) {
-      await this.saveMessagesAndCreateContactsService.saveMessagesAndCreateContacts(
-        messagesToSave,
-        connectedAccount,
-        workspaceId,
-        gmailMessageChannelId,
-        'gmail partial-sync',
-      );
-    }
-
-    if (messagesDeleted.length !== 0) {
-      startTime = Date.now();
-
-      await this.messageService.deleteMessages(
-        messagesDeleted,
-        gmailMessageChannelId,
-        workspaceId,
-      );
-
-      endTime = Date.now();
-
-      this.logger.log(
-        `gmail partial-sync for workspace ${workspaceId} and account ${connectedAccountId}: deleting messages in ${
-          endTime - startTime
-        }ms.`,
-      );
-    }
-
-    if (errors.length) {
-      throw new Error(
-        `Error fetching messages for ${connectedAccountId} in workspace ${workspaceId} during partial-sync`,
-      );
-    }
-    startTime = Date.now();
-
-    await this.connectedAccountService.updateLastSyncHistoryId(
-      historyId,
-      connectedAccount.id,
-      workspaceId,
-    );
-
-    endTime = Date.now();
-
-    this.logger.log(
-      `gmail partial-sync for workspace ${workspaceId} and account ${connectedAccountId} updating lastSyncHistoryId in ${
-        endTime - startTime
-      }ms.`,
-    );
-
-    this.logger.log(
-      `gmail partial-sync for workspace ${workspaceId} and account ${connectedAccountId} done.`,
-    );
-  }
-
-  private async getMessageIdsFromHistory(
-    history: gmail_v1.Schema$History[],
-  ): Promise<{
-    messagesAdded: string[];
-    messagesDeleted: string[];
-  }> {
-    const { messagesAdded, messagesDeleted } = history.reduce(
-      (
-        acc: {
-          messagesAdded: string[];
-          messagesDeleted: string[];
-        },
-        history,
-      ) => {
-        const messagesAdded = history.messagesAdded?.map(
-          (messageAdded) => messageAdded.message?.id || '',
-        );
-
-        const messagesDeleted = history.messagesDeleted?.map(
-          (messageDeleted) => messageDeleted.message?.id || '',
-        );
-
-        if (messagesAdded) acc.messagesAdded.push(...messagesAdded);
-        if (messagesDeleted) acc.messagesDeleted.push(...messagesDeleted);
-
-        return acc;
-      },
-      { messagesAdded: [], messagesDeleted: [] },
-    );
-
-    const uniqueMessagesAdded = messagesAdded.filter(
-      (messageId) => !messagesDeleted.includes(messageId),
-    );
-
-    const uniqueMessagesDeleted = messagesDeleted.filter(
-      (messageId) => !messagesAdded.includes(messageId),
-    );
-
-    return {
-      messagesAdded: uniqueMessagesAdded,
-      messagesDeleted: uniqueMessagesDeleted,
-    };
-  }
-
-  private async getHistoryFromGmail(
-    refreshToken: string,
-    lastSyncHistoryId: string,
-    maxResults: number,
-  ): Promise<{
-    history: gmail_v1.Schema$History[];
-    historyId?: string | null;
-    error?: {
-      code: number;
-      errors: {
-        domain: string;
-        reason: string;
-        message: string;
-        locationType?: string;
-        location?: string;
-      }[];
-      message: string;
-    };
-  }> {
-    const gmailClient =
-      await this.gmailClientProvider.getGmailClient(refreshToken);
-
-    const fullHistory: gmail_v1.Schema$History[] = [];
-
-    try {
-      const history = await gmailClient.users.history.list({
-        userId: 'me',
-        startHistoryId: lastSyncHistoryId,
-        historyTypes: ['messageAdded', 'messageDeleted'],
-        maxResults,
-      });
-
-      let nextPageToken = history?.data?.nextPageToken;
-
-      const historyId = history?.data?.historyId;
-
-      if (history?.data?.history) {
-        fullHistory.push(...history.data.history);
-      }
-
-      while (nextPageToken) {
-        const nextHistory = await gmailClient.users.history.list({
-          userId: 'me',
-          startHistoryId: lastSyncHistoryId,
-          historyTypes: ['messageAdded', 'messageDeleted'],
-          maxResults,
-          pageToken: nextPageToken,
-        });
-
-        nextPageToken = nextHistory?.data?.nextPageToken;
-
-        if (nextHistory?.data?.history) {
-          fullHistory.push(...nextHistory.data.history);
-        }
-      }
-
-      return { history: fullHistory, historyId };
-    } catch (error) {
-      const errorData = error?.response?.data?.error;
-
-      if (errorData) {
-        return { history: [], error: errorData };
-      }
-
-      throw error;
-    }
-  }
-
-  private async fallbackToFullSync(
-    workspaceId: string,
-    connectedAccountId: string,
-  ) {
-    await this.messageQueueService.add<GmailFullSyncJobData>(
-      GmailFullSyncJob.name,
-      { workspaceId, connectedAccountId },
-      {
-        retryLimit: 2,
-      },
-    );
-  }
-
-  private isHandleBlocked = (
-    selfHandle: string,
-    message: GmailMessage,
-    blocklistedEmails: string[],
-  ): boolean => {
-    // If the message is received, check if the sender is in the blocklist
-    // If the message is sent, check if any of the recipients with role 'to' is in the blocklist
-
-    if (message.fromHandle === selfHandle) {
-      return message.participants.some(
-        (participant) =>
-          participant.role === 'to' &&
-          blocklistedEmails.includes(participant.handle),
-      );
-    }
-
-    return blocklistedEmails.includes(message.fromHandle);
-  };
-
-  private shouldSkipImport(
-    selfHandle: string,
-    message: GmailMessage,
-    blocklistedEmails: string[],
-  ): boolean {
-    return (
-      !isPersonEmail(message.fromHandle) ||
-      this.isHandleBlocked(selfHandle, message, blocklistedEmails)
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/services/gmail-refresh-access-token.service.ts b/packages/twenty-server/src/workspace/messaging/services/gmail-refresh-access-token.service.ts
deleted file mode 100644
index 7a01b663bfeb..000000000000
--- a/packages/twenty-server/src/workspace/messaging/services/gmail-refresh-access-token.service.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import axios from 'axios';
-
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
-
-@Injectable()
-export class GmailRefreshAccessTokenService {
-  constructor(
-    private readonly environmentService: EnvironmentService,
-    private readonly connectedAccountService: ConnectedAccountService,
-  ) {}
-
-  async refreshAndSaveAccessToken(
-    workspaceId: string,
-    connectedAccountId: string,
-  ): Promise<void> {
-    const connectedAccount = await this.connectedAccountService.getByIdOrFail(
-      connectedAccountId,
-      workspaceId,
-    );
-
-    const refreshToken = connectedAccount.refreshToken;
-
-    if (!refreshToken) {
-      throw new Error(
-        `No refresh token found for connected account ${connectedAccountId} in workspace ${workspaceId}`,
-      );
-    }
-
-    const accessToken = await this.refreshAccessToken(refreshToken);
-
-    await this.connectedAccountService.updateAccessToken(
-      accessToken,
-      connectedAccountId,
-      workspaceId,
-    );
-  }
-
-  async refreshAccessToken(refreshToken: string): Promise<string> {
-    const response = await axios.post(
-      'https://oauth2.googleapis.com/token',
-      {
-        client_id: this.environmentService.getAuthGoogleClientId(),
-        client_secret: this.environmentService.getAuthGoogleClientSecret(),
-        refresh_token: refreshToken,
-        grant_type: 'refresh_token',
-      },
-      {
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      },
-    );
-
-    return response.data.access_token;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/services/providers/messaging-providers.module.ts b/packages/twenty-server/src/workspace/messaging/services/providers/messaging-providers.module.ts
deleted file mode 100644
index eb2cc40a1a4d..000000000000
--- a/packages/twenty-server/src/workspace/messaging/services/providers/messaging-providers.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { EnvironmentModule } from 'src/integrations/environment/environment.module';
-import { GmailClientProvider } from 'src/workspace/messaging/services/providers/gmail/gmail-client.provider';
-
-@Module({
-  imports: [EnvironmentModule],
-  providers: [GmailClientProvider],
-  exports: [GmailClientProvider],
-})
-export class MessagingProvidersModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/services/save-messages-and-create-contacts.service.ts b/packages/twenty-server/src/workspace/messaging/services/save-messages-and-create-contacts.service.ts
deleted file mode 100644
index 380b43136ad6..000000000000
--- a/packages/twenty-server/src/workspace/messaging/services/save-messages-and-create-contacts.service.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-
-import { MessageChannelService } from 'src/workspace/messaging/repositories/message-channel/message-channel.service';
-import { MessageParticipantService } from 'src/workspace/messaging/repositories/message-participant/message-participant.service';
-import { MessageService } from 'src/workspace/messaging/repositories/message/message.service';
-import { CreateCompaniesAndContactsService } from 'src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.service';
-import {
-  GmailMessage,
-  ParticipantWithMessageId,
-} from 'src/workspace/messaging/types/gmail-message';
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { ConnectedAccountObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/connected-account.object-metadata';
-import { ObjectRecord } from 'src/workspace/workspace-sync-metadata/types/object-record';
-
-@Injectable()
-export class SaveMessagesAndCreateContactsService {
-  private readonly logger = new Logger(
-    SaveMessagesAndCreateContactsService.name,
-  );
-
-  constructor(
-    private readonly messageService: MessageService,
-    private readonly messageChannelService: MessageChannelService,
-    private readonly createCompaniesAndContactsService: CreateCompaniesAndContactsService,
-    private readonly messageParticipantService: MessageParticipantService,
-    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
-  ) {}
-
-  async saveMessagesAndCreateContacts(
-    messagesToSave: GmailMessage[],
-    connectedAccount: ObjectRecord<ConnectedAccountObjectMetadata>,
-    workspaceId: string,
-    gmailMessageChannelId: string,
-    jobName?: string,
-  ) {
-    const { dataSource: workspaceDataSource, dataSourceMetadata } =
-      await this.workspaceDataSourceService.connectedToWorkspaceDataSourceAndReturnMetadata(
-        workspaceId,
-      );
-
-    let startTime = Date.now();
-
-    const messageExternalIdsAndIdsMap = await this.messageService.saveMessages(
-      messagesToSave,
-      dataSourceMetadata,
-      workspaceDataSource,
-      connectedAccount,
-      gmailMessageChannelId,
-      workspaceId,
-    );
-
-    let endTime = Date.now();
-
-    this.logger.log(
-      `${jobName} saving messages for workspace ${workspaceId} and account ${
-        connectedAccount.id
-      } in ${endTime - startTime}ms`,
-    );
-
-    const isContactAutoCreationEnabled =
-      await this.messageChannelService.getIsContactAutoCreationEnabledByConnectedAccountIdOrFail(
-        connectedAccount.id,
-        workspaceId,
-      );
-
-    const participantsWithMessageId: ParticipantWithMessageId[] =
-      messagesToSave.flatMap((message) => {
-        const messageId = messageExternalIdsAndIdsMap.get(message.externalId);
-
-        return messageId
-          ? message.participants.map((participant) => ({
-              ...participant,
-              messageId,
-            }))
-          : [];
-      });
-
-    const contactsToCreate = messagesToSave
-      .filter((message) => connectedAccount.handle === message.fromHandle)
-      .flatMap((message) => message.participants);
-
-    if (isContactAutoCreationEnabled) {
-      startTime = Date.now();
-
-      await workspaceDataSource?.transaction(
-        async (transactionManager: EntityManager) => {
-          await this.createCompaniesAndContactsService.createCompaniesAndContacts(
-            connectedAccount.handle,
-            contactsToCreate,
-            workspaceId,
-            transactionManager,
-          );
-        },
-      );
-
-      const handles = participantsWithMessageId.map(
-        (participant) => participant.handle,
-      );
-
-      const messageParticipantsWithoutPersonIdAndWorkspaceMemberId =
-        await this.messageParticipantService.getByHandlesWithoutPersonIdAndWorkspaceMemberId(
-          handles,
-          workspaceId,
-        );
-
-      await this.messageParticipantService.updateMessageParticipantsAfterPeopleCreation(
-        messageParticipantsWithoutPersonIdAndWorkspaceMemberId,
-        workspaceId,
-      );
-
-      endTime = Date.now();
-
-      this.logger.log(
-        `${jobName} creating companies and contacts for workspace ${workspaceId} and account ${
-          connectedAccount.id
-        } in ${endTime - startTime}ms`,
-      );
-    }
-
-    startTime = Date.now();
-
-    await this.tryToSaveMessageParticipantsOrDeleteMessagesIfError(
-      participantsWithMessageId,
-      gmailMessageChannelId,
-      workspaceId,
-      connectedAccount,
-      jobName,
-    );
-
-    endTime = Date.now();
-
-    this.logger.log(
-      `${jobName} saving message participants for workspace ${workspaceId} and account in ${
-        connectedAccount.id
-      } ${endTime - startTime}ms`,
-    );
-  }
-
-  private async tryToSaveMessageParticipantsOrDeleteMessagesIfError(
-    participantsWithMessageId: ParticipantWithMessageId[],
-    gmailMessageChannelId: string,
-    workspaceId: string,
-    connectedAccount: ObjectRecord<ConnectedAccountObjectMetadata>,
-    jobName?: string,
-  ) {
-    try {
-      await this.messageParticipantService.saveMessageParticipants(
-        participantsWithMessageId,
-        workspaceId,
-      );
-    } catch (error) {
-      this.logger.error(
-        `${jobName} error saving message participants for workspace ${workspaceId} and account ${connectedAccount.id}`,
-        error,
-      );
-
-      const messagesToDelete = participantsWithMessageId.map(
-        (participant) => participant.messageId,
-      );
-
-      await this.messageService.deleteMessages(
-        messagesToDelete,
-        gmailMessageChannelId,
-        workspaceId,
-      );
-    }
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/services/thread-cleaner/thread-cleaner.module.ts b/packages/twenty-server/src/workspace/messaging/services/thread-cleaner/thread-cleaner.module.ts
deleted file mode 100644
index 92b71c6e87a3..000000000000
--- a/packages/twenty-server/src/workspace/messaging/services/thread-cleaner/thread-cleaner.module.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
-import { MessageThreadModule } from 'src/workspace/messaging/repositories/message-thread/message-thread.module';
-import { MessageModule } from 'src/workspace/messaging/repositories/message/message.module';
-import { ThreadCleanerService } from 'src/workspace/messaging/services/thread-cleaner/thread-cleaner.service';
-
-@Module({
-  imports: [
-    DataSourceModule,
-    TypeORMModule,
-    MessageThreadModule,
-    MessageModule,
-  ],
-  providers: [ThreadCleanerService],
-  exports: [ThreadCleanerService],
-})
-export class ThreadCleanerModule {}
diff --git a/packages/twenty-server/src/workspace/messaging/services/thread-cleaner/thread-cleaner.service.ts b/packages/twenty-server/src/workspace/messaging/services/thread-cleaner/thread-cleaner.service.ts
deleted file mode 100644
index 2d07c8cb7497..000000000000
--- a/packages/twenty-server/src/workspace/messaging/services/thread-cleaner/thread-cleaner.service.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
-import { MessageThreadService } from 'src/workspace/messaging/repositories/message-thread/message-thread.service';
-import { MessageService } from 'src/workspace/messaging/repositories/message/message.service';
-
-@Injectable()
-export class ThreadCleanerService {
-  constructor(
-    private readonly dataSourceService: DataSourceService,
-    private readonly typeORMService: TypeORMService,
-    private readonly messageService: MessageService,
-    private readonly messageThreadService: MessageThreadService,
-  ) {}
-
-  public async cleanWorkspaceThreads(workspaceId: string) {
-    const dataSourceMetadata =
-      await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
-        workspaceId,
-      );
-
-    const workspaceDataSource =
-      await this.typeORMService.connectToDataSource(dataSourceMetadata);
-
-    await workspaceDataSource?.transaction(async (transactionManager) => {
-      const messagesToDelete =
-        await this.messageService.getNonAssociatedMessages(
-          workspaceId,
-          transactionManager,
-        );
-
-      const messageIdsToDelete = messagesToDelete.map(({ id }) => id);
-
-      if (messageIdsToDelete.length > 0) {
-        await this.messageService.deleteByIds(
-          messageIdsToDelete,
-          workspaceId,
-          transactionManager,
-        );
-      }
-
-      const messageThreadsToDelete =
-        await this.messageThreadService.getOrphanThreads(
-          workspaceId,
-          transactionManager,
-        );
-
-      const messageThreadToDeleteIds = messageThreadsToDelete.map(
-        ({ id }) => id,
-      );
-
-      if (messageThreadToDeleteIds.length > 0) {
-        await this.messageThreadService.deleteByIds(
-          messageThreadToDeleteIds,
-          workspaceId,
-          transactionManager,
-        );
-      }
-    });
-  }
-}
diff --git a/packages/twenty-server/src/workspace/messaging/utils/create-queries-from-message-ids.util.ts b/packages/twenty-server/src/workspace/messaging/utils/create-queries-from-message-ids.util.ts
deleted file mode 100644
index 5263601c57c6..000000000000
--- a/packages/twenty-server/src/workspace/messaging/utils/create-queries-from-message-ids.util.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { MessageQuery } from 'src/workspace/messaging/types/message-or-thread-query';
-
-export const createQueriesFromMessageIds = (
-  messageExternalIds: string[],
-): MessageQuery[] => {
-  return messageExternalIds.map((messageId) => ({
-    uri: '/gmail/v1/users/me/messages/' + messageId + '?format=RAW',
-  }));
-};
diff --git a/packages/twenty-server/src/workspace/messaging/utils/filter-out-participants-from-company-or-workspace.util.ts b/packages/twenty-server/src/workspace/messaging/utils/filter-out-participants-from-company-or-workspace.util.ts
deleted file mode 100644
index d9e272fd9ffb..000000000000
--- a/packages/twenty-server/src/workspace/messaging/utils/filter-out-participants-from-company-or-workspace.util.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Participant } from 'src/workspace/messaging/types/gmail-message';
-import { getDomainNameFromHandle } from 'src/workspace/messaging/utils/get-domain-name-from-handle.util';
-import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
-import { ObjectRecord } from 'src/workspace/workspace-sync-metadata/types/object-record';
-
-export function filterOutParticipantsFromCompanyOrWorkspace(
-  participants: Participant[],
-  selfHandle: string,
-  workspaceMembers: ObjectRecord<WorkspaceMemberObjectMetadata>[],
-): Participant[] {
-  const selfDomainName = getDomainNameFromHandle(selfHandle);
-
-  const workspaceMembersMap = workspaceMembers.reduce(
-    (map, workspaceMember) => {
-      map[workspaceMember.userEmail] = true;
-
-      return map;
-    },
-    new Map<string, boolean>(),
-  );
-
-  return participants.filter(
-    (participant) =>
-      getDomainNameFromHandle(participant.handle) !== selfDomainName &&
-      !workspaceMembersMap[participant.handle],
-  );
-}
diff --git a/packages/twenty-server/src/workspace/messaging/utils/get-company-name-from-domain-name.util.ts b/packages/twenty-server/src/workspace/messaging/utils/get-company-name-from-domain-name.util.ts
deleted file mode 100644
index 8e1d435a1c12..000000000000
--- a/packages/twenty-server/src/workspace/messaging/utils/get-company-name-from-domain-name.util.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { capitalize } from 'src/utils/capitalize';
-
-export const getCompanyNameFromDomainName = (domainName: string): string => {
-  return capitalize(domainName.split('.').slice(-2, -1)[0]);
-};
diff --git a/packages/twenty-server/src/workspace/messaging/utils/get-domain-name-from-handle.util.ts b/packages/twenty-server/src/workspace/messaging/utils/get-domain-name-from-handle.util.ts
deleted file mode 100644
index 75bc941d7d51..000000000000
--- a/packages/twenty-server/src/workspace/messaging/utils/get-domain-name-from-handle.util.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export function getDomainNameFromHandle(handle: string): string {
-  return handle.split('@')?.[1].split('.').slice(-2).join('.').toLowerCase();
-}
diff --git a/packages/twenty-server/src/workspace/messaging/utils/get-unique-participants-and-handles.util.ts b/packages/twenty-server/src/workspace/messaging/utils/get-unique-participants-and-handles.util.ts
deleted file mode 100644
index 9e01ac024239..000000000000
--- a/packages/twenty-server/src/workspace/messaging/utils/get-unique-participants-and-handles.util.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { uniq, uniqBy } from 'lodash';
-
-import { Participant } from 'src/workspace/messaging/types/gmail-message';
-export function getUniqueParticipantsAndHandles(participants: Participant[]): {
-  uniqueParticipants: Participant[];
-  uniqueHandles: string[];
-} {
-  if (participants.length === 0) {
-    return { uniqueParticipants: [], uniqueHandles: [] };
-  }
-
-  const uniqueHandles = uniq(
-    participants.map((participant) => participant.handle),
-  );
-
-  const uniqueParticipants = uniqBy(participants, 'handle');
-
-  return { uniqueParticipants, uniqueHandles };
-}
diff --git a/packages/twenty-server/src/workspace/utils/compute-custom-name.util.ts b/packages/twenty-server/src/workspace/utils/compute-custom-name.util.ts
deleted file mode 100644
index 3e6c10d96e34..000000000000
--- a/packages/twenty-server/src/workspace/utils/compute-custom-name.util.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const customNamePrefix = '_';
-
-export const computeCustomName = (name: string, isCustom: boolean) => {
-  return isCustom ? `${customNamePrefix}${name}` : name;
-};
diff --git a/packages/twenty-server/src/workspace/utils/compute-field-target-column.util.ts b/packages/twenty-server/src/workspace/utils/compute-field-target-column.util.ts
deleted file mode 100644
index aad29d0ec9fc..000000000000
--- a/packages/twenty-server/src/workspace/utils/compute-field-target-column.util.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-
-import { FieldMetadataEntity } from 'src/metadata/field-metadata/field-metadata.entity';
-import { isCompositeFieldMetadataType } from 'src/metadata/field-metadata/utils/is-composite-field-metadata-type.util';
-import { BasicFieldMetadataType } from 'src/metadata/workspace-migration/factories/basic-column-action.factory';
-
-import { computeCustomName } from './compute-custom-name.util';
-
-export const computeFieldTargetColumn = (
-  fieldMetadata:
-    | FieldMetadataEntity<BasicFieldMetadataType>
-    | FieldMetadataInterface<BasicFieldMetadataType>,
-) => {
-  if (isCompositeFieldMetadataType(fieldMetadata.type)) {
-    throw new Error(
-      "Composite field metadata should not be computed here, as they're split into multiple fields.",
-    );
-  }
-
-  return computeCustomName(fieldMetadata.name, fieldMetadata.isCustom ?? false);
-};
diff --git a/packages/twenty-server/src/workspace/utils/compute-object-target-table.util.ts b/packages/twenty-server/src/workspace/utils/compute-object-target-table.util.ts
deleted file mode 100644
index 98f49dacc443..000000000000
--- a/packages/twenty-server/src/workspace/utils/compute-object-target-table.util.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-import { computeCustomName } from './compute-custom-name.util';
-
-export const computeObjectTargetTable = (
-  objectMetadata: ObjectMetadataInterface,
-) => {
-  return computeCustomName(
-    objectMetadata.nameSingular,
-    objectMetadata.isCustom,
-  );
-};
diff --git a/packages/twenty-server/src/workspace/utils/deduce-relation-direction.util.ts b/packages/twenty-server/src/workspace/utils/deduce-relation-direction.util.ts
deleted file mode 100644
index 4799329336ca..000000000000
--- a/packages/twenty-server/src/workspace/utils/deduce-relation-direction.util.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-import { RelationMetadataInterface } from 'src/metadata/field-metadata/interfaces/relation-metadata.interface';
-
-export enum RelationDirection {
-  FROM = 'from',
-  TO = 'to',
-}
-
-export const deduceRelationDirection = (
-  fieldMetadata: FieldMetadataInterface,
-  relationMetadata: RelationMetadataInterface,
-): RelationDirection => {
-  if (
-    relationMetadata.fromObjectMetadataId === fieldMetadata.objectMetadataId &&
-    relationMetadata.fromFieldMetadataId === fieldMetadata.id
-  ) {
-    return RelationDirection.FROM;
-  }
-
-  if (
-    relationMetadata.toObjectMetadataId === fieldMetadata.objectMetadataId &&
-    relationMetadata.toFieldMetadataId === fieldMetadata.id
-  ) {
-    return RelationDirection.TO;
-  }
-
-  throw new Error(
-    `Relation metadata ${relationMetadata.id} is not related to object ${fieldMetadata.objectMetadataId}`,
-  );
-};
diff --git a/packages/twenty-server/src/workspace/utils/is-relation-field-metadata-type.util.ts b/packages/twenty-server/src/workspace/utils/is-relation-field-metadata-type.util.ts
deleted file mode 100644
index f42b593ac9fc..000000000000
--- a/packages/twenty-server/src/workspace/utils/is-relation-field-metadata-type.util.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-export const isRelationFieldMetadataType = (
-  type: FieldMetadataType,
-): type is FieldMetadataType.RELATION => {
-  return type === FieldMetadataType.RELATION;
-};
diff --git a/packages/twenty-server/src/workspace/workspace-cleaner/commands/start-clean-inactive-workspaces.cron.command.ts b/packages/twenty-server/src/workspace/workspace-cleaner/commands/start-clean-inactive-workspaces.cron.command.ts
deleted file mode 100644
index 2da097f809b2..000000000000
--- a/packages/twenty-server/src/workspace/workspace-cleaner/commands/start-clean-inactive-workspaces.cron.command.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Inject } from '@nestjs/common';
-
-import { Command, CommandRunner } from 'nest-commander';
-
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import { cleanInactiveWorkspaceCronPattern } from 'src/workspace/workspace-cleaner/crons/clean-inactive-workspace.cron.pattern';
-import { CleanInactiveWorkspaceJob } from 'src/workspace/workspace-cleaner/crons/clean-inactive-workspace.job';
-
-@Command({
-  name: 'clean-inactive-workspaces:cron:start',
-  description: 'Starts a cron job to clean inactive workspaces',
-})
-export class StartCleanInactiveWorkspacesCronCommand extends CommandRunner {
-  constructor(
-    @Inject(MessageQueue.cronQueue)
-    private readonly messageQueueService: MessageQueueService,
-  ) {
-    super();
-  }
-
-  async run(): Promise<void> {
-    await this.messageQueueService.addCron<undefined>(
-      CleanInactiveWorkspaceJob.name,
-      undefined,
-      cleanInactiveWorkspaceCronPattern,
-      { retryLimit: 3 },
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-cleaner/commands/stop-clean-inactive-workspaces.cron.command.ts b/packages/twenty-server/src/workspace/workspace-cleaner/commands/stop-clean-inactive-workspaces.cron.command.ts
deleted file mode 100644
index 158896c06152..000000000000
--- a/packages/twenty-server/src/workspace/workspace-cleaner/commands/stop-clean-inactive-workspaces.cron.command.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Inject } from '@nestjs/common';
-
-import { Command, CommandRunner } from 'nest-commander';
-
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import { cleanInactiveWorkspaceCronPattern } from 'src/workspace/workspace-cleaner/crons/clean-inactive-workspace.cron.pattern';
-import { CleanInactiveWorkspaceJob } from 'src/workspace/workspace-cleaner/crons/clean-inactive-workspace.job';
-
-@Command({
-  name: 'clean-inactive-workspaces:cron:stop',
-  description: 'Stops the clean inactive workspaces cron job',
-})
-export class StopCleanInactiveWorkspacesCronCommand extends CommandRunner {
-  constructor(
-    @Inject(MessageQueue.cronQueue)
-    private readonly messageQueueService: MessageQueueService,
-  ) {
-    super();
-  }
-
-  async run(): Promise<void> {
-    await this.messageQueueService.removeCron(
-      CleanInactiveWorkspaceJob.name,
-      cleanInactiveWorkspaceCronPattern,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-cleaner/workspace-cleaner.module.ts b/packages/twenty-server/src/workspace/workspace-cleaner/workspace-cleaner.module.ts
deleted file mode 100644
index aca24e66a4b0..000000000000
--- a/packages/twenty-server/src/workspace/workspace-cleaner/workspace-cleaner.module.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { WorkspaceModule } from 'src/core/workspace/workspace.module';
-import { DeleteIncompleteWorkspacesCommand } from 'src/workspace/workspace-cleaner/commands/delete-incomplete-workspaces.command';
-import { Workspace } from 'src/core/workspace/workspace.entity';
-import { CleanInactiveWorkspacesCommand } from 'src/workspace/workspace-cleaner/commands/clean-inactive-workspaces.command';
-import { StartCleanInactiveWorkspacesCronCommand } from 'src/workspace/workspace-cleaner/commands/start-clean-inactive-workspaces.cron.command';
-import { StopCleanInactiveWorkspacesCronCommand } from 'src/workspace/workspace-cleaner/commands/stop-clean-inactive-workspaces.cron.command';
-import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([Workspace], 'core'),
-    WorkspaceModule,
-    DataSourceModule,
-  ],
-  providers: [
-    DeleteIncompleteWorkspacesCommand,
-    CleanInactiveWorkspacesCommand,
-    StartCleanInactiveWorkspacesCronCommand,
-    StopCleanInactiveWorkspacesCronCommand,
-  ],
-})
-export class WorkspaceCleanerModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-health/commands/workspace-health-command.module.ts b/packages/twenty-server/src/workspace/workspace-health/commands/workspace-health-command.module.ts
deleted file mode 100644
index 62b93c2a4f58..000000000000
--- a/packages/twenty-server/src/workspace/workspace-health/commands/workspace-health-command.module.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { WorkspaceHealthCommand } from 'src/workspace/workspace-health/commands/workspace-health.command';
-import { WorkspaceHealthModule } from 'src/workspace/workspace-health/workspace-health.module';
-
-@Module({
-  imports: [WorkspaceHealthModule],
-  providers: [WorkspaceHealthCommand],
-})
-export class WorkspaceHealthCommandModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-health/fixer/index.ts b/packages/twenty-server/src/workspace/workspace-health/fixer/index.ts
deleted file mode 100644
index ca9d93aac088..000000000000
--- a/packages/twenty-server/src/workspace/workspace-health/fixer/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { WorkspaceNullableFixer } from './workspace-nullable.fixer';
-import { WorkspaceDefaultValueFixer } from './workspace-default-value.fixer';
-import { WorkspaceTypeFixer } from './workspace-type.fixer';
-import { WorkspaceTargetColumnMapFixer } from './workspace-target-column-map.fixer';
-
-export const workspaceFixers = [
-  WorkspaceNullableFixer,
-  WorkspaceDefaultValueFixer,
-  WorkspaceTypeFixer,
-  WorkspaceTargetColumnMapFixer,
-];
diff --git a/packages/twenty-server/src/workspace/workspace-health/fixer/workspace-default-value.fixer.ts b/packages/twenty-server/src/workspace/workspace-health/fixer/workspace-default-value.fixer.ts
deleted file mode 100644
index fb95e1e02062..000000000000
--- a/packages/twenty-server/src/workspace/workspace-health/fixer/workspace-default-value.fixer.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-
-import {
-  WorkspaceHealthColumnIssue,
-  WorkspaceHealthIssueType,
-} from 'src/workspace/workspace-health/interfaces/workspace-health-issue.interface';
-import { WorkspaceMigrationBuilderAction } from 'src/workspace/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
-import { FieldMetadataDefaultValue } from 'src/metadata/field-metadata/interfaces/field-metadata-default-value.interface';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { WorkspaceMigrationEntity } from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { WorkspaceMigrationFieldFactory } from 'src/workspace/workspace-migration-builder/factories/workspace-migration-field.factory';
-
-import { AbstractWorkspaceFixer } from './abstract-workspace.fixer';
-
-@Injectable()
-export class WorkspaceDefaultValueFixer extends AbstractWorkspaceFixer<WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_CONFLICT> {
-  constructor(
-    private readonly workspaceMigrationFieldFactory: WorkspaceMigrationFieldFactory,
-  ) {
-    super(WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_CONFLICT);
-  }
-
-  async createWorkspaceMigrations(
-    manager: EntityManager,
-    objectMetadataCollection: ObjectMetadataEntity[],
-    issues: WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_CONFLICT>[],
-  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
-    if (issues.length <= 0) {
-      return [];
-    }
-
-    return this.fixColumnDefaultValueIssues(objectMetadataCollection, issues);
-  }
-
-  private async fixColumnDefaultValueIssues(
-    objectMetadataCollection: ObjectMetadataEntity[],
-    issues: WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_CONFLICT>[],
-  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
-    const fieldMetadataUpdateCollection = issues.map((issue) => {
-      const oldDefaultValue =
-        this.computeFieldMetadataDefaultValueFromColumnDefault(
-          issue.columnStructure?.columnDefault,
-        );
-
-      return {
-        current: {
-          ...issue.fieldMetadata,
-          defaultValue: oldDefaultValue,
-        },
-        altered: issue.fieldMetadata,
-      };
-    });
-
-    return this.workspaceMigrationFieldFactory.create(
-      objectMetadataCollection,
-      fieldMetadataUpdateCollection,
-      WorkspaceMigrationBuilderAction.UPDATE,
-    );
-  }
-
-  private computeFieldMetadataDefaultValueFromColumnDefault(
-    columnDefault: string | undefined,
-  ): FieldMetadataDefaultValue<'default'> {
-    if (
-      columnDefault === undefined ||
-      columnDefault === null ||
-      columnDefault === 'NULL'
-    ) {
-      return null;
-    }
-
-    if (!isNaN(Number(columnDefault))) {
-      return { value: +columnDefault };
-    }
-
-    if (columnDefault === 'true') {
-      return { value: true };
-    }
-
-    if (columnDefault === 'false') {
-      return { value: false };
-    }
-
-    if (columnDefault === '') {
-      return { value: '' };
-    }
-
-    if (columnDefault === 'now()') {
-      return { type: 'now' };
-    }
-
-    if (columnDefault.startsWith('public.uuid_generate_v4')) {
-      return { type: 'uuid' };
-    }
-
-    return { value: columnDefault };
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-health/fixer/workspace-nullable.fixer.ts b/packages/twenty-server/src/workspace/workspace-health/fixer/workspace-nullable.fixer.ts
deleted file mode 100644
index dda7d9479464..000000000000
--- a/packages/twenty-server/src/workspace/workspace-health/fixer/workspace-nullable.fixer.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-
-import {
-  WorkspaceHealthColumnIssue,
-  WorkspaceHealthIssueType,
-} from 'src/workspace/workspace-health/interfaces/workspace-health-issue.interface';
-import { WorkspaceMigrationBuilderAction } from 'src/workspace/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { WorkspaceMigrationEntity } from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { WorkspaceMigrationFieldFactory } from 'src/workspace/workspace-migration-builder/factories/workspace-migration-field.factory';
-
-import { AbstractWorkspaceFixer } from './abstract-workspace.fixer';
-
-@Injectable()
-export class WorkspaceNullableFixer extends AbstractWorkspaceFixer<WorkspaceHealthIssueType.COLUMN_NULLABILITY_CONFLICT> {
-  constructor(
-    private readonly workspaceMigrationFieldFactory: WorkspaceMigrationFieldFactory,
-  ) {
-    super(WorkspaceHealthIssueType.COLUMN_NULLABILITY_CONFLICT);
-  }
-
-  async createWorkspaceMigrations(
-    manager: EntityManager,
-    objectMetadataCollection: ObjectMetadataEntity[],
-    issues: WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.COLUMN_NULLABILITY_CONFLICT>[],
-  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
-    if (issues.length <= 0) {
-      return [];
-    }
-
-    return this.fixColumnNullabilityIssues(objectMetadataCollection, issues);
-  }
-
-  private async fixColumnNullabilityIssues(
-    objectMetadataCollection: ObjectMetadataEntity[],
-    issues: WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.COLUMN_NULLABILITY_CONFLICT>[],
-  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
-    const fieldMetadataUpdateCollection = issues.map((issue) => {
-      return {
-        current: {
-          ...issue.fieldMetadata,
-          isNullable: issue.columnStructure?.isNullable ?? false,
-        },
-        altered: issue.fieldMetadata,
-      };
-    });
-
-    return this.workspaceMigrationFieldFactory.create(
-      objectMetadataCollection,
-      fieldMetadataUpdateCollection,
-      WorkspaceMigrationBuilderAction.UPDATE,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-health/fixer/workspace-target-column-map.fixer.ts b/packages/twenty-server/src/workspace/workspace-health/fixer/workspace-target-column-map.fixer.ts
deleted file mode 100644
index 1b91ab48afe9..000000000000
--- a/packages/twenty-server/src/workspace/workspace-health/fixer/workspace-target-column-map.fixer.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-import isEqual from 'lodash.isequal';
-
-import {
-  WorkspaceHealthColumnIssue,
-  WorkspaceHealthIssueType,
-} from 'src/workspace/workspace-health/interfaces/workspace-health-issue.interface';
-import { WorkspaceMigrationBuilderAction } from 'src/workspace/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { generateTargetColumnMap } from 'src/metadata/field-metadata/utils/generate-target-column-map.util';
-import { FieldMetadataEntity } from 'src/metadata/field-metadata/field-metadata.entity';
-import { WorkspaceMigrationEntity } from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-import { DataSourceEntity } from 'src/metadata/data-source/data-source.entity';
-import { DatabaseStructureService } from 'src/workspace/workspace-health/services/database-structure.service';
-import { WorkspaceMigrationFieldFactory } from 'src/workspace/workspace-migration-builder/factories/workspace-migration-field.factory';
-import { isCompositeFieldMetadataType } from 'src/metadata/field-metadata/utils/is-composite-field-metadata-type.util';
-
-import {
-  AbstractWorkspaceFixer,
-  CompareEntity,
-} from './abstract-workspace.fixer';
-
-@Injectable()
-export class WorkspaceTargetColumnMapFixer extends AbstractWorkspaceFixer<
-  WorkspaceHealthIssueType.COLUMN_TARGET_COLUMN_MAP_NOT_VALID,
-  FieldMetadataEntity
-> {
-  constructor(
-    private readonly workspaceMigrationFieldFactory: WorkspaceMigrationFieldFactory,
-    private readonly databaseStructureService: DatabaseStructureService,
-  ) {
-    super(WorkspaceHealthIssueType.COLUMN_TARGET_COLUMN_MAP_NOT_VALID);
-  }
-
-  async createWorkspaceMigrations(
-    manager: EntityManager,
-    objectMetadataCollection: ObjectMetadataEntity[],
-    issues: WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.COLUMN_TARGET_COLUMN_MAP_NOT_VALID>[],
-  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
-    if (issues.length <= 0) {
-      return [];
-    }
-
-    return this.fixStructureTargetColumnMapIssues(
-      manager,
-      objectMetadataCollection,
-      issues,
-    );
-  }
-
-  async createMetadataUpdates(
-    manager: EntityManager,
-    objectMetadataCollection: ObjectMetadataEntity[],
-    issues: WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.COLUMN_TARGET_COLUMN_MAP_NOT_VALID>[],
-  ): Promise<CompareEntity<FieldMetadataEntity>[]> {
-    if (issues.length <= 0) {
-      return [];
-    }
-
-    return this.fixMetadataTargetColumnMapIssues(manager, issues);
-  }
-
-  private async fixStructureTargetColumnMapIssues(
-    manager: EntityManager,
-    objectMetadataCollection: ObjectMetadataEntity[],
-    issues: WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.COLUMN_TARGET_COLUMN_MAP_NOT_VALID>[],
-  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
-    const workspaceMigrationCollection: Partial<WorkspaceMigrationEntity>[] =
-      [];
-    const dataSourceRepository = manager.getRepository(DataSourceEntity);
-
-    for (const issue of issues) {
-      const objectMetadata = objectMetadataCollection.find(
-        (metadata) => metadata.id === issue.fieldMetadata.objectMetadataId,
-      );
-      const targetColumnMap = generateTargetColumnMap(
-        issue.fieldMetadata.type,
-        issue.fieldMetadata.isCustom,
-        issue.fieldMetadata.name,
-      );
-
-      // Skip composite fields, too complicated to fix for now
-      if (isCompositeFieldMetadataType(issue.fieldMetadata.type)) {
-        continue;
-      }
-
-      if (!objectMetadata) {
-        throw new Error(
-          `Object metadata with id ${issue.fieldMetadata.objectMetadataId} not found`,
-        );
-      }
-
-      if (!isEqual(issue.fieldMetadata.targetColumnMap, targetColumnMap)) {
-        // Retrieve the data source to get the schema name
-        const dataSource = await dataSourceRepository.findOne({
-          where: {
-            id: objectMetadata.dataSourceId,
-          },
-        });
-
-        if (!dataSource) {
-          throw new Error(
-            `Data source with id ${objectMetadata.dataSourceId} not found`,
-          );
-        }
-
-        const columnName = issue.fieldMetadata.targetColumnMap?.value;
-        const columnExist =
-          await this.databaseStructureService.workspaceColumnExist(
-            dataSource.schema,
-            computeObjectTargetTable(objectMetadata),
-            columnName,
-          );
-
-        if (!columnExist) {
-          continue;
-        }
-
-        const workspaceMigration =
-          await this.workspaceMigrationFieldFactory.create(
-            objectMetadataCollection,
-            [
-              {
-                current: issue.fieldMetadata,
-                altered: {
-                  ...issue.fieldMetadata,
-                  targetColumnMap,
-                },
-              },
-            ],
-            WorkspaceMigrationBuilderAction.UPDATE,
-          );
-
-        workspaceMigrationCollection.push(workspaceMigration[0]);
-      }
-    }
-
-    return workspaceMigrationCollection;
-  }
-
-  private async fixMetadataTargetColumnMapIssues(
-    manager: EntityManager,
-    issues: WorkspaceHealthColumnIssue<WorkspaceHealthIssueType.COLUMN_TARGET_COLUMN_MAP_NOT_VALID>[],
-  ): Promise<CompareEntity<FieldMetadataEntity>[]> {
-    const fieldMetadataRepository = manager.getRepository(FieldMetadataEntity);
-    const updatedEntities: CompareEntity<FieldMetadataEntity>[] = [];
-
-    for (const issue of issues) {
-      await fieldMetadataRepository.update(issue.fieldMetadata.id, {
-        targetColumnMap: generateTargetColumnMap(
-          issue.fieldMetadata.type,
-          issue.fieldMetadata.isCustom,
-          issue.fieldMetadata.name,
-        ),
-      });
-      const alteredEntity = await fieldMetadataRepository.findOne({
-        where: {
-          id: issue.fieldMetadata.id,
-        },
-      });
-
-      updatedEntities.push({
-        current: issue.fieldMetadata,
-        altered: alteredEntity as FieldMetadataEntity | null,
-      });
-    }
-
-    return updatedEntities;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-health/interfaces/workspace-health-fix-kind.interface.ts b/packages/twenty-server/src/workspace/workspace-health/interfaces/workspace-health-fix-kind.interface.ts
deleted file mode 100644
index 58bf30646cfb..000000000000
--- a/packages/twenty-server/src/workspace/workspace-health/interfaces/workspace-health-fix-kind.interface.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export enum WorkspaceHealthFixKind {
-  Nullable = 'nullable',
-  Type = 'type',
-  DefaultValue = 'default-value',
-  TargetColumnMap = 'target-column-map',
-}
diff --git a/packages/twenty-server/src/workspace/workspace-health/services/database-structure.service.ts b/packages/twenty-server/src/workspace/workspace-health/services/database-structure.service.ts
deleted file mode 100644
index 0ce9aea71afd..000000000000
--- a/packages/twenty-server/src/workspace/workspace-health/services/database-structure.service.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { ColumnType } from 'typeorm';
-import { ColumnMetadata } from 'typeorm/metadata/ColumnMetadata';
-
-import {
-  WorkspaceTableStructure,
-  WorkspaceTableStructureResult,
-} from 'src/workspace/workspace-health/interfaces/workspace-table-definition.interface';
-import { FieldMetadataDefaultValue } from 'src/metadata/field-metadata/interfaces/field-metadata-default-value.interface';
-
-import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/metadata/field-metadata/field-metadata.entity';
-import { fieldMetadataTypeToColumnType } from 'src/metadata/workspace-migration/utils/field-metadata-type-to-column-type.util';
-import { serializeTypeDefaultValue } from 'src/metadata/field-metadata/utils/serialize-type-default-value.util';
-import { isCompositeFieldMetadataType } from 'src/metadata/field-metadata/utils/is-composite-field-metadata-type.util';
-import { isRelationFieldMetadataType } from 'src/workspace/utils/is-relation-field-metadata-type.util';
-
-@Injectable()
-export class DatabaseStructureService {
-  constructor(private readonly typeORMService: TypeORMService) {}
-
-  async getWorkspaceTableColumns(
-    schemaName: string,
-    tableName: string,
-  ): Promise<WorkspaceTableStructure[]> {
-    const mainDataSource = this.typeORMService.getMainDataSource();
-    const results = await mainDataSource.query<
-      WorkspaceTableStructureResult[]
-    >(`
-      WITH foreign_keys AS (
-        SELECT
-          kcu.table_schema AS schema_name,
-          kcu.table_name AS table_name,
-          kcu.column_name AS column_name,
-          tc.constraint_name AS constraint_name
-        FROM
-          information_schema.key_column_usage AS kcu
-        JOIN
-          information_schema.table_constraints AS tc
-          ON tc.constraint_name = kcu.constraint_name
-          AND tc.table_schema = kcu.table_schema
-        WHERE
-          tc.constraint_type = 'FOREIGN KEY'
-          AND tc.table_schema = '${schemaName}'
-          AND tc.table_name = '${tableName}'
-        ),
-        unique_constraints AS (
-          SELECT
-            tc.table_schema AS schema_name,
-            tc.table_name AS table_name,
-            kcu.column_name AS column_name
-          FROM
-            information_schema.key_column_usage AS kcu
-          JOIN
-            information_schema.table_constraints AS tc
-            ON tc.constraint_name = kcu.constraint_name
-            AND tc.table_schema = kcu.table_schema
-          WHERE
-            tc.constraint_type = 'UNIQUE'
-            AND tc.table_schema = '${schemaName}'
-            AND tc.table_name = '${tableName}'
-        )
-        SELECT
-          c.table_schema AS "tableSchema",
-          c.table_name AS "tableName",
-          c.column_name AS "columnName",
-          CASE 
-            WHEN (c.data_type = 'USER-DEFINED') THEN c.udt_name 
-            ELSE data_type
-          END AS "dataType",
-          c.is_nullable AS "isNullable",
-          c.column_default AS "columnDefault",
-          CASE
-            WHEN pk.constraint_type = 'PRIMARY KEY' THEN 'TRUE'
-            ELSE 'FALSE'
-          END AS "isPrimaryKey",
-          CASE
-            WHEN fk.constraint_name IS NOT NULL THEN 'TRUE'
-            ELSE 'FALSE'
-          END AS "isForeignKey",
-          CASE
-            WHEN uc.column_name IS NOT NULL THEN 'TRUE'
-            ELSE 'FALSE'
-          END AS "isUnique",
-          rc.update_rule AS "onUpdateAction",
-          rc.delete_rule AS "onDeleteAction"
-        FROM
-          information_schema.columns AS c
-        LEFT JOIN
-          information_schema.constraint_column_usage AS ccu
-          ON c.column_name = ccu.column_name
-          AND c.table_name = ccu.table_name
-          AND c.table_schema = ccu.table_schema
-        LEFT JOIN
-          information_schema.table_constraints AS pk
-          ON pk.constraint_name = ccu.constraint_name
-          AND pk.constraint_type = 'PRIMARY KEY'
-          AND pk.table_name = c.table_name
-          AND pk.table_schema = c.table_schema
-        LEFT JOIN
-          foreign_keys AS fk
-          ON c.table_schema = fk.schema_name
-          AND c.table_name = fk.table_name
-          AND c.column_name = fk.column_name
-        LEFT JOIN
-          unique_constraints AS uc
-          ON c.table_schema = uc.schema_name
-          AND c.table_name = uc.table_name
-          AND c.column_name = uc.column_name
-        LEFT JOIN
-          information_schema.referential_constraints AS rc
-          ON rc.constraint_name = fk.constraint_name
-          AND rc.constraint_schema = '${schemaName}'
-        WHERE
-          c.table_schema = '${schemaName}'
-          AND c.table_name = '${tableName}';
-    `);
-
-    if (!results || results.length === 0) {
-      return [];
-    }
-
-    return results.map((item) => ({
-      ...item,
-      isNullable: item.isNullable === 'YES',
-      isPrimaryKey: item.isPrimaryKey === 'TRUE',
-      isForeignKey: item.isForeignKey === 'TRUE',
-      isUnique: item.isUnique === 'TRUE',
-    }));
-  }
-
-  async workspaceColumnExist(
-    schemaName: string,
-    tableName: string,
-    columnName: string,
-  ): Promise<boolean> {
-    const mainDataSource = this.typeORMService.getMainDataSource();
-    const results = await mainDataSource.query(
-      `SELECT column_name
-        FROM information_schema.columns
-        WHERE table_schema = $1
-        AND table_name = $2
-        AND column_name = $3`,
-      [schemaName, tableName, columnName],
-    );
-
-    return results.length >= 1;
-  }
-
-  getPostgresDataType(fieldMetadata: FieldMetadataEntity): string {
-    const typeORMType = fieldMetadataTypeToColumnType(fieldMetadata.type);
-    const mainDataSource = this.typeORMService.getMainDataSource();
-
-    // Compute enum name to compare data type properly
-    if (typeORMType === 'enum') {
-      const objectName = fieldMetadata.object?.nameSingular;
-      const prefix = fieldMetadata.isCustom ? '_' : '';
-      const fieldName = fieldMetadata.name;
-
-      return `${objectName}_${prefix}${fieldName}_enum`;
-    }
-
-    return mainDataSource.driver.normalizeType({
-      type: typeORMType,
-    });
-  }
-
-  getFieldMetadataTypeFromPostgresDataType(
-    postgresDataType: string,
-  ): FieldMetadataType | null {
-    const mainDataSource = this.typeORMService.getMainDataSource();
-    const types = Object.values(FieldMetadataType).filter((type) => {
-      // We're skipping composite and relation types, as they're not directly mapped to a column type
-      if (isCompositeFieldMetadataType(type)) {
-        return false;
-      }
-
-      if (isRelationFieldMetadataType(type)) {
-        return false;
-      }
-
-      return true;
-    });
-
-    for (const type of types) {
-      const typeORMType = fieldMetadataTypeToColumnType(
-        FieldMetadataType[type],
-      ) as ColumnType;
-      const dataType = mainDataSource.driver.normalizeType({
-        type: typeORMType,
-      });
-
-      if (postgresDataType === dataType) {
-        return FieldMetadataType[type];
-      }
-    }
-
-    return null;
-  }
-
-  getPostgresDefault(
-    fieldMetadataType: FieldMetadataType,
-    defaultValue: FieldMetadataDefaultValue | null,
-  ): string | null | undefined {
-    const typeORMType = fieldMetadataTypeToColumnType(
-      fieldMetadataType,
-    ) as ColumnType;
-    const mainDataSource = this.typeORMService.getMainDataSource();
-
-    if (defaultValue && 'type' in defaultValue) {
-      const serializedDefaultValue = serializeTypeDefaultValue(defaultValue);
-
-      // Special case for uuid_generate_v4() default value
-      if (serializedDefaultValue === 'public.uuid_generate_v4()') {
-        return 'uuid_generate_v4()';
-      }
-
-      return serializedDefaultValue;
-    }
-
-    const value =
-      defaultValue && 'value' in defaultValue ? defaultValue.value : null;
-
-    if (typeof value === 'number') {
-      return value.toString();
-    }
-
-    return mainDataSource.driver.normalizeDefault({
-      type: typeORMType,
-      default: value,
-      isArray: false,
-      // Workaround to use normalizeDefault without a complete ColumnMetadata object
-    } as ColumnMetadata);
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-health/services/field-metadata-health.service.ts b/packages/twenty-server/src/workspace/workspace-health/services/field-metadata-health.service.ts
deleted file mode 100644
index cf4c7c4d1b44..000000000000
--- a/packages/twenty-server/src/workspace/workspace-health/services/field-metadata-health.service.ts
+++ /dev/null
@@ -1,369 +0,0 @@
-import { Injectable, InternalServerErrorException } from '@nestjs/common';
-
-import isEqual from 'lodash.isequal';
-
-import {
-  WorkspaceHealthIssue,
-  WorkspaceHealthIssueType,
-} from 'src/workspace/workspace-health/interfaces/workspace-health-issue.interface';
-import { WorkspaceTableStructure } from 'src/workspace/workspace-health/interfaces/workspace-table-definition.interface';
-import { WorkspaceHealthOptions } from 'src/workspace/workspace-health/interfaces/workspace-health-options.interface';
-import { FieldMetadataDefaultValue } from 'src/metadata/field-metadata/interfaces/field-metadata-default-value.interface';
-
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/metadata/field-metadata/field-metadata.entity';
-import { isCompositeFieldMetadataType } from 'src/metadata/field-metadata/utils/is-composite-field-metadata-type.util';
-import { DatabaseStructureService } from 'src/workspace/workspace-health/services/database-structure.service';
-import { validName } from 'src/workspace/workspace-health/utils/valid-name.util';
-import { compositeDefinitions } from 'src/metadata/field-metadata/composite-types';
-import { validateDefaultValueForType } from 'src/metadata/field-metadata/utils/validate-default-value-for-type.util';
-import {
-  EnumFieldMetadataUnionType,
-  isEnumFieldMetadataType,
-} from 'src/metadata/field-metadata/utils/is-enum-field-metadata-type.util';
-import { validateOptionsForType } from 'src/metadata/field-metadata/utils/validate-options-for-type.util';
-import { serializeDefaultValue } from 'src/metadata/field-metadata/utils/serialize-default-value';
-import { computeCompositeFieldMetadata } from 'src/workspace/workspace-health/utils/compute-composite-field-metadata.util';
-import { generateTargetColumnMap } from 'src/metadata/field-metadata/utils/generate-target-column-map.util';
-import { customNamePrefix } from 'src/workspace/utils/compute-custom-name.util';
-import { isRelationFieldMetadataType } from 'src/workspace/utils/is-relation-field-metadata-type.util';
-
-@Injectable()
-export class FieldMetadataHealthService {
-  constructor(
-    private readonly databaseStructureService: DatabaseStructureService,
-  ) {}
-
-  async healthCheck(
-    tableName: string,
-    workspaceTableColumns: WorkspaceTableStructure[],
-    fieldMetadataCollection: FieldMetadataEntity[],
-    options: WorkspaceHealthOptions,
-  ): Promise<WorkspaceHealthIssue[]> {
-    const issues: WorkspaceHealthIssue[] = [];
-
-    for (const fieldMetadata of fieldMetadataCollection) {
-      // Relation metadata are checked in another service
-      if (isRelationFieldMetadataType(fieldMetadata.type)) {
-        continue;
-      }
-
-      if (isCompositeFieldMetadataType(fieldMetadata.type)) {
-        const compositeFieldMetadataCollection =
-          compositeDefinitions.get(fieldMetadata.type)?.(fieldMetadata) ?? [];
-
-        if (options.mode === 'metadata' || options.mode === 'all') {
-          const targetColumnMapIssue = this.targetColumnMapCheck(fieldMetadata);
-
-          if (targetColumnMapIssue) {
-            issues.push(targetColumnMapIssue);
-          }
-
-          const defaultValueIssues =
-            this.defaultValueHealthCheck(fieldMetadata);
-
-          issues.push(...defaultValueIssues);
-        }
-
-        for (const compositeFieldMetadata of compositeFieldMetadataCollection) {
-          const compositeFieldIssues = await this.healthCheckField(
-            tableName,
-            workspaceTableColumns,
-            computeCompositeFieldMetadata(
-              compositeFieldMetadata,
-              fieldMetadata,
-            ),
-            options,
-          );
-
-          issues.push(...compositeFieldIssues);
-        }
-      } else {
-        const fieldIssues = await this.healthCheckField(
-          tableName,
-          workspaceTableColumns,
-          fieldMetadata,
-          options,
-        );
-
-        issues.push(...fieldIssues);
-      }
-    }
-
-    return issues;
-  }
-
-  private async healthCheckField(
-    tableName: string,
-    workspaceTableColumns: WorkspaceTableStructure[],
-    fieldMetadata: FieldMetadataEntity,
-    options: WorkspaceHealthOptions,
-  ): Promise<WorkspaceHealthIssue[]> {
-    const issues: WorkspaceHealthIssue[] = [];
-
-    if (options.mode === 'structure' || options.mode === 'all') {
-      const structureIssues = this.structureFieldCheck(
-        tableName,
-        workspaceTableColumns,
-        fieldMetadata,
-      );
-
-      issues.push(...structureIssues);
-    }
-
-    if (options.mode === 'metadata' || options.mode === 'all') {
-      const metadataIssues = this.metadataFieldCheck(tableName, fieldMetadata);
-
-      issues.push(...metadataIssues);
-    }
-
-    return issues;
-  }
-
-  private structureFieldCheck(
-    tableName: string,
-    workspaceTableColumns: WorkspaceTableStructure[],
-    fieldMetadata: FieldMetadataEntity,
-  ): WorkspaceHealthIssue[] {
-    const issues: WorkspaceHealthIssue[] = [];
-    const columnName = fieldMetadata.targetColumnMap.value;
-
-    const dataType =
-      this.databaseStructureService.getPostgresDataType(fieldMetadata);
-
-    const defaultValue = this.databaseStructureService.getPostgresDefault(
-      fieldMetadata.type,
-      fieldMetadata.defaultValue,
-    );
-    // Check if column exist in database
-    const columnStructure = workspaceTableColumns.find(
-      (tableDefinition) => tableDefinition.columnName === columnName,
-    );
-
-    if (!columnStructure) {
-      issues.push({
-        type: WorkspaceHealthIssueType.MISSING_COLUMN,
-        fieldMetadata,
-        columnStructure,
-        message: `Column ${columnName} not found in table ${tableName}`,
-      });
-
-      return issues;
-    }
-
-    const columnDefaultValue = columnStructure.columnDefault?.split('::')?.[0];
-
-    // Check if column data type is the same
-    if (columnStructure.dataType !== dataType) {
-      issues.push({
-        type: WorkspaceHealthIssueType.COLUMN_DATA_TYPE_CONFLICT,
-        fieldMetadata,
-        columnStructure,
-        message: `Column ${columnName} type is not the same as the field metadata type "${columnStructure.dataType}" !== "${dataType}"`,
-      });
-    }
-
-    if (columnStructure.isNullable !== fieldMetadata.isNullable) {
-      issues.push({
-        type: WorkspaceHealthIssueType.COLUMN_NULLABILITY_CONFLICT,
-        fieldMetadata,
-        columnStructure,
-        message: `Column ${columnName} is expected to be ${
-          fieldMetadata.isNullable ? 'nullable' : 'not nullable'
-        } but is ${columnStructure.isNullable ? 'nullable' : 'not nullable'}`,
-      });
-    }
-
-    if (columnDefaultValue && isEnumFieldMetadataType(fieldMetadata.type)) {
-      const enumValues = fieldMetadata.options?.map((option) =>
-        serializeDefaultValue(option.value),
-      );
-
-      if (!enumValues.includes(columnDefaultValue)) {
-        issues.push({
-          type: WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_NOT_VALID,
-          fieldMetadata,
-          columnStructure,
-          message: `Column ${columnName} default value is not in the enum values "${columnDefaultValue}" NOT IN "${enumValues}"`,
-        });
-      }
-    }
-
-    if (columnDefaultValue !== defaultValue) {
-      issues.push({
-        type: WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_CONFLICT,
-        fieldMetadata,
-        columnStructure,
-        message: `Column ${columnName} default value is not the same as the field metadata default value "${columnStructure.columnDefault}" !== "${defaultValue}"`,
-      });
-    }
-
-    return issues;
-  }
-
-  private metadataFieldCheck(
-    tableName: string,
-    fieldMetadata: FieldMetadataEntity,
-  ): WorkspaceHealthIssue[] {
-    const issues: WorkspaceHealthIssue[] = [];
-    const columnName = fieldMetadata.targetColumnMap.value;
-    const targetColumnMapIssue = this.targetColumnMapCheck(fieldMetadata);
-    const defaultValueIssues = this.defaultValueHealthCheck(fieldMetadata);
-
-    if (targetColumnMapIssue) {
-      issues.push(targetColumnMapIssue);
-    }
-
-    if (fieldMetadata.name.startsWith(customNamePrefix)) {
-      issues.push({
-        type: WorkspaceHealthIssueType.COLUMN_NAME_SHOULD_NOT_BE_PREFIXED,
-        fieldMetadata,
-        message: `Column ${columnName} should not be prefixed with "${customNamePrefix}"`,
-      });
-    }
-
-    if (fieldMetadata.isCustom && !columnName?.startsWith(customNamePrefix)) {
-      issues.push({
-        type: WorkspaceHealthIssueType.COLUMN_NAME_SHOULD_BE_CUSTOM,
-        fieldMetadata,
-        message: `Column ${columnName} is marked as custom in table ${tableName} but doesn't start with "_"`,
-      });
-    }
-
-    if (!fieldMetadata.objectMetadataId) {
-      issues.push({
-        type: WorkspaceHealthIssueType.COLUMN_OBJECT_REFERENCE_INVALID,
-        fieldMetadata,
-        message: `Column ${columnName} doesn't have a valid object metadata id`,
-      });
-    }
-
-    if (!Object.values(FieldMetadataType).includes(fieldMetadata.type)) {
-      issues.push({
-        type: WorkspaceHealthIssueType.COLUMN_TYPE_NOT_VALID,
-        fieldMetadata,
-        message: `Column ${columnName} doesn't have a valid field metadata type`,
-      });
-    }
-
-    if (
-      !fieldMetadata.name ||
-      !validName(fieldMetadata.name) ||
-      !fieldMetadata.label
-    ) {
-      issues.push({
-        type: WorkspaceHealthIssueType.COLUMN_NAME_NOT_VALID,
-        fieldMetadata,
-        message: `Column ${columnName} doesn't have a valid name or label`,
-      });
-    }
-
-    if (
-      isEnumFieldMetadataType(fieldMetadata.type) &&
-      !validateOptionsForType(fieldMetadata.type, fieldMetadata.options)
-    ) {
-      issues.push({
-        type: WorkspaceHealthIssueType.COLUMN_OPTIONS_NOT_VALID,
-        fieldMetadata,
-        message: `Column options of ${fieldMetadata.targetColumnMap?.value} is not valid`,
-      });
-    }
-
-    issues.push(...defaultValueIssues);
-
-    return issues;
-  }
-
-  private targetColumnMapCheck(
-    fieldMetadata: FieldMetadataEntity,
-  ): WorkspaceHealthIssue | null {
-    const targetColumnMap = generateTargetColumnMap(
-      fieldMetadata.type,
-      fieldMetadata.isCustom,
-      fieldMetadata.name,
-    );
-
-    if (
-      !fieldMetadata.targetColumnMap ||
-      !isEqual(targetColumnMap, fieldMetadata.targetColumnMap)
-    ) {
-      return {
-        type: WorkspaceHealthIssueType.COLUMN_TARGET_COLUMN_MAP_NOT_VALID,
-        fieldMetadata,
-        message: `Column targetColumnMap "${JSON.stringify(
-          fieldMetadata.targetColumnMap,
-        )}" is not the same as the generated one "${JSON.stringify(
-          targetColumnMap,
-        )}"`,
-      };
-    }
-
-    return null;
-  }
-
-  private defaultValueHealthCheck(
-    fieldMetadata: FieldMetadataEntity,
-  ): WorkspaceHealthIssue[] {
-    const issues: WorkspaceHealthIssue[] = [];
-
-    if (
-      !validateDefaultValueForType(
-        fieldMetadata.type,
-        fieldMetadata.defaultValue,
-      )
-    ) {
-      issues.push({
-        type: WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_NOT_VALID,
-        fieldMetadata,
-        message: `Column default value for composite type ${fieldMetadata.type} is not well structured`,
-      });
-    }
-
-    if (
-      isEnumFieldMetadataType(fieldMetadata.type) &&
-      fieldMetadata.defaultValue
-    ) {
-      const enumValues = fieldMetadata.options?.map((option) => option.value);
-      const metadataDefaultValue = (
-        fieldMetadata.defaultValue as FieldMetadataDefaultValue<EnumFieldMetadataUnionType>
-      )?.value;
-
-      if (metadataDefaultValue && !enumValues.includes(metadataDefaultValue)) {
-        issues.push({
-          type: WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_NOT_VALID,
-          fieldMetadata,
-          message: `Column default value is not in the enum values "${metadataDefaultValue}" NOT IN "${enumValues}"`,
-        });
-      }
-    }
-
-    return issues;
-  }
-
-  private isCompositeObjectWellStructured(
-    fieldMetadataType: FieldMetadataType,
-    object: any,
-  ): boolean {
-    const subFields = compositeDefinitions.get(fieldMetadataType)?.() ?? [];
-
-    if (!object) {
-      return true;
-    }
-
-    if (subFields.length === 0) {
-      throw new InternalServerErrorException(
-        `The composite field type ${fieldMetadataType} doesn't have any sub fields, it seems this one is not implemented in the composite definitions map`,
-      );
-    }
-
-    for (const subField of subFields) {
-      if (!object[subField.name]) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-health/services/workspace-fix.service.ts b/packages/twenty-server/src/workspace/workspace-health/services/workspace-fix.service.ts
deleted file mode 100644
index 9ed85195e25c..000000000000
--- a/packages/twenty-server/src/workspace/workspace-health/services/workspace-fix.service.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-
-import { WorkspaceHealthFixKind } from 'src/workspace/workspace-health/interfaces/workspace-health-fix-kind.interface';
-import { WorkspaceHealthIssue } from 'src/workspace/workspace-health/interfaces/workspace-health-issue.interface';
-
-import { WorkspaceMigrationEntity } from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { WorkspaceNullableFixer } from 'src/workspace/workspace-health/fixer/workspace-nullable.fixer';
-import { WorkspaceDefaultValueFixer } from 'src/workspace/workspace-health/fixer/workspace-default-value.fixer';
-import { WorkspaceTypeFixer } from 'src/workspace/workspace-health/fixer/workspace-type.fixer';
-import { WorkspaceTargetColumnMapFixer } from 'src/workspace/workspace-health/fixer/workspace-target-column-map.fixer';
-import { CompareEntity } from 'src/workspace/workspace-health/fixer/abstract-workspace.fixer';
-
-@Injectable()
-export class WorkspaceFixService {
-  constructor(
-    private readonly workspaceNullableFixer: WorkspaceNullableFixer,
-    private readonly workspaceDefaultValueFixer: WorkspaceDefaultValueFixer,
-    private readonly workspaceTypeFixer: WorkspaceTypeFixer,
-    private readonly workspaceTargetColumnMapFixer: WorkspaceTargetColumnMapFixer,
-  ) {}
-
-  async createWorkspaceMigrations(
-    manager: EntityManager,
-    objectMetadataCollection: ObjectMetadataEntity[],
-    type: WorkspaceHealthFixKind,
-    issues: WorkspaceHealthIssue[],
-  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
-    switch (type) {
-      case WorkspaceHealthFixKind.Nullable: {
-        const filteredIssues = this.workspaceNullableFixer.filterIssues(issues);
-
-        return this.workspaceNullableFixer.createWorkspaceMigrations(
-          manager,
-          objectMetadataCollection,
-          filteredIssues,
-        );
-      }
-      case WorkspaceHealthFixKind.DefaultValue: {
-        const filteredIssues =
-          this.workspaceDefaultValueFixer.filterIssues(issues);
-
-        return this.workspaceDefaultValueFixer.createWorkspaceMigrations(
-          manager,
-          objectMetadataCollection,
-          filteredIssues,
-        );
-      }
-      case WorkspaceHealthFixKind.Type: {
-        const filteredIssues = this.workspaceTypeFixer.filterIssues(issues);
-
-        return this.workspaceTypeFixer.createWorkspaceMigrations(
-          manager,
-          objectMetadataCollection,
-          filteredIssues,
-        );
-      }
-      case WorkspaceHealthFixKind.TargetColumnMap: {
-        const filteredIssues =
-          this.workspaceTargetColumnMapFixer.filterIssues(issues);
-
-        return this.workspaceTargetColumnMapFixer.createWorkspaceMigrations(
-          manager,
-          objectMetadataCollection,
-          filteredIssues,
-        );
-      }
-      default: {
-        return [];
-      }
-    }
-  }
-
-  async createMetadataUpdates(
-    manager: EntityManager,
-    objectMetadataCollection: ObjectMetadataEntity[],
-    type: WorkspaceHealthFixKind,
-    issues: WorkspaceHealthIssue[],
-  ): Promise<CompareEntity<unknown>[]> {
-    switch (type) {
-      case WorkspaceHealthFixKind.TargetColumnMap: {
-        const filteredIssues =
-          this.workspaceTargetColumnMapFixer.filterIssues(issues);
-
-        return this.workspaceTargetColumnMapFixer.createMetadataUpdates(
-          manager,
-          objectMetadataCollection,
-          filteredIssues,
-        );
-      }
-      default: {
-        return [];
-      }
-    }
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-health/utils/compute-composite-field-metadata.util.ts b/packages/twenty-server/src/workspace/workspace-health/utils/compute-composite-field-metadata.util.ts
deleted file mode 100644
index 21ddb271be79..000000000000
--- a/packages/twenty-server/src/workspace/workspace-health/utils/compute-composite-field-metadata.util.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-
-import { FieldMetadataEntity } from 'src/metadata/field-metadata/field-metadata.entity';
-import { camelCase } from 'src/utils/camel-case';
-
-// Compute composite field metadata by combining the composite field metadata with the field metadata
-export const computeCompositeFieldMetadata = (
-  compositeFieldMetadata: FieldMetadataInterface,
-  fieldMetadata: FieldMetadataEntity,
-): FieldMetadataEntity => ({
-  ...fieldMetadata,
-  ...compositeFieldMetadata,
-  objectMetadataId: fieldMetadata.objectMetadataId,
-  name: camelCase(`${fieldMetadata.name}-${compositeFieldMetadata.name}`),
-});
diff --git a/packages/twenty-server/src/workspace/workspace-health/utils/is-workspace-health-issue-type.util.ts b/packages/twenty-server/src/workspace/workspace-health/utils/is-workspace-health-issue-type.util.ts
deleted file mode 100644
index 0d946000f484..000000000000
--- a/packages/twenty-server/src/workspace/workspace-health/utils/is-workspace-health-issue-type.util.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { WorkspaceHealthIssueType } from 'src/workspace/workspace-health/interfaces/workspace-health-issue.interface';
-
-export const isWorkspaceHealthNullableIssue = (
-  type: WorkspaceHealthIssueType,
-): type is WorkspaceHealthIssueType.COLUMN_NULLABILITY_CONFLICT => {
-  return type === WorkspaceHealthIssueType.COLUMN_NULLABILITY_CONFLICT;
-};
-
-export const isWorkspaceHealthTypeIssue = (
-  type: WorkspaceHealthIssueType,
-): type is WorkspaceHealthIssueType.COLUMN_DATA_TYPE_CONFLICT => {
-  return type === WorkspaceHealthIssueType.COLUMN_DATA_TYPE_CONFLICT;
-};
-
-export const isWorkspaceHealthDefaultValueIssue = (
-  type: WorkspaceHealthIssueType,
-): type is WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_CONFLICT => {
-  return type === WorkspaceHealthIssueType.COLUMN_DEFAULT_VALUE_CONFLICT;
-};
-
-export const isWorkspaceHealthTargetColumnMapIssue = (
-  type: WorkspaceHealthIssueType,
-): type is WorkspaceHealthIssueType.COLUMN_TARGET_COLUMN_MAP_NOT_VALID => {
-  return type === WorkspaceHealthIssueType.COLUMN_TARGET_COLUMN_MAP_NOT_VALID;
-};
diff --git a/packages/twenty-server/src/workspace/workspace-health/utils/map-field-metadata-type-to-data-type.util.ts b/packages/twenty-server/src/workspace/workspace-health/utils/map-field-metadata-type-to-data-type.util.ts
deleted file mode 100644
index e61cd98e3d85..000000000000
--- a/packages/twenty-server/src/workspace/workspace-health/utils/map-field-metadata-type-to-data-type.util.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { ConflictException } from '@nestjs/common';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-export const mapFieldMetadataTypeToDataType = (
-  fieldMetadataType: FieldMetadataType,
-): string => {
-  switch (fieldMetadataType) {
-    case FieldMetadataType.UUID:
-      return 'uuid';
-    case FieldMetadataType.TEXT:
-      return 'text';
-    case FieldMetadataType.PHONE:
-    case FieldMetadataType.EMAIL:
-      return 'varchar';
-    case FieldMetadataType.NUMERIC:
-      return 'numeric';
-    case FieldMetadataType.NUMBER:
-    case FieldMetadataType.PROBABILITY:
-      return 'double precision';
-    case FieldMetadataType.BOOLEAN:
-      return 'boolean';
-    case FieldMetadataType.DATE_TIME:
-      return 'timestamp';
-    case FieldMetadataType.RATING:
-    case FieldMetadataType.SELECT:
-    case FieldMetadataType.MULTI_SELECT:
-      return 'enum';
-    default:
-      throw new ConflictException(
-        `Cannot convert ${fieldMetadataType} to data type.`,
-      );
-  }
-};
diff --git a/packages/twenty-server/src/workspace/workspace-health/workspace-health.module.ts b/packages/twenty-server/src/workspace/workspace-health/workspace-health.module.ts
deleted file mode 100644
index 296f92b2f10e..000000000000
--- a/packages/twenty-server/src/workspace/workspace-health/workspace-health.module.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
-import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-import { DatabaseStructureService } from 'src/workspace/workspace-health/services/database-structure.service';
-import { FieldMetadataHealthService } from 'src/workspace/workspace-health/services/field-metadata-health.service';
-import { ObjectMetadataHealthService } from 'src/workspace/workspace-health/services/object-metadata-health.service';
-import { RelationMetadataHealthService } from 'src/workspace/workspace-health/services/relation-metadata.health.service';
-import { WorkspaceHealthService } from 'src/workspace/workspace-health/workspace-health.service';
-import { WorkspaceMigrationBuilderModule } from 'src/workspace/workspace-migration-builder/workspace-migration-builder.module';
-import { WorkspaceMigrationRunnerModule } from 'src/workspace/workspace-migration-runner/workspace-migration-runner.module';
-
-import { workspaceFixers } from './fixer';
-
-import { WorkspaceFixService } from './services/workspace-fix.service';
-
-@Module({
-  imports: [
-    DataSourceModule,
-    TypeORMModule,
-    ObjectMetadataModule,
-    WorkspaceDataSourceModule,
-    WorkspaceMigrationRunnerModule,
-    WorkspaceMigrationBuilderModule,
-  ],
-  providers: [
-    ...workspaceFixers,
-    WorkspaceHealthService,
-    DatabaseStructureService,
-    ObjectMetadataHealthService,
-    FieldMetadataHealthService,
-    RelationMetadataHealthService,
-    WorkspaceFixService,
-  ],
-  exports: [WorkspaceHealthService],
-})
-export class WorkspaceHealthModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/demo-objects-prefill-data.ts b/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/demo-objects-prefill-data.ts
deleted file mode 100644
index 4fd2fd64684c..000000000000
--- a/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/demo-objects-prefill-data.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { DataSource, EntityManager } from 'typeorm';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { viewPrefillData } from 'src/workspace/workspace-manager/demo-objects-prefill-data/view';
-import { companyPrefillData } from 'src/workspace/workspace-manager/demo-objects-prefill-data/company';
-import { personPrefillData } from 'src/workspace/workspace-manager/demo-objects-prefill-data/person';
-import { pipelineStepPrefillData } from 'src/workspace/workspace-manager/demo-objects-prefill-data/pipeline-step';
-import { workspaceMemberPrefillData } from 'src/workspace/workspace-manager/demo-objects-prefill-data/workspace-member';
-import { seedDemoOpportunity } from 'src/workspace/workspace-manager/demo-objects-prefill-data/opportunity';
-
-export const demoObjectsPrefillData = async (
-  workspaceDataSource: DataSource,
-  schemaName: string,
-  objectMetadata: ObjectMetadataEntity[],
-) => {
-  const objectMetadataMap = objectMetadata.reduce((acc, object) => {
-    acc[object.nameSingular] = {
-      id: object.id,
-      fields: object.fields.reduce((acc, field) => {
-        acc[field.name] = field.id;
-
-        return acc;
-      }, {}),
-    };
-
-    return acc;
-  }, {});
-
-  // TODO: udnerstand why only with this createQueryRunner transaction below works
-  const queryRunner = workspaceDataSource.createQueryRunner();
-
-  await queryRunner.connect();
-
-  workspaceDataSource.transaction(async (entityManager: EntityManager) => {
-    await companyPrefillData(entityManager, schemaName);
-    await personPrefillData(entityManager, schemaName);
-    await viewPrefillData(entityManager, schemaName, objectMetadataMap);
-    await pipelineStepPrefillData(entityManager, schemaName);
-    await seedDemoOpportunity(entityManager, schemaName);
-
-    await workspaceMemberPrefillData(entityManager, schemaName);
-  });
-};
diff --git a/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/opportunity.ts b/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/opportunity.ts
deleted file mode 100644
index cd5f40e33d98..000000000000
--- a/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/opportunity.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { EntityManager } from 'typeorm';
-import { v4 } from 'uuid';
-
-const tableName = 'opportunity';
-
-const getRandomProbability = () => {
-  const firstDigit = Math.floor(Math.random() * 9) + 1;
-
-  return firstDigit / 10;
-};
-
-const getRandomPipelineStepId = (pipelineStepIds: { id: string }[]) =>
-  pipelineStepIds[Math.floor(Math.random() * pipelineStepIds.length)].id;
-
-const getRandomStage = () => {
-  const stages = ['NEW', 'SCREENING', 'MEETING', 'PROPOSAL', 'CUSTOMER'];
-
-  return stages[Math.floor(Math.random() * stages.length)];
-};
-
-const generateRandomAmountMicros = () => {
-  const firstDigit = Math.floor(Math.random() * 9) + 1;
-
-  return firstDigit * 10000000000;
-};
-
-// Function to generate the array of opportunities
-// companiesWithPeople - selecting from the db companies and 1 person related to the company.id to use companyId, pointOfContactId and personId
-// pipelineStepIds - selecting from the db pipeline, getting random id from selected to use as pipelineStepId
-
-const generateOpportunities = (
-  companies,
-  pipelineStepIds: { id: string }[],
-) => {
-  return companies.map((company) => ({
-    id: v4(),
-    amountAmountMicros: generateRandomAmountMicros(),
-    amountCurrencyCode: 'USD',
-    closeDate: new Date(),
-    stage: getRandomStage(),
-    probability: getRandomProbability(),
-    pipelineStepId: getRandomPipelineStepId(pipelineStepIds),
-    pointOfContactId: company.personId,
-    companyId: company.id,
-  }));
-};
-
-export const seedDemoOpportunity = async (
-  entityManager: EntityManager,
-  schemaName: string,
-) => {
-  const companiesWithPeople = await entityManager?.query(
-    `SELECT company.*, person.id AS "personId"
-     FROM ${schemaName}.company
-     LEFT JOIN ${schemaName}.person ON company.id = "person"."companyId"
-     LIMIT 50`,
-  );
-  const pipelineStepIds = await entityManager?.query(
-    `SELECT id FROM ${schemaName}."pipelineStep"`,
-  );
-
-  const opportunities = generateOpportunities(
-    companiesWithPeople,
-    pipelineStepIds,
-  );
-
-  await entityManager
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.${tableName}`, [
-      'id',
-      'amountAmountMicros',
-      'amountCurrencyCode',
-      'closeDate',
-      'stage',
-      'probability',
-      'pipelineStepId',
-      'pointOfContactId',
-      'companyId',
-      'position',
-    ])
-    .orIgnore()
-    .values(
-      opportunities.map((opportunity, index) => ({
-        ...opportunity,
-        position: index,
-      })),
-    )
-    .execute();
-};
diff --git a/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/view.ts b/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/view.ts
deleted file mode 100644
index 7e40b47ba02e..000000000000
--- a/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/view.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import { EntityManager } from 'typeorm';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-
-export const viewPrefillData = async (
-  entityManager: EntityManager,
-  schemaName: string,
-  objectMetadataMap: Record<string, ObjectMetadataEntity>,
-) => {
-  // Creating views
-  const createdViews = await entityManager
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.view`, ['name', 'objectMetadataId', 'type'])
-    .orIgnore()
-    .values([
-      {
-        name: 'All Companies',
-        objectMetadataId: objectMetadataMap['company'].id,
-        type: 'table',
-      },
-      {
-        name: 'All People',
-        objectMetadataId: objectMetadataMap['person'].id,
-        type: 'table',
-      },
-      {
-        name: 'All Opportunities',
-        objectMetadataId: objectMetadataMap['opportunity'].id,
-        type: 'kanban',
-      },
-    ])
-    .returning('*')
-    .execute();
-
-  const viewIdMap = createdViews.raw.reduce((acc, view) => {
-    acc[view.name] = view.id;
-
-    return acc;
-  }, {});
-
-  // Creating viewFields
-  await entityManager
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.viewField`, [
-      'fieldMetadataId',
-      'viewId',
-      'position',
-      'isVisible',
-      'size',
-    ])
-    .orIgnore()
-    .values([
-      // Company
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['name'],
-        viewId: viewIdMap['All Companies'],
-        position: 0,
-        isVisible: true,
-        size: 180,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['domainName'],
-        viewId: viewIdMap['All Companies'],
-        position: 1,
-        isVisible: true,
-        size: 100,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['accountOwner'],
-        viewId: viewIdMap['All Companies'],
-        position: 2,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['createdAt'],
-        viewId: viewIdMap['All Companies'],
-        position: 3,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['employees'],
-        viewId: viewIdMap['All Companies'],
-        position: 4,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['linkedinLink'],
-        viewId: viewIdMap['All Companies'],
-        position: 5,
-        isVisible: true,
-        size: 170,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['address'],
-        viewId: viewIdMap['All Companies'],
-        position: 6,
-        isVisible: true,
-        size: 170,
-      },
-      // Person
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['name'],
-        viewId: viewIdMap['All People'],
-        position: 0,
-        isVisible: true,
-        size: 210,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['email'],
-        viewId: viewIdMap['All People'],
-        position: 1,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['company'],
-        viewId: viewIdMap['All People'],
-        position: 2,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['phone'],
-        viewId: viewIdMap['All People'],
-        position: 3,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['createdAt'],
-        viewId: viewIdMap['All People'],
-        position: 4,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['city'],
-        viewId: viewIdMap['All People'],
-        position: 5,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['jobTitle'],
-        viewId: viewIdMap['All People'],
-        position: 6,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['linkedinLink'],
-        viewId: viewIdMap['All People'],
-        position: 7,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['xLink'],
-        viewId: viewIdMap['All People'],
-        position: 8,
-        isVisible: true,
-        size: 150,
-      },
-      // Opportunity
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['amount'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 0,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['closeDate'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 1,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['probability'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 2,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId:
-          objectMetadataMap['opportunity'].fields['pointOfContact'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 3,
-        isVisible: true,
-        size: 150,
-      },
-    ])
-    .execute();
-};
diff --git a/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/workspace-member.ts b/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/workspace-member.ts
deleted file mode 100644
index ae5f87add4d0..000000000000
--- a/packages/twenty-server/src/workspace/workspace-manager/demo-objects-prefill-data/workspace-member.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { EntityManager } from 'typeorm';
-
-import { DemoSeedUserIds } from 'src/database/typeorm-seeds/core/demo/users';
-
-const WorkspaceMemberIds = {
-  Noah: '20202020-0687-4c41-b707-ed1bfca972a7',
-  Hugo: '20202020-77d5-4cb6-b60a-f4a835a85d61',
-  Julia: '20202020-1553-45c6-a028-5a9064cce07f',
-};
-
-export const workspaceMemberPrefillData = async (
-  entityManager: EntityManager,
-  schemaName: string,
-) => {
-  await entityManager
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.workspaceMember`, [
-      'id',
-      'nameFirstName',
-      'nameLastName',
-      'locale',
-      'colorScheme',
-      'userId',
-    ])
-    .orIgnore()
-    .values([
-      {
-        id: WorkspaceMemberIds.Noah,
-        nameFirstName: 'Noah',
-        nameLastName: 'A',
-        locale: 'en',
-        colorScheme: 'Light',
-        userId: DemoSeedUserIds.Noah,
-      },
-      {
-        id: WorkspaceMemberIds.Hugo,
-        nameFirstName: 'Hugo',
-        nameLastName: 'I',
-        locale: 'en',
-        colorScheme: 'Light',
-        userId: DemoSeedUserIds.Hugo,
-      },
-      {
-        id: WorkspaceMemberIds.Julia,
-        nameFirstName: 'Julia',
-        nameLastName: 'S',
-        locale: 'en',
-        colorScheme: 'Light',
-        userId: DemoSeedUserIds.Julia,
-      },
-    ])
-    .execute();
-};
diff --git a/packages/twenty-server/src/workspace/workspace-manager/standard-objects-prefill-data/pipeline-step.ts b/packages/twenty-server/src/workspace/workspace-manager/standard-objects-prefill-data/pipeline-step.ts
deleted file mode 100644
index bbf86f127197..000000000000
--- a/packages/twenty-server/src/workspace/workspace-manager/standard-objects-prefill-data/pipeline-step.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { EntityManager } from 'typeorm';
-
-export const pipelineStepPrefillData = async (
-  entityManager: EntityManager,
-  schemaName: string,
-) => {
-  await entityManager
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.pipelineStep`, ['name', 'color', 'position'])
-    .orIgnore()
-    .values([
-      {
-        name: 'NEW',
-        color: 'red',
-        position: 0,
-      },
-      {
-        name: 'SCREENING',
-        color: 'purple',
-        position: 1,
-      },
-      {
-        name: 'MEETING',
-        color: 'sky',
-        position: 2,
-      },
-      {
-        name: 'PROPOSAL',
-        color: 'turquoise',
-        position: 3,
-      },
-      {
-        name: 'CUSTOMER',
-        color: 'yellow',
-        position: 4,
-      },
-    ])
-    .returning('*')
-    .execute();
-};
diff --git a/packages/twenty-server/src/workspace/workspace-manager/standard-objects-prefill-data/standard-objects-prefill-data.ts b/packages/twenty-server/src/workspace/workspace-manager/standard-objects-prefill-data/standard-objects-prefill-data.ts
deleted file mode 100644
index c4c801a9a5d6..000000000000
--- a/packages/twenty-server/src/workspace/workspace-manager/standard-objects-prefill-data/standard-objects-prefill-data.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { DataSource, EntityManager } from 'typeorm';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { viewPrefillData } from 'src/workspace/workspace-manager/standard-objects-prefill-data/view';
-import { companyPrefillData } from 'src/workspace/workspace-manager/standard-objects-prefill-data/company';
-import { personPrefillData } from 'src/workspace/workspace-manager/standard-objects-prefill-data/person';
-import { pipelineStepPrefillData } from 'src/workspace/workspace-manager/standard-objects-prefill-data/pipeline-step';
-
-export const standardObjectsPrefillData = async (
-  workspaceDataSource: DataSource,
-  schemaName: string,
-  objectMetadata: ObjectMetadataEntity[],
-) => {
-  const objectMetadataMap = objectMetadata.reduce((acc, object) => {
-    acc[object.nameSingular] = {
-      id: object.id,
-      fields: object.fields.reduce((acc, field) => {
-        acc[field.name] = field.id;
-
-        return acc;
-      }, {}),
-    };
-
-    return acc;
-  }, {});
-
-  workspaceDataSource.transaction(async (entityManager: EntityManager) => {
-    await companyPrefillData(entityManager, schemaName);
-    await personPrefillData(entityManager, schemaName);
-    await viewPrefillData(entityManager, schemaName, objectMetadataMap);
-    await pipelineStepPrefillData(entityManager, schemaName);
-  });
-};
diff --git a/packages/twenty-server/src/workspace/workspace-manager/standard-objects-prefill-data/view.ts b/packages/twenty-server/src/workspace/workspace-manager/standard-objects-prefill-data/view.ts
deleted file mode 100644
index 7e40b47ba02e..000000000000
--- a/packages/twenty-server/src/workspace/workspace-manager/standard-objects-prefill-data/view.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import { EntityManager } from 'typeorm';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-
-export const viewPrefillData = async (
-  entityManager: EntityManager,
-  schemaName: string,
-  objectMetadataMap: Record<string, ObjectMetadataEntity>,
-) => {
-  // Creating views
-  const createdViews = await entityManager
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.view`, ['name', 'objectMetadataId', 'type'])
-    .orIgnore()
-    .values([
-      {
-        name: 'All Companies',
-        objectMetadataId: objectMetadataMap['company'].id,
-        type: 'table',
-      },
-      {
-        name: 'All People',
-        objectMetadataId: objectMetadataMap['person'].id,
-        type: 'table',
-      },
-      {
-        name: 'All Opportunities',
-        objectMetadataId: objectMetadataMap['opportunity'].id,
-        type: 'kanban',
-      },
-    ])
-    .returning('*')
-    .execute();
-
-  const viewIdMap = createdViews.raw.reduce((acc, view) => {
-    acc[view.name] = view.id;
-
-    return acc;
-  }, {});
-
-  // Creating viewFields
-  await entityManager
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.viewField`, [
-      'fieldMetadataId',
-      'viewId',
-      'position',
-      'isVisible',
-      'size',
-    ])
-    .orIgnore()
-    .values([
-      // Company
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['name'],
-        viewId: viewIdMap['All Companies'],
-        position: 0,
-        isVisible: true,
-        size: 180,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['domainName'],
-        viewId: viewIdMap['All Companies'],
-        position: 1,
-        isVisible: true,
-        size: 100,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['accountOwner'],
-        viewId: viewIdMap['All Companies'],
-        position: 2,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['createdAt'],
-        viewId: viewIdMap['All Companies'],
-        position: 3,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['employees'],
-        viewId: viewIdMap['All Companies'],
-        position: 4,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['linkedinLink'],
-        viewId: viewIdMap['All Companies'],
-        position: 5,
-        isVisible: true,
-        size: 170,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['company'].fields['address'],
-        viewId: viewIdMap['All Companies'],
-        position: 6,
-        isVisible: true,
-        size: 170,
-      },
-      // Person
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['name'],
-        viewId: viewIdMap['All People'],
-        position: 0,
-        isVisible: true,
-        size: 210,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['email'],
-        viewId: viewIdMap['All People'],
-        position: 1,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['company'],
-        viewId: viewIdMap['All People'],
-        position: 2,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['phone'],
-        viewId: viewIdMap['All People'],
-        position: 3,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['createdAt'],
-        viewId: viewIdMap['All People'],
-        position: 4,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['city'],
-        viewId: viewIdMap['All People'],
-        position: 5,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['jobTitle'],
-        viewId: viewIdMap['All People'],
-        position: 6,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['linkedinLink'],
-        viewId: viewIdMap['All People'],
-        position: 7,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['person'].fields['xLink'],
-        viewId: viewIdMap['All People'],
-        position: 8,
-        isVisible: true,
-        size: 150,
-      },
-      // Opportunity
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['amount'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 0,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['closeDate'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 1,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId: objectMetadataMap['opportunity'].fields['probability'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 2,
-        isVisible: true,
-        size: 150,
-      },
-      {
-        fieldMetadataId:
-          objectMetadataMap['opportunity'].fields['pointOfContact'],
-        viewId: viewIdMap['All Opportunities'],
-        position: 3,
-        isVisible: true,
-        size: 150,
-      },
-    ])
-    .execute();
-};
diff --git a/packages/twenty-server/src/workspace/workspace-manager/workspace-manager.module.ts b/packages/twenty-server/src/workspace/workspace-manager/workspace-manager.module.ts
deleted file mode 100644
index 4c404070ba0c..000000000000
--- a/packages/twenty-server/src/workspace/workspace-manager/workspace-manager.module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
-import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
-import { WorkspaceMigrationModule } from 'src/metadata/workspace-migration/workspace-migration.module';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-import { WorkspaceSyncMetadataModule } from 'src/workspace/workspace-sync-metadata/workspace-sync-metadata.module';
-import { WorkspaceHealthModule } from 'src/workspace/workspace-health/workspace-health.module';
-
-import { WorkspaceManagerService } from './workspace-manager.service';
-
-@Module({
-  imports: [
-    WorkspaceDataSourceModule,
-    WorkspaceMigrationModule,
-    ObjectMetadataModule,
-    DataSourceModule,
-    WorkspaceSyncMetadataModule,
-    WorkspaceHealthModule,
-  ],
-  exports: [WorkspaceManagerService],
-  providers: [WorkspaceManagerService],
-})
-export class WorkspaceManagerModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-migration-builder/factories/workspace-migration-object.factory.ts b/packages/twenty-server/src/workspace/workspace-migration-builder/factories/workspace-migration-object.factory.ts
deleted file mode 100644
index 9c820ec663f5..000000000000
--- a/packages/twenty-server/src/workspace/workspace-migration-builder/factories/workspace-migration-object.factory.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { WorkspaceMigrationBuilderAction } from 'src/workspace/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import {
-  WorkspaceMigrationColumnActionType,
-  WorkspaceMigrationEntity,
-  WorkspaceMigrationTableAction,
-} from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-import { WorkspaceMigrationFactory } from 'src/metadata/workspace-migration/workspace-migration.factory';
-import { generateMigrationName } from 'src/metadata/workspace-migration/utils/generate-migration-name.util';
-
-@Injectable()
-export class WorkspaceMigrationObjectFactory {
-  constructor(
-    private readonly workspaceMigrationFactory: WorkspaceMigrationFactory,
-  ) {}
-
-  async create(
-    objectMetadataCollection: ObjectMetadataEntity[],
-    action: WorkspaceMigrationBuilderAction,
-  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
-    switch (action) {
-      case WorkspaceMigrationBuilderAction.CREATE:
-        return this.createObjectMigration(objectMetadataCollection);
-      case WorkspaceMigrationBuilderAction.DELETE:
-        return this.deleteObjectMigration(objectMetadataCollection);
-      default:
-        return [];
-    }
-  }
-
-  private async createObjectMigration(
-    objectMetadataCollection: ObjectMetadataEntity[],
-  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
-    const workspaceMigrations: Partial<WorkspaceMigrationEntity>[] = [];
-
-    for (const objectMetadata of objectMetadataCollection) {
-      const migrations: WorkspaceMigrationTableAction[] = [
-        {
-          name: computeObjectTargetTable(objectMetadata),
-          action: 'create',
-        },
-      ];
-
-      for (const field of objectMetadata.fields) {
-        if (field.type === FieldMetadataType.RELATION) {
-          continue;
-        }
-
-        migrations.push({
-          name: computeObjectTargetTable(objectMetadata),
-          action: 'alter',
-          columns: this.workspaceMigrationFactory.createColumnActions(
-            WorkspaceMigrationColumnActionType.CREATE,
-            field,
-          ),
-        });
-      }
-
-      workspaceMigrations.push({
-        workspaceId: objectMetadata.workspaceId,
-        name: generateMigrationName(`create-${objectMetadata.nameSingular}`),
-        isCustom: false,
-        migrations,
-      });
-    }
-
-    return workspaceMigrations;
-  }
-
-  private async deleteObjectMigration(
-    objectMetadataCollection: ObjectMetadataEntity[],
-  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
-    const workspaceMigrations: Partial<WorkspaceMigrationEntity>[] = [];
-
-    for (const objectMetadata of objectMetadataCollection) {
-      const migrations: WorkspaceMigrationTableAction[] = [
-        {
-          name: computeObjectTargetTable(objectMetadata),
-          action: 'drop',
-          columns: [],
-        },
-      ];
-
-      workspaceMigrations.push({
-        workspaceId: objectMetadata.workspaceId,
-        name: generateMigrationName(`delete-${objectMetadata.nameSingular}`),
-        isCustom: false,
-        migrations,
-      });
-    }
-
-    return workspaceMigrations;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-migration-builder/workspace-migration-builder.module.ts b/packages/twenty-server/src/workspace/workspace-migration-builder/workspace-migration-builder.module.ts
deleted file mode 100644
index fcd035f3ba88..000000000000
--- a/packages/twenty-server/src/workspace/workspace-migration-builder/workspace-migration-builder.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { WorkspaceMigrationModule } from 'src/metadata/workspace-migration/workspace-migration.module';
-
-import { workspaceMigrationBuilderFactories } from './factories';
-
-@Module({
-  imports: [WorkspaceMigrationModule],
-  providers: [...workspaceMigrationBuilderFactories],
-  exports: [...workspaceMigrationBuilderFactories],
-})
-export class WorkspaceMigrationBuilderModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-migration-runner/commands/workspace-sync-metadata-commands.module.ts b/packages/twenty-server/src/workspace/workspace-migration-runner/commands/workspace-sync-metadata-commands.module.ts
deleted file mode 100644
index 892afd2c10c1..000000000000
--- a/packages/twenty-server/src/workspace/workspace-migration-runner/commands/workspace-sync-metadata-commands.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { WorkspaceMigrationRunnerModule } from 'src/workspace/workspace-migration-runner/workspace-migration-runner.module';
-
-import { WorkspaceExecutePendingMigrationsCommand } from './workspace-execute-pending-migrations.command';
-
-@Module({
-  imports: [WorkspaceMigrationRunnerModule],
-  providers: [WorkspaceExecutePendingMigrationsCommand],
-})
-export class WorkspaceMigrationRunnerCommandsModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-migration-runner/services/workspace-migration-enum.service.ts b/packages/twenty-server/src/workspace/workspace-migration-runner/services/workspace-migration-enum.service.ts
deleted file mode 100644
index 20f8be4bcb78..000000000000
--- a/packages/twenty-server/src/workspace/workspace-migration-runner/services/workspace-migration-enum.service.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { QueryRunner } from 'typeorm';
-
-import { WorkspaceMigrationColumnAlter } from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { serializeDefaultValue } from 'src/metadata/field-metadata/utils/serialize-default-value';
-
-@Injectable()
-export class WorkspaceMigrationEnumService {
-  async alterEnum(
-    queryRunner: QueryRunner,
-    schemaName: string,
-    tableName: string,
-    migrationColumn: WorkspaceMigrationColumnAlter,
-  ) {
-    const columnDefinition = migrationColumn.alteredColumnDefinition;
-    const oldEnumTypeName = `${tableName}_${columnDefinition.columnName}_enum`;
-    const newEnumTypeName = `${tableName}_${columnDefinition.columnName}_enum_new`;
-    const enumValues =
-      columnDefinition.enum?.map((enumValue) => {
-        if (typeof enumValue === 'string') {
-          return enumValue;
-        }
-
-        return enumValue.to;
-      }) ?? [];
-
-    if (!columnDefinition.isNullable && !columnDefinition.defaultValue) {
-      columnDefinition.defaultValue = serializeDefaultValue(enumValues[0]);
-    }
-
-    // Create new enum type with new values
-    await this.createNewEnumType(
-      newEnumTypeName,
-      queryRunner,
-      schemaName,
-      enumValues,
-    );
-
-    // Temporarily change column type to text
-    await queryRunner.query(`
-      ALTER TABLE "${schemaName}"."${tableName}"
-      ALTER COLUMN "${columnDefinition.columnName}" TYPE TEXT
-    `);
-
-    // Migrate existing values to new values
-    await this.migrateEnumValues(
-      queryRunner,
-      schemaName,
-      tableName,
-      migrationColumn,
-    );
-
-    // Update existing rows to handle missing values
-    await this.handleMissingEnumValues(
-      queryRunner,
-      schemaName,
-      tableName,
-      migrationColumn,
-      enumValues,
-    );
-
-    // Alter column type to new enum
-    await this.updateColumnToNewEnum(
-      queryRunner,
-      schemaName,
-      tableName,
-      columnDefinition.columnName,
-      newEnumTypeName,
-      columnDefinition.defaultValue,
-    );
-
-    // Drop old enum type
-    await this.dropOldEnumType(queryRunner, schemaName, oldEnumTypeName);
-
-    // Rename new enum type to old enum type name
-    await this.renameEnumType(
-      queryRunner,
-      schemaName,
-      oldEnumTypeName,
-      newEnumTypeName,
-    );
-  }
-
-  private async createNewEnumType(
-    name: string,
-    queryRunner: QueryRunner,
-    schemaName: string,
-    newValues: string[],
-  ) {
-    const enumValues = newValues
-      .map((value) => `'${value.replace(/'/g, "''")}'`)
-      .join(', ');
-
-    await queryRunner.query(
-      `CREATE TYPE "${schemaName}"."${name}" AS ENUM (${enumValues})`,
-    );
-  }
-
-  private async migrateEnumValues(
-    queryRunner: QueryRunner,
-    schemaName: string,
-    tableName: string,
-    migrationColumn: WorkspaceMigrationColumnAlter,
-  ) {
-    const columnDefinition = migrationColumn.alteredColumnDefinition;
-
-    if (!columnDefinition.enum) {
-      return;
-    }
-
-    for (const enumValue of columnDefinition.enum) {
-      // Skip string values
-      if (typeof enumValue === 'string') {
-        continue;
-      }
-      await queryRunner.query(`
-        UPDATE "${schemaName}"."${tableName}"
-        SET "${columnDefinition.columnName}" = '${enumValue.to}'
-        WHERE "${columnDefinition.columnName}" = '${enumValue.from}'
-      `);
-    }
-  }
-
-  private async handleMissingEnumValues(
-    queryRunner: QueryRunner,
-    schemaName: string,
-    tableName: string,
-    migrationColumn: WorkspaceMigrationColumnAlter,
-    enumValues: string[],
-  ) {
-    const columnDefinition = migrationColumn.alteredColumnDefinition;
-
-    // Set missing values to null or default value
-    let defaultValue = 'NULL';
-
-    if (columnDefinition.defaultValue) {
-      if (Array.isArray(columnDefinition.defaultValue)) {
-        defaultValue = `ARRAY[${columnDefinition.defaultValue
-          .map((e) => `'${e}'`)
-          .join(', ')}]`;
-      } else {
-        defaultValue = columnDefinition.defaultValue;
-      }
-    }
-
-    await queryRunner.query(`
-      UPDATE "${schemaName}"."${tableName}"
-      SET "${columnDefinition.columnName}" = ${defaultValue}
-      WHERE "${columnDefinition.columnName}" NOT IN (${enumValues
-        .map((e) => `'${e}'`)
-        .join(', ')})
-    `);
-  }
-
-  private async updateColumnToNewEnum(
-    queryRunner: QueryRunner,
-    schemaName: string,
-    tableName: string,
-    columnName: string,
-    newEnumTypeName: string,
-    newDefaultValue: string,
-  ) {
-    await queryRunner.query(
-      `ALTER TABLE "${schemaName}"."${tableName}" ALTER COLUMN "${columnName}" DROP DEFAULT,
-      ALTER COLUMN "${columnName}" TYPE "${schemaName}"."${newEnumTypeName}" USING ("${columnName}"::text::"${schemaName}"."${newEnumTypeName}"),
-      ALTER COLUMN "${columnName}" SET DEFAULT ${newDefaultValue}`,
-    );
-  }
-
-  private async dropOldEnumType(
-    queryRunner: QueryRunner,
-    schemaName: string,
-    oldEnumTypeName: string,
-  ) {
-    await queryRunner.query(
-      `DROP TYPE IF EXISTS "${schemaName}"."${oldEnumTypeName}"`,
-    );
-  }
-
-  private async renameEnumType(
-    queryRunner: QueryRunner,
-    schemaName: string,
-    oldEnumTypeName: string,
-    newEnumTypeName: string,
-  ) {
-    await queryRunner.query(`
-      ALTER TYPE "${schemaName}"."${newEnumTypeName}"
-      RENAME TO "${oldEnumTypeName}"
-    `);
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-migration-runner/workspace-migration-runner.module.ts b/packages/twenty-server/src/workspace/workspace-migration-runner/workspace-migration-runner.module.ts
deleted file mode 100644
index 257a6cf3cfe3..000000000000
--- a/packages/twenty-server/src/workspace/workspace-migration-runner/workspace-migration-runner.module.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { WorkspaceMigrationModule } from 'src/metadata/workspace-migration/workspace-migration.module';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-import { WorkspaceCacheVersionModule } from 'src/metadata/workspace-cache-version/workspace-cache-version.module';
-import { WorkspaceMigrationEnumService } from 'src/workspace/workspace-migration-runner/services/workspace-migration-enum.service';
-
-import { WorkspaceMigrationRunnerService } from './workspace-migration-runner.service';
-
-import { WorkspaceMigrationTypeService } from './services/workspace-migration-type.service';
-
-@Module({
-  imports: [
-    WorkspaceDataSourceModule,
-    WorkspaceMigrationModule,
-    WorkspaceCacheVersionModule,
-  ],
-  providers: [
-    WorkspaceMigrationRunnerService,
-    WorkspaceMigrationEnumService,
-    WorkspaceMigrationTypeService,
-  ],
-  exports: [WorkspaceMigrationRunnerService],
-})
-export class WorkspaceMigrationRunnerModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/__tests__/args-string.factory.spec.ts b/packages/twenty-server/src/workspace/workspace-query-builder/factories/__tests__/args-string.factory.spec.ts
deleted file mode 100644
index c7eec0ac1f14..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/__tests__/args-string.factory.spec.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { TestingModule, Test } from '@nestjs/testing';
-
-import { ArgsAliasFactory } from 'src/workspace/workspace-query-builder/factories/args-alias.factory';
-import { ArgsStringFactory } from 'src/workspace/workspace-query-builder/factories/args-string.factory';
-
-describe('ArgsStringFactory', () => {
-  let service: ArgsStringFactory;
-  const argsAliasCreate = jest.fn();
-
-  beforeEach(async () => {
-    jest.resetAllMocks();
-
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        ArgsStringFactory,
-        {
-          provide: ArgsAliasFactory,
-          useValue: {
-            create: argsAliasCreate,
-          },
-        },
-      ],
-    }).compile();
-
-    service = module.get<ArgsStringFactory>(ArgsStringFactory);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-
-  describe('create', () => {
-    it('should return null when args are missing', () => {
-      const args = undefined;
-
-      const result = service.create(args, []);
-
-      expect(result).toBeNull();
-    });
-
-    it('should return a string with the args when args are present', () => {
-      const args = {
-        id: '1',
-        name: 'field_name',
-      };
-
-      argsAliasCreate.mockReturnValue(args);
-
-      const result = service.create(args, []);
-
-      expect(result).toEqual('id: "1", name: "field_name"');
-    });
-
-    it('should return a string with the args when args are present and the value is an object', () => {
-      const args = {
-        id: '1',
-        name: {
-          firstName: 'test',
-        },
-      };
-
-      argsAliasCreate.mockReturnValue(args);
-
-      const result = service.create(args, []);
-
-      expect(result).toEqual('id: "1", name: {firstName:"test"}');
-    });
-
-    it('when orderBy is present, should return an array of objects', () => {
-      const args = {
-        orderBy: {
-          id: 'AscNullsFirst',
-          name: 'AscNullsFirst',
-        },
-      };
-
-      argsAliasCreate.mockReturnValue(args);
-
-      const result = service.create(args, []);
-
-      expect(result).toEqual(
-        'orderBy: [{id: AscNullsFirst}, {name: AscNullsFirst}]',
-      );
-    });
-  });
-});
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/__tests__/find-duplicates-query.factory.spec.ts b/packages/twenty-server/src/workspace/workspace-query-builder/factories/__tests__/find-duplicates-query.factory.spec.ts
deleted file mode 100644
index 96472a36d950..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/__tests__/find-duplicates-query.factory.spec.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-
-import { RecordFilter } from 'src/workspace/workspace-query-builder/interfaces/record.interface';
-import { FindDuplicatesResolverArgs } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-
-import { ArgsAliasFactory } from 'src/workspace/workspace-query-builder/factories/args-alias.factory';
-import { FieldsStringFactory } from 'src/workspace/workspace-query-builder/factories/fields-string.factory';
-import { FindDuplicatesQueryFactory } from 'src/workspace/workspace-query-builder/factories/find-duplicates-query.factory';
-import { workspaceQueryBuilderOptions } from 'src/workspace/workspace-query-builder/utils-test/workspace-query-builder-options';
-
-describe('FindDuplicatesQueryFactory', () => {
-  let service: FindDuplicatesQueryFactory;
-  const argAliasCreate = jest.fn();
-
-  beforeEach(async () => {
-    jest.resetAllMocks();
-
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        FindDuplicatesQueryFactory,
-        {
-          provide: FieldsStringFactory,
-          useValue: {
-            create: jest.fn().mockResolvedValue('fieldsString'),
-            // Mock implementation of FieldsStringFactory methods if needed
-          },
-        },
-        {
-          provide: ArgsAliasFactory,
-          useValue: {
-            create: argAliasCreate,
-            // Mock implementation of ArgsAliasFactory methods if needed
-          },
-        },
-      ],
-    }).compile();
-
-    service = module.get<FindDuplicatesQueryFactory>(
-      FindDuplicatesQueryFactory,
-    );
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-
-  describe('create', () => {
-    it('should return (first: 0) as a filter when args are missing', async () => {
-      const args: FindDuplicatesResolverArgs<RecordFilter> = {};
-
-      const query = await service.create(args, workspaceQueryBuilderOptions);
-
-      expect(query.trim()).toEqual(`query {
-        objectNameCollection(first: 0) {
-          fieldsString
-        }
-      }`);
-    });
-
-    it('should use firstName and lastName as a filter when both args are present', async () => {
-      argAliasCreate.mockReturnValue({
-        nameFirstName: 'John',
-        nameLastName: 'Doe',
-      });
-
-      const args: FindDuplicatesResolverArgs<RecordFilter> = {
-        data: {
-          name: {
-            firstName: 'John',
-            lastName: 'Doe',
-          },
-        } as unknown as RecordFilter,
-      };
-
-      const query = await service.create(args, {
-        ...workspaceQueryBuilderOptions,
-        objectMetadataItem: {
-          ...workspaceQueryBuilderOptions.objectMetadataItem,
-          nameSingular: 'person',
-        },
-      });
-
-      expect(query.trim()).toEqual(`query {
-        personCollection(filter: {or:[{nameFirstName:{ilike:\"%John%\"},nameLastName:{ilike:\"%Doe%\"}}]}) {
-          fieldsString
-        }
-      }`);
-    });
-
-    it('should return (first: 0) as a filter when only firstName is present', async () => {
-      argAliasCreate.mockReturnValue({
-        nameFirstName: 'John',
-      });
-
-      const args: FindDuplicatesResolverArgs<RecordFilter> = {
-        data: {
-          name: {
-            firstName: 'John',
-          },
-        } as unknown as RecordFilter,
-      };
-
-      const query = await service.create(args, {
-        ...workspaceQueryBuilderOptions,
-        objectMetadataItem: {
-          ...workspaceQueryBuilderOptions.objectMetadataItem,
-          nameSingular: 'person',
-        },
-      });
-
-      expect(query.trim()).toEqual(`query {
-        personCollection(first: 0) {
-          fieldsString
-        }
-      }`);
-    });
-
-    it('should use "currentRecord" as query args when its present', async () => {
-      argAliasCreate.mockReturnValue({
-        nameFirstName: 'John',
-      });
-
-      const args: FindDuplicatesResolverArgs<RecordFilter> = {
-        id: 'uuid',
-      };
-
-      const query = await service.create(
-        args,
-        {
-          ...workspaceQueryBuilderOptions,
-          objectMetadataItem: {
-            ...workspaceQueryBuilderOptions.objectMetadataItem,
-            nameSingular: 'person',
-          },
-        },
-        {
-          nameFirstName: 'Peter',
-          nameLastName: 'Parker',
-        },
-      );
-
-      expect(query.trim()).toEqual(`query {
-        personCollection(filter: {id:{neq:\"uuid\"},or:[{nameFirstName:{ilike:\"%Peter%\"},nameLastName:{ilike:\"%Parker%\"}}]}) {
-          fieldsString
-        }
-      }`);
-    });
-  });
-
-  describe('buildQueryForExistingRecord', () => {
-    it(`should include all the fields that exist for person inside "duplicateCriteriaCollection" constant`, async () => {
-      const query = service.buildQueryForExistingRecord('uuid', {
-        ...workspaceQueryBuilderOptions,
-        objectMetadataItem: {
-          ...workspaceQueryBuilderOptions.objectMetadataItem,
-          nameSingular: 'person',
-        },
-      });
-
-      expect(query.trim()).toEqual(`query {
-        personCollection(filter: { id: { eq: \"uuid\" }}){
-          edges {
-            node {
-              __typename
-              nameFirstName
-nameLastName
-linkedinLinkUrl
-email
-            }
-          }
-        }
-      }`);
-    });
-  });
-});
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/args-alias.factory.ts b/packages/twenty-server/src/workspace/workspace-query-builder/factories/args-alias.factory.ts
deleted file mode 100644
index ae80ffd22c69..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/args-alias.factory.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-
-@Injectable()
-export class ArgsAliasFactory {
-  create(
-    args: Record<string, any>,
-    fieldMetadataCollection: FieldMetadataInterface[],
-  ): Record<string, any> {
-    const fieldMetadataMap = new Map(
-      fieldMetadataCollection.map((fieldMetadata) => [
-        fieldMetadata.name,
-        fieldMetadata,
-      ]),
-    );
-
-    return this.createArgsObjectRecursive(args, fieldMetadataMap);
-  }
-
-  private createArgsObjectRecursive(
-    args: Record<string, any>,
-    fieldMetadataMap: Map<string, FieldMetadataInterface>,
-  ) {
-    // If it's not an object, we don't need to do anything
-    if (typeof args !== 'object' || args === null) {
-      return args;
-    }
-
-    // If it's an array, we need to map all items
-    if (Array.isArray(args)) {
-      return args.map((arg) =>
-        this.createArgsObjectRecursive(arg, fieldMetadataMap),
-      );
-    }
-
-    const newArgs = {};
-
-    for (const [key, value] of Object.entries(args)) {
-      const fieldMetadata = fieldMetadataMap.get(key);
-
-      // If it's a special complex field, we need to map all columns
-      if (
-        fieldMetadata &&
-        typeof value === 'object' &&
-        value !== null &&
-        Object.values(fieldMetadata.targetColumnMap).length > 1
-      ) {
-        for (const [subKey, subValue] of Object.entries(value)) {
-          const mappedKey = fieldMetadata.targetColumnMap[subKey];
-
-          if (mappedKey) {
-            newArgs[mappedKey] = subValue;
-          }
-        }
-      } else if (fieldMetadata) {
-        // Otherwise we just need to map the value
-        const mappedKey = fieldMetadata.targetColumnMap.value;
-
-        newArgs[mappedKey ?? key] = value;
-      } else {
-        // Recurse if value is a nested object, otherwise append field or alias
-        newArgs[key] = this.createArgsObjectRecursive(value, fieldMetadataMap);
-      }
-    }
-
-    return newArgs;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/create-many-query.factory.ts b/packages/twenty-server/src/workspace/workspace-query-builder/factories/create-many-query.factory.ts
deleted file mode 100644
index 9db70306fc93..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/create-many-query.factory.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { v4 as uuidv4 } from 'uuid';
-
-import { WorkspaceQueryBuilderOptions } from 'src/workspace/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
-import { Record as IRecord } from 'src/workspace/workspace-query-builder/interfaces/record.interface';
-import { CreateManyResolverArgs } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-
-import { stringifyWithoutKeyQuote } from 'src/workspace/workspace-query-builder/utils/stringify-without-key-quote.util';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-
-import { FieldsStringFactory } from './fields-string.factory';
-import { ArgsAliasFactory } from './args-alias.factory';
-
-@Injectable()
-export class CreateManyQueryFactory {
-  private readonly logger = new Logger(CreateManyQueryFactory.name);
-
-  constructor(
-    private readonly fieldsStringFactory: FieldsStringFactory,
-    private readonly argsAliasFactory: ArgsAliasFactory,
-  ) {}
-
-  async create<Record extends IRecord = IRecord>(
-    args: CreateManyResolverArgs<Record>,
-    options: WorkspaceQueryBuilderOptions,
-  ) {
-    const fieldsString = await this.fieldsStringFactory.create(
-      options.info,
-      options.fieldMetadataCollection,
-      options.objectMetadataCollection,
-    );
-    const computedArgs = this.argsAliasFactory.create(
-      args,
-      options.fieldMetadataCollection,
-    );
-
-    return `
-      mutation {
-        insertInto${computeObjectTargetTable(
-          options.objectMetadataItem,
-        )}Collection(objects: ${stringifyWithoutKeyQuote(
-          computedArgs.data.map((datum) => ({
-            id: uuidv4(),
-            ...datum,
-          })),
-        )}) {
-          affectedCount
-          records {
-            ${fieldsString}
-          }
-        }
-      }
-    `;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/delete-many-query.factory.ts b/packages/twenty-server/src/workspace/workspace-query-builder/factories/delete-many-query.factory.ts
deleted file mode 100644
index b0082b5b77a9..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/delete-many-query.factory.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { WorkspaceQueryBuilderOptions } from 'src/workspace/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
-import { DeleteManyResolverArgs } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-
-import { stringifyWithoutKeyQuote } from 'src/workspace/workspace-query-builder/utils/stringify-without-key-quote.util';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-
-import { FieldsStringFactory } from './fields-string.factory';
-
-export interface DeleteManyQueryFactoryOptions
-  extends WorkspaceQueryBuilderOptions {
-  atMost?: number;
-}
-
-@Injectable()
-export class DeleteManyQueryFactory {
-  constructor(private readonly fieldsStringFactory: FieldsStringFactory) {}
-
-  async create(
-    args: DeleteManyResolverArgs,
-    options: DeleteManyQueryFactoryOptions,
-  ) {
-    const fieldsString = await this.fieldsStringFactory.create(
-      options.info,
-      options.fieldMetadataCollection,
-      options.objectMetadataCollection,
-    );
-
-    return `
-      mutation {
-        deleteFrom${computeObjectTargetTable(
-          options.objectMetadataItem,
-        )}Collection(filter: ${stringifyWithoutKeyQuote(
-          args.filter,
-        )}, atMost: ${options.atMost ?? 1}) {
-          affectedCount
-          records {
-            ${fieldsString}
-          }
-        }
-      }
-    `;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/delete-one-query.factory.ts b/packages/twenty-server/src/workspace/workspace-query-builder/factories/delete-one-query.factory.ts
deleted file mode 100644
index 65112ec0fb34..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/delete-one-query.factory.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { WorkspaceQueryBuilderOptions } from 'src/workspace/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
-import { DeleteOneResolverArgs } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-
-import { FieldsStringFactory } from './fields-string.factory';
-
-@Injectable()
-export class DeleteOneQueryFactory {
-  private readonly logger = new Logger(DeleteOneQueryFactory.name);
-
-  constructor(private readonly fieldsStringFactory: FieldsStringFactory) {}
-
-  async create(
-    args: DeleteOneResolverArgs,
-    options: WorkspaceQueryBuilderOptions,
-  ) {
-    const fieldsString = await this.fieldsStringFactory.create(
-      options.info,
-      options.fieldMetadataCollection,
-      options.objectMetadataCollection,
-    );
-
-    return `
-      mutation {
-        deleteFrom${computeObjectTargetTable(
-          options.objectMetadataItem,
-        )}Collection(filter: { id: { eq: "${args.id}" } }) {
-          affectedCount
-          records {
-            ${fieldsString}
-          }
-        }
-      }
-    `;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/factories.ts b/packages/twenty-server/src/workspace/workspace-query-builder/factories/factories.ts
deleted file mode 100644
index 0a876fe94c06..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/factories.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { ArgsAliasFactory } from './args-alias.factory';
-import { ArgsStringFactory } from './args-string.factory';
-import { RelationFieldAliasFactory } from './relation-field-alias.factory';
-import { CreateManyQueryFactory } from './create-many-query.factory';
-import { DeleteOneQueryFactory } from './delete-one-query.factory';
-import { FieldAliasFactory } from './field-alias.factory';
-import { FieldsStringFactory } from './fields-string.factory';
-import { FindManyQueryFactory } from './find-many-query.factory';
-import { FindOneQueryFactory } from './find-one-query.factory';
-import { UpdateOneQueryFactory } from './update-one-query.factory';
-import { UpdateManyQueryFactory } from './update-many-query.factory';
-import { DeleteManyQueryFactory } from './delete-many-query.factory';
-import { FindDuplicatesQueryFactory } from './find-duplicates-query.factory';
-
-export const workspaceQueryBuilderFactories = [
-  ArgsAliasFactory,
-  ArgsStringFactory,
-  RelationFieldAliasFactory,
-  CreateManyQueryFactory,
-  DeleteOneQueryFactory,
-  FieldAliasFactory,
-  FieldsStringFactory,
-  FindManyQueryFactory,
-  FindOneQueryFactory,
-  FindDuplicatesQueryFactory,
-  UpdateOneQueryFactory,
-  UpdateManyQueryFactory,
-  DeleteManyQueryFactory,
-];
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/field-alias.factory.ts b/packages/twenty-server/src/workspace/workspace-query-builder/factories/field-alias.factory.ts
deleted file mode 100644
index fd2f684e1250..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/field-alias.factory.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-
-@Injectable()
-export class FieldAliasFactory {
-  private readonly logger = new Logger(FieldAliasFactory.name);
-
-  create(fieldKey: string, fieldMetadata: FieldMetadataInterface) {
-    const entries = Object.entries(fieldMetadata.targetColumnMap);
-
-    if (entries.length === 0) {
-      return null;
-    }
-
-    if (entries.length === 1) {
-      // If there is only one value, use it as the alias
-      const alias = entries[0][1];
-
-      return `${fieldKey}: ${alias}`;
-    }
-
-    // Otherwise it means it's a special type with multiple values, so we need map all columns
-    return `
-      ${entries
-        .map(([key, value]) => `___${fieldMetadata.name}_${key}: ${value}`)
-        .join('\n')}
-    `;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/find-duplicates-query.factory.ts b/packages/twenty-server/src/workspace/workspace-query-builder/factories/find-duplicates-query.factory.ts
deleted file mode 100644
index b5bf98fc7a57..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/find-duplicates-query.factory.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import isEmpty from 'lodash.isempty';
-
-import { WorkspaceQueryBuilderOptions } from 'src/workspace/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
-import { RecordFilter } from 'src/workspace/workspace-query-builder/interfaces/record.interface';
-import { FindDuplicatesResolverArgs } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-import { stringifyWithoutKeyQuote } from 'src/workspace/workspace-query-builder/utils/stringify-without-key-quote.util';
-import { ArgsAliasFactory } from 'src/workspace/workspace-query-builder/factories/args-alias.factory';
-import { duplicateCriteriaCollection } from 'src/workspace/workspace-resolver-builder/constants/duplicate-criteria.constants';
-
-import { FieldsStringFactory } from './fields-string.factory';
-
-@Injectable()
-export class FindDuplicatesQueryFactory {
-  private readonly logger = new Logger(FindDuplicatesQueryFactory.name);
-
-  constructor(
-    private readonly fieldsStringFactory: FieldsStringFactory,
-    private readonly argsAliasFactory: ArgsAliasFactory,
-  ) {}
-
-  async create<Filter extends RecordFilter = RecordFilter>(
-    args: FindDuplicatesResolverArgs<Filter>,
-    options: WorkspaceQueryBuilderOptions,
-    currentRecord?: Record<string, unknown>,
-  ) {
-    const fieldsString = await this.fieldsStringFactory.create(
-      options.info,
-      options.fieldMetadataCollection,
-      options.objectMetadataCollection,
-    );
-
-    const argsData = this.getFindDuplicateBy<Filter>(
-      args,
-      options,
-      currentRecord,
-    );
-
-    const duplicateCondition = this.buildDuplicateCondition(
-      options.objectMetadataItem,
-      argsData,
-      args.id,
-    );
-
-    const filters = stringifyWithoutKeyQuote(duplicateCondition);
-
-    return `
-      query {
-        ${computeObjectTargetTable(options.objectMetadataItem)}Collection${
-          isEmpty(duplicateCondition?.or)
-            ? '(first: 0)'
-            : `(filter: ${filters})`
-        } {
-          ${fieldsString}
-        }
-      }
-    `;
-  }
-
-  getFindDuplicateBy<Filter extends RecordFilter = RecordFilter>(
-    args: FindDuplicatesResolverArgs<Filter>,
-    options: WorkspaceQueryBuilderOptions,
-    currentRecord?: Record<string, unknown>,
-  ) {
-    if (currentRecord) {
-      return currentRecord;
-    }
-
-    return this.argsAliasFactory.create(
-      args.data ?? {},
-      options.fieldMetadataCollection,
-    );
-  }
-
-  buildQueryForExistingRecord(
-    id: string,
-    options: WorkspaceQueryBuilderOptions,
-  ) {
-    return `
-      query {
-        ${computeObjectTargetTable(
-          options.objectMetadataItem,
-        )}Collection(filter: { id: { eq: "${id}" }}){
-          edges {
-            node {
-              __typename
-              ${this.getApplicableDuplicateCriteriaCollection(
-                options.objectMetadataItem,
-              )
-                .flatMap((dc) => dc.columnNames)
-                .join('\n')}
-            }
-          }
-        }
-      }
-    `;
-  }
-
-  private buildDuplicateCondition(
-    objectMetadataItem: ObjectMetadataInterface,
-    argsData?: Record<string, unknown>,
-    filteringByExistingRecordId?: string,
-  ) {
-    if (!argsData) {
-      return;
-    }
-
-    const criteriaCollection =
-      this.getApplicableDuplicateCriteriaCollection(objectMetadataItem);
-
-    const criteriaWithMatchingArgs = criteriaCollection.filter((criteria) =>
-      criteria.columnNames.every((columnName) => !!argsData[columnName]),
-    );
-
-    const filterCriteria = criteriaWithMatchingArgs.map((criteria) =>
-      Object.fromEntries(
-        criteria.columnNames.map((columnName) => [
-          columnName,
-          { ilike: `%${argsData[columnName]}%` },
-        ]),
-      ),
-    );
-
-    return {
-      // when filtering by an existing record, we need to filter that explicit record out
-      ...(filteringByExistingRecordId && {
-        id: { neq: filteringByExistingRecordId },
-      }),
-      // keep condition as "or" to get results by more duplicate criteria
-      or: filterCriteria,
-    };
-  }
-
-  private getApplicableDuplicateCriteriaCollection(
-    objectMetadataItem: ObjectMetadataInterface,
-  ) {
-    return duplicateCriteriaCollection.filter(
-      (duplicateCriteria) =>
-        duplicateCriteria.objectName === objectMetadataItem.nameSingular,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/find-many-query.factory.ts b/packages/twenty-server/src/workspace/workspace-query-builder/factories/find-many-query.factory.ts
deleted file mode 100644
index f5a5b573588f..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/find-many-query.factory.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { WorkspaceQueryBuilderOptions } from 'src/workspace/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
-import {
-  RecordFilter,
-  RecordOrderBy,
-} from 'src/workspace/workspace-query-builder/interfaces/record.interface';
-import { FindManyResolverArgs } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-
-import { ArgsStringFactory } from './args-string.factory';
-import { FieldsStringFactory } from './fields-string.factory';
-
-@Injectable()
-export class FindManyQueryFactory {
-  private readonly logger = new Logger(FindManyQueryFactory.name);
-
-  constructor(
-    private readonly fieldsStringFactory: FieldsStringFactory,
-    private readonly argsStringFactory: ArgsStringFactory,
-  ) {}
-
-  async create<
-    Filter extends RecordFilter = RecordFilter,
-    OrderBy extends RecordOrderBy = RecordOrderBy,
-  >(
-    args: FindManyResolverArgs<Filter, OrderBy>,
-    options: WorkspaceQueryBuilderOptions,
-  ) {
-    const fieldsString = await this.fieldsStringFactory.create(
-      options.info,
-      options.fieldMetadataCollection,
-      options.objectMetadataCollection,
-    );
-    const argsString = this.argsStringFactory.create(
-      args,
-      options.fieldMetadataCollection,
-    );
-
-    return `
-      query {
-        ${computeObjectTargetTable(options.objectMetadataItem)}Collection${
-          argsString ? `(${argsString})` : ''
-        } {
-          ${fieldsString}
-        }
-      }
-    `;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/find-one-query.factory.ts b/packages/twenty-server/src/workspace/workspace-query-builder/factories/find-one-query.factory.ts
deleted file mode 100644
index 89dbf5ce1e83..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/find-one-query.factory.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { WorkspaceQueryBuilderOptions } from 'src/workspace/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
-import { RecordFilter } from 'src/workspace/workspace-query-builder/interfaces/record.interface';
-import { FindOneResolverArgs } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-
-import { ArgsStringFactory } from './args-string.factory';
-import { FieldsStringFactory } from './fields-string.factory';
-
-@Injectable()
-export class FindOneQueryFactory {
-  private readonly logger = new Logger(FindOneQueryFactory.name);
-
-  constructor(
-    private readonly fieldsStringFactory: FieldsStringFactory,
-    private readonly argsStringFactory: ArgsStringFactory,
-  ) {}
-
-  async create<Filter extends RecordFilter = RecordFilter>(
-    args: FindOneResolverArgs<Filter>,
-    options: WorkspaceQueryBuilderOptions,
-  ) {
-    const fieldsString = await this.fieldsStringFactory.create(
-      options.info,
-      options.fieldMetadataCollection,
-      options.objectMetadataCollection,
-    );
-    const argsString = this.argsStringFactory.create(
-      args,
-      options.fieldMetadataCollection,
-    );
-
-    return `
-      query {
-        ${computeObjectTargetTable(options.objectMetadataItem)}Collection${
-          argsString ? `(${argsString})` : ''
-        } {
-          edges {
-            node {
-              ${fieldsString}
-            }
-          }
-        }
-      }
-    `;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/update-many-query.factory.ts b/packages/twenty-server/src/workspace/workspace-query-builder/factories/update-many-query.factory.ts
deleted file mode 100644
index 37d7ed501a19..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/update-many-query.factory.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import {
-  Record as IRecord,
-  RecordFilter,
-} from 'src/workspace/workspace-query-builder/interfaces/record.interface';
-import { WorkspaceQueryBuilderOptions } from 'src/workspace/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
-import { UpdateManyResolverArgs } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-
-import { stringifyWithoutKeyQuote } from 'src/workspace/workspace-query-builder/utils/stringify-without-key-quote.util';
-import { FieldsStringFactory } from 'src/workspace/workspace-query-builder/factories/fields-string.factory';
-import { ArgsAliasFactory } from 'src/workspace/workspace-query-builder/factories/args-alias.factory';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-
-export interface UpdateManyQueryFactoryOptions
-  extends WorkspaceQueryBuilderOptions {
-  atMost?: number;
-}
-
-@Injectable()
-export class UpdateManyQueryFactory {
-  constructor(
-    private readonly fieldsStringFactory: FieldsStringFactory,
-    private readonly argsAliasFactory: ArgsAliasFactory,
-  ) {}
-
-  async create<
-    Record extends IRecord = IRecord,
-    Filter extends RecordFilter = RecordFilter,
-  >(
-    args: UpdateManyResolverArgs<Record, Filter>,
-    options: UpdateManyQueryFactoryOptions,
-  ) {
-    const fieldsString = await this.fieldsStringFactory.create(
-      options.info,
-      options.fieldMetadataCollection,
-      options.objectMetadataCollection,
-    );
-
-    const computedArgs = this.argsAliasFactory.create(
-      args,
-      options.fieldMetadataCollection,
-    );
-
-    const argsData = {
-      ...computedArgs.data,
-      updatedAt: new Date().toISOString(),
-    };
-
-    return `
-    mutation {
-      update${computeObjectTargetTable(options.objectMetadataItem)}Collection(
-        set: ${stringifyWithoutKeyQuote(argsData)},
-        filter: ${stringifyWithoutKeyQuote(args.filter)},
-        atMost: ${options.atMost ?? 1},
-      ) {
-        affectedCount
-        records {
-          ${fieldsString}
-        }
-      }
-    }`;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/factories/update-one-query.factory.ts b/packages/twenty-server/src/workspace/workspace-query-builder/factories/update-one-query.factory.ts
deleted file mode 100644
index 73fbb6d1eb44..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/factories/update-one-query.factory.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { WorkspaceQueryBuilderOptions } from 'src/workspace/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
-import { Record as IRecord } from 'src/workspace/workspace-query-builder/interfaces/record.interface';
-import { UpdateOneResolverArgs } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-
-import { stringifyWithoutKeyQuote } from 'src/workspace/workspace-query-builder/utils/stringify-without-key-quote.util';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-
-import { FieldsStringFactory } from './fields-string.factory';
-import { ArgsAliasFactory } from './args-alias.factory';
-
-@Injectable()
-export class UpdateOneQueryFactory {
-  private readonly logger = new Logger(UpdateOneQueryFactory.name);
-
-  constructor(
-    private readonly fieldsStringFactory: FieldsStringFactory,
-    private readonly argsAliasFactory: ArgsAliasFactory,
-  ) {}
-
-  async create<Record extends IRecord = IRecord>(
-    args: UpdateOneResolverArgs<Record>,
-    options: WorkspaceQueryBuilderOptions,
-  ) {
-    const fieldsString = await this.fieldsStringFactory.create(
-      options.info,
-      options.fieldMetadataCollection,
-      options.objectMetadataCollection,
-    );
-    const computedArgs = this.argsAliasFactory.create(
-      args,
-      options.fieldMetadataCollection,
-    );
-
-    const argsData = {
-      ...computedArgs.data,
-      updatedAt: new Date().toISOString(),
-    };
-
-    return `
-      mutation {
-        update${computeObjectTargetTable(
-          options.objectMetadataItem,
-        )}Collection(set: ${stringifyWithoutKeyQuote(
-          argsData,
-        )}, filter: { id: { eq: "${computedArgs.id}" } }) {
-          affectedCount
-          records {
-            ${fieldsString}
-          }
-        }
-      }
-    `;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/interfaces/workspace-query-builder-options.interface.ts b/packages/twenty-server/src/workspace/workspace-query-builder/interfaces/workspace-query-builder-options.interface.ts
deleted file mode 100644
index 976cda78d61b..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/interfaces/workspace-query-builder-options.interface.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { GraphQLResolveInfo } from 'graphql';
-
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-export interface WorkspaceQueryBuilderOptions {
-  objectMetadataItem: ObjectMetadataInterface;
-  info: GraphQLResolveInfo;
-  fieldMetadataCollection: FieldMetadataInterface[];
-  objectMetadataCollection: ObjectMetadataInterface[];
-}
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/utils-test/workspace-query-builder-options.ts b/packages/twenty-server/src/workspace/workspace-query-builder/utils-test/workspace-query-builder-options.ts
deleted file mode 100644
index 7b052cdb309e..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/utils-test/workspace-query-builder-options.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { GraphQLResolveInfo } from 'graphql';
-
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-import { WorkspaceQueryBuilderOptions } from 'src/workspace/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
-
-import { objectMetadataItem } from 'src/utils/utils-test/object-metadata-item';
-
-export const workspaceQueryBuilderOptions: WorkspaceQueryBuilderOptions = {
-  fieldMetadataCollection: [],
-  info: {} as GraphQLResolveInfo,
-  objectMetadataCollection: [],
-  objectMetadataItem: objectMetadataItem as ObjectMetadataInterface,
-};
diff --git a/packages/twenty-server/src/workspace/workspace-query-builder/workspace-query-builder.module.ts b/packages/twenty-server/src/workspace/workspace-query-builder/workspace-query-builder.module.ts
deleted file mode 100644
index 367d95b495e2..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-builder/workspace-query-builder.module.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
-import { FieldsStringFactory } from 'src/workspace/workspace-query-builder/factories/fields-string.factory';
-
-import { WorkspaceQueryBuilderFactory } from './workspace-query-builder.factory';
-
-import { workspaceQueryBuilderFactories } from './factories/factories';
-
-@Module({
-  imports: [ObjectMetadataModule],
-  providers: [...workspaceQueryBuilderFactories, WorkspaceQueryBuilderFactory],
-  exports: [WorkspaceQueryBuilderFactory, FieldsStringFactory],
-})
-export class WorkspaceQueryBuilderModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-query-runner/interfaces/pg-graphql.interface.ts b/packages/twenty-server/src/workspace/workspace-query-runner/interfaces/pg-graphql.interface.ts
deleted file mode 100644
index b0bb89aa5b32..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-runner/interfaces/pg-graphql.interface.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Record as IRecord } from 'src/workspace/workspace-query-builder/interfaces/record.interface';
-
-export interface PGGraphQLResponse<Data = any> {
-  resolve: {
-    data: Data;
-    errors: any[];
-  };
-}
-
-export type PGGraphQLResult<Data = any> = [PGGraphQLResponse<Data>];
-
-export interface PGGraphQLMutation<Record = IRecord> {
-  affectedRows: number;
-  records: Record[];
-}
diff --git a/packages/twenty-server/src/workspace/workspace-query-runner/interfaces/query-runner-option.interface.ts b/packages/twenty-server/src/workspace/workspace-query-runner/interfaces/query-runner-option.interface.ts
deleted file mode 100644
index a0d5deb7cfd3..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-runner/interfaces/query-runner-option.interface.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { GraphQLResolveInfo } from 'graphql';
-
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-export interface WorkspaceQueryRunnerOptions {
-  workspaceId: string;
-  userId: string | undefined;
-  info: GraphQLResolveInfo;
-  objectMetadataItem: ObjectMetadataInterface;
-  fieldMetadataCollection: FieldMetadataInterface[];
-  objectMetadataCollection: ObjectMetadataInterface[];
-}
diff --git a/packages/twenty-server/src/workspace/workspace-query-runner/utils/__tests__/parse-result.spec.ts b/packages/twenty-server/src/workspace/workspace-query-runner/utils/__tests__/parse-result.spec.ts
deleted file mode 100644
index 2e5c67f5ceab..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-runner/utils/__tests__/parse-result.spec.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import {
-  isSpecialKey,
-  handleSpecialKey,
-  parseResult,
-} from 'src/workspace/workspace-query-runner/utils/parse-result.util';
-
-describe('isSpecialKey', () => {
-  test('should return true if the key starts with "___"', () => {
-    expect(isSpecialKey('___specialKey')).toBe(true);
-  });
-
-  test('should return false if the key does not start with "___"', () => {
-    expect(isSpecialKey('normalKey')).toBe(false);
-  });
-});
-
-describe('handleSpecialKey', () => {
-  let result;
-
-  beforeEach(() => {
-    result = {};
-  });
-
-  test('should correctly process a special key and add it to the result object', () => {
-    handleSpecialKey(result, '___complexField_link', 'value1');
-    expect(result).toEqual({
-      complexField: {
-        link: 'value1',
-      },
-    });
-  });
-
-  test('should add values under the same newKey if called multiple times', () => {
-    handleSpecialKey(result, '___complexField_link', 'value1');
-    handleSpecialKey(result, '___complexField_text', 'value2');
-    expect(result).toEqual({
-      complexField: {
-        link: 'value1',
-        text: 'value2',
-      },
-    });
-  });
-
-  test('should not create a new field if the special key is not correctly formed', () => {
-    handleSpecialKey(result, '___complexField', 'value1');
-    expect(result).toEqual({});
-  });
-});
-
-describe('parseResult', () => {
-  test('should recursively parse an object and handle special keys', () => {
-    const obj = {
-      normalField: 'value1',
-      ___specialField_part1: 'value2',
-      nested: {
-        ___specialFieldNested_part2: 'value3',
-      },
-    };
-
-    const expectedResult = {
-      normalField: 'value1',
-      specialField: {
-        part1: 'value2',
-      },
-      nested: {
-        specialFieldNested: {
-          part2: 'value3',
-        },
-      },
-    };
-
-    expect(parseResult(obj)).toEqual(expectedResult);
-  });
-
-  test('should handle arrays and parse each element', () => {
-    const objArray = [
-      {
-        ___specialField_part1: 'value1',
-      },
-      {
-        ___specialField_part2: 'value2',
-      },
-    ];
-
-    const expectedResult = [
-      {
-        specialField: {
-          part1: 'value1',
-        },
-      },
-      {
-        specialField: {
-          part2: 'value2',
-        },
-      },
-    ];
-
-    expect(parseResult(objArray)).toEqual(expectedResult);
-  });
-
-  test('should return the original value if it is not an object or array', () => {
-    expect(parseResult('stringValue')).toBe('stringValue');
-    expect(parseResult(12345)).toBe(12345);
-  });
-});
diff --git a/packages/twenty-server/src/workspace/workspace-query-runner/utils/parse-result.util.ts b/packages/twenty-server/src/workspace/workspace-query-runner/utils/parse-result.util.ts
deleted file mode 100644
index aedbb7fd13eb..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-runner/utils/parse-result.util.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-export const isSpecialKey = (key: string): boolean => {
-  return key.startsWith('___');
-};
-
-export const handleSpecialKey = (
-  result: any,
-  key: string,
-  value: any,
-): void => {
-  const parts = key.split('_').filter((part) => part);
-
-  // If parts don't contain enough information, return without altering result
-  if (parts.length < 2) {
-    return;
-  }
-
-  const newKey = parts.slice(0, -1).join('');
-  const subKey = parts[parts.length - 1];
-
-  if (!result[newKey]) {
-    result[newKey] = {};
-  }
-
-  result[newKey][subKey] = value;
-};
-
-export const parseResult = (obj: any): any => {
-  if (obj === null || typeof obj !== 'object' || typeof obj === 'function') {
-    return obj;
-  }
-
-  if (Array.isArray(obj)) {
-    return obj.map((item) => parseResult(item));
-  }
-
-  const result: any = {};
-
-  for (const key in obj) {
-    if (obj.hasOwnProperty(key)) {
-      if (typeof obj[key] === 'object' && obj[key] !== null) {
-        result[key] = parseResult(obj[key]);
-      } else if (key === '__typename') {
-        result[key] = obj[key].replace(/^_*/, '');
-      } else if (isSpecialKey(key)) {
-        handleSpecialKey(result, key, obj[key]);
-      } else {
-        result[key] = obj[key];
-      }
-    }
-  }
-
-  return result;
-};
diff --git a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface.ts b/packages/twenty-server/src/workspace/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface.ts
deleted file mode 100644
index 37a5fc7117b2..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ResolverArgs } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-
-export interface WorkspacePreQueryHook {
-  execute(
-    userId: string | undefined,
-    workspaceId: string,
-    payload: ResolverArgs,
-  ): Promise<void>;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.config.ts b/packages/twenty-server/src/workspace/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.config.ts
deleted file mode 100644
index f9e887341c79..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.config.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { MessageFindManyPreQueryHook } from 'src/workspace/messaging/query-hooks/message/message-find-many.pre-query.hook';
-import { MessageFindOnePreQueryHook } from 'src/workspace/messaging/query-hooks/message/message-find-one.pre-query-hook';
-import { WorkspaceQueryHook } from 'src/workspace/workspace-query-runner/workspace-pre-query-hook/types/workspace-query-hook.type';
-
-// TODO: move to a decorator
-export const workspacePreQueryHooks: WorkspaceQueryHook = {
-  message: {
-    findOne: [MessageFindOnePreQueryHook.name],
-    findMany: [MessageFindManyPreQueryHook.name],
-  },
-};
diff --git a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.module.ts b/packages/twenty-server/src/workspace/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.module.ts
deleted file mode 100644
index 31d7d977647d..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { MessagingQueryHookModule } from 'src/workspace/messaging/query-hooks/messaging-query-hook.module';
-import { WorkspacePreQueryHookService } from 'src/workspace/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.service';
-
-@Module({
-  imports: [MessagingQueryHookModule],
-  providers: [WorkspacePreQueryHookService],
-  exports: [WorkspacePreQueryHookService],
-})
-export class WorkspacePreQueryHookModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.service.ts b/packages/twenty-server/src/workspace/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.service.ts
deleted file mode 100644
index 1b0d61b94659..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.service.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { ModuleRef } from '@nestjs/core';
-
-import { WorkspacePreQueryHook } from 'src/workspace/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface';
-
-import {
-  ExecutePreHookMethod,
-  WorkspacePreQueryHookPayload,
-} from 'src/workspace/workspace-query-runner/workspace-pre-query-hook/types/workspace-query-hook.type';
-import { workspacePreQueryHooks } from 'src/workspace/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.config';
-
-@Injectable()
-export class WorkspacePreQueryHookService {
-  constructor(private readonly workspaceQueryHookModuleRef: ModuleRef) {}
-
-  public async executePreHooks<T extends ExecutePreHookMethod>(
-    userId: string | undefined,
-    workspaceId: string,
-    objectName: string,
-    method: T,
-    payload: WorkspacePreQueryHookPayload<T>,
-  ): Promise<void> {
-    const hooks = workspacePreQueryHooks[objectName] || [];
-
-    for (const hookName of Object.values(hooks[method] ?? [])) {
-      const hook: WorkspacePreQueryHook =
-        await this.workspaceQueryHookModuleRef.get(hookName, {
-          strict: false,
-        });
-
-      await hook.execute(userId, workspaceId, payload);
-    }
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-query-runner.module.ts b/packages/twenty-server/src/workspace/workspace-query-runner/workspace-query-runner.module.ts
deleted file mode 100644
index 0202cb4b728f..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-query-runner.module.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { WorkspaceQueryBuilderModule } from 'src/workspace/workspace-query-builder/workspace-query-builder.module';
-import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-import { WorkspacePreQueryHookModule } from 'src/workspace/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.module';
-
-import { WorkspaceQueryRunnerService } from './workspace-query-runner.service';
-
-@Module({
-  imports: [
-    WorkspaceQueryBuilderModule,
-    WorkspaceDataSourceModule,
-    WorkspacePreQueryHookModule,
-  ],
-  providers: [WorkspaceQueryRunnerService],
-  exports: [WorkspaceQueryRunnerService],
-})
-export class WorkspaceQueryRunnerModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-query-runner.service.ts b/packages/twenty-server/src/workspace/workspace-query-runner/workspace-query-runner.service.ts
deleted file mode 100644
index 3ae9a304a690..000000000000
--- a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-query-runner.service.ts
+++ /dev/null
@@ -1,506 +0,0 @@
-import {
-  BadRequestException,
-  Inject,
-  Injectable,
-  Logger,
-} from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
-
-import isEmpty from 'lodash.isempty';
-
-import { IConnection } from 'src/utils/pagination/interfaces/connection.interface';
-import {
-  Record as IRecord,
-  RecordFilter,
-  RecordOrderBy,
-} from 'src/workspace/workspace-query-builder/interfaces/record.interface';
-import {
-  CreateManyResolverArgs,
-  CreateOneResolverArgs,
-  DeleteManyResolverArgs,
-  DeleteOneResolverArgs,
-  FindDuplicatesResolverArgs,
-  FindManyResolverArgs,
-  FindOneResolverArgs,
-  UpdateManyResolverArgs,
-  UpdateOneResolverArgs,
-} from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-import { WorkspaceQueryBuilderFactory } from 'src/workspace/workspace-query-builder/workspace-query-builder.factory';
-import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
-import {
-  CallWebhookJobsJob,
-  CallWebhookJobsJobData,
-  CallWebhookJobsJobOperation,
-} from 'src/workspace/workspace-query-runner/jobs/call-webhook-jobs.job';
-import { parseResult } from 'src/workspace/workspace-query-runner/utils/parse-result.util';
-import { computeObjectTargetTable } from 'src/workspace/utils/compute-object-target-table.util';
-import { ObjectRecordDeleteEvent } from 'src/integrations/event-emitter/types/object-record-delete.event';
-import { ObjectRecordCreateEvent } from 'src/integrations/event-emitter/types/object-record-create.event';
-import { ObjectRecordUpdateEvent } from 'src/integrations/event-emitter/types/object-record-update.event';
-import { WorkspacePreQueryHookService } from 'src/workspace/workspace-query-runner/workspace-pre-query-hook/workspace-pre-query-hook.service';
-import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { NotFoundError } from 'src/filters/utils/graphql-errors.util';
-
-import { WorkspaceQueryRunnerOptions } from './interfaces/query-runner-option.interface';
-import {
-  PGGraphQLMutation,
-  PGGraphQLResult,
-} from './interfaces/pg-graphql.interface';
-import { computePgGraphQLError } from './utils/compute-pg-graphql-error.util';
-
-@Injectable()
-export class WorkspaceQueryRunnerService {
-  private readonly logger = new Logger(WorkspaceQueryRunnerService.name);
-
-  constructor(
-    private readonly workspaceQueryBuilderFactory: WorkspaceQueryBuilderFactory,
-    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
-    @Inject(MessageQueue.webhookQueue)
-    private readonly messageQueueService: MessageQueueService,
-    private readonly eventEmitter: EventEmitter2,
-    private readonly workspacePreQueryHookService: WorkspacePreQueryHookService,
-    private readonly environmentService: EnvironmentService,
-  ) {}
-
-  async findMany<
-    Record extends IRecord = IRecord,
-    Filter extends RecordFilter = RecordFilter,
-    OrderBy extends RecordOrderBy = RecordOrderBy,
-  >(
-    args: FindManyResolverArgs<Filter, OrderBy>,
-    options: WorkspaceQueryRunnerOptions,
-  ): Promise<IConnection<Record> | undefined> {
-    const { workspaceId, userId, objectMetadataItem } = options;
-    const start = performance.now();
-
-    const query = await this.workspaceQueryBuilderFactory.findMany(
-      args,
-      options,
-    );
-
-    await this.workspacePreQueryHookService.executePreHooks(
-      userId,
-      workspaceId,
-      objectMetadataItem.nameSingular,
-      'findMany',
-      args,
-    );
-
-    const result = await this.execute(query, workspaceId);
-    const end = performance.now();
-
-    this.logger.log(
-      `query time: ${end - start} ms on query ${
-        options.objectMetadataItem.nameSingular
-      }`,
-    );
-
-    return this.parseResult<IConnection<Record>>(
-      result,
-      objectMetadataItem,
-      '',
-    );
-  }
-
-  async findOne<
-    Record extends IRecord = IRecord,
-    Filter extends RecordFilter = RecordFilter,
-  >(
-    args: FindOneResolverArgs<Filter>,
-    options: WorkspaceQueryRunnerOptions,
-  ): Promise<Record | undefined> {
-    if (!args.filter || Object.keys(args.filter).length === 0) {
-      throw new BadRequestException('Missing filter argument');
-    }
-    const { workspaceId, userId, objectMetadataItem } = options;
-    const query = await this.workspaceQueryBuilderFactory.findOne(
-      args,
-      options,
-    );
-
-    await this.workspacePreQueryHookService.executePreHooks(
-      userId,
-      workspaceId,
-      objectMetadataItem.nameSingular,
-      'findOne',
-      args,
-    );
-
-    const result = await this.execute(query, workspaceId);
-    const parsedResult = this.parseResult<IConnection<Record>>(
-      result,
-      objectMetadataItem,
-      '',
-    );
-
-    return parsedResult?.edges?.[0]?.node;
-  }
-
-  async findDuplicates<TRecord extends IRecord = IRecord>(
-    args: FindDuplicatesResolverArgs<TRecord>,
-    options: WorkspaceQueryRunnerOptions,
-  ): Promise<IConnection<TRecord> | undefined> {
-    if (!args.data && !args.id) {
-      throw new BadRequestException(
-        'You have to provide either "data" or "id" argument',
-      );
-    }
-
-    if (!args.id && isEmpty(args.data)) {
-      throw new BadRequestException(
-        'The "data" condition can not be empty when ID input not provided',
-      );
-    }
-
-    const { workspaceId, userId, objectMetadataItem } = options;
-
-    let existingRecord: Record<string, unknown> | undefined;
-
-    if (args.id) {
-      const existingRecordQuery =
-        this.workspaceQueryBuilderFactory.findDuplicatesExistingRecord(
-          args.id,
-          options,
-        );
-
-      const existingRecordResult = await this.execute(
-        existingRecordQuery,
-        workspaceId,
-      );
-
-      const parsedResult = this.parseResult<Record<string, unknown>>(
-        existingRecordResult,
-        objectMetadataItem,
-        '',
-      );
-
-      existingRecord = parsedResult?.edges?.[0]?.node;
-
-      if (!existingRecord) {
-        throw new NotFoundError(`Object with id ${args.id} not found`);
-      }
-    }
-
-    const query = await this.workspaceQueryBuilderFactory.findDuplicates(
-      args,
-      options,
-      existingRecord,
-    );
-
-    await this.workspacePreQueryHookService.executePreHooks(
-      userId,
-      workspaceId,
-      objectMetadataItem.nameSingular,
-      'findDuplicates',
-      args,
-    );
-
-    const result = await this.execute(query, workspaceId);
-
-    return this.parseResult<IConnection<TRecord>>(
-      result,
-      objectMetadataItem,
-      '',
-    );
-  }
-
-  async createMany<Record extends IRecord = IRecord>(
-    args: CreateManyResolverArgs<Record>,
-    options: WorkspaceQueryRunnerOptions,
-  ): Promise<Record[] | undefined> {
-    const { workspaceId, objectMetadataItem } = options;
-    const query = await this.workspaceQueryBuilderFactory.createMany(
-      args,
-      options,
-    );
-
-    const result = await this.execute(query, workspaceId);
-
-    const parsedResults = this.parseResult<PGGraphQLMutation<Record>>(
-      result,
-      objectMetadataItem,
-      'insertInto',
-    )?.records;
-
-    await this.triggerWebhooks<Record>(
-      parsedResults,
-      CallWebhookJobsJobOperation.create,
-      options,
-    );
-
-    parsedResults.forEach((record) => {
-      this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.created`, {
-        workspaceId,
-        createdRecord: [this.removeNestedProperties(record)],
-      } satisfies ObjectRecordCreateEvent<any>);
-    });
-
-    return parsedResults;
-  }
-
-  async createOne<Record extends IRecord = IRecord>(
-    args: CreateOneResolverArgs<Record>,
-    options: WorkspaceQueryRunnerOptions,
-  ): Promise<Record | undefined> {
-    const results = await this.createMany({ data: [args.data] }, options);
-
-    return results?.[0];
-  }
-
-  async updateOne<Record extends IRecord = IRecord>(
-    args: UpdateOneResolverArgs<Record>,
-    options: WorkspaceQueryRunnerOptions,
-  ): Promise<Record | undefined> {
-    const { workspaceId, objectMetadataItem } = options;
-
-    const existingRecord = await this.findOne(
-      { filter: { id: { eq: args.id } } } as FindOneResolverArgs,
-      options,
-    );
-
-    const query = await this.workspaceQueryBuilderFactory.updateOne(
-      args,
-      options,
-    );
-
-    const result = await this.execute(query, workspaceId);
-
-    const parsedResults = this.parseResult<PGGraphQLMutation<Record>>(
-      result,
-      objectMetadataItem,
-      'update',
-    )?.records;
-
-    await this.triggerWebhooks<Record>(
-      parsedResults,
-      CallWebhookJobsJobOperation.update,
-      options,
-    );
-
-    this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.updated`, {
-      workspaceId,
-      previousRecord: this.removeNestedProperties(existingRecord as Record),
-      updatedRecord: this.removeNestedProperties(parsedResults?.[0]),
-    } satisfies ObjectRecordUpdateEvent<any>);
-
-    return parsedResults?.[0];
-  }
-
-  async updateMany<Record extends IRecord = IRecord>(
-    args: UpdateManyResolverArgs<Record>,
-    options: WorkspaceQueryRunnerOptions,
-  ): Promise<Record[] | undefined> {
-    const { workspaceId, objectMetadataItem } = options;
-    const maximumRecordAffected =
-      this.environmentService.getMutationMaximumRecordAffected();
-    const query = await this.workspaceQueryBuilderFactory.updateMany(args, {
-      ...options,
-      atMost: maximumRecordAffected,
-    });
-
-    const result = await this.execute(query, workspaceId);
-
-    const parsedResults = this.parseResult<PGGraphQLMutation<Record>>(
-      result,
-      objectMetadataItem,
-      'update',
-    )?.records;
-
-    await this.triggerWebhooks<Record>(
-      parsedResults,
-      CallWebhookJobsJobOperation.update,
-      options,
-    );
-
-    return parsedResults;
-  }
-
-  async deleteMany<
-    Record extends IRecord = IRecord,
-    Filter extends RecordFilter = RecordFilter,
-  >(
-    args: DeleteManyResolverArgs<Filter>,
-    options: WorkspaceQueryRunnerOptions,
-  ): Promise<Record[] | undefined> {
-    const { workspaceId, objectMetadataItem } = options;
-    const maximumRecordAffected =
-      this.environmentService.getMutationMaximumRecordAffected();
-    const query = await this.workspaceQueryBuilderFactory.deleteMany(args, {
-      ...options,
-      atMost: maximumRecordAffected,
-    });
-
-    const result = await this.execute(query, workspaceId);
-
-    const parsedResults = this.parseResult<PGGraphQLMutation<Record>>(
-      result,
-      objectMetadataItem,
-      'deleteFrom',
-    )?.records;
-
-    await this.triggerWebhooks<Record>(
-      parsedResults,
-      CallWebhookJobsJobOperation.delete,
-      options,
-    );
-
-    parsedResults.forEach((record) => {
-      this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.deleted`, {
-        workspaceId,
-        deletedRecord: [this.removeNestedProperties(record)],
-      } satisfies ObjectRecordDeleteEvent<any>);
-    });
-
-    return parsedResults;
-  }
-
-  async deleteOne<Record extends IRecord = IRecord>(
-    args: DeleteOneResolverArgs,
-    options: WorkspaceQueryRunnerOptions,
-  ): Promise<Record | undefined> {
-    const { workspaceId, objectMetadataItem } = options;
-    const query = await this.workspaceQueryBuilderFactory.deleteOne(
-      args,
-      options,
-    );
-    const result = await this.execute(query, workspaceId);
-
-    const parsedResults = this.parseResult<PGGraphQLMutation<Record>>(
-      result,
-      objectMetadataItem,
-      'deleteFrom',
-    )?.records;
-
-    await this.triggerWebhooks<Record>(
-      parsedResults,
-      CallWebhookJobsJobOperation.delete,
-      options,
-    );
-
-    this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.deleted`, {
-      workspaceId,
-      deletedRecord: this.removeNestedProperties(parsedResults?.[0]),
-    } satisfies ObjectRecordDeleteEvent<any>);
-
-    return parsedResults?.[0];
-  }
-
-  private removeNestedProperties<Record extends IRecord = IRecord>(
-    record: Record,
-  ) {
-    if (!record) {
-      return;
-    }
-    const sanitizedRecord = {};
-
-    for (const [key, value] of Object.entries(record)) {
-      if (value && typeof value === 'object' && value['edges']) {
-        continue;
-      }
-
-      sanitizedRecord[key] = value;
-    }
-
-    return sanitizedRecord;
-  }
-
-  async execute(
-    query: string,
-    workspaceId: string,
-  ): Promise<PGGraphQLResult | undefined> {
-    const workspaceDataSource =
-      await this.workspaceDataSourceService.connectToWorkspaceDataSource(
-        workspaceId,
-      );
-
-    await workspaceDataSource?.query(`
-        SET search_path TO ${this.workspaceDataSourceService.getSchemaName(
-          workspaceId,
-        )};
-      `);
-
-    const results = await workspaceDataSource?.query<PGGraphQLResult>(`
-        SELECT graphql.resolve($$
-          ${query}
-        $$);
-      `);
-
-    return results;
-  }
-
-  private parseResult<Result>(
-    graphqlResult: PGGraphQLResult | undefined,
-    objectMetadataItem: ObjectMetadataInterface,
-    command: string,
-  ): Result {
-    const entityKey = `${command}${computeObjectTargetTable(
-      objectMetadataItem,
-    )}Collection`;
-    const result = graphqlResult?.[0]?.resolve?.data?.[entityKey];
-    const errors = graphqlResult?.[0]?.resolve?.errors;
-
-    if (!result) {
-      this.logger.log(
-        `No result found for ${entityKey}, graphqlResult: ` +
-          JSON.stringify(graphqlResult, null, 3),
-      );
-    }
-
-    if (
-      result &&
-      ['update', 'deleteFrom'].includes(command) &&
-      !result.affectedCount
-    ) {
-      throw new BadRequestException('No rows were affected.');
-    }
-
-    if (errors && errors.length > 0) {
-      const error = computePgGraphQLError(
-        command,
-        objectMetadataItem.nameSingular,
-        errors,
-      );
-
-      throw error;
-    }
-
-    return parseResult(result);
-  }
-
-  async executeAndParse<Result>(
-    query: string,
-    objectMetadataItem: ObjectMetadataInterface,
-    command: string,
-    workspaceId: string,
-  ): Promise<Result> {
-    const result = await this.execute(query, workspaceId);
-
-    return this.parseResult(result, objectMetadataItem, command);
-  }
-
-  async triggerWebhooks<Record>(
-    jobsData: Record[] | undefined,
-    operation: CallWebhookJobsJobOperation,
-    options: WorkspaceQueryRunnerOptions,
-  ) {
-    if (!Array.isArray(jobsData)) {
-      return;
-    }
-    jobsData.forEach((jobData) => {
-      this.messageQueueService.add<CallWebhookJobsJobData>(
-        CallWebhookJobsJob.name,
-        {
-          record: jobData,
-          workspaceId: options.workspaceId,
-          operation,
-          objectMetadataItem: options.objectMetadataItem,
-        },
-        { retryLimit: 3 },
-      );
-    });
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/create-many-resolver.factory.ts b/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/create-many-resolver.factory.ts
deleted file mode 100644
index eb606ee23544..000000000000
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/create-many-resolver.factory.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import {
-  CreateManyResolverArgs,
-  Resolver,
-} from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { WorkspaceSchemaBuilderContext } from 'src/workspace/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
-import { WorkspaceResolverBuilderFactoryInterface } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
-
-import { WorkspaceQueryRunnerService } from 'src/workspace/workspace-query-runner/workspace-query-runner.service';
-
-@Injectable()
-export class CreateManyResolverFactory
-  implements WorkspaceResolverBuilderFactoryInterface
-{
-  public static methodName = 'createMany' as const;
-
-  constructor(
-    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
-  ) {}
-
-  create(
-    context: WorkspaceSchemaBuilderContext,
-  ): Resolver<CreateManyResolverArgs> {
-    const internalContext = context;
-
-    return (_source, args, context, info) => {
-      return this.workspaceQueryRunnerService.createMany(args, {
-        objectMetadataItem: internalContext.objectMetadataItem,
-        workspaceId: internalContext.workspaceId,
-        userId: internalContext.userId,
-        info,
-        fieldMetadataCollection: internalContext.fieldMetadataCollection,
-        objectMetadataCollection: internalContext.objectMetadataCollection,
-      });
-    };
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/create-one-resolver.factory.ts b/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/create-one-resolver.factory.ts
deleted file mode 100644
index f895db2dee1c..000000000000
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/create-one-resolver.factory.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import {
-  CreateOneResolverArgs,
-  Resolver,
-} from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { WorkspaceSchemaBuilderContext } from 'src/workspace/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
-import { WorkspaceResolverBuilderFactoryInterface } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
-
-import { WorkspaceQueryRunnerService } from 'src/workspace/workspace-query-runner/workspace-query-runner.service';
-
-@Injectable()
-export class CreateOneResolverFactory
-  implements WorkspaceResolverBuilderFactoryInterface
-{
-  public static methodName = 'createOne' as const;
-
-  constructor(
-    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
-  ) {}
-
-  create(
-    context: WorkspaceSchemaBuilderContext,
-  ): Resolver<CreateOneResolverArgs> {
-    const internalContext = context;
-
-    return (_source, args, context, info) => {
-      return this.workspaceQueryRunnerService.createOne(args, {
-        objectMetadataItem: internalContext.objectMetadataItem,
-        workspaceId: internalContext.workspaceId,
-        userId: internalContext.userId,
-        info,
-        fieldMetadataCollection: internalContext.fieldMetadataCollection,
-        objectMetadataCollection: internalContext.objectMetadataCollection,
-      });
-    };
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/delete-many-resolver.factory.ts b/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/delete-many-resolver.factory.ts
deleted file mode 100644
index 37deb7191048..000000000000
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/delete-many-resolver.factory.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import {
-  DeleteManyResolverArgs,
-  Resolver,
-} from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { WorkspaceSchemaBuilderContext } from 'src/workspace/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
-import { WorkspaceResolverBuilderFactoryInterface } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
-
-import { WorkspaceQueryRunnerService } from 'src/workspace/workspace-query-runner/workspace-query-runner.service';
-
-@Injectable()
-export class DeleteManyResolverFactory
-  implements WorkspaceResolverBuilderFactoryInterface
-{
-  public static methodName = 'deleteMany' as const;
-
-  constructor(
-    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
-  ) {}
-
-  create(
-    context: WorkspaceSchemaBuilderContext,
-  ): Resolver<DeleteManyResolverArgs> {
-    const internalContext = context;
-
-    return (_source, args, context, info) => {
-      return this.workspaceQueryRunnerService.deleteMany(args, {
-        objectMetadataItem: internalContext.objectMetadataItem,
-        workspaceId: internalContext.workspaceId,
-        userId: internalContext.userId,
-        info,
-        fieldMetadataCollection: internalContext.fieldMetadataCollection,
-        objectMetadataCollection: internalContext.objectMetadataCollection,
-      });
-    };
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/delete-one-resolver.factory.ts b/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/delete-one-resolver.factory.ts
deleted file mode 100644
index 28c5706d0678..000000000000
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/delete-one-resolver.factory.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import {
-  DeleteOneResolverArgs,
-  Resolver,
-} from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { WorkspaceSchemaBuilderContext } from 'src/workspace/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
-import { WorkspaceResolverBuilderFactoryInterface } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
-
-import { WorkspaceQueryRunnerService } from 'src/workspace/workspace-query-runner/workspace-query-runner.service';
-
-@Injectable()
-export class DeleteOneResolverFactory
-  implements WorkspaceResolverBuilderFactoryInterface
-{
-  public static methodName = 'deleteOne' as const;
-
-  constructor(
-    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
-  ) {}
-
-  create(
-    context: WorkspaceSchemaBuilderContext,
-  ): Resolver<DeleteOneResolverArgs> {
-    const internalContext = context;
-
-    return (_source, args, context, info) => {
-      return this.workspaceQueryRunnerService.deleteOne(args, {
-        objectMetadataItem: internalContext.objectMetadataItem,
-        workspaceId: internalContext.workspaceId,
-        userId: internalContext.userId,
-        info,
-        fieldMetadataCollection: internalContext.fieldMetadataCollection,
-        objectMetadataCollection: internalContext.objectMetadataCollection,
-      });
-    };
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/execute-quick-action-on-one-resolver.factory.ts b/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/execute-quick-action-on-one-resolver.factory.ts
deleted file mode 100644
index a2138d00303c..000000000000
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/execute-quick-action-on-one-resolver.factory.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import {
-  Resolver,
-  FindOneResolverArgs,
-  ExecuteQuickActionOnOneResolverArgs,
-  DeleteOneResolverArgs,
-} from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { Record as IRecord } from 'src/workspace/workspace-query-builder/interfaces/record.interface';
-import { WorkspaceSchemaBuilderContext } from 'src/workspace/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
-import { WorkspaceResolverBuilderFactoryInterface } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
-import { WorkspaceQueryRunnerOptions } from 'src/workspace/workspace-query-runner/interfaces/query-runner-option.interface';
-
-import { WorkspaceQueryRunnerService } from 'src/workspace/workspace-query-runner/workspace-query-runner.service';
-import { QuickActionsService } from 'src/core/quick-actions/quick-actions.service';
-
-@Injectable()
-export class ExecuteQuickActionOnOneResolverFactory
-  implements WorkspaceResolverBuilderFactoryInterface
-{
-  public static methodName = 'executeQuickActionOnOne' as const;
-
-  constructor(
-    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
-    private readonly quickActionsService: QuickActionsService,
-  ) {}
-
-  create(
-    context: WorkspaceSchemaBuilderContext,
-  ): Resolver<ExecuteQuickActionOnOneResolverArgs> {
-    const internalContext = context;
-
-    return (_source, args, context, info) => {
-      return this.executeQuickActionOnOne(args, {
-        objectMetadataItem: internalContext.objectMetadataItem,
-        userId: internalContext.userId,
-        workspaceId: internalContext.workspaceId,
-        info,
-        fieldMetadataCollection: internalContext.fieldMetadataCollection,
-        objectMetadataCollection: internalContext.objectMetadataCollection,
-      });
-    };
-  }
-
-  private async executeQuickActionOnOne<Record extends IRecord = IRecord>(
-    args: DeleteOneResolverArgs,
-    options: WorkspaceQueryRunnerOptions,
-  ): Promise<Record | undefined> {
-    switch (options.objectMetadataItem.nameSingular) {
-      case 'company': {
-        await this.quickActionsService.executeQuickActionOnCompany(
-          args.id,
-          options.workspaceId,
-          options.objectMetadataItem,
-        );
-        break;
-      }
-      case 'person': {
-        await this.quickActionsService.createCompanyFromPerson(
-          args.id,
-          options.workspaceId,
-          options.objectMetadataCollection,
-        );
-        break;
-      }
-      default:
-        // TODO: different quick actions per object on frontend
-        break;
-    }
-
-    return this.workspaceQueryRunnerService.findOne(
-      { filter: { id: { eq: args.id } } } as FindOneResolverArgs,
-      options,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/factories.ts b/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/factories.ts
deleted file mode 100644
index 2ee2f27064b1..000000000000
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/factories.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { UpdateManyResolverFactory } from 'src/workspace/workspace-resolver-builder/factories/update-many-resolver.factory';
-
-import { FindDuplicatesResolverFactory } from './find-duplicates-resolver.factory';
-import { FindManyResolverFactory } from './find-many-resolver.factory';
-import { FindOneResolverFactory } from './find-one-resolver.factory';
-import { CreateManyResolverFactory } from './create-many-resolver.factory';
-import { CreateOneResolverFactory } from './create-one-resolver.factory';
-import { UpdateOneResolverFactory } from './update-one-resolver.factory';
-import { DeleteOneResolverFactory } from './delete-one-resolver.factory';
-import { DeleteManyResolverFactory } from './delete-many-resolver.factory';
-import { ExecuteQuickActionOnOneResolverFactory } from './execute-quick-action-on-one-resolver.factory';
-
-export const workspaceResolverBuilderFactories = [
-  FindManyResolverFactory,
-  FindOneResolverFactory,
-  FindDuplicatesResolverFactory,
-  CreateManyResolverFactory,
-  CreateOneResolverFactory,
-  UpdateOneResolverFactory,
-  DeleteOneResolverFactory,
-  ExecuteQuickActionOnOneResolverFactory,
-  UpdateManyResolverFactory,
-  DeleteManyResolverFactory,
-];
-
-export const workspaceResolverBuilderMethodNames = {
-  queries: [
-    FindManyResolverFactory.methodName,
-    FindOneResolverFactory.methodName,
-    FindDuplicatesResolverFactory.methodName,
-  ],
-  mutations: [
-    CreateManyResolverFactory.methodName,
-    CreateOneResolverFactory.methodName,
-    UpdateOneResolverFactory.methodName,
-    DeleteOneResolverFactory.methodName,
-    ExecuteQuickActionOnOneResolverFactory.methodName,
-    UpdateManyResolverFactory.methodName,
-    DeleteManyResolverFactory.methodName,
-  ],
-} as const;
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/find-duplicates-resolver.factory.ts b/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/find-duplicates-resolver.factory.ts
deleted file mode 100644
index 3d2e3ac185ab..000000000000
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/find-duplicates-resolver.factory.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import {
-  FindDuplicatesResolverArgs,
-  Resolver,
-} from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { WorkspaceSchemaBuilderContext } from 'src/workspace/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
-import { WorkspaceResolverBuilderFactoryInterface } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
-
-import { WorkspaceQueryRunnerService } from 'src/workspace/workspace-query-runner/workspace-query-runner.service';
-
-@Injectable()
-export class FindDuplicatesResolverFactory
-  implements WorkspaceResolverBuilderFactoryInterface
-{
-  public static methodName = 'findDuplicates' as const;
-
-  constructor(
-    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
-  ) {}
-
-  create(
-    context: WorkspaceSchemaBuilderContext,
-  ): Resolver<FindDuplicatesResolverArgs> {
-    const internalContext = context;
-
-    return (_source, args, context, info) => {
-      return this.workspaceQueryRunnerService.findDuplicates(args, {
-        objectMetadataItem: internalContext.objectMetadataItem,
-        workspaceId: internalContext.workspaceId,
-        userId: internalContext.userId,
-        info,
-        fieldMetadataCollection: internalContext.fieldMetadataCollection,
-        objectMetadataCollection: internalContext.objectMetadataCollection,
-      });
-    };
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/find-many-resolver.factory.ts b/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/find-many-resolver.factory.ts
deleted file mode 100644
index 3009ea39e351..000000000000
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/find-many-resolver.factory.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import {
-  FindManyResolverArgs,
-  Resolver,
-} from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { WorkspaceSchemaBuilderContext } from 'src/workspace/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
-import { WorkspaceResolverBuilderFactoryInterface } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
-
-import { WorkspaceQueryRunnerService } from 'src/workspace/workspace-query-runner/workspace-query-runner.service';
-
-@Injectable()
-export class FindManyResolverFactory
-  implements WorkspaceResolverBuilderFactoryInterface
-{
-  public static methodName = 'findMany' as const;
-
-  constructor(
-    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
-  ) {}
-
-  create(
-    context: WorkspaceSchemaBuilderContext,
-  ): Resolver<FindManyResolverArgs> {
-    const internalContext = context;
-
-    return (_source, args, context, info) => {
-      return this.workspaceQueryRunnerService.findMany(args, {
-        objectMetadataItem: internalContext.objectMetadataItem,
-        workspaceId: internalContext.workspaceId,
-        userId: internalContext.userId,
-        info,
-        fieldMetadataCollection: internalContext.fieldMetadataCollection,
-        objectMetadataCollection: internalContext.objectMetadataCollection,
-      });
-    };
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/find-one-resolver.factory.ts b/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/find-one-resolver.factory.ts
deleted file mode 100644
index 114b8ef4e5bf..000000000000
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/find-one-resolver.factory.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import {
-  FindOneResolverArgs,
-  Resolver,
-} from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { WorkspaceSchemaBuilderContext } from 'src/workspace/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
-import { WorkspaceResolverBuilderFactoryInterface } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
-
-import { WorkspaceQueryRunnerService } from 'src/workspace/workspace-query-runner/workspace-query-runner.service';
-
-@Injectable()
-export class FindOneResolverFactory
-  implements WorkspaceResolverBuilderFactoryInterface
-{
-  public static methodName = 'findOne' as const;
-
-  constructor(
-    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
-  ) {}
-
-  create(
-    context: WorkspaceSchemaBuilderContext,
-  ): Resolver<FindOneResolverArgs> {
-    const internalContext = context;
-
-    return (_source, args, context, info) => {
-      return this.workspaceQueryRunnerService.findOne(args, {
-        objectMetadataItem: internalContext.objectMetadataItem,
-        workspaceId: internalContext.workspaceId,
-        userId: internalContext.userId,
-        info,
-        fieldMetadataCollection: internalContext.fieldMetadataCollection,
-        objectMetadataCollection: internalContext.objectMetadataCollection,
-      });
-    };
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/update-many-resolver.factory.ts b/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/update-many-resolver.factory.ts
deleted file mode 100644
index ba3d79c34a50..000000000000
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/update-many-resolver.factory.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import {
-  Resolver,
-  UpdateManyResolverArgs,
-} from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { WorkspaceSchemaBuilderContext } from 'src/workspace/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
-import { WorkspaceResolverBuilderFactoryInterface } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
-
-import { WorkspaceQueryRunnerService } from 'src/workspace/workspace-query-runner/workspace-query-runner.service';
-
-@Injectable()
-export class UpdateManyResolverFactory
-  implements WorkspaceResolverBuilderFactoryInterface
-{
-  public static methodName = 'updateMany' as const;
-
-  constructor(
-    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
-  ) {}
-
-  create(
-    context: WorkspaceSchemaBuilderContext,
-  ): Resolver<UpdateManyResolverArgs> {
-    const internalContext = context;
-
-    return (_source, args, context, info) => {
-      return this.workspaceQueryRunnerService.updateMany(args, {
-        objectMetadataItem: internalContext.objectMetadataItem,
-        workspaceId: internalContext.workspaceId,
-        userId: internalContext.userId,
-        info,
-        fieldMetadataCollection: internalContext.fieldMetadataCollection,
-        objectMetadataCollection: internalContext.objectMetadataCollection,
-      });
-    };
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/update-one-resolver.factory.ts b/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/update-one-resolver.factory.ts
deleted file mode 100644
index a6ba683669ca..000000000000
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/factories/update-one-resolver.factory.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import {
-  Resolver,
-  UpdateOneResolverArgs,
-} from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { WorkspaceSchemaBuilderContext } from 'src/workspace/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
-import { WorkspaceResolverBuilderFactoryInterface } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
-
-import { WorkspaceQueryRunnerService } from 'src/workspace/workspace-query-runner/workspace-query-runner.service';
-
-@Injectable()
-export class UpdateOneResolverFactory
-  implements WorkspaceResolverBuilderFactoryInterface
-{
-  public static methodName = 'updateOne' as const;
-
-  constructor(
-    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
-  ) {}
-
-  create(
-    context: WorkspaceSchemaBuilderContext,
-  ): Resolver<UpdateOneResolverArgs> {
-    const internalContext = context;
-
-    return (_source, args, context, info) => {
-      return this.workspaceQueryRunnerService.updateOne(args, {
-        objectMetadataItem: internalContext.objectMetadataItem,
-        workspaceId: internalContext.workspaceId,
-        userId: internalContext.userId,
-        info,
-        fieldMetadataCollection: internalContext.fieldMetadataCollection,
-        objectMetadataCollection: internalContext.objectMetadataCollection,
-      });
-    };
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/interfaces/pg-graphql.interface.ts b/packages/twenty-server/src/workspace/workspace-resolver-builder/interfaces/pg-graphql.interface.ts
deleted file mode 100644
index 4bca0075e2eb..000000000000
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/interfaces/pg-graphql.interface.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Record as IRecord } from 'src/workspace/workspace-query-builder/interfaces/record.interface';
-
-export interface PGGraphQLResponse<Data = any> {
-  resolve: {
-    data: Data;
-  };
-}
-
-export type PGGraphQLResult<Data = any> = [PGGraphQLResponse<Data>];
-
-export interface PGGraphQLMutation<Record = IRecord> {
-  affectedRows: number;
-  records: Record[];
-}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface.ts b/packages/twenty-server/src/workspace/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface.ts
deleted file mode 100644
index d1c880039930..000000000000
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { WorkspaceSchemaBuilderContext } from 'src/workspace/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
-
-import { Resolver } from './workspace-resolvers-builder.interface';
-
-export interface WorkspaceResolverBuilderFactoryInterface {
-  create(context: WorkspaceSchemaBuilderContext): Resolver;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-resolver-builder/workspace-resolver-builder.module.ts b/packages/twenty-server/src/workspace/workspace-resolver-builder/workspace-resolver-builder.module.ts
deleted file mode 100644
index 2e6e1dccdf94..000000000000
--- a/packages/twenty-server/src/workspace/workspace-resolver-builder/workspace-resolver-builder.module.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { WorkspaceQueryRunnerModule } from 'src/workspace/workspace-query-runner/workspace-query-runner.module';
-import { QuickActionsModule } from 'src/core/quick-actions/quick-actions.module';
-
-import { WorkspaceResolverFactory } from './workspace-resolver.factory';
-
-import { workspaceResolverBuilderFactories } from './factories/factories';
-
-@Module({
-  imports: [WorkspaceQueryRunnerModule, QuickActionsModule],
-  providers: [...workspaceResolverBuilderFactories, WorkspaceResolverFactory],
-  exports: [WorkspaceResolverFactory],
-})
-export class WorkspaceResolverBuilderModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/connection-type.factory.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/factories/connection-type.factory.ts
deleted file mode 100644
index 05256efa4c49..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/connection-type.factory.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { GraphQLOutputType } from 'graphql';
-
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-import {
-  TypeMapperService,
-  TypeOptions,
-} from 'src/workspace/workspace-schema-builder/services/type-mapper.service';
-import { TypeDefinitionsStorage } from 'src/workspace/workspace-schema-builder/storages/type-definitions.storage';
-import { PageInfoType } from 'src/workspace/workspace-schema-builder/graphql-types/object';
-
-import { ConnectionTypeDefinitionKind } from './connection-type-definition.factory';
-import { ObjectTypeDefinitionKind } from './object-type-definition.factory';
-
-@Injectable()
-export class ConnectionTypeFactory {
-  private readonly logger = new Logger(ConnectionTypeFactory.name);
-
-  constructor(
-    private readonly typeMapperService: TypeMapperService,
-    private readonly typeDefinitionsStorage: TypeDefinitionsStorage,
-  ) {}
-
-  public create(
-    objectMetadata: ObjectMetadataInterface,
-    kind: ConnectionTypeDefinitionKind,
-    buildOtions: WorkspaceBuildSchemaOptions,
-    typeOptions: TypeOptions,
-  ): GraphQLOutputType {
-    if (kind === ConnectionTypeDefinitionKind.PageInfo) {
-      return this.typeMapperService.mapToGqlType(PageInfoType, typeOptions);
-    }
-
-    const edgeType = this.typeDefinitionsStorage.getObjectTypeByKey(
-      objectMetadata.id,
-      kind as unknown as ObjectTypeDefinitionKind,
-    );
-
-    if (!edgeType) {
-      this.logger.error(
-        `Edge type for ${objectMetadata.nameSingular} was not found. Please, check if you have defined it.`,
-        {
-          objectMetadata,
-          buildOtions,
-        },
-      );
-
-      throw new Error(
-        `Edge type for ${objectMetadata.nameSingular} was not found. Please, check if you have defined it.`,
-      );
-    }
-
-    return this.typeMapperService.mapToGqlType(edgeType, typeOptions);
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/edge-type.factory.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/factories/edge-type.factory.ts
deleted file mode 100644
index 003c29ce12cf..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/edge-type.factory.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { GraphQLOutputType } from 'graphql';
-
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-import {
-  TypeMapperService,
-  TypeOptions,
-} from 'src/workspace/workspace-schema-builder/services/type-mapper.service';
-import { TypeDefinitionsStorage } from 'src/workspace/workspace-schema-builder/storages/type-definitions.storage';
-import { CursorScalarType } from 'src/workspace/workspace-schema-builder/graphql-types/scalars';
-
-import { ObjectTypeDefinitionKind } from './object-type-definition.factory';
-import { EdgeTypeDefinitionKind } from './edge-type-definition.factory';
-
-@Injectable()
-export class EdgeTypeFactory {
-  private readonly logger = new Logger(EdgeTypeFactory.name);
-
-  constructor(
-    private readonly typeMapperService: TypeMapperService,
-    private readonly typeDefinitionsStorage: TypeDefinitionsStorage,
-  ) {}
-
-  public create(
-    objectMetadata: ObjectMetadataInterface,
-    kind: EdgeTypeDefinitionKind,
-    buildOtions: WorkspaceBuildSchemaOptions,
-    typeOptions: TypeOptions,
-  ): GraphQLOutputType {
-    if (kind === EdgeTypeDefinitionKind.Cursor) {
-      return this.typeMapperService.mapToGqlType(CursorScalarType, typeOptions);
-    }
-
-    const objectType = this.typeDefinitionsStorage.getObjectTypeByKey(
-      objectMetadata.id,
-      ObjectTypeDefinitionKind.Plain,
-    );
-
-    if (!objectType) {
-      this.logger.error(
-        `Node type for ${objectMetadata.nameSingular} was not found. Please, check if you have defined it.`,
-        {
-          objectMetadata,
-          buildOtions,
-        },
-      );
-
-      throw new Error(
-        `Node type for ${objectMetadata.nameSingular} was not found. Please, check if you have defined it.`,
-      );
-    }
-
-    return this.typeMapperService.mapToGqlType(objectType, typeOptions);
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/factories.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/factories/factories.ts
deleted file mode 100644
index 3d9feba653ec..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/factories.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { EnumTypeDefinitionFactory } from 'src/workspace/workspace-schema-builder/factories/enum-type-definition.factory';
-
-import { ArgsFactory } from './args.factory';
-import { InputTypeFactory } from './input-type.factory';
-import { InputTypeDefinitionFactory } from './input-type-definition.factory';
-import { ObjectTypeDefinitionFactory } from './object-type-definition.factory';
-import { OutputTypeFactory } from './output-type.factory';
-import { QueryTypeFactory } from './query-type.factory';
-import { RootTypeFactory } from './root-type.factory';
-import { FilterTypeFactory } from './filter-type.factory';
-import { FilterTypeDefinitionFactory } from './filter-type-definition.factory';
-import { ConnectionTypeFactory } from './connection-type.factory';
-import { ConnectionTypeDefinitionFactory } from './connection-type-definition.factory';
-import { EdgeTypeFactory } from './edge-type.factory';
-import { EdgeTypeDefinitionFactory } from './edge-type-definition.factory';
-import { MutationTypeFactory } from './mutation-type.factory';
-import { OrderByTypeFactory } from './order-by-type.factory';
-import { OrderByTypeDefinitionFactory } from './order-by-type-definition.factory';
-import { RelationTypeFactory } from './relation-type.factory';
-import { ExtendObjectTypeDefinitionFactory } from './extend-object-type-definition.factory';
-import { OrphanedTypesFactory } from './orphaned-types.factory';
-
-export const workspaceSchemaBuilderFactories = [
-  ArgsFactory,
-  InputTypeFactory,
-  InputTypeDefinitionFactory,
-  OutputTypeFactory,
-  ObjectTypeDefinitionFactory,
-  EnumTypeDefinitionFactory,
-  RelationTypeFactory,
-  ExtendObjectTypeDefinitionFactory,
-  FilterTypeFactory,
-  FilterTypeDefinitionFactory,
-  OrderByTypeFactory,
-  OrderByTypeDefinitionFactory,
-  ConnectionTypeFactory,
-  ConnectionTypeDefinitionFactory,
-  EdgeTypeFactory,
-  EdgeTypeDefinitionFactory,
-  RootTypeFactory,
-  QueryTypeFactory,
-  MutationTypeFactory,
-  OrphanedTypesFactory,
-];
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/filter-type-definition.factory.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/factories/filter-type-definition.factory.ts
deleted file mode 100644
index 934aadd5c318..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/filter-type-definition.factory.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { GraphQLInputFieldConfigMap, GraphQLInputObjectType } from 'graphql';
-
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-import { pascalCase } from 'src/utils/pascal-case';
-import { TypeMapperService } from 'src/workspace/workspace-schema-builder/services/type-mapper.service';
-import { isRelationFieldMetadataType } from 'src/workspace/utils/is-relation-field-metadata-type.util';
-
-import { FilterTypeFactory } from './filter-type.factory';
-import {
-  InputTypeDefinition,
-  InputTypeDefinitionKind,
-} from './input-type-definition.factory';
-
-@Injectable()
-export class FilterTypeDefinitionFactory {
-  constructor(
-    private readonly filterTypeFactory: FilterTypeFactory,
-    private readonly typeMapperService: TypeMapperService,
-  ) {}
-
-  public create(
-    objectMetadata: ObjectMetadataInterface,
-    options: WorkspaceBuildSchemaOptions,
-  ): InputTypeDefinition {
-    const kind = InputTypeDefinitionKind.Filter;
-    const filterInputType = new GraphQLInputObjectType({
-      name: `${pascalCase(objectMetadata.nameSingular)}${kind.toString()}Input`,
-      description: objectMetadata.description,
-      fields: () => {
-        const andOrType = this.typeMapperService.mapToGqlType(filterInputType, {
-          isArray: true,
-          arrayDepth: 1,
-          nullable: true,
-        });
-
-        return {
-          ...this.generateFields(objectMetadata, options),
-          and: {
-            type: andOrType,
-          },
-          or: {
-            type: andOrType,
-          },
-          not: {
-            type: this.typeMapperService.mapToGqlType(filterInputType, {
-              nullable: true,
-            }),
-          },
-        };
-      },
-    });
-
-    return {
-      target: objectMetadata.id,
-      kind,
-      type: filterInputType,
-    };
-  }
-
-  private generateFields(
-    objectMetadata: ObjectMetadataInterface,
-    options: WorkspaceBuildSchemaOptions,
-  ): GraphQLInputFieldConfigMap {
-    const fields: GraphQLInputFieldConfigMap = {};
-
-    for (const fieldMetadata of objectMetadata.fields) {
-      // Relation types are generated during extension of object type definition
-      if (isRelationFieldMetadataType(fieldMetadata.type)) {
-        continue;
-      }
-
-      const type = this.filterTypeFactory.create(fieldMetadata, options, {
-        nullable: fieldMetadata.isNullable,
-        defaultValue: fieldMetadata.defaultValue,
-      });
-
-      fields[fieldMetadata.name] = {
-        type,
-        description: fieldMetadata.description,
-        // TODO: Add default value
-        defaultValue: undefined,
-      };
-    }
-
-    return fields;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/filter-type.factory.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/factories/filter-type.factory.ts
deleted file mode 100644
index 434f2c138133..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/filter-type.factory.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import {
-  GraphQLInputObjectType,
-  GraphQLInputType,
-  GraphQLList,
-  GraphQLScalarType,
-} from 'graphql';
-
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-
-import {
-  TypeMapperService,
-  TypeOptions,
-} from 'src/workspace/workspace-schema-builder/services/type-mapper.service';
-import { TypeDefinitionsStorage } from 'src/workspace/workspace-schema-builder/storages/type-definitions.storage';
-import { isCompositeFieldMetadataType } from 'src/metadata/field-metadata/utils/is-composite-field-metadata-type.util';
-import { isEnumFieldMetadataType } from 'src/metadata/field-metadata/utils/is-enum-field-metadata-type.util';
-import { FilterIs } from 'src/workspace/workspace-schema-builder/graphql-types/input/filter-is.input-type';
-
-import { InputTypeDefinitionKind } from './input-type-definition.factory';
-
-@Injectable()
-export class FilterTypeFactory {
-  private readonly logger = new Logger(FilterTypeFactory.name);
-
-  constructor(
-    private readonly typeMapperService: TypeMapperService,
-    private readonly typeDefinitionsStorage: TypeDefinitionsStorage,
-  ) {}
-
-  public create(
-    fieldMetadata: FieldMetadataInterface,
-    buildOptions: WorkspaceBuildSchemaOptions,
-    typeOptions: TypeOptions,
-  ): GraphQLInputType {
-    const target = isCompositeFieldMetadataType(fieldMetadata.type)
-      ? fieldMetadata.type.toString()
-      : fieldMetadata.id;
-    let filterType: GraphQLInputObjectType | GraphQLScalarType | undefined =
-      undefined;
-
-    if (isEnumFieldMetadataType(fieldMetadata.type)) {
-      filterType = this.createEnumFilterType(fieldMetadata);
-    } else {
-      filterType = this.typeMapperService.mapToFilterType(
-        fieldMetadata.type,
-        buildOptions.dateScalarMode,
-        buildOptions.numberScalarMode,
-      );
-
-      filterType ??= this.typeDefinitionsStorage.getInputTypeByKey(
-        target,
-        InputTypeDefinitionKind.Filter,
-      );
-    }
-
-    if (!filterType) {
-      this.logger.error(`Could not find a GraphQL type for ${target}`, {
-        fieldMetadata,
-        buildOptions,
-        typeOptions,
-      });
-
-      throw new Error(`Could not find a GraphQL type for ${target}`);
-    }
-
-    return this.typeMapperService.mapToGqlType(filterType, typeOptions);
-  }
-
-  private createEnumFilterType(
-    fieldMetadata: FieldMetadataInterface,
-  ): GraphQLInputObjectType {
-    const enumType = this.typeDefinitionsStorage.getEnumTypeByKey(
-      fieldMetadata.id,
-    );
-
-    if (!enumType) {
-      this.logger.error(
-        `Could not find a GraphQL enum type for ${fieldMetadata.id}`,
-        {
-          fieldMetadata,
-        },
-      );
-
-      throw new Error(
-        `Could not find a GraphQL enum type for ${fieldMetadata.id}`,
-      );
-    }
-
-    return new GraphQLInputObjectType({
-      name: `${enumType.name}Filter`,
-      fields: () => ({
-        eq: { type: enumType },
-        neq: { type: enumType },
-        in: { type: new GraphQLList(enumType) },
-        is: { type: FilterIs },
-      }),
-    });
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/input-type-definition.factory.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/factories/input-type-definition.factory.ts
deleted file mode 100644
index d10fa4f0333b..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/input-type-definition.factory.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { GraphQLInputFieldConfigMap, GraphQLInputObjectType } from 'graphql';
-
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-import { pascalCase } from 'src/utils/pascal-case';
-import { isRelationFieldMetadataType } from 'src/workspace/utils/is-relation-field-metadata-type.util';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-import { InputTypeFactory } from './input-type.factory';
-
-export enum InputTypeDefinitionKind {
-  Create = 'Create',
-  Update = 'Update',
-  Filter = 'Filter',
-  OrderBy = 'OrderBy',
-}
-
-export interface InputTypeDefinition {
-  target: string;
-  kind: InputTypeDefinitionKind;
-  type: GraphQLInputObjectType;
-}
-
-@Injectable()
-export class InputTypeDefinitionFactory {
-  constructor(private readonly inputTypeFactory: InputTypeFactory) {}
-
-  public create(
-    objectMetadata: ObjectMetadataInterface,
-    kind: InputTypeDefinitionKind,
-    options: WorkspaceBuildSchemaOptions,
-  ): InputTypeDefinition {
-    return {
-      target: objectMetadata.id,
-      kind,
-      type: new GraphQLInputObjectType({
-        name: `${pascalCase(
-          objectMetadata.nameSingular,
-        )}${kind.toString()}Input`,
-        description: objectMetadata.description,
-        fields: this.generateFields(objectMetadata, kind, options),
-      }),
-    };
-  }
-
-  private generateFields(
-    objectMetadata: ObjectMetadataInterface,
-    kind: InputTypeDefinitionKind,
-    options: WorkspaceBuildSchemaOptions,
-  ): GraphQLInputFieldConfigMap {
-    const fields: GraphQLInputFieldConfigMap = {};
-
-    for (const fieldMetadata of objectMetadata.fields) {
-      // Relation field types are generated during extension of object type definition
-      if (isRelationFieldMetadataType(fieldMetadata.type)) {
-        continue;
-      }
-
-      const type = this.inputTypeFactory.create(fieldMetadata, kind, options, {
-        nullable: fieldMetadata.isNullable,
-        defaultValue: fieldMetadata.defaultValue,
-        isArray: fieldMetadata.type === FieldMetadataType.MULTI_SELECT,
-      });
-
-      fields[fieldMetadata.name] = {
-        type,
-        description: fieldMetadata.description,
-        // TODO: Add default value
-        defaultValue: undefined,
-      };
-    }
-
-    return fields;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/input-type.factory.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/factories/input-type.factory.ts
deleted file mode 100644
index 2bd22552bdc0..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/input-type.factory.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { GraphQLInputType } from 'graphql';
-
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-
-import {
-  TypeMapperService,
-  TypeOptions,
-} from 'src/workspace/workspace-schema-builder/services/type-mapper.service';
-import { TypeDefinitionsStorage } from 'src/workspace/workspace-schema-builder/storages/type-definitions.storage';
-import { isCompositeFieldMetadataType } from 'src/metadata/field-metadata/utils/is-composite-field-metadata-type.util';
-
-import { InputTypeDefinitionKind } from './input-type-definition.factory';
-
-@Injectable()
-export class InputTypeFactory {
-  private readonly logger = new Logger(InputTypeFactory.name);
-
-  constructor(
-    private readonly typeMapperService: TypeMapperService,
-    private readonly typeDefinitionsStorage: TypeDefinitionsStorage,
-  ) {}
-
-  public create(
-    fieldMetadata: FieldMetadataInterface,
-    kind: InputTypeDefinitionKind,
-    buildOtions: WorkspaceBuildSchemaOptions,
-    typeOptions: TypeOptions,
-  ): GraphQLInputType {
-    const target = isCompositeFieldMetadataType(fieldMetadata.type)
-      ? fieldMetadata.type.toString()
-      : fieldMetadata.id;
-    let inputType: GraphQLInputType | undefined =
-      this.typeMapperService.mapToScalarType(
-        fieldMetadata.type,
-        buildOtions.dateScalarMode,
-        buildOtions.numberScalarMode,
-      );
-
-    inputType ??= this.typeDefinitionsStorage.getInputTypeByKey(target, kind);
-
-    inputType ??= this.typeDefinitionsStorage.getEnumTypeByKey(target);
-
-    if (!inputType) {
-      this.logger.error(`Could not find a GraphQL type for ${target}`, {
-        fieldMetadata,
-        kind,
-        buildOtions,
-        typeOptions,
-      });
-
-      throw new Error(`Could not find a GraphQL type for ${target}`);
-    }
-
-    return this.typeMapperService.mapToGqlType(inputType, typeOptions);
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/mutation-type.factory.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/factories/mutation-type.factory.ts
deleted file mode 100644
index 5a5fbddcd219..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/mutation-type.factory.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { GraphQLObjectType } from 'graphql';
-
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { WorkspaceResolverBuilderMutationMethodNames } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-import { ObjectTypeName, RootTypeFactory } from './root-type.factory';
-
-@Injectable()
-export class MutationTypeFactory {
-  constructor(private readonly rootTypeFactory: RootTypeFactory) {}
-
-  create(
-    objectMetadataCollection: ObjectMetadataInterface[],
-    workspaceResolverMethodNames: WorkspaceResolverBuilderMutationMethodNames[],
-    options: WorkspaceBuildSchemaOptions,
-  ): GraphQLObjectType {
-    return this.rootTypeFactory.create(
-      objectMetadataCollection,
-      workspaceResolverMethodNames,
-      ObjectTypeName.Mutation,
-      options,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/object-type-definition.factory.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/factories/object-type-definition.factory.ts
deleted file mode 100644
index af30aea5c007..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/object-type-definition.factory.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { GraphQLFieldConfigMap, GraphQLObjectType } from 'graphql';
-
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-import { pascalCase } from 'src/utils/pascal-case';
-import { isRelationFieldMetadataType } from 'src/workspace/utils/is-relation-field-metadata-type.util';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-import { OutputTypeFactory } from './output-type.factory';
-
-export enum ObjectTypeDefinitionKind {
-  Connection = 'Connection',
-  Edge = 'Edge',
-  Plain = '',
-}
-
-export interface ObjectTypeDefinition {
-  target: string;
-  kind: ObjectTypeDefinitionKind;
-  type: GraphQLObjectType;
-}
-
-@Injectable()
-export class ObjectTypeDefinitionFactory {
-  constructor(private readonly outputTypeFactory: OutputTypeFactory) {}
-
-  public create(
-    objectMetadata: ObjectMetadataInterface,
-    kind: ObjectTypeDefinitionKind,
-    options: WorkspaceBuildSchemaOptions,
-  ): ObjectTypeDefinition {
-    return {
-      target: objectMetadata.id,
-      kind,
-      type: new GraphQLObjectType({
-        name: `${pascalCase(objectMetadata.nameSingular)}${kind.toString()}`,
-        description: objectMetadata.description,
-        fields: this.generateFields(objectMetadata, kind, options),
-      }),
-    };
-  }
-
-  private generateFields(
-    objectMetadata: ObjectMetadataInterface,
-    kind: ObjectTypeDefinitionKind,
-    options: WorkspaceBuildSchemaOptions,
-  ): GraphQLFieldConfigMap<any, any> {
-    const fields: GraphQLFieldConfigMap<any, any> = {};
-
-    for (const fieldMetadata of objectMetadata.fields) {
-      // Relation field types are generated during extension of object type definition
-      if (isRelationFieldMetadataType(fieldMetadata.type)) {
-        continue;
-      }
-
-      const type = this.outputTypeFactory.create(fieldMetadata, kind, options, {
-        nullable: fieldMetadata.isNullable,
-        isArray: fieldMetadata.type === FieldMetadataType.MULTI_SELECT,
-      });
-
-      fields[fieldMetadata.name] = {
-        type,
-        description: fieldMetadata.description,
-      };
-    }
-
-    return fields;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/order-by-type-definition.factory.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/factories/order-by-type-definition.factory.ts
deleted file mode 100644
index 29c5bc8e991e..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/order-by-type-definition.factory.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { GraphQLInputFieldConfigMap, GraphQLInputObjectType } from 'graphql';
-
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-import { pascalCase } from 'src/utils/pascal-case';
-import { isRelationFieldMetadataType } from 'src/workspace/utils/is-relation-field-metadata-type.util';
-
-import {
-  InputTypeDefinition,
-  InputTypeDefinitionKind,
-} from './input-type-definition.factory';
-import { OrderByTypeFactory } from './order-by-type.factory';
-
-@Injectable()
-export class OrderByTypeDefinitionFactory {
-  constructor(private readonly orderByTypeFactory: OrderByTypeFactory) {}
-
-  public create(
-    objectMetadata: ObjectMetadataInterface,
-    options: WorkspaceBuildSchemaOptions,
-  ): InputTypeDefinition {
-    const kind = InputTypeDefinitionKind.OrderBy;
-
-    return {
-      target: objectMetadata.id,
-      kind,
-      type: new GraphQLInputObjectType({
-        name: `${pascalCase(
-          objectMetadata.nameSingular,
-        )}${kind.toString()}Input`,
-        description: objectMetadata.description,
-        fields: this.generateFields(objectMetadata, options),
-      }),
-    };
-  }
-
-  private generateFields(
-    objectMetadata: ObjectMetadataInterface,
-    options: WorkspaceBuildSchemaOptions,
-  ): GraphQLInputFieldConfigMap {
-    const fields: GraphQLInputFieldConfigMap = {};
-
-    for (const fieldMetadata of objectMetadata.fields) {
-      // Relation field types are generated during extension of object type definition
-      if (isRelationFieldMetadataType(fieldMetadata.type)) {
-        continue;
-      }
-
-      const type = this.orderByTypeFactory.create(fieldMetadata, options, {
-        nullable: fieldMetadata.isNullable,
-      });
-
-      fields[fieldMetadata.name] = {
-        type,
-        description: fieldMetadata.description,
-        // TODO: Add default value
-        defaultValue: undefined,
-      };
-    }
-
-    return fields;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/order-by-type.factory.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/factories/order-by-type.factory.ts
deleted file mode 100644
index 21eb11460cbe..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/order-by-type.factory.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { GraphQLInputType } from 'graphql';
-
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-
-import {
-  TypeMapperService,
-  TypeOptions,
-} from 'src/workspace/workspace-schema-builder/services/type-mapper.service';
-import { TypeDefinitionsStorage } from 'src/workspace/workspace-schema-builder/storages/type-definitions.storage';
-import { isCompositeFieldMetadataType } from 'src/metadata/field-metadata/utils/is-composite-field-metadata-type.util';
-
-import { InputTypeDefinitionKind } from './input-type-definition.factory';
-
-@Injectable()
-export class OrderByTypeFactory {
-  private readonly logger = new Logger(OrderByTypeFactory.name);
-
-  constructor(
-    private readonly typeMapperService: TypeMapperService,
-    private readonly typeDefinitionsStorage: TypeDefinitionsStorage,
-  ) {}
-
-  public create(
-    fieldMetadata: FieldMetadataInterface,
-    buildOtions: WorkspaceBuildSchemaOptions,
-    typeOptions: TypeOptions,
-  ): GraphQLInputType {
-    const target = isCompositeFieldMetadataType(fieldMetadata.type)
-      ? fieldMetadata.type.toString()
-      : fieldMetadata.id;
-    let orderByType = this.typeMapperService.mapToOrderByType(
-      fieldMetadata.type,
-    );
-
-    orderByType ??= this.typeDefinitionsStorage.getInputTypeByKey(
-      target,
-      InputTypeDefinitionKind.OrderBy,
-    );
-
-    if (!orderByType) {
-      this.logger.error(`Could not find a GraphQL type for ${target}`, {
-        fieldMetadata,
-        buildOtions,
-        typeOptions,
-      });
-
-      throw new Error(`Could not find a GraphQL type for ${target}`);
-    }
-
-    return this.typeMapperService.mapToGqlType(orderByType, typeOptions);
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/output-type.factory.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/factories/output-type.factory.ts
deleted file mode 100644
index 5f2883f07717..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/output-type.factory.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { GraphQLOutputType } from 'graphql';
-
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-
-import {
-  TypeMapperService,
-  TypeOptions,
-} from 'src/workspace/workspace-schema-builder/services/type-mapper.service';
-import { TypeDefinitionsStorage } from 'src/workspace/workspace-schema-builder/storages/type-definitions.storage';
-import { isCompositeFieldMetadataType } from 'src/metadata/field-metadata/utils/is-composite-field-metadata-type.util';
-
-import { ObjectTypeDefinitionKind } from './object-type-definition.factory';
-
-@Injectable()
-export class OutputTypeFactory {
-  private readonly logger = new Logger(OutputTypeFactory.name);
-
-  constructor(
-    private readonly typeMapperService: TypeMapperService,
-    private readonly typeDefinitionsStorage: TypeDefinitionsStorage,
-  ) {}
-
-  public create(
-    fieldMetadata: FieldMetadataInterface,
-    kind: ObjectTypeDefinitionKind,
-    buildOtions: WorkspaceBuildSchemaOptions,
-    typeOptions: TypeOptions,
-  ): GraphQLOutputType {
-    const target = isCompositeFieldMetadataType(fieldMetadata.type)
-      ? fieldMetadata.type.toString()
-      : fieldMetadata.id;
-    let gqlType: GraphQLOutputType | undefined =
-      this.typeMapperService.mapToScalarType(
-        fieldMetadata.type,
-        buildOtions.dateScalarMode,
-        buildOtions.numberScalarMode,
-      );
-
-    gqlType ??= this.typeDefinitionsStorage.getObjectTypeByKey(target, kind);
-
-    gqlType ??= this.typeDefinitionsStorage.getEnumTypeByKey(target);
-
-    if (!gqlType) {
-      this.logger.error(`Could not find a GraphQL type for ${target}`, {
-        fieldMetadata,
-        buildOtions,
-        typeOptions,
-      });
-
-      throw new Error(`Could not find a GraphQL type for ${target}`);
-    }
-
-    return this.typeMapperService.mapToGqlType(gqlType, typeOptions);
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/query-type.factory.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/factories/query-type.factory.ts
deleted file mode 100644
index b837db179888..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/query-type.factory.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { GraphQLObjectType } from 'graphql';
-
-import { WorkspaceBuildSchemaOptions } from 'src/workspace/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
-import { WorkspaceResolverBuilderQueryMethodNames } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-import { ObjectTypeName, RootTypeFactory } from './root-type.factory';
-
-@Injectable()
-export class QueryTypeFactory {
-  constructor(private readonly rootTypeFactory: RootTypeFactory) {}
-
-  create(
-    objectMetadataCollection: ObjectMetadataInterface[],
-    workspaceResolverMethodNames: WorkspaceResolverBuilderQueryMethodNames[],
-    options: WorkspaceBuildSchemaOptions,
-  ): GraphQLObjectType {
-    return this.rootTypeFactory.create(
-      objectMetadataCollection,
-      workspaceResolverMethodNames,
-      ObjectTypeName.Query,
-      options,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/relation-type.factory.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/factories/relation-type.factory.ts
deleted file mode 100644
index 266c08ac2c3a..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/factories/relation-type.factory.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { GraphQLOutputType } from 'graphql';
-
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-import { RelationMetadataInterface } from 'src/metadata/field-metadata/interfaces/relation-metadata.interface';
-
-import { RelationMetadataType } from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { TypeDefinitionsStorage } from 'src/workspace/workspace-schema-builder/storages/type-definitions.storage';
-import { RelationDirection } from 'src/workspace/utils/deduce-relation-direction.util';
-
-import { ObjectTypeDefinitionKind } from './object-type-definition.factory';
-
-@Injectable()
-export class RelationTypeFactory {
-  private readonly logger = new Logger(RelationTypeFactory.name);
-
-  constructor(
-    private readonly typeDefinitionsStorage: TypeDefinitionsStorage,
-  ) {}
-
-  public create(
-    fieldMetadata: FieldMetadataInterface,
-    relationMetadata: RelationMetadataInterface,
-    relationDirection: RelationDirection,
-  ): GraphQLOutputType {
-    let relationQqlType: GraphQLOutputType | undefined = undefined;
-
-    if (
-      relationDirection === RelationDirection.FROM &&
-      relationMetadata.relationType === RelationMetadataType.ONE_TO_MANY
-    ) {
-      relationQqlType = this.typeDefinitionsStorage.getObjectTypeByKey(
-        relationMetadata.toObjectMetadataId,
-        ObjectTypeDefinitionKind.Connection,
-      );
-    } else {
-      const relationObjectId =
-        relationDirection === RelationDirection.FROM
-          ? relationMetadata.toObjectMetadataId
-          : relationMetadata.fromObjectMetadataId;
-
-      relationQqlType = this.typeDefinitionsStorage.getObjectTypeByKey(
-        relationObjectId,
-        ObjectTypeDefinitionKind.Plain,
-      );
-    }
-
-    if (!relationQqlType) {
-      this.logger.error(
-        `Could not find a relation type for ${fieldMetadata.id}`,
-        {
-          fieldMetadata,
-        },
-      );
-
-      throw new Error(`Could not find a relation type for ${fieldMetadata.id}`);
-    }
-
-    return relationQqlType;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/big-float-filter.input-type.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/big-float-filter.input-type.ts
deleted file mode 100644
index 31d68e36bb31..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/big-float-filter.input-type.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { GraphQLInputObjectType, GraphQLList, GraphQLNonNull } from 'graphql';
-
-import { FilterIs } from 'src/workspace/workspace-schema-builder/graphql-types/input/filter-is.input-type';
-import { BigFloatScalarType } from 'src/workspace/workspace-schema-builder/graphql-types/scalars';
-
-export const BigFloatFilterType = new GraphQLInputObjectType({
-  name: 'BigFloatFilter',
-  fields: {
-    eq: { type: BigFloatScalarType },
-    gt: { type: BigFloatScalarType },
-    gte: { type: BigFloatScalarType },
-    in: { type: new GraphQLList(new GraphQLNonNull(BigFloatScalarType)) },
-    lt: { type: BigFloatScalarType },
-    lte: { type: BigFloatScalarType },
-    neq: { type: BigFloatScalarType },
-    is: { type: FilterIs },
-  },
-});
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/boolean-filter.input-type.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/boolean-filter.input-type.ts
deleted file mode 100644
index 6439478b818c..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/boolean-filter.input-type.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { GraphQLBoolean, GraphQLInputObjectType } from 'graphql';
-
-import { FilterIs } from 'src/workspace/workspace-schema-builder/graphql-types/input/filter-is.input-type';
-
-export const BooleanFilterType = new GraphQLInputObjectType({
-  name: 'BooleanFilter',
-  fields: {
-    eq: { type: GraphQLBoolean },
-    is: { type: FilterIs },
-  },
-});
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/date-filter.input-type.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/date-filter.input-type.ts
deleted file mode 100644
index 0ab2ef7be32e..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/date-filter.input-type.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { GraphQLInputObjectType, GraphQLList, GraphQLNonNull } from 'graphql';
-
-import { FilterIs } from 'src/workspace/workspace-schema-builder/graphql-types/input/filter-is.input-type';
-import { DateScalarType } from 'src/workspace/workspace-schema-builder/graphql-types/scalars';
-
-export const DateFilterType = new GraphQLInputObjectType({
-  name: 'DateFilter',
-  fields: {
-    eq: { type: DateScalarType },
-    gt: { type: DateScalarType },
-    gte: { type: DateScalarType },
-    in: { type: new GraphQLList(new GraphQLNonNull(DateScalarType)) },
-    lt: { type: DateScalarType },
-    lte: { type: DateScalarType },
-    neq: { type: DateScalarType },
-    is: { type: FilterIs },
-  },
-});
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/date-time-filter.input-type.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/date-time-filter.input-type.ts
deleted file mode 100644
index 423640582cf6..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/date-time-filter.input-type.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { GraphQLInputObjectType, GraphQLList, GraphQLNonNull } from 'graphql';
-
-import { FilterIs } from 'src/workspace/workspace-schema-builder/graphql-types/input/filter-is.input-type';
-import { DateTimeScalarType } from 'src/workspace/workspace-schema-builder/graphql-types/scalars';
-
-export const DatetimeFilterType = new GraphQLInputObjectType({
-  name: 'DateTimeFilter',
-  fields: {
-    eq: { type: DateTimeScalarType },
-    gt: { type: DateTimeScalarType },
-    gte: { type: DateTimeScalarType },
-    in: { type: new GraphQLList(new GraphQLNonNull(DateTimeScalarType)) },
-    lt: { type: DateTimeScalarType },
-    lte: { type: DateTimeScalarType },
-    neq: { type: DateTimeScalarType },
-    is: { type: FilterIs },
-  },
-});
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/index.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/index.ts
deleted file mode 100644
index 31fea9680dd9..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export * from './big-float-filter.input-type';
-export * from './big-int-filter.input-type';
-export * from './date-filter.input-type';
-export * from './date-time-filter.input-type';
-export * from './float-filter.input-type';
-export * from './int-filter.input-type';
-export * from './string-filter.input-type';
-export * from './time-filter.input-type';
-export * from './uuid-filter.input-type';
-export * from './boolean-filter.input-type';
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/time-filter.input-type.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/time-filter.input-type.ts
deleted file mode 100644
index 81a1f895f038..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/time-filter.input-type.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { GraphQLInputObjectType, GraphQLList, GraphQLNonNull } from 'graphql';
-
-import { FilterIs } from 'src/workspace/workspace-schema-builder/graphql-types/input/filter-is.input-type';
-import { TimeScalarType } from 'src/workspace/workspace-schema-builder/graphql-types/scalars';
-
-export const TimeFilterType = new GraphQLInputObjectType({
-  name: 'TimeFilter',
-  fields: {
-    eq: { type: TimeScalarType },
-    gt: { type: TimeScalarType },
-    gte: { type: TimeScalarType },
-    in: { type: new GraphQLList(new GraphQLNonNull(TimeScalarType)) },
-    lt: { type: TimeScalarType },
-    lte: { type: TimeScalarType },
-    neq: { type: TimeScalarType },
-    is: { type: FilterIs },
-  },
-});
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/uuid-filter.input-type.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/uuid-filter.input-type.ts
deleted file mode 100644
index c1ff25832ec8..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/input/uuid-filter.input-type.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { GraphQLInputObjectType, GraphQLList } from 'graphql';
-
-import { FilterIs } from 'src/workspace/workspace-schema-builder/graphql-types/input/filter-is.input-type';
-import { UUIDScalarType } from 'src/workspace/workspace-schema-builder/graphql-types/scalars';
-
-export const UUIDFilterType = new GraphQLInputObjectType({
-  name: 'UUIDFilter',
-  fields: {
-    eq: { type: UUIDScalarType },
-    in: { type: new GraphQLList(UUIDScalarType) },
-    neq: { type: UUIDScalarType },
-    is: { type: FilterIs },
-  },
-});
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/index.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/index.ts
deleted file mode 100644
index fa9b1f0f4a9d..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/graphql-types/scalars/index.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { CursorScalarType } from './cursor.scalar';
-import { BigFloatScalarType } from './big-float.scalar';
-import { BigIntScalarType } from './big-int.scalar';
-import { DateScalarType } from './date.scalar';
-import { DateTimeScalarType } from './date-time.scalar';
-import { TimeScalarType } from './time.scalar';
-import { UUIDScalarType } from './uuid.scalar';
-
-export * from './big-float.scalar';
-export * from './big-int.scalar';
-export * from './cursor.scalar';
-export * from './date.scalar';
-export * from './date-time.scalar';
-export * from './time.scalar';
-export * from './uuid.scalar';
-
-export const scalars = [
-  BigFloatScalarType,
-  BigIntScalarType,
-  DateScalarType,
-  DateTimeScalarType,
-  TimeScalarType,
-  UUIDScalarType,
-  CursorScalarType,
-];
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/interfaces/param-metadata.interface.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/interfaces/param-metadata.interface.ts
deleted file mode 100644
index 12a1ac18153e..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/interfaces/param-metadata.interface.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { InputTypeDefinitionKind } from 'src/workspace/workspace-schema-builder/factories/input-type-definition.factory';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-export interface ArgMetadata<T = any> {
-  kind?: InputTypeDefinitionKind;
-  type?: FieldMetadataType;
-  isNullable?: boolean;
-  isArray?: boolean;
-  defaultValue?: T;
-}
-
-export interface ArgsMetadata {
-  args: {
-    [key: string]: ArgMetadata;
-  };
-  objectMetadataId: string;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface.ts
deleted file mode 100644
index 4ca4b68e05ba..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-export interface WorkspaceSchemaBuilderContext {
-  workspaceId: string;
-  userId: string | undefined;
-  objectMetadataItem: ObjectMetadataInterface;
-  fieldMetadataCollection: FieldMetadataInterface[];
-  objectMetadataCollection: ObjectMetadataInterface[];
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/storages/type-definitions.storage.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/storages/type-definitions.storage.ts
deleted file mode 100644
index 15abbc97a2fc..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/storages/type-definitions.storage.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { Injectable, Scope } from '@nestjs/common';
-
-import {
-  GraphQLEnumType,
-  GraphQLInputObjectType,
-  GraphQLObjectType,
-} from 'graphql';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { EnumTypeDefinition } from 'src/workspace/workspace-schema-builder/factories/enum-type-definition.factory';
-import {
-  InputTypeDefinition,
-  InputTypeDefinitionKind,
-} from 'src/workspace/workspace-schema-builder/factories/input-type-definition.factory';
-import {
-  ObjectTypeDefinition,
-  ObjectTypeDefinitionKind,
-} from 'src/workspace/workspace-schema-builder/factories/object-type-definition.factory';
-
-// Must be scoped on REQUEST level
-@Injectable({ scope: Scope.REQUEST })
-export class TypeDefinitionsStorage {
-  private readonly enumTypeDefinitions = new Map<string, EnumTypeDefinition>();
-  private readonly objectTypeDefinitions = new Map<
-    string,
-    ObjectTypeDefinition
-  >();
-  private readonly inputTypeDefinitions = new Map<
-    string,
-    InputTypeDefinition
-  >();
-
-  addEnumTypes(enumDefs: EnumTypeDefinition[]) {
-    enumDefs.forEach((item) => this.enumTypeDefinitions.set(item.target, item));
-  }
-
-  addObjectTypes(objectDefs: ObjectTypeDefinition[]) {
-    objectDefs.forEach((item) =>
-      this.objectTypeDefinitions.set(
-        this.generateCompositeKey(item.target, item.kind),
-        item,
-      ),
-    );
-  }
-
-  getObjectTypeByKey(
-    target: string,
-    kind: ObjectTypeDefinitionKind,
-  ): GraphQLObjectType | undefined {
-    return this.objectTypeDefinitions.get(
-      this.generateCompositeKey(target, kind),
-    )?.type;
-  }
-
-  getAllObjectTypeDefinitions(): ObjectTypeDefinition[] {
-    return Array.from(this.objectTypeDefinitions.values());
-  }
-
-  addInputTypes(inputDefs: InputTypeDefinition[]) {
-    inputDefs.forEach((item) =>
-      this.inputTypeDefinitions.set(
-        this.generateCompositeKey(item.target, item.kind),
-        item,
-      ),
-    );
-  }
-
-  getInputTypeByKey(
-    target: string,
-    kind: InputTypeDefinitionKind,
-  ): GraphQLInputObjectType | undefined {
-    return this.inputTypeDefinitions.get(
-      this.generateCompositeKey(target, kind),
-    )?.type;
-  }
-
-  getEnumTypeByKey(target: string): GraphQLEnumType | undefined {
-    return this.enumTypeDefinitions.get(target)?.type;
-  }
-
-  getAllInputTypeDefinitions(): InputTypeDefinition[] {
-    return Array.from(this.inputTypeDefinitions.values());
-  }
-
-  private generateCompositeKey(
-    target: string | FieldMetadataType,
-    kind: ObjectTypeDefinitionKind | InputTypeDefinitionKind,
-  ): string {
-    return `${target.toString()}_${kind.toString()}`;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/type-definitions.generator.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/type-definitions.generator.ts
deleted file mode 100644
index da56b3665134..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/type-definitions.generator.ts
+++ /dev/null
@@ -1,250 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
-
-import { FieldMetadataEntity } from 'src/metadata/field-metadata/field-metadata.entity';
-import { customTableDefaultColumns } from 'src/workspace/workspace-migration-runner/utils/custom-table-default-column.util';
-import { fullNameObjectDefinition } from 'src/metadata/field-metadata/composite-types/full-name.composite-type';
-import { currencyObjectDefinition } from 'src/metadata/field-metadata/composite-types/currency.composite-type';
-import { linkObjectDefinition } from 'src/metadata/field-metadata/composite-types/link.composite-type';
-import { EnumTypeDefinitionFactory } from 'src/workspace/workspace-schema-builder/factories/enum-type-definition.factory';
-
-import { TypeDefinitionsStorage } from './storages/type-definitions.storage';
-import {
-  ObjectTypeDefinitionFactory,
-  ObjectTypeDefinitionKind,
-} from './factories/object-type-definition.factory';
-import {
-  InputTypeDefinitionFactory,
-  InputTypeDefinitionKind,
-} from './factories/input-type-definition.factory';
-import { getFieldMetadataType } from './utils/get-field-metadata-type.util';
-import { WorkspaceBuildSchemaOptions } from './interfaces/workspace-build-schema-optionts.interface';
-import { FilterTypeDefinitionFactory } from './factories/filter-type-definition.factory';
-import { ConnectionTypeDefinitionFactory } from './factories/connection-type-definition.factory';
-import { EdgeTypeDefinitionFactory } from './factories/edge-type-definition.factory';
-import { OrderByTypeDefinitionFactory } from './factories/order-by-type-definition.factory';
-import { ExtendObjectTypeDefinitionFactory } from './factories/extend-object-type-definition.factory';
-import { objectContainsRelationField } from './utils/object-contains-relation-field';
-
-// Create a default field for each custom table default column
-const defaultFields = customTableDefaultColumns.map((column) => {
-  return {
-    type: getFieldMetadataType(column.type),
-    name: column.name,
-    isNullable: true,
-  } as FieldMetadataEntity;
-});
-
-@Injectable()
-export class TypeDefinitionsGenerator {
-  private readonly logger = new Logger(TypeDefinitionsGenerator.name);
-
-  constructor(
-    private readonly typeDefinitionsStorage: TypeDefinitionsStorage,
-    private readonly objectTypeDefinitionFactory: ObjectTypeDefinitionFactory,
-    private readonly enumTypeDefinitionFactory: EnumTypeDefinitionFactory,
-    private readonly inputTypeDefinitionFactory: InputTypeDefinitionFactory,
-    private readonly filterTypeDefintionFactory: FilterTypeDefinitionFactory,
-    private readonly orderByTypeDefinitionFactory: OrderByTypeDefinitionFactory,
-    private readonly edgeTypeDefinitionFactory: EdgeTypeDefinitionFactory,
-    private readonly connectionTypeDefinitionFactory: ConnectionTypeDefinitionFactory,
-    private readonly extendObjectTypeDefinitionFactory: ExtendObjectTypeDefinitionFactory,
-  ) {}
-
-  generate(
-    objectMetadataCollection: ObjectMetadataInterface[],
-    options: WorkspaceBuildSchemaOptions,
-  ) {
-    // Generate static objects first because they can be used in dynamic objects
-    this.generateStaticObjectTypeDefs(options);
-    // Generate dynamic objects
-    this.generateDynamicObjectTypeDefs(objectMetadataCollection, options);
-  }
-
-  private generateStaticObjectTypeDefs(options: WorkspaceBuildSchemaOptions) {
-    const staticObjectMetadataCollection = [
-      currencyObjectDefinition,
-      linkObjectDefinition,
-      fullNameObjectDefinition,
-    ];
-
-    this.logger.log(
-      `Generating staticObjects: [${staticObjectMetadataCollection
-        .map((object) => object.nameSingular)
-        .join(', ')}]`,
-    );
-
-    // Generate static objects first because they can be used in dynamic objects
-    this.generateEnumTypeDefs(staticObjectMetadataCollection, options);
-    this.generateObjectTypeDefs(staticObjectMetadataCollection, options);
-    this.generateInputTypeDefs(staticObjectMetadataCollection, options);
-  }
-
-  private generateDynamicObjectTypeDefs(
-    dynamicObjectMetadataCollection: ObjectMetadataInterface[],
-    options: WorkspaceBuildSchemaOptions,
-  ) {
-    this.logger.log(
-      `Generating dynamicObjects: [${dynamicObjectMetadataCollection
-        .map((object) => object.nameSingular)
-        .join(', ')}]`,
-    );
-
-    // Generate dynamic objects
-    this.generateEnumTypeDefs(dynamicObjectMetadataCollection, options);
-    this.generateObjectTypeDefs(dynamicObjectMetadataCollection, options);
-    this.generatePaginationTypeDefs(dynamicObjectMetadataCollection, options);
-    this.generateInputTypeDefs(dynamicObjectMetadataCollection, options);
-    this.generateExtendedObjectTypeDefs(
-      dynamicObjectMetadataCollection,
-      options,
-    );
-  }
-
-  private generateObjectTypeDefs(
-    objectMetadataCollection: ObjectMetadataInterface[],
-    options: WorkspaceBuildSchemaOptions,
-  ) {
-    const objectTypeDefs = objectMetadataCollection.map((objectMetadata) => {
-      const fields = this.mergeFieldsWithDefaults(objectMetadata.fields);
-      const extendedObjectMetadata = {
-        ...objectMetadata,
-        fields,
-      };
-
-      return this.objectTypeDefinitionFactory.create(
-        extendedObjectMetadata,
-        ObjectTypeDefinitionKind.Plain,
-        options,
-      );
-    });
-
-    this.typeDefinitionsStorage.addObjectTypes(objectTypeDefs);
-  }
-
-  private generatePaginationTypeDefs(
-    objectMetadataCollection: ObjectMetadataInterface[],
-    options: WorkspaceBuildSchemaOptions,
-  ) {
-    const edgeTypeDefs = objectMetadataCollection.map((objectMetadata) => {
-      const fields = this.mergeFieldsWithDefaults(objectMetadata.fields);
-      const extendedObjectMetadata = {
-        ...objectMetadata,
-        fields,
-      };
-
-      return this.edgeTypeDefinitionFactory.create(
-        extendedObjectMetadata,
-        options,
-      );
-    });
-
-    this.typeDefinitionsStorage.addObjectTypes(edgeTypeDefs);
-
-    // Connection type defs are using edge type defs
-    const connectionTypeDefs = objectMetadataCollection.map(
-      (objectMetadata) => {
-        const fields = this.mergeFieldsWithDefaults(objectMetadata.fields);
-        const extendedObjectMetadata = {
-          ...objectMetadata,
-          fields,
-        };
-
-        return this.connectionTypeDefinitionFactory.create(
-          extendedObjectMetadata,
-          options,
-        );
-      },
-    );
-
-    this.typeDefinitionsStorage.addObjectTypes(connectionTypeDefs);
-  }
-
-  private generateInputTypeDefs(
-    objectMetadataCollection: ObjectMetadataInterface[],
-    options: WorkspaceBuildSchemaOptions,
-  ) {
-    const inputTypeDefs = objectMetadataCollection
-      .map((objectMetadata) => {
-        const fields = this.mergeFieldsWithDefaults(objectMetadata.fields);
-        const requiredExtendedObjectMetadata = {
-          ...objectMetadata,
-          fields,
-        };
-        const optionalExtendedObjectMetadata = {
-          ...objectMetadata,
-          fields: fields.map((field) => ({ ...field, isNullable: true })),
-        };
-
-        return [
-          // Input type for create
-          this.inputTypeDefinitionFactory.create(
-            requiredExtendedObjectMetadata,
-            InputTypeDefinitionKind.Create,
-            options,
-          ),
-          // Input type for update
-          this.inputTypeDefinitionFactory.create(
-            optionalExtendedObjectMetadata,
-            InputTypeDefinitionKind.Update,
-            options,
-          ),
-          // Filter input type
-          this.filterTypeDefintionFactory.create(
-            optionalExtendedObjectMetadata,
-            options,
-          ),
-          // OrderBy input type
-          this.orderByTypeDefinitionFactory.create(
-            optionalExtendedObjectMetadata,
-            options,
-          ),
-        ];
-      })
-      .flat();
-
-    this.typeDefinitionsStorage.addInputTypes(inputTypeDefs);
-  }
-
-  private generateEnumTypeDefs(
-    objectMetadataCollection: ObjectMetadataInterface[],
-    options: WorkspaceBuildSchemaOptions,
-  ) {
-    const enumTypeDefs = objectMetadataCollection
-      .map((objectMetadata) =>
-        this.enumTypeDefinitionFactory.create(objectMetadata, options),
-      )
-      .flat();
-
-    this.typeDefinitionsStorage.addEnumTypes(enumTypeDefs);
-  }
-
-  private generateExtendedObjectTypeDefs(
-    objectMetadataCollection: ObjectMetadataInterface[],
-    options: WorkspaceBuildSchemaOptions,
-  ) {
-    // Generate extended object type defs only for objects that contain composite fields
-    const objectMetadataCollectionWithCompositeFields =
-      objectMetadataCollection.filter(objectContainsRelationField);
-    const objectTypeDefs = objectMetadataCollectionWithCompositeFields.map(
-      (objectMetadata) =>
-        this.extendObjectTypeDefinitionFactory.create(objectMetadata, options),
-    );
-
-    this.typeDefinitionsStorage.addObjectTypes(objectTypeDefs);
-  }
-
-  private mergeFieldsWithDefaults(
-    fields: FieldMetadataInterface[],
-  ): FieldMetadataInterface[] {
-    const fieldNames = new Set(fields.map((field) => field.name));
-
-    const uniqueDefaultFields = defaultFields.filter(
-      (defaultField) => !fieldNames.has(defaultField.name),
-    );
-
-    return [...fields, ...uniqueDefaultFields];
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/utils/__tests__/get-field-metadata-type.spec.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/utils/__tests__/get-field-metadata-type.spec.ts
deleted file mode 100644
index ee579c723efc..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/utils/__tests__/get-field-metadata-type.spec.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { getFieldMetadataType } from 'src/workspace/workspace-schema-builder/utils/get-field-metadata-type.util';
-
-describe('getFieldMetadataType', () => {
-  it.each([
-    ['uuid', FieldMetadataType.UUID],
-    ['timestamp', FieldMetadataType.DATE_TIME],
-  ])(
-    'should return correct FieldMetadataType for type %s',
-    (type, expectedMetadataType) => {
-      expect(getFieldMetadataType(type)).toBe(expectedMetadataType);
-    },
-  );
-
-  it('should throw an error for an unknown type', () => {
-    const unknownType = 'unknownType';
-
-    expect(() => getFieldMetadataType(unknownType)).toThrow(
-      `Unknown type ${unknownType}`,
-    );
-  });
-});
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/utils/get-field-metadata-type.util.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/utils/get-field-metadata-type.util.ts
deleted file mode 100644
index a32fa3434822..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/utils/get-field-metadata-type.util.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-const typeOrmTypeMapping = new Map<string, FieldMetadataType>([
-  ['uuid', FieldMetadataType.UUID],
-  ['timestamp', FieldMetadataType.DATE_TIME],
-  // Add more types here if we need to support more than id, and createdAt/updatedAt/deletedAt
-]);
-
-export const getFieldMetadataType = (type: string) => {
-  const fieldType = typeOrmTypeMapping.get(type);
-
-  if (fieldType === undefined || fieldType === null) {
-    throw new Error(`Unknown type ${type}`);
-  }
-
-  return fieldType;
-};
diff --git a/packages/twenty-server/src/workspace/workspace-schema-builder/utils/object-contains-relation-field.ts b/packages/twenty-server/src/workspace/workspace-schema-builder/utils/object-contains-relation-field.ts
deleted file mode 100644
index 0ece0b83bba0..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-builder/utils/object-contains-relation-field.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/object-metadata.interface';
-
-import { isRelationFieldMetadataType } from 'src/workspace/utils/is-relation-field-metadata-type.util';
-
-export const objectContainsRelationField = (
-  objectMetadata: ObjectMetadataInterface,
-): boolean => {
-  return objectMetadata.fields.some((field) =>
-    isRelationFieldMetadataType(field.type),
-  );
-};
diff --git a/packages/twenty-server/src/workspace/workspace-schema-storage/workspace-schema-storage.module.ts b/packages/twenty-server/src/workspace/workspace-schema-storage/workspace-schema-storage.module.ts
deleted file mode 100644
index dd3f7b6e7376..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-storage/workspace-schema-storage.module.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { MemoryStorageDriverType } from 'src/integrations/memory-storage/interfaces';
-import { MemoryStorageModule } from 'src/integrations/memory-storage/memory-storage.module';
-import { MemoryStorageJsonSerializer } from 'src/integrations/memory-storage/serializers/json.serializer';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
-import { WorkspaceCacheVersionModule } from 'src/metadata/workspace-cache-version/workspace-cache-version.module';
-import { WorkspaceSchemaStorageService } from 'src/workspace/workspace-schema-storage/workspace-schema-storage.service';
-
-@Module({
-  imports: [
-    ObjectMetadataModule,
-    WorkspaceCacheVersionModule,
-    MemoryStorageModule.forRoot({
-      identifier: 'objectMetadataCollection',
-      type: MemoryStorageDriverType.Local,
-      options: {},
-      serializer: new MemoryStorageJsonSerializer<ObjectMetadataEntity[]>(),
-    }),
-    MemoryStorageModule.forRoot({
-      identifier: 'typeDefs',
-      type: MemoryStorageDriverType.Local,
-      options: {},
-    }),
-    MemoryStorageModule.forRoot({
-      identifier: 'usedScalarNames',
-      type: MemoryStorageDriverType.Local,
-      options: {},
-      serializer: new MemoryStorageJsonSerializer<string[]>(),
-    }),
-    MemoryStorageModule.forRoot({
-      identifier: 'cacheVersion',
-      type: MemoryStorageDriverType.Local,
-      options: {},
-    }),
-  ],
-  providers: [WorkspaceSchemaStorageService],
-  exports: [WorkspaceSchemaStorageService],
-})
-export class WorkspaceSchemaStorageModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-schema-storage/workspace-schema-storage.service.ts b/packages/twenty-server/src/workspace/workspace-schema-storage/workspace-schema-storage.service.ts
deleted file mode 100644
index f51478527470..000000000000
--- a/packages/twenty-server/src/workspace/workspace-schema-storage/workspace-schema-storage.service.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { InjectMemoryStorage } from 'src/integrations/memory-storage/decorators/inject-memory-storage.decorator';
-import { MemoryStorageService } from 'src/integrations/memory-storage/memory-storage.service';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { WorkspaceCacheVersionService } from 'src/metadata/workspace-cache-version/workspace-cache-version.service';
-
-@Injectable()
-export class WorkspaceSchemaStorageService {
-  constructor(
-    @InjectMemoryStorage('objectMetadataCollection')
-    private readonly objectMetadataMemoryStorageService: MemoryStorageService<
-      ObjectMetadataEntity[]
-    >,
-    @InjectMemoryStorage('typeDefs')
-    private readonly typeDefsMemoryStorageService: MemoryStorageService<string>,
-    @InjectMemoryStorage('usedScalarNames')
-    private readonly usedScalarNamesMemoryStorageService: MemoryStorageService<
-      string[]
-    >,
-    @InjectMemoryStorage('cacheVersion')
-    private readonly cacheVersionMemoryStorageService: MemoryStorageService<string>,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
-  ) {}
-
-  async validateCacheVersion(workspaceId: string): Promise<void> {
-    const currentVersion =
-      (await this.cacheVersionMemoryStorageService.read({
-        key: workspaceId,
-      })) ?? '0';
-    let latestVersion =
-      await this.workspaceCacheVersionService.getVersion(workspaceId);
-
-    if (!latestVersion || currentVersion !== latestVersion) {
-      // Invalidate cache if version mismatch is detected
-      await this.invalidateCache(workspaceId);
-
-      // If the latest version is not found, increment the version
-      latestVersion ??=
-        await this.workspaceCacheVersionService.incrementVersion(workspaceId);
-
-      // Update the cache version after invalidation
-      await this.cacheVersionMemoryStorageService.write({
-        key: workspaceId,
-        data: latestVersion,
-      });
-    }
-  }
-
-  setObjectMetadata(
-    workspaceId: string,
-    objectMetadata: ObjectMetadataEntity[],
-  ) {
-    return this.objectMetadataMemoryStorageService.write({
-      key: workspaceId,
-      data: objectMetadata,
-    });
-  }
-
-  getObjectMetadata(
-    workspaceId: string,
-  ): Promise<ObjectMetadataEntity[] | null> {
-    return this.objectMetadataMemoryStorageService.read({
-      key: workspaceId,
-    });
-  }
-
-  setTypeDefs(workspaceId: string, typeDefs: string): Promise<void> {
-    return this.typeDefsMemoryStorageService.write({
-      key: workspaceId,
-      data: typeDefs,
-    });
-  }
-
-  getTypeDefs(workspaceId: string): Promise<string | null> {
-    return this.typeDefsMemoryStorageService.read({
-      key: workspaceId,
-    });
-  }
-
-  setUsedScalarNames(
-    workspaceId: string,
-    scalarsUsed: string[],
-  ): Promise<void> {
-    return this.usedScalarNamesMemoryStorageService.write({
-      key: workspaceId,
-      data: scalarsUsed,
-    });
-  }
-
-  getUsedScalarNames(workspaceId: string): Promise<string[] | null> {
-    return this.usedScalarNamesMemoryStorageService.read({
-      key: workspaceId,
-    });
-  }
-
-  async invalidateCache(workspaceId: string): Promise<void> {
-    await this.objectMetadataMemoryStorageService.delete({ key: workspaceId });
-    await this.typeDefsMemoryStorageService.delete({ key: workspaceId });
-    await this.usedScalarNamesMemoryStorageService.delete({ key: workspaceId });
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/commands/services/sync-workspace-logger.service.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/commands/services/sync-workspace-logger.service.ts
deleted file mode 100644
index c579bb820b67..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/commands/services/sync-workspace-logger.service.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { WorkspaceSyncStorage } from 'src/workspace/workspace-sync-metadata/storage/workspace-sync.storage';
-import { WorkspaceMigrationEntity } from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { CommandLogger } from 'src/commands/command-logger';
-
-@Injectable()
-export class SyncWorkspaceLoggerService {
-  private readonly commandLogger = new CommandLogger(
-    SyncWorkspaceLoggerService.name,
-  );
-
-  constructor() {}
-
-  async saveLogs(
-    storage: WorkspaceSyncStorage,
-    workspaceMigrations: WorkspaceMigrationEntity[],
-  ) {
-    // Save workspace migrations
-    await this.commandLogger.writeLog(
-      'workspace-migrations',
-      workspaceMigrations,
-    );
-
-    // Save object metadata create collection
-    await this.commandLogger.writeLog(
-      'object-metadata-create-collection',
-      storage.objectMetadataCreateCollection,
-    );
-
-    // Save object metadata update collection
-    await this.commandLogger.writeLog(
-      'object-metadata-update-collection',
-      storage.objectMetadataUpdateCollection,
-    );
-
-    // Save object metadata delete collection
-    await this.commandLogger.writeLog(
-      'object-metadata-delete-collection',
-      storage.objectMetadataDeleteCollection,
-    );
-
-    // Save field metadata create collection
-    await this.commandLogger.writeLog(
-      'field-metadata-create-collection',
-      storage.fieldMetadataCreateCollection,
-    );
-
-    // Save field metadata update collection
-    await this.commandLogger.writeLog(
-      'field-metadata-update-collection',
-      storage.fieldMetadataUpdateCollection,
-    );
-
-    // Save field metadata delete collection
-    await this.commandLogger.writeLog(
-      'field-metadata-delete-collection',
-      storage.fieldMetadataDeleteCollection,
-    );
-
-    // Save relation metadata create collection
-    await this.commandLogger.writeLog(
-      'relation-metadata-create-collection',
-      storage.relationMetadataCreateCollection,
-    );
-
-    // Save relation metadata update collection
-    await this.commandLogger.writeLog(
-      'relation-metadata-update-collection',
-      storage.relationMetadataUpdateCollection,
-    );
-
-    // Save relation metadata delete collection
-    await this.commandLogger.writeLog(
-      'relation-metadata-delete-collection',
-      storage.relationMetadataDeleteCollection,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/commands/sync-workspace-metadata.command.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/commands/sync-workspace-metadata.command.ts
deleted file mode 100644
index d8962e4a04ff..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/commands/sync-workspace-metadata.command.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { Logger } from '@nestjs/common';
-
-import { Command, CommandRunner, Option } from 'nest-commander';
-
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
-import { WorkspaceSyncMetadataService } from 'src/workspace/workspace-sync-metadata/workspace-sync-metadata.service';
-import { WorkspaceHealthService } from 'src/workspace/workspace-health/workspace-health.service';
-
-import { SyncWorkspaceLoggerService } from './services/sync-workspace-logger.service';
-
-// TODO: implement dry-run
-interface RunWorkspaceMigrationsOptions {
-  workspaceId: string;
-  dryRun?: boolean;
-  force?: boolean;
-}
-
-@Command({
-  name: 'workspace:sync-metadata',
-  description: 'Sync metadata',
-})
-export class SyncWorkspaceMetadataCommand extends CommandRunner {
-  private readonly logger = new Logger(SyncWorkspaceMetadataCommand.name);
-
-  constructor(
-    private readonly workspaceSyncMetadataService: WorkspaceSyncMetadataService,
-    private readonly workspaceHealthService: WorkspaceHealthService,
-    private readonly dataSourceService: DataSourceService,
-    private readonly syncWorkspaceLoggerService: SyncWorkspaceLoggerService,
-  ) {
-    super();
-  }
-
-  async run(
-    _passedParam: string[],
-    options: RunWorkspaceMigrationsOptions,
-  ): Promise<void> {
-    const issues = await this.workspaceHealthService.healthCheck(
-      options.workspaceId,
-    );
-
-    // Security: abort if there are issues.
-    if (issues.length > 0) {
-      if (!options.force) {
-        this.logger.error(
-          `Workspace contains ${issues.length} issues, aborting.`,
-        );
-
-        this.logger.log('If you want to force the migration, use --force flag');
-        this.logger.log(
-          'Please use `workspace:health` command to check issues and fix them before running this command.',
-        );
-
-        return;
-      }
-
-      this.logger.warn(
-        `Workspace contains ${issues.length} issues, sync has been forced.`,
-      );
-    }
-
-    const dataSourceMetadata =
-      await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
-        options.workspaceId,
-      );
-
-    const { storage, workspaceMigrations } =
-      await this.workspaceSyncMetadataService.syncStandardObjectsAndFieldsMetadata(
-        {
-          workspaceId: options.workspaceId,
-          dataSourceId: dataSourceMetadata.id,
-        },
-        { applyChanges: !options.dryRun },
-      );
-
-    if (options.dryRun) {
-      await this.syncWorkspaceLoggerService.saveLogs(
-        storage,
-        workspaceMigrations,
-      );
-    }
-  }
-
-  @Option({
-    flags: '-w, --workspace-id [workspace_id]',
-    description: 'workspace id',
-    required: true,
-  })
-  parseWorkspaceId(value: string): string {
-    return value;
-  }
-
-  @Option({
-    flags: '-d, --dry-run',
-    description: 'Dry run without applying changes',
-    required: false,
-  })
-  dryRun(): boolean {
-    return true;
-  }
-
-  @Option({
-    flags: '-f, --force',
-    description: 'Force migration',
-    required: false,
-  })
-  force(): boolean {
-    return true;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module.ts
deleted file mode 100644
index f8ac2f6580b0..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
-import { WorkspaceSyncMetadataModule } from 'src/workspace/workspace-sync-metadata/workspace-sync-metadata.module';
-import { WorkspaceHealthModule } from 'src/workspace/workspace-health/workspace-health.module';
-
-import { SyncWorkspaceMetadataCommand } from './sync-workspace-metadata.command';
-
-import { SyncWorkspaceLoggerService } from './services/sync-workspace-logger.service';
-
-@Module({
-  imports: [
-    WorkspaceSyncMetadataModule,
-    WorkspaceHealthModule,
-    DataSourceModule,
-  ],
-  providers: [SyncWorkspaceMetadataCommand, SyncWorkspaceLoggerService],
-})
-export class WorkspaceSyncMetadataCommandsModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/workspace-field.comparator.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/workspace-field.comparator.ts
deleted file mode 100644
index 0b85ea648f56..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/workspace-field.comparator.ts
+++ /dev/null
@@ -1,197 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import diff from 'microdiff';
-
-import {
-  ComparatorAction,
-  FieldComparatorResult,
-} from 'src/workspace/workspace-sync-metadata/interfaces/comparator.interface';
-import { PartialFieldMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
-import { PartialObjectMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/partial-object-metadata.interface';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { transformMetadataForComparison } from 'src/workspace/workspace-sync-metadata/comparators/utils/transform-metadata-for-comparison.util';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-const commonFieldPropertiesToIgnore = [
-  'id',
-  'createdAt',
-  'updatedAt',
-  'objectMetadataId',
-  'isActive',
-  'options',
-];
-
-const fieldPropertiesToStringify = ['targetColumnMap', 'defaultValue'] as const;
-
-@Injectable()
-export class WorkspaceFieldComparator {
-  constructor() {}
-
-  public compare(
-    originalObjectMetadata: ObjectMetadataEntity,
-    standardObjectMetadata: PartialObjectMetadata,
-  ): FieldComparatorResult[] {
-    const result: FieldComparatorResult[] = [];
-    const fieldPropertiesToUpdateMap: Record<
-      string,
-      Partial<PartialFieldMetadata>
-    > = {};
-
-    // Double security to only compare non-custom fields
-    const filteredOriginalFieldCollection =
-      originalObjectMetadata.fields.filter((field) => !field.isCustom);
-    const originalFieldMetadataMap = transformMetadataForComparison(
-      filteredOriginalFieldCollection,
-      {
-        shouldIgnoreProperty: (property, originalMetadata) => {
-          if (commonFieldPropertiesToIgnore.includes(property)) {
-            return true;
-          }
-
-          if (
-            originalMetadata &&
-            property === 'defaultValue' &&
-            originalMetadata.type === FieldMetadataType.SELECT
-          ) {
-            return true;
-          }
-
-          return false;
-        },
-        propertiesToStringify: fieldPropertiesToStringify,
-        keyFactory(datum) {
-          return datum.name;
-        },
-      },
-    );
-    const standardFieldMetadataMap = transformMetadataForComparison(
-      standardObjectMetadata.fields,
-      {
-        shouldIgnoreProperty: (property, originalMetadata) => {
-          if (['options'].includes(property)) {
-            return true;
-          }
-
-          if (
-            originalMetadata &&
-            property === 'defaultValue' &&
-            originalMetadata.type === FieldMetadataType.SELECT
-          ) {
-            return true;
-          }
-
-          return false;
-        },
-        propertiesToStringify: fieldPropertiesToStringify,
-        keyFactory(datum) {
-          return datum.name;
-        },
-      },
-    );
-
-    // Compare fields
-    const fieldMetadataDifference = diff(
-      originalFieldMetadataMap,
-      standardFieldMetadataMap,
-    );
-
-    for (const difference of fieldMetadataDifference) {
-      const fieldName = difference.path[0];
-      // Object shouldn't have thousands of fields, so we can use find here
-      const standardFieldMetadata = standardObjectMetadata.fields.find(
-        (field) => field.name === fieldName,
-      );
-      const originalFieldMetadata = originalObjectMetadata.fields.find(
-        (field) => field.name === fieldName,
-      );
-
-      switch (difference.type) {
-        case 'CREATE': {
-          if (!standardFieldMetadata) {
-            throw new Error(
-              `Field ${fieldName} not found in standardObjectMetadata`,
-            );
-          }
-
-          result.push({
-            action: ComparatorAction.CREATE,
-            object: {
-              ...standardFieldMetadata,
-              objectMetadataId: originalObjectMetadata.id,
-            },
-          });
-          break;
-        }
-        case 'CHANGE': {
-          if (!originalFieldMetadata) {
-            throw new Error(
-              `Field ${fieldName} not found in originalObjectMetadata`,
-            );
-          }
-
-          const id = originalFieldMetadata.id;
-          const property = difference.path[difference.path.length - 1];
-
-          // If the old value and the new value are both null, skip
-          // Database is storing null, and we can get undefined here
-          if (
-            difference.oldValue === null &&
-            (difference.value === null || difference.value === undefined)
-          ) {
-            break;
-          }
-
-          if (typeof property !== 'string') {
-            break;
-          }
-
-          if (!fieldPropertiesToUpdateMap[id]) {
-            fieldPropertiesToUpdateMap[id] = {};
-          }
-
-          // If the property is a stringified JSON, parse it
-          if (
-            (fieldPropertiesToStringify as readonly string[]).includes(property)
-          ) {
-            fieldPropertiesToUpdateMap[id][property] = JSON.parse(
-              difference.value,
-            );
-          } else {
-            fieldPropertiesToUpdateMap[id][property] = difference.value;
-          }
-          break;
-        }
-        case 'REMOVE': {
-          if (!originalFieldMetadata) {
-            throw new Error(
-              `Field ${fieldName} not found in originalObjectMetadata`,
-            );
-          }
-
-          if (difference.path.length === 1) {
-            result.push({
-              action: ComparatorAction.DELETE,
-              object: originalFieldMetadata,
-            });
-          }
-          break;
-        }
-      }
-    }
-
-    for (const [id, fieldPropertiesToUpdate] of Object.entries(
-      fieldPropertiesToUpdateMap,
-    )) {
-      result.push({
-        action: ComparatorAction.UPDATE,
-        object: {
-          id,
-          ...fieldPropertiesToUpdate,
-        },
-      });
-    }
-
-    return result;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator.ts
deleted file mode 100644
index 351d428a5025..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import {
-  FieldMetadataDecoratorParams,
-  ReflectFieldMetadata,
-} from 'src/workspace/workspace-sync-metadata/interfaces/reflect-field-metadata.interface';
-import { GateDecoratorParams } from 'src/workspace/workspace-sync-metadata/interfaces/gate-decorator.interface';
-import { FieldMetadataDefaultValue } from 'src/metadata/field-metadata/interfaces/field-metadata-default-value.interface';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { generateTargetColumnMap } from 'src/metadata/field-metadata/utils/generate-target-column-map.util';
-import { generateDefaultValue } from 'src/metadata/field-metadata/utils/generate-default-value';
-import { TypedReflect } from 'src/utils/typed-reflect';
-
-export function FieldMetadata<T extends FieldMetadataType>(
-  params: FieldMetadataDecoratorParams<T>,
-): PropertyDecorator {
-  return (target: object, fieldKey: string) => {
-    const existingFieldMetadata =
-      TypedReflect.getMetadata('fieldMetadataMap', target.constructor) ?? {};
-    const isNullable =
-      TypedReflect.getMetadata('isNullable', target, fieldKey) ?? false;
-    const isSystem =
-      TypedReflect.getMetadata('isSystem', target, fieldKey) ?? false;
-    const gate = TypedReflect.getMetadata('gate', target, fieldKey);
-    const { joinColumn, ...restParams } = params;
-
-    TypedReflect.defineMetadata(
-      'fieldMetadataMap',
-      {
-        ...existingFieldMetadata,
-        [fieldKey]: generateFieldMetadata<T>(
-          restParams,
-          fieldKey,
-          isNullable,
-          isSystem,
-          gate,
-        ),
-        ...(joinColumn && restParams.type === FieldMetadataType.RELATION
-          ? {
-              [joinColumn]: generateFieldMetadata<FieldMetadataType.UUID>(
-                {
-                  ...restParams,
-                  type: FieldMetadataType.UUID,
-                  label: `${restParams.label} id (foreign key)`,
-                  description: `${restParams.description} id foreign key`,
-                  defaultValue: null,
-                  options: undefined,
-                },
-                joinColumn,
-                isNullable,
-                true,
-                gate,
-              ),
-            }
-          : {}),
-      },
-      target.constructor,
-    );
-  };
-}
-
-function generateFieldMetadata<T extends FieldMetadataType>(
-  params: FieldMetadataDecoratorParams<T>,
-  fieldKey: string,
-  isNullable: boolean,
-  isSystem: boolean,
-  gate: GateDecoratorParams | undefined = undefined,
-): ReflectFieldMetadata[string] {
-  const targetColumnMap = generateTargetColumnMap(params.type, false, fieldKey);
-  const defaultValue = (params.defaultValue ??
-    generateDefaultValue(
-      params.type,
-    )) as FieldMetadataDefaultValue<'default'> | null;
-
-  return {
-    name: fieldKey,
-    ...params,
-    targetColumnMap,
-    isNullable: params.type === FieldMetadataType.RELATION ? true : isNullable,
-    isSystem,
-    isCustom: false,
-    options: params.options,
-    description: params.description,
-    icon: params.icon,
-    defaultValue,
-    gate,
-  };
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/gate.decorator.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/gate.decorator.ts
deleted file mode 100644
index c5753ed74e2c..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/gate.decorator.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { GateDecoratorParams } from 'src/workspace/workspace-sync-metadata/interfaces/gate-decorator.interface';
-
-import { TypedReflect } from 'src/utils/typed-reflect';
-
-export function Gate(metadata: GateDecoratorParams) {
-  return function (target: object, fieldKey?: string) {
-    if (fieldKey) {
-      TypedReflect.defineMetadata('gate', metadata, target, fieldKey);
-    } else {
-      TypedReflect.defineMetadata('gate', metadata, target);
-    }
-  };
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator.ts
deleted file mode 100644
index 0a6afffe2ab4..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { ObjectMetadataDecoratorParams } from 'src/workspace/workspace-sync-metadata/interfaces/reflect-object-metadata.interface';
-
-import { TypedReflect } from 'src/utils/typed-reflect';
-import { convertClassNameToObjectMetadataName } from 'src/workspace/workspace-sync-metadata/utils/convert-class-to-object-metadata-name.util';
-
-export function ObjectMetadata(
-  params: ObjectMetadataDecoratorParams,
-): ClassDecorator {
-  return (target) => {
-    const isSystem = TypedReflect.getMetadata('isSystem', target) ?? false;
-    const gate = TypedReflect.getMetadata('gate', target);
-    const objectName = convertClassNameToObjectMetadataName(target.name);
-
-    TypedReflect.defineMetadata(
-      'objectMetadata',
-      {
-        nameSingular: objectName,
-        ...params,
-        targetTableName: 'DEPRECATED',
-        isSystem,
-        isCustom: false,
-        description: params.description,
-        icon: params.icon,
-        gate,
-      },
-      target,
-    );
-  };
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator.ts
deleted file mode 100644
index 448f7380ba23..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import 'reflect-metadata';
-
-import {
-  ReflectRelationMetadata,
-  RelationMetadataDecoratorParams,
-} from 'src/workspace/workspace-sync-metadata/interfaces/reflect-relation-metadata.interface';
-
-import { TypedReflect } from 'src/utils/typed-reflect';
-import { convertClassNameToObjectMetadataName } from 'src/workspace/workspace-sync-metadata/utils/convert-class-to-object-metadata-name.util';
-import { RelationOnDeleteAction } from 'src/metadata/relation-metadata/relation-metadata.entity';
-
-export function RelationMetadata(
-  params: RelationMetadataDecoratorParams,
-): PropertyDecorator {
-  return (target: object, fieldKey: string) => {
-    const relationMetadataCollection =
-      TypedReflect.getMetadata(
-        'relationMetadataCollection',
-        target.constructor,
-      ) ?? [];
-    const gate = TypedReflect.getMetadata('gate', target, fieldKey);
-    const objectName = convertClassNameToObjectMetadataName(
-      target.constructor.name,
-    );
-
-    Reflect.defineMetadata(
-      'relationMetadataCollection',
-      [
-        ...relationMetadataCollection,
-        {
-          type: params.type,
-          fromObjectNameSingular: objectName,
-          toObjectNameSingular: params.objectName,
-          fromFieldMetadataName: fieldKey,
-          toFieldMetadataName: params.inverseSideFieldName ?? objectName,
-          onDelete: params.onDelete ?? RelationOnDeleteAction.SET_NULL,
-          gate,
-        } satisfies ReflectRelationMetadata,
-      ],
-      target.constructor,
-    );
-  };
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/factories/feature-flags.factory.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/factories/feature-flags.factory.ts
deleted file mode 100644
index 82904e5d8f79..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/factories/feature-flags.factory.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Repository } from 'typeorm';
-
-import { WorkspaceSyncContext } from 'src/workspace/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
-import { FeatureFlagMap } from 'src/core/feature-flag/interfaces/feature-flag-map.interface';
-
-import { FeatureFlagEntity } from 'src/core/feature-flag/feature-flag.entity';
-
-@Injectable()
-export class FeatureFlagFactory {
-  constructor(
-    @InjectRepository(FeatureFlagEntity, 'core')
-    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
-  ) {}
-
-  async create(context: WorkspaceSyncContext): Promise<FeatureFlagMap> {
-    const workspaceFeatureFlags = await this.featureFlagRepository.find({
-      where: { workspaceId: context.workspaceId },
-    });
-
-    const workspaceFeatureFlagsMap = workspaceFeatureFlags.reduce(
-      (result, currentFeatureFlag) => {
-        result[currentFeatureFlag.key] = currentFeatureFlag.value;
-
-        return result;
-      },
-      {} as FeatureFlagMap,
-    );
-
-    return workspaceFeatureFlagsMap;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/factories/index.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/factories/index.ts
deleted file mode 100644
index b1c95a507e40..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/factories/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { FeatureFlagFactory } from './feature-flags.factory';
-import { StandardObjectFactory } from './standard-object.factory';
-import { StandardRelationFactory } from './standard-relation.factory';
-
-export const workspaceSyncMetadataFactories = [
-  FeatureFlagFactory,
-  StandardObjectFactory,
-  StandardRelationFactory,
-];
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/factories/standard-object.factory.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/factories/standard-object.factory.ts
deleted file mode 100644
index f1b1b5825a49..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/factories/standard-object.factory.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { WorkspaceSyncContext } from 'src/workspace/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
-import { PartialObjectMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/partial-object-metadata.interface';
-import { FeatureFlagMap } from 'src/core/feature-flag/interfaces/feature-flag-map.interface';
-import { PartialFieldMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
-
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { standardObjectMetadataCollection } from 'src/workspace/workspace-sync-metadata/standard-objects';
-import { TypedReflect } from 'src/utils/typed-reflect';
-import { isGatedAndNotEnabled } from 'src/workspace/workspace-sync-metadata/utils/is-gate-and-not-enabled.util';
-
-@Injectable()
-export class StandardObjectFactory {
-  create(
-    context: WorkspaceSyncContext,
-    workspaceFeatureFlagsMap: FeatureFlagMap,
-  ): PartialObjectMetadata[] {
-    return standardObjectMetadataCollection
-      .map((metadata) =>
-        this.createObjectMetadata(metadata, context, workspaceFeatureFlagsMap),
-      )
-      .filter((metadata): metadata is PartialObjectMetadata => !!metadata);
-  }
-
-  private createObjectMetadata(
-    metadata: typeof BaseObjectMetadata,
-    context: WorkspaceSyncContext,
-    workspaceFeatureFlagsMap: FeatureFlagMap,
-  ): PartialObjectMetadata | undefined {
-    const objectMetadata = TypedReflect.getMetadata('objectMetadata', metadata);
-    const fieldMetadataMap =
-      TypedReflect.getMetadata('fieldMetadataMap', metadata) ?? [];
-
-    if (!objectMetadata) {
-      throw new Error(
-        `Object metadata decorator not found, can\'t parse ${metadata.name}`,
-      );
-    }
-
-    if (isGatedAndNotEnabled(objectMetadata.gate, workspaceFeatureFlagsMap)) {
-      return undefined;
-    }
-
-    const fields = Object.values(fieldMetadataMap).reduce(
-      // Omit gate as we don't want to store it in the DB
-      (acc, { gate, ...fieldMetadata }) => {
-        if (isGatedAndNotEnabled(gate, workspaceFeatureFlagsMap)) {
-          return acc;
-        }
-
-        acc.push({
-          ...fieldMetadata,
-          workspaceId: context.workspaceId,
-          isSystem: objectMetadata.isSystem || fieldMetadata.isSystem,
-        });
-
-        return acc;
-      },
-      [] as PartialFieldMetadata[],
-    );
-
-    return {
-      ...objectMetadata,
-      workspaceId: context.workspaceId,
-      dataSourceId: context.dataSourceId,
-      fields,
-    };
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/factories/standard-relation.factory.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/factories/standard-relation.factory.ts
deleted file mode 100644
index a18adacd0e81..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/factories/standard-relation.factory.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { WorkspaceSyncContext } from 'src/workspace/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
-import { FeatureFlagMap } from 'src/core/feature-flag/interfaces/feature-flag-map.interface';
-
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { standardObjectMetadataCollection } from 'src/workspace/workspace-sync-metadata/standard-objects';
-import { TypedReflect } from 'src/utils/typed-reflect';
-import { isGatedAndNotEnabled } from 'src/workspace/workspace-sync-metadata/utils/is-gate-and-not-enabled.util';
-import { assert } from 'src/utils/assert';
-import { RelationMetadataEntity } from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-
-@Injectable()
-export class StandardRelationFactory {
-  create(
-    context: WorkspaceSyncContext,
-    originalObjectMetadataMap: Record<string, ObjectMetadataEntity>,
-    workspaceFeatureFlagsMap: FeatureFlagMap,
-  ): Partial<RelationMetadataEntity>[] {
-    return standardObjectMetadataCollection.flatMap((standardObjectMetadata) =>
-      this.createRelationMetadata(
-        standardObjectMetadata,
-        context,
-        originalObjectMetadataMap,
-        workspaceFeatureFlagsMap,
-      ),
-    );
-  }
-
-  private createRelationMetadata(
-    standardObjectMetadata: typeof BaseObjectMetadata,
-    context: WorkspaceSyncContext,
-    originalObjectMetadataMap: Record<string, ObjectMetadataEntity>,
-    workspaceFeatureFlagsMap: FeatureFlagMap,
-  ): Partial<RelationMetadataEntity>[] {
-    const objectMetadata = TypedReflect.getMetadata(
-      'objectMetadata',
-      standardObjectMetadata,
-    );
-    const relationMetadataCollection = TypedReflect.getMetadata(
-      'relationMetadataCollection',
-      standardObjectMetadata,
-    );
-
-    if (!objectMetadata) {
-      throw new Error(
-        `Object metadata decorator not found, can\'t parse ${standardObjectMetadata.name}`,
-      );
-    }
-
-    if (
-      !relationMetadataCollection ||
-      isGatedAndNotEnabled(objectMetadata.gate, workspaceFeatureFlagsMap)
-    ) {
-      return [];
-    }
-
-    return relationMetadataCollection
-      .filter(
-        (relationMetadata) =>
-          !isGatedAndNotEnabled(
-            relationMetadata.gate,
-            workspaceFeatureFlagsMap,
-          ),
-      )
-      .map((relationMetadata) => {
-        const fromObjectMetadata =
-          originalObjectMetadataMap[relationMetadata.fromObjectNameSingular];
-
-        assert(
-          fromObjectMetadata,
-          `Object ${relationMetadata.fromObjectNameSingular} not found in DB 
-        for relation FROM defined in class ${objectMetadata.nameSingular}`,
-        );
-
-        const toObjectMetadata =
-          originalObjectMetadataMap[relationMetadata.toObjectNameSingular];
-
-        assert(
-          toObjectMetadata,
-          `Object ${relationMetadata.toObjectNameSingular} not found in DB
-        for relation TO defined in class ${objectMetadata.nameSingular}`,
-        );
-
-        const fromFieldMetadata = fromObjectMetadata?.fields.find(
-          (field) => field.name === relationMetadata.fromFieldMetadataName,
-        );
-
-        assert(
-          fromFieldMetadata,
-          `Field ${relationMetadata.fromFieldMetadataName} not found in object ${relationMetadata.fromObjectNameSingular}
-        for relation FROM defined in class ${objectMetadata.nameSingular}`,
-        );
-
-        const toFieldMetadata = toObjectMetadata?.fields.find(
-          (field) => field.name === relationMetadata.toFieldMetadataName,
-        );
-
-        assert(
-          toFieldMetadata,
-          `Field ${relationMetadata.toFieldMetadataName} not found in object ${relationMetadata.toObjectNameSingular}
-        for relation TO defined in class ${objectMetadata.nameSingular}`,
-        );
-
-        return {
-          relationType: relationMetadata.type,
-          fromObjectMetadataId: fromObjectMetadata?.id,
-          toObjectMetadataId: toObjectMetadata?.id,
-          fromFieldMetadataId: fromFieldMetadata?.id,
-          toFieldMetadataId: toFieldMetadata?.id,
-          workspaceId: context.workspaceId,
-          onDeleteAction: relationMetadata.onDelete,
-        };
-      });
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/comparator.interface.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/comparator.interface.ts
deleted file mode 100644
index 8b4c722c27ed..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/comparator.interface.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { FieldMetadataEntity } from 'src/metadata/field-metadata/field-metadata.entity';
-import { RelationMetadataEntity } from 'src/metadata/relation-metadata/relation-metadata.entity';
-
-import { PartialFieldMetadata } from './partial-field-metadata.interface';
-import { PartialObjectMetadata } from './partial-object-metadata.interface';
-
-export const enum ComparatorAction {
-  SKIP = 'SKIP',
-  CREATE = 'CREATE',
-  UPDATE = 'UPDATE',
-  DELETE = 'DELETE',
-}
-
-export interface ComparatorSkipResult {
-  action: ComparatorAction.SKIP;
-}
-
-export interface ComparatorCreateResult<T> {
-  action: ComparatorAction.CREATE;
-  object: T;
-}
-
-export interface ComparatorUpdateResult<T> {
-  action: ComparatorAction.UPDATE;
-  object: T;
-}
-
-export interface ComparatorDeleteResult<T> {
-  action: ComparatorAction.DELETE;
-  object: T;
-}
-
-export type ObjectComparatorResult =
-  | ComparatorSkipResult
-  | ComparatorCreateResult<PartialObjectMetadata>
-  | ComparatorUpdateResult<Partial<PartialObjectMetadata>>;
-
-export type FieldComparatorResult =
-  | ComparatorSkipResult
-  | ComparatorCreateResult<PartialFieldMetadata>
-  | ComparatorUpdateResult<Partial<PartialFieldMetadata> & { id: string }>
-  | ComparatorDeleteResult<FieldMetadataEntity>;
-
-export type RelationComparatorResult =
-  | ComparatorCreateResult<Partial<RelationMetadataEntity>>
-  | ComparatorDeleteResult<RelationMetadataEntity>
-  | ComparatorUpdateResult<Partial<RelationMetadataEntity>>;
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/mapped-metadata.interface.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/mapped-metadata.interface.ts
deleted file mode 100644
index 70c9c41751db..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/mapped-metadata.interface.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { PartialFieldMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
-import { PartialObjectMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/partial-object-metadata.interface';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { FieldMetadataEntity } from 'src/metadata/field-metadata/field-metadata.entity';
-
-export type MappedFieldMetadata = Record<string, PartialFieldMetadata>;
-
-export interface MappedObjectMetadata
-  extends Omit<PartialObjectMetadata, 'fields'> {
-  fields: MappedFieldMetadata;
-}
-
-export type MappedFieldMetadataEntity = Record<string, FieldMetadataEntity>;
-
-export interface MappedObjectMetadataEntity
-  extends Omit<ObjectMetadataEntity, 'fields'> {
-  fields: MappedFieldMetadataEntity;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/partial-field-metadata.interface.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/partial-field-metadata.interface.ts
deleted file mode 100644
index 6e21f7c18424..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/partial-field-metadata.interface.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { ReflectFieldMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/reflect-field-metadata.interface';
-
-export type PartialFieldMetadata = ReflectFieldMetadata[string] & {
-  workspaceId: string;
-  objectMetadataId?: string;
-};
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/partial-object-metadata.interface.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/partial-object-metadata.interface.ts
deleted file mode 100644
index 1080b34cf7b5..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/partial-object-metadata.interface.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { PartialFieldMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
-import { ReflectObjectMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/reflect-object-metadata.interface';
-
-export type PartialObjectMetadata = ReflectObjectMetadata & {
-  id?: string;
-  workspaceId: string;
-  dataSourceId: string;
-  fields: PartialFieldMetadata[];
-};
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/partial-relation-metadata.interface.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/partial-relation-metadata.interface.ts
deleted file mode 100644
index e1b5657ab07c..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/partial-relation-metadata.interface.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ReflectRelationMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/reflect-relation-metadata.interface';
-
-export type PartialRelationMetadata = ReflectRelationMetadata & {
-  id: string;
-  workspaceId: string;
-  fromObjectMetadataId: string;
-  toObjectMetadataId: string;
-  fromFieldMetadataId: string;
-  toFieldMetadataId: string;
-};
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/reflect-field-metadata.interface.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/reflect-field-metadata.interface.ts
deleted file mode 100644
index 873ed5b75e9d..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/reflect-field-metadata.interface.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { FieldMetadataDefaultValue } from 'src/metadata/field-metadata/interfaces/field-metadata-default-value.interface';
-import { GateDecoratorParams } from 'src/workspace/workspace-sync-metadata/interfaces/gate-decorator.interface';
-import { FieldMetadataOptions } from 'src/metadata/field-metadata/interfaces/field-metadata-options.interface';
-import { FieldMetadataTargetColumnMap } from 'src/metadata/field-metadata/interfaces/field-metadata-target-column-map.interface';
-
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-export interface FieldMetadataDecoratorParams<
-  T extends FieldMetadataType | 'default',
-> {
-  type: T;
-  label: string;
-  description?: string;
-  icon?: string;
-  defaultValue?: FieldMetadataDefaultValue<T>;
-  joinColumn?: string;
-  options?: FieldMetadataOptions<T>;
-}
-
-export interface ReflectFieldMetadata {
-  [key: string]: Omit<
-    FieldMetadataDecoratorParams<'default'>,
-    'defaultValue' | 'type' | 'options'
-  > & {
-    name: string;
-    type: FieldMetadataType;
-    targetColumnMap: FieldMetadataTargetColumnMap<'default'>;
-    isNullable: boolean;
-    isSystem: boolean;
-    isCustom: boolean;
-    description?: string;
-    defaultValue: FieldMetadataDefaultValue<'default'> | null;
-    gate?: GateDecoratorParams;
-    options?: FieldMetadataOptions<'default'> | null;
-  };
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/reflect-object-metadata.interface.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/reflect-object-metadata.interface.ts
deleted file mode 100644
index 10bbd3d5c293..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/reflect-object-metadata.interface.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { GateDecoratorParams } from 'src/workspace/workspace-sync-metadata/interfaces/gate-decorator.interface';
-
-export interface ObjectMetadataDecoratorParams {
-  namePlural: string;
-  labelSingular: string;
-  labelPlural: string;
-  description?: string;
-  icon?: string;
-}
-
-export interface ReflectObjectMetadata extends ObjectMetadataDecoratorParams {
-  nameSingular: string;
-  targetTableName: string;
-  isSystem: boolean;
-  isCustom: boolean;
-  gate?: GateDecoratorParams;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/reflect-relation-metadata.interface.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/reflect-relation-metadata.interface.ts
deleted file mode 100644
index 06393424f4d9..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/interfaces/reflect-relation-metadata.interface.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { GateDecoratorParams } from 'src/workspace/workspace-sync-metadata/interfaces/gate-decorator.interface';
-
-import {
-  RelationOnDeleteAction,
-  RelationMetadataType,
-} from 'src/metadata/relation-metadata/relation-metadata.entity';
-
-export interface RelationMetadataDecoratorParams {
-  type: RelationMetadataType;
-  objectName: string;
-  inverseSideFieldName?: string;
-  onDelete?: RelationOnDeleteAction;
-}
-
-export interface ReflectRelationMetadata {
-  type: RelationMetadataType;
-  fromObjectNameSingular: string;
-  toObjectNameSingular: string;
-  fromFieldMetadataName: string;
-  toFieldMetadataName: string;
-  gate?: GateDecoratorParams;
-  onDelete: RelationOnDeleteAction;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/services/workspace-metadata-updater.service.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/services/workspace-metadata-updater.service.ts
deleted file mode 100644
index cc1620164d6f..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/services/workspace-metadata-updater.service.ts
+++ /dev/null
@@ -1,266 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { EntityManager, In } from 'typeorm';
-import { v4 as uuidV4 } from 'uuid';
-import omit from 'lodash.omit';
-
-import { PartialFieldMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/metadata/field-metadata/field-metadata.entity';
-import { RelationMetadataEntity } from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { FieldMetadataComplexOption } from 'src/metadata/field-metadata/dtos/options.input';
-import { WorkspaceSyncStorage } from 'src/workspace/workspace-sync-metadata/storage/workspace-sync.storage';
-
-@Injectable()
-export class WorkspaceMetadataUpdaterService {
-  private readonly logger = new Logger(WorkspaceMetadataUpdaterService.name);
-
-  async updateObjectMetadata(
-    manager: EntityManager,
-    storage: WorkspaceSyncStorage,
-  ): Promise<{
-    createdObjectMetadataCollection: ObjectMetadataEntity[];
-    updatedObjectMetadataCollection: ObjectMetadataEntity[];
-  }> {
-    const objectMetadataRepository =
-      manager.getRepository(ObjectMetadataEntity);
-
-    /**
-     * Create object metadata
-     */
-    const createdPartialObjectMetadataCollection =
-      await objectMetadataRepository.save(
-        storage.objectMetadataCreateCollection.map((objectMetadata) => ({
-          ...objectMetadata,
-          isActive: true,
-          fields: objectMetadata.fields.map((field) =>
-            this.prepareFieldMetadataForCreation(field),
-          ),
-        })) as DeepPartial<ObjectMetadataEntity>[],
-      );
-    const identifiers = createdPartialObjectMetadataCollection.map(
-      (object) => object.id,
-    );
-    const createdObjectMetadataCollection = await manager.find(
-      ObjectMetadataEntity,
-      {
-        where: { id: In(identifiers) },
-        relations: ['dataSource', 'fields'],
-      },
-    );
-
-    /**
-     * Update object metadata
-     */
-    const updatedObjectMetadataCollection = await objectMetadataRepository.save(
-      storage.objectMetadataUpdateCollection.map((objectMetadata) =>
-        omit(objectMetadata, ['fields']),
-      ),
-    );
-
-    /**
-     * Delete object metadata
-     */
-    if (storage.objectMetadataDeleteCollection.length > 0) {
-      await objectMetadataRepository.delete(
-        storage.objectMetadataDeleteCollection.map((object) => object.id),
-      );
-    }
-
-    return {
-      createdObjectMetadataCollection,
-      updatedObjectMetadataCollection,
-    };
-  }
-
-  /**
-   * TODO: Refactor this
-   */
-  private prepareFieldMetadataForCreation(field: PartialFieldMetadata) {
-    return {
-      ...field,
-      ...(field.type === FieldMetadataType.SELECT && field.options
-        ? {
-            options: this.generateUUIDForNewSelectFieldOptions(
-              field.options as FieldMetadataComplexOption[],
-            ),
-          }
-        : {}),
-      isActive: true,
-    };
-  }
-
-  private generateUUIDForNewSelectFieldOptions(
-    options: FieldMetadataComplexOption[],
-  ): FieldMetadataComplexOption[] {
-    return options.map((option) => ({
-      ...option,
-      id: uuidV4(),
-    }));
-  }
-
-  async updateFieldMetadata(
-    manager: EntityManager,
-    storage: WorkspaceSyncStorage,
-  ): Promise<{
-    createdFieldMetadataCollection: FieldMetadataEntity[];
-    updatedFieldMetadataCollection: {
-      current: FieldMetadataEntity;
-      altered: FieldMetadataEntity;
-    }[];
-  }> {
-    const fieldMetadataRepository = manager.getRepository(FieldMetadataEntity);
-
-    /**
-     * Create field metadata
-     */
-    const createdFieldMetadataCollection = await fieldMetadataRepository.save(
-      storage.fieldMetadataCreateCollection.map((field) =>
-        this.prepareFieldMetadataForCreation(field),
-      ) as DeepPartial<FieldMetadataEntity>[],
-    );
-
-    /**
-     * Update field metadata
-     */
-    const oldFieldMetadataCollection = await fieldMetadataRepository.findBy({
-      id: In(storage.fieldMetadataUpdateCollection.map((field) => field.id)),
-    });
-    // Pre-process old collection into a mapping for quick access
-    const oldFieldMetadataMap = new Map(
-      oldFieldMetadataCollection.map((field) => [field.id, field]),
-    );
-    // Combine old and new field metadata to get whole updated entities
-    const fieldMetadataUpdateCollection =
-      storage.fieldMetadataUpdateCollection.map((updateFieldMetadata) => {
-        const oldFieldMetadata = oldFieldMetadataMap.get(
-          updateFieldMetadata.id,
-        );
-
-        if (!oldFieldMetadata) {
-          throw new Error(`
-            Field ${updateFieldMetadata.id} not found in oldFieldMetadataCollection`);
-        }
-
-        // TypeORM 😢
-        // If we didn't provide the old value, it will be set to null fields that are not in the updateFieldMetadata
-        // and override the old value with null in the DB.
-        // Also save method doesn't return the whole entity if you give a partial one.
-        // https://github.com/typeorm/typeorm/issues/3490
-        // To avoid calling update in a for loop, we did this hack.
-        return {
-          ...oldFieldMetadata,
-          ...updateFieldMetadata,
-          options: updateFieldMetadata.options ?? oldFieldMetadata.options,
-        };
-      });
-
-    const updatedFieldMetadataCollection = await fieldMetadataRepository.save(
-      fieldMetadataUpdateCollection,
-    );
-
-    /**
-     * Delete field metadata
-     */
-    // TODO: handle relation fields deletion. We need to delete the relation metadata first due to the DB constraint.
-    const fieldMetadataDeleteCollectionWithoutRelationType =
-      storage.fieldMetadataDeleteCollection.filter(
-        (field) => field.type !== FieldMetadataType.RELATION,
-      );
-
-    if (fieldMetadataDeleteCollectionWithoutRelationType.length > 0) {
-      await fieldMetadataRepository.delete(
-        fieldMetadataDeleteCollectionWithoutRelationType.map(
-          (field) => field.id,
-        ),
-      );
-    }
-
-    return {
-      createdFieldMetadataCollection:
-        createdFieldMetadataCollection as FieldMetadataEntity[],
-      updatedFieldMetadataCollection: updatedFieldMetadataCollection.map(
-        (alteredFieldMetadata) => {
-          const oldFieldMetadata = oldFieldMetadataMap.get(
-            alteredFieldMetadata.id,
-          );
-
-          if (!oldFieldMetadata) {
-            throw new Error(`
-              Field ${alteredFieldMetadata.id} not found in oldFieldMetadataCollection
-            `);
-          }
-
-          return {
-            current: oldFieldMetadata as FieldMetadataEntity,
-            altered: alteredFieldMetadata as FieldMetadataEntity,
-          };
-        },
-      ),
-    };
-  }
-
-  async updateRelationMetadata(
-    manager: EntityManager,
-    storage: WorkspaceSyncStorage,
-  ): Promise<{
-    createdRelationMetadataCollection: RelationMetadataEntity[];
-    updatedRelationMetadataCollection: RelationMetadataEntity[];
-  }> {
-    const relationMetadataRepository = manager.getRepository(
-      RelationMetadataEntity,
-    );
-    const fieldMetadataRepository = manager.getRepository(FieldMetadataEntity);
-
-    /**
-     * Create relation metadata
-     */
-    const createdRelationMetadataCollection =
-      await relationMetadataRepository.save(
-        storage.relationMetadataCreateCollection,
-      );
-
-    /**
-     * Update relation metadata
-     */
-
-    const updatedRelationMetadataCollection =
-      await relationMetadataRepository.save(
-        storage.relationMetadataUpdateCollection,
-      );
-
-    /**
-     * Delete relation metadata
-     */
-    if (storage.relationMetadataDeleteCollection.length > 0) {
-      await relationMetadataRepository.delete(
-        storage.relationMetadataDeleteCollection.map(
-          (relationMetadata) => relationMetadata.id,
-        ),
-      );
-    }
-
-    /**
-     * Delete related field metadata
-     */
-    const fieldMetadataDeleteCollectionOnlyRelation =
-      storage.fieldMetadataDeleteCollection.filter(
-        (field) => field.type === FieldMetadataType.RELATION,
-      );
-
-    if (fieldMetadataDeleteCollectionOnlyRelation.length > 0) {
-      await fieldMetadataRepository.delete(
-        fieldMetadataDeleteCollectionOnlyRelation.map((field) => field.id),
-      );
-    }
-
-    return {
-      createdRelationMetadataCollection,
-      updatedRelationMetadataCollection,
-    };
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/services/workspace-sync-object-metadata.service.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/services/workspace-sync-object-metadata.service.ts
deleted file mode 100644
index 43c3b2e428d2..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/services/workspace-sync-object-metadata.service.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-
-import { WorkspaceSyncContext } from 'src/workspace/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
-import { ComparatorAction } from 'src/workspace/workspace-sync-metadata/interfaces/comparator.interface';
-import { FeatureFlagMap } from 'src/core/feature-flag/interfaces/feature-flag-map.interface';
-import { WorkspaceMigrationBuilderAction } from 'src/workspace/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { mapObjectMetadataByUniqueIdentifier } from 'src/workspace/workspace-sync-metadata/utils/sync-metadata.util';
-import { WorkspaceMigrationEntity } from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { StandardObjectFactory } from 'src/workspace/workspace-sync-metadata/factories/standard-object.factory';
-import { WorkspaceObjectComparator } from 'src/workspace/workspace-sync-metadata/comparators/workspace-object.comparator';
-import { WorkspaceFieldComparator } from 'src/workspace/workspace-sync-metadata/comparators/workspace-field.comparator';
-import { WorkspaceMetadataUpdaterService } from 'src/workspace/workspace-sync-metadata/services/workspace-metadata-updater.service';
-import { WorkspaceSyncStorage } from 'src/workspace/workspace-sync-metadata/storage/workspace-sync.storage';
-import { WorkspaceMigrationObjectFactory } from 'src/workspace/workspace-migration-builder/factories/workspace-migration-object.factory';
-import { WorkspaceMigrationFieldFactory } from 'src/workspace/workspace-migration-builder/factories/workspace-migration-field.factory';
-
-@Injectable()
-export class WorkspaceSyncObjectMetadataService {
-  private readonly logger = new Logger(WorkspaceSyncObjectMetadataService.name);
-
-  constructor(
-    private readonly standardObjectFactory: StandardObjectFactory,
-    private readonly workspaceObjectComparator: WorkspaceObjectComparator,
-    private readonly workspaceFieldComparator: WorkspaceFieldComparator,
-    private readonly workspaceMetadataUpdaterService: WorkspaceMetadataUpdaterService,
-    private readonly workspaceMigrationObjectFactory: WorkspaceMigrationObjectFactory,
-    private readonly workspaceMigrationFieldFactory: WorkspaceMigrationFieldFactory,
-  ) {}
-
-  async synchronize(
-    context: WorkspaceSyncContext,
-    manager: EntityManager,
-    storage: WorkspaceSyncStorage,
-    workspaceFeatureFlagsMap: FeatureFlagMap,
-  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
-    const objectMetadataRepository =
-      manager.getRepository(ObjectMetadataEntity);
-
-    // Retrieve object metadata collection from DB
-    const originalObjectMetadataCollection =
-      await objectMetadataRepository.find({
-        where: {
-          workspaceId: context.workspaceId,
-          isCustom: false,
-          fields: { isCustom: false },
-        },
-        relations: ['dataSource', 'fields'],
-      });
-
-    // Create standard object metadata collection
-    const standardObjectMetadataCollection = this.standardObjectFactory.create(
-      context,
-      workspaceFeatureFlagsMap,
-    );
-
-    // Create map of original and standard object metadata by unique identifier
-    const originalObjectMetadataMap = mapObjectMetadataByUniqueIdentifier(
-      originalObjectMetadataCollection,
-    );
-    const standardObjectMetadataMap = mapObjectMetadataByUniqueIdentifier(
-      standardObjectMetadataCollection,
-    );
-
-    this.logger.log('Comparing standard objects and fields metadata');
-
-    // Store object that need to be deleted
-    for (const originalObjectMetadata of originalObjectMetadataCollection) {
-      if (!standardObjectMetadataMap[originalObjectMetadata.nameSingular]) {
-        storage.addDeleteObjectMetadata(originalObjectMetadata);
-      }
-    }
-
-    // Loop over all standard objects and compare them with the objects in DB
-    for (const standardObjectName in standardObjectMetadataMap) {
-      const originalObjectMetadata =
-        originalObjectMetadataMap[standardObjectName];
-      const standardObjectMetadata =
-        standardObjectMetadataMap[standardObjectName];
-
-      /**
-       * COMPARE OBJECT METADATA
-       */
-      const objectComparatorResult = this.workspaceObjectComparator.compare(
-        originalObjectMetadata,
-        standardObjectMetadata,
-      );
-
-      if (objectComparatorResult.action === ComparatorAction.CREATE) {
-        storage.addCreateObjectMetadata(standardObjectMetadata);
-        continue;
-      }
-
-      if (objectComparatorResult.action === ComparatorAction.UPDATE) {
-        storage.addUpdateObjectMetadata(objectComparatorResult.object);
-      }
-
-      /**
-       * COMPARE FIELD METADATA
-       */
-      const fieldComparatorResults = this.workspaceFieldComparator.compare(
-        originalObjectMetadata,
-        standardObjectMetadata,
-      );
-
-      for (const fieldComparatorResult of fieldComparatorResults) {
-        switch (fieldComparatorResult.action) {
-          case ComparatorAction.CREATE: {
-            storage.addCreateFieldMetadata(fieldComparatorResult.object);
-            break;
-          }
-          case ComparatorAction.UPDATE: {
-            storage.addUpdateFieldMetadata(fieldComparatorResult.object);
-            break;
-          }
-          case ComparatorAction.DELETE: {
-            storage.addDeleteFieldMetadata(fieldComparatorResult.object);
-            break;
-          }
-        }
-      }
-    }
-
-    this.logger.log('Updating workspace metadata');
-
-    // Apply changes to DB
-    const metadataObjectUpdaterResult =
-      await this.workspaceMetadataUpdaterService.updateObjectMetadata(
-        manager,
-        storage,
-      );
-    const metadataFieldUpdaterResult =
-      await this.workspaceMetadataUpdaterService.updateFieldMetadata(
-        manager,
-        storage,
-      );
-
-    this.logger.log('Generating migrations');
-
-    // Create migrations
-    const createObjectWorkspaceMigrations =
-      await this.workspaceMigrationObjectFactory.create(
-        metadataObjectUpdaterResult.createdObjectMetadataCollection,
-        WorkspaceMigrationBuilderAction.CREATE,
-      );
-
-    const deleteObjectWorkspaceMigrations =
-      await this.workspaceMigrationObjectFactory.create(
-        storage.objectMetadataDeleteCollection,
-        WorkspaceMigrationBuilderAction.DELETE,
-      );
-
-    const createFieldWorkspaceMigrations =
-      await this.workspaceMigrationFieldFactory.create(
-        originalObjectMetadataCollection,
-        metadataFieldUpdaterResult.createdFieldMetadataCollection,
-        WorkspaceMigrationBuilderAction.CREATE,
-      );
-
-    const updateFieldWorkspaceMigrations =
-      await this.workspaceMigrationFieldFactory.create(
-        originalObjectMetadataCollection,
-        metadataFieldUpdaterResult.updatedFieldMetadataCollection,
-        WorkspaceMigrationBuilderAction.UPDATE,
-      );
-
-    const deleteFieldWorkspaceMigrations =
-      await this.workspaceMigrationFieldFactory.create(
-        originalObjectMetadataCollection,
-        storage.fieldMetadataDeleteCollection,
-        WorkspaceMigrationBuilderAction.DELETE,
-      );
-
-    this.logger.log('Saving migrations');
-
-    return [
-      ...createObjectWorkspaceMigrations,
-      ...deleteObjectWorkspaceMigrations,
-      ...createFieldWorkspaceMigrations,
-      ...updateFieldWorkspaceMigrations,
-      ...deleteFieldWorkspaceMigrations,
-    ];
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/services/workspace-sync-relation-metadata.service.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/services/workspace-sync-relation-metadata.service.ts
deleted file mode 100644
index 171678c97e9a..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/services/workspace-sync-relation-metadata.service.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import { EntityManager } from 'typeorm';
-
-import { WorkspaceSyncContext } from 'src/workspace/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
-import { FeatureFlagMap } from 'src/core/feature-flag/interfaces/feature-flag-map.interface';
-import { ComparatorAction } from 'src/workspace/workspace-sync-metadata/interfaces/comparator.interface';
-import { WorkspaceMigrationBuilderAction } from 'src/workspace/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { RelationMetadataEntity } from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { mapObjectMetadataByUniqueIdentifier } from 'src/workspace/workspace-sync-metadata/utils/sync-metadata.util';
-import { StandardRelationFactory } from 'src/workspace/workspace-sync-metadata/factories/standard-relation.factory';
-import { WorkspaceRelationComparator } from 'src/workspace/workspace-sync-metadata/comparators/workspace-relation.comparator';
-import { WorkspaceMetadataUpdaterService } from 'src/workspace/workspace-sync-metadata/services/workspace-metadata-updater.service';
-import { WorkspaceMigrationEntity } from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { WorkspaceSyncStorage } from 'src/workspace/workspace-sync-metadata/storage/workspace-sync.storage';
-import { WorkspaceMigrationRelationFactory } from 'src/workspace/workspace-migration-builder/factories/workspace-migration-relation.factory';
-
-@Injectable()
-export class WorkspaceSyncRelationMetadataService {
-  private readonly logger = new Logger(
-    WorkspaceSyncRelationMetadataService.name,
-  );
-
-  constructor(
-    private readonly standardRelationFactory: StandardRelationFactory,
-    private readonly workspaceRelationComparator: WorkspaceRelationComparator,
-    private readonly workspaceMetadataUpdaterService: WorkspaceMetadataUpdaterService,
-    private readonly workspaceMigrationRelationFactory: WorkspaceMigrationRelationFactory,
-  ) {}
-
-  async synchronize(
-    context: WorkspaceSyncContext,
-    manager: EntityManager,
-    storage: WorkspaceSyncStorage,
-    workspaceFeatureFlagsMap: FeatureFlagMap,
-  ): Promise<Partial<WorkspaceMigrationEntity>[]> {
-    const objectMetadataRepository =
-      manager.getRepository(ObjectMetadataEntity);
-
-    // Retrieve object metadata collection from DB
-    const originalObjectMetadataCollection =
-      await objectMetadataRepository.find({
-        where: {
-          workspaceId: context.workspaceId,
-          isCustom: false,
-          fields: { isCustom: false },
-        },
-        relations: ['dataSource', 'fields'],
-      });
-
-    // Create map of object metadata & field metadata by unique identifier
-    const originalObjectMetadataMap = mapObjectMetadataByUniqueIdentifier(
-      originalObjectMetadataCollection,
-    );
-
-    const relationMetadataRepository = manager.getRepository(
-      RelationMetadataEntity,
-    );
-
-    // Retrieve relation metadata collection from DB
-    const originalRelationMetadataCollection =
-      await relationMetadataRepository.find({
-        where: {
-          workspaceId: context.workspaceId,
-          fromFieldMetadata: { isCustom: false },
-        },
-      });
-
-    // Create standard relation metadata collection
-    const standardRelationMetadataCollection =
-      this.standardRelationFactory.create(
-        context,
-        originalObjectMetadataMap,
-        workspaceFeatureFlagsMap,
-      );
-
-    const relationComparatorResults = this.workspaceRelationComparator.compare(
-      originalRelationMetadataCollection,
-      standardRelationMetadataCollection,
-    );
-
-    for (const relationComparatorResult of relationComparatorResults) {
-      if (relationComparatorResult.action === ComparatorAction.CREATE) {
-        storage.addCreateRelationMetadata(relationComparatorResult.object);
-      } else if (relationComparatorResult.action === ComparatorAction.UPDATE) {
-        storage.addUpdateRelationMetadata(relationComparatorResult.object);
-      } else if (relationComparatorResult.action === ComparatorAction.DELETE) {
-        storage.addDeleteRelationMetadata(relationComparatorResult.object);
-      }
-    }
-
-    const metadataRelationUpdaterResult =
-      await this.workspaceMetadataUpdaterService.updateRelationMetadata(
-        manager,
-        storage,
-      );
-
-    // Create migrations
-    const createRelationWorkspaceMigrations =
-      await this.workspaceMigrationRelationFactory.create(
-        originalObjectMetadataCollection,
-        metadataRelationUpdaterResult.createdRelationMetadataCollection,
-        WorkspaceMigrationBuilderAction.CREATE,
-      );
-
-    const updateRelationWorkspaceMigrations =
-      await this.workspaceMigrationRelationFactory.create(
-        originalObjectMetadataCollection,
-        metadataRelationUpdaterResult.updatedRelationMetadataCollection,
-        WorkspaceMigrationBuilderAction.UPDATE,
-      );
-
-    return [
-      ...createRelationWorkspaceMigrations,
-      ...updateRelationWorkspaceMigrations,
-    ];
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/activity-target.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/activity-target.object-metadata.ts
deleted file mode 100644
index c8b7a72ae003..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/activity-target.object-metadata.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { ActivityObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/activity.object-metadata';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { CompanyObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/company.object-metadata';
-import { OpportunityObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata';
-import { PersonObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'activityTargets',
-  labelSingular: 'Activity Target',
-  labelPlural: 'Activity Targets',
-  description: 'An activity target',
-  icon: 'IconCheckbox',
-})
-@IsSystem()
-export class ActivityTargetObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Activity',
-    description: 'ActivityTarget activity',
-    icon: 'IconNotes',
-    joinColumn: 'activityId',
-  })
-  @IsNullable()
-  activity: ActivityObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Person',
-    description: 'ActivityTarget person',
-    icon: 'IconUser',
-    joinColumn: 'personId',
-  })
-  @IsNullable()
-  person: PersonObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Company',
-    description: 'ActivityTarget company',
-    icon: 'IconBuildingSkyscraper',
-    joinColumn: 'companyId',
-  })
-  @IsNullable()
-  company: CompanyObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Opportunity',
-    description: 'ActivityTarget opportunity',
-    icon: 'IconTargetArrow',
-    joinColumn: 'opportunityId',
-  })
-  @IsNullable()
-  opportunity: OpportunityObjectMetadata;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/activity.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/activity.object-metadata.ts
deleted file mode 100644
index df001c73a40c..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/activity.object-metadata.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { RelationMetadataType } from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { ActivityTargetObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/activity-target.object-metadata';
-import { AttachmentObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/attachment.object-metadata';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { CommentObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/comment.object-metadata';
-import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'activities',
-  labelSingular: 'Activity',
-  labelPlural: 'Activities',
-  description: 'An activity',
-  icon: 'IconCheckbox',
-})
-@IsSystem()
-export class ActivityObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Title',
-    description: 'Activity title',
-    icon: 'IconNotes',
-  })
-  title: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Body',
-    description: 'Activity body',
-    icon: 'IconList',
-  })
-  body: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Type',
-    description: 'Activity type',
-    icon: 'IconCheckbox',
-    defaultValue: { value: 'Note' },
-  })
-  type: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.DATE_TIME,
-    label: 'Reminder Date',
-    description: 'Activity reminder date',
-    icon: 'IconCalendarEvent',
-  })
-  @IsNullable()
-  reminderAt: Date;
-
-  @FieldMetadata({
-    type: FieldMetadataType.DATE_TIME,
-    label: 'Due Date',
-    description: 'Activity due date',
-    icon: 'IconCalendarEvent',
-  })
-  @IsNullable()
-  dueAt: Date;
-
-  @FieldMetadata({
-    type: FieldMetadataType.DATE_TIME,
-    label: 'Completion Date',
-    description: 'Activity completion date',
-    icon: 'IconCheck',
-  })
-  @IsNullable()
-  completedAt: Date;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Targets',
-    description: 'Activity targets',
-    icon: 'IconCheckbox',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'activityTarget',
-  })
-  @IsNullable()
-  activityTargets: ActivityTargetObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Attachments',
-    description: 'Activity attachments',
-    icon: 'IconFileImport',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'attachment',
-  })
-  @IsNullable()
-  attachments: AttachmentObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Comments',
-    description: 'Activity comments',
-    icon: 'IconComment',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'comment',
-  })
-  @IsNullable()
-  comments: CommentObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Author',
-    description: 'Activity author',
-    icon: 'IconUserCircle',
-    joinColumn: 'authorId',
-  })
-  author: WorkspaceMemberObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Assignee',
-    description: 'Acitivity assignee',
-    icon: 'IconUserCircle',
-    joinColumn: 'assigneeId',
-  })
-  @IsNullable()
-  assignee: WorkspaceMemberObjectMetadata;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/api-key.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/api-key.object-metadata.ts
deleted file mode 100644
index 88781989008d..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/api-key.object-metadata.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'apiKeys',
-  labelSingular: 'Api Key',
-  labelPlural: 'Api Keys',
-  description: 'An api key',
-  icon: 'IconRobot',
-})
-@IsSystem()
-export class ApiKeyObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Name',
-    description: 'ApiKey name',
-    icon: 'IconLink',
-  })
-  name: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.DATE_TIME,
-    label: 'Expiration date',
-    description: 'ApiKey expiration date',
-    icon: 'IconCalendar',
-  })
-  expiresAt: Date;
-
-  @FieldMetadata({
-    type: FieldMetadataType.DATE_TIME,
-    label: 'Revocation date',
-    description: 'ApiKey revocation date',
-    icon: 'IconCalendar',
-  })
-  @IsNullable()
-  revokedAt?: Date;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/attachment.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/attachment.object-metadata.ts
deleted file mode 100644
index 282c750afc10..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/attachment.object-metadata.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { ActivityObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/activity.object-metadata';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { CompanyObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/company.object-metadata';
-import { OpportunityObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata';
-import { PersonObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata';
-import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'attachments',
-  labelSingular: 'Attachment',
-  labelPlural: 'Attachments',
-  description: 'An attachment',
-  icon: 'IconFileImport',
-})
-@IsSystem()
-export class AttachmentObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Name',
-    description: 'Attachment name',
-    icon: 'IconFileUpload',
-  })
-  name: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Full path',
-    description: 'Attachment full path',
-    icon: 'IconLink',
-  })
-  fullPath: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Type',
-    description: 'Attachment type',
-    icon: 'IconList',
-  })
-  type: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Author',
-    description: 'Attachment author',
-    icon: 'IconCircleUser',
-    joinColumn: 'authorId',
-  })
-  author: WorkspaceMemberObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Activity',
-    description: 'Attachment activity',
-    icon: 'IconNotes',
-    joinColumn: 'activityId',
-  })
-  @IsNullable()
-  activity: ActivityObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Person',
-    description: 'Attachment person',
-    icon: 'IconUser',
-    joinColumn: 'personId',
-  })
-  @IsNullable()
-  person: PersonObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Company',
-    description: 'Attachment company',
-    icon: 'IconBuildingSkyscraper',
-    joinColumn: 'companyId',
-  })
-  @IsNullable()
-  company: CompanyObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Opportunity',
-    description: 'Attachment opportunity',
-    icon: 'IconBuildingSkyscraper',
-    joinColumn: 'opportunityId',
-  })
-  @IsNullable()
-  opportunity: OpportunityObjectMetadata;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata.ts
deleted file mode 100644
index bfd8c5fc4ec0..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-
-export abstract class BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.UUID,
-    label: 'Id',
-    defaultValue: { type: 'uuid' },
-  })
-  @IsSystem()
-  id: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.DATE_TIME,
-    label: 'Creation date',
-    icon: 'IconCalendar',
-    defaultValue: { type: 'now' },
-  })
-  createdAt: Date;
-
-  @FieldMetadata({
-    type: FieldMetadataType.DATE_TIME,
-    label: 'Update date',
-    icon: 'IconCalendar',
-    defaultValue: { type: 'now' },
-  })
-  @IsSystem()
-  updatedAt: Date;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/blocklist.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/blocklist.object-metadata.ts
deleted file mode 100644
index e82463a659c7..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/blocklist.object-metadata.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'blocklists',
-  labelSingular: 'Blocklist',
-  labelPlural: 'Blocklists',
-  description: 'Blocklist',
-  icon: 'IconForbid2',
-})
-@IsSystem()
-export class BlocklistObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Handle',
-    description: 'Handle',
-    icon: 'IconAt',
-  })
-  handle: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'WorkspaceMember',
-    description: 'WorkspaceMember',
-    icon: 'IconCircleUser',
-    joinColumn: 'workspaceMemberId',
-  })
-  workspaceMember: WorkspaceMemberObjectMetadata;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/comment.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/comment.object-metadata.ts
deleted file mode 100644
index 08770250f206..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/comment.object-metadata.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { ActivityObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/activity.object-metadata';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'comments',
-  labelSingular: 'Comment',
-  labelPlural: 'Comments',
-  description: 'A comment',
-  icon: 'IconMessageCircle',
-})
-@IsSystem()
-export class CommentObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Body',
-    description: 'Comment body',
-    icon: 'IconLink',
-  })
-  body: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Author',
-    description: 'Comment author',
-    icon: 'IconCircleUser',
-    joinColumn: 'authorId',
-  })
-  author: WorkspaceMemberObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Activity',
-    description: 'Comment activity',
-    icon: 'IconNotes',
-    joinColumn: 'activityId',
-  })
-  activity: ActivityObjectMetadata;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/company.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/company.object-metadata.ts
deleted file mode 100644
index 20b9aa9a8ef2..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/company.object-metadata.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-import { CurrencyMetadata } from 'src/metadata/field-metadata/composite-types/currency.composite-type';
-import { LinkMetadata } from 'src/metadata/field-metadata/composite-types/link.composite-type';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import {
-  RelationMetadataType,
-  RelationOnDeleteAction,
-} from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { ActivityTargetObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/activity-target.object-metadata';
-import { AttachmentObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/attachment.object-metadata';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { FavoriteObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/favorite.object-metadata';
-import { OpportunityObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata';
-import { PersonObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata';
-import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'companies',
-  labelSingular: 'Company',
-  labelPlural: 'Companies',
-  description: 'A company',
-  icon: 'IconBuildingSkyscraper',
-})
-export class CompanyObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Name',
-    description: 'The company name',
-    icon: 'IconBuildingSkyscraper',
-  })
-  name: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Domain Name',
-    description:
-      'The company website URL. We use this url to fetch the company icon',
-    icon: 'IconLink',
-  })
-  domainName?: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Address',
-    description: 'The company address',
-    icon: 'IconMap',
-  })
-  address: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.NUMBER,
-    label: 'Employees',
-    description: 'Number of employees in the company',
-    icon: 'IconUsers',
-  })
-  @IsNullable()
-  employees: number;
-
-  @FieldMetadata({
-    type: FieldMetadataType.LINK,
-    label: 'Linkedin',
-    description: 'The company Linkedin account',
-    icon: 'IconBrandLinkedin',
-  })
-  @IsNullable()
-  linkedinLink: LinkMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.LINK,
-    label: 'X',
-    description: 'The company Twitter/X account',
-    icon: 'IconBrandX',
-  })
-  @IsNullable()
-  xLink: LinkMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.CURRENCY,
-    label: 'ARR',
-    description:
-      'Annual Recurring Revenue: The actual or estimated annual revenue of the company',
-    icon: 'IconMoneybag',
-  })
-  @IsNullable()
-  annualRecurringRevenue: CurrencyMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.BOOLEAN,
-    label: 'ICP',
-    description:
-      'Ideal Customer Profile:  Indicates whether the company is the most suitable and valuable customer for you',
-    icon: 'IconTarget',
-    defaultValue: { value: false },
-  })
-  idealCustomerProfile: boolean;
-
-  @FieldMetadata({
-    type: FieldMetadataType.NUMBER,
-    label: 'Position',
-    description: 'Position',
-    icon: 'IconHierarchy2',
-  })
-  @IsSystem()
-  @IsNullable()
-  position: number;
-
-  // Relations
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'People',
-    description: 'People linked to the company.',
-    icon: 'IconUsers',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'person',
-  })
-  @IsNullable()
-  people: PersonObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Account Owner',
-    description:
-      'Your team member responsible for managing the company account',
-    icon: 'IconUserCircle',
-    joinColumn: 'accountOwnerId',
-  })
-  @IsNullable()
-  accountOwner: WorkspaceMemberObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Activities',
-    description: 'Activities tied to the company',
-    icon: 'IconCheckbox',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'activityTarget',
-    onDelete: RelationOnDeleteAction.CASCADE,
-  })
-  @IsNullable()
-  activityTargets: ActivityTargetObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Opportunities',
-    description: 'Opportunities linked to the company.',
-    icon: 'IconTargetArrow',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'opportunity',
-  })
-  @IsNullable()
-  opportunities: OpportunityObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Favorites',
-    description: 'Favorites linked to the company',
-    icon: 'IconHeart',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'favorite',
-    onDelete: RelationOnDeleteAction.CASCADE,
-  })
-  @IsNullable()
-  favorites: FavoriteObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Attachments',
-    description: 'Attachments linked to the company.',
-    icon: 'IconFileImport',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'attachment',
-    onDelete: RelationOnDeleteAction.CASCADE,
-  })
-  @IsNullable()
-  attachments: AttachmentObjectMetadata[];
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/connected-account.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/connected-account.object-metadata.ts
deleted file mode 100644
index 554535847565..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/connected-account.object-metadata.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import {
-  RelationMetadataType,
-  RelationOnDeleteAction,
-} from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { MessageChannelObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-channel.object-metadata';
-import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'connectedAccounts',
-  labelSingular: 'Connected Account',
-  labelPlural: 'Connected Accounts',
-  description: 'A connected account',
-  icon: 'IconAt',
-})
-@IsSystem()
-export class ConnectedAccountObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'handle',
-    description: 'The account handle (email, username, phone number, etc.)',
-    icon: 'IconMail',
-  })
-  handle: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'provider',
-    description: 'The account provider',
-    icon: 'IconSettings',
-  })
-  provider: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Access Token',
-    description: 'Messaging provider access token',
-    icon: 'IconKey',
-  })
-  accessToken: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Refresh Token',
-    description: 'Messaging provider refresh token',
-    icon: 'IconKey',
-  })
-  refreshToken: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Account Owner',
-    description: 'Account Owner',
-    icon: 'IconUserCircle',
-    joinColumn: 'accountOwnerId',
-  })
-  accountOwner: WorkspaceMemberObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Last sync history ID',
-    description: 'Last sync history ID',
-    icon: 'IconHistory',
-  })
-  lastSyncHistoryId: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Message Channel',
-    description: 'Message Channel',
-    icon: 'IconMessage',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'messageChannel',
-    onDelete: RelationOnDeleteAction.CASCADE,
-  })
-  @IsNullable()
-  messageChannels: MessageChannelObjectMetadata[];
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/favorite.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/favorite.object-metadata.ts
deleted file mode 100644
index b7ae721e1bfc..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/favorite.object-metadata.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { CompanyObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/company.object-metadata';
-import { OpportunityObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata';
-import { PersonObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata';
-import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'favorites',
-  labelSingular: 'Favorite',
-  labelPlural: 'Favorites',
-  description: 'A favorite',
-  icon: 'IconHeart',
-})
-@IsSystem()
-export class FavoriteObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.NUMBER,
-    label: 'Position',
-    description: 'Favorite position',
-    icon: 'IconList',
-    defaultValue: { value: 0 },
-  })
-  position: number;
-
-  // Relations
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Workspace Member',
-    description: 'Favorite workspace member',
-    icon: 'IconCircleUser',
-    joinColumn: 'workspaceMemberId',
-  })
-  workspaceMember: WorkspaceMemberObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Person',
-    description: 'Favorite person',
-    icon: 'IconUser',
-    joinColumn: 'personId',
-  })
-  @IsNullable()
-  person: PersonObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Company',
-    description: 'Favorite company',
-    icon: 'IconBuildingSkyscraper',
-    joinColumn: 'companyId',
-  })
-  @IsNullable()
-  company: CompanyObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Opportunity',
-    description: 'Favorite opportunity',
-    icon: 'IconTargetArrow',
-    joinColumn: 'opportunityId',
-  })
-  @IsNullable()
-  opportunity: OpportunityObjectMetadata;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/index.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/index.ts
deleted file mode 100644
index 804dc3a310be..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/index.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { ActivityTargetObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/activity-target.object-metadata';
-import { ActivityObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/activity.object-metadata';
-import { ApiKeyObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/api-key.object-metadata';
-import { AttachmentObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/attachment.object-metadata';
-import { BlocklistObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/blocklist.object-metadata';
-import { CommentObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/comment.object-metadata';
-import { CompanyObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/company.object-metadata';
-import { ConnectedAccountObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/connected-account.object-metadata';
-import { FavoriteObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/favorite.object-metadata';
-import { MessageChannelMessageAssociationObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-channel-message-association.object-metadata';
-import { MessageChannelObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-channel.object-metadata';
-import { MessageParticipantObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-participant.object-metadata';
-import { MessageThreadObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-thread.object-metadata';
-import { MessageObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message.object-metadata';
-import { OpportunityObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata';
-import { PersonObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata';
-import { PipelineStepObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/pipeline-step.object-metadata';
-import { ViewFieldObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/view-field.object-metadata';
-import { ViewFilterObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/view-filter.object-metadata';
-import { ViewSortObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/view-sort.object-metadata';
-import { ViewObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/view.object-metadata';
-import { WebhookObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/webhook.object-metadata';
-import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
-
-export const standardObjectMetadataCollection = [
-  ActivityTargetObjectMetadata,
-  ActivityObjectMetadata,
-  ApiKeyObjectMetadata,
-  AttachmentObjectMetadata,
-  BlocklistObjectMetadata,
-  CommentObjectMetadata,
-  CompanyObjectMetadata,
-  ConnectedAccountObjectMetadata,
-  FavoriteObjectMetadata,
-  OpportunityObjectMetadata,
-  PersonObjectMetadata,
-  PipelineStepObjectMetadata,
-  ViewFieldObjectMetadata,
-  ViewFilterObjectMetadata,
-  ViewSortObjectMetadata,
-  ViewObjectMetadata,
-  WebhookObjectMetadata,
-  WorkspaceMemberObjectMetadata,
-  MessageThreadObjectMetadata,
-  MessageObjectMetadata,
-  MessageChannelObjectMetadata,
-  MessageParticipantObjectMetadata,
-  MessageChannelMessageAssociationObjectMetadata,
-];
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message-channel-message-association.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message-channel-message-association.object-metadata.ts
deleted file mode 100644
index 2e9472aa3039..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message-channel-message-association.object-metadata.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { MessageChannelObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-channel.object-metadata';
-import { MessageThreadObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-thread.object-metadata';
-import { MessageObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'messageChannelMessageAssociations',
-  labelSingular: 'Message Channel Message Association',
-  labelPlural: 'Message Channel Message Associations',
-  description: 'Message Synced with a Message Channel',
-  icon: 'IconMessage',
-})
-@IsSystem()
-export class MessageChannelMessageAssociationObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Message Channel Id',
-    description: 'Message Channel Id',
-    icon: 'IconHash',
-    joinColumn: 'messageChannelId',
-  })
-  @IsNullable()
-  messageChannel: MessageChannelObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Message Id',
-    description: 'Message Id',
-    icon: 'IconHash',
-    joinColumn: 'messageId',
-  })
-  @IsNullable()
-  message: MessageObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Message External Id',
-    description: 'Message id from the messaging provider',
-    icon: 'IconHash',
-  })
-  @IsNullable()
-  messageExternalId: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Message Thread Id',
-    description: 'Message Thread Id',
-    icon: 'IconHash',
-    joinColumn: 'messageThreadId',
-  })
-  @IsNullable()
-  messageThread: MessageThreadObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Thread External Id',
-    description: 'Thread id from the messaging provider',
-    icon: 'IconHash',
-  })
-  @IsNullable()
-  messageThreadExternalId: string;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message-channel.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message-channel.object-metadata.ts
deleted file mode 100644
index 224f4340da1e..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message-channel.object-metadata.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import {
-  RelationMetadataType,
-  RelationOnDeleteAction,
-} from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { ConnectedAccountObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/connected-account.object-metadata';
-import { MessageChannelMessageAssociationObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-channel-message-association.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'messageChannels',
-  labelSingular: 'Message Channel',
-  labelPlural: 'Message Channels',
-  description: 'Message Channels',
-  icon: 'IconMessage',
-})
-@IsSystem()
-export class MessageChannelObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.SELECT,
-    label: 'Visibility',
-    description: 'Visibility',
-    icon: 'IconEyeglass',
-    options: [
-      { value: 'metadata', label: 'Metadata', position: 0, color: 'green' },
-      { value: 'subject', label: 'Subject', position: 1, color: 'blue' },
-      {
-        value: 'share_everything',
-        label: 'Share Everything',
-        position: 2,
-        color: 'orange',
-      },
-    ],
-    defaultValue: { value: 'share_everything' },
-  })
-  visibility: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Handle',
-    description: 'Handle',
-    icon: 'IconAt',
-  })
-  handle: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Connected Account',
-    description: 'Connected Account',
-    icon: 'IconUserCircle',
-    joinColumn: 'connectedAccountId',
-  })
-  connectedAccount: ConnectedAccountObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.SELECT,
-    label: 'Type',
-    description: 'Channel Type',
-    icon: 'IconMessage',
-    options: [
-      { value: 'email', label: 'Email', position: 0, color: 'green' },
-      { value: 'sms', label: 'SMS', position: 1, color: 'blue' },
-    ],
-    defaultValue: { value: 'email' },
-  })
-  type: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.BOOLEAN,
-    label: 'Is Contact Auto Creation Enabled',
-    description: 'Is Contact Auto Creation Enabled',
-    icon: 'IconUserCircle',
-    defaultValue: { value: true },
-  })
-  isContactAutoCreationEnabled: boolean;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Message Channel Association',
-    description: 'Messages from the channel.',
-    icon: 'IconMessage',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'messageChannelMessageAssociation',
-    onDelete: RelationOnDeleteAction.CASCADE,
-  })
-  @IsNullable()
-  messageChannelMessageAssociations: MessageChannelMessageAssociationObjectMetadata[];
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message-participant.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message-participant.object-metadata.ts
deleted file mode 100644
index 70ee2dffa2d2..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message-participant.object-metadata.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { MessageObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message.object-metadata';
-import { PersonObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata';
-import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'messageParticipants',
-  labelSingular: 'Message Participant',
-  labelPlural: 'Message Participants',
-  description: 'Message Participants',
-  icon: 'IconUserCircle',
-})
-@IsSystem()
-export class MessageParticipantObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Message',
-    description: 'Message',
-    icon: 'IconMessage',
-    joinColumn: 'messageId',
-  })
-  message: MessageObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.SELECT,
-    label: 'Role',
-    description: 'Role',
-    icon: 'IconAt',
-    options: [
-      { value: 'from', label: 'From', position: 0, color: 'green' },
-      { value: 'to', label: 'To', position: 1, color: 'blue' },
-      { value: 'cc', label: 'Cc', position: 2, color: 'orange' },
-      { value: 'bcc', label: 'Bcc', position: 3, color: 'red' },
-    ],
-    defaultValue: { value: 'from' },
-  })
-  role: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Handle',
-    description: 'Handle',
-    icon: 'IconAt',
-  })
-  handle: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Display Name',
-    description: 'Display Name',
-    icon: 'IconUser',
-  })
-  displayName: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Person',
-    description: 'Person',
-    icon: 'IconUser',
-    joinColumn: 'personId',
-  })
-  @IsNullable()
-  person: PersonObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Workspace Member',
-    description: 'Workspace member',
-    icon: 'IconCircleUser',
-    joinColumn: 'workspaceMemberId',
-  })
-  @IsNullable()
-  workspaceMember: WorkspaceMemberObjectMetadata;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message-thread.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message-thread.object-metadata.ts
deleted file mode 100644
index ac8957119ab8..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message-thread.object-metadata.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import {
-  RelationMetadataType,
-  RelationOnDeleteAction,
-} from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { MessageChannelMessageAssociationObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-channel-message-association.object-metadata';
-import { MessageObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'messageThreads',
-  labelSingular: 'Message Thread',
-  labelPlural: 'Message Threads',
-  description: 'Message Thread',
-  icon: 'IconMessage',
-})
-@IsSystem()
-export class MessageThreadObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Messages',
-    description: 'Messages from the thread.',
-    icon: 'IconMessage',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'message',
-    onDelete: RelationOnDeleteAction.CASCADE,
-  })
-  @IsNullable()
-  messages: MessageObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Message Channel Association',
-    description: 'Messages from the channel.',
-    icon: 'IconMessage',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'messageChannelMessageAssociation',
-    onDelete: RelationOnDeleteAction.RESTRICT,
-  })
-  @IsNullable()
-  messageChannelMessageAssociations: MessageChannelMessageAssociationObjectMetadata[];
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message.object-metadata.ts
deleted file mode 100644
index 0d2e337990eb..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message.object-metadata.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import {
-  RelationMetadataType,
-  RelationOnDeleteAction,
-} from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { MessageChannelMessageAssociationObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-channel-message-association.object-metadata';
-import { MessageParticipantObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-participant.object-metadata';
-import { MessageThreadObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-thread.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'messages',
-  labelSingular: 'Message',
-  labelPlural: 'Messages',
-  description: 'Message',
-  icon: 'IconMessage',
-})
-@IsSystem()
-export class MessageObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Header message Id',
-    description: 'Message id from the message header',
-    icon: 'IconHash',
-  })
-  headerMessageId: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Message Thread Id',
-    description: 'Message Thread Id',
-    icon: 'IconHash',
-    joinColumn: 'messageThreadId',
-  })
-  @IsNullable()
-  messageThread: MessageThreadObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.SELECT,
-    label: 'Direction',
-    description: 'Message Direction',
-    icon: 'IconDirection',
-    options: [
-      { value: 'incoming', label: 'Incoming', position: 0, color: 'green' },
-      { value: 'outgoing', label: 'Outgoing', position: 1, color: 'blue' },
-    ],
-    defaultValue: { value: 'incoming' },
-  })
-  direction: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Subject',
-    description: 'Subject',
-    icon: 'IconMessage',
-  })
-  subject: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Text',
-    description: 'Text',
-    icon: 'IconMessage',
-  })
-  text: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.DATE_TIME,
-    label: 'Received At',
-    description: 'The date the message was received',
-    icon: 'IconCalendar',
-  })
-  @IsNullable()
-  receivedAt: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Message Participants',
-    description: 'Message Participants',
-    icon: 'IconUserCircle',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'messageParticipant',
-    inverseSideFieldName: 'message',
-    onDelete: RelationOnDeleteAction.CASCADE,
-  })
-  @IsNullable()
-  messageParticipants: MessageParticipantObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Message Channel Association',
-    description: 'Messages from the channel.',
-    icon: 'IconMessage',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'messageChannelMessageAssociation',
-    onDelete: RelationOnDeleteAction.CASCADE,
-  })
-  @IsNullable()
-  messageChannelMessageAssociations: MessageChannelMessageAssociationObjectMetadata[];
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata.ts
deleted file mode 100644
index 6fcc97d6fbe2..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-import { CurrencyMetadata } from 'src/metadata/field-metadata/composite-types/currency.composite-type';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import {
-  RelationMetadataType,
-  RelationOnDeleteAction,
-} from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { ActivityTargetObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/activity-target.object-metadata';
-import { AttachmentObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/attachment.object-metadata';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { CompanyObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/company.object-metadata';
-import { FavoriteObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/favorite.object-metadata';
-import { PersonObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata';
-import { PipelineStepObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/pipeline-step.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'opportunities',
-  labelSingular: 'Opportunity',
-  labelPlural: 'Opportunities',
-  description: 'An opportunity',
-  icon: 'IconTargetArrow',
-})
-export class OpportunityObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Name',
-    description: 'The opportunity name',
-    icon: 'IconTargetArrow',
-  })
-  name: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.CURRENCY,
-    label: 'Amount',
-    description: 'Opportunity amount',
-    icon: 'IconCurrencyDollar',
-  })
-  @IsNullable()
-  amount: CurrencyMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.DATE_TIME,
-    label: 'Close date',
-    description: 'Opportunity close date',
-    icon: 'IconCalendarEvent',
-  })
-  @IsNullable()
-  closeDate: Date;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Probability',
-    description: 'Opportunity probability',
-    icon: 'IconProgressCheck',
-    defaultValue: { value: '0' },
-  })
-  probability: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.SELECT,
-    label: 'Stage',
-    description: 'Opportunity stage',
-    icon: 'IconProgressCheck',
-    options: [
-      { value: 'NEW', label: 'New', position: 0, color: 'red' },
-      { value: 'SCREENING', label: 'Screening', position: 1, color: 'purple' },
-      { value: 'MEETING', label: 'Meeting', position: 2, color: 'sky' },
-      {
-        value: 'PROPOSAL',
-        label: 'Proposal',
-        position: 3,
-        color: 'turquoise',
-      },
-      { value: 'CUSTOMER', label: 'Customer', position: 4, color: 'yellow' },
-    ],
-    defaultValue: { value: 'NEW' },
-  })
-  stage: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.NUMBER,
-    label: 'Position',
-    description: 'Position',
-    icon: 'IconHierarchy2',
-  })
-  @IsSystem()
-  @IsNullable()
-  position: number;
-
-  // Relations
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Pipeline Step',
-    description: 'Opportunity pipeline step',
-    icon: 'IconKanban',
-    joinColumn: 'pipelineStepId',
-  })
-  @IsNullable()
-  pipelineStep: PipelineStepObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Point of Contact',
-    description: 'Opportunity point of contact',
-    icon: 'IconUser',
-    joinColumn: 'pointOfContactId',
-  })
-  @IsNullable()
-  pointOfContact: PersonObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Company',
-    description: 'Opportunity company',
-    icon: 'IconBuildingSkyscraper',
-    joinColumn: 'companyId',
-  })
-  @IsNullable()
-  company: CompanyObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Favorites',
-    description: 'Favorites linked to the opportunity',
-    icon: 'IconHeart',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'favorite',
-    onDelete: RelationOnDeleteAction.CASCADE,
-  })
-  @IsNullable()
-  favorites: FavoriteObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Activities',
-    description: 'Activities tied to the opportunity',
-    icon: 'IconCheckbox',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'activityTarget',
-    onDelete: RelationOnDeleteAction.CASCADE,
-  })
-  @IsNullable()
-  activityTargets: ActivityTargetObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Attachments',
-    description: 'Attachments linked to the opportunity.',
-    icon: 'IconFileImport',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'attachment',
-  })
-  @IsNullable()
-  attachments: AttachmentObjectMetadata[];
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata.ts
deleted file mode 100644
index e067212c12de..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/person.object-metadata.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-import { FullNameMetadata } from 'src/metadata/field-metadata/composite-types/full-name.composite-type';
-import { LinkMetadata } from 'src/metadata/field-metadata/composite-types/link.composite-type';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import {
-  RelationMetadataType,
-  RelationOnDeleteAction,
-} from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { ActivityTargetObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/activity-target.object-metadata';
-import { AttachmentObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/attachment.object-metadata';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { CompanyObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/company.object-metadata';
-import { FavoriteObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/favorite.object-metadata';
-import { MessageParticipantObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-participant.object-metadata';
-import { OpportunityObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'people',
-  labelSingular: 'Person',
-  labelPlural: 'People',
-  description: 'A person',
-  icon: 'IconUser',
-})
-export class PersonObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.FULL_NAME,
-    label: 'Name',
-    description: 'Contact’s name',
-    icon: 'IconUser',
-  })
-  @IsNullable()
-  name: FullNameMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.EMAIL,
-    label: 'Email',
-    description: 'Contact’s Email',
-    icon: 'IconMail',
-  })
-  email: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.LINK,
-    label: 'Linkedin',
-    description: 'Contact’s Linkedin account',
-    icon: 'IconBrandLinkedin',
-  })
-  @IsNullable()
-  linkedinLink: LinkMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.LINK,
-    label: 'X',
-    description: 'Contact’s X/Twitter account',
-    icon: 'IconBrandX',
-  })
-  @IsNullable()
-  xLink: LinkMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Job Title',
-    description: 'Contact’s job title',
-    icon: 'IconBriefcase',
-  })
-  jobTitle: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Phone',
-    description: 'Contact’s phone number',
-    icon: 'IconPhone',
-  })
-  phone: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'City',
-    description: 'Contact’s city',
-    icon: 'IconMap',
-  })
-  city: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Avatar',
-    description: 'Contact’s avatar',
-    icon: 'IconFileUpload',
-  })
-  @IsSystem()
-  avatarUrl: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.NUMBER,
-    label: 'Position',
-    description: 'Record Position',
-    icon: 'IconHierarchy2',
-  })
-  @IsSystem()
-  @IsNullable()
-  position: number;
-
-  // Relations
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Company',
-    description: 'Contact’s company',
-    icon: 'IconBuildingSkyscraper',
-    joinColumn: 'companyId',
-  })
-  @IsNullable()
-  company: CompanyObjectMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'POC for Opportunities',
-    description: 'Point of Contact for Opportunities',
-    icon: 'IconTargetArrow',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'opportunity',
-    inverseSideFieldName: 'pointOfContact',
-  })
-  @IsNullable()
-  pointOfContactForOpportunities: OpportunityObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Activities',
-    description: 'Activities tied to the contact',
-    icon: 'IconCheckbox',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'activityTarget',
-    onDelete: RelationOnDeleteAction.CASCADE,
-  })
-  @IsNullable()
-  activityTargets: ActivityTargetObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Favorites',
-    description: 'Favorites linked to the contact',
-    icon: 'IconHeart',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'favorite',
-    onDelete: RelationOnDeleteAction.CASCADE,
-  })
-  @IsNullable()
-  favorites: FavoriteObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Attachments',
-    description: 'Attachments linked to the contact.',
-    icon: 'IconFileImport',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'attachment',
-    onDelete: RelationOnDeleteAction.CASCADE,
-  })
-  @IsNullable()
-  attachments: AttachmentObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Message Participants',
-    description: 'Message Participants',
-    icon: 'IconUserCircle',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'messageParticipant',
-    inverseSideFieldName: 'person',
-  })
-  @IsNullable()
-  messageParticipants: MessageParticipantObjectMetadata[];
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/pipeline-step.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/pipeline-step.object-metadata.ts
deleted file mode 100644
index 4f11772fc737..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/pipeline-step.object-metadata.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { RelationMetadataType } from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { OpportunityObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'pipelineSteps',
-  labelSingular: 'Pipeline Step',
-  labelPlural: 'Pipeline Steps',
-  description: 'A pipeline step',
-  icon: 'IconLayoutKanban',
-})
-@IsSystem()
-export class PipelineStepObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Name',
-    description: 'Pipeline Step name',
-    icon: 'IconCurrencyDollar',
-  })
-  name: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Color',
-    description: 'Pipeline Step color',
-    icon: 'IconColorSwatch',
-  })
-  color: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.NUMBER,
-    label: 'Position',
-    description: 'Pipeline Step position',
-    icon: 'IconHierarchy2',
-    defaultValue: { value: 0 },
-  })
-  @IsNullable()
-  position: number;
-
-  // Relations
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Opportunities',
-    description: 'Opportunities linked to the step.',
-    icon: 'IconTargetArrow',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'opportunity',
-  })
-  @IsNullable()
-  opportunities: OpportunityObjectMetadata[];
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/view-field.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/view-field.object-metadata.ts
deleted file mode 100644
index 5104d686b6ed..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/view-field.object-metadata.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { ViewObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/view.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'viewFields',
-  labelSingular: 'View Field',
-  labelPlural: 'View Fields',
-  description: '(System) View Fields',
-  icon: 'IconTag',
-})
-@IsSystem()
-export class ViewFieldObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.UUID,
-    label: 'Field Metadata Id',
-    description: 'View Field target field',
-    icon: 'IconTag',
-  })
-  fieldMetadataId: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.BOOLEAN,
-    label: 'Visible',
-    description: 'View Field visibility',
-    icon: 'IconEye',
-    defaultValue: { value: true },
-  })
-  isVisible: boolean;
-
-  @FieldMetadata({
-    type: FieldMetadataType.NUMBER,
-    label: 'Size',
-    description: 'View Field size',
-    icon: 'IconEye',
-    defaultValue: { value: 0 },
-  })
-  size: number;
-
-  @FieldMetadata({
-    type: FieldMetadataType.NUMBER,
-    label: 'Position',
-    description: 'View Field position',
-    icon: 'IconList',
-    defaultValue: { value: 0 },
-  })
-  position: number;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'View',
-    description: 'View Field related view',
-    icon: 'IconLayoutCollage',
-    joinColumn: 'viewId',
-  })
-  @IsNullable()
-  view?: ViewObjectMetadata;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/view-filter.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/view-filter.object-metadata.ts
deleted file mode 100644
index 398ad280c194..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/view-filter.object-metadata.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { ViewObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/view.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'viewFilters',
-  labelSingular: 'View Filter',
-  labelPlural: 'View Filters',
-  description: '(System) View Filters',
-  icon: 'IconFilterBolt',
-})
-@IsSystem()
-export class ViewFilterObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.UUID,
-    label: 'Field Metadata Id',
-    description: 'View Filter target field',
-  })
-  fieldMetadataId: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Operand',
-    description: 'View Filter operand',
-    defaultValue: { value: 'Contains' },
-  })
-  operand: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Value',
-    description: 'View Filter value',
-  })
-  value: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Display Value',
-    description: 'View Filter Display Value',
-  })
-  displayValue: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'View',
-    description: 'View Filter related view',
-    icon: 'IconLayoutCollage',
-    joinColumn: 'viewId',
-  })
-  @IsNullable()
-  view: ViewObjectMetadata;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/view-sort.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/view-sort.object-metadata.ts
deleted file mode 100644
index a0a00b54db66..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/view-sort.object-metadata.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { ViewObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/view.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'viewSorts',
-  labelSingular: 'View Sort',
-  labelPlural: 'View Sorts',
-  description: '(System) View Sorts',
-  icon: 'IconArrowsSort',
-})
-@IsSystem()
-export class ViewSortObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.UUID,
-    label: 'Field Metadata Id',
-    description: 'View Sort target field',
-    icon: 'IconTag',
-  })
-  fieldMetadataId: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Direction',
-    description: 'View Sort direction',
-    defaultValue: { value: 'asc' },
-  })
-  direction: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'View',
-    description: 'View Sort related view',
-    icon: 'IconLayoutCollage',
-    joinColumn: 'viewId',
-  })
-  @IsNullable()
-  view: ViewObjectMetadata;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/view.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/view.object-metadata.ts
deleted file mode 100644
index e0d70a79dcea..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/view.object-metadata.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { RelationMetadataType } from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { ViewFieldObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/view-field.object-metadata';
-import { ViewFilterObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/view-filter.object-metadata';
-import { ViewSortObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/view-sort.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'views',
-  labelSingular: 'View',
-  labelPlural: 'Views',
-  description: '(System) Views',
-  icon: 'IconLayoutCollage',
-})
-@IsSystem()
-export class ViewObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Name',
-    description: 'View name',
-  })
-  name: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.UUID,
-    label: 'Object Metadata Id',
-    description: 'View target object',
-  })
-  objectMetadataId: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Type',
-    description: 'View type',
-    defaultValue: { value: 'table' },
-  })
-  type: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.BOOLEAN,
-    label: 'Compact View',
-    description: 'Describes if the view is in compact mode',
-    defaultValue: { value: false },
-  })
-  isCompact: boolean;
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'View Fields',
-    description: 'View Fields',
-    icon: 'IconTag',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'viewField',
-  })
-  @IsNullable()
-  viewFields: ViewFieldObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'View Filters',
-    description: 'View Filters',
-    icon: 'IconFilterBolt',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'viewFilter',
-  })
-  @IsNullable()
-  viewFilters: ViewFilterObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'View Sorts',
-    description: 'View Sorts',
-    icon: 'IconArrowsSort',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'viewSort',
-  })
-  @IsNullable()
-  viewSorts: ViewSortObjectMetadata[];
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/webhook.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/webhook.object-metadata.ts
deleted file mode 100644
index 58412fb624d8..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/webhook.object-metadata.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'webhooks',
-  labelSingular: 'Webhook',
-  labelPlural: 'Webhooks',
-  description: 'A webhook',
-  icon: 'IconRobot',
-})
-@IsSystem()
-export class WebhookObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Target Url',
-    description: 'Webhook target url',
-    icon: 'IconLink',
-  })
-  targetUrl: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Operation',
-    description: 'Webhook operation',
-    icon: 'IconCheckbox',
-  })
-  operation: string;
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata.ts
deleted file mode 100644
index 2ddf038d5128..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata.ts
+++ /dev/null
@@ -1,207 +0,0 @@
-import { FullNameMetadata } from 'src/metadata/field-metadata/composite-types/full-name.composite-type';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-import {
-  RelationMetadataType,
-  RelationOnDeleteAction,
-} from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { FieldMetadata } from 'src/workspace/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/workspace/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/workspace/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/workspace/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/workspace/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { ActivityObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/activity.object-metadata';
-import { AttachmentObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/attachment.object-metadata';
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-import { BlocklistObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/blocklist.object-metadata';
-import { CommentObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/comment.object-metadata';
-import { CompanyObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/company.object-metadata';
-import { ConnectedAccountObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/connected-account.object-metadata';
-import { FavoriteObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/favorite.object-metadata';
-import { MessageParticipantObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/message-participant.object-metadata';
-
-@ObjectMetadata({
-  namePlural: 'workspaceMembers',
-  labelSingular: 'Workspace Member',
-  labelPlural: 'Workspace Members',
-  description: 'A workspace member',
-  icon: 'IconUserCircle',
-})
-@IsSystem()
-export class WorkspaceMemberObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    type: FieldMetadataType.FULL_NAME,
-    label: 'Name',
-    description: 'Workspace member name',
-    icon: 'IconCircleUser',
-  })
-  name: FullNameMetadata;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Color Scheme',
-    description: 'Preferred color scheme',
-    icon: 'IconColorSwatch',
-    defaultValue: { value: 'Light' },
-  })
-  colorScheme: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Language',
-    description: 'Preferred language',
-    icon: 'IconLanguage',
-    defaultValue: { value: 'en' },
-  })
-  locale: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'Avatar Url',
-    description: 'Workspace member avatar',
-    icon: 'IconFileUpload',
-  })
-  avatarUrl: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.TEXT,
-    label: 'User Email',
-    description: 'Related user email address',
-    icon: 'IconMail',
-  })
-  userEmail: string;
-
-  @FieldMetadata({
-    type: FieldMetadataType.UUID,
-    label: 'User Id',
-    description: 'Associated User Id',
-    icon: 'IconCircleUsers',
-  })
-  userId: string;
-
-  // Relations
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Authored activities',
-    description: 'Activities created by the workspace member',
-    icon: 'IconCheckbox',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'activity',
-    inverseSideFieldName: 'author',
-  })
-  @IsNullable()
-  authoredActivities: ActivityObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Assigned activities',
-    description: 'Activities assigned to the workspace member',
-    icon: 'IconCheckbox',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'activity',
-    inverseSideFieldName: 'assignee',
-  })
-  @IsNullable()
-  assignedActivities: ActivityObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Favorites',
-    description: 'Favorites linked to the workspace member',
-    icon: 'IconHeart',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'favorite',
-    onDelete: RelationOnDeleteAction.CASCADE,
-  })
-  @IsNullable()
-  favorites: FavoriteObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Account Owner For Companies',
-    description: 'Account owner for companies',
-    icon: 'IconBriefcase',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'company',
-    inverseSideFieldName: 'accountOwner',
-  })
-  @IsNullable()
-  accountOwnerForCompanies: CompanyObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Authored attachments',
-    description: 'Attachments created by the workspace member',
-    icon: 'IconFileImport',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'attachment',
-    inverseSideFieldName: 'author',
-  })
-  @IsNullable()
-  authoredAttachments: AttachmentObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Authored comments',
-    description: 'Authored comments',
-    icon: 'IconComment',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'comment',
-    inverseSideFieldName: 'author',
-  })
-  @IsNullable()
-  authoredComments: CommentObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Connected accounts',
-    description: 'Connected accounts',
-    icon: 'IconAt',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'connectedAccount',
-    inverseSideFieldName: 'accountOwner',
-  })
-  @IsNullable()
-  connectedAccounts: ConnectedAccountObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Message Participants',
-    description: 'Message Participants',
-    icon: 'IconUserCircle',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'messageParticipant',
-    inverseSideFieldName: 'workspaceMember',
-  })
-  @IsNullable()
-  messageParticipants: MessageParticipantObjectMetadata[];
-
-  @FieldMetadata({
-    type: FieldMetadataType.RELATION,
-    label: 'Blocklist',
-    description: 'Blocklisted handles',
-    icon: 'IconForbid2',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    objectName: 'blocklist',
-    inverseSideFieldName: 'workspaceMember',
-  })
-  @IsNullable()
-  blocklist: BlocklistObjectMetadata[];
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/storage/workspace-sync.storage.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/storage/workspace-sync.storage.ts
deleted file mode 100644
index 4820c36da8ce..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/storage/workspace-sync.storage.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { PartialObjectMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/partial-object-metadata.interface';
-import { PartialFieldMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
-import { PartialRelationMetadata } from 'src/workspace/workspace-sync-metadata/interfaces/partial-relation-metadata.interface';
-
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { FieldMetadataEntity } from 'src/metadata/field-metadata/field-metadata.entity';
-import { RelationMetadataEntity } from 'src/metadata/relation-metadata/relation-metadata.entity';
-
-export class WorkspaceSyncStorage {
-  // Object metadata
-  private readonly _objectMetadataCreateCollection: PartialObjectMetadata[] =
-    [];
-  private readonly _objectMetadataUpdateCollection: Partial<PartialObjectMetadata>[] =
-    [];
-  private readonly _objectMetadataDeleteCollection: ObjectMetadataEntity[] = [];
-
-  // Field metadata
-  private readonly _fieldMetadataCreateCollection: PartialFieldMetadata[] = [];
-  private readonly _fieldMetadataUpdateCollection: (Partial<PartialFieldMetadata> & {
-    id: string;
-  })[] = [];
-  private readonly _fieldMetadataDeleteCollection: FieldMetadataEntity[] = [];
-
-  // Relation metadata
-  private readonly _relationMetadataCreateCollection: Partial<RelationMetadataEntity>[] =
-    [];
-  private readonly _relationMetadataDeleteCollection: RelationMetadataEntity[] =
-    [];
-  private readonly _relationMetadataUpdateCollection: Partial<PartialRelationMetadata>[] =
-    [];
-
-  constructor() {}
-
-  get objectMetadataCreateCollection() {
-    return this._objectMetadataCreateCollection;
-  }
-
-  get objectMetadataUpdateCollection() {
-    return this._objectMetadataUpdateCollection;
-  }
-
-  get objectMetadataDeleteCollection() {
-    return this._objectMetadataDeleteCollection;
-  }
-
-  get fieldMetadataCreateCollection() {
-    return this._fieldMetadataCreateCollection;
-  }
-
-  get fieldMetadataUpdateCollection() {
-    return this._fieldMetadataUpdateCollection;
-  }
-
-  get fieldMetadataDeleteCollection() {
-    return this._fieldMetadataDeleteCollection;
-  }
-
-  get relationMetadataCreateCollection() {
-    return this._relationMetadataCreateCollection;
-  }
-
-  get relationMetadataUpdateCollection() {
-    return this._relationMetadataUpdateCollection;
-  }
-
-  get relationMetadataDeleteCollection() {
-    return this._relationMetadataDeleteCollection;
-  }
-
-  addCreateObjectMetadata(object: PartialObjectMetadata) {
-    this._objectMetadataCreateCollection.push(object);
-  }
-
-  addUpdateObjectMetadata(object: Partial<PartialObjectMetadata>) {
-    this._objectMetadataUpdateCollection.push(object);
-  }
-
-  addDeleteObjectMetadata(object: ObjectMetadataEntity) {
-    this._objectMetadataDeleteCollection.push(object);
-  }
-
-  addCreateFieldMetadata(field: PartialFieldMetadata) {
-    this._fieldMetadataCreateCollection.push(field);
-  }
-
-  addUpdateFieldMetadata(
-    field: Partial<PartialFieldMetadata> & { id: string },
-  ) {
-    this._fieldMetadataUpdateCollection.push(field);
-  }
-
-  addDeleteFieldMetadata(field: FieldMetadataEntity) {
-    this._fieldMetadataDeleteCollection.push(field);
-  }
-
-  addCreateRelationMetadata(relation: Partial<RelationMetadataEntity>) {
-    this._relationMetadataCreateCollection.push(relation);
-  }
-
-  addUpdateRelationMetadata(relation: Partial<PartialRelationMetadata>) {
-    this._relationMetadataUpdateCollection.push(relation);
-  }
-
-  addDeleteRelationMetadata(relation: RelationMetadataEntity) {
-    this._relationMetadataDeleteCollection.push(relation);
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/types/object-record.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/types/object-record.ts
deleted file mode 100644
index bf21776f2f1c..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/types/object-record.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata';
-
-export type ObjectRecord<T extends BaseObjectMetadata> = {
-  [K in keyof T as T[K] extends BaseObjectMetadata
-    ? `${Extract<K, string>}Id`
-    : K]: T[K] extends BaseObjectMetadata ? string : T[K];
-} & {
-  [K in keyof T]: T[K] extends BaseObjectMetadata ? ObjectRecord<T[K]> : T[K];
-};
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/utils/is-gate-and-not-enabled.util.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/utils/is-gate-and-not-enabled.util.ts
deleted file mode 100644
index b0fe74feb49d..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/utils/is-gate-and-not-enabled.util.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { GateDecoratorParams } from 'src/workspace/workspace-sync-metadata/interfaces/gate-decorator.interface';
-
-export const isGatedAndNotEnabled = (
-  gate: GateDecoratorParams | undefined,
-  workspaceFeatureFlagsMap: Record<string, boolean>,
-): boolean => {
-  const featureFlagValue =
-    gate?.featureFlag && workspaceFeatureFlagsMap[gate.featureFlag];
-
-  return gate?.featureFlag !== undefined && !featureFlagValue;
-};
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/workspace-sync-metadata.module.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/workspace-sync-metadata.module.ts
deleted file mode 100644
index a7b12a0e3e03..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/workspace-sync-metadata.module.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { FeatureFlagEntity } from 'src/core/feature-flag/feature-flag.entity';
-import { FieldMetadataEntity } from 'src/metadata/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
-import { RelationMetadataEntity } from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { WorkspaceMigrationEntity } from 'src/metadata/workspace-migration/workspace-migration.entity';
-import { WorkspaceMigrationRunnerModule } from 'src/workspace/workspace-migration-runner/workspace-migration-runner.module';
-import { WorkspaceSyncMetadataService } from 'src/workspace/workspace-sync-metadata/workspace-sync-metadata.service';
-import { workspaceSyncMetadataFactories } from 'src/workspace/workspace-sync-metadata/factories';
-import { workspaceSyncMetadataComparators } from 'src/workspace/workspace-sync-metadata/comparators';
-import { WorkspaceMetadataUpdaterService } from 'src/workspace/workspace-sync-metadata/services/workspace-metadata-updater.service';
-import { WorkspaceSyncObjectMetadataService } from 'src/workspace/workspace-sync-metadata/services/workspace-sync-object-metadata.service';
-import { WorkspaceSyncRelationMetadataService } from 'src/workspace/workspace-sync-metadata/services/workspace-sync-relation-metadata.service';
-import { WorkspaceMigrationBuilderModule } from 'src/workspace/workspace-migration-builder/workspace-migration-builder.module';
-
-@Module({
-  imports: [
-    WorkspaceMigrationBuilderModule,
-    WorkspaceMigrationRunnerModule,
-    TypeOrmModule.forFeature(
-      [
-        FieldMetadataEntity,
-        ObjectMetadataEntity,
-        RelationMetadataEntity,
-        WorkspaceMigrationEntity,
-      ],
-      'metadata',
-    ),
-    TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
-  ],
-  providers: [
-    ...workspaceSyncMetadataFactories,
-    ...workspaceSyncMetadataComparators,
-    WorkspaceMetadataUpdaterService,
-    WorkspaceSyncObjectMetadataService,
-    WorkspaceSyncRelationMetadataService,
-    WorkspaceSyncMetadataService,
-  ],
-  exports: [WorkspaceSyncMetadataService],
-})
-export class WorkspaceSyncMetadataModule {}
diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/workspace-sync-metadata.service.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/workspace-sync-metadata.service.ts
deleted file mode 100644
index c12fcc607352..000000000000
--- a/packages/twenty-server/src/workspace/workspace-sync-metadata/workspace-sync-metadata.service.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { InjectDataSource } from '@nestjs/typeorm';
-
-import { DataSource } from 'typeorm';
-
-import { WorkspaceSyncContext } from 'src/workspace/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
-
-import { WorkspaceMigrationRunnerService } from 'src/workspace/workspace-migration-runner/workspace-migration-runner.service';
-import { FeatureFlagFactory } from 'src/workspace/workspace-sync-metadata/factories/feature-flags.factory';
-import { WorkspaceSyncObjectMetadataService } from 'src/workspace/workspace-sync-metadata/services/workspace-sync-object-metadata.service';
-import { WorkspaceSyncRelationMetadataService } from 'src/workspace/workspace-sync-metadata/services/workspace-sync-relation-metadata.service';
-import { WorkspaceSyncStorage } from 'src/workspace/workspace-sync-metadata/storage/workspace-sync.storage';
-import { WorkspaceMigrationEntity } from 'src/metadata/workspace-migration/workspace-migration.entity';
-
-@Injectable()
-export class WorkspaceSyncMetadataService {
-  private readonly logger = new Logger(WorkspaceSyncMetadataService.name);
-
-  constructor(
-    @InjectDataSource('metadata')
-    private readonly metadataDataSource: DataSource,
-    private readonly featureFlagFactory: FeatureFlagFactory,
-    private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
-    private readonly workspaceSyncObjectMetadataService: WorkspaceSyncObjectMetadataService,
-    private readonly workspaceSyncRelationMetadataService: WorkspaceSyncRelationMetadataService,
-  ) {}
-
-  /**
-   *
-   * Sync all standard objects and fields metadata for a given workspace and data source
-   * This will update the metadata if it has changed and generate migrations based on the diff.
-   *
-   * @param dataSourceId
-   * @param workspaceId
-   */
-  public async syncStandardObjectsAndFieldsMetadata(
-    context: WorkspaceSyncContext,
-    options: { applyChanges?: boolean } = { applyChanges: true },
-  ): Promise<{
-    workspaceMigrations: WorkspaceMigrationEntity[];
-    storage: WorkspaceSyncStorage;
-  }> {
-    let workspaceMigrations: WorkspaceMigrationEntity[] = [];
-    const storage = new WorkspaceSyncStorage();
-    const queryRunner = this.metadataDataSource.createQueryRunner();
-
-    this.logger.log('Syncing standard objects and fields metadata');
-
-    await queryRunner.connect();
-    await queryRunner.startTransaction();
-
-    const manager = queryRunner.manager;
-
-    try {
-      const workspaceMigrationRepository = manager.getRepository(
-        WorkspaceMigrationEntity,
-      );
-
-      // Retrieve feature flags
-      const workspaceFeatureFlagsMap =
-        await this.featureFlagFactory.create(context);
-
-      this.logger.log('Syncing standard objects and fields metadata');
-
-      const workspaceObjectMigrations =
-        await this.workspaceSyncObjectMetadataService.synchronize(
-          context,
-          manager,
-          storage,
-          workspaceFeatureFlagsMap,
-        );
-
-      const workspaceRelationMigrations =
-        await this.workspaceSyncRelationMetadataService.synchronize(
-          context,
-          manager,
-          storage,
-          workspaceFeatureFlagsMap,
-        );
-
-      // Save workspace migrations into the database
-      workspaceMigrations = await workspaceMigrationRepository.save([
-        ...workspaceObjectMigrations,
-        ...workspaceRelationMigrations,
-      ]);
-
-      // If we're running a dry run, rollback the transaction and do not execute migrations
-      if (!options.applyChanges) {
-        this.logger.log('Running in dry run mode, rolling back transaction');
-
-        await queryRunner.rollbackTransaction();
-
-        await queryRunner.release();
-
-        return {
-          workspaceMigrations,
-          storage,
-        };
-      }
-
-      await queryRunner.commitTransaction();
-
-      // Execute migrations
-      await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
-        context.workspaceId,
-      );
-    } catch (error) {
-      console.error('Sync of standard objects failed with:', error);
-      await queryRunner.rollbackTransaction();
-    } finally {
-      await queryRunner.release();
-    }
-
-    return {
-      workspaceMigrations,
-      storage,
-    };
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace.factory.spec.ts b/packages/twenty-server/src/workspace/workspace.factory.spec.ts
deleted file mode 100644
index 6109069092dd..000000000000
--- a/packages/twenty-server/src/workspace/workspace.factory.spec.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
-import { WorkspaceSchemaStorageService } from 'src/workspace/workspace-schema-storage/workspace-schema-storage.service';
-import { ScalarsExplorerService } from 'src/workspace/services/scalars-explorer.service';
-
-import { WorkspaceFactory } from './workspace.factory';
-
-import { WorkspaceResolverFactory } from './workspace-resolver-builder/workspace-resolver.factory';
-import { WorkspaceGraphQLSchemaFactory } from './workspace-schema-builder/workspace-graphql-schema.factory';
-
-describe('WorkspaceFactory', () => {
-  let service: WorkspaceFactory;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        WorkspaceFactory,
-        {
-          provide: DataSourceService,
-          useValue: {},
-        },
-        {
-          provide: ObjectMetadataService,
-          useValue: {},
-        },
-        {
-          provide: ScalarsExplorerService,
-          useValue: {},
-        },
-        {
-          provide: WorkspaceGraphQLSchemaFactory,
-          useValue: {},
-        },
-        {
-          provide: WorkspaceResolverFactory,
-          useValue: {},
-        },
-        {
-          provide: WorkspaceSchemaStorageService,
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    service = module.get<WorkspaceFactory>(WorkspaceFactory);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});
diff --git a/packages/twenty-server/src/workspace/workspace.factory.ts b/packages/twenty-server/src/workspace/workspace.factory.ts
deleted file mode 100644
index bbc4b758d085..000000000000
--- a/packages/twenty-server/src/workspace/workspace.factory.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { GraphQLSchema, printSchema } from 'graphql';
-import { makeExecutableSchema } from '@graphql-tools/schema';
-import { gql } from 'graphql-tag';
-
-import { DataSourceService } from 'src/metadata/data-source/data-source.service';
-import { WorkspaceSchemaStorageService } from 'src/workspace/workspace-schema-storage/workspace-schema-storage.service';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
-import { ScalarsExplorerService } from 'src/workspace/services/scalars-explorer.service';
-
-import { WorkspaceGraphQLSchemaFactory } from './workspace-schema-builder/workspace-graphql-schema.factory';
-import { workspaceResolverBuilderMethodNames } from './workspace-resolver-builder/factories/factories';
-import { WorkspaceResolverFactory } from './workspace-resolver-builder/workspace-resolver.factory';
-
-@Injectable()
-export class WorkspaceFactory {
-  constructor(
-    private readonly dataSourceService: DataSourceService,
-    private readonly objectMetadataService: ObjectMetadataService,
-    private readonly scalarsExplorerService: ScalarsExplorerService,
-    private readonly workspaceGraphQLSchemaFactory: WorkspaceGraphQLSchemaFactory,
-    private readonly workspaceResolverFactory: WorkspaceResolverFactory,
-    private readonly workspaceSchemaStorageService: WorkspaceSchemaStorageService,
-  ) {}
-
-  async createGraphQLSchema(
-    workspaceId: string | undefined,
-    userId: string | undefined,
-  ): Promise<GraphQLSchema> {
-    if (!workspaceId) {
-      return new GraphQLSchema({});
-    }
-
-    const dataSourcesMetadata =
-      await this.dataSourceService.getDataSourcesMetadataFromWorkspaceId(
-        workspaceId,
-      );
-
-    // Can'f find any data sources for this workspace
-    if (!dataSourcesMetadata || dataSourcesMetadata.length === 0) {
-      return new GraphQLSchema({});
-    }
-
-    // Validate cache version
-    await this.workspaceSchemaStorageService.validateCacheVersion(workspaceId);
-
-    // Get object metadata from cache
-    let objectMetadataCollection =
-      await this.workspaceSchemaStorageService.getObjectMetadata(workspaceId);
-
-    // If object metadata is not cached, get it from the database
-    if (!objectMetadataCollection) {
-      objectMetadataCollection =
-        await this.objectMetadataService.findManyWithinWorkspace(workspaceId);
-
-      await this.workspaceSchemaStorageService.setObjectMetadata(
-        workspaceId,
-        objectMetadataCollection,
-      );
-    }
-
-    // Get typeDefs from cache
-    let typeDefs =
-      await this.workspaceSchemaStorageService.getTypeDefs(workspaceId);
-    let usedScalarNames =
-      await this.workspaceSchemaStorageService.getUsedScalarNames(workspaceId);
-
-    // If typeDefs are not cached, generate them
-    if (!typeDefs || !usedScalarNames) {
-      const autoGeneratedSchema =
-        await this.workspaceGraphQLSchemaFactory.create(
-          objectMetadataCollection,
-          workspaceResolverBuilderMethodNames,
-        );
-
-      usedScalarNames =
-        this.scalarsExplorerService.getUsedScalarNames(autoGeneratedSchema);
-      typeDefs = printSchema(autoGeneratedSchema);
-
-      await this.workspaceSchemaStorageService.setTypeDefs(
-        workspaceId,
-        typeDefs,
-      );
-      await this.workspaceSchemaStorageService.setUsedScalarNames(
-        workspaceId,
-        usedScalarNames,
-      );
-    }
-
-    const autoGeneratedResolvers = await this.workspaceResolverFactory.create(
-      workspaceId,
-      userId,
-      objectMetadataCollection,
-      workspaceResolverBuilderMethodNames,
-    );
-    const scalarsResolvers =
-      this.scalarsExplorerService.getScalarResolvers(usedScalarNames);
-
-    const executableSchema = makeExecutableSchema({
-      typeDefs: gql`
-        ${typeDefs}
-      `,
-      resolvers: {
-        ...scalarsResolvers,
-        ...autoGeneratedResolvers,
-      },
-    });
-
-    return executableSchema;
-  }
-}
diff --git a/packages/twenty-server/src/workspace/workspace.module.ts b/packages/twenty-server/src/workspace/workspace.module.ts
deleted file mode 100644
index f6bbe9705da2..000000000000
--- a/packages/twenty-server/src/workspace/workspace.module.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { MetadataModule } from 'src/metadata/metadata.module';
-import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
-import { WorkspaceSchemaStorageModule } from 'src/workspace/workspace-schema-storage/workspace-schema-storage.module';
-import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
-import { ScalarsExplorerService } from 'src/workspace/services/scalars-explorer.service';
-import { MessagingModule } from 'src/workspace/messaging/messaging.module';
-
-import { WorkspaceFactory } from './workspace.factory';
-
-import { WorkspaceSchemaBuilderModule } from './workspace-schema-builder/workspace-schema-builder.module';
-import { WorkspaceResolverBuilderModule } from './workspace-resolver-builder/workspace-resolver-builder.module';
-
-@Module({
-  imports: [
-    MetadataModule,
-    DataSourceModule,
-    ObjectMetadataModule,
-    WorkspaceSchemaBuilderModule,
-    WorkspaceResolverBuilderModule,
-    WorkspaceSchemaStorageModule,
-    MessagingModule,
-  ],
-  providers: [WorkspaceFactory, ScalarsExplorerService],
-  exports: [WorkspaceFactory],
-})
-export class WorkspaceModule {}
diff --git a/packages/twenty-server/test/company.e2e-spec.ts b/packages/twenty-server/test/company.e2e-spec.ts
index cb6ea18f51b9..1441a7d9c356 100644
--- a/packages/twenty-server/test/company.e2e-spec.ts
+++ b/packages/twenty-server/test/company.e2e-spec.ts
@@ -2,7 +2,7 @@ import { INestApplication } from '@nestjs/common';
 
 import request from 'supertest';
 
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
 
 import { createApp } from './utils/create-app';
 
diff --git a/packages/twenty-server/tsconfig.json b/packages/twenty-server/tsconfig.json
index 92e6f856d279..c0fc8b9bb4b0 100644
--- a/packages/twenty-server/tsconfig.json
+++ b/packages/twenty-server/tsconfig.json
@@ -25,11 +25,13 @@
     "types": ["jest", "node"],
     "paths": {
       "src/*": ["packages/twenty-server/src/*"],
+      "test/*": ["packages/twenty-server/test/*"],
       "twenty-emails": ["packages/twenty-emails/src/index.ts"]
     }
   },
   "ts-node": {
     "files": true,
     "require": ["tsconfig-paths/register"]
-  }
+  },
+  "exclude": ["dist"]
 }
diff --git a/packages/twenty-ui/.eslintrc.cjs b/packages/twenty-ui/.eslintrc.cjs
new file mode 100644
index 000000000000..ccb1c6e414d3
--- /dev/null
+++ b/packages/twenty-ui/.eslintrc.cjs
@@ -0,0 +1,32 @@
+module.exports = {
+  extends: ['../../.eslintrc.cjs', '../../.eslintrc.react.cjs'],
+  ignorePatterns: ['!**/*'],
+  overrides: [
+    {
+      files: ['*.ts', '*.tsx'],
+      parserOptions: {
+        project: ['packages/twenty-ui/tsconfig.{json,*.json}'],
+      },
+      rules: {
+        'no-restricted-imports': [
+          'error',
+          {
+            patterns: [
+              {
+                group: ['@tabler/icons-react'],
+                message: 'Please import icons from `src/display`',
+              },
+              {
+                group: ['react-hotkeys-web-hook'],
+                importNames: ['useHotkeys'],
+                message:
+                  'Please use the custom wrapper: `useScopedHotkeys` from `src/utilities`',
+              },
+            ],
+          },
+        ],
+        '@nx/dependency-checks': 'error',
+      },
+    },
+  ],
+};
diff --git a/packages/twenty-ui/.storybook/main.ts b/packages/twenty-ui/.storybook/main.ts
new file mode 100644
index 000000000000..270259adfdd7
--- /dev/null
+++ b/packages/twenty-ui/.storybook/main.ts
@@ -0,0 +1,25 @@
+import { StorybookConfig } from '@storybook/react-vite';
+
+const config: StorybookConfig = {
+  stories: ['../src/**/*.stories.@(js|jsx|ts|tsx|mdx)'],
+  addons: [
+    '@storybook/addon-links',
+    '@storybook/addon-essentials',
+    '@storybook/addon-onboarding',
+    '@storybook/addon-interactions',
+    '@storybook/addon-coverage',
+    'storybook-dark-mode',
+    'storybook-addon-cookie',
+    'storybook-addon-pseudo-states',
+  ],
+  framework: {
+    name: '@storybook/react-vite',
+    options: {},
+  },
+};
+
+export default config;
+
+// To customize your Vite configuration you can use the viteFinal field.
+// Check https://storybook.js.org/docs/react/builders/vite#configuration
+// and https://nx.dev/recipes/storybook/custom-builder-configs
diff --git a/packages/twenty-ui/.storybook/manager-head.html b/packages/twenty-ui/.storybook/manager-head.html
new file mode 100644
index 000000000000..0be4849fca4e
--- /dev/null
+++ b/packages/twenty-ui/.storybook/manager-head.html
@@ -0,0 +1,5 @@
+<style>
+    [data-is-storybook="true"] {
+        background-color: transparent!important;
+    }
+</style>
\ No newline at end of file
diff --git a/packages/twenty-ui/.storybook/preview-head.html b/packages/twenty-ui/.storybook/preview-head.html
new file mode 100644
index 000000000000..732858d597cd
--- /dev/null
+++ b/packages/twenty-ui/.storybook/preview-head.html
@@ -0,0 +1,34 @@
+<link
+  href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap"
+  rel="stylesheet"
+/>
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/iframe-resizer/4.3.7/iframeResizer.contentWindow.min.js"></script>
+
+<style type="text/css">
+body {
+  margin: 0;
+  font-family: 'Inter', sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+html {
+  font-size: 13px;
+}
+.sbdocs-wrapper {
+  padding: 0 !important;
+}
+*::-webkit-scrollbar {
+    height: 4px;
+    width: 4px;
+  }
+
+  *::-webkit-scrollbar-corner {
+    background-color: transparent;
+  }
+
+  *::-webkit-scrollbar-thumb {
+    background-color: transparent;
+    border-radius: 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/packages/twenty-ui/.storybook/preview.tsx b/packages/twenty-ui/.storybook/preview.tsx
new file mode 100644
index 000000000000..83da6ca43a86
--- /dev/null
+++ b/packages/twenty-ui/.storybook/preview.tsx
@@ -0,0 +1,22 @@
+import { ThemeProvider } from '@emotion/react';
+import { Preview } from '@storybook/react';
+import { useDarkMode } from 'storybook-dark-mode';
+
+import { THEME_DARK, THEME_LIGHT } from '../src/theme/index';
+
+const preview: Preview = {
+  decorators: [
+    (Story) => {
+      const mode = useDarkMode() ? 'Dark' : 'Light';
+
+      const theme = mode === 'Dark' ? THEME_DARK : THEME_LIGHT;
+      return (
+        <ThemeProvider theme={theme}>
+          <Story />
+        </ThemeProvider>
+      );
+    },
+  ],
+};
+
+export default preview;
diff --git a/packages/twenty-ui/README.md b/packages/twenty-ui/README.md
new file mode 100644
index 000000000000..dfab0516c520
--- /dev/null
+++ b/packages/twenty-ui/README.md
@@ -0,0 +1,15 @@
+# Twenty UI
+
+This library was generated with [Nx](https://nx.dev).
+
+## Building
+
+Run `yarn nx build twenty-ui` to build the library.
+
+## Storybook Server
+
+Run `yarn nx start twenty-ui` to start the storybook development server on `localhost:6006`.
+
+## Running unit tests
+
+Run `yarn nx test twenty-ui` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/packages/twenty-ui/jest.config.ts b/packages/twenty-ui/jest.config.ts
new file mode 100644
index 000000000000..e5840eb2abfd
--- /dev/null
+++ b/packages/twenty-ui/jest.config.ts
@@ -0,0 +1,22 @@
+export default {
+  displayName: 'twenty-ui',
+  preset: '../../jest.preset.js',
+  setupFilesAfterEnv: ['./setupTests.ts'],
+  testEnvironment: 'jsdom',
+  transformIgnorePatterns: ['../../node_modules/'],
+  transform: {
+    '^.+\\.[tj]sx?$': [
+      '@swc/jest',
+      {
+        jsc: {
+          parser: { syntax: 'typescript', tsx: true },
+          transform: { react: { runtime: 'automatic' } },
+        },
+      },
+    ],
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  extensionsToTreatAsEsm: ['.ts', '.tsx'],
+  coverageDirectory: './coverage',
+};
+
diff --git a/packages/twenty-ui/package.json b/packages/twenty-ui/package.json
new file mode 100644
index 000000000000..1653b0fdce62
--- /dev/null
+++ b/packages/twenty-ui/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "twenty-ui",
+  "version": "0.4.0",
+  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    }
+  },
+  "scripts": {
+    "build": "vite build"
+  }
+}
diff --git a/packages/twenty-ui/project.json b/packages/twenty-ui/project.json
new file mode 100644
index 000000000000..c32123554f34
--- /dev/null
+++ b/packages/twenty-ui/project.json
@@ -0,0 +1,77 @@
+{
+  "name": "twenty-ui",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "packages/twenty-ui/src",
+  "projectType": "library",
+  "targets": {
+    "build": {
+      "dependsOn": ["^build", "generateBarrels"]
+    },
+    "generateBarrels": {
+      "executor": "nx:run-commands",
+      "cache": true,
+      "inputs": [
+        "{projectRoot}/src/**/*.{ts,tsx}",
+        "!{projectRoot}/src/**/*.(spec|test).{ts,tsx}",
+        "!{projectRoot}/src/**/*.stories.{ts,tsx}"
+      ],
+      "outputs": ["{projectRoot}/src/index.ts", "{projectRoot}/src/*/index.ts"],
+      "options": {
+        "outputPath": "{projectRoot}/dist",
+        "command": "npx ts-node --esm {projectRoot}/scripts/generateBarrels.ts"
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "options": {
+        "eslintConfig": "{projectRoot}/.eslintrc.cjs",
+        "ignorePath": "{workspaceRoot}/.gitignore",
+        "lintFilePatterns": [
+          "{projectRoot}/src/**/*.{ts,tsx,json}",
+          "{projectRoot}/package.json"
+        ]
+      },
+      "configurations": {
+        "ci": { "lintFilePatterns": ["{projectRoot}/**/*.{ts,tsx,json}"] },
+        "fix": { "fix": true }
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{projectRoot}/coverage"],
+      "options": {
+        "jestConfig": "{projectRoot}/jest.config.ts"
+      }
+    },
+    "storybook:dev": {
+      "executor": "@nx/storybook:storybook",
+      "options": {
+        "port": 6007,
+        "configDir": "{projectRoot}/.storybook"
+      },
+      "configurations": {
+        "ci": { "quiet": true }
+      }
+    },
+    "storybook:build": {
+      "executor": "@nx/storybook:build",
+      "outputs": ["{options.outputDir}"],
+      "options": {
+        "outputDir": "{projectRoot}/storybook-static",
+        "configDir": "{projectRoot}/.storybook"
+      },
+      "configurations": {
+        "ci": {
+          "quiet": true
+        }
+      }
+    },
+    "storybook:test": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "test-storybook -c {projectRoot}/.storybook --url=http://localhost:6007"
+      }
+    }
+  },
+  "tags": []
+}
diff --git a/packages/twenty-ui/scripts/generateBarrels.ts b/packages/twenty-ui/scripts/generateBarrels.ts
new file mode 100644
index 000000000000..23831fd9012b
--- /dev/null
+++ b/packages/twenty-ui/scripts/generateBarrels.ts
@@ -0,0 +1,90 @@
+import * as fs from 'fs';
+import path from 'path';
+
+const extensions = ['.ts', '.tsx'];
+const excludedExtensions = [
+  '.test.ts',
+  '.test.tsx',
+  '.spec.ts',
+  '.spec.tsx',
+  '.stories.ts',
+  '.stories.tsx',
+];
+const excludedDirectories = [
+  '__tests__',
+  '__mocks__',
+  '__stories__',
+  'internal',
+];
+const srcPath = path.resolve('packages/twenty-ui/src');
+
+const getSubDirectoryPaths = (directoryPath: string) =>
+  fs
+    .readdirSync(directoryPath)
+    .filter(
+      (fileOrDirectoryName) =>
+        !excludedDirectories.includes(fileOrDirectoryName) &&
+        fs
+          .statSync(path.join(directoryPath, fileOrDirectoryName))
+          .isDirectory(),
+    )
+    .map((subDirectoryName) => path.join(directoryPath, subDirectoryName));
+
+const getDirectoryPathsRecursive = (directoryPath: string): string[] => [
+  directoryPath,
+  ...getSubDirectoryPaths(directoryPath).flatMap(getDirectoryPathsRecursive),
+];
+
+const getFilesPaths = (directoryPath: string) =>
+  fs
+    .readdirSync(directoryPath)
+    .filter(
+      (filePath) =>
+        fs.statSync(path.join(directoryPath, filePath)).isFile() &&
+        !filePath.startsWith('index.') &&
+        extensions.some((extension) => filePath.endsWith(extension)) &&
+        excludedExtensions.every(
+          (excludedExtension) => !filePath.endsWith(excludedExtension),
+        ),
+    );
+
+const moduleDirectories = getSubDirectoryPaths(srcPath);
+
+moduleDirectories.forEach((moduleDirectoryPath) => {
+  const directoryPaths = getDirectoryPathsRecursive(moduleDirectoryPath);
+
+  const moduleExports = directoryPaths
+    .flatMap((directoryPath) => {
+      const directFilesPaths = getFilesPaths(directoryPath);
+
+      return directFilesPaths.map((filePath) => {
+        const fileName = filePath.split('.').slice(0, -1).join('.');
+        return `export * from './${path.relative(
+          moduleDirectoryPath,
+          path.join(directoryPath, fileName),
+        )}';`;
+      });
+    })
+    .sort((a, b) => a.localeCompare(b))
+    .join('\n');
+
+  fs.writeFileSync(
+    path.join(moduleDirectoryPath, 'index.ts'),
+    `${moduleExports}\n`,
+    'utf-8',
+  );
+});
+
+const mainBarrelExports = moduleDirectories
+  .map(
+    (moduleDirectoryPath) =>
+      `export * from './${path.relative(srcPath, moduleDirectoryPath)}';`,
+  )
+  .sort((a, b) => a.localeCompare(b))
+  .join('\n');
+
+fs.writeFileSync(
+  path.join(srcPath, 'index.ts'),
+  `${mainBarrelExports}\n`,
+  'utf-8',
+);
diff --git a/packages/twenty-ui/setupTests.ts b/packages/twenty-ui/setupTests.ts
new file mode 100644
index 000000000000..8f2609b7b3e0
--- /dev/null
+++ b/packages/twenty-ui/setupTests.ts
@@ -0,0 +1,5 @@
+// jest-dom adds custom jest matchers for asserting on DOM nodes.
+// allows you to do things like:
+// expect(element).toHaveTextContent(/react/i)
+// learn more: https://github.com/testing-library/jest-dom
+import '@testing-library/jest-dom';
diff --git a/packages/twenty-front/src/modules/ui/display/pill/components/Pill.tsx b/packages/twenty-ui/src/components/Pill/Pill.tsx
similarity index 82%
rename from packages/twenty-front/src/modules/ui/display/pill/components/Pill.tsx
rename to packages/twenty-ui/src/components/Pill/Pill.tsx
index 414b11db781f..80ea62daaaa0 100644
--- a/packages/twenty-front/src/modules/ui/display/pill/components/Pill.tsx
+++ b/packages/twenty-ui/src/components/Pill/Pill.tsx
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import styled from '@emotion/styled';
 
 type PillProps = {
@@ -21,6 +22,6 @@ const StyledPill = styled.span`
   padding: ${({ theme }) => `0 ${theme.spacing(2)}`};
 `;
 
-export const Pill = ({ className, label }: PillProps) => (
-  <StyledPill className={className}>{label}</StyledPill>
-);
+export const Pill = ({ className, label }: PillProps) => {
+  return <StyledPill className={className}>{label}</StyledPill>;
+};
diff --git a/packages/twenty-ui/src/components/Pill/__stories__/Pill.stories.ts b/packages/twenty-ui/src/components/Pill/__stories__/Pill.stories.ts
new file mode 100644
index 000000000000..d7f099efa192
--- /dev/null
+++ b/packages/twenty-ui/src/components/Pill/__stories__/Pill.stories.ts
@@ -0,0 +1,18 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { ComponentDecorator } from '../../../testing/decorators/ComponentDecorator';
+import { Pill } from '../Pill';
+
+const meta: Meta<typeof Pill> = {
+  title: 'UI/Display/Pill',
+  component: Pill,
+  decorators: [ComponentDecorator],
+  args: {
+    label: 'Soon',
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof Pill>;
+
+export const Default: Story = {};
diff --git a/packages/twenty-ui/src/components/index.ts b/packages/twenty-ui/src/components/index.ts
new file mode 100644
index 000000000000..9421600e95d0
--- /dev/null
+++ b/packages/twenty-ui/src/components/index.ts
@@ -0,0 +1 @@
+export * from './Pill/Pill';
diff --git a/packages/twenty-ui/src/display/icon/components/TablerIcons.ts b/packages/twenty-ui/src/display/icon/components/TablerIcons.ts
new file mode 100644
index 000000000000..1a5f4247bf07
--- /dev/null
+++ b/packages/twenty-ui/src/display/icon/components/TablerIcons.ts
@@ -0,0 +1,143 @@
+/* eslint-disable no-restricted-imports */
+export type { TablerIconsProps } from '@tabler/icons-react';
+export {
+  Icon123,
+  IconAlertCircle,
+  IconAlertTriangle,
+  IconApps,
+  IconArchive,
+  IconArchiveOff,
+  IconArrowBackUp,
+  IconArrowDown,
+  IconArrowLeft,
+  IconArrowRight,
+  IconArrowUp,
+  IconArrowUpRight,
+  IconAt,
+  IconBaselineDensitySmall,
+  IconBell,
+  IconBolt,
+  IconBook2,
+  IconBox,
+  IconBrandGithub,
+  IconBrandGoogle,
+  IconBrandLinkedin,
+  IconBrandX,
+  IconBriefcase,
+  IconBuildingSkyscraper,
+  IconCalendar,
+  IconCalendarEvent,
+  IconCalendarX,
+  IconCheck,
+  IconCheckbox,
+  IconChevronDown,
+  IconChevronLeft,
+  IconChevronRight,
+  IconChevronsRight,
+  IconChevronUp,
+  IconCircleDot,
+  IconCircleOff,
+  IconCirclePlus,
+  IconCircleX,
+  IconClick,
+  IconCode,
+  IconCoins,
+  IconColorSwatch,
+  IconMessageCircle as IconComment,
+  IconCopy,
+  IconCreditCard,
+  IconCurrencyDollar,
+  IconCurrencyEuro,
+  IconCurrencyFrank,
+  IconCurrencyPound,
+  IconCurrencyYen,
+  IconCurrencyYuan,
+  IconDatabase,
+  IconDeviceFloppy,
+  IconDoorEnter,
+  IconDotsVertical,
+  IconDownload,
+  IconEditCircle,
+  IconEye,
+  IconEyeOff,
+  IconFile,
+  IconFileCheck,
+  IconFileExport,
+  IconFileImport,
+  IconFileText,
+  IconFileUpload,
+  IconFileZip,
+  IconFilter,
+  IconFilterOff,
+  IconFocusCentered,
+  IconForbid,
+  IconGripVertical,
+  IconH1,
+  IconH2,
+  IconH3,
+  IconHeadphones,
+  IconHeart,
+  IconHeartOff,
+  IconHelpCircle,
+  IconHierarchy2,
+  IconInbox,
+  IconInfoCircle,
+  IconJson,
+  IconKey,
+  IconLanguage,
+  IconLayersLinked,
+  IconLayoutKanban,
+  IconLayoutSidebarLeftCollapse,
+  IconLayoutSidebarRightCollapse,
+  IconLayoutSidebarRightExpand,
+  IconLink,
+  IconLinkOff,
+  IconList,
+  IconListNumbers,
+  IconLock,
+  IconMail,
+  IconMailCog,
+  IconMap,
+  IconMinus,
+  IconMoneybag,
+  IconMouse2,
+  IconNotes,
+  IconNumbers,
+  IconPaperclip,
+  IconPencil,
+  IconPhone,
+  IconPhoto,
+  IconPilcrow,
+  IconPlug,
+  IconPlus,
+  IconPresentation,
+  IconProgressCheck,
+  IconPuzzle,
+  IconQuestionMark,
+  IconRefresh,
+  IconRelationManyToMany,
+  IconRelationOneToMany,
+  IconRelationOneToOne,
+  IconRepeat,
+  IconSearch,
+  IconSend,
+  IconSettings,
+  IconSortDescending,
+  IconTable,
+  IconTag,
+  IconTags,
+  IconTarget,
+  IconTargetArrow,
+  IconTextSize,
+  IconTimelineEvent,
+  IconTrash,
+  IconUnlink,
+  IconUpload,
+  IconUser,
+  IconUserCircle,
+  IconUsers,
+  IconVideo,
+  IconWand,
+  IconWorld,
+  IconX,
+} from '@tabler/icons-react';
diff --git a/packages/twenty-ui/src/display/index.ts b/packages/twenty-ui/src/display/index.ts
new file mode 100644
index 000000000000..bb37a9a6632b
--- /dev/null
+++ b/packages/twenty-ui/src/display/index.ts
@@ -0,0 +1 @@
+export * from './icon/components/TablerIcons';
diff --git a/packages/twenty-ui/src/emotion.d.ts b/packages/twenty-ui/src/emotion.d.ts
new file mode 100644
index 000000000000..2a890909fe48
--- /dev/null
+++ b/packages/twenty-ui/src/emotion.d.ts
@@ -0,0 +1,5 @@
+import { ThemeType } from './theme';
+
+declare module '@emotion/react' {
+  export interface Theme extends ThemeType {}
+}
diff --git a/packages/twenty-ui/src/index.ts b/packages/twenty-ui/src/index.ts
new file mode 100644
index 000000000000..09b018c3f5b6
--- /dev/null
+++ b/packages/twenty-ui/src/index.ts
@@ -0,0 +1,5 @@
+export * from './components';
+export * from './display';
+export * from './testing';
+export * from './theme';
+export * from './utilities';
diff --git a/packages/twenty-ui/src/nx-react.d.ts b/packages/twenty-ui/src/nx-react.d.ts
new file mode 100644
index 000000000000..639a9eed3ad2
--- /dev/null
+++ b/packages/twenty-ui/src/nx-react.d.ts
@@ -0,0 +1,3 @@
+/// <reference types="@nx/react/typings/cssmodule.d.ts" />
+/// <reference types="@nx/react/typings/image.d.ts" />
+/// <reference types="@nx/react/typings/styled-jsx.d.ts" />
diff --git a/packages/twenty-ui/src/testing/ComponentStorybookLayout.tsx b/packages/twenty-ui/src/testing/ComponentStorybookLayout.tsx
new file mode 100644
index 000000000000..57fbe655403c
--- /dev/null
+++ b/packages/twenty-ui/src/testing/ComponentStorybookLayout.tsx
@@ -0,0 +1,28 @@
+import styled from '@emotion/styled';
+
+const StyledLayout = styled.div<{ width?: number }>`
+  background: ${({ theme }) => theme.background.primary};
+  border: 1px solid ${({ theme }) => theme.border.color.light};
+  border-radius: 5px;
+
+  display: flex;
+  flex-direction: row;
+
+  height: fit-content;
+  max-width: calc(100% - 40px);
+  min-width: ${({ width }) => (width ? 'unset' : '300px')};
+  padding: 20px;
+  width: ${({ width }) => (width ? width + 'px' : 'fit-content')};
+`;
+
+type ComponentStorybookLayoutProps = {
+  width?: number;
+  children: JSX.Element;
+};
+
+export const ComponentStorybookLayout = ({
+  width,
+  children,
+}: ComponentStorybookLayoutProps) => (
+  <StyledLayout width={width}>{children}</StyledLayout>
+);
diff --git a/packages/twenty-ui/src/testing/decorators/ComponentDecorator.tsx b/packages/twenty-ui/src/testing/decorators/ComponentDecorator.tsx
new file mode 100644
index 000000000000..70fa9051a8eb
--- /dev/null
+++ b/packages/twenty-ui/src/testing/decorators/ComponentDecorator.tsx
@@ -0,0 +1,13 @@
+import { Decorator } from '@storybook/react';
+
+import { ComponentStorybookLayout } from '../ComponentStorybookLayout';
+
+export const ComponentDecorator: Decorator = (Story, context) => {
+  const { container } = context.parameters;
+
+  return (
+    <ComponentStorybookLayout width={container?.width}>
+      <Story />
+    </ComponentStorybookLayout>
+  );
+};
diff --git a/packages/twenty-ui/src/testing/index.ts b/packages/twenty-ui/src/testing/index.ts
new file mode 100644
index 000000000000..7b8accb69ff4
--- /dev/null
+++ b/packages/twenty-ui/src/testing/index.ts
@@ -0,0 +1,2 @@
+export * from './ComponentStorybookLayout';
+export * from './decorators/ComponentDecorator';
diff --git a/packages/twenty-ui/src/theme/assets/dark-noise.jpg b/packages/twenty-ui/src/theme/assets/dark-noise.jpg
new file mode 100644
index 000000000000..6fc95715e9d4
Binary files /dev/null and b/packages/twenty-ui/src/theme/assets/dark-noise.jpg differ
diff --git a/packages/twenty-ui/src/theme/assets/light-noise.png b/packages/twenty-ui/src/theme/assets/light-noise.png
new file mode 100644
index 000000000000..d7b3bc2c064a
Binary files /dev/null and b/packages/twenty-ui/src/theme/assets/light-noise.png differ
diff --git a/packages/twenty-ui/src/theme/constants/AccentDark.ts b/packages/twenty-ui/src/theme/constants/AccentDark.ts
new file mode 100644
index 000000000000..35918883d307
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/AccentDark.ts
@@ -0,0 +1,10 @@
+import { COLOR } from './Colors';
+
+export const ACCENT_DARK = {
+  primary: COLOR.blueAccent75,
+  secondary: COLOR.blueAccent80,
+  tertiary: COLOR.blueAccent85,
+  quaternary: COLOR.blueAccent90,
+  accent3570: COLOR.blueAccent70,
+  accent4060: COLOR.blueAccent60,
+};
diff --git a/packages/twenty-ui/src/theme/constants/AccentLight.ts b/packages/twenty-ui/src/theme/constants/AccentLight.ts
new file mode 100644
index 000000000000..7c898969720d
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/AccentLight.ts
@@ -0,0 +1,10 @@
+import { COLOR } from './Colors';
+
+export const ACCENT_LIGHT = {
+  primary: COLOR.blueAccent25,
+  secondary: COLOR.blueAccent20,
+  tertiary: COLOR.blueAccent15,
+  quaternary: COLOR.blueAccent10,
+  accent3570: COLOR.blueAccent35,
+  accent4060: COLOR.blueAccent40,
+};
diff --git a/packages/twenty-ui/src/theme/constants/Animation.ts b/packages/twenty-ui/src/theme/constants/Animation.ts
new file mode 100644
index 000000000000..865d43b2b9a9
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/Animation.ts
@@ -0,0 +1,9 @@
+export const ANIMATION = {
+  duration: {
+    instant: 0.075,
+    fast: 0.15,
+    normal: 0.3,
+  },
+};
+
+export type AnimationDuration = 'instant' | 'fast' | 'normal';
diff --git a/packages/twenty-ui/src/theme/constants/BackgroundDark.ts b/packages/twenty-ui/src/theme/constants/BackgroundDark.ts
new file mode 100644
index 000000000000..299edc7e7501
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/BackgroundDark.ts
@@ -0,0 +1,28 @@
+/* eslint-disable @nx/workspace-no-hardcoded-colors */
+import DarkNoise from '../assets/dark-noise.jpg';
+
+import { COLOR } from './Colors';
+import { GRAY_SCALE } from './GrayScale';
+import { RGBA } from './Rgba';
+
+export const BACKGROUND_DARK = {
+  noisy: `url(${DarkNoise.toString()});`,
+  primary: GRAY_SCALE.gray85,
+  secondary: GRAY_SCALE.gray80,
+  tertiary: GRAY_SCALE.gray75,
+  quaternary: GRAY_SCALE.gray70,
+  danger: COLOR.red80,
+  transparent: {
+    primary: RGBA(GRAY_SCALE.gray85, 0.8),
+    secondary: RGBA(GRAY_SCALE.gray80, 0.8),
+    strong: RGBA(GRAY_SCALE.gray0, 0.14),
+    medium: RGBA(GRAY_SCALE.gray0, 0.1),
+    light: RGBA(GRAY_SCALE.gray0, 0.06),
+    lighter: RGBA(GRAY_SCALE.gray0, 0.03),
+    danger: RGBA(COLOR.red, 0.08),
+    forBackdropFilter: RGBA(GRAY_SCALE.gray80, 0.5),
+  },
+  overlay: RGBA(GRAY_SCALE.gray80, 0.8),
+  radialGradient: `radial-gradient(50% 62.62% at 50% 0%, #505050 0%, ${GRAY_SCALE.gray60} 100%)`,
+  radialGradientHover: `radial-gradient(76.32% 95.59% at 50% 0%, #505050 0%, ${GRAY_SCALE.gray60} 100%)`,
+};
diff --git a/packages/twenty-ui/src/theme/constants/BackgroundLight.ts b/packages/twenty-ui/src/theme/constants/BackgroundLight.ts
new file mode 100644
index 000000000000..ff2475a49cbc
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/BackgroundLight.ts
@@ -0,0 +1,28 @@
+/* eslint-disable @nx/workspace-no-hardcoded-colors */
+import LightNoise from '../assets/light-noise.png';
+
+import { COLOR } from './Colors';
+import { GRAY_SCALE } from './GrayScale';
+import { RGBA } from './Rgba';
+
+export const BACKGROUND_LIGHT = {
+  noisy: `url(${LightNoise.toString()});`,
+  primary: GRAY_SCALE.gray0,
+  secondary: GRAY_SCALE.gray10,
+  tertiary: GRAY_SCALE.gray15,
+  quaternary: GRAY_SCALE.gray20,
+  danger: COLOR.red10,
+  transparent: {
+    primary: RGBA(GRAY_SCALE.gray0, 0.8),
+    secondary: RGBA(GRAY_SCALE.gray10, 0.8),
+    strong: RGBA(GRAY_SCALE.gray100, 0.16),
+    medium: RGBA(GRAY_SCALE.gray100, 0.08),
+    light: RGBA(GRAY_SCALE.gray100, 0.04),
+    lighter: RGBA(GRAY_SCALE.gray100, 0.02),
+    danger: RGBA(COLOR.red, 0.08),
+    forBackdropFilter: RGBA(GRAY_SCALE.gray10, 0.5),
+  },
+  overlay: RGBA(GRAY_SCALE.gray80, 0.8),
+  radialGradient: `radial-gradient(50% 62.62% at 50% 0%, #505050 0%, ${GRAY_SCALE.gray60} 100%)`,
+  radialGradientHover: `radial-gradient(76.32% 95.59% at 50% 0%, #505050 0%, ${GRAY_SCALE.gray60} 100%)`,
+};
diff --git a/packages/twenty-ui/src/theme/constants/Blur.ts b/packages/twenty-ui/src/theme/constants/Blur.ts
new file mode 100644
index 000000000000..01f2651473e1
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/Blur.ts
@@ -0,0 +1,4 @@
+export const BLUR = {
+  light: 'blur(6px)',
+  strong: 'blur(20px)',
+};
diff --git a/packages/twenty-ui/src/theme/constants/BorderCommon.ts b/packages/twenty-ui/src/theme/constants/BorderCommon.ts
new file mode 100644
index 000000000000..a68f017bc44c
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/BorderCommon.ts
@@ -0,0 +1,10 @@
+export const BORDER_COMMON = {
+  radius: {
+    xs: '2px',
+    sm: '4px',
+    md: '8px',
+    xl: '20px',
+    pill: '999px',
+    rounded: '100%',
+  },
+};
diff --git a/packages/twenty-ui/src/theme/constants/BorderDark.ts b/packages/twenty-ui/src/theme/constants/BorderDark.ts
new file mode 100644
index 000000000000..0cb471f589bf
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/BorderDark.ts
@@ -0,0 +1,15 @@
+import { BORDER_COMMON } from './BorderCommon';
+import { COLOR } from './Colors';
+import { GRAY_SCALE } from './GrayScale';
+
+export const BORDER_DARK = {
+  color: {
+    strong: GRAY_SCALE.gray55,
+    medium: GRAY_SCALE.gray65,
+    light: GRAY_SCALE.gray70,
+    secondaryInverted: GRAY_SCALE.gray35,
+    inverted: GRAY_SCALE.gray20,
+    danger: COLOR.red70,
+  },
+  ...BORDER_COMMON,
+};
diff --git a/packages/twenty-ui/src/theme/constants/BorderLight.ts b/packages/twenty-ui/src/theme/constants/BorderLight.ts
new file mode 100644
index 000000000000..298f78208096
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/BorderLight.ts
@@ -0,0 +1,15 @@
+import { BORDER_COMMON } from './BorderCommon';
+import { COLOR } from './Colors';
+import { GRAY_SCALE } from './GrayScale';
+
+export const BORDER_LIGHT = {
+  color: {
+    strong: GRAY_SCALE.gray25,
+    medium: GRAY_SCALE.gray20,
+    light: GRAY_SCALE.gray15,
+    secondaryInverted: GRAY_SCALE.gray50,
+    inverted: GRAY_SCALE.gray60,
+    danger: COLOR.red20,
+  },
+  ...BORDER_COMMON,
+};
diff --git a/packages/twenty-ui/src/theme/constants/BoxShadowDark.ts b/packages/twenty-ui/src/theme/constants/BoxShadowDark.ts
new file mode 100644
index 000000000000..fff90eaec5ff
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/BoxShadowDark.ts
@@ -0,0 +1,18 @@
+import { GRAY_SCALE } from './GrayScale';
+import { RGBA } from './Rgba';
+
+export const BOX_SHADOW_DARK = {
+  light: `0px 2px 4px 0px ${RGBA(
+    GRAY_SCALE.gray100,
+    0.04,
+  )}, 0px 0px 4px 0px ${RGBA(GRAY_SCALE.gray100, 0.08)}`,
+  strong: `2px 4px 16px 0px ${RGBA(
+    GRAY_SCALE.gray100,
+    0.16,
+  )}, 0px 2px 4px 0px ${RGBA(GRAY_SCALE.gray100, 0.08)}`,
+  underline: `0px 1px 0px 0px ${RGBA(GRAY_SCALE.gray100, 0.32)}`,
+  superHeavy: `2px 4px 16px 0px ${RGBA(
+    GRAY_SCALE.gray100,
+    0.12,
+  )}, 0px 2px 4px 0px ${RGBA(GRAY_SCALE.gray100, 0.04)}`,
+};
diff --git a/packages/twenty-ui/src/theme/constants/BoxShadowLight.ts b/packages/twenty-ui/src/theme/constants/BoxShadowLight.ts
new file mode 100644
index 000000000000..4e1d98b4a503
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/BoxShadowLight.ts
@@ -0,0 +1,21 @@
+import { GRAY_SCALE } from './GrayScale';
+import { RGBA } from './Rgba';
+
+export const BOX_SHADOW_LIGHT = {
+  light: `0px 2px 4px 0px ${RGBA(
+    GRAY_SCALE.gray100,
+    0.04,
+  )}, 0px 0px 4px 0px ${RGBA(GRAY_SCALE.gray100, 0.08)}`,
+  strong: `2px 4px 16px 0px ${RGBA(
+    GRAY_SCALE.gray100,
+    0.12,
+  )}, 0px 2px 4px 0px ${RGBA(GRAY_SCALE.gray100, 0.04)}`,
+  underline: `0px 1px 0px 0px ${RGBA(GRAY_SCALE.gray100, 0.32)}`,
+  superHeavy: `0px 0px 8px 0px ${RGBA(
+    GRAY_SCALE.gray100,
+    0.16,
+  )}, 0px 8px 64px -16px ${RGBA(
+    GRAY_SCALE.gray100,
+    0.48,
+  )}, 0px 24px 56px -16px ${RGBA(GRAY_SCALE.gray100, 0.08)}`,
+};
diff --git a/packages/twenty-ui/src/theme/constants/Colors.ts b/packages/twenty-ui/src/theme/constants/Colors.ts
new file mode 100644
index 000000000000..21d046f615bc
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/Colors.ts
@@ -0,0 +1,7 @@
+import { MAIN_COLORS } from './MainColors';
+import { SECONDARY_COLORS } from './SecondaryColors';
+
+export const COLOR = {
+  ...MAIN_COLORS,
+  ...SECONDARY_COLORS,
+};
diff --git a/packages/twenty-ui/src/theme/constants/FontCommon.ts b/packages/twenty-ui/src/theme/constants/FontCommon.ts
new file mode 100644
index 000000000000..65556c018d38
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/FontCommon.ts
@@ -0,0 +1,17 @@
+export const FONT_COMMON = {
+  size: {
+    xxs: '0.625rem',
+    xs: '0.85rem',
+    sm: '0.92rem',
+    md: '1rem',
+    lg: '1.23rem',
+    xl: '1.54rem',
+    xxl: '1.85rem',
+  },
+  weight: {
+    regular: 400,
+    medium: 500,
+    semiBold: 600,
+  },
+  family: 'Inter, sans-serif',
+};
diff --git a/packages/twenty-ui/src/theme/constants/FontDark.ts b/packages/twenty-ui/src/theme/constants/FontDark.ts
new file mode 100644
index 000000000000..340eee19d3c1
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/FontDark.ts
@@ -0,0 +1,16 @@
+import { COLOR } from './Colors';
+import { FONT_COMMON } from './FontCommon';
+import { GRAY_SCALE } from './GrayScale';
+
+export const FONT_DARK = {
+  color: {
+    primary: GRAY_SCALE.gray20,
+    secondary: GRAY_SCALE.gray35,
+    tertiary: GRAY_SCALE.gray45,
+    light: GRAY_SCALE.gray50,
+    extraLight: GRAY_SCALE.gray55,
+    inverted: GRAY_SCALE.gray100,
+    danger: COLOR.red,
+  },
+  ...FONT_COMMON,
+};
diff --git a/packages/twenty-ui/src/theme/constants/FontLight.ts b/packages/twenty-ui/src/theme/constants/FontLight.ts
new file mode 100644
index 000000000000..469b748420c3
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/FontLight.ts
@@ -0,0 +1,16 @@
+import { COLOR } from './Colors';
+import { FONT_COMMON } from './FontCommon';
+import { GRAY_SCALE } from './GrayScale';
+
+export const FONT_LIGHT = {
+  color: {
+    primary: GRAY_SCALE.gray60,
+    secondary: GRAY_SCALE.gray50,
+    tertiary: GRAY_SCALE.gray40,
+    light: GRAY_SCALE.gray35,
+    extraLight: GRAY_SCALE.gray30,
+    inverted: GRAY_SCALE.gray0,
+    danger: COLOR.red,
+  },
+  ...FONT_COMMON,
+};
diff --git a/packages/twenty-ui/src/theme/constants/GrayScale.ts b/packages/twenty-ui/src/theme/constants/GrayScale.ts
new file mode 100644
index 000000000000..90c194d9241e
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/GrayScale.ts
@@ -0,0 +1,22 @@
+/* eslint-disable @nx/workspace-no-hardcoded-colors */
+export const GRAY_SCALE = {
+  gray100: '#000000',
+  gray90: '#141414',
+  gray85: '#171717',
+  gray80: '#1b1b1b',
+  gray75: '#1d1d1d',
+  gray70: '#222222',
+  gray65: '#292929',
+  gray60: '#333333',
+  gray55: '#4c4c4c',
+  gray50: '#666666',
+  gray45: '#818181',
+  gray40: '#999999',
+  gray35: '#b3b3b3',
+  gray30: '#cccccc',
+  gray25: '#d6d6d6',
+  gray20: '#ebebeb',
+  gray15: '#f1f1f1',
+  gray10: '#fcfcfc',
+  gray0: '#ffffff',
+};
diff --git a/packages/twenty-ui/src/theme/constants/HoverBackground.ts b/packages/twenty-ui/src/theme/constants/HoverBackground.ts
new file mode 100644
index 000000000000..cbd9b9e0e4a1
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/HoverBackground.ts
@@ -0,0 +1,8 @@
+import { css } from '@emotion/react';
+
+export const HOVER_BACKGROUND = (props: any) => css`
+  transition: background 0.1s ease;
+  &:hover {
+    background: ${props.theme.background.transparent.light};
+  }
+`;
diff --git a/packages/twenty-ui/src/theme/constants/Icon.ts b/packages/twenty-ui/src/theme/constants/Icon.ts
new file mode 100644
index 000000000000..e103c0b8ec3f
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/Icon.ts
@@ -0,0 +1,13 @@
+export const ICON = {
+  size: {
+    sm: 14,
+    md: 16,
+    lg: 20,
+    xl: 40,
+  },
+  stroke: {
+    sm: 1.6,
+    md: 2,
+    lg: 2.5,
+  },
+};
diff --git a/packages/twenty-ui/src/theme/constants/MainColorNames.ts b/packages/twenty-ui/src/theme/constants/MainColorNames.ts
new file mode 100644
index 000000000000..7abcdc90cc58
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/MainColorNames.ts
@@ -0,0 +1,5 @@
+import { MAIN_COLORS } from './MainColors';
+
+export const MAIN_COLOR_NAMES = Object.keys(MAIN_COLORS) as ThemeColor[];
+
+export type ThemeColor = keyof typeof MAIN_COLORS;
diff --git a/packages/twenty-ui/src/theme/constants/MainColors.ts b/packages/twenty-ui/src/theme/constants/MainColors.ts
new file mode 100644
index 000000000000..0fdab5f51214
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/MainColors.ts
@@ -0,0 +1,15 @@
+/* eslint-disable @nx/workspace-no-hardcoded-colors */
+import { GRAY_SCALE } from './GrayScale';
+
+export const MAIN_COLORS = {
+  green: '#55ef3c',
+  turquoise: '#15de8f',
+  sky: '#00e0ff',
+  blue: '#1961ed',
+  purple: '#915ffd',
+  pink: '#f54bd0',
+  red: '#f83e3e',
+  orange: '#ff7222',
+  yellow: '#ffd338',
+  gray: GRAY_SCALE.gray30,
+};
diff --git a/packages/twenty-ui/src/theme/constants/MobileViewport.ts b/packages/twenty-ui/src/theme/constants/MobileViewport.ts
new file mode 100644
index 000000000000..485d2dacd0f4
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/MobileViewport.ts
@@ -0,0 +1 @@
+export const MOBILE_VIEWPORT = 768;
diff --git a/packages/twenty-ui/src/theme/constants/Modal.ts b/packages/twenty-ui/src/theme/constants/Modal.ts
new file mode 100644
index 000000000000..2a53265cc00e
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/Modal.ts
@@ -0,0 +1,7 @@
+export const MODAL = {
+  size: {
+    sm: '300px',
+    md: '400px',
+    lg: '53%',
+  },
+};
diff --git a/packages/twenty-ui/src/theme/constants/OverlayBackground.ts b/packages/twenty-ui/src/theme/constants/OverlayBackground.ts
new file mode 100644
index 000000000000..a61aa50fe57c
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/OverlayBackground.ts
@@ -0,0 +1,9 @@
+import { css } from '@emotion/react';
+
+import { ThemeType } from '..';
+
+export const OVERLAY_BACKGROUND = (props: { theme: ThemeType }) => css`
+  backdrop-filter: blur(12px) saturate(200%) contrast(50%) brightness(130%);
+  background: ${props.theme.background.transparent.forBackdropFilter};
+  box-shadow: ${props.theme.boxShadow.strong};
+`;
diff --git a/packages/twenty-ui/src/theme/constants/Rgba.ts b/packages/twenty-ui/src/theme/constants/Rgba.ts
new file mode 100644
index 000000000000..6b06f2a64e9d
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/Rgba.ts
@@ -0,0 +1,8 @@
+/* eslint-disable @nx/workspace-no-hardcoded-colors */
+import hexRgb from 'hex-rgb';
+
+export const RGBA = (hex: string, alpha: number) => {
+  return `rgba(${hexRgb(hex, { format: 'array' })
+    .slice(0, -1)
+    .join(',')},${alpha})`;
+};
diff --git a/packages/twenty-ui/src/theme/constants/SecondaryColors.ts b/packages/twenty-ui/src/theme/constants/SecondaryColors.ts
new file mode 100644
index 000000000000..f023f8e74937
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/SecondaryColors.ts
@@ -0,0 +1,106 @@
+/* eslint-disable @nx/workspace-no-hardcoded-colors */
+import { GRAY_SCALE } from './GrayScale';
+
+export const SECONDARY_COLORS = {
+  yellow80: '#2e2a1a',
+  yellow70: '#453d1e',
+  yellow60: '#746224',
+  yellow50: '#b99b2e',
+  yellow40: '#ffe074',
+  yellow30: '#ffedaf',
+  yellow20: '#fff6d7',
+  yellow10: '#fffbeb',
+
+  green80: '#1d2d1b',
+  green70: '#23421e',
+  green60: '#2a5822',
+  green50: '#42ae31',
+  green40: '#88f477',
+  green30: '#ccfac5',
+  green20: '#ddfcd8',
+  green10: '#eefdec',
+
+  turquoise80: '#172b23',
+  turquoise70: '#173f2f',
+  turquoise60: '#166747',
+  turquoise50: '#16a26b',
+  turquoise40: '#5be8b1',
+  turquoise30: '#a1f2d2',
+  turquoise20: '#d0f8e9',
+  turquoise10: '#e8fcf4',
+
+  sky80: '#152b2e',
+  sky70: '#123f45',
+  sky60: '#0e6874',
+  sky50: '#07a4b9',
+  sky40: '#4de9ff',
+  sky30: '#99f3ff',
+  sky20: '#ccf9ff',
+  sky10: '#e5fcff',
+
+  blue80: '#171e2c',
+  blue70: '#172642',
+  blue60: '#18356d',
+  blue50: '#184bad',
+  blue40: '#5e90f2',
+  blue30: '#a3c0f8',
+  blue20: '#d1dffb',
+  blue10: '#e8effd',
+
+  purple80: '#231e2e',
+  purple70: '#2f2545',
+  purple60: '#483473',
+  purple50: '#6c49b8',
+  purple40: '#b28ffe',
+  purple30: '#d3bffe',
+  purple20: '#e9dfff',
+  purple10: '#f4efff',
+
+  pink80: '#2d1c29',
+  pink70: '#43213c',
+  pink60: '#702c61',
+  pink50: '#b23b98',
+  pink40: '#f881de',
+  pink30: '#fbb7ec',
+  pink20: '#fddbf6',
+  pink10: '#feedfa',
+
+  red80: '#2d1b1b',
+  red70: '#441f1f',
+  red60: '#712727',
+  red50: '#b43232',
+  red40: '#fa7878',
+  red30: '#fcb2b2',
+  red20: '#fed8d8',
+  red10: '#feecec',
+
+  orange80: '#2e2018',
+  orange70: '#452919',
+  orange60: '#743b1b',
+  orange50: '#b9571f',
+  orange40: '#ff9c64',
+  orange30: '#ffc7a7',
+  orange20: '#ffe3d3',
+  orange10: '#fff1e9',
+
+  gray80: GRAY_SCALE.gray70,
+  gray70: GRAY_SCALE.gray65,
+  gray60: GRAY_SCALE.gray55,
+  gray50: GRAY_SCALE.gray40,
+  gray40: GRAY_SCALE.gray25,
+  gray30: GRAY_SCALE.gray20,
+  gray20: GRAY_SCALE.gray15,
+  gray10: GRAY_SCALE.gray10,
+  blueAccent90: '#141a25',
+  blueAccent85: '#151d2e',
+  blueAccent80: '#152037',
+  blueAccent75: '#16233f',
+  blueAccent70: '#17294a',
+  blueAccent60: '#18356d',
+  blueAccent40: '#a3c0f8',
+  blueAccent35: '#c8d9fb',
+  blueAccent25: '#dae6fc',
+  blueAccent20: '#e2ecfd',
+  blueAccent15: '#edf2fe',
+  blueAccent10: '#f5f9fd',
+};
diff --git a/packages/twenty-ui/src/theme/constants/TagDark.ts b/packages/twenty-ui/src/theme/constants/TagDark.ts
new file mode 100644
index 000000000000..5728ca8e2f34
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/TagDark.ts
@@ -0,0 +1,28 @@
+import { COLOR } from './Colors';
+
+export const TAG_DARK = {
+  text: {
+    green: COLOR.green10,
+    turquoise: COLOR.turquoise10,
+    sky: COLOR.sky10,
+    blue: COLOR.blue10,
+    purple: COLOR.purple10,
+    pink: COLOR.pink10,
+    red: COLOR.red10,
+    orange: COLOR.orange10,
+    yellow: COLOR.yellow10,
+    gray: COLOR.gray10,
+  },
+  background: {
+    green: COLOR.green60,
+    turquoise: COLOR.turquoise60,
+    sky: COLOR.sky60,
+    blue: COLOR.blue60,
+    purple: COLOR.purple60,
+    pink: COLOR.pink60,
+    red: COLOR.red60,
+    orange: COLOR.orange60,
+    yellow: COLOR.yellow60,
+    gray: COLOR.gray60,
+  },
+};
diff --git a/packages/twenty-ui/src/theme/constants/TagLight.ts b/packages/twenty-ui/src/theme/constants/TagLight.ts
new file mode 100644
index 000000000000..29bdee8be638
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/TagLight.ts
@@ -0,0 +1,28 @@
+import { COLOR } from './Colors';
+
+export const TAG_LIGHT = {
+  text: {
+    green: COLOR.green60,
+    turquoise: COLOR.turquoise60,
+    sky: COLOR.sky60,
+    blue: COLOR.blue60,
+    purple: COLOR.purple60,
+    pink: COLOR.pink60,
+    red: COLOR.red60,
+    orange: COLOR.orange60,
+    yellow: COLOR.yellow60,
+    gray: COLOR.gray60,
+  },
+  background: {
+    green: COLOR.green20,
+    turquoise: COLOR.turquoise20,
+    sky: COLOR.sky20,
+    blue: COLOR.blue20,
+    purple: COLOR.purple20,
+    pink: COLOR.pink20,
+    red: COLOR.red20,
+    orange: COLOR.orange20,
+    yellow: COLOR.yellow20,
+    gray: COLOR.gray20,
+  },
+};
diff --git a/packages/twenty-ui/src/theme/constants/Text.ts b/packages/twenty-ui/src/theme/constants/Text.ts
new file mode 100644
index 000000000000..db9a0786b766
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/Text.ts
@@ -0,0 +1,13 @@
+export const TEXT = {
+  lineHeight: {
+    lg: 1.5,
+    md: 1.2,
+  },
+
+  iconSizeMedium: 16,
+  iconSizeSmall: 14,
+
+  iconStrikeLight: 1.6,
+  iconStrikeMedium: 2,
+  iconStrikeBold: 2.5,
+};
diff --git a/packages/twenty-ui/src/theme/constants/TextInputStyle.ts b/packages/twenty-ui/src/theme/constants/TextInputStyle.ts
new file mode 100644
index 000000000000..9b7bad41a7fa
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/TextInputStyle.ts
@@ -0,0 +1,21 @@
+import { css } from '@emotion/react';
+
+import { ThemeType } from '..';
+
+export const TEXT_INPUT_STYLE = (props: { theme: ThemeType }) => css`
+  background-color: transparent;
+  border: none;
+  color: ${props.theme.font.color.primary};
+  font-family: ${props.theme.font.family};
+  font-size: inherit;
+  font-weight: inherit;
+  outline: none;
+  padding: ${props.theme.spacing(0)} ${props.theme.spacing(2)};
+
+  &::placeholder,
+  &::-webkit-input-placeholder {
+    color: ${props.theme.font.color.light};
+    font-family: ${props.theme.font.family};
+    font-weight: ${props.theme.font.weight.medium};
+  }
+`;
diff --git a/packages/twenty-ui/src/theme/constants/ThemeCommon.ts b/packages/twenty-ui/src/theme/constants/ThemeCommon.ts
new file mode 100644
index 000000000000..8c450fb87436
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/ThemeCommon.ts
@@ -0,0 +1,44 @@
+/* eslint-disable @nx/workspace-no-hardcoded-colors */
+import { ANIMATION } from './Animation';
+import { BLUR } from './Blur';
+import { COLOR } from './Colors';
+import { GRAY_SCALE } from './GrayScale';
+import { ICON } from './Icon';
+import { MODAL } from './Modal';
+import { TEXT } from './Text';
+
+export const THEME_COMMON = {
+  color: COLOR,
+  grayScale: GRAY_SCALE,
+  icon: ICON,
+  modal: MODAL,
+  text: TEXT,
+  blur: BLUR,
+  animation: ANIMATION,
+  snackBar: {
+    success: {
+      background: '#16A26B',
+      color: '#D0F8E9',
+    },
+    error: {
+      background: '#B43232',
+      color: '#FED8D8',
+    },
+    info: {
+      background: COLOR.gray80,
+      color: GRAY_SCALE.gray0,
+    },
+  },
+  spacingMultiplicator: 4,
+  spacing: (...args: number[]) =>
+    args.map((multiplicator) => `${multiplicator * 4}px`).join(' '),
+  betweenSiblingsGap: `2px`,
+  table: {
+    horizontalCellMargin: '8px',
+    checkboxColumnWidth: '32px',
+    horizontalCellPadding: '8px',
+  },
+  rightDrawerWidth: '500px',
+  clickableElementBackgroundTransition: 'background 0.1s ease',
+  lastLayerZIndex: 2147483647,
+};
diff --git a/packages/twenty-ui/src/theme/constants/ThemeDark.ts b/packages/twenty-ui/src/theme/constants/ThemeDark.ts
new file mode 100644
index 000000000000..6f3284f037b4
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/ThemeDark.ts
@@ -0,0 +1,22 @@
+import { ThemeType } from '..';
+
+import { ACCENT_DARK } from './AccentDark';
+import { BACKGROUND_DARK } from './BackgroundDark';
+import { BORDER_DARK } from './BorderDark';
+import { BOX_SHADOW_DARK } from './BoxShadowDark';
+import { FONT_DARK } from './FontDark';
+import { TAG_DARK } from './TagDark';
+import { THEME_COMMON } from './ThemeCommon';
+
+export const THEME_DARK: ThemeType = {
+  ...THEME_COMMON,
+  ...{
+    accent: ACCENT_DARK,
+    background: BACKGROUND_DARK,
+    border: BORDER_DARK,
+    tag: TAG_DARK,
+    boxShadow: BOX_SHADOW_DARK,
+    font: FONT_DARK,
+    name: 'dark',
+  },
+};
diff --git a/packages/twenty-ui/src/theme/constants/ThemeLight.ts b/packages/twenty-ui/src/theme/constants/ThemeLight.ts
new file mode 100644
index 000000000000..9331102fc513
--- /dev/null
+++ b/packages/twenty-ui/src/theme/constants/ThemeLight.ts
@@ -0,0 +1,20 @@
+import { ACCENT_LIGHT } from './AccentLight';
+import { BACKGROUND_LIGHT } from './BackgroundLight';
+import { BORDER_LIGHT } from './BorderLight';
+import { BOX_SHADOW_LIGHT } from './BoxShadowLight';
+import { FONT_LIGHT } from './FontLight';
+import { TAG_LIGHT } from './TagLight';
+import { THEME_COMMON } from './ThemeCommon';
+
+export const THEME_LIGHT = {
+  ...THEME_COMMON,
+  ...{
+    accent: ACCENT_LIGHT,
+    background: BACKGROUND_LIGHT,
+    border: BORDER_LIGHT,
+    tag: TAG_LIGHT,
+    boxShadow: BOX_SHADOW_LIGHT,
+    font: FONT_LIGHT,
+    name: 'light',
+  },
+};
diff --git a/packages/twenty-ui/src/theme/index.ts b/packages/twenty-ui/src/theme/index.ts
new file mode 100644
index 000000000000..e71efe683634
--- /dev/null
+++ b/packages/twenty-ui/src/theme/index.ts
@@ -0,0 +1,34 @@
+export * from './constants/AccentDark';
+export * from './constants/AccentLight';
+export * from './constants/Animation';
+export * from './constants/BackgroundDark';
+export * from './constants/BackgroundLight';
+export * from './constants/Blur';
+export * from './constants/BorderCommon';
+export * from './constants/BorderDark';
+export * from './constants/BorderLight';
+export * from './constants/BoxShadowDark';
+export * from './constants/BoxShadowLight';
+export * from './constants/Colors';
+export * from './constants/FontCommon';
+export * from './constants/FontDark';
+export * from './constants/FontLight';
+export * from './constants/GrayScale';
+export * from './constants/HoverBackground';
+export * from './constants/Icon';
+export * from './constants/MainColorNames';
+export * from './constants/MainColors';
+export * from './constants/MobileViewport';
+export * from './constants/Modal';
+export * from './constants/OverlayBackground';
+export * from './constants/Rgba';
+export * from './constants/SecondaryColors';
+export * from './constants/TagDark';
+export * from './constants/TagLight';
+export * from './constants/Text';
+export * from './constants/TextInputStyle';
+export * from './constants/ThemeCommon';
+export * from './constants/ThemeDark';
+export * from './constants/ThemeLight';
+export * from './provider/ThemeProvider';
+export * from './types/ThemeType';
diff --git a/packages/twenty-ui/src/theme/provider/ThemeProvider.tsx b/packages/twenty-ui/src/theme/provider/ThemeProvider.tsx
new file mode 100644
index 000000000000..364afe5d4ec8
--- /dev/null
+++ b/packages/twenty-ui/src/theme/provider/ThemeProvider.tsx
@@ -0,0 +1,16 @@
+// ThemeProvider.tsx
+import * as React from 'react';
+import { ThemeProvider as EmotionThemeProvider } from '@emotion/react';
+
+import { ThemeType } from '..';
+
+type ThemeProviderProps = {
+  theme: ThemeType;
+  children: React.ReactNode;
+};
+
+const ThemeProvider: React.FC<ThemeProviderProps> = ({ theme, children }) => {
+  return <EmotionThemeProvider theme={theme}>{children}</EmotionThemeProvider>;
+};
+
+export default ThemeProvider;
diff --git a/packages/twenty-ui/src/theme/types/ThemeType.ts b/packages/twenty-ui/src/theme/types/ThemeType.ts
new file mode 100644
index 000000000000..dc71a7b0226f
--- /dev/null
+++ b/packages/twenty-ui/src/theme/types/ThemeType.ts
@@ -0,0 +1,3 @@
+import { THEME_LIGHT } from '../constants/ThemeLight';
+
+export type ThemeType = typeof THEME_LIGHT;
diff --git a/packages/twenty-ui/src/utilities/index.ts b/packages/twenty-ui/src/utilities/index.ts
new file mode 100644
index 000000000000..fe923f164e19
--- /dev/null
+++ b/packages/twenty-ui/src/utilities/index.ts
@@ -0,0 +1 @@
+export * from './state/utils/createState';
diff --git a/packages/twenty-ui/src/utilities/state/utils/createState.ts b/packages/twenty-ui/src/utilities/state/utils/createState.ts
new file mode 100644
index 000000000000..c81d9a86db73
--- /dev/null
+++ b/packages/twenty-ui/src/utilities/state/utils/createState.ts
@@ -0,0 +1,18 @@
+import { atom, AtomEffect } from 'recoil';
+
+export const createState = <ValueType>({
+  key,
+  defaultValue,
+  effects,
+}: {
+  key: string;
+  defaultValue: ValueType;
+  effects?: ReadonlyArray<AtomEffect<ValueType>>;
+}) => {
+  const recoilState = atom<ValueType>({
+    key,
+    default: defaultValue,
+    effects,
+  });
+  return recoilState;
+};
diff --git a/packages/twenty-ui/src/vite-env.d.ts b/packages/twenty-ui/src/vite-env.d.ts
new file mode 100644
index 000000000000..b1f45c786669
--- /dev/null
+++ b/packages/twenty-ui/src/vite-env.d.ts
@@ -0,0 +1,2 @@
+/// <reference types="vite/client" />
+/// <reference types="vite-plugin-svgr/client" />
diff --git a/packages/twenty-ui/tsconfig.json b/packages/twenty-ui/tsconfig.json
new file mode 100644
index 000000000000..c842807bf0ae
--- /dev/null
+++ b/packages/twenty-ui/tsconfig.json
@@ -0,0 +1,28 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "allowJs": false,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "esModuleInterop": true,
+    "noEmit": true,
+    "types": ["node"],
+    "paths": {
+      "@ui/*": ["packages/twenty-ui/src/*"]
+    }
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    },
+    {
+      "path": "./tsconfig.storybook.json"
+    }
+  ]
+}
diff --git a/packages/twenty-ui/tsconfig.lib.json b/packages/twenty-ui/tsconfig.lib.json
new file mode 100644
index 000000000000..022f4388a836
--- /dev/null
+++ b/packages/twenty-ui/tsconfig.lib.json
@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc"
+  },
+  "exclude": [
+    "**/*.spec.ts",
+    "**/*.spec.tsx",
+    "**/*.stories.ts",
+    "**/*.stories.tsx",
+    "**/*.test.ts",
+    "**/*.test.tsx"
+  ],
+  "include": ["src/**/*.d.ts", "src/**/*.ts", "src/**/*.tsx"]
+}
diff --git a/packages/twenty-ui/tsconfig.spec.json b/packages/twenty-ui/tsconfig.spec.json
new file mode 100644
index 000000000000..73b7fbbbf2a2
--- /dev/null
+++ b/packages/twenty-ui/tsconfig.spec.json
@@ -0,0 +1,16 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "jest.config.ts",
+    "setupTests.ts",
+    "src/**/*.d.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.ts",
+    "vite.config.ts"
+  ]
+}
diff --git a/packages/twenty-ui/tsconfig.storybook.json b/packages/twenty-ui/tsconfig.storybook.json
new file mode 100644
index 000000000000..495fa64c071f
--- /dev/null
+++ b/packages/twenty-ui/tsconfig.storybook.json
@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "emitDecoratorMetadata": true,
+    "outDir": ""
+  },
+  "include": [
+    ".storybook/*.ts",
+    ".storybook/*.tsx",
+    "src/**/*.d.ts",
+    "src/**/*.stories.mdx",
+    "src/**/*.stories.ts",
+    "src/**/*.stories.tsx"
+  ]
+}
diff --git a/packages/twenty-ui/vite.config.ts b/packages/twenty-ui/vite.config.ts
new file mode 100644
index 000000000000..e8c995a21f9f
--- /dev/null
+++ b/packages/twenty-ui/vite.config.ts
@@ -0,0 +1,49 @@
+/// <reference types='vitest' />
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+import react from '@vitejs/plugin-react-swc';
+import * as path from 'path';
+import { defineConfig } from 'vite';
+import checker from 'vite-plugin-checker';
+import dts from 'vite-plugin-dts';
+
+export default defineConfig({
+  root: __dirname,
+  cacheDir: '../../node_modules/.vite/packages/twenty-ui',
+
+  plugins: [
+    react(),
+    nxViteTsPaths(),
+    dts({
+      entryRoot: 'src',
+      tsconfigPath: path.join(__dirname, 'tsconfig.lib.json'),
+    }),
+    checker({
+      typescript: {
+        tsconfigPath: path.join(__dirname, 'tsconfig.lib.json'),
+      },
+    }),
+  ],
+
+  // Configuration for building your library.
+  // See: https://vitejs.dev/guide/build.html#library-mode
+  build: {
+    outDir: './dist',
+    reportCompressedSize: true,
+    commonjsOptions: {
+      transformMixedEsModules: true,
+    },
+    lib: {
+      // Could also be a dictionary or array of multiple entry points.
+      entry: 'src/index.ts',
+      name: 'twenty-ui',
+      fileName: 'index',
+      // Change this to the formats you want to support.
+      // Don't forget to update your package.json as well.
+      formats: ['es', 'cjs'],
+    },
+    rollupOptions: {
+      // External packages that should not be bundled into your library.
+      external: ['react', 'react-dom', 'react/jsx-runtime'],
+    },
+  },
+});
diff --git a/packages/twenty-website/.eslintrc.js b/packages/twenty-website/.eslintrc.js
index 115862f93f55..3afe9205c753 100644
--- a/packages/twenty-website/.eslintrc.js
+++ b/packages/twenty-website/.eslintrc.js
@@ -1,5 +1,5 @@
 module.exports = {
-  extends: ['../../.eslintrc.js'],
+  extends: ['../../.eslintrc.cjs', 'plugin:@next/next/recommended'],
   rules: {
     'no-console': 'off',
     'prefer-arrow/prefer-arrow-functions': 'off',
diff --git a/packages/twenty-website/package.json b/packages/twenty-website/package.json
index 7363f503278f..01a36805651d 100644
--- a/packages/twenty-website/package.json
+++ b/packages/twenty-website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twenty-website",
-  "version": "0.2.2",
+  "version": "0.4.0",
   "private": true,
   "scripts": {
     "nx": "NX_DEFAULT_PROJECT=twenty-website node ../../node_modules/nx/bin/nx.js",
diff --git a/packages/twenty-website/public/images/releases/0.2.3_relations.png b/packages/twenty-website/public/images/releases/0.2.3_relations.png
new file mode 100644
index 000000000000..dd0c2bd14ff0
Binary files /dev/null and b/packages/twenty-website/public/images/releases/0.2.3_relations.png differ
diff --git a/packages/twenty-website/public/images/releases/0.2.3_webhooks.png b/packages/twenty-website/public/images/releases/0.2.3_webhooks.png
new file mode 100644
index 000000000000..25c214fdeacb
Binary files /dev/null and b/packages/twenty-website/public/images/releases/0.2.3_webhooks.png differ
diff --git a/packages/twenty-website/public/images/releases/0.3.0_rating.png b/packages/twenty-website/public/images/releases/0.3.0_rating.png
new file mode 100644
index 000000000000..ba7d61ea44e1
Binary files /dev/null and b/packages/twenty-website/public/images/releases/0.3.0_rating.png differ
diff --git a/packages/twenty-website/public/images/releases/0.3.1_contributors.png b/packages/twenty-website/public/images/releases/0.3.1_contributors.png
new file mode 100644
index 000000000000..e50da30b4f41
Binary files /dev/null and b/packages/twenty-website/public/images/releases/0.3.1_contributors.png differ
diff --git a/packages/twenty-website/public/images/releases/0.3.2_new_layout.png b/packages/twenty-website/public/images/releases/0.3.2_new_layout.png
new file mode 100644
index 000000000000..1b3d2123b81e
Binary files /dev/null and b/packages/twenty-website/public/images/releases/0.3.2_new_layout.png differ
diff --git a/packages/twenty-website/public/images/releases/0.3.3_emails.png b/packages/twenty-website/public/images/releases/0.3.3_emails.png
new file mode 100644
index 000000000000..2b7b72f704a7
Binary files /dev/null and b/packages/twenty-website/public/images/releases/0.3.3_emails.png differ
diff --git a/packages/twenty-website/public/images/releases/0.3.3_kanban.png b/packages/twenty-website/public/images/releases/0.3.3_kanban.png
new file mode 100644
index 000000000000..8bbf281e22cc
Binary files /dev/null and b/packages/twenty-website/public/images/releases/0.3.3_kanban.png differ
diff --git a/packages/twenty-website/public/images/releases/0.3.3_sign_up.png b/packages/twenty-website/public/images/releases/0.3.3_sign_up.png
new file mode 100644
index 000000000000..cc9618b4d7d8
Binary files /dev/null and b/packages/twenty-website/public/images/releases/0.3.3_sign_up.png differ
diff --git a/packages/twenty-website/public/images/releases/0.4/0.4-address-field-type.png b/packages/twenty-website/public/images/releases/0.4/0.4-address-field-type.png
new file mode 100644
index 000000000000..c16ddee10ff8
Binary files /dev/null and b/packages/twenty-website/public/images/releases/0.4/0.4-address-field-type.png differ
diff --git a/packages/twenty-website/public/images/releases/0.4/0.4-expand-relation-card.png b/packages/twenty-website/public/images/releases/0.4/0.4-expand-relation-card.png
new file mode 100644
index 000000000000..59eaf3d56e07
Binary files /dev/null and b/packages/twenty-website/public/images/releases/0.4/0.4-expand-relation-card.png differ
diff --git a/packages/twenty-website/public/images/releases/0.4/0.4-multi-workspace.png b/packages/twenty-website/public/images/releases/0.4/0.4-multi-workspace.png
new file mode 100644
index 000000000000..fee3f98e14a7
Binary files /dev/null and b/packages/twenty-website/public/images/releases/0.4/0.4-multi-workspace.png differ
diff --git a/packages/twenty-website/public/images/user-guide/all-opportunities-dark.png b/packages/twenty-website/public/images/user-guide/all-opportunities-dark.png
deleted file mode 100644
index ba7cd3564e41..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/all-opportunities-dark.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/all-opportunities-light.png b/packages/twenty-website/public/images/user-guide/all-opportunities-light.png
deleted file mode 100644
index 98842e1a26c9..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/all-opportunities-light.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/attach-files-to-records-dark.png b/packages/twenty-website/public/images/user-guide/attach-files-to-records-dark.png
deleted file mode 100644
index 14c95fd148d2..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/attach-files-to-records-dark.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/attach-files-to-records-light.png b/packages/twenty-website/public/images/user-guide/attach-files-to-records-light.png
deleted file mode 100644
index 122658c6a42f..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/attach-files-to-records-light.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/compact-opportunities-view-dark.png b/packages/twenty-website/public/images/user-guide/compact-opportunities-view-dark.png
deleted file mode 100644
index d80ce2881ea5..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/compact-opportunities-view-dark.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/compact-opportunities-view-light.png b/packages/twenty-website/public/images/user-guide/compact-opportunities-view-light.png
deleted file mode 100644
index ee73cf6f61cc..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/compact-opportunities-view-light.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/connect-zapier.png b/packages/twenty-website/public/images/user-guide/connect-zapier.png
deleted file mode 100644
index b449b882d7dd..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/connect-zapier.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/create-custom-object.gif b/packages/twenty-website/public/images/user-guide/create-custom-object.gif
deleted file mode 100644
index e5d5d9ad613f..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/create-custom-object.gif and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/create-new-note-dark.png b/packages/twenty-website/public/images/user-guide/create-new-note-dark.png
deleted file mode 100644
index e1958ecc9e34..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/create-new-note-dark.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/create-new-note-light.png b/packages/twenty-website/public/images/user-guide/create-new-note-light.png
deleted file mode 100644
index d8bfd93f592d..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/create-new-note-light.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/create-new-task-dark.png b/packages/twenty-website/public/images/user-guide/create-new-task-dark.png
deleted file mode 100644
index 22080b450326..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/create-new-task-dark.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/create-new-task-light.png b/packages/twenty-website/public/images/user-guide/create-new-task-light.png
deleted file mode 100644
index a48c38bc5614..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/create-new-task-light.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/create-workspace/choose-plan.png b/packages/twenty-website/public/images/user-guide/create-workspace/choose-plan.png
new file mode 100644
index 000000000000..326e2ac36d43
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/create-workspace/choose-plan.png differ
diff --git a/packages/twenty-website/public/images/user-guide/display-fields-dark.png b/packages/twenty-website/public/images/user-guide/display-fields-dark.png
deleted file mode 100644
index ba0b8a4b9523..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/display-fields-dark.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/display-fields-light.png b/packages/twenty-website/public/images/user-guide/display-fields-light.png
deleted file mode 100644
index 6d688d652be8..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/display-fields-light.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/emails/auto-creation.png b/packages/twenty-website/public/images/user-guide/emails/auto-creation.png
new file mode 100644
index 000000000000..89e53fa66b09
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/emails/auto-creation.png differ
diff --git a/packages/twenty-website/public/images/user-guide/emails/connect-account.png b/packages/twenty-website/public/images/user-guide/emails/connect-account.png
new file mode 100644
index 000000000000..a46462e8341b
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/emails/connect-account.png differ
diff --git a/packages/twenty-website/public/images/user-guide/emails/emails_header.png b/packages/twenty-website/public/images/user-guide/emails/emails_header.png
new file mode 100644
index 000000000000..25ec21693e7c
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/emails/emails_header.png differ
diff --git a/packages/twenty-website/public/images/user-guide/emails/privacy-settings.png b/packages/twenty-website/public/images/user-guide/emails/privacy-settings.png
new file mode 100644
index 000000000000..5313265f1768
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/emails/privacy-settings.png differ
diff --git a/packages/twenty-website/public/images/user-guide/emails/show-inbox.png b/packages/twenty-website/public/images/user-guide/emails/show-inbox.png
new file mode 100644
index 000000000000..60bb3a721ba0
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/emails/show-inbox.png differ
diff --git a/packages/twenty-website/public/images/user-guide/fields/custom-fields.png b/packages/twenty-website/public/images/user-guide/fields/custom-fields.png
new file mode 100644
index 000000000000..e26a76a3227f
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/fields/custom-fields.png differ
diff --git a/packages/twenty-website/public/images/user-guide/fields/deactivate-field.png b/packages/twenty-website/public/images/user-guide/fields/deactivate-field.png
new file mode 100644
index 000000000000..03d263622ae3
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/fields/deactivate-field.png differ
diff --git a/packages/twenty-website/public/images/user-guide/fields/quick-new-field.png b/packages/twenty-website/public/images/user-guide/fields/quick-new-field.png
new file mode 100644
index 000000000000..a10b0785e180
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/fields/quick-new-field.png differ
diff --git a/packages/twenty-website/public/images/user-guide/fields/standard-fields.png b/packages/twenty-website/public/images/user-guide/fields/standard-fields.png
new file mode 100644
index 000000000000..09387e0512f8
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/fields/standard-fields.png differ
diff --git a/packages/twenty-website/public/images/user-guide/filter-opportunities-dark.png b/packages/twenty-website/public/images/user-guide/filter-opportunities-dark.png
deleted file mode 100644
index 79b9b33603ee..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/filter-opportunities-dark.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/filter-opportunities-light.png b/packages/twenty-website/public/images/user-guide/filter-opportunities-light.png
deleted file mode 100644
index b59aa623e281..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/filter-opportunities-light.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/github/discord-welcome.png b/packages/twenty-website/public/images/user-guide/github/discord-welcome.png
new file mode 100644
index 000000000000..e787a35aab43
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/github/discord-welcome.png differ
diff --git a/packages/twenty-website/public/images/user-guide/github/github-conversations.png b/packages/twenty-website/public/images/user-guide/github/github-conversations.png
new file mode 100644
index 000000000000..bd698a1a1308
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/github/github-conversations.png differ
diff --git a/packages/twenty-website/public/images/user-guide/github/github-header.png b/packages/twenty-website/public/images/user-guide/github/github-header.png
new file mode 100644
index 000000000000..0e5ebaeaeb36
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/github/github-header.png differ
diff --git a/packages/twenty-website/public/images/user-guide/github/good-first-issues.png b/packages/twenty-website/public/images/user-guide/github/good-first-issues.png
new file mode 100644
index 000000000000..296952f51bfa
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/github/good-first-issues.png differ
diff --git a/packages/twenty-website/public/images/user-guide/github/new-issue.png b/packages/twenty-website/public/images/user-guide/github/new-issue.png
new file mode 100644
index 000000000000..b790129fad22
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/github/new-issue.png differ
diff --git a/packages/twenty-website/public/images/user-guide/home/create-a-workspace.png b/packages/twenty-website/public/images/user-guide/home/create-a-workspace.png
index 9df5a6fdacf1..2599de89f422 100644
Binary files a/packages/twenty-website/public/images/user-guide/home/create-a-workspace.png and b/packages/twenty-website/public/images/user-guide/home/create-a-workspace.png differ
diff --git a/packages/twenty-website/public/images/user-guide/home/custom-objects.png b/packages/twenty-website/public/images/user-guide/home/custom-objects.png
index 24ffedeefa13..1b850bc1c6c5 100644
Binary files a/packages/twenty-website/public/images/user-guide/home/custom-objects.png and b/packages/twenty-website/public/images/user-guide/home/custom-objects.png differ
diff --git a/packages/twenty-website/public/images/user-guide/home/import-your-data.png b/packages/twenty-website/public/images/user-guide/home/import-your-data.png
index 8c092fa8db8a..3381fd6447d1 100644
Binary files a/packages/twenty-website/public/images/user-guide/home/import-your-data.png and b/packages/twenty-website/public/images/user-guide/home/import-your-data.png differ
diff --git a/packages/twenty-website/public/images/user-guide/home/what-is-twenty.png b/packages/twenty-website/public/images/user-guide/home/what-is-twenty.png
index 4ae3d7bb195b..573139899a20 100644
Binary files a/packages/twenty-website/public/images/user-guide/home/what-is-twenty.png and b/packages/twenty-website/public/images/user-guide/home/what-is-twenty.png differ
diff --git a/packages/twenty-website/public/images/user-guide/import-export-data/match-columns.png b/packages/twenty-website/public/images/user-guide/import-export-data/match-columns.png
new file mode 100644
index 000000000000..2a6a443453a7
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/import-export-data/match-columns.png differ
diff --git a/packages/twenty-website/public/images/user-guide/kanban-views/compact-view.png b/packages/twenty-website/public/images/user-guide/kanban-views/compact-view.png
new file mode 100644
index 000000000000..0344ea873971
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/kanban-views/compact-view.png differ
diff --git a/packages/twenty-website/public/images/user-guide/kanban-views/edit-stage.png b/packages/twenty-website/public/images/user-guide/kanban-views/edit-stage.png
new file mode 100644
index 000000000000..5886224a9e1c
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/kanban-views/edit-stage.png differ
diff --git a/packages/twenty-website/public/images/user-guide/kanban-views/filter.png b/packages/twenty-website/public/images/user-guide/kanban-views/filter.png
new file mode 100644
index 000000000000..4412fce247ae
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/kanban-views/filter.png differ
diff --git a/packages/twenty-website/public/images/user-guide/manage-custom-object.png b/packages/twenty-website/public/images/user-guide/manage-custom-object.png
deleted file mode 100644
index 142ba9cfbf22..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/manage-custom-object.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/notes/add-note.png b/packages/twenty-website/public/images/user-guide/notes/add-note.png
new file mode 100644
index 000000000000..fd494ea094e2
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/notes/add-note.png differ
diff --git a/packages/twenty-website/public/images/user-guide/notes/notes_header.png b/packages/twenty-website/public/images/user-guide/notes/notes_header.png
new file mode 100644
index 000000000000..8059f31478e5
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/notes/notes_header.png differ
diff --git a/packages/twenty-website/public/images/user-guide/objects/custom-objects.png b/packages/twenty-website/public/images/user-guide/objects/custom-objects.png
new file mode 100644
index 000000000000..2c8eb71d62b8
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/objects/custom-objects.png differ
diff --git a/packages/twenty-website/public/images/user-guide/objects/customize-fields.png b/packages/twenty-website/public/images/user-guide/objects/customize-fields.png
new file mode 100644
index 000000000000..0dd2255c2994
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/objects/customize-fields.png differ
diff --git a/packages/twenty-website/public/images/user-guide/objects/standard-objects.png b/packages/twenty-website/public/images/user-guide/objects/standard-objects.png
new file mode 100644
index 000000000000..0a81863d8f93
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/objects/standard-objects.png differ
diff --git a/packages/twenty-website/public/images/user-guide/placeholder-header.png b/packages/twenty-website/public/images/user-guide/placeholder-header.png
new file mode 100644
index 000000000000..368d660e86ac
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/placeholder-header.png differ
diff --git a/packages/twenty-website/public/images/user-guide/tasks/tasks_header.png b/packages/twenty-website/public/images/user-guide/tasks/tasks_header.png
new file mode 100644
index 000000000000..466e666f455b
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/tasks/tasks_header.png differ
diff --git a/packages/twenty-website/public/images/user-guide/tips/favorites.png b/packages/twenty-website/public/images/user-guide/tips/favorites.png
new file mode 100644
index 000000000000..7f4cced6a0d2
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/tips/favorites.png differ
diff --git a/packages/twenty-website/public/images/user-guide/view-all-objects-dark.png b/packages/twenty-website/public/images/user-guide/view-all-objects-dark.png
deleted file mode 100644
index b8d1345d99a4..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/view-all-objects-dark.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/view-all-objects-light.png b/packages/twenty-website/public/images/user-guide/view-all-objects-light.png
deleted file mode 100644
index 9a6b5e38e2c2..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/view-all-objects-light.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/view-favorite-records-dark.png b/packages/twenty-website/public/images/user-guide/view-favorite-records-dark.png
deleted file mode 100644
index 891fef1187bd..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/view-favorite-records-dark.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/view-favorite-records-light.png b/packages/twenty-website/public/images/user-guide/view-favorite-records-light.png
deleted file mode 100644
index 7bdd630f25e1..000000000000
Binary files a/packages/twenty-website/public/images/user-guide/view-favorite-records-light.png and /dev/null differ
diff --git a/packages/twenty-website/public/images/user-guide/views/default-view.png b/packages/twenty-website/public/images/user-guide/views/default-view.png
new file mode 100644
index 000000000000..28b9672c32ca
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/views/default-view.png differ
diff --git a/packages/twenty-website/public/images/user-guide/what-is-twenty/20.png b/packages/twenty-website/public/images/user-guide/what-is-twenty/20.png
new file mode 100644
index 000000000000..9906d82b6921
Binary files /dev/null and b/packages/twenty-website/public/images/user-guide/what-is-twenty/20.png differ
diff --git a/packages/twenty-website/src/app/_components/contributors/ActivityLog.tsx b/packages/twenty-website/src/app/_components/contributors/ActivityLog.tsx
index ecea571394cb..34c7b739f566 100644
--- a/packages/twenty-website/src/app/_components/contributors/ActivityLog.tsx
+++ b/packages/twenty-website/src/app/_components/contributors/ActivityLog.tsx
@@ -1,9 +1,20 @@
 'use client';
 
-import { ResponsiveTimeRange } from '@nivo/calendar';
+import styled from '@emotion/styled';
+import { TimeRange } from '@nivo/calendar';
 
 import { CardContainer } from '@/app/_components/contributors/CardContainer';
 import { Title } from '@/app/_components/contributors/Title';
+import { getActivityEndDate } from '@/app/contributors/utils/get-activity-end-date';
+
+const CalendarContentContainer = styled.div`
+  @media (max-width: 890px) {
+    overflow-x: auto;
+    &::-webkit-scrollbar {
+      display: none;
+    }
+  }
+`;
 
 export const ActivityLog = ({
   data,
@@ -13,20 +24,26 @@ export const ActivityLog = ({
   if (!data.length) {
     return null;
   }
+  const endDate = getActivityEndDate(data);
+
   return (
     <CardContainer>
       <Title>Activity</Title>
-      <div style={{ width: '100%', height: '214px' }}>
-        <ResponsiveTimeRange
+      <CalendarContentContainer>
+        <TimeRange
+          height={150}
+          width={725}
           data={data}
+          to={endDate}
           emptyColor="#F4EFFF"
           colors={['#E9DFFF', '#B28FFE', '#915FFD']}
-          dayBorderWidth={2}
-          dayBorderColor="#ffffff"
+          weekdayTicks={[]}
+          weekdayLegendOffset={0}
+          dayBorderWidth={0}
           dayRadius={4}
-          daySpacing={2}
+          daySpacing={4}
         />
-      </div>
+      </CalendarContentContainer>
     </CardContainer>
   );
 };
diff --git a/packages/twenty-website/src/app/_components/contributors/AnimatedFigures.tsx b/packages/twenty-website/src/app/_components/contributors/AnimatedFigures.tsx
new file mode 100644
index 000000000000..91e962b22226
--- /dev/null
+++ b/packages/twenty-website/src/app/_components/contributors/AnimatedFigures.tsx
@@ -0,0 +1,50 @@
+import { useEffect, useRef } from 'react';
+import styled from '@emotion/styled';
+import {
+  animate,
+  motion,
+  useInView,
+  useMotionValue,
+  useTransform,
+} from 'framer-motion';
+
+import { Theme } from '@/app/_components/ui/theme/theme';
+
+const Container = styled.div`
+  display: flex;
+  flex-direction: row;
+  font-size: 56px;
+  font-weight: 700;
+  color: ${Theme.text.color.secondary};
+
+  @media (max-width: 810px) {
+    font-size: 32px;
+  }
+`;
+
+interface AnimatedFiguresProps {
+  value: number;
+  children?: React.ReactNode;
+}
+
+export const AnimatedFigures = ({ value, children }: AnimatedFiguresProps) => {
+  const count = useMotionValue(0);
+  const rounded = useTransform(count, (latest) => {
+    return Math.round(latest);
+  });
+  const ref = useRef<HTMLSpanElement>(null);
+  const inView = useInView(ref);
+
+  useEffect(() => {
+    if (inView) {
+      animate(count, value, { duration: 2 });
+    }
+  }, [count, inView, value]);
+
+  return (
+    <Container>
+      <motion.span ref={ref}>{rounded}</motion.span>
+      {children}
+    </Container>
+  );
+};
diff --git a/packages/twenty-website/src/app/_components/contributors/AvatarGrid.tsx b/packages/twenty-website/src/app/_components/contributors/AvatarGrid.tsx
index 50512ad2e8c7..48dbe4120e5a 100644
--- a/packages/twenty-website/src/app/_components/contributors/AvatarGrid.tsx
+++ b/packages/twenty-website/src/app/_components/contributors/AvatarGrid.tsx
@@ -3,6 +3,8 @@
 import styled from '@emotion/styled';
 import Link from 'next/link';
 
+import MotionContainer from '@/app/_components/ui/layout/LoaderAnimation';
+
 export interface User {
   id: string;
   avatarUrl: string;
@@ -26,6 +28,7 @@ const AvatarItem = styled.div`
   border-radius: 16px;
   overflow: hidden;
   transition: 200ms;
+  background-color: white;
 
   &:hover {
     -webkit-box-shadow: -6px 6px 0px 1px rgba(0, 0, 0, 1);
@@ -52,6 +55,8 @@ const AvatarItem = styled.div`
     transition:
       opacity 0.3s ease,
       visibility 0.3s;
+    border-bottom-left-radius: 8px;
+    border-bottom-right-radius: 8px;
   }
 
   &:hover .username {
@@ -64,16 +69,18 @@ import React from 'react';
 
 const AvatarGrid = ({ users }: { users: User[] }) => {
   return (
-    <AvatarGridContainer>
-      {users.map((user) => (
-        <Link href={`/contributors/${user.id}`} key={`l_${user.id}`}>
-          <AvatarItem key={user.id}>
-            <img src={user.avatarUrl} alt={user.id} />
-            <span className="username">{user.id}</span>
-          </AvatarItem>
-        </Link>
-      ))}
-    </AvatarGridContainer>
+    <MotionContainer>
+      <AvatarGridContainer>
+        {users.map((user) => (
+          <Link href={`/contributors/${user.id}`} key={`l_${user.id}`}>
+            <AvatarItem key={user.id}>
+              <img src={user.avatarUrl} alt={user.id} />
+              <span className="username">{user.id}</span>
+            </AvatarItem>
+          </Link>
+        ))}
+      </AvatarGridContainer>
+    </MotionContainer>
   );
 };
 
diff --git a/packages/twenty-website/src/app/_components/contributors/CardContainer.tsx b/packages/twenty-website/src/app/_components/contributors/CardContainer.tsx
index 7a2f828be389..87b00e940bf4 100644
--- a/packages/twenty-website/src/app/_components/contributors/CardContainer.tsx
+++ b/packages/twenty-website/src/app/_components/contributors/CardContainer.tsx
@@ -11,7 +11,6 @@ export const CardContainer = styled.div`
   background-color: #fafafa;
 
   @media (max-width: 810px) {
-    gap: 16px;
     padding: 24px;
   }
 `;
diff --git a/packages/twenty-website/src/app/_components/contributors/ContentContainer.tsx b/packages/twenty-website/src/app/_components/contributors/ContentContainer.tsx
index a24728a7fb61..27b27f33c7c7 100644
--- a/packages/twenty-website/src/app/_components/contributors/ContentContainer.tsx
+++ b/packages/twenty-website/src/app/_components/contributors/ContentContainer.tsx
@@ -2,6 +2,8 @@
 
 import styled from '@emotion/styled';
 
+import MotionContainer from '@/app/_components/ui/layout/LoaderAnimation';
+
 const Container = styled.div`
   display: flex;
   flex-direction: column;
@@ -9,11 +11,11 @@ const Container = styled.div`
   width: 100%;
   max-width: 898px;
   padding: 40px;
-
   gap: 40px;
   @media (max-width: 809px) {
     width: 100%;
     padding: 40px 24px 40px 24px;
+    gap: 24px;
   }
 `;
 
@@ -22,5 +24,9 @@ export const ContentContainer = ({
 }: {
   children?: React.ReactNode;
 }) => {
-  return <Container>{children}</Container>;
+  return (
+    <MotionContainer>
+      <Container>{children}</Container>
+    </MotionContainer>
+  );
 };
diff --git a/packages/twenty-website/src/app/_components/contributors/Header.tsx b/packages/twenty-website/src/app/_components/contributors/Header.tsx
index d9a8509bbe68..9b2bf3b7318a 100644
--- a/packages/twenty-website/src/app/_components/contributors/Header.tsx
+++ b/packages/twenty-website/src/app/_components/contributors/Header.tsx
@@ -4,13 +4,19 @@ import styled from '@emotion/styled';
 
 const Title = styled.h2`
   font-size: 56px;
-  font-weight: 600;
+  font-weight: bold;
   color: #b3b3b3;
-  margin-bottom: 0px;
+  margin-bottom: 32px;
   margin-top: 64px;
+  text-align: center;
+  display: flex;
+  justify-items: center;
+  align-items: center;
+  flex-direction: column;
 
   @media (max-width: 810px) {
-    font-size: 28px;
+    font-size: 32px;
+    margin-bottom: 22px;
   }
 `;
 
@@ -18,7 +24,8 @@ export const Header = () => {
   return (
     <>
       <Title>
-        Our amazing <br /> <span style={{ color: 'black' }}>Contributors</span>
+        Our amazing <br />
+        <span style={{ color: '#141414' }}>Contributors</span>
       </Title>
     </>
   );
diff --git a/packages/twenty-website/src/app/_components/contributors/ProfileCard.tsx b/packages/twenty-website/src/app/_components/contributors/ProfileCard.tsx
index d24842430c47..ef066a8e5a76 100644
--- a/packages/twenty-website/src/app/_components/contributors/ProfileCard.tsx
+++ b/packages/twenty-website/src/app/_components/contributors/ProfileCard.tsx
@@ -10,6 +10,10 @@ const ProfileContainer = styled.div`
   gap: 32px;
   width: 100%;
   align-items: center;
+  @media (max-width: 600px) {
+    flex-direction: column;
+    align-items: start;
+  }
 `;
 
 const Avatar = styled.div`
@@ -33,6 +37,10 @@ const Details = styled.div`
   flex-direction: column;
   gap: 4px;
 
+  @media (max-width: 810px) {
+    gap: 8px;
+  }
+
   .username {
     font-size: 40px;
     font-weight: 700;
@@ -42,7 +50,7 @@ const Details = styled.div`
     gap: 12px;
 
     @media (max-width: 810px) {
-      font-size: 24px;
+      font-size: 32px;
       line-height: 28.8px;
     }
   }
diff --git a/packages/twenty-website/src/app/_components/contributors/ProfileInfo.tsx b/packages/twenty-website/src/app/_components/contributors/ProfileInfo.tsx
index 435a93cd2d5d..731959cdf2e0 100644
--- a/packages/twenty-website/src/app/_components/contributors/ProfileInfo.tsx
+++ b/packages/twenty-website/src/app/_components/contributors/ProfileInfo.tsx
@@ -1,8 +1,11 @@
 'use client';
 
+import React from 'react';
 import styled from '@emotion/styled';
 
+import { AnimatedFigures } from '@/app/_components/contributors/AnimatedFigures';
 import { CardContainer } from '@/app/_components/contributors/CardContainer';
+import { Theme } from '@/app/_components/ui/theme/theme';
 
 const Container = styled(CardContainer)`
   flex-direction: row;
@@ -21,8 +24,8 @@ const Container = styled(CardContainer)`
 
     .title {
       font-size: 24px;
-      color: #b3b3b3;
-      margin: 0;
+      color: ${Theme.text.color.quarternary};
+      margin: 8px;
 
       @media (max-width: 810px) {
         font-size: 20px;
@@ -32,7 +35,7 @@ const Container = styled(CardContainer)`
     .value {
       font-size: 56px;
       font-weight: 700;
-      color: #474747;
+      color: ${Theme.text.color.secondary};
 
       @media (max-width: 810px) {
         font-size: 32px;
@@ -63,22 +66,23 @@ export const ProfileInfo = ({
   rank,
   activeDays,
 }: ProfileInfoProps) => {
+  const parsedValue = parseFloat(rank.replace('%', ''));
   return (
     <>
       <Container>
         <div className="item">
           <p className="title">Merged PR</p>
-          <span className="value">{mergedPRsCount}</span>
+          <AnimatedFigures value={mergedPRsCount} />
         </div>
         <div className="separator"></div>
         <div className="item">
-          <p className="title">Rank</p>
-          <span className="value">{rank}%</span>
+          <p className="title">Ranking</p>
+          <AnimatedFigures value={parsedValue}>%</AnimatedFigures>
         </div>
         <div className="separator"></div>
         <div className="item">
           <p className="title">Active Days</p>
-          <span className="value">{activeDays}</span>
+          <AnimatedFigures value={activeDays} />
         </div>
       </Container>
     </>
diff --git a/packages/twenty-website/src/app/_components/contributors/PullRequestItem.tsx b/packages/twenty-website/src/app/_components/contributors/PullRequestItem.tsx
index edb57d0a1c98..617ed7c1778b 100644
--- a/packages/twenty-website/src/app/_components/contributors/PullRequestItem.tsx
+++ b/packages/twenty-website/src/app/_components/contributors/PullRequestItem.tsx
@@ -3,6 +3,7 @@ import styled from '@emotion/styled';
 import { format } from 'date-fns';
 
 import { PullRequestIcon } from '@/app/_components/ui/icons/SvgIcons';
+import { Theme } from '@/app/_components/ui/theme/theme';
 import { formatIntoRelativeDate } from '@/shared-utils/formatIntoRelativeDate';
 
 const StyledTooltip = styled(Tooltip)``;
@@ -15,7 +16,7 @@ const Item = styled.div`
 const StyledTitle = styled.a`
   font-size: 24px;
   font-weight: 400;
-  color: #474747;
+  color: ${Theme.text.color.secondary};
   margin: 0;
   text-decoration: none;
 
@@ -27,6 +28,7 @@ const StyledTitle = styled.a`
 const StyledPrLink = styled.a`
   cursor: pointer;
   text-decoration: none;
+  color: ${Theme.text.color.quarternary} !important;
 
   &:hover {
     text-decoration: underline;
@@ -38,7 +40,8 @@ const StyledDescription = styled.div`
   font-size: 20px;
   line-height: 28px;
   font-weight: 500;
-  color: #b3b3b3;
+  color: ${Theme.text.color.quarternary};
+  margin-top: 4px;
 
   @media (max-width: 810px) {
     font-size: 18px;
diff --git a/packages/twenty-website/src/app/_components/contributors/PullRequests.tsx b/packages/twenty-website/src/app/_components/contributors/PullRequests.tsx
index f7822c6227db..c8367fc0b4fe 100644
--- a/packages/twenty-website/src/app/_components/contributors/PullRequests.tsx
+++ b/packages/twenty-website/src/app/_components/contributors/PullRequests.tsx
@@ -10,6 +10,7 @@ const List = styled.div`
   display: flex;
   gap: 24px;
   flex-direction: column;
+  overflow: hidden;
 `;
 interface PullRequestsProps {
   list: {
diff --git a/packages/twenty-website/src/app/_components/contributors/ThankYou.tsx b/packages/twenty-website/src/app/_components/contributors/ThankYou.tsx
index a0a80dba5256..141ba036c5ce 100644
--- a/packages/twenty-website/src/app/_components/contributors/ThankYou.tsx
+++ b/packages/twenty-website/src/app/_components/contributors/ThankYou.tsx
@@ -6,7 +6,6 @@ import { CardContainer } from '@/app/_components/contributors/CardContainer';
 import { HeartIcon } from '@/app/_components/ui/icons/SvgIcons';
 
 const StyledTitle = styled.div`
-  display: flex;
   font-size: 24px;
   font-weight: 500;
   gap: 8px;
@@ -18,20 +17,21 @@ const StyledTitle = styled.div`
 
 const StyledHeartIcon = styled(HeartIcon)`
   @media (max-width: 810px) {
+    display: inline-block !important;
     width: 16px !important;
     height: 16px !important;
   }
 `;
 
 interface ThankYouProps {
-  authorId: string;
+  username: string;
 }
 
-export const ThankYou = ({ authorId }: ThankYouProps) => {
+export const ThankYou = ({ username }: ThankYouProps) => {
   return (
     <CardContainer>
       <StyledTitle>
-        Thank you @{authorId} <StyledHeartIcon color="#333333" size="18px" />
+        Thank you @{username} <StyledHeartIcon color="#333333" size="18px" />
       </StyledTitle>
     </CardContainer>
   );
diff --git a/packages/twenty-website/src/app/_components/oss-friends/Background.tsx b/packages/twenty-website/src/app/_components/oss-friends/Background.tsx
index f97b976d4814..06f472f48771 100644
--- a/packages/twenty-website/src/app/_components/oss-friends/Background.tsx
+++ b/packages/twenty-website/src/app/_components/oss-friends/Background.tsx
@@ -1,44 +1,100 @@
 'use client';
-
+import React from 'react';
 import styled from '@emotion/styled';
 
-const BackgroundContainer = styled.div`
+const BACKGROUND_ROTATION = -5;
+
+const BACKGROUND_IMAGE_URL =
+  'https://framerusercontent.com/images/nqEmdwe7yDXNsOZovuxG5zvj2E.png';
+
+const BackgroundImage = styled.div`
   position: absolute;
-  top: 100%;
-  left: 0px;
-  width: 100%;
-  height: 100%;
-  max-height: 200%;
-  background-image: url(https://framerusercontent.com/images/nqEmdwe7yDXNsOZovuxG5zvj2E.png);
+  height: calc(100% - 350px);
+  width: 200%;
+  top: 250px;
+  overflow: visible;
+  z-index: -3;
+  background-image: url(${BACKGROUND_IMAGE_URL});
+  transform: rotate(${BACKGROUND_ROTATION}deg);
   background-size: auto 20px;
   background-repeat: repeat;
   transform-origin: center center;
-  z-index: -2;
+
+  @media (max-width: 1024px) {
+    transform: rotate(-1deg);
+    top: 100px;
+    height: 100%;
+  }
 `;
 
-const Gradient = styled.div`
-  position: absolute;
-  width: 100%;
+const Container = styled.div`
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   height: 100%;
-  max-height: 200%;
-  top: 100%;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: linear-gradient(
-    185deg,
-    #fff 8.33%,
-    rgba(255, 255, 255, 0.08) 48.95%,
-    #fff 92.18%
-  );
-  z-index: -1;
+  width: 100%;
+  overflow: hidden;
+  min-width: 100vw;
+  max-width: 100vw;
+  z-index: 0;
+
+  &::before {
+    content: '';
+    position: absolute;
+    top: 150px;
+    left: 0;
+    height: 300px;
+    width: 200%;
+    background: linear-gradient(
+      to bottom,
+      rgba(255, 255, 255, 1),
+      rgba(255, 255, 255, 0)
+    );
+    transform: rotate(${BACKGROUND_ROTATION}deg);
+    z-index: -2;
+    pointer-events: none;
+
+    @media (max-width: 1024px) {
+      height: 200px;
+      top: 50px;
+      transform: rotate(-1deg);
+    }
+  }
+
+  &::after {
+    content: '';
+    position: absolute;
+    bottom: 140px;
+    left: -20px;
+    height: 300px;
+    width: 220%;
+    background: linear-gradient(
+      to top,
+      rgba(255, 255, 255, 1),
+      rgba(255, 255, 255, 0)
+    );
+    transform: rotate(${BACKGROUND_ROTATION}deg);
+    z-index: -2;
+    pointer-events: none;
+
+    @media (max-width: 1024px) {
+      height: 200px;
+      transform: rotate(-1deg);
+      bottom: 0px;
+    }
+  }
 `;
 
-export const Background = () => {
+type BackgroundProps = {
+  children: React.ReactNode;
+};
+
+export const Background = ({ children }: BackgroundProps) => {
   return (
-    <>
-      <BackgroundContainer />
-      <Gradient />
-    </>
+    <Container>
+      {children}
+      <BackgroundImage />
+    </Container>
   );
 };
diff --git a/packages/twenty-website/src/app/_components/oss-friends/ContentContainer.tsx b/packages/twenty-website/src/app/_components/oss-friends/ContentContainer.tsx
index 130bb9041c20..cf5238e7b472 100644
--- a/packages/twenty-website/src/app/_components/oss-friends/ContentContainer.tsx
+++ b/packages/twenty-website/src/app/_components/oss-friends/ContentContainer.tsx
@@ -11,7 +11,7 @@ const Container = styled.div`
   gap: 26px;
   @media (max-width: 809px) {
     width: 100%;
-    padding: 0px 12px 0px 12px;
+    padding: 0px 12px 40px 12px;
   }
 `;
 
diff --git a/packages/twenty-website/src/app/_components/releases/Line.tsx b/packages/twenty-website/src/app/_components/releases/Line.tsx
index 5d1f564fbf2b..a0d618c7e3b0 100644
--- a/packages/twenty-website/src/app/_components/releases/Line.tsx
+++ b/packages/twenty-website/src/app/_components/releases/Line.tsx
@@ -9,17 +9,17 @@ const StyledLineContainer = styled.div`
 
   @media (max-width: 810px) {
     width: auto;
-    margin: 24px 0;
     display: block;
+    margin: 24px 0px 64px;
   }
 `;
 
 const StyledLine = styled.div`
   height: 1px;
   background-color: #d9d9d9;
-  margin-bottom: 48px;
+  margin-bottom: 80px;
   margin-left: 148px;
-  margin-top: 48px;
+  margin-top: 40px;
   width: 100%;
 
   @media (max-width: 810px) {
diff --git a/packages/twenty-website/src/app/_components/releases/Release.tsx b/packages/twenty-website/src/app/_components/releases/Release.tsx
index c12bc3d527ea..d0a10a74688c 100644
--- a/packages/twenty-website/src/app/_components/releases/Release.tsx
+++ b/packages/twenty-website/src/app/_components/releases/Release.tsx
@@ -1,11 +1,11 @@
 'use client';
 
+import { JSXElementConstructor, ReactElement } from 'react';
 import styled from '@emotion/styled';
 import { Gabarito } from 'next/font/google';
-import { compileMDX } from 'next-mdx-remote/rsc';
-import remarkBehead from 'remark-behead';
-import gfm from 'remark-gfm';
 
+import MotionContainer from '@/app/_components/ui/layout/LoaderAnimation';
+import { Theme } from '@/app/_components/ui/theme/theme';
 import { ReleaseNote } from '@/app/releases/api/route';
 
 const StyledContainer = styled.div`
@@ -16,7 +16,6 @@ const StyledContainer = styled.div`
 
   @media (max-width: 810px) {
     width: auto;
-    margin: 24px 0;
     display: block;
   }
 `;
@@ -35,76 +34,82 @@ const StyledVersion = styled.div`
     font-size: 20px;
     flex-flow: row;
     justify-content: space-between;
+    margin-bottom: 24px;
   }
 `;
 
 const StyledRelease = styled.span`
-  color: #b3b3b3;
+  color: ${Theme.text.color.quarternary};
+  line-height: 140%;
 `;
 
 const StyledDate = styled.span`
-  color: #474747;
-  font-size: 16px;
+  color: ${Theme.text.color.secondary};
+  font-weight: 400;
+  font-size: ${Theme.font.size.sm};
 `;
 
 const StlyedContent = styled.div`
   flex: 1;
 
+  gap: 64px;
+
   h3 {
-    color: #141414;
+    color: ${Theme.text.color.primary};
+    font-weight: 700;
     font-size: 40px;
     margin: 0;
   }
 
   p {
-    color: #474747;
+    color: ${Theme.text.color.secondary};
+    font-family: ${Theme.font.family};
     font-size: 16px;
     line-height: 28.8px;
-    color: #818181;
     font-weight: 400;
+    margin: 40px 0px;
+    text-align: justify;
   }
 
   img {
     max-width: 100%;
   }
+
+  @media (max-width: 810px) {
+    h3 {
+      font-size: 24px;
+    }
+  }
 `;
 
 const gabarito = Gabarito({
-  weight: ['400', '500'],
+  weight: ['400', '500', '600', '700'],
   subsets: ['latin'],
   display: 'swap',
   adjustFontFallback: false,
+  variable: '--font-gabarito',
 });
 
-export const Release = async ({ release }: { release: ReleaseNote }) => {
-  let mdxSource;
-  try {
-    mdxSource = await compileMDX({
-      source: release.content,
-      options: {
-        mdxOptions: {
-          remarkPlugins: [gfm, [remarkBehead, { depth: 2 }]],
-        },
-      },
-    });
-    mdxSource = mdxSource.content;
-  } catch (error) {
-    console.error('An error occurred during MDX rendering:', error);
-    mdxSource = `<p>Oops! Something went wrong.</p> ${error}`;
-  }
-
+export const Release = ({
+  release,
+  mdxReleaseContent,
+}: {
+  release: ReleaseNote;
+  mdxReleaseContent: ReactElement<any, string | JSXElementConstructor<any>>;
+}) => {
   return (
-    <StyledContainer className={gabarito.className}>
-      <StyledVersion>
-        <StyledRelease>{release.release}</StyledRelease>
-        <StyledDate>
-          {release.date.endsWith(new Date().getFullYear().toString())
-            ? release.date.slice(0, -5)
-            : release.date}
-        </StyledDate>
-      </StyledVersion>
-
-      <StlyedContent>{mdxSource}</StlyedContent>
-    </StyledContainer>
+    <MotionContainer>
+      <StyledContainer className={gabarito.className}>
+        <StyledVersion>
+          <StyledRelease>{release.release}</StyledRelease>
+          <StyledDate>
+            {release.date.endsWith(new Date().getFullYear().toString())
+              ? release.date.slice(0, -5)
+              : release.date}
+          </StyledDate>
+        </StyledVersion>
+        <StlyedContent>{mdxReleaseContent}</StlyedContent>
+      </StyledContainer>
+    </MotionContainer>
   );
 };
diff --git a/packages/twenty-website/src/app/_components/releases/StyledTitle.tsx b/packages/twenty-website/src/app/_components/releases/StyledTitle.tsx
index 816cc23b19d4..569257ee19be 100644
--- a/packages/twenty-website/src/app/_components/releases/StyledTitle.tsx
+++ b/packages/twenty-website/src/app/_components/releases/StyledTitle.tsx
@@ -9,7 +9,7 @@ const StyledTitle = styled.div`
 
   @media (max-width: 810px) {
     font-size: 1em;
-    margin: 16px auto;
+    margin: 64px auto;
   }
 `;
 const StyledHeader = styled.h1`
@@ -17,6 +17,7 @@ const StyledHeader = styled.h1`
   margin: 0;
 `;
 const StyledSubHeader = styled.h1`
+  color: #141414;
   margin: 0;
 `;
 
diff --git a/packages/twenty-website/src/app/_components/ui/icons/SvgIcons.tsx b/packages/twenty-website/src/app/_components/ui/icons/SvgIcons.tsx
index 91f76461b5fa..e8498ebf0408 100644
--- a/packages/twenty-website/src/app/_components/ui/icons/SvgIcons.tsx
+++ b/packages/twenty-website/src/app/_components/ui/icons/SvgIcons.tsx
@@ -139,7 +139,9 @@ export const PullRequestIcon = ({ size = 'S', color = 'rgb(179,179,179)' }) => {
 export const HeartIcon = ({ size = 'S', color = 'rgb(179,179,179)' }) => {
   const dimension = getSize(size);
   return (
-    <div style={{ width: dimension, height: dimension }}>
+    <span
+      style={{ width: dimension, height: dimension, display: 'inline-block' }}
+    >
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 20" fill="none">
         <path
           d="M18.513 10.572L11.013 18L3.513 10.572C3.0183 10.0906 2.62864 9.51201 2.36854 8.87263C2.10845 8.23325 1.98356 7.54694 2.00173 6.85693C2.01991 6.16691 2.18076 5.48813 2.47415 4.86333C2.76755 4.23853 3.18713 3.68125 3.70648 3.22657C4.22583 2.7719 4.8337 2.42968 5.49181 2.22147C6.14991 2.01327 6.844 1.94358 7.53036 2.0168C8.21673 2.09001 8.8805 2.30455 9.47987 2.6469C10.0792 2.98925 10.6012 3.45199 11.013 4.00599C11.4265 3.45602 11.9491 2.99731 12.5481 2.6586C13.1471 2.31988 13.8095 2.10844 14.4939 2.03751C15.1784 1.96658 15.8701 2.03769 16.5258 2.24639C17.1815 2.45508 17.787 2.79687 18.3045 3.25036C18.8221 3.70385 19.2404 4.25928 19.5334 4.88189C19.8264 5.50449 19.9877 6.18088 20.0073 6.8687C20.0269 7.55653 19.9043 8.24099 19.6471 8.87924C19.39 9.5175 19.0039 10.0958 18.513 10.578"
@@ -149,7 +151,7 @@ export const HeartIcon = ({ size = 'S', color = 'rgb(179,179,179)' }) => {
           strokeLinejoin="round"
         />
       </svg>
-    </div>
+    </span>
   );
 };
 
diff --git a/packages/twenty-website/src/app/_components/ui/layout/Breadcrumbs.tsx b/packages/twenty-website/src/app/_components/ui/layout/Breadcrumbs.tsx
index 830049c7a379..c3df927a5064 100644
--- a/packages/twenty-website/src/app/_components/ui/layout/Breadcrumbs.tsx
+++ b/packages/twenty-website/src/app/_components/ui/layout/Breadcrumbs.tsx
@@ -21,6 +21,7 @@ const InternalLinkItem = styled(Link)`
   color: #b3b3b3;
   &:hover {
     color: ${Theme.text.color.quarternary};
+    text-decoration: underline;
   }
 `;
 
@@ -30,7 +31,7 @@ const ExternalLinkItem = styled.a`
 `;
 
 const ActivePage = styled.span`
-  color: ${Theme.text.color.secondary};
+  color: ${Theme.text.color.primary};
   font-weight: ${Theme.font.weight.medium};
 `;
 
diff --git a/packages/twenty-website/src/app/_components/ui/layout/ContentContainer.tsx b/packages/twenty-website/src/app/_components/ui/layout/ContentContainer.tsx
index 40d3b1228521..556401a285c6 100644
--- a/packages/twenty-website/src/app/_components/ui/layout/ContentContainer.tsx
+++ b/packages/twenty-website/src/app/_components/ui/layout/ContentContainer.tsx
@@ -9,7 +9,7 @@ const Container = styled.div`
   padding: 0px 96px 0px 96px;
   @media (max-width: 809px) {
     width: 100%;
-    padding: 0px 12px 0px 12px;
+    padding: 0px 24px 0px 24px;
   }
 `;
 
diff --git a/packages/twenty-website/src/app/_components/ui/layout/FooterDesktop.tsx b/packages/twenty-website/src/app/_components/ui/layout/FooterDesktop.tsx
index 7015e72c1044..7b92e25a596a 100644
--- a/packages/twenty-website/src/app/_components/ui/layout/FooterDesktop.tsx
+++ b/packages/twenty-website/src/app/_components/ui/layout/FooterDesktop.tsx
@@ -19,7 +19,7 @@ const FooterContainer = styled.div`
   color: rgb(129, 129, 129);
   gap: 32px;
   @media (max-width: 809px) {
-    display: none;
+    padding: 36px 24px;
   }
 `;
 
@@ -28,6 +28,9 @@ const LeftSideFooter = styled.div`
   display: flex;
   flex-direction: column;
   gap: 16px;
+  @media (max-width: 809px) {
+    display: none;
+  }
 `;
 
 const RightSideFooter = styled.div`
@@ -35,6 +38,10 @@ const RightSideFooter = styled.div`
   justify-content: space-between;
   gap: 48px;
   height: 146px;
+  @media (max-width: 809px) {
+    flex-direction: column;
+    height: fit-content;
+  }
 `;
 
 const RightSideFooterColumn = styled.div`
@@ -70,6 +77,8 @@ export const FooterDesktop = () => {
       <div
         style={{
           width: '100%',
+          maxWidth: '1200px',
+          margin: '0 auto',
           display: 'flex',
           flexDirection: 'row',
           justifyContent: 'space-between',
@@ -96,6 +105,9 @@ export const FooterDesktop = () => {
           </RightSideFooterColumn>
           <RightSideFooterColumn>
             <RightSideFooterColumnTitle>Other</RightSideFooterColumnTitle>
+            <RightSideFooterLink href="/contributors">
+              Contributors
+            </RightSideFooterLink>
             <RightSideFooterLink href="/oss-friends">
               OSS Friends
             </RightSideFooterLink>
@@ -111,6 +123,8 @@ export const FooterDesktop = () => {
       <div
         style={{
           width: '100%',
+          maxWidth: '1200px',
+          margin: '0 auto',
           display: 'flex',
           flexDirection: 'row',
           justifyContent: 'space-between',
@@ -120,7 +134,7 @@ export const FooterDesktop = () => {
       >
         <div>
           <span style={{ fontFamily: 'Inter, sans-serif' }}>©</span>
-          2023 Twenty PBC
+          {new Date().getFullYear()} Twenty PBC
         </div>
         <div
           style={{
diff --git a/packages/twenty-website/src/app/_components/ui/layout/HeaderDesktop.tsx b/packages/twenty-website/src/app/_components/ui/layout/HeaderDesktop.tsx
deleted file mode 100644
index 4b9232594c92..000000000000
--- a/packages/twenty-website/src/app/_components/ui/layout/HeaderDesktop.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-'use client';
-
-import React from 'react';
-import styled from '@emotion/styled';
-
-import { ExternalArrow } from '@/app/_components/ui/icons/SvgIcons';
-
-import { GithubIcon } from '../icons/SvgIcons';
-
-import { Logo } from './Logo';
-
-const Nav = styled.nav`
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  align-items: center;
-  overflow: visible;
-  padding: 12px 16px 12px 16px;
-  position: relative;
-  transform-origin: 50% 50% 0px;
-  border-bottom: 1px solid rgba(20, 20, 20, 0.08);
-
-  @media (max-width: 809px) {
-    display: none;
-  }
-`;
-
-const LinkList = styled.div`
-  display: flex;
-  flex-direction: row;
-  gap: 2px;
-`;
-
-const ListItem = styled.a`
-  color: rgb(71, 71, 71);
-  text-decoration: none;
-  display: flex;
-  gap: 4px;
-  align-items: center;
-  border-radius: 8px;
-  height: 40px;
-  padding-left: 16px;
-  padding-right: 16px;
-  &:hover {
-    background-color: #f1f1f1;
-  }
-`;
-
-const LogoContainer = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  width: 202px;
-`;
-
-const StyledButton = styled.div`
-  display: flex;
-  height: 40px;
-  padding-left: 16px;
-  padding-right: 16px;
-  align-items: center;
-  background-color: #000;
-  color: #fff;
-  border-radius: 8px;
-  font-weight: 500;
-  border: none;
-  outline: inherit;
-  cursor: pointer;
-`;
-
-const CallToActionContainer = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  a {
-    text-decoration: none;
-  }
-`;
-
-const LinkNextToCTA = styled.a`
-  display: flex;
-  align-items: center;
-  color: rgb(71, 71, 71);
-  padding: 0px 16px 0px 16px;
-  span {
-    text-decoration: underline;
-  }
-`;
-
-const CallToAction = () => {
-  return (
-    <CallToActionContainer>
-      <LinkNextToCTA href="https://github.com/twentyhq/twenty">
-        Sign in
-      </LinkNextToCTA>
-      <a href="https://twenty.com/stripe-redirection">
-        <StyledButton>Get Started</StyledButton>
-      </a>
-    </CallToActionContainer>
-  );
-};
-
-export const HeaderDesktop = () => {
-  return (
-    <Nav>
-      <LogoContainer>
-        <Logo />
-      </LogoContainer>
-      <LinkList>
-        <ListItem href="/pricing">Pricing</ListItem>
-        <ListItem href="/story">Story</ListItem>
-        <ListItem href="https://docs.twenty.com">
-          Docs <ExternalArrow />
-        </ListItem>
-        <ListItem href="https://github.com/twentyhq/twenty">
-          <GithubIcon color="rgb(71,71,71)" /> 8.3k <ExternalArrow />
-        </ListItem>
-      </LinkList>
-      <CallToAction />
-    </Nav>
-  );
-};
diff --git a/packages/twenty-website/src/app/_components/ui/layout/HeaderMobile.tsx b/packages/twenty-website/src/app/_components/ui/layout/HeaderMobile.tsx
deleted file mode 100644
index 8f510246d223..000000000000
--- a/packages/twenty-website/src/app/_components/ui/layout/HeaderMobile.tsx
+++ /dev/null
@@ -1,235 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-import styled from '@emotion/styled';
-import { IBM_Plex_Mono } from 'next/font/google';
-
-import { ExternalArrow } from '@/app/_components/ui/icons/SvgIcons';
-
-import { GithubIcon } from '../icons/SvgIcons';
-
-import { Logo } from './Logo';
-
-const IBMPlexMono = IBM_Plex_Mono({
-  weight: '500',
-  subsets: ['latin'],
-  display: 'swap',
-});
-
-const Nav = styled.nav`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  overflow: visible;
-  padding: 0 12px;
-  position: relative;
-  transform-origin: 50% 50% 0px;
-  border-bottom: 1px solid rgba(20, 20, 20, 0.08);
-  height: 64px;
-  width: 100%;
-  @media (min-width: 810px) {
-    display: none;
-  }
-`;
-
-const LinkList = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-  align-items: center;
-`;
-
-const ListItem = styled.a`
-  color: rgb(71, 71, 71);
-  text-decoration: none;
-  display: flex;
-  gap: 4px;
-  align-items: center;
-  border-radius: 8px;
-  height: 48px;
-  padding-left: 16px;
-  padding-right: 16px;
-  &:hover {
-    background-color: #f1f1f1;
-  }
-`;
-
-const LogoContainer = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  width: 202px;
-`;
-
-const LogoAddon = styled.div`
-  font-size: 12px;
-  font-style: normal;
-  font-weight: 500;
-  line-height: 150%;
-`;
-
-const StyledButton = styled.div`
-  display: flex;
-  height: 40px;
-  padding-left: 16px;
-  padding-right: 16px;
-  align-items: center;
-  background-color: #000;
-  color: #fff;
-  border-radius: 8px;
-  font-weight: 500;
-  border: none;
-  outline: inherit;
-  cursor: pointer;
-`;
-
-const CallToActionContainer = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  a {
-    text-decoration: none;
-  }
-`;
-
-const LinkNextToCTA = styled.a`
-  display: flex;
-  align-items: center;
-  color: rgb(71, 71, 71);
-  padding: 0px 16px 0px 16px;
-  span {
-    text-decoration: underline;
-  }
-`;
-
-const CallToAction = () => {
-  return (
-    <CallToActionContainer>
-      <LinkNextToCTA href="https://github.com/twentyhq/twenty">
-        Sign in
-      </LinkNextToCTA>
-      <a href="#">
-        <StyledButton>Get Started</StyledButton>
-      </a>
-    </CallToActionContainer>
-  );
-};
-
-const HamburgerContainer = styled.div`
-  height: 44px;
-  width: 44px;
-  cursor: pointer;
-  position: relative;
-  input {
-    height: 44px;
-    width: 44px;
-    opacity: 0;
-  }
-
-  #line1 {
-    transition: transform 0.5s;
-    transition-timing-function: ease-in-out;
-  }
-
-  #line2 {
-    transition: transform 0.5s;
-    transition-timing-function: ease-in-out;
-  }
-
-  #menu-input:checked ~ #line1 {
-    transform: rotate(45deg) translate(7px);
-  }
-
-  #menu-input:checked ~ #line2 {
-    transform: rotate(-45deg) translate(7px);
-  }
-`;
-
-const HamburgerLine1 = styled.div`
-  height: 2px;
-  left: calc(50.00000000000002% - 20px / 2);
-  position: absolute;
-  top: calc(37.50000000000002% - 2px / 2);
-  width: 20px;
-  border-radius: 10px;
-  background-color: rgb(179, 179, 179);
-`;
-
-const HamburgerLine2 = styled.div`
-  height: 2px;
-  left: calc(50.00000000000002% - 20px / 2);
-  position: absolute;
-  top: calc(62.50000000000002% - 2px / 2);
-  width: 20px;
-  border-radius: 10px;
-  background-color: rgb(179, 179, 179);
-`;
-
-const NavOpen = styled.div`
-  flex-direction: column;
-  align-items: center;
-  position: fixed;
-  inset: 0px;
-  top: 63px;
-  background-color: #fff;
-  gap: 33px;
-  padding-top: 32px;
-  z-index: 100;
-  transition: transform 0.2s ease-in;
-  display: flex;
-  transform-origin: top;
-`;
-
-const MobileMenu = styled.div`
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-`;
-
-export const HeaderMobile = () => {
-  const isTwentyDev = false;
-
-  const [menuOpen, setMenuOpen] = useState(false);
-
-  const toggleMenu = () => {
-    setMenuOpen(!menuOpen);
-  };
-
-  return (
-    <MobileMenu>
-      <Nav>
-        <LogoContainer>
-          <Logo />
-          {isTwentyDev && (
-            <LogoAddon className={IBMPlexMono.className}>
-              for Developers
-            </LogoAddon>
-          )}
-        </LogoContainer>
-        <HamburgerContainer>
-          <input type="checkbox" id="menu-input" onChange={toggleMenu} />
-          <HamburgerLine1 id="line1" />
-          <HamburgerLine2 id="line2" />
-        </HamburgerContainer>
-      </Nav>
-      <NavOpen
-        style={{
-          transform: `scaleY(${menuOpen ? '1' : '0'})`,
-        }}
-      >
-        <LinkList>
-          <ListItem href="/story">Story</ListItem>
-          <ListItem href="/pricing">Pricing</ListItem>
-          <ListItem href="https://docs.twenty.com">
-            Docs <ExternalArrow />
-          </ListItem>
-          <ListItem href="https://github.com/twentyhq/twenty">
-            <GithubIcon color="rgb(71,71,71)" /> 8.3k <ExternalArrow />
-          </ListItem>
-        </LinkList>
-        <CallToAction />
-      </NavOpen>
-    </MobileMenu>
-  );
-};
diff --git a/packages/twenty-website/src/app/_components/ui/layout/LoaderAnimation.tsx b/packages/twenty-website/src/app/_components/ui/layout/LoaderAnimation.tsx
new file mode 100644
index 000000000000..1b8849098e68
--- /dev/null
+++ b/packages/twenty-website/src/app/_components/ui/layout/LoaderAnimation.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { motion } from 'framer-motion';
+
+const containerVariants = {
+  hidden: { opacity: 0, y: 20 },
+  visible: {
+    opacity: 1,
+    y: 0,
+    transition: { duration: 0.2, ease: 'easeOut' },
+  },
+};
+
+const MotionContainer = ({ children }: { children?: React.ReactNode }) => (
+  <motion.div variants={containerVariants} initial="hidden" animate="visible">
+    {children}
+  </motion.div>
+);
+
+export default MotionContainer;
diff --git a/packages/twenty-website/src/app/_components/ui/layout/header/HeaderDesktop.tsx b/packages/twenty-website/src/app/_components/ui/layout/header/HeaderDesktop.tsx
new file mode 100644
index 000000000000..792df8119899
--- /dev/null
+++ b/packages/twenty-website/src/app/_components/ui/layout/header/HeaderDesktop.tsx
@@ -0,0 +1,34 @@
+'use client';
+
+import React from 'react';
+
+import { ExternalArrow, GithubIcon } from '@/app/_components/ui/icons/SvgIcons';
+import { CallToAction } from '@/app/_components/ui/layout/header/callToAction';
+import {
+  DesktopNav,
+  LinkList,
+  ListItem,
+  LogoContainer,
+} from '@/app/_components/ui/layout/header/styled';
+import { Logo } from '@/app/_components/ui/layout/Logo';
+
+export const HeaderDesktop = () => {
+  return (
+    <DesktopNav>
+      <LogoContainer>
+        <Logo />
+      </LogoContainer>
+      <LinkList>
+        <ListItem href="/story">Story</ListItem>
+        <ListItem href="/pricing">Pricing</ListItem>
+        <ListItem href="https://docs.twenty.com">
+          Docs <ExternalArrow />
+        </ListItem>
+        <ListItem href="https://github.com/twentyhq/twenty">
+          <GithubIcon color="rgb(71,71,71)" /> 8.3k <ExternalArrow />
+        </ListItem>
+      </LinkList>
+      <CallToAction />
+    </DesktopNav>
+  );
+};
diff --git a/packages/twenty-website/src/app/_components/ui/layout/header/HeaderMobile.tsx b/packages/twenty-website/src/app/_components/ui/layout/header/HeaderMobile.tsx
new file mode 100644
index 000000000000..6c107822f4c3
--- /dev/null
+++ b/packages/twenty-website/src/app/_components/ui/layout/header/HeaderMobile.tsx
@@ -0,0 +1,73 @@
+'use client';
+
+import { useState } from 'react';
+import { IBM_Plex_Mono } from 'next/font/google';
+
+import { ExternalArrow, GithubIcon } from '@/app/_components/ui/icons/SvgIcons';
+import { CallToAction } from '@/app/_components/ui/layout/header/callToAction';
+import {
+  HamburgerContainer,
+  HamburgerLine1,
+  HamburgerLine2,
+  ListItem,
+  LogoAddon,
+  LogoContainer,
+  MobileLinkList,
+  MobileMenu,
+  MobileNav,
+  NavOpen,
+} from '@/app/_components/ui/layout/header/styled';
+import { Logo } from '@/app/_components/ui/layout/Logo';
+
+const IBMPlexMono = IBM_Plex_Mono({
+  weight: '500',
+  subsets: ['latin'],
+  display: 'swap',
+});
+
+export const HeaderMobile = () => {
+  const isTwentyDev = false;
+
+  const [menuOpen, setMenuOpen] = useState(false);
+
+  const toggleMenu = () => {
+    setMenuOpen(!menuOpen);
+  };
+
+  return (
+    <MobileMenu>
+      <MobileNav>
+        <LogoContainer>
+          <Logo />
+          {isTwentyDev && (
+            <LogoAddon className={IBMPlexMono.className}>
+              for Developers
+            </LogoAddon>
+          )}
+        </LogoContainer>
+        <HamburgerContainer>
+          <input type="checkbox" id="menu-input" onChange={toggleMenu} />
+          <HamburgerLine1 id="line1" />
+          <HamburgerLine2 id="line2" />
+        </HamburgerContainer>
+      </MobileNav>
+      <NavOpen
+        style={{
+          transform: `scaleY(${menuOpen ? '1' : '0'})`,
+        }}
+      >
+        <MobileLinkList>
+          <ListItem href="/story">Story</ListItem>
+          <ListItem href="/pricing">Pricing</ListItem>
+          <ListItem href="https://docs.twenty.com">
+            Docs <ExternalArrow />
+          </ListItem>
+          <ListItem href="https://github.com/twentyhq/twenty">
+            <GithubIcon color="rgb(71,71,71)" /> 8.3k <ExternalArrow />
+          </ListItem>
+        </MobileLinkList>
+        <CallToAction />
+      </NavOpen>
+    </MobileMenu>
+  );
+};
diff --git a/packages/twenty-website/src/app/_components/ui/layout/header/callToAction.tsx b/packages/twenty-website/src/app/_components/ui/layout/header/callToAction.tsx
new file mode 100644
index 000000000000..c61145e874c4
--- /dev/null
+++ b/packages/twenty-website/src/app/_components/ui/layout/header/callToAction.tsx
@@ -0,0 +1,16 @@
+import {
+  CallToActionContainer,
+  LinkNextToCTA,
+  StyledButton,
+} from '@/app/_components/ui/layout/header/styled';
+
+export const CallToAction = () => {
+  return (
+    <CallToActionContainer>
+      <LinkNextToCTA href="https://app.twenty.com">Sign in</LinkNextToCTA>
+      <a href="https://app.twenty.com">
+        <StyledButton>Get Started</StyledButton>
+      </a>
+    </CallToActionContainer>
+  );
+};
diff --git a/packages/twenty-website/src/app/_components/ui/layout/header/index.tsx b/packages/twenty-website/src/app/_components/ui/layout/header/index.tsx
new file mode 100644
index 000000000000..257c42071bda
--- /dev/null
+++ b/packages/twenty-website/src/app/_components/ui/layout/header/index.tsx
@@ -0,0 +1,13 @@
+'use client';
+
+import { HeaderDesktop } from '@/app/_components/ui/layout/header/HeaderDesktop';
+import { HeaderMobile } from '@/app/_components/ui/layout/header/HeaderMobile';
+
+export const AppHeader = () => {
+  return (
+    <>
+      <HeaderDesktop />
+      <HeaderMobile />
+    </>
+  );
+};
diff --git a/packages/twenty-website/src/app/_components/ui/layout/header/styled.ts b/packages/twenty-website/src/app/_components/ui/layout/header/styled.ts
new file mode 100644
index 000000000000..4b11cdb3767b
--- /dev/null
+++ b/packages/twenty-website/src/app/_components/ui/layout/header/styled.ts
@@ -0,0 +1,197 @@
+'use client';
+
+import styled from '@emotion/styled';
+
+import mq from '@/app/_components/ui/theme/mq';
+
+export const DesktopNav = styled.nav`
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  overflow: visible;
+  padding: 12px 16px 12px 16px;
+  position: relative;
+  transform-origin: 50% 50% 0px;
+  border-bottom: 1px solid rgba(20, 20, 20, 0.08);
+
+  @media (max-width: 809px) {
+    display: none;
+  }
+`;
+
+export const MobileNav = styled.nav`
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  overflow: visible;
+  padding: 0 12px;
+  position: relative;
+  transform-origin: 50% 50% 0px;
+  border-bottom: 1px solid rgba(20, 20, 20, 0.08);
+  height: 64px;
+  width: 100%;
+`;
+
+export const LinkList = styled.div`
+  display: flex;
+  flex-direction: row;
+  gap: 2px;
+  ${mq({
+    marginRight: ['auto', 'auto', '0'],
+  })}
+`;
+
+export const MobileLinkList = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+  align-items: center;
+`;
+
+export const ListItem = styled.a`
+  color: rgb(71, 71, 71);
+  text-decoration: none;
+  display: flex;
+  gap: 4px;
+  align-items: center;
+  border-radius: 8px;
+  height: 40px;
+  padding-left: 16px;
+  padding-right: 16px;
+  &:hover {
+    background-color: #f1f1f1;
+  }
+`;
+
+export const LogoContainer = styled.div`
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  ${mq({
+    width: ['auto', 'auto', '202px'],
+  })}
+`;
+
+export const LogoAddon = styled.div`
+  font-size: 12px;
+  font-style: normal;
+  font-weight: 500;
+  line-height: 150%;
+`;
+
+export const StyledButton = styled.div`
+  display: flex;
+  height: 40px;
+  padding-left: 16px;
+  padding-right: 16px;
+  align-items: center;
+  background-color: #000;
+  color: #fff;
+  border-radius: 8px;
+  font-weight: 500;
+  border: none;
+  outline: inherit;
+  cursor: pointer;
+`;
+
+export const CallToActionContainer = styled.div`
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  a {
+    text-decoration: none;
+  }
+`;
+
+export const LinkNextToCTA = styled.a`
+  display: flex;
+  align-items: center;
+  color: rgb(71, 71, 71);
+  padding: 0px 16px 0px 16px;
+  span {
+    text-decoration: underline;
+  }
+`;
+
+export const HamburgerContainer = styled.div`
+  height: 44px;
+  width: 44px;
+  position: relative;
+
+  input {
+    cursor: pointer;
+    height: 44px;
+    width: 44px;
+    opacity: 0;
+    z-index: 1;
+  }
+
+  #line1 {
+    transition: transform 0.5s;
+    transition-timing-function: ease-in-out;
+    z-index: 0;
+  }
+
+  #line2 {
+    transition: transform 0.5s;
+    transition-timing-function: ease-in-out;
+    z-index: 0;
+  }
+
+  #menu-input:checked ~ #line1 {
+    transform: rotate(45deg) translate(7px);
+  }
+
+  #menu-input:checked ~ #line2 {
+    transform: rotate(-45deg) translate(7px);
+  }
+`;
+
+export const HamburgerLine1 = styled.div`
+  height: 2px;
+  left: calc(50.00000000000002% - 20px / 2);
+  position: absolute;
+  top: calc(37.50000000000002% - 2px / 2);
+  width: 20px;
+  border-radius: 10px;
+  background-color: rgb(179, 179, 179);
+  z-index: 0;
+`;
+
+export const HamburgerLine2 = styled.div`
+  height: 2px;
+  left: calc(50.00000000000002% - 20px / 2);
+  position: absolute;
+  top: calc(62.50000000000002% - 2px / 2);
+  width: 20px;
+  border-radius: 10px;
+  background-color: rgb(179, 179, 179);
+  z-index: 0;
+`;
+
+export const NavOpen = styled.div`
+  flex-direction: column;
+  align-items: center;
+  position: fixed;
+  inset: 0px;
+  top: 63px;
+  background-color: #fff;
+  gap: 33px;
+  padding-top: 32px;
+  z-index: 100;
+  transition: transform 0.2s ease-in;
+  display: flex;
+  transform-origin: top;
+`;
+
+export const MobileMenu = styled.div`
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  @media (min-width: 810px) {
+    display: none;
+  }
+`;
diff --git a/packages/twenty-website/src/app/_components/user-guide/UserGuideSidebarSection.tsx b/packages/twenty-website/src/app/_components/user-guide/UserGuideSidebarSection.tsx
index 6bdc2724c602..8a5a0a70f2e5 100644
--- a/packages/twenty-website/src/app/_components/user-guide/UserGuideSidebarSection.tsx
+++ b/packages/twenty-website/src/app/_components/user-guide/UserGuideSidebarSection.tsx
@@ -2,8 +2,7 @@
 
 import { useState } from 'react';
 import styled from '@emotion/styled';
-import { useRouter } from 'next/navigation';
-import { usePathname } from 'next/navigation';
+import { usePathname, useRouter } from 'next/navigation';
 
 import { IconChevronDown, IconChevronRight } from '@/app/_components/ui/icons';
 import { Theme } from '@/app/_components/ui/theme/theme';
diff --git a/packages/twenty-website/src/app/_server-utils/get-posts.tsx b/packages/twenty-website/src/app/_server-utils/get-posts.tsx
index 135ad64fa2bd..e95f7b8ab273 100644
--- a/packages/twenty-website/src/app/_server-utils/get-posts.tsx
+++ b/packages/twenty-website/src/app/_server-utils/get-posts.tsx
@@ -29,7 +29,7 @@ export interface Directory {
 async function getFiles(
   filePath: string,
   basePath: string,
-  position: number = 0,
+  position = 0,
 ): Promise<Directory> {
   const entries = fs.readdirSync(filePath, { withFileTypes: true });
 
@@ -99,13 +99,14 @@ async function parseFrontMatterAndCategory(
   return parsedDirectory;
 }
 
-export async function compileMDXFile(filePath: string, addToc: boolean = true) {
+export async function compileMDXFile(filePath: string, addToc = true) {
   const fileContent = fs.readFileSync(filePath, 'utf8');
   const compiled = await compileMDX<{ title: string; position?: number }>({
     source: fileContent,
     options: {
       parseFrontmatter: true,
       mdxOptions: {
+        development: process.env.NODE_ENV === 'development',
         remarkPlugins: [gfm],
         rehypePlugins: [rehypeSlug, ...(addToc ? [toc] : [])],
       },
diff --git a/packages/twenty-website/src/app/contributors/[slug]/page.tsx b/packages/twenty-website/src/app/contributors/[slug]/page.tsx
index 1bcde3cbedf7..549333552abf 100644
--- a/packages/twenty-website/src/app/contributors/[slug]/page.tsx
+++ b/packages/twenty-website/src/app/contributors/[slug]/page.tsx
@@ -100,8 +100,7 @@ export default async function ({ params }: { params: { slug: string } }) {
     .sort((a, b) => new Date(a.day).getTime() - new Date(b.day).getTime());
 
   return (
-    <>
-      <Background />
+    <Background>
       <ContentContainer>
         <Breadcrumb active={contributor.id} />
         <ProfileCard
@@ -127,8 +126,8 @@ export default async function ({ params }: { params: { slug: string } }) {
             }[]
           }
         />
-        <ThankYou authorId={contributor.login} />
+        <ThankYou username={contributor.id} />
       </ContentContainer>
-    </>
+    </Background>
   );
 }
diff --git a/packages/twenty-website/src/app/contributors/api/fetch-issues-prs.tsx b/packages/twenty-website/src/app/contributors/api/fetch-issues-prs.tsx
index fbac2a072bcb..7ae588a7dd0e 100644
--- a/packages/twenty-website/src/app/contributors/api/fetch-issues-prs.tsx
+++ b/packages/twenty-website/src/app/contributors/api/fetch-issues-prs.tsx
@@ -9,7 +9,7 @@ import {
 export async function fetchIssuesPRs(
   query: typeof graphql,
   cursor: string | null = null,
-  isIssues: boolean = false,
+  isIssues = false,
   accumulatedData: Array<PullRequestNode | IssueNode> = [],
 ): Promise<Array<PullRequestNode | IssueNode>> {
   const { repository } = await query<Repository>(
diff --git a/packages/twenty-website/src/app/contributors/api/save-prs-to-db.tsx b/packages/twenty-website/src/app/contributors/api/save-prs-to-db.tsx
index 3cb93350ccc1..2f5d37f6cc32 100644
--- a/packages/twenty-website/src/app/contributors/api/save-prs-to-db.tsx
+++ b/packages/twenty-website/src/app/contributors/api/save-prs-to-db.tsx
@@ -15,6 +15,7 @@ export async function savePRsToDB(
     if (pr.author == null) {
       continue;
     }
+
     await insertMany(
       userModel,
       [
@@ -43,7 +44,7 @@ export async function savePRsToDB(
           authorId: pr.author.login,
         },
       ],
-      { onConflictKey: 'id' },
+      { onConflictKey: 'id', onConflictUpdateObject: { title: pr.title } },
     );
 
     for (const label of pr.labels.nodes) {
diff --git a/packages/twenty-website/src/app/contributors/api/search-issues-prs.tsx b/packages/twenty-website/src/app/contributors/api/search-issues-prs.tsx
index e06318aa31e6..cf6e150e173e 100644
--- a/packages/twenty-website/src/app/contributors/api/search-issues-prs.tsx
+++ b/packages/twenty-website/src/app/contributors/api/search-issues-prs.tsx
@@ -9,7 +9,7 @@ import {
 export async function searchIssuesPRs(
   query: typeof graphql,
   cursor: string | null = null,
-  isIssues: boolean = false,
+  isIssues = false,
   accumulatedData: Array<PullRequestNode | IssueNode> = [],
 ): Promise<Array<PullRequestNode | IssueNode>> {
   const { search } = await query<SearchIssuesPRsQuery>(
diff --git a/packages/twenty-website/src/app/contributors/page.tsx b/packages/twenty-website/src/app/contributors/page.tsx
index 4d00bdf59773..deb8803f4494 100644
--- a/packages/twenty-website/src/app/contributors/page.tsx
+++ b/packages/twenty-website/src/app/contributors/page.tsx
@@ -43,15 +43,12 @@ const Contributors = async () => {
     .filter((contributor) => contributor.pullRequestCount > 0);
 
   return (
-    <>
-      <Background />
+    <Background>
       <ContentContainer>
         <Header />
-        <div>
-          <AvatarGrid users={fitlerContributors as Contributor[]} />
-        </div>
+        <AvatarGrid users={fitlerContributors as Contributor[]} />
       </ContentContainer>
-    </>
+    </Background>
   );
 };
 
diff --git a/packages/twenty-website/src/app/contributors/utils/get-activity-end-date.tsx b/packages/twenty-website/src/app/contributors/utils/get-activity-end-date.tsx
new file mode 100644
index 000000000000..101d9b041f9d
--- /dev/null
+++ b/packages/twenty-website/src/app/contributors/utils/get-activity-end-date.tsx
@@ -0,0 +1,22 @@
+const TOTAL_DAYS_TO_FULL_WIDTH = 232;
+
+export const getActivityEndDate = (
+  activityDates: { value: number; day: string }[],
+) => {
+  const startDate = new Date(activityDates[0].day);
+  const endDate = new Date(activityDates[activityDates.length - 1].day);
+
+  const differenceInMilliseconds = endDate.getTime() - startDate.getTime();
+
+  const numberOfDays = Math.floor(
+    differenceInMilliseconds / (1000 * 60 * 60 * 24),
+  );
+
+  const daysToAdd = TOTAL_DAYS_TO_FULL_WIDTH - numberOfDays;
+
+  if (daysToAdd > 0) {
+    endDate.setDate(endDate.getDate() + daysToAdd);
+  }
+
+  return endDate;
+};
diff --git a/packages/twenty-website/src/app/layout.tsx b/packages/twenty-website/src/app/layout.tsx
index f98e00ebfb03..7ac3fe181f31 100644
--- a/packages/twenty-website/src/app/layout.tsx
+++ b/packages/twenty-website/src/app/layout.tsx
@@ -1,10 +1,9 @@
 import { Metadata } from 'next';
 import { Gabarito, Inter } from 'next/font/google';
 
-import { HeaderMobile } from '@/app/_components/ui/layout/HeaderMobile';
+import { AppHeader } from '@/app/_components/ui/layout/header';
 
 import { FooterDesktop } from './_components/ui/layout/FooterDesktop';
-import { HeaderDesktop } from './_components/ui/layout/HeaderDesktop';
 import EmotionRootStyleRegistry from './emotion-root-style-registry';
 
 import './layout.css';
@@ -40,11 +39,8 @@ export default function RootLayout({
     <html lang="en" className={`${gabarito.variable} ${inter.variable}`}>
       <body>
         <EmotionRootStyleRegistry>
-          <HeaderDesktop />
-          <div className="container">
-            <HeaderMobile />
-            {children}
-          </div>
+          <AppHeader />
+          <div className="container">{children}</div>
           <FooterDesktop />
         </EmotionRootStyleRegistry>
       </body>
diff --git a/packages/twenty-website/src/app/oss-friends/page.tsx b/packages/twenty-website/src/app/oss-friends/page.tsx
index 9b2f9b453743..ec8d930e9626 100644
--- a/packages/twenty-website/src/app/oss-friends/page.tsx
+++ b/packages/twenty-website/src/app/oss-friends/page.tsx
@@ -10,8 +10,7 @@ export default async function OssFriends() {
   const listJson = await ossList.json();
 
   return (
-    <>
-      <Background />
+    <Background>
       <ContentContainer>
         <Header />
         <CardContainer>
@@ -20,6 +19,6 @@ export default async function OssFriends() {
           ))}
         </CardContainer>
       </ContentContainer>
-    </>
+    </Background>
   );
 }
diff --git a/packages/twenty-website/src/app/releases/get-releases.tsx b/packages/twenty-website/src/app/releases/get-releases.tsx
index 5b215b043c70..584977bcb2bd 100644
--- a/packages/twenty-website/src/app/releases/get-releases.tsx
+++ b/packages/twenty-website/src/app/releases/get-releases.tsx
@@ -1,5 +1,9 @@
+import { JSXElementConstructor, ReactElement } from 'react';
 import fs from 'fs';
 import matter from 'gray-matter';
+import { compileMDX } from 'next-mdx-remote/rsc';
+import remarkBehead from 'remark-behead';
+import gfm from 'remark-gfm';
 
 import { ReleaseNote } from '@/app/releases/api/route';
 import { compareSemanticVersions } from '@/shared-utils/compareSemanticVersions';
@@ -45,3 +49,23 @@ export async function getReleases(baseUrl?: string): Promise<ReleaseNote[]> {
 
   return releasenotes;
 }
+
+export async function getMdxReleasesContent(
+  releases: ReleaseNote[],
+): Promise<ReactElement<any, string | JSXElementConstructor<any>>[]> {
+  const mdxSourcesPromises = releases.map(async (release) => {
+    const mdxSource = await compileMDX<{ title: string; position?: number }>({
+      source: release.content,
+      options: {
+        parseFrontmatter: true,
+        mdxOptions: {
+          development: process.env.NODE_ENV === 'development',
+          remarkPlugins: [gfm, [remarkBehead, { depth: 2 }]],
+        },
+      },
+    });
+    return mdxSource.content;
+  });
+
+  return await Promise.all(mdxSourcesPromises);
+}
diff --git a/packages/twenty-website/src/app/releases/page.tsx b/packages/twenty-website/src/app/releases/page.tsx
index b6e5dfdccbed..51eb7709a70f 100644
--- a/packages/twenty-website/src/app/releases/page.tsx
+++ b/packages/twenty-website/src/app/releases/page.tsx
@@ -5,7 +5,10 @@ import { Line } from '@/app/_components/releases/Line';
 import { Release } from '@/app/_components/releases/Release';
 import { Title } from '@/app/_components/releases/StyledTitle';
 import { ContentContainer } from '@/app/_components/ui/layout/ContentContainer';
-import { getReleases } from '@/app/releases/get-releases';
+import {
+  getMdxReleasesContent,
+  getReleases,
+} from '@/app/releases/get-releases';
 
 export const metadata: Metadata = {
   title: 'Twenty - Releases',
@@ -14,6 +17,7 @@ export const metadata: Metadata = {
 
 const Home = async () => {
   const releases = await getReleases();
+  const mdxReleasesContent = await getMdxReleasesContent(releases);
 
   return (
     <ContentContainer>
@@ -21,7 +25,10 @@ const Home = async () => {
 
       {releases.map((note, index) => (
         <React.Fragment key={note.slug}>
-          <Release release={note} />
+          <Release
+            release={note}
+            mdxReleaseContent={mdxReleasesContent[index]}
+          />
           {index != releases.length - 1 && <Line />}
         </React.Fragment>
       ))}
diff --git a/packages/twenty-website/src/content/releases/0.2.3.mdx b/packages/twenty-website/src/content/releases/0.2.3.mdx
new file mode 100644
index 000000000000..8b57478222b0
--- /dev/null
+++ b/packages/twenty-website/src/content/releases/0.2.3.mdx
@@ -0,0 +1,16 @@
+---
+release: 0.2.3
+Date: Jan 17th 2024
+---
+
+# Webhooks
+
+Developers can now use webhooks to synchronize customer data updates in real-time across applications.
+
+![Webhooks](/images/releases/0.2.3_webhooks.png)
+
+# Relations on Record Pages
+
+You can now navigate from one object to another directly from the record detail page.
+
+![Webhooks](/images/releases/0.2.3_relations.png)
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/releases/0.3.0.mdx b/packages/twenty-website/src/content/releases/0.3.0.mdx
new file mode 100644
index 000000000000..73102d71f414
--- /dev/null
+++ b/packages/twenty-website/src/content/releases/0.3.0.mdx
@@ -0,0 +1,10 @@
+---
+release: 0.3.0
+Date: Feb 3rd 2024
+---
+
+# Rating field
+
+The new Rating field represents a numeric value from zero to five, it can be useful for various use-cases such as scoring leads.
+
+![rating](/images/releases/0.3.0_rating.png)
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/releases/0.3.1.mdx b/packages/twenty-website/src/content/releases/0.3.1.mdx
new file mode 100644
index 000000000000..9bde47aae0b9
--- /dev/null
+++ b/packages/twenty-website/src/content/releases/0.3.1.mdx
@@ -0,0 +1,11 @@
+---
+release: 0.3.1
+Date: February 16th 2024
+---
+
+# Contributors page
+
+Contributors now have their very own [hall of fame](https://twenty.com/contributors).
+
+![rating](/images/releases/0.3.1_contributors.png)
+
diff --git a/packages/twenty-website/src/content/releases/0.3.2.mdx b/packages/twenty-website/src/content/releases/0.3.2.mdx
new file mode 100644
index 000000000000..3115bd4c84a6
--- /dev/null
+++ b/packages/twenty-website/src/content/releases/0.3.2.mdx
@@ -0,0 +1,10 @@
+---
+release: 0.3.2
+Date: Feb 29th 2024
+---
+
+# New record page
+
+The record page now features a clearer layout with increased space for content
+
+![](/images/releases/0.3.2_new_layout.png)
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/releases/0.3.3.mdx b/packages/twenty-website/src/content/releases/0.3.3.mdx
new file mode 100644
index 000000000000..704abcf8a4ec
--- /dev/null
+++ b/packages/twenty-website/src/content/releases/0.3.3.mdx
@@ -0,0 +1,23 @@
+---
+release: 0.3.3
+Date: Mar 19th 2024
+---
+
+# Gmail integration
+
+Connect your Gmail account to automatically associate emails with relevant 'People' and 'Companies'. Contacts you've emailed will be automatically added to 'People', excluding non-personal emails like support@ and team@. Control your privacy by selecting the information you share with your team.
+
+![](/images/releases/0.3.3_emails.png)
+
+
+# Kanbans on any object
+
+Create a Kanban view on any object and streamline processes like recruitment or onboarding.
+
+![](/images/releases/0.3.3_kanban.png)
+
+# Self-Onboarding
+
+We are pleased to reopen the cloud subscription to everyone. No more waiting!
+
+![](/images/releases/0.3.3_sign_up.png)
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/releases/0.4.0.mdx b/packages/twenty-website/src/content/releases/0.4.0.mdx
new file mode 100644
index 000000000000..831f96869c51
--- /dev/null
+++ b/packages/twenty-website/src/content/releases/0.4.0.mdx
@@ -0,0 +1,23 @@
+---
+release: 0.4.0
+Date: Apr 1st 2024
+---
+
+# Relation Fields on Record Page
+
+On record pages, you can now expand relation cards to view their fields without navigating to their individual record pages. For example, on a Company record page, you can expand an employee card to view their job title. This feature applies to all types of objects, including custom ones.
+
+![](/images/releases/0.4/0.4-expand-relation-card.png)
+
+
+# Address Field Type
+
+The new `Address Field` Type enables entry of a full address in one field, while structurally storing each address part - such as street name and number - in separate subfields.
+
+![](/images/releases/0.4/0.4-address-field-type.png)
+
+# Multi-Workspace
+
+You can now switch between workspaces by clicking your workspace name at the top left of the screen. This feature will only appear if you have been invited to join another workspace.
+
+![](/images/releases/0.4/0.4-multi-workspace.png)
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/releases/CompactView.mdx b/packages/twenty-website/src/content/releases/CompactView.mdx
deleted file mode 100644
index 24078f610a94..000000000000
--- a/packages/twenty-website/src/content/releases/CompactView.mdx
+++ /dev/null
@@ -1,11 +0,0 @@
----
-release: 0.3.2
-Date: May 6th 2024
----
-
-# Compact view
-
-
-Standard objects are in-built objects with a set of attributes available for all users. All workspaces come with three standard objects by default: People, Companies, and Opportunities. Standard objects have standard fields that are also available for all Twenty users, like Account Owner and URL.
-
-![](/images/user-guide/view-all-objects-light.png)
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/releases/Inbox.mdx b/packages/twenty-website/src/content/releases/Inbox.mdx
deleted file mode 100644
index 4a76b8cdb215..000000000000
--- a/packages/twenty-website/src/content/releases/Inbox.mdx
+++ /dev/null
@@ -1,10 +0,0 @@
----
-release: 0.4.3
-Date: February 24th 2024
----
-
-# Inbox
-
-
-
-An inbox gathering task in a CRM system is an automated process that collects and organizes various types of communications such as notes, emails, and notifications. Notes are often summaries or details related to customer interactions that can be recorded and tracked. This system also archives and prioritizes emails and notifications, making it easier to manage customer relationships and ensure all communication is accounted for and responded to in a timely manner.
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/_category_.json b/packages/twenty-website/src/content/user-guide/_category_.json
deleted file mode 100644
index 38e8529b6e79..000000000000
--- a/packages/twenty-website/src/content/user-guide/_category_.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "label": "User Guide",
-  "position": 3
-}
diff --git a/packages/twenty-website/src/content/user-guide/api-webhooks.mdx b/packages/twenty-website/src/content/user-guide/api-webhooks.mdx
new file mode 100644
index 000000000000..f4bd4052b458
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/api-webhooks.mdx
@@ -0,0 +1,85 @@
+---
+title: API and Wehooks
+info: Learn how to manage API keys and Webhooks in Twenty.
+icon: IconApi
+image: /images/user-guide/placeholder-header.png
+---
+
+## API Keys
+
+API keys allow automated access to your CRM data, synchronize data with other systems, and create custom integrations or solutions. 
+
+For example, you can use them to retrieve details of a specific `Person` or `Company` record, such as their name or address.
+
+## generate an API key
+
+1. Go to Settings in the sidebar on the left.
+2. Under Workspace, go to Developers. Here, you'll see a list of active keys that you or your team have created.
+3. To generate a new key, click on `+ Create key` at the top right. 
+4. Give your API key a name, an expiration date, and a logo.
+5. Hit save to see your API key. 
+6. Since the key is only visible once, make sure you store it somewhere safe. 
+
+<div class="warning">
+Since your API key gives access to sensitive information, you shouldn't share it with services you don't fully trust. If leaked, someone can use it maliciously. If your API key's security is compromised, immediately disable it and generate a new one.
+</div>
+
+<div style={{padding:'70.59% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/928786722?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+
+## Regenerating an API key
+
+To regenerate an API key, click on the key you want to regenerate. You'll then be able to see a button to regenerate the API key.
+
+# Webhooks
+
+Webhooks allow for immediate updates to your specified URL about changes or events related to your customer data.
+
+For instance, a webhook can alert your system in real-time when someone creates a new person record or updates an existing note.
+
+## Creating Webhooks
+
+1. From Settings -> Developers, click `+` Create webhook.
+2. Enter your URL.
+3. Click Save.
+
+<div style={{padding:'70.59% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/928786708?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+## Deleting Webhooks
+
+1. In Developers, find your webhook.
+2. Click on your webhook and press **Delete** to remove it. A confirmation popup will appear to confirm.
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/basics/_category_.json b/packages/twenty-website/src/content/user-guide/basics/_category_.json
deleted file mode 100644
index cd758c340a37..000000000000
--- a/packages/twenty-website/src/content/user-guide/basics/_category_.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "title": "Basics",
-  "position": 1
-}
diff --git a/packages/twenty-website/src/content/user-guide/basics/custom-objects.mdx b/packages/twenty-website/src/content/user-guide/basics/custom-objects.mdx
deleted file mode 100644
index 8e174121101f..000000000000
--- a/packages/twenty-website/src/content/user-guide/basics/custom-objects.mdx
+++ /dev/null
@@ -1,41 +0,0 @@
----
-title: Custom Objects
-position: 1
-icon: IconAugmentedReality
----
-
-
-Objects are structures that allow you to store data (records, attributes, and values) specific to an organization. Twenty provides both standard and custom objects.
-
-Standard objects are in-built objects with a set of attributes available for all users. All workspaces come with three standard objects by default: People, Companies, and Opportunities. Standard objects have standard fields that are also available for all Twenty users, like Account Owner and URL.
-
-Custom objects are objects that you can create to store information that is unique to your organization. They are not built-in; members of your workspace can create and customize custom objects to hold information that standard objects aren't suitable for. For example, if you're Airbnb, you may want to create a custom object for Listings or Reservations.    
-
-## Creating a new custom object 
-
-To create a new custom object:
-
-1. Go to Settings in the sidebar on the left.
-2. Under Workspace, go to Data model. Here you'll be able to see an overview of all your existing Standard and Custom objects (both active and disabled).
-<br/>
-
-
-<img src="/images/user-guide/view-all-objects-light.png" style={{width:'100%', maxWidth:'800px'}}/>
-
-<br/>
-
-3. Click on `+ New object` at the top, then choose Custom as the object type. Enter the name (both singular and plural), choose an icon, and add a description for your custom object and hit Save (at the top right). Using Listing as an example of custom object, the singular would be "listing" and the plural would be "listings" along with a description like "Listings that hosts created to showcase their property." 
-
-<br/>
-
-<div style={{textAlign: 'center'}}>
-    <img src="/images/user-guide/create-custom-object.gif" alt="Create custom object" />
-</div>
-
-<br/>
-
-4. Once you create your custom object, you'll be able to manage it. You can edit the name, icon and description, view the different fields, and add more fields.
-
-<div style={{textAlign: 'center'}}>
-    <img src="/images/user-guide/manage-custom-object.png" alt="Create custom object" />
-</div>
diff --git a/packages/twenty-website/src/content/user-guide/basics/notes.mdx b/packages/twenty-website/src/content/user-guide/basics/notes.mdx
deleted file mode 100644
index cfcc26c98c82..000000000000
--- a/packages/twenty-website/src/content/user-guide/basics/notes.mdx
+++ /dev/null
@@ -1,28 +0,0 @@
----
-title: Notes
-position: 1
-icon: IconNote
----
-
-
-Easily create a note to keep track of important information. 
-
-## Create Notes 
-
-To attach a note to the record, go to the <b>Notes</b> tab of a record page and click on `+ New Note`. You can also format, comment, and upload images to your notes.   
-
-<img src="/images/user-guide/create-new-note-light.png" style={{width:'100%', maxWidth:'800px'}}/>
-
-## Format Notes 
-
-You can format your notes right from the editor. Use markdown syntax, press the `/` key or click on the `+` icon on the editor to see the different block options, such as headings, tables, and lists. You can also attach images to your note. 
-
-Highlight the text to see more formatting options like bold, italics, and alignment options. 
-
-You can also change the background color and text color of each block to highlight important things in your note. To do so, hover over the block you want to format and click on the `⋮⋮` icon besides the `+` icon. Click on <b>Colors</b> to open up all color options for both the text and the background.  
-
-## Delete Notes
-
-To delete a note, open it and click on the trashcan icon on the upper right of the screen. This will permanently delete your note. 
-
-
diff --git a/packages/twenty-website/src/content/user-guide/basics/opportunities.mdx b/packages/twenty-website/src/content/user-guide/basics/opportunities.mdx
deleted file mode 100644
index 4c4ecab2c795..000000000000
--- a/packages/twenty-website/src/content/user-guide/basics/opportunities.mdx
+++ /dev/null
@@ -1,47 +0,0 @@
----
-title: Opportunities
-position: 1
-icon: IconTargetArrow
----
-
-All opportunities are presented in a Kanban board, where each column represents the stage of your workflow and each card represents a record. For each card, you can list the amount, close date, probability, and the point of contact. You can also move each card between stages as it goes through your workflow. 
-
-<img src="/images/user-guide/all-opportunities-light.png" style={{width:'100%', maxWidth:'800px'}}/>
-
-## Add and delete stages
-
-You can add as many stages as you'd like to perfectly capture your entire workflow. To add a new stage, click on <b>Options</b> on the top right, choose <b>Stages</b>, and then click on `+ Add stage`. Name your stage and hit `Enter` to create it. Click on the name of the stage and then on edit to change the stage's name and color.
-
-To delete a stage, click on the stage name or on the `⋮` icon that appears when you hover over a stage. Click on edit to open the menu and click on <b>Delete</b> at the bottom to permanently delete a stage. 
-
-## Filter, update, and sort views 
-
-It's easy to add filters and update your view to focus on only the most important things. To add a filter:
-- Click <b>Filter</b> on the top right of the opportunities board and select the field you want to filter by (Amount, Close date, Company, Creation Date, Person, Pipeline Step, and Point of Contact).
-- Select the filter's condition (is/is not, greater than/lesser than) and then choose the value of the field you want to filter by.
-- You can either create a new view or update your current view with the filter in place. 
-- You can also add another filter by following the same steps or clicking on the `+ Add filter` button on top of the columns. 
-- To remove a filter condition, simply click on the <b>X</b> next to the attribute you used to filter the records. 
-
-<img src="/images/user-guide/filter-opportunities-light.png" style={{width:'100%', maxWidth:'800px'}}/>
-
-<br/>
-
-You can also sort your records by Close date, Creation date, and Probability. To do so:
-- Click on <b>Sort</b> on the top right. 
-- Choose Ascending or Descending, and then the field you want to sort the records by. 
-- You can then update your view or create a new one with the sort filter in place. 
-
-## Display fields 
-
-You can configure your kanban board to display some fields and hide others. By default, the Amount, Close date, Probability, and Point of Contact are all visible. To hide a field, click on <b>Options</b> on the top right, then on <b>Fields</b> to bring up the list of options. Hover over the field you want to hide to bring up the `-` button. Click on it to hide the field.  
-
-You can also rearrange the order of fields by holding down the field name and dragging it to where you want it. 
-
-<img src="/images/user-guide/display-fields-light.png" style={{width:'100%', maxWidth:'800px'}}/>
-
-<br/>
-
-You can also hide all the fields, and get an overview of all the opportunities at a glance. To do so, click on <b>Options</b> on the top right and turn on the toggle in front of the <b>Compact view</b> option. 
-
-<img src="/images/user-guide/compact-opportunities-view-light.png"style={{width:'100%', maxWidth:'800px'}}/>
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/basics/tasks.mdx b/packages/twenty-website/src/content/user-guide/basics/tasks.mdx
deleted file mode 100644
index 86c1c5135292..000000000000
--- a/packages/twenty-website/src/content/user-guide/basics/tasks.mdx
+++ /dev/null
@@ -1,16 +0,0 @@
----
-title: Tasks
-position: 1
-icon: IconChecklist
----
-
-
-You can find all the tasks from across your workspace in the <b>Tasks</b> window in your sidebar. You can also find a dedicated tab for Tasks on each record so you can add and edit tasks directly from each record. Alternatively, you can click on the `+` button on the top right of each record page and then click on <b>Task</b> to create a new task. 
-
-<img src="/images/user-guide/create-new-task-light.png" style={{width:'100%', maxWidth:'800px'}}/>
-
-## Tasks page
-
-Switch between upcoming and completed tasks to get an overview of what's pending and what's already been done. 
-
-You can also see the tasks assigned to others by changing the assignee from the top right of the Tasks page, and edit each task to update the content, due dates, and assignee. You can also comment on each task. 
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/constants/UserGuideIndex.ts b/packages/twenty-website/src/content/user-guide/constants/UserGuideIndex.ts
index 8698de50cf5b..1a392ff16006 100644
--- a/packages/twenty-website/src/content/user-guide/constants/UserGuideIndex.ts
+++ b/packages/twenty-website/src/content/user-guide/constants/UserGuideIndex.ts
@@ -10,20 +10,26 @@ export type IndexHeading = {
 export const USER_GUIDE_INDEX = {
   'Getting Started': [
     { title: 'What is Twenty', url: 'what-is-twenty' },
-    { title: 'Create a Workspace', url: 'create-a-workspace' },
-    { title: 'Import your data', url: 'import-your-data' },
+    { title: 'Create a Workspace', url: 'create-workspace' },
   ],
   Objects: [
-    { title: 'People', url: 'people' },
-    { title: 'Companies', url: 'companies' },
-    { title: 'Opportunities', url: 'opportunities' },
-    { title: 'Custom Objects', url: 'custom-objects' },
-    { title: 'Remote Objects', url: 'remote-objects' },
+    { title: 'Objects', url: 'objects' },
+    { title: 'Fields', url: 'fields' },
+    { title: 'Views, Sort and Filter', url: 'views-sort-filter' },
+    { title: 'Table Views', url: 'table-views' },
+    { title: 'Kanban Views', url: 'kanban-views' },
+    { title: 'Import/Export Data', url: 'import-export-data' },
   ],
   Functions: [
-    { title: 'Email', url: 'email' },
-    { title: 'Calendar', url: 'calendar' },
+    { title: 'Emails', url: 'emails' },
     { title: 'Notes', url: 'notes' },
     { title: 'Tasks', url: 'tasks' },
+    { title: 'Integrations', url: 'integrations' },
+    { title: 'API and Webhooks', url: 'api-webhooks' },
+  ],
+  Other: [
+    { title: 'Glossary', url: 'glossary' },
+    { title: 'Tips', url: 'tips' },
+    { title: 'Github', url: 'github' },
   ],
 };
diff --git a/packages/twenty-website/src/content/user-guide/create-workspace.mdx b/packages/twenty-website/src/content/user-guide/create-workspace.mdx
new file mode 100644
index 000000000000..cbf85a07b443
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/create-workspace.mdx
@@ -0,0 +1,50 @@
+---
+title: Create a Workspace
+info: Follow a step-by-step guide on how to register on Twenty, choose a subscription plan, confirm your payment and set up your account, with additional advice on seeking assistance if needed.
+icon: IconNote
+image: /images/user-guide/placeholder-header.png
+---
+
+# Step 1: Registration
+1. Navigate to [Twenty Sign Up](https://app.twenty.com/sign-up).
+2. Select your preferred sign-up method:
+    - **Continue with Google** for Google account registration.
+    - Or, **Continue With Email** for email registration.
+
+<div style={{padding:'69.01% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927066829?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+# Step 2: Choosing A Subscription Plan
+Choose a subscription plan after completing the 7-day free trial. Twenty offers the most competitive pricing in the market.
+
+## Monthly Plan
+At $9 per seat per month, this plan offers absolute freedom to cancel at any time.
+
+## Annual Plan
+At $90 per seat per year, this plan provides an annual saving of $18 compared to the Monthly Plan.
+
+Both plans give full access to all Twenty features, including unlimited contacts, email integration, custom objects, API & Webhooks, and frequent updates.
+
+<img src="/images/user-guide/create-workspace/choose-plan.png" style={{width:'100%'}}/>
+
+# Step 3: Payment Confirmation & Account Setup
+Post payment approval via Stripe, you're directed to create your workspace and user profile. Remember that you can cancel your subscription anytime.
+
+# Support
+For queries or help, connect with the dedicated support team at [contact@twenty.com](mailto:contact@twenty.com) or send a message on [Discord](https://discord.gg/cx5n4Jzs57)
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/emails.mdx b/packages/twenty-website/src/content/user-guide/emails.mdx
new file mode 100644
index 000000000000..b9383443c03d
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/emails.mdx
@@ -0,0 +1,50 @@
+---
+title: Emails
+info: Understand the concept of email synchronization in Twenty, including how to read synced emails, connect new mailboxes, and set sharing levels.
+icon: IconChecklist
+image: /images/user-guide/emails/emails_header.png
+---
+
+# Email Synchronization
+
+The system links emails from known contacts directly to their CRM records, keeping all communication up to date. It's important to avoid syncing emails from impersonal addresses such as team@ and support@, or from personal email providers like Gmail or Outlook, to ensure privacy and relevance.
+
+## Reading an Email
+
+Go to a specific `Person` or `Company` record page, then select the `Emails` tab to view synced emails instantly. Click on an email to open it.
+
+<img src="/images/user-guide/emails/show-inbox.png" style={{width:'100%'}}/>
+
+You can customize how you share and manage your emails through the settings. 
+
+# Mailbox Settings
+
+## Connecting a New Mailbox
+
+To connect a Gmail mailbox, go to `Settings` > `Accounts`, then click the `Add account` button. You can add several mailboxes to your account.
+
+After connecting a mailbox, visit the `Emails` tab and select the desired mailbox to customize its settings.
+
+The initial import may take some time, and it will be followed by automatic updates every ten minutes.
+
+<img src="/images/user-guide/emails/connect-account.png" style={{width:'100%'}}/>
+
+## Sharing Levels
+
+From here, you can choose different levels of sharing for outbound and inbound emails:
+
+-  **Metadata Only**: Share only the basic information of the email (sender, recipient, date, and time).
+-  **Subject and Metadata**: Share the subject line of the email along with the metadata.
+-  **All Email Content**: Share the entire content of the email, including attachments.
+
+<img src="/images/user-guide/emails/privacy-settings.png" style={{width:'100%'}}/>
+
+## Contacts Auto-Creation
+
+Contact auto-creation is a handy built-in feature. This default feature automatically adds email contacts not already in your CRM, boosting your contact list without any extra effort on your part. To manage this feature, go to `Settings` > `Email`. You can toggle it on or off. Remember, turning it off means that all new email contacts must be manually entered into the CRM.
+
+<img src="/images/user-guide/emails/auto-creation.png" style={{width:'100%'}}/>
+
+## Upcoming Features
+
+Soon, you will have the capability to send emails, view attachments, and request access to email content that you're not allowed to read.
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/fields.mdx b/packages/twenty-website/src/content/user-guide/fields.mdx
new file mode 100644
index 000000000000..293f65d0ec87
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/fields.mdx
@@ -0,0 +1,86 @@
+---
+title: Fields   
+info: Understand the role of fields and how to handle them.
+icon: IconChecklist
+image: /images/user-guide/placeholder-header.png
+---
+
+
+# About Fields
+
+Fields in an object are akin to the column names in an Excel spreadsheet, indicating the type of data stored — such as text, numbers, or dates — under specific names. These fields can be standard (created by default) or custom (user-created).
+
+## Standard Fields
+
+The platform includes Standard Fields by default as predefined fields designed to meet common, universal requirements in business modeling.
+
+As an example, "First Name" and "Last Name" are standard fields within the `people object`. They're text fields, meant to capture and store the respective names of individuals. 
+
+As essential parts of the data model, you can't delete them, but only deactivate them.
+
+<img src="/images/user-guide/fields/standard-fields.png" style={{width:'100%'}}/>
+
+## Custom Fields
+
+A `Custom Field` is a user-defined attribute you can add to a standard or custom object to store specific information that's not captured by the default fields. These fields can carry different types of data such as text, number, date, Select values, etc. Custom fields allow you to tailor your database to the unique needs of your business.
+
+For instance, a custom field for SpaceX could be "Rocket Active Status", indicating if a rocket is operational.
+
+<img src="/images/user-guide/fields/custom-fields.png"style={{width:'100%'}}/>
+
+# Create a Custom Field
+
+To add a custom field to any object, follow these steps:
+	1.	Go to `Settings` in the left sidebar.
+	2.	Go to `Data Model`, then select the object you wish to customize
+	3.	Proceed by clicking on `Add Field`.
+	4.	Choose a field name and type that suits your requirements. Consider adding a field description for better understanding.
+
+Your newly created field is now available within the application's fields. To display it on a specific view, click on the options menu, then select "Fields".
+
+<div style={{padding:'71.15% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927628219?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+For creating `Custom Fields` in a more expeditious manner, make use of the **+** button located in the top right of the chosen object table, and then select the Customize fields option. This pathway affords you rapid access to the Data Model Settings page.
+
+<img src="/images/user-guide/fields/quick-new-field.png" style={{width:'100%'}}/>
+
+# Deactivate a field
+
+You can deactivate a field in the app to stop it from functioning without disrupting your data model. Deactivation is like a soft deletion, making the field unavailable for use in the app.
+
+Here's how you can do it:
+
+1. Locate the field you wish to deactivate. You'll find these under various object sections.
+
+2. To the right of the line, three vertically aligned dots symbolize a menu button. Click on this to unveil a dropdown list of options.
+
+3. In the dropdown menu, find and click on the "deactivate" option.
+
+<img src="/images/user-guide/fields/deactivate-field.png" style={{width:'100%'}}/>
+
+And, voila! You've deactivated a field. But what does this imply for your CRM operations?
+
+1. **In-App Functionality:** A deactivated field will no longer be functional within the app. You won't be able to assign values to these fields anymore.
+
+2. **Relation Fields:** If the deactivated field happens to be a relation field, the system doesn't delete the existing relation. It does prevent you from assigning or linking records to each other via this field in the app, moving forward.
+
+3. **API:** You can still use deactivated Fields and their data through the API.
+
+You can reactivate Standard and Custom Fields or have the option to permanently delete them.
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/github.mdx b/packages/twenty-website/src/content/user-guide/github.mdx
new file mode 100644
index 000000000000..5ef92f07d518
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/github.mdx
@@ -0,0 +1,54 @@
+---
+title: GitHub
+info: Learn about the Twenty GitHub repository and the variety of resources it hosts including source code, documentation, and discussions.
+icon: IconGitHub
+image: /images/user-guide/github/github-header.png
+---
+
+# About
+
+The Twenty GitHub repository hosts a vast array of resources like source code, documentation, discussions, and issue tracking. This is where you will be able to access the full code behind Twenty.
+
+[Visit Twenty on Github](https://github.com/twentyhq/twenty)
+
+# Contributing
+
+Contributing to the Twenty project on GitHub is a rewarding way to help improve the software you use. Whether you're fixing bugs, suggesting features, or improving documentation, your contributions are welcome.
+
+## Reporting Issues
+
+Encounter an issue? [Create an issue](https://github.com/twentyhq/twenty/issues/new) on GitHub, providing as much detail as possible.
+
+<img src="/images/user-guide/github/new-issue.png" style={{width:'100%'}}/>
+
+## Suggesting Features
+
+What improvements would you like to see on Twenty? No matter your technical know-how, you can join [the conversation here](https://github.com/twentyhq/twenty/discussions).
+
+<img src="/images/user-guide/github/github-conversations.png" style={{width:'100%'}}/>
+
+## Coding a feature
+
+Start your journey by finding beginner-friendly tasks:
+
+1. Navigate to the **[Issues](https://github.com/twentyhq/twenty/issues)** tab on the Twenty repository.
+2. Filter by **[Good First Issue](https://github.com/twentyhq/twenty/labels/good%20first%20issue)** label to find tasks suited for newcomers.
+3. Pick an issue, fork the repository, and start contributing.
+
+<img src="/images/user-guide/github/good-first-issues.png" style={{width:'100%'}}/>
+
+Ensure you're assigned to the issue to avoid overlapping work with other contributors.
+
+## Code of Conduct
+
+Remember to adhere to Twenty's [Code of Conduct](https://github.com/twentyhq/twenty/blob/main/.github/CODE_OF_CONDUCT.md) throughout your contribution process.
+
+# Discord
+
+If you have any question, for example on how to contribute, join the community on [Discord](https://discord.gg/cx5n4Jzs57)
+
+<img src="/images/user-guide/github/discord-welcome.png" style={{width:'100%'}}/>
+
+<br/>
+<br/>
+Thank you for contributing to Twenty ❤️
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/glossary.mdx b/packages/twenty-website/src/content/user-guide/glossary.mdx
new file mode 100644
index 000000000000..2dee898157d2
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/glossary.mdx
@@ -0,0 +1,43 @@
+---
+title: Glossary
+info: Get familiar with essential terminology used in Twenty.
+icon: IconVocabulary
+image: /images/user-guide/placeholder-header.png
+---
+
+# Company & People
+The CRM has two fundamental types of records:
+- A `Company` represents a business or organization.
+- `People` represent your company's current and prospective customers or clients.
+
+# Kanban
+A `Kanban` is a way to track a business process. Pipelines are present within a *module* and have *stages*:
+- A **module** has the logic for a certain business process (for example: sales, recruiting).
+- **Stages** map the steps in your process (for example: new, ongoing, won, lost).
+
+# Views 
+You can customize the display of your records using views, setting different filters and sorting options for each view.
+
+# Workspace
+A `Workspace` typically represents a company using Twenty. It holds all the records and data that you and your team members add to Twenty.   
+It has a single domain name, which is typically the domain name your company uses for employee email addresses.
+
+Sure, here is the glossary in the requested markdown format:
+
+# Field 
+A field refers to a specific area where particular data is stored for an entity.
+
+# Record 
+A Record indicates an instance of an object, like a specific account or contact.
+
+# Tasks 
+Tasks in Twenty CRM are assigned activities relating to contacts, accounts, or opportunities.
+
+# Opportunities 
+Opportunities in Twenty CRM are potential deals or sales with accounts or contacts.
+
+# Integration 
+Integration are built-in tools that allow to link Twenty with other software or systems.
+
+# User Profile
+A User Profile is the information and settings specific to a workspace member in Twenty.
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/home.mdx b/packages/twenty-website/src/content/user-guide/home.mdx
deleted file mode 100644
index 4f6d0865db41..000000000000
--- a/packages/twenty-website/src/content/user-guide/home.mdx
+++ /dev/null
@@ -1,54 +0,0 @@
----
-title: Get started
-position: 0
-icon: IconUsers
-info: This is homepage
----
-
-The purpose of this user guide is to help you learn how you can use Twenty to build the CRM you want. 
-
-## Quick Search 
-
-You'll see a search bar at the top of your sidebar. You can also bring up the command bar with the `cmd`/`ctrl` + `k` shortcut to navigate through your workspace, and find people, companies, notes, and more. 
-
-The command bar also supports other shortcuts for navigation.  
-
-## Create Pre-filtered Views 
-
-Twenty allows you to add filters to see data that meets certain criteria and hides the rest. You can apply multiple filters at once.
-
-To create a filter in your workspace, click Filter at the top right and select the attribute you'd like to filter your records by. Create your filter and then save changes in a new view by clicking `+ Create view`. 
-
-The filtered view is now available to your whole team.
-
-## Add Stages For Opportunities
-
-You can also add more stages to the opportunities board. 
-
-On the <b>Opportunities</b> page, click on <b>Options</b>, <b>Stages</b>, then `+ Add Stage`.
-
-You can also edit the stage by clicking on the name. 
-
-## Create Notes and Tasks For Each Record
-
-You can attach notes and tasks to each record. With Notes, you can keep a record of any observations, comments, and interactions, and keep track of all items that require action with Tasks. 
-
-There are multiple ways to create notes and tasks. Learn more about [Notes](./basics/notes.mdx) and [Tasks](./basics/tasks.mdx). 
-
-## Upload Files For Each Record 
-
-You can also upload and attach files for each record. To do so, expand a record, and head over to the <b>Files</b> tab. You'll then see the `+ Add file` button. 
-
-<img src="/images/user-guide/attach-files-to-records-light.png" style={{width:'100%', maxWidth:'800px'}}/>
-
-## Add Records To Favorites
-
-You can add records to your favorites for quick access. To do so, expand the record you want to add, and click on the heart icon on the top right. You'll now be able to see your favorite records in your sidebar right above your workspace. 
-
-<img src="/images/user-guide/view-favorite-records-light.png" style={{width:'100%', maxWidth:'800px'}}/>
-
-## Import data
-
-You can easily import People and Companies data into Twenty from other apps using a .csv, .xslx, or .xsl file. In the <b>Companies</b> or <b>People</b> page, click on <b>Options</b> and then on <b>Import</b>. 
-
-Upload your file, match the columns, and validate the data to import it. 
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/import-export-data.mdx b/packages/twenty-website/src/content/user-guide/import-export-data.mdx
new file mode 100644
index 000000000000..218221adc749
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/import-export-data.mdx
@@ -0,0 +1,43 @@
+---
+title: Import/Export Data
+info: Learn the procedures for importing and exporting data.
+icon: IconNote
+image: /images/user-guide/placeholder-header.png
+---
+
+# Import data
+
+You can import People and Companies data into Twenty from other apps using a .csv, .xslx, or .xsl file. In the <b>Companies</b> or <b>People</b> page, click on <b>Options</b> and then on <b>Import</b>. 
+
+Upload your file, match the columns, check your data and import it.
+
+<img src="/images/user-guide/import-export-data/match-columns.png" style={{width:'100%'}}/>
+
+# Export data
+
+To export data from an object:
+
+1. Visit the object index.
+2. Choose the view for data export.
+3. Access the `Options` menu.
+4. Click on `Export`.
+5. Select the save location for the CSV data. Note that exporting may take time with a large record count.
+
+<div style={{padding:'71.24% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/926226303?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/integrations.mdx b/packages/twenty-website/src/content/user-guide/integrations.mdx
new file mode 100644
index 000000000000..8d953fa59ea0
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/integrations.mdx
@@ -0,0 +1,43 @@
+---
+title: Integrations
+info: Learn how to connect Twenty to your other tools.
+icon: IconBrandZapier
+image: /images/user-guide/placeholder-header.png
+---
+
+# About
+
+Integration with Zapier and Windmill is available for automating your workflows.
+
+# Zapier
+
+Sync Twenty with 3000+ apps using [Zapier](https://zapier.com/apps/twenty/integrations), and automate your work. Here's how you can connect Twenty to Zapier:
+
+1. Go to Zapier and log in. 
+2. Click on `+ Create Zap` in the left sidebar. 
+3. Choose the application you want to set as the trigger. A trigger refers to an event that starts the automation. 
+4. Select Twenty as the action. An action is the event performed whenever an application triggers an automation. [Learn more about triggers and actions in Zapier.](https://zapier.com/how-it-works)
+5. Once you choose the Twenty account that you want to use for your automation, you'll have to allow Zapier to access it by adding an API key. You can learn [how to generate your API key here.](/user-guide/api-webhooks)
+
+6. Enter your API key and click on 'Yes, Continue to Twenty.'
+
+<div style={{padding:'69.01% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927913866?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+You can now continue creating your automation!
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/integrations/_category_.json b/packages/twenty-website/src/content/user-guide/integrations/_category_.json
deleted file mode 100644
index 4309ef82a4e3..000000000000
--- a/packages/twenty-website/src/content/user-guide/integrations/_category_.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "title": "Integrations",
-  "position": 2
-}
diff --git a/packages/twenty-website/src/content/user-guide/integrations/connect-zapier.mdx b/packages/twenty-website/src/content/user-guide/integrations/connect-zapier.mdx
deleted file mode 100644
index 139224fb41dd..000000000000
--- a/packages/twenty-website/src/content/user-guide/integrations/connect-zapier.mdx
+++ /dev/null
@@ -1,25 +0,0 @@
----
-title: Connect Zapier
-position: 3
-icon: IconBrandZapier
----
-
-<div class="warning">
-Twenty integration is currently being registered in the public Zapier repository, you may not find it until the publishing process is complete.
-</div>
-
-
-Sync Twenty with 3000+ apps using [Zapier](https://zapier.com/), and automate your work. Here's how you can connect Twenty to Zapier:
-
-1. Go to Zapier and log in. 
-2. Click on `+ Create Zap` in the left sidebar. 
-3. Choose the application you want to set as the trigger. A trigger refers to an event that starts the automation. 
-4. Select Twenty as the action. An action is the event performed whenever an application triggers an automation. [Learn more about triggers and actions in Zapier.](https://zapier.com/how-it-works)
-5. Once you choose the Twenty account that you want to use for your automation, you'll have to authorize it by adding an API key. You can learn [how to generate your API key here.](user-guide/integrations/generating-api-keys.mdx)
-6. Enter your API key and click on 'Yes, Continue to Twenty.'
-
-<div style={{textAlign: 'center'}}>
-    <img src="/images/user-guide/connect-zapier.png" alt="Connect Twenty to Zapier" style={{width:'100%', maxWidth:'800px'}}/>
-</div>
-
-You can now continue creating your automation!
diff --git a/packages/twenty-website/src/content/user-guide/integrations/generating-api-keys.mdx b/packages/twenty-website/src/content/user-guide/integrations/generating-api-keys.mdx
deleted file mode 100644
index efd5dd3bc747..000000000000
--- a/packages/twenty-website/src/content/user-guide/integrations/generating-api-keys.mdx
+++ /dev/null
@@ -1,23 +0,0 @@
----
-title: API Keys
-position: 2
-icon: IconApi
----
-
-To generate an API key: 
-
-1. Go to Settings in the sidebar on the left.
-2. Under Workspace, go to Developers. Here, you'll see a list of active keys that you or your team have created.
-3. To generate a new key, click on `+ Create key` on the top right. 
-4. Give your API key a name, an expiration date, and a logo.
-5. Hit save to see your API key. 
-6. Since the key is only visible once, make sure you store it somewhere safe. 
-
-<div class="warning">
-Since your API key contains sensitive information, you shouldn't share it with services you don't fully trust. If leaked, someone can use it maliciously. If you think your API key is no longer secure, make sure you disable it and generate a new one.  
-</div>
-
-
-## Regenerating API key
-
-To regenerate an API key, click on the key you want to regenerate. You'll then be able to see a button to regenerate the API key. 
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/kanban-views.mdx b/packages/twenty-website/src/content/user-guide/kanban-views.mdx
new file mode 100644
index 000000000000..def112d9b963
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/kanban-views.mdx
@@ -0,0 +1,80 @@
+---
+title: Kanban Views
+info: Learn how to customize and navigate Kanban Views.
+icon: IconTargetArrow
+image: /images/user-guide/placeholder-header.png
+---
+
+# About Kanban Views
+
+Kanban views visually map out process flows, where each column stands for a distinct stage and each card represents a record.
+
+# Move Cards between Stages
+
+ You can move each card between stages as it goes through your workflow by dragging and dropping. To proceed, hold your click on a card and move it to the next stage.
+
+<div style={{padding:'69.01% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927888627?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+# Add and delete stages
+
+You can tailor your workflow to suit your needs using stages, which represent a value in a Select Field:
+
+## Add Stages
+
+To add a stage, access the Select Field Settings by navigating to Settings > Data Model, selecting your object, and then the field your Kanban board depends on.
+
+<div style={{padding:'69.01% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927890428?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+## Remove Stages
+
+To remove a stage, hover the stage name or the `⋮` icon, click `Edit from settings` in the Select Field settings, and then click <b>Delete</b> next to the relevant stage.
+
+<img src="/images/user-guide/kanban-views/edit-stage.png" style={{width:'100%'}}/>
+
+# Display fields 
+
+You can configure your Kanban board to display some fields and hide others. To hide a field, click on <b>Options</b> on the top right, then on <b>Fields</b> to bring up the list of options. Hover the field you want to hide to bring up the `-` button. Click on it to hide the field.  
+
+You can also rearrange the order of fields by holding down the field name and dragging it to where you want it.
+
+<img src="/images/user-guide/kanban-views/filter.png" style={{width:'100%'}}/>
+
+# Compact View
+
+You can also hide all the fields, and get an overview of all the opportunities at a glance. To do so, click on <b>Options</b> on the top right and turn on the toggle in front of the <b>Compact view</b> option. 
+
+<img src="/images/user-guide/kanban-views/compact-view.png"style={{width:'100%'}}/>
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/notes.mdx b/packages/twenty-website/src/content/user-guide/notes.mdx
new file mode 100644
index 000000000000..12d8ba9571b6
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/notes.mdx
@@ -0,0 +1,67 @@
+---
+title: Notes
+info: Explore how to efficiently manage notes within record pages in Twenty, including procedures for creating, formatting, commenting, saving, and deleting notes.
+icon: IconNote
+image: /images/user-guide/notes/notes_header.png
+---
+
+Manage your record-linked notes efficiently using the powerful **Notes** feature. This guide walks through how to create, format, comment, and delete notes seamlessly within record pages. 
+
+# Creating Notes
+
+Creating notes in the system is intuitive and dynamic. You can either:
+
+- Use the search function by pressing `cmd/ctrl + k`, then select 'Create note' from the list of quick actions.
+- Go to a `Record page` and select `+` at the top right of the page, or go to the Notes tab and press the `New Note` button.
+
+<img src="/images/user-guide/notes/add-note.png"style={{width:'100%'}}/>
+
+
+## Adding Content
+
+Start typing directly or press '/' to add elements like headings, files, or images instantly.
+
+## Format Content
+
+You can format your notes right from the editor. Use markdown syntax, press the `/` key or click on the `+` icon on the editor to see the different block options, such as headings, tables, and lists. You can also attach images to your note. 
+
+Highlight the text to see more formatting options like bold, italics, and alignment options. 
+
+You can also change the background color and text color of each block to highlight important things in your note. To do so, hover over the block you want to format and click on the `⋮⋮` icon besides the `+` icon. Click on <b>Colors</b> to open up all color options for both the text and the background.
+
+<div style={{padding:'69.01% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927896302?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+# Viewing Notes
+
+The system displays all your notes linked to a specific record under the Notes section on the corresponding `Record page`.
+
+# Commenting
+**Comments**: Work together effectively with your team members by adding comments on notes for updates, feedback, or discussions.
+
+# Saving And Deleting
+
+All edits and additions to the note are automatically saved. 
+
+To delete a note:
+
+1. Open the note you wish to remove by clicking on it from within the `Record page`.
+2. Click the trashcan icon located in the top right corner of the screen.
+
+Please be aware that deleting a note is permanent and can't be undone.
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/objects.mdx b/packages/twenty-website/src/content/user-guide/objects.mdx
new file mode 100644
index 000000000000..1c34d1010875
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/objects.mdx
@@ -0,0 +1,82 @@
+---
+title: Objects
+info: Discover how to use standard and custom objects in your workspace.
+icon: IconChecklist
+image: /images/user-guide/placeholder-header.png
+---
+
+# Standard Objects
+
+Standard objects are predefined entities in your workspace that offer integrated, standardized intelligence requiring no extra configuration. They're part of a shared data model accessible to all users of Twenty.
+
+<img src="/images/user-guide/objects/standard-objects.png"style={{width:'100%'}}/>
+
+## People
+
+The `People` object aggregates customer relations data. It includes contact details and interaction history, providing a comprehensive view of your business's customer interactions.
+
+## Company
+
+The `Companies` object consolidates business account information. It encompasses all pertinent data such as industry, size, location, and contact personnel, thereby offering an integrated perspective of your business's organizational connections. It is both link to the People and Opportunities objects.
+
+## Opportunities
+
+The `Opportunities` object encapsulates deal-related data. It tracks the progression of potential sales, from prospecting to closure, recording stages, deal sizes, associated accounts, and expected closure dates. This provides a well-rounded view of your business's sales pipeline. 
+
+# Custom objects
+
+Custom objects are objects that you can create to store information that's unique to your organization. They're not built-in; members of your workspace can create and customize custom objects to hold information that standard objects aren't suitable for. For example, if you're SpaceX, you may want to create a custom object for Rockets and Launches.
+
+<img src="/images/user-guide/objects/custom-objects.png"style={{width:'100%'}}/>
+
+## Creating a new custom object 
+
+To create a new custom object:
+
+1. Go to Settings in the sidebar on the left.
+2. Under Workspace, go to Data model. Here you'll be able to see an overview of all your existing Standard and Custom objects (both active and disabled).
+
+
+<div style={{padding:'71.24% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/926288174?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+3. Click on `+ New object` at the top, then choose Custom as the object type. Enter the name (both singular and plural), choose an icon, and add a description for your custom object and hit Save (at the top right). Using Listing as an example of custom object, the singular would be "listing" and the plural would be "listings" along with a description like "Listings that hosts created to showcase their property."
+
+<div style={{padding:'71.24% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/926293493?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+4. Once you create your custom object, you'll be able to manage it. You can edit the name, icon and description, view the different fields, and add more fields.
+
+<img src="/images/user-guide/objects/customize-fields.png"style={{width:'100%'}}/>
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/others/_category_.json b/packages/twenty-website/src/content/user-guide/others/_category_.json
deleted file mode 100644
index 66620be53c53..000000000000
--- a/packages/twenty-website/src/content/user-guide/others/_category_.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "title": "Others",
-  "position": 3
-}
diff --git a/packages/twenty-website/src/content/user-guide/others/glossary.mdx b/packages/twenty-website/src/content/user-guide/others/glossary.mdx
deleted file mode 100644
index b6eac3456269..000000000000
--- a/packages/twenty-website/src/content/user-guide/others/glossary.mdx
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: Glossary
-position: 3
-icon: IconVocabulary
----
-
-### Company & People
-The CRM has two fundamental types of records:
-- A `Company` represents a business or organization.
-- `People` represent your company's current and prospective customers or clients.
-
-### Pipelines
-A `Pipeline` is a way to track a business process. Pipelines are present within a *module* and have *stages*:
-- A **module** contains the logic for a certain business process (for example: sales, recruiting).
-- **Stages** map the steps in your process (for example: new, ongoing, won, lost).
-
-### Views 
-With views, you can customize how your records are displayed. You can have different filters and sort settings for each view. 
-
-### Workspace
-A `Workspace` typically represents a company using Twenty. It holds all the records and data that you and your team members add to Twenty.   
-It has a single domain name, which is typically the domain name your company uses for employee email addresses.
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/others/tips.mdx b/packages/twenty-website/src/content/user-guide/others/tips.mdx
deleted file mode 100644
index 17004ae069a9..000000000000
--- a/packages/twenty-website/src/content/user-guide/others/tips.mdx
+++ /dev/null
@@ -1,38 +0,0 @@
----
-title: Tips 
-sidebar_position: 1
-icon: IconInfoCircle
----
-
-## Update workspace name & logo
-
-Workspace admins can edit its name and logo in settings. 
-
-- From the sidebar, go to <b>Settings</b>. 
-- Under <b>Workspace</b>, go to <b>General</b>.
-- Edit the name and logo. Your changes will be saved automatically. 
-
-## Enable dark mode 
-
-Not a fan of light mode? Easily switch to dark mode with these steps:
-
-- From the sidebar, go to <b>Settings</b>. 
-- Under <b>User</b>, go to <b>Appearance</b>.
-- Select <b>Dark</b>. Your changes will be saved automatically. 
-
-## Account settings 
-
-Configure your user account and set your preferences. 
-
-- From the sidebar, go to <b>Settings</b>. 
-- Under <b>User</b>, go to <b>Profile</b> to edit your name and profile picture. You can upload PNGs, GIFs, and JPEGs.
-- Manage your accounts and configure your email and calendar settings in <b>Accounts</b>. 
-- Your changes will be saved automatically. 
-
-## Invite & manage members
-
-Admins can easily invite new members any time. 
-
-- From the sidebar, go to <b>Settings</b>. 
-- Under <b>Workspace</b>, go to <b>Members</b>.
-- Use the invite link to add more members to your workspace or simply delete existing ones. 
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/table-views.mdx b/packages/twenty-website/src/content/user-guide/table-views.mdx
new file mode 100644
index 000000000000..d3ac632caf3f
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/table-views.mdx
@@ -0,0 +1,70 @@
+---
+title: Table Views
+info: Learn how to customize and navigate Table Views.
+icon: IconChecklist
+image: /images/user-guide/placeholder-header.png
+---
+
+# About Table Views
+
+Table views are visual representations of data structured in rows and columns.
+
+# Create record
+
+Add records as needed, without limits. To add a record, you can either click on the **+** button at the top right of the screen or at the top of the record **Name** column. 
+
+Enter the record name then press `Enter` to save. To edit a record name, click on its name on its detail page.
+
+<div style={{padding:'69.01% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927071691?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+
+# Delete record
+
+**Index View:** To delete a record, select the checkbox next to the record and click the delete button below.
+
+**Record Page:** Tap the **3 dots menu** in the top right corner, then select delete.
+
+
+<div style={{padding:'69.01% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927073570?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+# Add a Custom Field
+
+To create a custom field, click the **+** button at the right end of the table columns and select **Customize fields**. 
+
+<img src="/images/user-guide/fields/quick-new-field.png" style={{width:'100%'}}/>
+
+You can also do it by navigating to **Settings** > **Data Model** > **People**. Click on **Add Field**. Choose a field name and type. The new field will be available in the app.
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/tasks.mdx b/packages/twenty-website/src/content/user-guide/tasks.mdx
new file mode 100644
index 000000000000..11a52d456571
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/tasks.mdx
@@ -0,0 +1,112 @@
+---
+title: Tasks
+info: Understand how to effectively manage tasks in Twenty, including tasks creation, viewing, editing, marking as complete, and deletion.
+image: /images/user-guide/tasks/tasks_header.png
+---
+
+Manage all tasks within your workspace using the **Tasks** feature. This guide will show you how to create and manage tasks, switch between upcoming and completed tasks, edit task details, and much more.
+
+# Creating Tasks
+
+Creating tasks in Twenty is seamless. You can either:
+
+-  Go to the `Tasks`tab and press the `+` button at the top right of the page.
+-  Use the search function by pressing `cmd/ctrl + k`, then select 'Create task' from the list of quick actions.
+-  Go to a `Record page` and press `+`at the top right of the page, or go to the Task tab and press the `Add Task`button. 
+
+<div style={{padding:'70.59% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/928786754?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+## Adding Task Content
+
+Once you've created a task you can enrich it with rich content, such as Titles, Bullet points or even images. To do so, press "/" and enter the desired command.
+
+# Viewing Tasks
+
+The **Tasks** page displays all your tasks across your workspace. Here you can:
+
+- Filter tasks assigned to a specific user by clicking the button with your name at the top right of the screen.
+- Toggle between upcoming (`To do`) and completed (`Done`) tasks to see what needs attention and what you have accomplished.
+
+You can also see tasks for a given Record on its `Record page`.
+
+<div style={{padding:'69.01% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927908280?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+# Editing Tasks
+
+To edit a task, you should click on its card. This will open a side panel offering the following features:
+
+-  **Assignee and Due date**: Update the assignee or edit the due date.
+-  **Comments**: Work together with your team members by adding comments on tasks to give updates or feedback.
+-  **Automations**: Thanks to the API and Webhooks, you can also automate task creation triggered by specific activities in your workspace.
+
+# Marking Tasks as Complete
+
+To mark a task as complete:
+
+1. Locate the task on your `Tasks` page or within a `Record page`.
+2. Click on the circle at the left of the task card - it will change to signify completion.
+3. The task status will automatically update to `Done`.
+
+This procedure will help keep an updated record of your accomplishments. 
+
+<div style={{padding:'69.01% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927910083?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+# Delete a task
+
+To permanently remove a task:
+
+1. Open the task you want to delete by clicking on its card, either from the `Tasks` page or within a `Record page`.
+2. Click the trash icon located at the top right corner of the task details panel.
+
+Please note, deleting a task is permanent and can't be undone. Consider marking tasks as `Done` if there is a chance you will need to refer to them again.
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/tips.mdx b/packages/twenty-website/src/content/user-guide/tips.mdx
new file mode 100644
index 000000000000..754cc0de244a
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/tips.mdx
@@ -0,0 +1,89 @@
+---
+title: Tips 
+info: Discover tips and tricks for optimizing your experience, including user and workspace management, personalization settings, and navigation enhancements.
+icon: IconInfoCircle
+image: /images/user-guide/placeholder-header.png
+---
+
+# Update workspace name & logo
+
+Workspace admins can edit its name and logo in settings. 
+
+- From the sidebar, go to <b>Settings</b>. 
+- Under <b>Workspace</b>, go to <b>General</b>.
+- Edit the name and logo. The system will automatically save your changes.
+
+<div style={{padding:'69.01% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927915481?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+# Enable dark mode 
+
+Not a fan of light mode? Switch to dark mode with these steps:
+
+- From the sidebar, go to <b>Settings</b>. 
+- Under <b>User</b>, go to <b>Appearance</b>.
+Select **Dark**. The system will automatically save your changes.
+
+<div style={{padding:'69.01% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927916570?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+# Account settings 
+
+Configure your user account and set your preferences. 
+
+- From the sidebar, go to <b>Settings</b>. 
+- Under <b>User</b>, go to <b>Profile</b> to edit your name and profile picture. You can upload PNGs, GIFs, and JPEGs.
+- Manage your accounts and configure your email and calendar settings in <b>Accounts</b>. 
+- The system will automatically save your changes.
+
+# Invite & manage members
+
+Admins can invite new members any time. 
+
+- From the sidebar, go to <b>Settings</b>. 
+- Under <b>Workspace</b>, go to <b>Members</b>.
+- Use the invite link to add more members to your workspace or delete existing ones.
+
+# Quick Search 
+
+You'll see a search bar at the top of your sidebar. You can also bring up the command bar with the `cmd/ctrl + k` shortcut to navigate through your workspace, and find people, companies, notes, and more. 
+
+The command bar also supports shortcuts for navigation.  
+
+# Add Records To Favorites
+
+You can add records to your favorites for quick access. To do so, expand the record you want to add, and click on the heart icon on the top right. You'll now be able to see your favorite records in your sidebar right above your workspace. 
+
+<img src="/images/user-guide/tips/favorites.png" style={{width:'100%', maxWidth:'800px'}}/>
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/views-sort-filter.mdx b/packages/twenty-website/src/content/user-guide/views-sort-filter.mdx
new file mode 100644
index 000000000000..200be0832f6f
--- /dev/null
+++ b/packages/twenty-website/src/content/user-guide/views-sort-filter.mdx
@@ -0,0 +1,176 @@
+---
+title: Views, Sort and Filter
+info: Find out how to create, manage and delete Object Views.
+icon: IconChecklist
+image: /images/user-guide/placeholder-header.png
+---
+# About Views
+
+You can see your records in different ways by creating views. In a view, you can apply filters and sorts to organize your content efficiently. For instance, on the `People` object, you can create a view to isolate US contacts by filtering those with a US phone number.
+
+## Default View
+
+Each object comes with an unfiltered, unsorted, and undeletable view known as the Default view. It's named after the object's plural name, such as "All Companies," "All People," "All Opportunities".
+
+<img src="/images/user-guide/views/default-view.png" style={{width:'100%'}}/>
+
+# Creating, Editing and Deleting Views
+
+You can create several custom views and share them with your team.
+
+## Creating a View
+
+There is two ways to create a new view. Either directly from the `View Switcher`, either filtering and sorting an existing view.
+
+### From View Switcher
+
+1. Open the View Switcher
+2. Click the `Add View` button at the bottom of the view switcher menu.
+3. Choose an Icon and name for your View.
+4. Choose a "View type" between Table and Kanban. 
+5. (Kanban Views only) For your Kanban view, select the Select field you wish to use as the column header. The system prompts you to create one from the Settings before enabling Kanban view creation, if your object lacks a `Select field`.
+6. Click "Create" to generate your new view.
+
+The newly created view opens automatically.
+
+<div style={{padding:'69.01% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927639721?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+### From Sorting and Filtering
+
+When you change the `Sorting` and `Filtering` of an existing view, a `Save as new view` button will appear at the right edge of the `View Bar`. This will opens the New View menu mentionned above, allowing you to create a new view out of an existing one.
+
+<div style={{padding:'69.01% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927643495?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+## Editing and Deleting a View
+
+To Edit or Delete a view:
+1. Open the View Switcher
+2. Hover the View you wish to edit
+3. Click the `Pen Icon Button` that appears on the right
+
+You will then be able to modify the view. To delete it, press the `Delete` button that just appeard.
+
+
+<div style={{padding:'69.01% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927645774?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+# Navigating Between Views
+
+To switch between views, simply open the view switcher and click the view you wish to open.
+
+# Customizing Views
+
+Each view can be customized to streamline your business processes. Views help segment your data. You can customize views using filters, sorts, and field display.
+
+## Filtering a View
+
+To filter a view:
+
+-  Click **Filter** > select a field (for example: Name, Company in the People Object).
+-  Choose a condition, select a value, and apply the filter.
+-  Add more filters with `+ Add filter` or remove them with **X**.
+
+
+<div style={{padding:'71.24% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/926282262?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+## Sorting a View
+
+Order your fields data in ascending or descending order:
+- Select **Sort**, choose a field, and define the sort order you desire.
+- You can apply and arrange several sorts as needed.
+<div style={{padding:'69.01% 0 0 0', position:'relative'}}>
+  <iframe 
+    src="https://player.vimeo.com/video/927885588?autoplay=1&loop=1&autopause=0&background=1&amp;app_id=58479" 
+    frameborder="0" 
+    allow="autoplay; fullscreen; picture-in-picture; clipboard-write" 
+    style={{
+      position:'absolute',
+      top:0,
+      left:0,
+      width:'100%',
+      height:'100%',
+      borderRadius: '16px', 
+      border:'2px solid black'
+    }}
+    title="Export data"
+  ></iframe>
+</div>
+<script src="https://player.vimeo.com/api/player.js"></script>
+
+
+## Field display
+
+You can customize which fields to display within a view. To hide a field, click **Options** > **Fields** and select the `-` button next to the field or click on the field column header and select **hide**.
+
+You can rearrange fields by clicking their field column header and then press **Move Right** or **Move Left**.
+
+## Opening Record
+
+To open a record, click on the name in the first column. This action will open the corresponding Record page.
\ No newline at end of file
diff --git a/packages/twenty-website/src/content/user-guide/what-is-twenty.mdx b/packages/twenty-website/src/content/user-guide/what-is-twenty.mdx
index 022dda1e5bb1..aec38739e0c1 100644
--- a/packages/twenty-website/src/content/user-guide/what-is-twenty.mdx
+++ b/packages/twenty-website/src/content/user-guide/what-is-twenty.mdx
@@ -1,57 +1,59 @@
 ---
 title: What is Twenty
-position: 0
 icon: IconUsers
-info: A brief on Twenty's commitment to reshaping CRM with Open Source
-image: /images/user-guide/home/what-is-twenty.png
+info: Discover Twenty, an open-source CRM, its features, benefits, system requirements, and how to get involved.
+image: /images/user-guide/what-is-twenty/20.png
 ---
 
-## What is Twenty
+# Overview
 
-The purpose of this user guide is to help you learn how you can use Twenty to build the CRM you want. 
+Twenty is the leading open-source CRM, crafted by hundreds of contributors to suit your unique business needs.
 
-## Quick Search 
+## Main Features
 
-You'll see a search bar at the top of your sidebar. You can also bring up the command bar with the `cmd`/`ctrl` + `k` shortcut to navigate through your workspace, and find people, companies, notes, and more. 
+* **Contact Management:** Efficiently store and manage customer data. [Learn more](/user-guide/objects).
+* **Custom Objects:** Create and customize objects to fit your business needs. [Details](/user-guide/objects).
+* **Custom Fields:** Tailor data fields to capture and organize information specific to your operations. [Understand more](/user-guide/fields).
+* **Kanban & Table Views:** Optimize your workflow with flexible [Table Views](/user-guide/table-views) and [Kanban Views](/user-guide/kanban-views).
+* **Pipeline Visualization:** Get a clear view of your processes with customizable views. [Explore views](/user-guide/views-sort-and-filter).
+* **Email Integration:** View the emails of a specific customer or company within your workspace. [Integrate now](/user-guide/emails).
+* **Notes:** Create detailed notes for each record to share knowledge more effectively. [Add notes](/user-guide/notes).
+* **Tasks:** Schedule tasks to track customer interactions. [See how](/user-guide/tasks).
+* **API & Webhooks:** Connect to other apps and automate workflows with API and Webhooks. [Start integrating](/user-guide/integrations).
 
-The command bar also supports other shortcuts for navigation.  
+## Benefits
 
-## Create Pre-filtered Views 
+* Customizable: Designed to fit your business needs.
+* Community-driven: Built and maintained by a large open-source community.
+* Cost-effective: You'll never be vendor-locked because can always self-host.
 
-Twenty allows you to add filters to see data that meets certain criteria and hides the rest. You can apply multiple filters at once.
+## System Requirements
 
-To create a filter in your workspace, click Filter at the top right and select the attribute you'd like to filter your records by. Create your filter and then save changes in a new view by clicking `+ Create view`. 
+* Modern web browser (Firefox, Chrome, Safari and Edge on their latest version are supported).
+* Internet connection (Offline mode isn't yet supported).
 
-The filtered view is now available to your whole team.
+# Demo
 
-## Add Stages For Opportunities
+If you wish to try Twenty before creating your own account, go to demo.twenty.com and login with the following credentials:
 
-You can also add more stages to the opportunities board. 
+```
+email: noah@demo.dev
+password: Applecar2025
+```
 
-On the <b>Opportunities</b> page, click on <b>Options</b>, <b>Stages</b>, then `+ Add Stage`.
+# Vision
+Creating a good CRM is hard because it's a balancing act.
+For each business, the requirements seem straightforward, yet everyone's needs are distinct.
+The result is a CRM that's either too basic, or one that's attempting to be a jack-of-all-trades but ending up as a master of none.
 
-You can also edit the stage by clicking on the name. 
+At first, Twenty looks like most CRMs you already know: you can track deals, organize contacts, manage tasks and notes.
+But what sets it apart is our approach to extensibility. We are building an open platform that provides the building blocks for you to solve your unique business problems.
 
-## Create Notes and Tasks For Each Record
+We prioritize universal principles and common patterns over feature lists. 
+We don't try to have all the answers and instead empower users to find what works best for them.
+And Open-source is the bedrock of our approach, ensuring that Twenty evolves with its community, for its community.
 
-You can attach notes and tasks to each record. With Notes, you can keep a record of any observations, comments, and interactions, and keep track of all items that require action with Tasks. 
+# Join now
 
-There are multiple ways to create notes and tasks. Learn more about [Notes](./basics/notes.mdx) and [Tasks](./basics/tasks.mdx). 
+[Register here](https://app.twenty.com) or [become a contributor on GitHub](https://github.com/twentyhq/twenty).
 
-## Upload Files For Each Record 
-
-You can also upload and attach files for each record. To do so, expand a record, and head over to the <b>Files</b> tab. You'll then see the `+ Add file` button. 
-
-<img src="/images/user-guide/attach-files-to-records-light.png" style={{width:'100%', maxWidth:'800px'}}/>
-
-## Add Records To Favorites
-
-You can add records to your favorites for quick access. To do so, expand the record you want to add, and click on the heart icon on the top right. You'll now be able to see your favorite records in your sidebar right above your workspace. 
-
-<img src="/images/user-guide/view-favorite-records-light.png" style={{width:'100%', maxWidth:'800px'}}/>
-
-## Import data
-
-You can easily import People and Companies data into Twenty from other apps using a .csv, .xslx, or .xsl file. In the <b>Companies</b> or <b>People</b> page, click on <b>Options</b> and then on <b>Import</b>. 
-
-Upload your file, match the columns, and validate the data to import it. 
\ No newline at end of file
diff --git a/packages/twenty-website/src/database/database.ts b/packages/twenty-website/src/database/database.ts
index 49fdfe075a2e..91cc0abd8afe 100644
--- a/packages/twenty-website/src/database/database.ts
+++ b/packages/twenty-website/src/database/database.ts
@@ -76,10 +76,25 @@ const findAll = (model: SQLiteTableWithColumns<any>) => {
 const insertMany = async (
   model: SQLiteTableWithColumns<any>,
   data: any,
-  options?: { onConflictKey?: string },
+  options?: {
+    onConflictKey?: string;
+    onConflictUpdateObject?: any;
+  },
 ) => {
   if (isSqliteDriver) {
     const query = sqliteDb.insert(model).values(data);
+
+    if (options?.onConflictUpdateObject) {
+      if (options?.onConflictKey) {
+        return query
+          .onConflictDoUpdate({
+            target: [model[options.onConflictKey]],
+            set: options.onConflictUpdateObject,
+          })
+          .execute();
+      }
+    }
+
     if (options?.onConflictKey) {
       return query
         .onConflictDoNothing({
@@ -87,10 +102,23 @@ const insertMany = async (
         })
         .execute();
     }
+
     return query.execute();
   }
   if (isPgDriver) {
     const query = pgDb.insert(model).values(data);
+
+    if (options?.onConflictUpdateObject) {
+      if (options?.onConflictKey) {
+        return query
+          .onConflictDoUpdate({
+            target: [model[options.onConflictKey]],
+            set: options.onConflictUpdateObject,
+          })
+          .execute();
+      }
+    }
+
     if (options?.onConflictKey) {
       return query
         .onConflictDoNothing({
diff --git a/packages/twenty-website/src/database/postgres/schema-postgres.ts b/packages/twenty-website/src/database/postgres/schema-postgres.ts
index 44ef1b48a5bc..bb5f429f64d2 100644
--- a/packages/twenty-website/src/database/postgres/schema-postgres.ts
+++ b/packages/twenty-website/src/database/postgres/schema-postgres.ts
@@ -9,7 +9,7 @@ export const pgUsers = pgTable('users', {
 
 export const pgPullRequests = pgTable('pullRequests', {
   id: text('id').primaryKey(),
-  name: text('title'),
+  title: text('title'),
   body: text('body'),
   url: text('url'),
   createdAt: text('createdAt'),
diff --git a/packages/twenty-website/src/database/sqlite/schema-sqlite.ts b/packages/twenty-website/src/database/sqlite/schema-sqlite.ts
index 21c424831f72..60ca22b358a9 100644
--- a/packages/twenty-website/src/database/sqlite/schema-sqlite.ts
+++ b/packages/twenty-website/src/database/sqlite/schema-sqlite.ts
@@ -9,7 +9,7 @@ export const sqlLiteUsers = sqliteTable('users', {
 
 export const sqlLitePullRequests = sqliteTable('pullRequests', {
   id: text('id').primaryKey(),
-  name: text('title'),
+  title: text('title'),
   body: text('body'),
   url: text('url'),
   createdAt: text('createdAt'),
diff --git a/packages/twenty-zapier/src/utils/computeInputFields.ts b/packages/twenty-zapier/src/utils/computeInputFields.ts
index ca80a8fb5d39..7b8afbc58bbc 100644
--- a/packages/twenty-zapier/src/utils/computeInputFields.ts
+++ b/packages/twenty-zapier/src/utils/computeInputFields.ts
@@ -18,6 +18,8 @@ const getTypeFromFieldMetadataType = (
       return 'string';
     case FieldMetadataType.DATE_TIME:
       return 'datetime';
+    case FieldMetadataType.DATE:
+      return 'date';
     case FieldMetadataType.BOOLEAN:
       return 'boolean';
     case FieldMetadataType.NUMBER:
@@ -89,6 +91,57 @@ const get_subfieldsFromField = (nodeField: NodeField): NodeField[] => {
       };
       return [amountMicros, currencyCode];
     }
+    case FieldMetadataType.ADDRESS: {
+      const address1: NodeField = {
+        type: 'TEXT',
+        name: 'addressStreet1',
+        label: 'Address',
+        description: 'Address',
+        isNullable: true,
+        defaultValue: null,
+      };
+      const address2: NodeField = {
+        type: 'TEXT',
+        name: 'addressStreet2',
+        label: 'Address 2',
+        description: 'Address 2',
+        isNullable: true,
+        defaultValue: null,
+      };
+      const city: NodeField = {
+        type: 'TEXT',
+        name: 'addressCity',
+        label: 'City',
+        description: 'City',
+        isNullable: true,
+        defaultValue: null,
+      };
+      const state: NodeField = {
+        type: 'TEXT',
+        name: 'addressState',
+        label: 'State',
+        description: 'State',
+        isNullable: true,
+        defaultValue: null,
+      };
+      const postalCode: NodeField = {
+        type: 'TEXT',
+        name: 'addressPostalCode',
+        label: 'Postal Code',
+        description: 'Postal Code',
+        isNullable: true,
+        defaultValue: null,
+      };
+      const country: NodeField = {
+        type: 'TEXT',
+        name: 'addressCountry',
+        label: 'Country',
+        description: 'Country',
+        isNullable: true,
+        defaultValue: null,
+      };
+      return [address1, address2, city, state, postalCode, country];
+    }
     default:
       throw new Error(`Unknown nodeField type: ${nodeField.type}`);
   }
@@ -109,6 +162,7 @@ export const computeInputFields = (
       case FieldMetadataType.FULL_NAME:
       case FieldMetadataType.LINK:
       case FieldMetadataType.CURRENCY:
+      case FieldMetadataType.ADDRESS:
         for (const subNodeField of get_subfieldsFromField(nodeField)) {
           const field = {
             key: `${nodeField.name}__${subNodeField.name}`,
@@ -125,6 +179,7 @@ export const computeInputFields = (
       case FieldMetadataType.PHONE:
       case FieldMetadataType.EMAIL:
       case FieldMetadataType.DATE_TIME:
+      case FieldMetadataType.DATE:
       case FieldMetadataType.BOOLEAN:
       case FieldMetadataType.NUMBER:
       case FieldMetadataType.NUMERIC:
diff --git a/packages/twenty-zapier/src/utils/data.types.ts b/packages/twenty-zapier/src/utils/data.types.ts
index 540860c89f28..d7b38d4876c7 100644
--- a/packages/twenty-zapier/src/utils/data.types.ts
+++ b/packages/twenty-zapier/src/utils/data.types.ts
@@ -36,6 +36,7 @@ export enum FieldMetadataType {
   PHONE = 'PHONE',
   EMAIL = 'EMAIL',
   DATE_TIME = 'DATE_TIME',
+  DATE = 'DATE',
   BOOLEAN = 'BOOLEAN',
   NUMBER = 'NUMBER',
   NUMERIC = 'NUMERIC',
@@ -47,6 +48,7 @@ export enum FieldMetadataType {
   SELECT = 'SELECT',
   MULTI_SELECT = 'MULTI_SELECT',
   RELATION = 'RELATION',
+  ADDRESS = 'ADDRESS',
 }
 
 export type Schema = {
diff --git a/render.yaml b/render.yaml
index f67eb8391069..b0719ea46b63 100644
--- a/render.yaml
+++ b/render.yaml
@@ -32,6 +32,8 @@ services:
       generateValue: true
     - key: REFRESH_TOKEN_SECRET
       generateValue: true
+    - key: FILE_TOKEN_SECRET
+      generateValue: true
     - key: PG_DATABASE_HOST
       fromService:
         name: twenty_postgres
diff --git a/tools/eslint-rules/index.ts b/tools/eslint-rules/index.ts
index 6331e011587e..54ac86050bc7 100644
--- a/tools/eslint-rules/index.ts
+++ b/tools/eslint-rules/index.ts
@@ -6,6 +6,10 @@ import {
   rule as effectComponents,
   RULE_NAME as effectComponentsName,
 } from './rules/effect-components';
+import {
+  rule as explicitBooleanPredicatesInIf,
+  RULE_NAME as explicitBooleanPredicatesInIfName,
+} from './rules/explicit-boolean-predicates-in-if';
 import {
   rule as matchingStateVariable,
   RULE_NAME as matchingStateVariableName,
@@ -30,6 +34,15 @@ import {
   rule as styledComponentsPrefixedWithStyled,
   RULE_NAME as styledComponentsPrefixedWithStyledName,
 } from './rules/styled-components-prefixed-with-styled';
+import {
+  rule as useGetLoadableAndGetValueToGetAtoms,
+  RULE_NAME as useGetLoadableAndGetValueToGetAtomsName,
+} from './rules/use-getLoadable-and-getValue-to-get-atoms';
+import {
+  rule as useRecoilCallbackHasDependencyArray,
+  RULE_NAME as useRecoilCallbackHasDependencyArrayName,
+} from './rules/useRecoilCallback-has-dependency-array';
+
 /**
  * Import your custom workspace rules at the top of this file.
  *
@@ -64,6 +77,11 @@ module.exports = {
     [sortCssPropertiesAlphabeticallyName]: sortCssPropertiesAlphabetically,
     [styledComponentsPrefixedWithStyledName]:
       styledComponentsPrefixedWithStyled,
+    [explicitBooleanPredicatesInIfName]: explicitBooleanPredicatesInIf,
+    [useGetLoadableAndGetValueToGetAtomsName]:
+      useGetLoadableAndGetValueToGetAtoms,
     [maxConstsPerFileName]: maxConstsPerFile,
+    [useRecoilCallbackHasDependencyArrayName]:
+      useRecoilCallbackHasDependencyArray,
   },
 };
diff --git a/tools/eslint-rules/project.json b/tools/eslint-rules/project.json
index 6b8c09e84108..a9144b5374e6 100644
--- a/tools/eslint-rules/project.json
+++ b/tools/eslint-rules/project.json
@@ -5,24 +5,17 @@
   "targets": {
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": [
-        "{options.outputFile}"
-      ],
       "options": {
-        "lintFilePatterns": [
-          "tools/eslint-rules/**/*.ts"
-        ],
+        "lintFilePatterns": ["{projectRoot}/**/*.ts"],
         "fix": true
       }
     },
     "test": {
       "executor": "@nx/jest:jest",
-      "outputs": [
-        "{workspaceRoot}/coverage/{projectRoot}"
-      ],
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "tools/eslint-rules/jest.config.ts"
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/tools/eslint-rules/rules/explicit-boolean-predicates-in-if.ts b/tools/eslint-rules/rules/explicit-boolean-predicates-in-if.ts
new file mode 100644
index 000000000000..c8b156e3c9c8
--- /dev/null
+++ b/tools/eslint-rules/rules/explicit-boolean-predicates-in-if.ts
@@ -0,0 +1,43 @@
+import { ESLintUtils, TSESTree } from '@typescript-eslint/experimental-utils';
+
+export const RULE_NAME = 'explicit-boolean-predicates-in-if';
+
+export const rule = ESLintUtils.RuleCreator(() => __filename)({
+  name: RULE_NAME,
+  meta: {
+    type: 'suggestion',
+    docs: {
+      description: 'Enforce explicit boolean predicates in if statements',
+      recommended: 'warn',
+    },
+    fixable: 'code',
+    schema: [],
+    messages: {
+      nonExplicitPredicate:
+        'Use an explicit boolean predicate in if statements.',
+    },
+  },
+  defaultOptions: [],
+  create: (context) => {
+    const parserServices = ESLintUtils.getParserServices(context);
+    const typeChecker = parserServices.program.getTypeChecker();
+
+    return {
+      IfStatement: (node: TSESTree.IfStatement) => {
+        const tsNode = parserServices.esTreeNodeToTSNodeMap.get(node.test);
+        const type = typeChecker.getTypeAtLocation(tsNode);
+
+        if (typeChecker.typeToString(type) !== 'boolean') {
+          const { test } = node;
+
+          context.report({
+            node: test,
+            messageId: 'nonExplicitPredicate',
+          });
+        }
+      },
+    };
+  },
+});
+
+export default rule;
diff --git a/tools/eslint-rules/rules/use-getLoadable-and-getValue-to-get-atoms.spec.ts b/tools/eslint-rules/rules/use-getLoadable-and-getValue-to-get-atoms.spec.ts
new file mode 100644
index 000000000000..40772c3813a9
--- /dev/null
+++ b/tools/eslint-rules/rules/use-getLoadable-and-getValue-to-get-atoms.spec.ts
@@ -0,0 +1,52 @@
+import { TSESLint } from '@typescript-eslint/utils';
+
+import { rule, RULE_NAME } from './use-getLoadable-and-getValue-to-get-atoms';
+
+const ruleTester = new TSESLint.RuleTester({
+  parser: require.resolve('@typescript-eslint/parser'),
+  parserOptions: {
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
+});
+
+ruleTester.run(RULE_NAME, rule, {
+  valid: [
+    {
+      code: 'const atoms = snapshot.getLoadable(someState).getValue();',
+    },
+    {
+      code: 'const atoms = snapshot.getLoadable(someState(viewId)).getValue();',
+    },
+  ],
+  invalid: [
+    {
+      code: 'const atoms = await snapshot.getPromise(someState);',
+      errors: [
+        {
+          messageId: 'invalidAccessorOnSnapshot',
+        },
+      ],
+      output: 'const atoms = await snapshot.getLoadable(someState);',
+    },
+    {
+      code: 'const atoms = await snapshot.getPromise(someState(viewId));',
+      errors: [
+        {
+          messageId: 'invalidAccessorOnSnapshot',
+        },
+      ],
+      output: 'const atoms = await snapshot.getLoadable(someState(viewId));',
+    },
+    {
+      code: 'const atoms = snapshot.getLoadable(someState).anotherMethod();',
+      errors: [
+        {
+          messageId: 'invalidWayToGetAtoms',
+        },
+      ],
+      output: 'const atoms = snapshot.getLoadable(someState).getValue();',
+    },
+  ],
+});
diff --git a/tools/eslint-rules/rules/use-getLoadable-and-getValue-to-get-atoms.ts b/tools/eslint-rules/rules/use-getLoadable-and-getValue-to-get-atoms.ts
new file mode 100644
index 000000000000..c5dbc20f3766
--- /dev/null
+++ b/tools/eslint-rules/rules/use-getLoadable-and-getValue-to-get-atoms.ts
@@ -0,0 +1,88 @@
+import { ESLintUtils } from '@typescript-eslint/utils';
+
+// NOTE: The rule will be available in ESLint configs as "@nx/workspace-usage-getLoadable-and-getValue-to-get-atoms"
+export const RULE_NAME = 'use-getLoadable-and-getValue-to-get-atoms';
+
+export const rule = ESLintUtils.RuleCreator(() => __filename)({
+  name: RULE_NAME,
+  meta: {
+    type: 'problem',
+    docs: {
+      description: 'Ensure you are using getLoadable and getValue',
+      recommended: 'recommended',
+    },
+    fixable: 'code',
+    schema: [],
+    messages: {
+      redundantAwait: 'Redundant await on non-promise',
+      invalidAccessorOnSnapshot:
+        "Expected to use method 'getLoadable()' on 'snapshot' but instead found '{{ propertyName }}'",
+      invalidWayToGetAtoms:
+        "Expected to use method 'getValue()' with 'getLoadable()' but instead found '{{ propertyName }}'",
+    },
+  },
+  defaultOptions: [],
+  create: (context) => ({
+    AwaitExpression: (node) => {
+      const { argument, range }: any = node;
+      if (
+        (argument.callee?.object?.callee?.object?.name === 'snapshot' &&
+          argument?.callee?.object?.callee?.property?.name === 'getLoadable') ||
+        (argument.callee?.object?.name === 'snapshot' &&
+          argument?.callee?.property?.name === 'getLoadable')
+      ) {
+        // remove await
+        context.report({
+          node,
+          messageId: 'redundantAwait',
+          data: {
+            propertyName: argument.callee.property.name,
+          },
+          fix: (fixer) => fixer.removeRange([range[0], range[0] + 5]),
+        });
+      }
+    },
+    MemberExpression: (node) => {
+      const { object, property }: any = node;
+
+      if (
+        object.callee?.type === 'MemberExpression' &&
+        object.callee.object?.name === 'snapshot' &&
+        object.callee.property?.name === 'getLoadable'
+      ) {
+        const propertyName = property.name;
+
+        if (propertyName !== 'getValue') {
+          context.report({
+            node: property,
+            messageId: 'invalidWayToGetAtoms',
+            data: {
+              propertyName,
+            },
+            // replace the property with `getValue`
+            fix: (fixer) => fixer.replaceText(property, 'getValue'),
+          });
+        }
+      }
+    },
+    CallExpression: (node) => {
+      const { callee }: any = node;
+
+      if (
+        callee.type === 'MemberExpression' &&
+        callee.object?.name === 'snapshot' &&
+        callee.property?.name === 'getPromise'
+      ) {
+        context.report({
+          node: callee.property,
+          messageId: 'invalidAccessorOnSnapshot',
+          data: {
+            propertyName: callee.property.name,
+          },
+          // Replace `getPromise` with `getLoadable`
+          fix: (fixer) => fixer.replaceText(callee.property, 'getLoadable'),
+        });
+      }
+    },
+  }),
+});
diff --git a/tools/eslint-rules/rules/useRecoilCallback-has-dependency-array.spec.ts b/tools/eslint-rules/rules/useRecoilCallback-has-dependency-array.spec.ts
new file mode 100644
index 000000000000..a671cfc69c15
--- /dev/null
+++ b/tools/eslint-rules/rules/useRecoilCallback-has-dependency-array.spec.ts
@@ -0,0 +1,29 @@
+import { TSESLint } from '@typescript-eslint/utils';
+
+import { rule, RULE_NAME } from './useRecoilCallback-has-dependency-array';
+
+const ruleTester = new TSESLint.RuleTester({
+  parser: require.resolve('@typescript-eslint/parser'),
+});
+
+ruleTester.run(RULE_NAME, rule, {
+  valid: [
+    {
+      code: 'const someValue = useRecoilCallback(() => () => {}, []);',
+    },
+    {
+      code: 'const someValue = useRecoilCallback(() => () => {}, [dependency]);',
+    },
+  ],
+  invalid: [
+    {
+      code: 'const someValue = useRecoilCallback(({}) => () => {});',
+      errors: [
+        {
+          messageId: 'isNecessaryDependencyArray',
+        },
+      ],
+      output: 'const someValue = useRecoilCallback(({}) => () => {}, []);',
+    },
+  ],
+});
diff --git a/tools/eslint-rules/rules/useRecoilCallback-has-dependency-array.ts b/tools/eslint-rules/rules/useRecoilCallback-has-dependency-array.ts
new file mode 100644
index 000000000000..6585d130d405
--- /dev/null
+++ b/tools/eslint-rules/rules/useRecoilCallback-has-dependency-array.ts
@@ -0,0 +1,46 @@
+import { ESLintUtils } from '@typescript-eslint/utils';
+
+// NOTE: The rule will be available in ESLint configs as "@nx/workspace-useRecoilCallback-has-dependency-array"
+export const RULE_NAME = 'useRecoilCallback-has-dependency-array';
+
+export const rule = ESLintUtils.RuleCreator(() => __filename)({
+  name: RULE_NAME,
+  meta: {
+    type: 'problem',
+    docs: {
+      description: 'Ensure `useRecoilCallback` is used with a dependency array',
+      recommended: 'recommended',
+    },
+    schema: [],
+    messages: {
+      isNecessaryDependencyArray:
+        'Is necessary dependency array with useRecoilCallback',
+    },
+    fixable: 'code',
+  },
+  defaultOptions: [],
+  create: (context) => {
+    return {
+      CallExpression: (node) => {
+        const { callee } = node;
+        if (
+          callee.type === 'Identifier' &&
+          callee.name === 'useRecoilCallback'
+        ) {
+          const depsArg = node.arguments;
+          if (depsArg.length === 1) {
+            context.report({
+              node: callee,
+              messageId: 'isNecessaryDependencyArray',
+              data: {
+                callee,
+                deps: depsArg[0],
+              },
+              fix: (fixer) => fixer.insertTextAfter(depsArg[0], ', []'),
+            });
+          }
+        }
+      },
+    };
+  },
+});
diff --git a/tsconfig.base.json b/tsconfig.base.json
index d001922d05c8..7acdc5e09c5b 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -15,7 +15,8 @@
     "skipDefaultLibCheck": true,
     "baseUrl": ".",
     "paths": {
-      "twenty-emails": ["packages/twenty-emails/src/index.ts"]
+      "twenty-emails": ["packages/twenty-emails/src/index.ts"],
+      "twenty-ui": ["packages/twenty-ui/src/index.ts"]
     }
   },
   "exclude": ["node_modules", "tmp"]
diff --git a/yarn.lock b/yarn.lock
index 38f19702dc35..cc7ad961a7fa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1546,7 +1546,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.13.16, @babel/core@npm:^7.22.9":
+"@babel/core@npm:^7.13.16":
   version: 7.23.6
   resolution: "@babel/core@npm:7.23.6"
   dependencies:
@@ -1736,6 +1736,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-define-polyfill-provider@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.5.0"
+  dependencies:
+    "@babel/helper-compilation-targets": "npm:^7.22.6"
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    debug: "npm:^4.1.1"
+    lodash.debounce: "npm:^4.0.8"
+    resolve: "npm:^1.14.2"
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 2b053b96a0c604a7e0f5c7d13a8a55f4451d938f7af42bd40f62a87df15e6c87a0b1dbd893a0f0bb51077b54dc3ba00a58b166531a5940ad286ab685dd8979ec
+  languageName: node
+  linkType: hard
+
+"@babel/helper-define-polyfill-provider@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.6.0"
+  dependencies:
+    "@babel/helper-compilation-targets": "npm:^7.22.6"
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    debug: "npm:^4.1.1"
+    lodash.debounce: "npm:^4.0.8"
+    resolve: "npm:^1.14.2"
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: bf6af52fadbbebc5bf71166b91eac4fc21431ec9b0d2a94063f3a3d900ed44aa1384ad23e920a85e7a657fcf3e80edb2eaaac9d902bd1e632f3b50c836b45c53
+  languageName: node
+  linkType: hard
+
 "@babel/helper-environment-visitor@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-environment-visitor@npm:7.22.20"
@@ -1811,6 +1841,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-plugin-utils@npm:^7.24.0":
+  version: 7.24.0
+  resolution: "@babel/helper-plugin-utils@npm:7.24.0"
+  checksum: 90f41bd1b4dfe7226b1d33a4bb745844c5c63e400f9e4e8bf9103a7ceddd7d425d65333b564d9daba3cebd105985764d51b4bd4c95822b97c2e3ac1201a8a5da
+  languageName: node
+  linkType: hard
+
 "@babel/helper-remap-async-to-generator@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20"
@@ -1960,7 +1997,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.13.16, @babel/parser@npm:^7.21.4, @babel/parser@npm:^7.23.6":
+"@babel/parser@npm:^7.13.16, @babel/parser@npm:^7.23.6":
   version: 7.23.6
   resolution: "@babel/parser@npm:7.23.6"
   bin:
@@ -2948,6 +2985,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-runtime@npm:^7.23.2":
+  version: 7.24.0
+  resolution: "@babel/plugin-transform-runtime@npm:7.24.0"
+  dependencies:
+    "@babel/helper-module-imports": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.8"
+    babel-plugin-polyfill-corejs3: "npm:^0.9.0"
+    babel-plugin-polyfill-regenerator: "npm:^0.5.5"
+    semver: "npm:^6.3.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: a632e0c6f4b1be21955646ba4f6e4af323daaa6ab68ce39f92f5186d444402e920b33cabd40759c36f72d8c36f256a35ea03060e407ca69bcf373fdcb450aa42
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-shorthand-properties@npm:^7.0.0, @babel/plugin-transform-shorthand-properties@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-shorthand-properties@npm:7.23.3"
@@ -3502,9 +3555,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@blocknote/core@npm:^0.11.2":
-  version: 0.11.2
-  resolution: "@blocknote/core@npm:0.11.2"
+"@blocknote/core@npm:^0.12.1":
+  version: 0.12.1
+  resolution: "@blocknote/core@npm:0.12.1"
   dependencies:
     "@tiptap/core": "npm:^2.0.3"
     "@tiptap/extension-bold": "npm:^2.0.3"
@@ -3545,23 +3598,21 @@ __metadata:
     y-prosemirror: "npm:1.2.1"
     y-protocols: "npm:^1.0.5"
     yjs: "npm:^13.6.1"
-  checksum: a9a5affe263481bf46b556ded4b5dd583f24e0b090d536550eb2484f7d091e76258d8a865171459fbf3be114abee638e406d419d0d32f07aa5a82c638d00fcb3
+  checksum: 3b00572a2d98964722b7bcd75f8399856c3fcdcbc88e7217e883d7f6eba13fa36aeea8dde439335c9ea475a25f179b771fa397e9b78219c608c74663db1557f2
   languageName: node
   linkType: hard
 
-"@blocknote/react@npm:^0.11.2":
-  version: 0.11.2
-  resolution: "@blocknote/react@npm:0.11.2"
+"@blocknote/react@npm:^0.12.2":
+  version: 0.12.2
+  resolution: "@blocknote/react@npm:0.12.2"
   dependencies:
-    "@blocknote/core": "npm:^0.11.2"
+    "@blocknote/core": "npm:^0.12.1"
     "@floating-ui/react": "npm:^0.26.4"
     "@mantine/core": "npm:^7.5.0"
     "@mantine/hooks": "npm:^7.5.0"
     "@mantine/utils": "npm:^6.0.21"
     "@tiptap/core": "npm:^2.0.3"
     "@tiptap/react": "npm:^2.0.3"
-    lodash.foreach: "npm:^4.5.0"
-    lodash.groupby: "npm:^4.6.0"
     lodash.merge: "npm:^4.6.2"
     react: "npm:^18"
     react-dom: "npm:^18.2.0"
@@ -3570,7 +3621,7 @@ __metadata:
   peerDependencies:
     react: ^18
     react-dom: ^18
-  checksum: a3dcfd40ea3e3b0e4c238b161be908e726b1d404337efe9903e92b7cf518d3165a7df8d78bce606f86354198751fd009d96f1cc8f23de51734e9faa663225981
+  checksum: 2dcae5268e104398bb2be13f650b6d141eecc74542dcc38b78b3cad7cc499e2e2fd5ecd225ce969fbfadd346cc74d2354316fbb2a61ce5f38c2d339849dd4b0e
   languageName: node
   linkType: hard
 
@@ -3932,21 +3983,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/state@npm:^6.1.4":
-  version: 6.3.3
-  resolution: "@codemirror/state@npm:6.3.3"
-  checksum: 97f0174dd6aa43d6293630b0024918ce1bb1f7833de8fa75006de8b7dbd963e2bb8b5e7a805f5a98492a0379d8b60faaee319d42583562b8ea6347ab8b63bf5f
-  languageName: node
-  linkType: hard
-
 "@codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0, @codemirror/view@npm:^6.7.1":
-  version: 6.22.2
-  resolution: "@codemirror/view@npm:6.22.2"
+  version: 6.25.1
+  resolution: "@codemirror/view@npm:6.25.1"
   dependencies:
-    "@codemirror/state": "npm:^6.1.4"
+    "@codemirror/state": "npm:^6.4.0"
     style-mod: "npm:^4.1.0"
     w3c-keyname: "npm:^2.2.4"
-  checksum: 7535a884fc35dc7f0cda22492d3fc1db19abd75a3b4ec3cbeb54fcfba1cbcc2a14a112a6c0ffd03ff3a5a25e9f3906324fc9740af82185edb2c7a38b2a68c835
+  checksum: 21d41c40a7d44d12fc82efe5ec87d95bc044243d18b12cac04ec40895de34ae0988001b5270a3dc8b4687d0d65054ed848134764ae9bbebcc8e0a6d1a6f09b8a
   languageName: node
   linkType: hard
 
@@ -3971,22 +4015,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codesandbox/sandpack-client@npm:^2.11.2":
-  version: 2.11.2
-  resolution: "@codesandbox/sandpack-client@npm:2.11.2"
+"@codesandbox/sandpack-client@npm:^2.13.2":
+  version: 2.13.2
+  resolution: "@codesandbox/sandpack-client@npm:2.13.2"
   dependencies:
     "@codesandbox/nodebox": "npm:0.1.8"
     buffer: "npm:^6.0.3"
     dequal: "npm:^2.0.2"
     outvariant: "npm:1.4.0"
     static-browser-server: "npm:1.0.3"
-  checksum: f5f2a8e4d78d1640fc0a7f8eeb88f36b34b66df56157c0be781c5b831f9b99002095ded40cb979701e79554b2bd0c9997c1a6e43601537bf243ba80e0acfce17
+  checksum: e92126e1115b38eebd5e2b1b50bd84e0ecf6b3d0c721ef9c93981914b4963b2f21e61bff00df3f13f795857be62346424e4392c91acd909d6abc770d96d7362f
   languageName: node
   linkType: hard
 
-"@codesandbox/sandpack-react@npm:^2.11.3":
-  version: 2.11.3
-  resolution: "@codesandbox/sandpack-react@npm:2.11.3"
+"@codesandbox/sandpack-react@npm:^2.13.5":
+  version: 2.13.5
+  resolution: "@codesandbox/sandpack-react@npm:2.13.5"
   dependencies:
     "@codemirror/autocomplete": "npm:^6.4.0"
     "@codemirror/commands": "npm:^6.1.3"
@@ -3996,13 +4040,12 @@ __metadata:
     "@codemirror/language": "npm:^6.3.2"
     "@codemirror/state": "npm:^6.2.0"
     "@codemirror/view": "npm:^6.7.1"
-    "@codesandbox/sandpack-client": "npm:^2.11.2"
+    "@codesandbox/sandpack-client": "npm:^2.13.2"
     "@lezer/highlight": "npm:^1.1.3"
     "@react-hook/intersection-observer": "npm:^3.1.1"
     "@stitches/core": "npm:^1.2.6"
     anser: "npm:^2.1.1"
     clean-set: "npm:^1.1.2"
-    codesandbox-import-util-types: "npm:^2.2.3"
     dequal: "npm:^2.0.2"
     escape-carriage: "npm:^1.3.1"
     lz-string: "npm:^1.4.4"
@@ -4011,7 +4054,7 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17 || ^18
     react-dom: ^16.8.0 || ^17 || ^18
-  checksum: 2a554f23b74dae619a34a9aeee04c7dc7900bb934004bcbd71a45e8fbc8e426a8826fdf871694197d74b3a9485175a1911781199483105f5df31bef770b897ea
+  checksum: 214dec8ad50adb1ceefa36320d59b02303b16d238ccd8d50a39b03934d239bbfc68e2abd7a0f8505b6ff700140d9c27857da5e9f7895938d9bdc6af121a22781
   languageName: node
   linkType: hard
 
@@ -5372,6 +5415,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eslint/js@npm:8.57.0":
+  version: 8.57.0
+  resolution: "@eslint/js@npm:8.57.0"
+  checksum: 9a518bb8625ba3350613903a6d8c622352ab0c6557a59fe6ff6178bf882bf57123f9d92aa826ee8ac3ee74b9c6203fe630e9ee00efb03d753962dcf65ee4bd94
+  languageName: node
+  linkType: hard
+
 "@faker-js/faker@npm:5.5.3":
   version: 5.5.3
   resolution: "@faker-js/faker@npm:5.5.3"
@@ -5612,9 +5662,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphiql/react@npm:^0.20.2":
-  version: 0.20.2
-  resolution: "@graphiql/react@npm:0.20.2"
+"@graphiql/react@npm:^0.20.3":
+  version: 0.20.3
+  resolution: "@graphiql/react@npm:0.20.3"
   dependencies:
     "@graphiql/toolkit": "npm:^0.9.1"
     "@headlessui/react": "npm:^1.7.15"
@@ -5635,7 +5685,7 @@ __metadata:
     graphql: ^15.5.0 || ^16.0.0
     react: ^16.8.0 || ^17 || ^18
     react-dom: ^16.8.0 || ^17 || ^18
-  checksum: 6bf9e50fc5c56da2e04bfacdf066a5077ddb3909481ab25f13da812d213b237855dda2daeb6c8f8cbc961584008e9bebd9b4ed89262963ecf94e736c53466b5c
+  checksum: 705b65bff8317f0628e4ba85dcb0e7945b0592c401fc467763e8211efff2f0776be7ba94eeee36d9da1fa6b1f942e89f4c472e9fc4e5ef148c1262aed1fd8db2
   languageName: node
   linkType: hard
 
@@ -6293,15 +6343,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/merge@npm:9.0.0":
-  version: 9.0.0
-  resolution: "@graphql-tools/merge@npm:9.0.0"
+"@graphql-tools/merge@npm:9.0.1, @graphql-tools/merge@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "@graphql-tools/merge@npm:9.0.1"
   dependencies:
-    "@graphql-tools/utils": "npm:^10.0.0"
+    "@graphql-tools/utils": "npm:^10.0.10"
     tslib: "npm:^2.4.0"
   peerDependencies:
     graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: 10376dbf1b64a3659dfa01d63bdafbb8addac829c0e772fc4596df4b46f249bee179692cc3f06b1157bdc3dccfe3a46caf5499786cce203eb0f7e124c88a5648
+  checksum: cbfcb2c10490a11417991e8b61b8df2eba73a2c576e57cbf2d928902030d4391122536b9442bf042609ec24376b79b8bc6d9117e137dd8db2255ed90613acbc7
   languageName: node
   linkType: hard
 
@@ -6317,18 +6367,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/merge@npm:^9.0.0, @graphql-tools/merge@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "@graphql-tools/merge@npm:9.0.1"
-  dependencies:
-    "@graphql-tools/utils": "npm:^10.0.10"
-    tslib: "npm:^2.4.0"
-  peerDependencies:
-    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: cbfcb2c10490a11417991e8b61b8df2eba73a2c576e57cbf2d928902030d4391122536b9442bf042609ec24376b79b8bc6d9117e137dd8db2255ed90613acbc7
-  languageName: node
-  linkType: hard
-
 "@graphql-tools/mock@npm:^8.1.2":
   version: 8.7.20
   resolution: "@graphql-tools/mock@npm:8.7.20"
@@ -6419,17 +6457,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/schema@npm:10.0.0":
-  version: 10.0.0
-  resolution: "@graphql-tools/schema@npm:10.0.0"
+"@graphql-tools/schema@npm:10.0.2, @graphql-tools/schema@npm:^10.0.0":
+  version: 10.0.2
+  resolution: "@graphql-tools/schema@npm:10.0.2"
   dependencies:
-    "@graphql-tools/merge": "npm:^9.0.0"
-    "@graphql-tools/utils": "npm:^10.0.0"
+    "@graphql-tools/merge": "npm:^9.0.1"
+    "@graphql-tools/utils": "npm:^10.0.10"
     tslib: "npm:^2.4.0"
     value-or-promise: "npm:^1.0.12"
   peerDependencies:
     graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: b746c69cefb3b89fad13d56f0abb9e764efe1569836ea9ae5e5c510a6f0bce6e08f324b28aebcb5b2c11ba2ea1c308f18c204e322a188e254e2c7e426d3ccecb
+  checksum: 3d71117c8d8ed491aa5b988bcdfcc1a7ca8cea8638b37083af2665a0dbb95e1255961a8a43658538ad33b83d621812886a4626ad7a5333d7d9e6c62304b52cb2
   languageName: node
   linkType: hard
 
@@ -6447,20 +6485,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/schema@npm:^10.0.0":
-  version: 10.0.2
-  resolution: "@graphql-tools/schema@npm:10.0.2"
-  dependencies:
-    "@graphql-tools/merge": "npm:^9.0.1"
-    "@graphql-tools/utils": "npm:^10.0.10"
-    tslib: "npm:^2.4.0"
-    value-or-promise: "npm:^1.0.12"
-  peerDependencies:
-    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: 3d71117c8d8ed491aa5b988bcdfcc1a7ca8cea8638b37083af2665a0dbb95e1255961a8a43658538ad33b83d621812886a4626ad7a5333d7d9e6c62304b52cb2
-  languageName: node
-  linkType: hard
-
 "@graphql-tools/schema@npm:^9.0.0, @graphql-tools/schema@npm:^9.0.18, @graphql-tools/schema@npm:^9.0.19":
   version: 9.0.19
   resolution: "@graphql-tools/schema@npm:9.0.19"
@@ -6498,15 +6522,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/utils@npm:10.0.1":
-  version: 10.0.1
-  resolution: "@graphql-tools/utils@npm:10.0.1"
+"@graphql-tools/utils@npm:10.0.13":
+  version: 10.0.13
+  resolution: "@graphql-tools/utils@npm:10.0.13"
   dependencies:
     "@graphql-typed-document-node/core": "npm:^3.1.1"
+    cross-inspect: "npm:1.0.0"
+    dset: "npm:^3.1.2"
     tslib: "npm:^2.4.0"
   peerDependencies:
     graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: c3562240f99543428fa960c1c9836225b33492e16a1ce0622ca71a3abbc3ef4e4f8e453cdb5cc32227e1866f1cdd9e20e09518f8354fa50c87164b2f793f03ae
+  checksum: 6505c494716bb7aa36eba3d731f5a3e28c0bbd2efc818f1fdc7367a408ced8878bfff40f4dafbcef70d912219df81484e32e28130366e8355c126fcbc8ac9dd5
   languageName: node
   linkType: hard
 
@@ -6718,6 +6744,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@humanwhocodes/config-array@npm:^0.11.14":
+  version: 0.11.14
+  resolution: "@humanwhocodes/config-array@npm:0.11.14"
+  dependencies:
+    "@humanwhocodes/object-schema": "npm:^2.0.2"
+    debug: "npm:^4.3.1"
+    minimatch: "npm:^3.0.5"
+  checksum: 66f725b4ee5fdd8322c737cb5013e19fac72d4d69c8bf4b7feb192fcb83442b035b92186f8e9497c220e58b2d51a080f28a73f7899bc1ab288c3be172c467541
+  languageName: node
+  linkType: hard
+
 "@humanwhocodes/module-importer@npm:^1.0.1":
   version: 1.0.1
   resolution: "@humanwhocodes/module-importer@npm:1.0.1"
@@ -6732,6 +6769,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@humanwhocodes/object-schema@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@humanwhocodes/object-schema@npm:2.0.2"
+  checksum: 6fd83dc320231d71c4541d0244051df61f301817e9f9da9fd4cb7e44ec8aacbde5958c1665b0c419401ab935114fdf532a6ad5d4e7294b1af2f347dd91a6983f
+  languageName: node
+  linkType: hard
+
 "@ioredis/commands@npm:^1.1.1":
   version: 1.2.0
   resolution: "@ioredis/commands@npm:1.2.0"
@@ -6938,6 +6982,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jest/schemas@npm:^28.1.3":
+  version: 28.1.3
+  resolution: "@jest/schemas@npm:28.1.3"
+  dependencies:
+    "@sinclair/typebox": "npm:^0.24.1"
+  checksum: 8c325918f3e1b83e687987b05c2e5143d171f372b091f891fe17835f06fadd864ddae3c7e221a704bdd7e2ea28c4b337124c02023d8affcbdd51eca2879162ac
+  languageName: node
+  linkType: hard
+
 "@jest/schemas@npm:^29.6.3":
   version: 29.6.3
   resolution: "@jest/schemas@npm:29.6.3"
@@ -7481,36 +7534,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@microsoft/api-extractor-model@npm:7.28.7":
-  version: 7.28.7
-  resolution: "@microsoft/api-extractor-model@npm:7.28.7"
+"@microsoft/api-extractor-model@npm:7.28.13":
+  version: 7.28.13
+  resolution: "@microsoft/api-extractor-model@npm:7.28.13"
   dependencies:
     "@microsoft/tsdoc": "npm:0.14.2"
     "@microsoft/tsdoc-config": "npm:~0.16.1"
-    "@rushstack/node-core-library": "npm:3.64.2"
-  checksum: 3afe79faf7490b9c110152d80d637e18a594a8c9ab0fa22ba8a05ab10491a5632ea2040bdc007ba6ed4dfc6c421c5d5f431566c01a961ab242e7861fae309be5
+    "@rushstack/node-core-library": "npm:4.0.2"
+  checksum: da83f6ccc01fac3b8274731327a6d35a45b2d98ce8c1d705a974ca34dd48ac0f9b0fe8e98130d2068ec1ee4e2b1f2942b53e21e6e5897f1d3501a3c4e5910645
   languageName: node
   linkType: hard
 
-"@microsoft/api-extractor@npm:^7.34.4":
-  version: 7.39.4
-  resolution: "@microsoft/api-extractor@npm:7.39.4"
+"@microsoft/api-extractor@npm:7.43.0":
+  version: 7.43.0
+  resolution: "@microsoft/api-extractor@npm:7.43.0"
   dependencies:
-    "@microsoft/api-extractor-model": "npm:7.28.7"
+    "@microsoft/api-extractor-model": "npm:7.28.13"
     "@microsoft/tsdoc": "npm:0.14.2"
     "@microsoft/tsdoc-config": "npm:~0.16.1"
-    "@rushstack/node-core-library": "npm:3.64.2"
-    "@rushstack/rig-package": "npm:0.5.1"
-    "@rushstack/ts-command-line": "npm:4.17.1"
-    colors: "npm:~1.2.1"
+    "@rushstack/node-core-library": "npm:4.0.2"
+    "@rushstack/rig-package": "npm:0.5.2"
+    "@rushstack/terminal": "npm:0.10.0"
+    "@rushstack/ts-command-line": "npm:4.19.1"
     lodash: "npm:~4.17.15"
+    minimatch: "npm:~3.0.3"
     resolve: "npm:~1.22.1"
     semver: "npm:~7.5.4"
     source-map: "npm:~0.6.1"
-    typescript: "npm:5.3.3"
+    typescript: "npm:5.4.2"
   bin:
     api-extractor: bin/api-extractor
-  checksum: 376698381ca62bc440b9a1e5239265a358e1cfd302f9d13f029bac94beaaee508618b14dbab1ce4c102f0631ae7d4b56e1fd93508211a60dec781bef85752543
+  checksum: 1bbd1866508db2c5c0ad771e4aeccef95201319879b5cd2b00c5177cfdedb1ad5bc35a452be9d14ac3cfcdf7c9b7c3a737bc2ada9bdcc48eb0e6e11214169b52
   languageName: node
   linkType: hard
 
@@ -7726,6 +7780,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nestjs/cache-manager@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "@nestjs/cache-manager@npm:2.2.1"
+  peerDependencies:
+    "@nestjs/common": ^9.0.0 || ^10.0.0
+    "@nestjs/core": ^9.0.0 || ^10.0.0
+    cache-manager: <=5
+    rxjs: ^7.0.0
+  checksum: d6be3ff686ef7a3c43175e9f3ddb08993e23a0f30b51e0390581ee5c894f8bfe212d4f8be000b0712acd35b8fe5ab7ffbb65145ae3b29801f295596459577648
+  languageName: node
+  linkType: hard
+
 "@nestjs/cli@npm:10.3.0":
   version: 10.3.0
   resolution: "@nestjs/cli@npm:10.3.0"
@@ -7866,6 +7932,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nestjs/devtools-integration@npm:^0.1.6":
+  version: 0.1.6
+  resolution: "@nestjs/devtools-integration@npm:0.1.6"
+  dependencies:
+    chalk: "npm:^4.1.2"
+    node-fetch: "npm:^2.6.9"
+  peerDependencies:
+    "@nestjs/common": ^9.3.7 || ^10.0.0
+    "@nestjs/core": ^9.3.7 || ^10.0.0
+  checksum: 7a8e5297469a6105fedd2283c5de21ff07bfa8b4d173faf540cc935ae67cbce7cf3fc14485e9ef4c3c6c85be9aa9e28bd5838dc236f8800dfdabc61899e1eba8
+  languageName: node
+  linkType: hard
+
 "@nestjs/event-emitter@npm:^2.0.3":
   version: 2.0.3
   resolution: "@nestjs/event-emitter@npm:2.0.3"
@@ -7879,24 +7958,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nestjs/graphql@npm:12.0.8":
-  version: 12.0.8
-  resolution: "@nestjs/graphql@npm:12.0.8"
+"@nestjs/graphql@npm:12.1.1":
+  version: 12.1.1
+  resolution: "@nestjs/graphql@npm:12.1.1"
   dependencies:
-    "@graphql-tools/merge": "npm:9.0.0"
-    "@graphql-tools/schema": "npm:10.0.0"
-    "@graphql-tools/utils": "npm:10.0.1"
-    "@nestjs/mapped-types": "npm:2.0.2"
-    chokidar: "npm:3.5.3"
-    fast-glob: "npm:3.2.12"
+    "@graphql-tools/merge": "npm:9.0.1"
+    "@graphql-tools/schema": "npm:10.0.2"
+    "@graphql-tools/utils": "npm:10.0.13"
+    "@nestjs/mapped-types": "npm:2.0.5"
+    chokidar: "npm:3.6.0"
+    fast-glob: "npm:3.3.2"
     graphql-tag: "npm:2.12.6"
-    graphql-ws: "npm:5.14.0"
+    graphql-ws: "npm:5.14.3"
     lodash: "npm:4.17.21"
     normalize-path: "npm:3.0.0"
     subscriptions-transport-ws: "npm:0.11.0"
-    tslib: "npm:2.6.0"
-    uuid: "npm:9.0.0"
-    ws: "npm:8.13.0"
+    tslib: "npm:2.6.2"
+    uuid: "npm:9.0.1"
+    ws: "npm:8.16.0"
   peerDependencies:
     "@apollo/subgraph": ^2.0.0
     "@nestjs/common": ^9.3.8 || ^10.0.0
@@ -7904,8 +7983,8 @@ __metadata:
     class-transformer: "*"
     class-validator: "*"
     graphql: ^16.6.0
-    reflect-metadata: ^0.1.13
-    ts-morph: ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+    reflect-metadata: ^0.1.13 || ^0.2.0
+    ts-morph: ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0
   peerDependenciesMeta:
     "@apollo/subgraph":
       optional: true
@@ -7915,28 +7994,28 @@ __metadata:
       optional: true
     ts-morph:
       optional: true
-  checksum: 85bfb0e198dc13e8e549cd4c1e9c33f08171f19fc01dccdd0822f72bfd5dcacb55967c87d690f13384252fadf6a4d254a7d0571a547a40c1f259e3b4d2d15143
+  checksum: b2c371d443007b583b75cbffd86714fc87551e2f6c56a89b70f95eae2ee3fc9a5ae0673b44d1c9d59f42b38e6f54fe20f92396a8be02c5bf87d8e83d5da764a6
   languageName: node
   linkType: hard
 
-"@nestjs/graphql@patch:@nestjs/graphql@12.0.8#./patches/@nestjs+graphql+12.0.8.patch::locator=twenty-server%40workspace%3Apackages%2Ftwenty-server":
-  version: 12.0.8
-  resolution: "@nestjs/graphql@patch:@nestjs/graphql@npm%3A12.0.8#./patches/@nestjs+graphql+12.0.8.patch::version=12.0.8&hash=daa690&locator=twenty-server%40workspace%3Apackages%2Ftwenty-server"
+"@nestjs/graphql@patch:@nestjs/graphql@12.1.1#./patches/@nestjs+graphql+12.1.1.patch::locator=twenty-server%40workspace%3Apackages%2Ftwenty-server":
+  version: 12.1.1
+  resolution: "@nestjs/graphql@patch:@nestjs/graphql@npm%3A12.1.1#./patches/@nestjs+graphql+12.1.1.patch::version=12.1.1&hash=214dda&locator=twenty-server%40workspace%3Apackages%2Ftwenty-server"
   dependencies:
-    "@graphql-tools/merge": "npm:9.0.0"
-    "@graphql-tools/schema": "npm:10.0.0"
-    "@graphql-tools/utils": "npm:10.0.1"
-    "@nestjs/mapped-types": "npm:2.0.2"
-    chokidar: "npm:3.5.3"
-    fast-glob: "npm:3.2.12"
+    "@graphql-tools/merge": "npm:9.0.1"
+    "@graphql-tools/schema": "npm:10.0.2"
+    "@graphql-tools/utils": "npm:10.0.13"
+    "@nestjs/mapped-types": "npm:2.0.5"
+    chokidar: "npm:3.6.0"
+    fast-glob: "npm:3.3.2"
     graphql-tag: "npm:2.12.6"
-    graphql-ws: "npm:5.14.0"
+    graphql-ws: "npm:5.14.3"
     lodash: "npm:4.17.21"
     normalize-path: "npm:3.0.0"
     subscriptions-transport-ws: "npm:0.11.0"
-    tslib: "npm:2.6.0"
-    uuid: "npm:9.0.0"
-    ws: "npm:8.13.0"
+    tslib: "npm:2.6.2"
+    uuid: "npm:9.0.1"
+    ws: "npm:8.16.0"
   peerDependencies:
     "@apollo/subgraph": ^2.0.0
     "@nestjs/common": ^9.3.8 || ^10.0.0
@@ -7944,8 +8023,8 @@ __metadata:
     class-transformer: "*"
     class-validator: "*"
     graphql: ^16.6.0
-    reflect-metadata: ^0.1.13
-    ts-morph: ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+    reflect-metadata: ^0.1.13 || ^0.2.0
+    ts-morph: ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0
   peerDependenciesMeta:
     "@apollo/subgraph":
       optional: true
@@ -7955,7 +8034,7 @@ __metadata:
       optional: true
     ts-morph:
       optional: true
-  checksum: e53b804e87e65c78e0e231a7033e135a8346d44ee110a8e2f270b026bd47fda41525b598a301b5ca84537b3c8e37fa92462be353e611751a5b433aadb1f6f290
+  checksum: eabde73e30747ea5d6ee33912516def4c87bc14adfb51ec7e9a037faa1d5c5446211774f6765686da778b17e37d72485d561c51f6e70a86562415b0f590f20d1
   languageName: node
   linkType: hard
 
@@ -7971,20 +8050,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nestjs/mapped-types@npm:2.0.2":
-  version: 2.0.2
-  resolution: "@nestjs/mapped-types@npm:2.0.2"
+"@nestjs/mapped-types@npm:2.0.5":
+  version: 2.0.5
+  resolution: "@nestjs/mapped-types@npm:2.0.5"
   peerDependencies:
     "@nestjs/common": ^8.0.0 || ^9.0.0 || ^10.0.0
     class-transformer: ^0.4.0 || ^0.5.0
     class-validator: ^0.13.0 || ^0.14.0
-    reflect-metadata: ^0.1.12
+    reflect-metadata: ^0.1.12 || ^0.2.0
   peerDependenciesMeta:
     class-transformer:
       optional: true
     class-validator:
       optional: true
-  checksum: 9a6d4c32242926aebc267d5a4a0b50f8aa8eeea8797e25aa9fb762637a45879c1ec103a9a0a30d24e8a6e3f75d0f4640208aaf4f9003e350b52f7e4acb07bab9
+  checksum: f92743cb4c0fe3b1eecdf0c7c6a40f0e7478574a9e1a25ebdbd29db29a7319c2ae608c08d07f7b9525bea01a5e20dbd73222100204d3a13500db4f56676446a1
   languageName: node
   linkType: hard
 
@@ -8043,15 +8122,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nestjs/serve-static@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "@nestjs/serve-static@npm:3.0.1"
+"@nestjs/serve-static@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@nestjs/serve-static@npm:4.0.1"
   dependencies:
     path-to-regexp: "npm:0.2.5"
   peerDependencies:
     "@fastify/static": ^6.5.0
-    "@nestjs/common": ^9.0.0
-    "@nestjs/core": ^9.0.0
+    "@nestjs/common": ^9.0.0 || ^10.0.0
+    "@nestjs/core": ^9.0.0 || ^10.0.0
     express: ^4.18.1
     fastify: ^4.7.0
   peerDependenciesMeta:
@@ -8061,7 +8140,7 @@ __metadata:
       optional: true
     fastify:
       optional: true
-  checksum: 70d47863c37aeb5876fd12feda6a26299af928385dfc24e336f50f7ce9c692a4950c2da449937c5c771ce0bc3869cd1c442cc21b9916973e6e3fbfddb999f1d0
+  checksum: 940119197dd0f9d35db8d59eb871171f857c4507363e50c2a7e9a430dfbf1055fd3bc43969eb5d2863d01b8dd86ae093371bf64cbead343065a7643769455738
   languageName: node
   linkType: hard
 
@@ -8167,6 +8246,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@next/eslint-plugin-next@npm:^14.1.4":
+  version: 14.1.4
+  resolution: "@next/eslint-plugin-next@npm:14.1.4"
+  dependencies:
+    glob: "npm:10.3.10"
+  checksum: fb49237153bf528ef3939e1ceae0f658e44abcf0ca155d8042c7961f523e4d9aeba3de18532b633734f3b5524b644e9c3c5187089e0d400896c1c35812bbbdd3
+  languageName: node
+  linkType: hard
+
 "@next/swc-darwin-arm64@npm:14.0.4":
   version: 14.0.4
   resolution: "@next/swc-darwin-arm64@npm:14.0.4"
@@ -8616,87 +8704,105 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nrwl/devkit@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nrwl/devkit@npm:17.2.8"
+"@nrwl/cypress@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nrwl/cypress@npm:18.1.3"
+  dependencies:
+    "@nx/cypress": "npm:18.1.3"
+  checksum: 93035b15bf94f6c8bfe97f319ab42a4660ebf25984dd5141516e619bc0a9f69246917a7d22c66e21d6872497fdfe8caee3bc8b150981df8559ff46321baf115a
+  languageName: node
+  linkType: hard
+
+"@nrwl/devkit@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nrwl/devkit@npm:18.1.3"
+  dependencies:
+    "@nx/devkit": "npm:18.1.3"
+  checksum: 004114374e302a1277e990694be4b328e7878fb3aca29c617c3b4bc2a52e55e4eee80d017b1111cb8adec00dc879300259fc3cbf157c680070dddfc4d04ac442
+  languageName: node
+  linkType: hard
+
+"@nrwl/eslint-plugin-nx@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nrwl/eslint-plugin-nx@npm:18.1.3"
   dependencies:
-    "@nx/devkit": "npm:17.2.8"
-  checksum: 0deab7982d2e193b7c9b66ed8b3ebc134dee08ea3e1a15edb5b8404372f9ec262fc7cb875ab9d365c6016fa140447dd76e8ec8509306ce6d72ac493f57164d8e
+    "@nx/eslint-plugin": "npm:18.1.3"
+  checksum: 7748b196cc2290a1e092b3ac4ad9b9bad57f207a1d271bd3174b069befd147151cbc765d36258ec7f48cc46c9b628f11a1fdf1731fb711ef89b866f94ac74359
   languageName: node
   linkType: hard
 
-"@nrwl/eslint-plugin-nx@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nrwl/eslint-plugin-nx@npm:17.2.8"
+"@nrwl/jest@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nrwl/jest@npm:18.1.3"
   dependencies:
-    "@nx/eslint-plugin": "npm:17.2.8"
-  checksum: 3540eda9978462d9a7376916ac1eeb45a81083a91f340b9db0251f6f7dd5ecd3a59d762fceac8ddd3a1d718ad028713bced1050ea64fec98ea1b314abb10210c
+    "@nx/jest": "npm:18.1.3"
+  checksum: 872f2b13f83770e7f953e995b5f4e47b793907b943fe22b75d0b87c03ed5d0e9eb803d897200ffbfe1c2d39e00d20398e3d775b25ec32bd06a524db4653bcf7e
   languageName: node
   linkType: hard
 
-"@nrwl/jest@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nrwl/jest@npm:17.2.8"
+"@nrwl/js@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nrwl/js@npm:18.1.3"
   dependencies:
-    "@nx/jest": "npm:17.2.8"
-  checksum: 5f01ae606abe18241d176ceabb5e0269fa2f2ca2c2659d356edef338ddaaafd08e4df9f61946f9b0c4d7eab33dc15090640194e6ea222b6c4b9c1d688ed9ecea
+    "@nx/js": "npm:18.1.3"
+  checksum: 4a53994b920dc6447ad3a75cf6ea956b920b8850cfabe0dbda90b48e098d0f84191306501cf2cf3810ee15b08a066abf7aeb652a7f3d1a745ee963150c7e815b
   languageName: node
   linkType: hard
 
-"@nrwl/js@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nrwl/js@npm:17.2.8"
+"@nrwl/react@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nrwl/react@npm:18.1.3"
   dependencies:
-    "@nx/js": "npm:17.2.8"
-  checksum: 87a9095f9282db6ff2bca3a9a90e667c05309839aca892968a726fd50adfeba08595b3ec0aefb80602ef2a77451e556f4cde942171e71c9dd6f2af61be0d8b59
+    "@nx/react": "npm:18.1.3"
+  checksum: 1d4c12f7a98157a893a1bb3c0c055275a9b11c61ee96481816a8c83c5b9f4dc71bcfe43a8609bd6879192a1bef90ac2b4ad1ff29dd6fb42ce50fb0b9150b38e5
   languageName: node
   linkType: hard
 
-"@nrwl/react@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nrwl/react@npm:17.2.8"
+"@nrwl/storybook@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nrwl/storybook@npm:18.1.3"
   dependencies:
-    "@nx/react": "npm:17.2.8"
-  checksum: 58a0551b469870868f67e3e0df5a9e3dd5fe0a6475192b0cc37739485ffe1ba97b57080e8540995aae4d3efdfe527eefad7a6098d82f18fe55a2293fd67ab1e3
+    "@nx/storybook": "npm:18.1.3"
+  checksum: 1ba4e2504fc515969c1e7af401df31aa1cb31ac5dc4575838ca1c6c6a859ed4bce44dab19bdd335608b54f4d339c1f295fc9d8f585a8359721e5b627c50700d9
   languageName: node
   linkType: hard
 
-"@nrwl/tao@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nrwl/tao@npm:17.2.8"
+"@nrwl/tao@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nrwl/tao@npm:18.1.3"
   dependencies:
-    nx: "npm:17.2.8"
+    nx: "npm:18.1.3"
     tslib: "npm:^2.3.0"
   bin:
     tao: index.js
-  checksum: 2ff0c52c6dc6522ffdbe6a1fae293e0b22516cf1789e67a4776a75771ae42a312a9bdb768b61f052ef24f231512e2b79d21a0ba649ebe1c953488c40594b8b68
+  checksum: 9f7a0816c2c8f687fd127a0acc34757428bfba1dc999f4918d6c8b256f3af860835102cff403dfb6e1ec0fb715a0294e844b2299827ff2d544b8553a92001f30
   languageName: node
   linkType: hard
 
-"@nrwl/vite@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nrwl/vite@npm:17.2.8"
+"@nrwl/vite@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nrwl/vite@npm:18.1.3"
   dependencies:
-    "@nx/vite": "npm:17.2.8"
-  checksum: cbef985e13528868346cf7143dbdd6e5330f55f1f90b458f27ad075085dbb65d68506f24cfd60c0c4a818aa7fc7108a8c316d7238292cc8dffd67998b1c0a9c3
+    "@nx/vite": "npm:18.1.3"
+  checksum: c1f7d6f55ee07eb84006c14eaee4179f1796356245aeed4bcf7de1c47d124d44a1a3e800c39eb4d2064a72c297d73b01ad069b03d63c8b35f45273aac69b8b4e
   languageName: node
   linkType: hard
 
-"@nrwl/web@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nrwl/web@npm:17.2.8"
+"@nrwl/web@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nrwl/web@npm:18.1.3"
   dependencies:
-    "@nx/web": "npm:17.2.8"
-  checksum: d46b59c1df33cc4b4e413b529ab26356fbde4c88f8641b9beb4a0cc120d93eda90455cbacb7f39dde8c929b3d6c09ee3931ec4114cc3ca07c2a4c4c8fda3b7d0
+    "@nx/web": "npm:18.1.3"
+  checksum: 23ea9064cbba9974a72b6a957cadfc5c33bb8ff2a8240c0f0c5e103204702feffac2989d0e9e5bfa82fe703a071a65bf3389bfef45053c7184f7eacbe4ba2870
   languageName: node
   linkType: hard
 
-"@nrwl/workspace@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nrwl/workspace@npm:17.2.8"
+"@nrwl/workspace@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nrwl/workspace@npm:18.1.3"
   dependencies:
-    "@nx/workspace": "npm:17.2.8"
-  checksum: f7878304444df92f540df8c3b83cfee53e2bc142ef8c74fda8d60e4432f27418397593ef15b4ead694d1ab46f46cb59481cea122ddee6679d06def74b6788e6f
+    "@nx/workspace": "npm:18.1.3"
+  checksum: f8ebd3c3cc09815889ed47c7bd956fd3b2d225277d967c8323d375948bac950c1473f246fdf9bd660454f18c496cd36bf3fe9477888590b5a854bc8c1bf715fd
   languageName: node
   linkType: hard
 
@@ -8713,103 +8819,125 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nx/devkit@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/devkit@npm:17.2.8"
+"@nx/cypress@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/cypress@npm:18.1.3"
+  dependencies:
+    "@nrwl/cypress": "npm:18.1.3"
+    "@nx/devkit": "npm:18.1.3"
+    "@nx/eslint": "npm:18.1.3"
+    "@nx/js": "npm:18.1.3"
+    "@phenomnomnominal/tsquery": "npm:~5.0.1"
+    detect-port: "npm:^1.5.1"
+    semver: "npm:^7.5.3"
+    tslib: "npm:^2.3.0"
+  peerDependencies:
+    cypress: ">= 3 < 14"
+  peerDependenciesMeta:
+    cypress:
+      optional: true
+  checksum: dd92b119ee8e9a9f4f13c5ba3c79f81e38e4c3835a9e7e66f5d07b6b34fea4e700c6d9699f20d9878ae074cd1009ef702e33faa57c23fd5bf8a4f56c8ab6e331
+  languageName: node
+  linkType: hard
+
+"@nx/devkit@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/devkit@npm:18.1.3"
   dependencies:
-    "@nrwl/devkit": "npm:17.2.8"
+    "@nrwl/devkit": "npm:18.1.3"
     ejs: "npm:^3.1.7"
     enquirer: "npm:~2.3.6"
     ignore: "npm:^5.0.4"
-    semver: "npm:7.5.3"
+    semver: "npm:^7.5.3"
     tmp: "npm:~0.2.1"
     tslib: "npm:^2.3.0"
+    yargs-parser: "npm:21.1.1"
   peerDependencies:
     nx: ">= 16 <= 18"
-  checksum: e339e2d0616b4374a7677ce3076b06c9b7d5619628b32ff41e6828c25d1bfd6fe4f71347d6151db078565bc2d8101d3ce75bcb67613c3a5c7eae3ed06b6432b3
+  checksum: 1015e79acc1f9b11b73863cfaad865614550f7c722e8dac026510127112e4c4a9c7c08e6f4766c0558eb6ca066d8b1124db6f406a67fcb8809c30d450887c60a
   languageName: node
   linkType: hard
 
-"@nx/eslint-plugin@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/eslint-plugin@npm:17.2.8"
+"@nx/eslint-plugin@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/eslint-plugin@npm:18.1.3"
   dependencies:
-    "@nrwl/eslint-plugin-nx": "npm:17.2.8"
-    "@nx/devkit": "npm:17.2.8"
-    "@nx/js": "npm:17.2.8"
-    "@typescript-eslint/type-utils": "npm:^6.9.1"
-    "@typescript-eslint/utils": "npm:^6.9.1"
+    "@nrwl/eslint-plugin-nx": "npm:18.1.3"
+    "@nx/devkit": "npm:18.1.3"
+    "@nx/js": "npm:18.1.3"
+    "@typescript-eslint/type-utils": "npm:^6.13.2"
+    "@typescript-eslint/utils": "npm:^6.13.2"
     chalk: "npm:^4.1.0"
     confusing-browser-globals: "npm:^1.0.9"
     jsonc-eslint-parser: "npm:^2.1.0"
-    semver: "npm:7.5.3"
+    semver: "npm:^7.5.3"
     tslib: "npm:^2.3.0"
   peerDependencies:
-    "@typescript-eslint/parser": ^6.9.1
+    "@typescript-eslint/parser": ^6.13.2 || ^7.0.0
     eslint-config-prettier: ^9.0.0
   peerDependenciesMeta:
     eslint-config-prettier:
       optional: true
-  checksum: 6911c47c19b1781a03f1719d0d695be53b66cad5bf0993663a1093c5519f58720493f0182d9b6aca5c74ba6397076738b66efa7867577fa629e7b6e03f26d6b3
+  checksum: 1e592a4c22baae10d5cef1c627471bca1aa01630d570b12cfb6641ccabdd2c82f03a3b2f3ae68c32409871154c62b1cf7c444b243a1387a05b780e34b6da9a59
   languageName: node
   linkType: hard
 
-"@nx/eslint@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/eslint@npm:17.2.8"
+"@nx/eslint@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/eslint@npm:18.1.3"
   dependencies:
-    "@nx/devkit": "npm:17.2.8"
-    "@nx/js": "npm:17.2.8"
-    "@nx/linter": "npm:17.2.8"
+    "@nx/devkit": "npm:18.1.3"
+    "@nx/js": "npm:18.1.3"
+    "@nx/linter": "npm:18.1.3"
+    eslint: "npm:^8.0.0"
     tslib: "npm:^2.3.0"
-    typescript: "npm:~5.2.2"
+    typescript: "npm:~5.3.2"
   peerDependencies:
-    eslint: ^8.0.0
     js-yaml: 4.1.0
   peerDependenciesMeta:
-    eslint:
-      optional: true
     js-yaml:
       optional: true
-  checksum: ccd9b69996440e53420d7059f8f8831c36b1a5f6a182473d3923be8f0f6c8e6d9dfa7ca83e74622ce7bbcbf03dd038d940d724aa89917666610cc2a60db080b0
+  checksum: d81dac04e7e540a38673f37dd4a53d42a6903357a9d3b9a470efd420e02d301d7e607edba2cc521653014b5d9a1e3814d1713c2be10b06fbd0411ef8fc2d6909
   languageName: node
   linkType: hard
 
-"@nx/jest@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/jest@npm:17.2.8"
+"@nx/jest@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/jest@npm:18.1.3"
   dependencies:
     "@jest/reporters": "npm:^29.4.1"
     "@jest/test-result": "npm:^29.4.1"
-    "@nrwl/jest": "npm:17.2.8"
-    "@nx/devkit": "npm:17.2.8"
-    "@nx/js": "npm:17.2.8"
+    "@nrwl/jest": "npm:18.1.3"
+    "@nx/devkit": "npm:18.1.3"
+    "@nx/js": "npm:18.1.3"
     "@phenomnomnominal/tsquery": "npm:~5.0.1"
     chalk: "npm:^4.1.0"
     identity-obj-proxy: "npm:3.0.0"
     jest-config: "npm:^29.4.1"
     jest-resolve: "npm:^29.4.1"
     jest-util: "npm:^29.4.1"
+    minimatch: "npm:9.0.3"
     resolve.exports: "npm:1.1.0"
     tslib: "npm:^2.3.0"
-  checksum: f20f5accdddb0f0f2fdd8872f59f065b5513b2d72a31eb01aa68af7b4ab3ec2799e2ba352ed641db43385cdc8ab60375c8dcfe177d085e8a346e91bf74e88e16
+    yargs-parser: "npm:21.1.1"
+  checksum: 2a3234129018db4bb1eb96d9b41d233a77cc1a7becdd4acf5985f31635a2884323a9620dfbe9bb2a35b20111f2b36fee216201cadd8d608cb290991c6b13ecf4
   languageName: node
   linkType: hard
 
-"@nx/js@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/js@npm:17.2.8"
+"@nx/js@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/js@npm:18.1.3"
   dependencies:
-    "@babel/core": "npm:^7.22.9"
+    "@babel/core": "npm:^7.23.2"
     "@babel/plugin-proposal-decorators": "npm:^7.22.7"
     "@babel/plugin-transform-class-properties": "npm:^7.22.5"
-    "@babel/plugin-transform-runtime": "npm:^7.22.9"
-    "@babel/preset-env": "npm:^7.22.9"
+    "@babel/plugin-transform-runtime": "npm:^7.23.2"
+    "@babel/preset-env": "npm:^7.23.2"
     "@babel/preset-typescript": "npm:^7.22.5"
     "@babel/runtime": "npm:^7.22.6"
-    "@nrwl/js": "npm:17.2.8"
-    "@nx/devkit": "npm:17.2.8"
-    "@nx/workspace": "npm:17.2.8"
+    "@nrwl/js": "npm:18.1.3"
+    "@nx/devkit": "npm:18.1.3"
+    "@nx/workspace": "npm:18.1.3"
     "@phenomnomnominal/tsquery": "npm:~5.0.1"
     babel-plugin-const-enum: "npm:^1.0.1"
     babel-plugin-macros: "npm:^2.8.0"
@@ -8821,11 +8949,11 @@ __metadata:
     fs-extra: "npm:^11.1.0"
     ignore: "npm:^5.0.4"
     js-tokens: "npm:^4.0.0"
-    minimatch: "npm:3.0.5"
+    minimatch: "npm:9.0.3"
     npm-package-arg: "npm:11.0.1"
     npm-run-path: "npm:^4.0.1"
     ora: "npm:5.3.0"
-    semver: "npm:7.5.3"
+    semver: "npm:^7.5.3"
     source-map-support: "npm:0.5.19"
     ts-node: "npm:10.9.1"
     tsconfig-paths: "npm:^4.1.2"
@@ -8835,153 +8963,168 @@ __metadata:
   peerDependenciesMeta:
     verdaccio:
       optional: true
-  checksum: 9ec84cc2f8af23b57297d66d651b21de6eed1899e327d9f9b801420fa7f6348e2c36c78459c83bc708ae6ffc1e38b22a417c1f15808b162c1be29ba59e44e2ed
+  checksum: 36ebe5827774eae39f28ff724627beae7c2097205705cf3ae5086191fd15df3c0c987fa85dbbe0b036f2236508ba2688812c48d6630182872f1a89206b133871
   languageName: node
   linkType: hard
 
-"@nx/linter@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/linter@npm:17.2.8"
+"@nx/linter@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/linter@npm:18.1.3"
   dependencies:
-    "@nx/eslint": "npm:17.2.8"
-  checksum: 11e8063f3b91b2ebb9fe893ac9840875da49124da1ee41c9e068d7e52d2de8e84011d3c7f3c37f15e0b11a3829fef4c63f77d2ec01b54aa5ccfea6bdf7687326
+    "@nx/eslint": "npm:18.1.3"
+  checksum: 4f9eba2aa1e3b43d9f649873fff17605658421e8caaf8e870f74f31c38e5452ee20b13a13c94e5145af1ad4d4bd94474121ad5f93472be1fdc9acaba81b34fce
   languageName: node
   linkType: hard
 
-"@nx/nx-darwin-arm64@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/nx-darwin-arm64@npm:17.2.8"
+"@nx/nx-darwin-arm64@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-darwin-arm64@npm:18.1.3"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@nx/nx-darwin-x64@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/nx-darwin-x64@npm:17.2.8"
+"@nx/nx-darwin-x64@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-darwin-x64@npm:18.1.3"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@nx/nx-freebsd-x64@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/nx-freebsd-x64@npm:17.2.8"
+"@nx/nx-freebsd-x64@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-freebsd-x64@npm:18.1.3"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-arm-gnueabihf@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/nx-linux-arm-gnueabihf@npm:17.2.8"
+"@nx/nx-linux-arm-gnueabihf@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-linux-arm-gnueabihf@npm:18.1.3"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-arm64-gnu@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/nx-linux-arm64-gnu@npm:17.2.8"
+"@nx/nx-linux-arm64-gnu@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-linux-arm64-gnu@npm:18.1.3"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-arm64-musl@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/nx-linux-arm64-musl@npm:17.2.8"
+"@nx/nx-linux-arm64-musl@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-linux-arm64-musl@npm:18.1.3"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-x64-gnu@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/nx-linux-x64-gnu@npm:17.2.8"
+"@nx/nx-linux-x64-gnu@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-linux-x64-gnu@npm:18.1.3"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-x64-musl@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/nx-linux-x64-musl@npm:17.2.8"
+"@nx/nx-linux-x64-musl@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-linux-x64-musl@npm:18.1.3"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@nx/nx-win32-arm64-msvc@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/nx-win32-arm64-msvc@npm:17.2.8"
+"@nx/nx-win32-arm64-msvc@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-win32-arm64-msvc@npm:18.1.3"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@nx/nx-win32-x64-msvc@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/nx-win32-x64-msvc@npm:17.2.8"
+"@nx/nx-win32-x64-msvc@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/nx-win32-x64-msvc@npm:18.1.3"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@nx/react@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/react@npm:17.2.8"
+"@nx/react@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/react@npm:18.1.3"
   dependencies:
-    "@nrwl/react": "npm:17.2.8"
-    "@nx/devkit": "npm:17.2.8"
-    "@nx/eslint": "npm:17.2.8"
-    "@nx/js": "npm:17.2.8"
-    "@nx/web": "npm:17.2.8"
+    "@nrwl/react": "npm:18.1.3"
+    "@nx/devkit": "npm:18.1.3"
+    "@nx/eslint": "npm:18.1.3"
+    "@nx/js": "npm:18.1.3"
+    "@nx/web": "npm:18.1.3"
     "@phenomnomnominal/tsquery": "npm:~5.0.1"
     "@svgr/webpack": "npm:^8.0.1"
     chalk: "npm:^4.1.0"
-    file-loader: "npm:^6.2.0"
-    minimatch: "npm:3.0.5"
+    minimatch: "npm:9.0.3"
+    tslib: "npm:^2.3.0"
+  checksum: 9c8e31c1b894be361bfba02eb590eac93374cb1b2fd38f6a611201c5008e5ec42090835dd271124bd446a27b28ac00aca7a8a5f32b1f73574a0ae05fa340608e
+  languageName: node
+  linkType: hard
+
+"@nx/storybook@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/storybook@npm:18.1.3"
+  dependencies:
+    "@nrwl/storybook": "npm:18.1.3"
+    "@nx/cypress": "npm:18.1.3"
+    "@nx/devkit": "npm:18.1.3"
+    "@nx/eslint": "npm:18.1.3"
+    "@nx/js": "npm:18.1.3"
+    "@phenomnomnominal/tsquery": "npm:~5.0.1"
+    semver: "npm:^7.5.3"
     tslib: "npm:^2.3.0"
-  checksum: 1fef56528de07ae76b02c0db8bd7e5e73496a44791fa2cac8345dec60ac2e441bf44cf81e4d45fa9cb88a5eba8fd4fcd38c5efbc1efc117b89adbafee4741919
+  checksum: e6559ca5be8902627c5c4f28f2578b6e6459c50c38636823daf18dada90f654774dbe0e5fc8b777484e3224f474f47c52175c1ec5d70cfeb10176412ce5f5812
   languageName: node
   linkType: hard
 
-"@nx/vite@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/vite@npm:17.2.8"
+"@nx/vite@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/vite@npm:18.1.3"
   dependencies:
-    "@nrwl/vite": "npm:17.2.8"
-    "@nx/devkit": "npm:17.2.8"
-    "@nx/js": "npm:17.2.8"
+    "@nrwl/vite": "npm:18.1.3"
+    "@nx/devkit": "npm:18.1.3"
+    "@nx/js": "npm:18.1.3"
     "@phenomnomnominal/tsquery": "npm:~5.0.1"
     "@swc/helpers": "npm:~0.5.0"
     enquirer: "npm:~2.3.6"
     tsconfig-paths: "npm:^4.1.2"
   peerDependencies:
     vite: ^5.0.0
-    vitest: ">=0.34.6"
-  checksum: 4ee88eceea60e4a7bc49e953b750eea4fecacedc0b2f75ce013a2ee58174940b3a42681fc91813115cb4752ded9f1d71de46369617943a504125c2690346d9f0
+    vitest: ^1.3.1
+  checksum: 4494713d7f54383698feea87a2ec3eb1e157746054dc1d064635c13522aecb2d606afae11c84fa9cd39da62cc531ad592e349e0a37b0f11000240aa68946cecf
   languageName: node
   linkType: hard
 
-"@nx/web@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/web@npm:17.2.8"
+"@nx/web@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/web@npm:18.1.3"
   dependencies:
-    "@nrwl/web": "npm:17.2.8"
-    "@nx/devkit": "npm:17.2.8"
-    "@nx/js": "npm:17.2.8"
+    "@nrwl/web": "npm:18.1.3"
+    "@nx/devkit": "npm:18.1.3"
+    "@nx/js": "npm:18.1.3"
     chalk: "npm:^4.1.0"
     detect-port: "npm:^1.5.1"
     http-server: "npm:^14.1.0"
     tslib: "npm:^2.3.0"
-  checksum: 3e0917bb9c7833a64e2ada61707216ff3b9d67bce81c0418a4ac4aed73b224261499196151d375926604820179c71d06f93b4fba763d3d9b3bcd83c220bbd8be
+  checksum: e23b98d29528c47fe3fad26433240040fe6af87a3f931158b6766a2f889316db3ee24273732e128a21636f5f493493f5fe445dcdb1903ae028744b69625c27fc
   languageName: node
   linkType: hard
 
-"@nx/workspace@npm:17.2.8":
-  version: 17.2.8
-  resolution: "@nx/workspace@npm:17.2.8"
+"@nx/workspace@npm:18.1.3":
+  version: 18.1.3
+  resolution: "@nx/workspace@npm:18.1.3"
   dependencies:
-    "@nrwl/workspace": "npm:17.2.8"
-    "@nx/devkit": "npm:17.2.8"
+    "@nrwl/workspace": "npm:18.1.3"
+    "@nx/devkit": "npm:18.1.3"
     chalk: "npm:^4.1.0"
     enquirer: "npm:~2.3.6"
-    nx: "npm:17.2.8"
+    nx: "npm:18.1.3"
     tslib: "npm:^2.3.0"
     yargs-parser: "npm:21.1.1"
-  checksum: c0f1c03f64910749a15dee678dc5e60f9d0cabf818c0201b523e4679c4cfe2830ae04622d9d05a17ce2349b6ed7a70969924dc5f91f573746cb7663536cb9465
+  checksum: b2bcfd0d0dd1e79a4787c1df6d9da8ceb442363cdbc06b6f59c10b43705ab77e23ee427123884dd141b0c3aa575097a265ab7f1023b8186dd70d84d413894736
   languageName: node
   linkType: hard
 
@@ -10359,7 +10502,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@radix-ui/react-slot@npm:1.0.2":
+"@radix-ui/react-slot@npm:1.0.2, @radix-ui/react-slot@npm:^1.0.2":
   version: 1.0.2
   resolution: "@radix-ui/react-slot@npm:1.0.2"
   dependencies:
@@ -11048,6 +11191,62 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@redis/bloom@npm:1.2.0, @redis/bloom@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@redis/bloom@npm:1.2.0"
+  peerDependencies:
+    "@redis/client": ^1.0.0
+  checksum: 7dde8e67188164e96226c8a5c78ebd2801f1662947371e78fb95fb180c1e9ddff8d237012eb5e9182775be61cb546f67f759927cdaee0d178d863ee290e1fb27
+  languageName: node
+  linkType: hard
+
+"@redis/client@npm:1.5.14, @redis/client@npm:^1.5.8":
+  version: 1.5.14
+  resolution: "@redis/client@npm:1.5.14"
+  dependencies:
+    cluster-key-slot: "npm:1.1.2"
+    generic-pool: "npm:3.9.0"
+    yallist: "npm:4.0.0"
+  checksum: e8036ef1bce676891a492c198251238b3eb19eb7120ff974291f2a4e8cea97ac0f4aabbc0c59f40a923dcb43456e4e2a29b7287bd6a91535330e5e4631d9b176
+  languageName: node
+  linkType: hard
+
+"@redis/graph@npm:1.1.1, @redis/graph@npm:^1.1.0":
+  version: 1.1.1
+  resolution: "@redis/graph@npm:1.1.1"
+  peerDependencies:
+    "@redis/client": ^1.0.0
+  checksum: 64199db2cb3669c4911af8aba3b7116c4c2c1df37ca74b2a65555e62c863935a0cea74bc41bd92acf2e551074eb2a30c75f54a9f439b40e0f9bb67fc5fb66614
+  languageName: node
+  linkType: hard
+
+"@redis/json@npm:1.0.6, @redis/json@npm:^1.0.4":
+  version: 1.0.6
+  resolution: "@redis/json@npm:1.0.6"
+  peerDependencies:
+    "@redis/client": ^1.0.0
+  checksum: ac6072c33ac4552cf4748b6b2dc5fdc63f7a9396e6453b59ee03831cdde8d495caa90786e04036633d058c39cdf5c6fce903272c43ff942941b15c157ac34498
+  languageName: node
+  linkType: hard
+
+"@redis/search@npm:1.1.6, @redis/search@npm:^1.1.3":
+  version: 1.1.6
+  resolution: "@redis/search@npm:1.1.6"
+  peerDependencies:
+    "@redis/client": ^1.0.0
+  checksum: 690b30dc914f013c10c03899ddc5585194e891323c14f4d974d51d912944e50b5f21208e0fc5eed958dde87b730254846e9ffe5caf0b54ff1ff2c64a051df057
+  languageName: node
+  linkType: hard
+
+"@redis/time-series@npm:1.0.5, @redis/time-series@npm:^1.0.4":
+  version: 1.0.5
+  resolution: "@redis/time-series@npm:1.0.5"
+  peerDependencies:
+    "@redis/client": ^1.0.0
+  checksum: 3c7f31f64a5f215534db6f0a10845be046ffee2928972037713acdd72cdb9ccc4a476ecce70d896333346a8f4081bd2139a4d50da4d19b9d61a6836066188d68
+  languageName: node
+  linkType: hard
+
 "@rehooks/component-size@npm:^1.0.3":
   version: 1.0.3
   resolution: "@rehooks/component-size@npm:1.0.3"
@@ -11125,7 +11324,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/pluginutils@npm:^5.0.2, @rollup/pluginutils@npm:^5.0.5":
+"@rollup/pluginutils@npm:^5.0.2, @rollup/pluginutils@npm:^5.0.5, @rollup/pluginutils@npm:^5.1.0":
   version: 5.1.0
   resolution: "@rollup/pluginutils@npm:5.1.0"
   dependencies:
@@ -11330,11 +11529,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rushstack/node-core-library@npm:3.64.2, @rushstack/node-core-library@npm:^3.55.2":
-  version: 3.64.2
-  resolution: "@rushstack/node-core-library@npm:3.64.2"
+"@rushstack/node-core-library@npm:4.0.2":
+  version: 4.0.2
+  resolution: "@rushstack/node-core-library@npm:4.0.2"
   dependencies:
-    colors: "npm:~1.2.1"
     fs-extra: "npm:~7.0.1"
     import-lazy: "npm:~4.0.0"
     jju: "npm:~1.4.0"
@@ -11346,29 +11544,44 @@ __metadata:
   peerDependenciesMeta:
     "@types/node":
       optional: true
-  checksum: eb2494d79864cdb10df8453d51ed5e5ad3113629b04ea6782faae2bb797aaab43e200864bc2de8262a52d844ba4e9a1c8f7fb61e92775bef441bcee5496e2a73
+  checksum: b60070b5b8f4da0cbda5b37f950ed5d3843f3c68aab13ce1d4383b9fd71ca94065dfdd2e3b10b361ae0ef5fd0182d891da2addfd3f1ca21e7789110f6266d83f
   languageName: node
   linkType: hard
 
-"@rushstack/rig-package@npm:0.5.1":
-  version: 0.5.1
-  resolution: "@rushstack/rig-package@npm:0.5.1"
+"@rushstack/rig-package@npm:0.5.2":
+  version: 0.5.2
+  resolution: "@rushstack/rig-package@npm:0.5.2"
   dependencies:
     resolve: "npm:~1.22.1"
     strip-json-comments: "npm:~3.1.1"
-  checksum: a296125a5170dd11c37c3d679eb6e61db4d0c0741b3947902d9eab34e9ff34d5d8e94fbf6b45757141ea077029490198b7eb35d311ba46eaac5e1d4145e9780c
+  checksum: 7bff460eb8407a68de20681b6354703c0fdb7a325c58060a2c4591b86dd3b83b95b651ccba3cc833f8d1a94c3a19638091b447c03d89eaa9df57bc9de7abb29d
+  languageName: node
+  linkType: hard
+
+"@rushstack/terminal@npm:0.10.0":
+  version: 0.10.0
+  resolution: "@rushstack/terminal@npm:0.10.0"
+  dependencies:
+    "@rushstack/node-core-library": "npm:4.0.2"
+    supports-color: "npm:~8.1.1"
+  peerDependencies:
+    "@types/node": "*"
+  peerDependenciesMeta:
+    "@types/node":
+      optional: true
+  checksum: 128d13d353265bd318fc52a5d2eaf6d352d3abd29fc3500d630b4d114b43392e2dfe8c4df200e855dc2c07e6d4e8f2175c38b5a8b71dff1eee7aa1f5a261e1c7
   languageName: node
   linkType: hard
 
-"@rushstack/ts-command-line@npm:4.17.1":
-  version: 4.17.1
-  resolution: "@rushstack/ts-command-line@npm:4.17.1"
+"@rushstack/ts-command-line@npm:4.19.1":
+  version: 4.19.1
+  resolution: "@rushstack/ts-command-line@npm:4.19.1"
   dependencies:
+    "@rushstack/terminal": "npm:0.10.0"
     "@types/argparse": "npm:1.0.38"
     argparse: "npm:~1.0.9"
-    colors: "npm:~1.2.1"
     string-argv: "npm:~0.3.1"
-  checksum: 4fd27d2450a6e71139e67b33d5ecba7abbf3497e7479ab3a96666cf79f207c5a7d4ad4f8de17f43e09bed65a0f28115160a4c5486c8e64f8b472c7145a31c2d2
+  checksum: 329184ae53b3d5dc0218ef63dbbd65efc3a3f423595cf69865cb47ee7ae233cfa8c93d87c31cdb1ef8a00f286d3dd56dc629a16c5903777a9eb1f603dd801c25
   languageName: node
   linkType: hard
 
@@ -11595,6 +11808,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sentry/types@npm:^7.109.0":
+  version: 7.109.0
+  resolution: "@sentry/types@npm:7.109.0"
+  checksum: 0c2953999b94b1549919b89fd0c956c2229c9fbcdee2c692ee8f94841b10905ea03cc361e89aa4387fe231a1c08d02fe27080d40874ad0da3785e43d17d941bc
+  languageName: node
+  linkType: hard
+
 "@sentry/utils@npm:6.19.7":
   version: 6.19.7
   resolution: "@sentry/utils@npm:6.19.7"
@@ -11683,6 +11903,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sinclair/typebox@npm:^0.24.1":
+  version: 0.24.51
+  resolution: "@sinclair/typebox@npm:0.24.51"
+  checksum: 458131e83ca59ad3721f0abeef2aa5220aff2083767e1143d75c67c85d55ef7a212f48f394471ee6bdd2e860ba30f09a489cdd2a28a2824d5b0d1014bdfb2552
+  languageName: node
+  linkType: hard
+
 "@sinclair/typebox@npm:^0.27.8":
   version: 0.27.8
   resolution: "@sinclair/typebox@npm:0.27.8"
@@ -12892,21 +13119,21 @@ __metadata:
   linkType: hard
 
 "@storybook/addon-interactions@npm:^7.6.7":
-  version: 7.6.7
-  resolution: "@storybook/addon-interactions@npm:7.6.7"
+  version: 7.6.17
+  resolution: "@storybook/addon-interactions@npm:7.6.17"
   dependencies:
     "@storybook/global": "npm:^5.0.0"
-    "@storybook/types": "npm:7.6.7"
+    "@storybook/types": "npm:7.6.17"
     jest-mock: "npm:^27.0.6"
     polished: "npm:^4.2.2"
     ts-dedent: "npm:^2.2.0"
-  checksum: 037714fd46df09a22111ceeff8062aa4f1fc6af358f6f7e0c9dc7dc04595bdbb2c238b3b2b1b651e157408fc024e7237c2580f6ce4fd13dda8e6caa7e117c23f
+  checksum: f0910e8db378f502270747508c42174bdb75671620d24868264638a2693c60b35f088e4c06cb2239a69f4aa176f8dc8cf9e215f872d5aeefec933643225b66b8
   languageName: node
   linkType: hard
 
 "@storybook/addon-links@npm:^7.6.7":
-  version: 7.6.7
-  resolution: "@storybook/addon-links@npm:7.6.7"
+  version: 7.6.17
+  resolution: "@storybook/addon-links@npm:7.6.17"
   dependencies:
     "@storybook/csf": "npm:^0.1.2"
     "@storybook/global": "npm:^5.0.0"
@@ -12916,7 +13143,7 @@ __metadata:
   peerDependenciesMeta:
     react:
       optional: true
-  checksum: 8c61d0dd7dd7072074f59c57a478f328bc0039bf0102134efea261bd1158ab19465605fac4eae42a9360b3c1f93143e2ee0f68e8001ad7de27f56e066d1cb17a
+  checksum: c95aa5629a948f07a260430fecb8bed283a1bcfa97d8925b5edf3d4eab46155c85dec1814a00db4206a6de8323803b3d8bf74665c97caf34bb229a403f5b03d7
   languageName: node
   linkType: hard
 
@@ -12953,15 +13180,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/addon-themes@npm:^7.6.7":
-  version: 7.6.7
-  resolution: "@storybook/addon-themes@npm:7.6.7"
-  dependencies:
-    ts-dedent: "npm:^2.0.0"
-  checksum: c024fb80b609be220bba50695798356dfa364d6acb4b150f069a3e5f5fc9fcd46a5fd81c2a28e058c1b2b4368d2c03e81d40bd842a1d591366a3ad7ca050299b
-  languageName: node
-  linkType: hard
-
 "@storybook/addon-toolbars@npm:7.6.7":
   version: 7.6.7
   resolution: "@storybook/addon-toolbars@npm:7.6.7"
@@ -13012,14 +13230,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/builder-manager@npm:7.6.7":
-  version: 7.6.7
-  resolution: "@storybook/builder-manager@npm:7.6.7"
+"@storybook/builder-manager@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/builder-manager@npm:7.6.17"
   dependencies:
     "@fal-works/esbuild-plugin-global-externals": "npm:^2.1.2"
-    "@storybook/core-common": "npm:7.6.7"
-    "@storybook/manager": "npm:7.6.7"
-    "@storybook/node-logger": "npm:7.6.7"
+    "@storybook/core-common": "npm:7.6.17"
+    "@storybook/manager": "npm:7.6.17"
+    "@storybook/node-logger": "npm:7.6.17"
     "@types/ejs": "npm:^3.1.1"
     "@types/find-cache-dir": "npm:^3.2.1"
     "@yarnpkg/esbuild-plugin-pnp": "npm:^3.0.0-rc.10"
@@ -13032,22 +13250,46 @@ __metadata:
     fs-extra: "npm:^11.1.0"
     process: "npm:^0.11.10"
     util: "npm:^0.12.4"
-  checksum: 07df0b1a9f8665afab0919110e8895ba9dec3fbc4ed1071d51bfacc0bac57f7b07864205fc031beb1a6c3f716c35810170d4b35ee7ce300f8b3c54478c20fe96
+  checksum: 1b2ca77f7f3bf3c72890e949cfadc45d633fee7315ebcabfc1d6e23cd259db93114cbd9b9197597057f90c5fd60b3e72b0782a284a4f80c6efdd15f118b2c594
   languageName: node
   linkType: hard
 
-"@storybook/builder-vite@npm:7.6.7":
-  version: 7.6.7
-  resolution: "@storybook/builder-vite@npm:7.6.7"
+"@storybook/builder-manager@npm:7.6.3":
+  version: 7.6.3
+  resolution: "@storybook/builder-manager@npm:7.6.3"
   dependencies:
-    "@storybook/channels": "npm:7.6.7"
-    "@storybook/client-logger": "npm:7.6.7"
-    "@storybook/core-common": "npm:7.6.7"
-    "@storybook/csf-plugin": "npm:7.6.7"
-    "@storybook/node-logger": "npm:7.6.7"
-    "@storybook/preview": "npm:7.6.7"
-    "@storybook/preview-api": "npm:7.6.7"
-    "@storybook/types": "npm:7.6.7"
+    "@fal-works/esbuild-plugin-global-externals": "npm:^2.1.2"
+    "@storybook/core-common": "npm:7.6.3"
+    "@storybook/manager": "npm:7.6.3"
+    "@storybook/node-logger": "npm:7.6.3"
+    "@types/ejs": "npm:^3.1.1"
+    "@types/find-cache-dir": "npm:^3.2.1"
+    "@yarnpkg/esbuild-plugin-pnp": "npm:^3.0.0-rc.10"
+    browser-assert: "npm:^1.2.1"
+    ejs: "npm:^3.1.8"
+    esbuild: "npm:^0.18.0"
+    esbuild-plugin-alias: "npm:^0.2.1"
+    express: "npm:^4.17.3"
+    find-cache-dir: "npm:^3.0.0"
+    fs-extra: "npm:^11.1.0"
+    process: "npm:^0.11.10"
+    util: "npm:^0.12.4"
+  checksum: 5d8654c0a15bf7112d994ce0331c4ece163179547fb36e1107beeb7c0cd63f754c072d1d72b02dcb439d4f6df37b69ed0c525ea2fa2d3dde2e16c7256ef01803
+  languageName: node
+  linkType: hard
+
+"@storybook/builder-vite@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/builder-vite@npm:7.6.17"
+  dependencies:
+    "@storybook/channels": "npm:7.6.17"
+    "@storybook/client-logger": "npm:7.6.17"
+    "@storybook/core-common": "npm:7.6.17"
+    "@storybook/csf-plugin": "npm:7.6.17"
+    "@storybook/node-logger": "npm:7.6.17"
+    "@storybook/preview": "npm:7.6.17"
+    "@storybook/preview-api": "npm:7.6.17"
+    "@storybook/types": "npm:7.6.17"
     "@types/find-cache-dir": "npm:^3.2.1"
     browser-assert: "npm:^1.2.1"
     es-module-lexer: "npm:^0.9.3"
@@ -13068,7 +13310,35 @@ __metadata:
       optional: true
     vite-plugin-glimmerx:
       optional: true
-  checksum: 0150bc6fbd3ab65425b582ba7ce5701e92bc825a0507c82fc5cd26e62d1c43f9ac156335ca6564c0b1ce7a3789677b34757564476531fbaa92f0914c1a8aa79c
+  checksum: eaa70e474240efd44adfdc8e7f6f57c3c1daddc966c221da981a0191fad322d78b279e954e03f20369eaa8223d11267f0a101ed3e9c16a3f7096f76fafc7388e
+  languageName: node
+  linkType: hard
+
+"@storybook/channels@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/channels@npm:7.6.17"
+  dependencies:
+    "@storybook/client-logger": "npm:7.6.17"
+    "@storybook/core-events": "npm:7.6.17"
+    "@storybook/global": "npm:^5.0.0"
+    qs: "npm:^6.10.0"
+    telejson: "npm:^7.2.0"
+    tiny-invariant: "npm:^1.3.1"
+  checksum: 7109b67a60c656d22deb1b9b44bf0e26b565044de6ccf63589b0e52188931e2eaa11b78f7a0e1b59396f654537f79ac4264c715417d467aca602a6e80495f49e
+  languageName: node
+  linkType: hard
+
+"@storybook/channels@npm:7.6.3":
+  version: 7.6.3
+  resolution: "@storybook/channels@npm:7.6.3"
+  dependencies:
+    "@storybook/client-logger": "npm:7.6.3"
+    "@storybook/core-events": "npm:7.6.3"
+    "@storybook/global": "npm:^5.0.0"
+    qs: "npm:^6.10.0"
+    telejson: "npm:^7.2.0"
+    tiny-invariant: "npm:^1.3.1"
+  checksum: 2111b31ab2e4fe32d523e63e42708944013c152e3b1ca234ff453e25de0a8cf0fe84577bfedd20b16d9ea2b50c50daa089036b16e0373247bc23825fe46f6fc2
   languageName: node
   linkType: hard
 
@@ -13086,22 +13356,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/cli@npm:7.6.7":
-  version: 7.6.7
-  resolution: "@storybook/cli@npm:7.6.7"
+"@storybook/channels@npm:8.0.6":
+  version: 8.0.6
+  resolution: "@storybook/channels@npm:8.0.6"
+  dependencies:
+    "@storybook/client-logger": "npm:8.0.6"
+    "@storybook/core-events": "npm:8.0.6"
+    "@storybook/global": "npm:^5.0.0"
+    telejson: "npm:^7.2.0"
+    tiny-invariant: "npm:^1.3.1"
+  checksum: 1df4a4e7e3259b959c94d5d4275aeed9fa0c8c139654fb0a6b0c943ec508fa21dd3915cfb276e1f1f363ffd4359ac284e0e05460aa7cc94bd8e0c2138a26a527
+  languageName: node
+  linkType: hard
+
+"@storybook/cli@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/cli@npm:7.6.17"
   dependencies:
     "@babel/core": "npm:^7.23.2"
     "@babel/preset-env": "npm:^7.23.2"
     "@babel/types": "npm:^7.23.0"
     "@ndelangen/get-tarball": "npm:^3.0.7"
-    "@storybook/codemod": "npm:7.6.7"
-    "@storybook/core-common": "npm:7.6.7"
-    "@storybook/core-events": "npm:7.6.7"
-    "@storybook/core-server": "npm:7.6.7"
-    "@storybook/csf-tools": "npm:7.6.7"
-    "@storybook/node-logger": "npm:7.6.7"
-    "@storybook/telemetry": "npm:7.6.7"
-    "@storybook/types": "npm:7.6.7"
+    "@storybook/codemod": "npm:7.6.17"
+    "@storybook/core-common": "npm:7.6.17"
+    "@storybook/core-events": "npm:7.6.17"
+    "@storybook/core-server": "npm:7.6.17"
+    "@storybook/csf-tools": "npm:7.6.17"
+    "@storybook/node-logger": "npm:7.6.17"
+    "@storybook/telemetry": "npm:7.6.17"
+    "@storybook/types": "npm:7.6.17"
     "@types/semver": "npm:^7.3.4"
     "@yarnpkg/fslib": "npm:2.10.3"
     "@yarnpkg/libzip": "npm:2.3.0"
@@ -13126,7 +13409,6 @@ __metadata:
     puppeteer-core: "npm:^2.1.1"
     read-pkg-up: "npm:^7.0.1"
     semver: "npm:^7.3.7"
-    simple-update-notifier: "npm:^2.0.0"
     strip-json-comments: "npm:^3.0.1"
     tempy: "npm:^1.0.1"
     ts-dedent: "npm:^2.0.0"
@@ -13134,7 +13416,25 @@ __metadata:
   bin:
     getstorybook: ./bin/index.js
     sb: ./bin/index.js
-  checksum: 1f070c5f4d2d154e6d46473e429d4c03a20fd89e0c50f49c599a1889d25231e2e013c3bea7c9799e7240c29b43cc1bb452b2d2a5f98263295788ecd5db0069fa
+  checksum: 8d8d426a1eca5d58a4cafa8418a1c8a41736e21a89c66307d18cea98c583976d672ae0773ab53e4e38f110dad2db788bd5d8daef3970ae14834db205818713ef
+  languageName: node
+  linkType: hard
+
+"@storybook/client-logger@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/client-logger@npm:7.6.17"
+  dependencies:
+    "@storybook/global": "npm:^5.0.0"
+  checksum: 77ebd176e65171b10b94f65ce7f10ed8c78e162b54462f5b87604f568e747f1604b4eb62ff7a601bf02d7e72b32e373fb980dd9c688a655706e74c025ebb82f3
+  languageName: node
+  linkType: hard
+
+"@storybook/client-logger@npm:7.6.3":
+  version: 7.6.3
+  resolution: "@storybook/client-logger@npm:7.6.3"
+  dependencies:
+    "@storybook/global": "npm:^5.0.0"
+  checksum: e32a9932aa7ddc05a17540c2bea7faf613cfc927ef855db2e15dad1fbfb35173c3669f1aeab2a589f16f9dda6a761ee055b98b40700b522a984ec81675817cd1
   languageName: node
   linkType: hard
 
@@ -13147,17 +13447,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/codemod@npm:7.6.7":
-  version: 7.6.7
-  resolution: "@storybook/codemod@npm:7.6.7"
+"@storybook/client-logger@npm:8.0.6":
+  version: 8.0.6
+  resolution: "@storybook/client-logger@npm:8.0.6"
+  dependencies:
+    "@storybook/global": "npm:^5.0.0"
+  checksum: 8b40a8031d6ec311b5761a95651090b1d07cbece014f623ce9d6e81f3fbb8b6bb75bc535cea88e2ecc4e52994ee718698aaae08d7311e597d926e9395c686b4d
+  languageName: node
+  linkType: hard
+
+"@storybook/codemod@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/codemod@npm:7.6.17"
   dependencies:
     "@babel/core": "npm:^7.23.2"
     "@babel/preset-env": "npm:^7.23.2"
     "@babel/types": "npm:^7.23.0"
     "@storybook/csf": "npm:^0.1.2"
-    "@storybook/csf-tools": "npm:7.6.7"
-    "@storybook/node-logger": "npm:7.6.7"
-    "@storybook/types": "npm:7.6.7"
+    "@storybook/csf-tools": "npm:7.6.17"
+    "@storybook/node-logger": "npm:7.6.17"
+    "@storybook/types": "npm:7.6.17"
     "@types/cross-spawn": "npm:^6.0.2"
     cross-spawn: "npm:^7.0.3"
     globby: "npm:^11.0.2"
@@ -13165,7 +13474,7 @@ __metadata:
     lodash: "npm:^4.17.21"
     prettier: "npm:^2.8.0"
     recast: "npm:^0.23.1"
-  checksum: 4f37240c133bc2dc110ba67b5ca0a3081ec8fcdd8cbf23bd0b0f76193adf6119fae640c354c13ba6827026ac1293913fa7ae8823f17eaecbf17f41d2267decf0
+  checksum: b8428203dfa551ea34b34659e5231cdc03eeb0fba2c53f801794b732515b173131bbe3df14dff9a540c18d3dfdafa7f94d11dbf34bf4dbaf03a47dd7c80d09ae
   languageName: node
   linkType: hard
 
@@ -13190,6 +13499,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/components@npm:^8.0.0":
+  version: 8.0.6
+  resolution: "@storybook/components@npm:8.0.6"
+  dependencies:
+    "@radix-ui/react-slot": "npm:^1.0.2"
+    "@storybook/client-logger": "npm:8.0.6"
+    "@storybook/csf": "npm:^0.1.2"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/icons": "npm:^1.2.5"
+    "@storybook/theming": "npm:8.0.6"
+    "@storybook/types": "npm:8.0.6"
+    memoizerific: "npm:^1.11.3"
+    util-deprecate: "npm:^1.0.2"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: a848bcce56920fa5894f6452cbba988a507d47b52a83992dd6dbe565ef83ec72bb441358c18667a7011eb2d73e14ea20daf27799847f51380696faa407de314a
+  languageName: node
+  linkType: hard
+
+"@storybook/core-client@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/core-client@npm:7.6.17"
+  dependencies:
+    "@storybook/client-logger": "npm:7.6.17"
+    "@storybook/preview-api": "npm:7.6.17"
+  checksum: 3342367bce219d46ac0c5b494688ae86aeb5c4006d98749dec2e30518850bc76a8b255611e9151f043d5141d11deb781b972c8610e98565cab4112dc86b7c1d5
+  languageName: node
+  linkType: hard
+
 "@storybook/core-client@npm:7.6.7":
   version: 7.6.7
   resolution: "@storybook/core-client@npm:7.6.7"
@@ -13200,6 +13539,68 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/core-common@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/core-common@npm:7.6.17"
+  dependencies:
+    "@storybook/core-events": "npm:7.6.17"
+    "@storybook/node-logger": "npm:7.6.17"
+    "@storybook/types": "npm:7.6.17"
+    "@types/find-cache-dir": "npm:^3.2.1"
+    "@types/node": "npm:^18.0.0"
+    "@types/node-fetch": "npm:^2.6.4"
+    "@types/pretty-hrtime": "npm:^1.0.0"
+    chalk: "npm:^4.1.0"
+    esbuild: "npm:^0.18.0"
+    esbuild-register: "npm:^3.5.0"
+    file-system-cache: "npm:2.3.0"
+    find-cache-dir: "npm:^3.0.0"
+    find-up: "npm:^5.0.0"
+    fs-extra: "npm:^11.1.0"
+    glob: "npm:^10.0.0"
+    handlebars: "npm:^4.7.7"
+    lazy-universal-dotenv: "npm:^4.0.0"
+    node-fetch: "npm:^2.0.0"
+    picomatch: "npm:^2.3.0"
+    pkg-dir: "npm:^5.0.0"
+    pretty-hrtime: "npm:^1.0.3"
+    resolve-from: "npm:^5.0.0"
+    ts-dedent: "npm:^2.0.0"
+  checksum: 5be46d8f2d97dcde4a45de688278baed78185b44895825fe2f9423b70410fa88214a9709f40e7656cebe218a2c57cfa9979228e9f2b522eb47cf5af825d1133d
+  languageName: node
+  linkType: hard
+
+"@storybook/core-common@npm:7.6.3":
+  version: 7.6.3
+  resolution: "@storybook/core-common@npm:7.6.3"
+  dependencies:
+    "@storybook/core-events": "npm:7.6.3"
+    "@storybook/node-logger": "npm:7.6.3"
+    "@storybook/types": "npm:7.6.3"
+    "@types/find-cache-dir": "npm:^3.2.1"
+    "@types/node": "npm:^18.0.0"
+    "@types/node-fetch": "npm:^2.6.4"
+    "@types/pretty-hrtime": "npm:^1.0.0"
+    chalk: "npm:^4.1.0"
+    esbuild: "npm:^0.18.0"
+    esbuild-register: "npm:^3.5.0"
+    file-system-cache: "npm:2.3.0"
+    find-cache-dir: "npm:^3.0.0"
+    find-up: "npm:^5.0.0"
+    fs-extra: "npm:^11.1.0"
+    glob: "npm:^10.0.0"
+    handlebars: "npm:^4.7.7"
+    lazy-universal-dotenv: "npm:^4.0.0"
+    node-fetch: "npm:^2.0.0"
+    picomatch: "npm:^2.3.0"
+    pkg-dir: "npm:^5.0.0"
+    pretty-hrtime: "npm:^1.0.3"
+    resolve-from: "npm:^5.0.0"
+    ts-dedent: "npm:^2.0.0"
+  checksum: 4f623ae79209df583d5abf3a50d5087170537bfeafefb716583315030dc3c2696a17062e4e2b859f23a10a4d995a9431d6d764c363c0105110d4858c61f6891b
+  languageName: node
+  linkType: hard
+
 "@storybook/core-common@npm:7.6.7, @storybook/core-common@npm:^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0":
   version: 7.6.7
   resolution: "@storybook/core-common@npm:7.6.7"
@@ -13231,6 +13632,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/core-events@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/core-events@npm:7.6.17"
+  dependencies:
+    ts-dedent: "npm:^2.0.0"
+  checksum: ab6410da3a456a61138b4a760a28b74bb9dc6f4c81de0d5ff7760b1853c6a437f8a0d05301c291f45503575d60c3be4805db4178f649eccd32c5ffd98a790250
+  languageName: node
+  linkType: hard
+
+"@storybook/core-events@npm:7.6.3":
+  version: 7.6.3
+  resolution: "@storybook/core-events@npm:7.6.3"
+  dependencies:
+    ts-dedent: "npm:^2.0.0"
+  checksum: 56304674342ad7a932e4735fd3ad347a277bb7e6407602f848e968cc7dd8e8eaa92c93dbfe2f42a4efb0853ae67491d76feefcab1fc0212b2596e33f5422888c
+  languageName: node
+  linkType: hard
+
 "@storybook/core-events@npm:7.6.7":
   version: 7.6.7
   resolution: "@storybook/core-events@npm:7.6.7"
@@ -13240,25 +13659,83 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/core-server@npm:7.6.7":
-  version: 7.6.7
-  resolution: "@storybook/core-server@npm:7.6.7"
+"@storybook/core-events@npm:8.0.6, @storybook/core-events@npm:^8.0.0":
+  version: 8.0.6
+  resolution: "@storybook/core-events@npm:8.0.6"
+  dependencies:
+    ts-dedent: "npm:^2.0.0"
+  checksum: 4771b9c959cbb5434ed410a373100d2a012cec65e2c23205c22c27a5273297ff389d0dd507e20277006ac30f19135bb4505cadac052f2f43d91c2bd9063a5b70
+  languageName: node
+  linkType: hard
+
+"@storybook/core-server@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/core-server@npm:7.6.17"
   dependencies:
     "@aw-web-design/x-default-browser": "npm:1.4.126"
     "@discoveryjs/json-ext": "npm:^0.5.3"
-    "@storybook/builder-manager": "npm:7.6.7"
-    "@storybook/channels": "npm:7.6.7"
-    "@storybook/core-common": "npm:7.6.7"
-    "@storybook/core-events": "npm:7.6.7"
+    "@storybook/builder-manager": "npm:7.6.17"
+    "@storybook/channels": "npm:7.6.17"
+    "@storybook/core-common": "npm:7.6.17"
+    "@storybook/core-events": "npm:7.6.17"
     "@storybook/csf": "npm:^0.1.2"
-    "@storybook/csf-tools": "npm:7.6.7"
+    "@storybook/csf-tools": "npm:7.6.17"
     "@storybook/docs-mdx": "npm:^0.1.0"
     "@storybook/global": "npm:^5.0.0"
-    "@storybook/manager": "npm:7.6.7"
-    "@storybook/node-logger": "npm:7.6.7"
-    "@storybook/preview-api": "npm:7.6.7"
-    "@storybook/telemetry": "npm:7.6.7"
-    "@storybook/types": "npm:7.6.7"
+    "@storybook/manager": "npm:7.6.17"
+    "@storybook/node-logger": "npm:7.6.17"
+    "@storybook/preview-api": "npm:7.6.17"
+    "@storybook/telemetry": "npm:7.6.17"
+    "@storybook/types": "npm:7.6.17"
+    "@types/detect-port": "npm:^1.3.0"
+    "@types/node": "npm:^18.0.0"
+    "@types/pretty-hrtime": "npm:^1.0.0"
+    "@types/semver": "npm:^7.3.4"
+    better-opn: "npm:^3.0.2"
+    chalk: "npm:^4.1.0"
+    cli-table3: "npm:^0.6.1"
+    compression: "npm:^1.7.4"
+    detect-port: "npm:^1.3.0"
+    express: "npm:^4.17.3"
+    fs-extra: "npm:^11.1.0"
+    globby: "npm:^11.0.2"
+    ip: "npm:^2.0.1"
+    lodash: "npm:^4.17.21"
+    open: "npm:^8.4.0"
+    pretty-hrtime: "npm:^1.0.3"
+    prompts: "npm:^2.4.0"
+    read-pkg-up: "npm:^7.0.1"
+    semver: "npm:^7.3.7"
+    telejson: "npm:^7.2.0"
+    tiny-invariant: "npm:^1.3.1"
+    ts-dedent: "npm:^2.0.0"
+    util: "npm:^0.12.4"
+    util-deprecate: "npm:^1.0.2"
+    watchpack: "npm:^2.2.0"
+    ws: "npm:^8.2.3"
+  checksum: b56077bea18c22151adb72c96efb1717034314b08bba5cae12b1f8a0e4135773f5c1e334ad3523dfeb578078b2d41a6091e2b0a992a110ca1859fdd89b1a4702
+  languageName: node
+  linkType: hard
+
+"@storybook/core-server@npm:7.6.3":
+  version: 7.6.3
+  resolution: "@storybook/core-server@npm:7.6.3"
+  dependencies:
+    "@aw-web-design/x-default-browser": "npm:1.4.126"
+    "@discoveryjs/json-ext": "npm:^0.5.3"
+    "@storybook/builder-manager": "npm:7.6.3"
+    "@storybook/channels": "npm:7.6.3"
+    "@storybook/core-common": "npm:7.6.3"
+    "@storybook/core-events": "npm:7.6.3"
+    "@storybook/csf": "npm:^0.1.2"
+    "@storybook/csf-tools": "npm:7.6.3"
+    "@storybook/docs-mdx": "npm:^0.1.0"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/manager": "npm:7.6.3"
+    "@storybook/node-logger": "npm:7.6.3"
+    "@storybook/preview-api": "npm:7.6.3"
+    "@storybook/telemetry": "npm:7.6.3"
+    "@storybook/types": "npm:7.6.3"
     "@types/detect-port": "npm:^1.3.0"
     "@types/node": "npm:^18.0.0"
     "@types/pretty-hrtime": "npm:^1.0.0"
@@ -13285,7 +13762,17 @@ __metadata:
     util-deprecate: "npm:^1.0.2"
     watchpack: "npm:^2.2.0"
     ws: "npm:^8.2.3"
-  checksum: 45fbac92bbc00fddc7e5052f8ca534ecf55f2972509809761509c88e1ded9e1cc5cd415c2f5bce2171d4effbfc21162ce60cc5c7d18a0a53be2a5891c122d84a
+  checksum: f02489b1848f6f445a7723b90d79749e5fee0d7f34a3f9e39e11fc094ff7805e6ebfdc74e8a66dd1a3abbe4998c8de1d2952ccfc19e4bc91ab6391f65ffbebe2
+  languageName: node
+  linkType: hard
+
+"@storybook/csf-plugin@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/csf-plugin@npm:7.6.17"
+  dependencies:
+    "@storybook/csf-tools": "npm:7.6.17"
+    unplugin: "npm:^1.3.1"
+  checksum: 720ecbd2e845f6d6d575b8fb5b05a085ddba1eb486318a9b7d6f2ea6646fe3e62d7c9589e18aab15ce0a715c653c9d24b2e0f38117e92845e636f0410a85f76d
   languageName: node
   linkType: hard
 
@@ -13299,6 +13786,40 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/csf-tools@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/csf-tools@npm:7.6.17"
+  dependencies:
+    "@babel/generator": "npm:^7.23.0"
+    "@babel/parser": "npm:^7.23.0"
+    "@babel/traverse": "npm:^7.23.2"
+    "@babel/types": "npm:^7.23.0"
+    "@storybook/csf": "npm:^0.1.2"
+    "@storybook/types": "npm:7.6.17"
+    fs-extra: "npm:^11.1.0"
+    recast: "npm:^0.23.1"
+    ts-dedent: "npm:^2.0.0"
+  checksum: 827458c97de27127a026d6f4592ad8760f27b69dc1082251710b8067b0616bf2c6b9c13b12cbf12a8162a6528d92ca81839cf78d0d10d09978d3ccdedaca7bce
+  languageName: node
+  linkType: hard
+
+"@storybook/csf-tools@npm:7.6.3":
+  version: 7.6.3
+  resolution: "@storybook/csf-tools@npm:7.6.3"
+  dependencies:
+    "@babel/generator": "npm:^7.23.0"
+    "@babel/parser": "npm:^7.23.0"
+    "@babel/traverse": "npm:^7.23.2"
+    "@babel/types": "npm:^7.23.0"
+    "@storybook/csf": "npm:^0.1.2"
+    "@storybook/types": "npm:7.6.3"
+    fs-extra: "npm:^11.1.0"
+    recast: "npm:^0.23.1"
+    ts-dedent: "npm:^2.0.0"
+  checksum: 31a4c2ea5abfd7c2d29bee8b642f4079e6ac21bb379f21b94494f3b79ea139d9c3cb0fb33bda6b1f50ab467b4984e683490d35b73a7965fb0e9978cb5b7ceed5
+  languageName: node
+  linkType: hard
+
 "@storybook/csf-tools@npm:7.6.7, @storybook/csf-tools@npm:^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0":
   version: 7.6.7
   resolution: "@storybook/csf-tools@npm:7.6.7"
@@ -13341,6 +13862,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/docs-tools@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/docs-tools@npm:7.6.17"
+  dependencies:
+    "@storybook/core-common": "npm:7.6.17"
+    "@storybook/preview-api": "npm:7.6.17"
+    "@storybook/types": "npm:7.6.17"
+    "@types/doctrine": "npm:^0.0.3"
+    assert: "npm:^2.1.0"
+    doctrine: "npm:^3.0.0"
+    lodash: "npm:^4.17.21"
+  checksum: 38473d0ce609cee38df5a8f3ad34a23ce6050e06b492cab51052ba67a2c6ecece532e0dee9f5e3cc5dee3d7105233289d05465a7ae0f5cb94fd2bbda1c267d38
+  languageName: node
+  linkType: hard
+
 "@storybook/docs-tools@npm:7.6.7":
   version: 7.6.7
   resolution: "@storybook/docs-tools@npm:7.6.7"
@@ -13356,6 +13892,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/expect@npm:storybook-jest":
+  version: 28.1.3-5
+  resolution: "@storybook/expect@npm:28.1.3-5"
+  dependencies:
+    "@types/jest": "npm:28.1.3"
+  checksum: ea912b18e1353cdd3bbdf93667ffebca7f843fa28a01e647429bffa6cb074afd4401d13eb2ecbfc9714e100e128ec1fe2686bded52e9e378ce44774889563558
+  languageName: node
+  linkType: hard
+
 "@storybook/global@npm:^5.0.0":
   version: 5.0.0
   resolution: "@storybook/global@npm:5.0.0"
@@ -13363,6 +13908,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/icons@npm:^1.2.5, @storybook/icons@npm:^1.2.9":
+  version: 1.2.9
+  resolution: "@storybook/icons@npm:1.2.9"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: 37513dbf526bf827941ee274e0f8358c6db41c963ffd0c408a674d794fa9af8d835e0dc4e58fd589106c4f33da5552aa8315ae45745f0c107ade0f6299cbf710
+  languageName: node
+  linkType: hard
+
 "@storybook/instrumenter@npm:7.6.7":
   version: 7.6.7
   resolution: "@storybook/instrumenter@npm:7.6.7"
@@ -13378,6 +13933,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/jest@npm:^0.2.3":
+  version: 0.2.3
+  resolution: "@storybook/jest@npm:0.2.3"
+  dependencies:
+    "@storybook/expect": "npm:storybook-jest"
+    "@testing-library/jest-dom": "npm:^6.1.2"
+    "@types/jest": "npm:28.1.3"
+    jest-mock: "npm:^27.3.0"
+  checksum: a2c367649ae53d9385b16f49bd73d5a928a2c3b9e64c2efcc1bbfc081b3b75972293bbe0e1828b67c94f0c2ed96341e0fae0ad5e30484a0ed4715724bbbf2c76
+  languageName: node
+  linkType: hard
+
 "@storybook/manager-api@npm:7.6.7":
   version: 7.6.7
   resolution: "@storybook/manager-api@npm:7.6.7"
@@ -13400,10 +13967,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/manager@npm:7.6.7":
-  version: 7.6.7
-  resolution: "@storybook/manager@npm:7.6.7"
-  checksum: 5b50ea2faeafaaa4448aea6456ee5800a6d625814063ca4d301fe43e3b9a7bf5e45427663e66bb798bef91f1615bdb4d2b12328c27dfc4dc783c086928cea395
+"@storybook/manager-api@npm:^8.0.0":
+  version: 8.0.6
+  resolution: "@storybook/manager-api@npm:8.0.6"
+  dependencies:
+    "@storybook/channels": "npm:8.0.6"
+    "@storybook/client-logger": "npm:8.0.6"
+    "@storybook/core-events": "npm:8.0.6"
+    "@storybook/csf": "npm:^0.1.2"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/icons": "npm:^1.2.5"
+    "@storybook/router": "npm:8.0.6"
+    "@storybook/theming": "npm:8.0.6"
+    "@storybook/types": "npm:8.0.6"
+    dequal: "npm:^2.0.2"
+    lodash: "npm:^4.17.21"
+    memoizerific: "npm:^1.11.3"
+    store2: "npm:^2.14.2"
+    telejson: "npm:^7.2.0"
+    ts-dedent: "npm:^2.0.0"
+  checksum: 719bef42fee448286ca20f82e7a831ef073ee7732118e434930e25a1f9cd838e4be82e7c66e0d6803c4b40e8195a9e43c4b3b6d2b00ae65a4aef65a7d1674905
+  languageName: node
+  linkType: hard
+
+"@storybook/manager@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/manager@npm:7.6.17"
+  checksum: e703466e95b0fca58963ac0abec188164e6bce904471171dd360c0d63ead0183a5b242db034af63157acd42d38348984e5fe4e6414af6190234c4d5d41608cee
+  languageName: node
+  linkType: hard
+
+"@storybook/manager@npm:7.6.3":
+  version: 7.6.3
+  resolution: "@storybook/manager@npm:7.6.3"
+  checksum: df7753e6dded87a058b489ad1caba819bb983c343b5af0c18b6bdf597cb4082783d90f58a82ea5e7ba1ffced93b1b66b8effd11560712ebd598824633f6647dd
   languageName: node
   linkType: hard
 
@@ -13414,6 +14011,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/node-logger@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/node-logger@npm:7.6.17"
+  checksum: 7b91f10812b8ea4e8716c3b133c5a78ac419e6bcd6a6ab80117cee25287aa973c1710a74a882238697499a1eca6521c4171f4f2d2e8651fb8ef6e28b7ee167fe
+  languageName: node
+  linkType: hard
+
+"@storybook/node-logger@npm:7.6.3":
+  version: 7.6.3
+  resolution: "@storybook/node-logger@npm:7.6.3"
+  checksum: adb880f276bc75a24cf7051d189fa888151a6d8f6ecb674229f4c4d2c178c5e3873d3ec26f9d99f850ed045268d207dc7718a63f3cdc9043302264134fe8fdbd
+  languageName: node
+  linkType: hard
+
 "@storybook/node-logger@npm:7.6.7":
   version: 7.6.7
   resolution: "@storybook/node-logger@npm:7.6.7"
@@ -13428,6 +14039,50 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/preview-api@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/preview-api@npm:7.6.17"
+  dependencies:
+    "@storybook/channels": "npm:7.6.17"
+    "@storybook/client-logger": "npm:7.6.17"
+    "@storybook/core-events": "npm:7.6.17"
+    "@storybook/csf": "npm:^0.1.2"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/types": "npm:7.6.17"
+    "@types/qs": "npm:^6.9.5"
+    dequal: "npm:^2.0.2"
+    lodash: "npm:^4.17.21"
+    memoizerific: "npm:^1.11.3"
+    qs: "npm:^6.10.0"
+    synchronous-promise: "npm:^2.0.15"
+    ts-dedent: "npm:^2.0.0"
+    util-deprecate: "npm:^1.0.2"
+  checksum: b4357ee0c1f9b05feee051d0c0ed3343972277f12d9d033fcc59acfb18d336cecc4a5f0b23998011af4a92c8126e785b2931dbdbdf79787aac5756a01c32aee0
+  languageName: node
+  linkType: hard
+
+"@storybook/preview-api@npm:7.6.3":
+  version: 7.6.3
+  resolution: "@storybook/preview-api@npm:7.6.3"
+  dependencies:
+    "@storybook/channels": "npm:7.6.3"
+    "@storybook/client-logger": "npm:7.6.3"
+    "@storybook/core-events": "npm:7.6.3"
+    "@storybook/csf": "npm:^0.1.2"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/types": "npm:7.6.3"
+    "@types/qs": "npm:^6.9.5"
+    dequal: "npm:^2.0.2"
+    lodash: "npm:^4.17.21"
+    memoizerific: "npm:^1.11.3"
+    qs: "npm:^6.10.0"
+    synchronous-promise: "npm:^2.0.15"
+    ts-dedent: "npm:^2.0.0"
+    util-deprecate: "npm:^1.0.2"
+  checksum: eb103973b0722096d5a44aa5d2e64bd8c8fb1a012c49231df97e3013b6dce181833fb4afb791f199d6e2c05ffc7b85a2988b3b16d701b4a6d41e968c72798acf
+  languageName: node
+  linkType: hard
+
 "@storybook/preview-api@npm:7.6.7, @storybook/preview-api@npm:^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0":
   version: 7.6.7
   resolution: "@storybook/preview-api@npm:7.6.7"
@@ -13450,10 +14105,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/preview@npm:7.6.7":
-  version: 7.6.7
-  resolution: "@storybook/preview@npm:7.6.7"
-  checksum: 04bad205c4bade10111085443f49faf2f11a130d9046f08b63f5ab0ebc06848b34c0d4091f951ce5d6b725672974f7af1d9589842130996a266853a2f5d24d29
+"@storybook/preview@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/preview@npm:7.6.17"
+  checksum: b4a2394c4622ff7291ba1b161d537902c53ed52ae3511c65e10c934b04463f6e7e55487b88889800acab55ea1c0aa33ea2a207786f3e06eda4617787f859da6b
+  languageName: node
+  linkType: hard
+
+"@storybook/react-dom-shim@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/react-dom-shim@npm:7.6.17"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: 20558c58f9f0a3a00c5a1bbf2aa3517e3d318e6528f503129c99fb9ee4b604a225e79725f67e01e6e99d5d8c7db0614575dcc89af7768381afe59c976cb7cfc0
   languageName: node
   linkType: hard
 
@@ -13468,13 +14133,13 @@ __metadata:
   linkType: hard
 
 "@storybook/react-vite@npm:^7.6.3":
-  version: 7.6.7
-  resolution: "@storybook/react-vite@npm:7.6.7"
+  version: 7.6.17
+  resolution: "@storybook/react-vite@npm:7.6.17"
   dependencies:
     "@joshwooding/vite-plugin-react-docgen-typescript": "npm:0.3.0"
     "@rollup/pluginutils": "npm:^5.0.2"
-    "@storybook/builder-vite": "npm:7.6.7"
-    "@storybook/react": "npm:7.6.7"
+    "@storybook/builder-vite": "npm:7.6.17"
+    "@storybook/react": "npm:7.6.17"
     "@vitejs/plugin-react": "npm:^3.0.1"
     magic-string: "npm:^0.30.0"
     react-docgen: "npm:^7.0.0"
@@ -13482,11 +14147,47 @@ __metadata:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     vite: ^3.0.0 || ^4.0.0 || ^5.0.0
-  checksum: 7c5b681be888e2277af0be1e4c59927838bdfc54bc4ee919aa6bec4f08a491210bba82f8a0cd94181136e1d082cbc81982c1fb8d55a0dbddf1003526d1e405fc
+  checksum: 2b45d09f17421d102b7599c55495b9c1688012f9761492493abf55dcfe8c23d65a4465ed6d5f96bb8e41475bbca103f4e0a285f65df85e17f8e82dce673b77dc
+  languageName: node
+  linkType: hard
+
+"@storybook/react@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/react@npm:7.6.17"
+  dependencies:
+    "@storybook/client-logger": "npm:7.6.17"
+    "@storybook/core-client": "npm:7.6.17"
+    "@storybook/docs-tools": "npm:7.6.17"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/preview-api": "npm:7.6.17"
+    "@storybook/react-dom-shim": "npm:7.6.17"
+    "@storybook/types": "npm:7.6.17"
+    "@types/escodegen": "npm:^0.0.6"
+    "@types/estree": "npm:^0.0.51"
+    "@types/node": "npm:^18.0.0"
+    acorn: "npm:^7.4.1"
+    acorn-jsx: "npm:^5.3.1"
+    acorn-walk: "npm:^7.2.0"
+    escodegen: "npm:^2.1.0"
+    html-tags: "npm:^3.1.0"
+    lodash: "npm:^4.17.21"
+    prop-types: "npm:^15.7.2"
+    react-element-to-jsx-string: "npm:^15.0.0"
+    ts-dedent: "npm:^2.0.0"
+    type-fest: "npm:~2.19"
+    util-deprecate: "npm:^1.0.2"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    typescript: "*"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 747bb48413865701716652b9587c8c5b07cc51cb1d54125a69a4ec355f24fdcfc3a9d925a0b6268786875e97addf435e10efe737450e50eea1d19408049674e6
   languageName: node
   linkType: hard
 
-"@storybook/react@npm:7.6.7, @storybook/react@npm:^7.6.3":
+"@storybook/react@npm:^7.6.3":
   version: 7.6.7
   resolution: "@storybook/react@npm:7.6.7"
   dependencies:
@@ -13533,7 +14234,50 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/telemetry@npm:7.6.7, @storybook/telemetry@npm:^7.1.0":
+"@storybook/router@npm:8.0.6":
+  version: 8.0.6
+  resolution: "@storybook/router@npm:8.0.6"
+  dependencies:
+    "@storybook/client-logger": "npm:8.0.6"
+    memoizerific: "npm:^1.11.3"
+    qs: "npm:^6.10.0"
+  checksum: 62a852b3e3f0f92d36a6b43cca350f4370a4f67e8964cb67aad8d1dfe3f7deab8561584ffa10aa69c0028edbc62b8e2fb0c1c949bdaf5a697238354edd43fb31
+  languageName: node
+  linkType: hard
+
+"@storybook/telemetry@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/telemetry@npm:7.6.17"
+  dependencies:
+    "@storybook/client-logger": "npm:7.6.17"
+    "@storybook/core-common": "npm:7.6.17"
+    "@storybook/csf-tools": "npm:7.6.17"
+    chalk: "npm:^4.1.0"
+    detect-package-manager: "npm:^2.0.1"
+    fetch-retry: "npm:^5.0.2"
+    fs-extra: "npm:^11.1.0"
+    read-pkg-up: "npm:^7.0.1"
+  checksum: 2d13afef0fd73982c1efec1598583ed592bd608bbc61f9c4d96c47be9202d80043041764e00ea3b10b0636417cfbfe7b3d13c6898187a09554c8a696f89ac226
+  languageName: node
+  linkType: hard
+
+"@storybook/telemetry@npm:7.6.3":
+  version: 7.6.3
+  resolution: "@storybook/telemetry@npm:7.6.3"
+  dependencies:
+    "@storybook/client-logger": "npm:7.6.3"
+    "@storybook/core-common": "npm:7.6.3"
+    "@storybook/csf-tools": "npm:7.6.3"
+    chalk: "npm:^4.1.0"
+    detect-package-manager: "npm:^2.0.1"
+    fetch-retry: "npm:^5.0.2"
+    fs-extra: "npm:^11.1.0"
+    read-pkg-up: "npm:^7.0.1"
+  checksum: 197ec4a77d8f119ac03c986653b2d9a00adc22b3ee8d70753c5fd4365cfc82dca3d097048d3b3b917414389d41fe161d6b383f6c2edad457301856644160ed3a
+  languageName: node
+  linkType: hard
+
+"@storybook/telemetry@npm:^7.1.0":
   version: 7.6.7
   resolution: "@storybook/telemetry@npm:7.6.7"
   dependencies:
@@ -13607,6 +14351,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/testing-library@npm:^0.2.2":
+  version: 0.2.2
+  resolution: "@storybook/testing-library@npm:0.2.2"
+  dependencies:
+    "@testing-library/dom": "npm:^9.0.0"
+    "@testing-library/user-event": "npm:^14.4.0"
+    ts-dedent: "npm:^2.2.0"
+  checksum: 3179c74148c92267ea449068ce9fb00bf960dbf06654354de7869428415d16dc730a0d58b5adca7619d21e5a058ae0bf713e34c09be8bca574388ec0106c5068
+  languageName: node
+  linkType: hard
+
 "@storybook/theming@npm:7.6.7":
   version: 7.6.7
   resolution: "@storybook/theming@npm:7.6.7"
@@ -13622,6 +14377,50 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/theming@npm:8.0.6, @storybook/theming@npm:^8.0.0":
+  version: 8.0.6
+  resolution: "@storybook/theming@npm:8.0.6"
+  dependencies:
+    "@emotion/use-insertion-effect-with-fallbacks": "npm:^1.0.1"
+    "@storybook/client-logger": "npm:8.0.6"
+    "@storybook/global": "npm:^5.0.0"
+    memoizerific: "npm:^1.11.3"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  peerDependenciesMeta:
+    react:
+      optional: true
+    react-dom:
+      optional: true
+  checksum: 4870e3d517f93f09937e5d53b1724ad1a39a8990ad232eb2bc1724fe70968cf6b51ffe73d010d0ddd5893d3e87981a491d2506114427dea97ee97e65e942e3e2
+  languageName: node
+  linkType: hard
+
+"@storybook/types@npm:7.6.17":
+  version: 7.6.17
+  resolution: "@storybook/types@npm:7.6.17"
+  dependencies:
+    "@storybook/channels": "npm:7.6.17"
+    "@types/babel__core": "npm:^7.0.0"
+    "@types/express": "npm:^4.7.0"
+    file-system-cache: "npm:2.3.0"
+  checksum: 7de04987b44b2d78d9e6ff39b54ece657b1d5266cc180a6b1a192ab394f893f8352578d9c8d0d2327e21689843a1c314f08e05eec18992d78a8d9347b0bcc72a
+  languageName: node
+  linkType: hard
+
+"@storybook/types@npm:7.6.3":
+  version: 7.6.3
+  resolution: "@storybook/types@npm:7.6.3"
+  dependencies:
+    "@storybook/channels": "npm:7.6.3"
+    "@types/babel__core": "npm:^7.0.0"
+    "@types/express": "npm:^4.7.0"
+    file-system-cache: "npm:2.3.0"
+  checksum: 301ed3cb058cb0c49bc5b20fa8d18bfa6714ea6a000ba532dd5800fc63c9318779e5ccb1ba9cc356316ff7eeb6ccb732c97a5a4fdb637ccb7768c5fb533d8367
+  languageName: node
+  linkType: hard
+
 "@storybook/types@npm:7.6.7":
   version: 7.6.7
   resolution: "@storybook/types@npm:7.6.7"
@@ -13634,6 +14433,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/types@npm:8.0.6":
+  version: 8.0.6
+  resolution: "@storybook/types@npm:8.0.6"
+  dependencies:
+    "@storybook/channels": "npm:8.0.6"
+    "@types/express": "npm:^4.7.0"
+    file-system-cache: "npm:2.3.0"
+  checksum: 160f94dfe1502475e3568956f181982e2a4e1ad2d2e1ae0443148490423f313b807139af436f6cfe956b89837a9e4523f45043e55494ef52b2ab833c1003606e
+  languageName: node
+  linkType: hard
+
 "@stylistic/eslint-plugin-js@npm:1.5.3, @stylistic/eslint-plugin-js@npm:^1.5.3":
   version: 1.5.3
   resolution: "@stylistic/eslint-plugin-js@npm:1.5.3"
@@ -13991,39 +14801,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc-node/core@npm:^1.10.6":
-  version: 1.10.6
-  resolution: "@swc-node/core@npm:1.10.6"
+"@swc-node/core@npm:^1.12.0":
+  version: 1.13.0
+  resolution: "@swc-node/core@npm:1.13.0"
   peerDependencies:
     "@swc/core": ">= 1.3"
-  checksum: cadcd927b3ab02a2888b7da43d80d5a6e19b4100e5b757ef7a4148123ce2940202053a0c412f20664e1eb18185fca26371f3cac3f866c4d2b1df5e8d2e63b99f
+    "@swc/types": ">= 0.1"
+  checksum: c41c6fcd155bb6904590d6c8dbd012a5a18dbfac55ab469220a35db47b252c0b5f3baeef9d5438249c3f2823eb9ec5e33566eb2e9b310e07c7f6ab3d207def69
   languageName: node
   linkType: hard
 
-"@swc-node/register@npm:~1.6.7":
-  version: 1.6.8
-  resolution: "@swc-node/register@npm:1.6.8"
+"@swc-node/register@npm:1.8.0":
+  version: 1.8.0
+  resolution: "@swc-node/register@npm:1.8.0"
   dependencies:
-    "@swc-node/core": "npm:^1.10.6"
-    "@swc-node/sourcemap-support": "npm:^0.3.0"
-    colorette: "npm:^2.0.19"
+    "@swc-node/core": "npm:^1.12.0"
+    "@swc-node/sourcemap-support": "npm:^0.4.0"
+    colorette: "npm:^2.0.20"
     debug: "npm:^4.3.4"
-    pirates: "npm:^4.0.5"
-    tslib: "npm:^2.5.0"
+    pirates: "npm:^4.0.6"
+    tslib: "npm:^2.6.2"
   peerDependencies:
     "@swc/core": ">= 1.3"
     typescript: ">= 4.3"
-  checksum: 681da27f9dbe7aa976c6873a2a0094d14237a4d51dea7c3c54d58e00e5375593d136b2d6e80e24412128cf338b238fc73206b3b69711698ee8fd6ceb40081551
+  checksum: 82181150a977b05d7eaf7b02c218954342e930c8700482bc71479b0dd1649f0621086e79ae67e4026dbc03b8096260af1cdae0cf40778fcc62efbeaa3bd9ca4b
   languageName: node
   linkType: hard
 
-"@swc-node/sourcemap-support@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "@swc-node/sourcemap-support@npm:0.3.0"
+"@swc-node/sourcemap-support@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "@swc-node/sourcemap-support@npm:0.4.0"
   dependencies:
     source-map-support: "npm:^0.5.21"
-    tslib: "npm:^2.5.0"
-  checksum: 331aac139159918377202723e5e4b34164714f29118c494d31d5ca19b9b7e54f958bcd94cae675a7854e84ed043f366b3041aa94377f80d3d9cbe891da1ed3de
+    tslib: "npm:^2.6.2"
+  checksum: b5130e17ee255fbb04233ce0ab39480c863850ce12aafbc7e784104c10403b19a7339646abb71dbb1659b3ffd53608a48e86f174112b946ba31fd7acdb811dd0
   languageName: node
   linkType: hard
 
@@ -14284,6 +15095,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/helpers@npm:~0.5.2":
+  version: 0.5.6
+  resolution: "@swc/helpers@npm:0.5.6"
+  dependencies:
+    tslib: "npm:^2.4.0"
+  checksum: ae43e2130b0c47a8c5dc51148925604707ee7801fef90674f71d2266a98b272c8f16145931fc7d51daf6795c4f3a86ccecd472e94a7ea562e0db7c333447d9e6
+  languageName: node
+  linkType: hard
+
 "@swc/jest@npm:^0.2.23, @swc/jest@npm:^0.2.29":
   version: 0.2.29
   resolution: "@swc/jest@npm:0.2.29"
@@ -14381,6 +15201,39 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@testing-library/jest-dom@npm:^6.1.2":
+  version: 6.4.2
+  resolution: "@testing-library/jest-dom@npm:6.4.2"
+  dependencies:
+    "@adobe/css-tools": "npm:^4.3.2"
+    "@babel/runtime": "npm:^7.9.2"
+    aria-query: "npm:^5.0.0"
+    chalk: "npm:^3.0.0"
+    css.escape: "npm:^1.5.1"
+    dom-accessibility-api: "npm:^0.6.3"
+    lodash: "npm:^4.17.15"
+    redent: "npm:^3.0.0"
+  peerDependencies:
+    "@jest/globals": ">= 28"
+    "@types/bun": "*"
+    "@types/jest": ">= 28"
+    jest: ">= 28"
+    vitest: ">= 0.32"
+  peerDependenciesMeta:
+    "@jest/globals":
+      optional: true
+    "@types/bun":
+      optional: true
+    "@types/jest":
+      optional: true
+    jest:
+      optional: true
+    vitest:
+      optional: true
+  checksum: e7eba527b34ce30cde94424d2ec685bdfed51daaafb7df9b68b51aec6052e99a50c8bfe654612dacdf857a1eb81d68cf294fc89de558ee3a992bf7a6019fffcc
+  languageName: node
+  linkType: hard
+
 "@testing-library/jest-dom@npm:^6.1.3, @testing-library/jest-dom@npm:^6.1.5":
   version: 6.2.0
   resolution: "@testing-library/jest-dom@npm:6.2.0"
@@ -14434,6 +15287,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@testing-library/user-event@npm:^14.4.0":
+  version: 14.5.2
+  resolution: "@testing-library/user-event@npm:14.5.2"
+  peerDependencies:
+    "@testing-library/dom": ">=7.21.4"
+  checksum: 68a0c2aa28a3c8e6eb05cafee29705438d7d8a9427423ce5064d44f19c29e89b5636de46dd2f28620fb10abba75c67130185bbc3aa23ac1163a227a5f36641e1
+  languageName: node
+  linkType: hard
+
 "@tiptap/core@npm:^2.0.3":
   version: 2.1.13
   resolution: "@tiptap/core@npm:2.1.13"
@@ -14708,18 +15570,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ts-morph/common@npm:~0.19.0":
-  version: 0.19.0
-  resolution: "@ts-morph/common@npm:0.19.0"
-  dependencies:
-    fast-glob: "npm:^3.2.12"
-    minimatch: "npm:^7.4.3"
-    mkdirp: "npm:^2.1.6"
-    path-browserify: "npm:^1.0.1"
-  checksum: e25fd46158d72be238ab1dda74e7ee284085895b12b9ab279f37d50f1cd71b2be95a56f3efa19d5f52986534e9f34ae4a294467cd1637b27cf4fb82bd7318bb7
-  languageName: node
-  linkType: hard
-
 "@tsconfig/node10@npm:^1.0.7":
   version: 1.0.9
   resolution: "@tsconfig/node10@npm:1.0.9"
@@ -15115,6 +15965,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/dompurify@npm:^3.0.5":
+  version: 3.0.5
+  resolution: "@types/dompurify@npm:3.0.5"
+  dependencies:
+    "@types/trusted-types": "npm:*"
+  checksum: a34dcc4498ca250815ccf9aecbe82df96ba5db247d0440cf266a876757d47c52519c240db3475e794d7deb0d6b1af23328e02879be368ad0e26b20c0f0865dba
+  languageName: node
+  linkType: hard
+
 "@types/ejs@npm:^3.1.1":
   version: 3.1.5
   resolution: "@types/ejs@npm:3.1.5"
@@ -15428,6 +16287,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/jest@npm:28.1.3":
+  version: 28.1.3
+  resolution: "@types/jest@npm:28.1.3"
+  dependencies:
+    jest-matcher-utils: "npm:^28.0.0"
+    pretty-format: "npm:^28.0.0"
+  checksum: d295db8680b5c230698345d6caae621ea9fa8720309027e2306fabfd8769679b4bd7474b4f6e03788905c934eff62105bc0a3e3f1e174feee51b4551d49ac42a
+  languageName: node
+  linkType: hard
+
 "@types/jest@npm:^29.5.11":
   version: 29.5.11
   resolution: "@types/jest@npm:29.5.11"
@@ -15573,6 +16442,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/lodash.differencewith@npm:^4.5.9":
+  version: 4.5.9
+  resolution: "@types/lodash.differencewith@npm:4.5.9"
+  dependencies:
+    "@types/lodash": "npm:*"
+  checksum: e2433f6daf390c9c09e32532dbd434f133c6ba9e10248d4655ad6c20208d29e620d467fd8a69efe1c66ae15854fca94a4ae36f5ebe0caeb5355272f71b28639f
+  languageName: node
+  linkType: hard
+
+"@types/lodash.groupby@npm:^4.6.9":
+  version: 4.6.9
+  resolution: "@types/lodash.groupby@npm:4.6.9"
+  dependencies:
+    "@types/lodash": "npm:*"
+  checksum: 1302531f76da99cc8f1bbd486a8c7048a833352b12c39eb5b2ded01173dd5fff76f2c7ace04f08b51c55840271170f1cfbffe4e454dde8597c3ee996e70d4e11
+  languageName: node
+  linkType: hard
+
 "@types/lodash.isempty@npm:^4.4.7":
   version: 4.4.9
   resolution: "@types/lodash.isempty@npm:4.4.9"
@@ -15609,6 +16496,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/lodash.mapvalues@npm:^4.6.9":
+  version: 4.6.9
+  resolution: "@types/lodash.mapvalues@npm:4.6.9"
+  dependencies:
+    "@types/lodash": "npm:*"
+  checksum: 09216965c2c64854c8c765f38f436333e931b98638a0b9d996bda7b6d538593a4cfe53cad7415d50593be48d76798763b97dc2d7925ab200dce1fa5b630ed3b4
+  languageName: node
+  linkType: hard
+
 "@types/lodash.merge@npm:^4.6.7":
   version: 4.6.9
   resolution: "@types/lodash.merge@npm:4.6.9"
@@ -15636,6 +16532,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/lodash.pick@npm:^4.3.7":
+  version: 4.4.9
+  resolution: "@types/lodash.pick@npm:4.4.9"
+  dependencies:
+    "@types/lodash": "npm:*"
+  checksum: 61ae2fb9fe817a2f398863d10dc57e3cb864ebadefb7f3554d8d0c189448e08a174d6bfdd6e0220988ea084a2d47c3377908cf037e2b3ce552aa79ce0f36bc9f
+  languageName: node
+  linkType: hard
+
 "@types/lodash.snakecase@npm:^4.1.7":
   version: 4.1.9
   resolution: "@types/lodash.snakecase@npm:4.1.9"
@@ -15645,6 +16550,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/lodash.uniq@npm:^4.5.9":
+  version: 4.5.9
+  resolution: "@types/lodash.uniq@npm:4.5.9"
+  dependencies:
+    "@types/lodash": "npm:*"
+  checksum: feb01dfd7b6e3d2b4d29bdb0d00cce8ffa685f1c219b34ae531f098811faab11696b7bdfc3654edcf65f6180ad0cda6471cec7da8a9e7688f294b5c8177cfea7
+  languageName: node
+  linkType: hard
+
+"@types/lodash.uniqby@npm:^4.7.9":
+  version: 4.7.9
+  resolution: "@types/lodash.uniqby@npm:4.7.9"
+  dependencies:
+    "@types/lodash": "npm:*"
+  checksum: b508927c8bd9a840c629169f8573d0f33a12c7232b4315785537f25914dec441323c54ba609f75fdefaa53f7ecd56f29bd6f598c3920ade45532b8eab76bf044
+  languageName: node
+  linkType: hard
+
 "@types/lodash.upperfirst@npm:^4.3.7":
   version: 4.3.9
   resolution: "@types/lodash.upperfirst@npm:4.3.9"
@@ -15804,6 +16727,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/node@npm:18.19.26":
+  version: 18.19.26
+  resolution: "@types/node@npm:18.19.26"
+  dependencies:
+    undici-types: "npm:~5.26.4"
+  checksum: 34b9ceb3366fc616f35a3f3a1467478182cc265ff142c02000503161a679d3036d8bbc410d343ae4012a868e879941d64d656bd509674b055c8735aba24d98e2
+  languageName: node
+  linkType: hard
+
 "@types/node@npm:>=8.1.0":
   version: 20.11.19
   resolution: "@types/node@npm:20.11.19"
@@ -15843,15 +16775,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^20.10.6":
-  version: 20.10.6
-  resolution: "@types/node@npm:20.10.6"
-  dependencies:
-    undici-types: "npm:~5.26.4"
-  checksum: 6692ccfa8552ef60c4069fda3c8de726c23e8d403cdf788e3c7efa769987e80fbda5f02723dd857f9de7df24a5fa40b3ed4580ec3c5cbac04eba44cf7b2ab1dc
-  languageName: node
-  linkType: hard
-
 "@types/nodemailer@npm:^6.4.14":
   version: 6.4.14
   resolution: "@types/nodemailer@npm:6.4.14"
@@ -16241,6 +17164,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/trusted-types@npm:*":
+  version: 2.0.7
+  resolution: "@types/trusted-types@npm:2.0.7"
+  checksum: 4c4855f10de7c6c135e0d32ce462419d8abbbc33713b31d294596c0cc34ae1fa6112a2f9da729c8f7a20707782b0d69da3b1f8df6645b0366d08825ca1522e0c
+  languageName: node
+  linkType: hard
+
 "@types/type-is@npm:^1.6.3":
   version: 1.6.6
   resolution: "@types/type-is@npm:1.6.6"
@@ -16345,15 +17275,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^6.10.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.17.0"
+"@typescript-eslint/eslint-plugin@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.21.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:6.17.0"
-    "@typescript-eslint/type-utils": "npm:6.17.0"
-    "@typescript-eslint/utils": "npm:6.17.0"
-    "@typescript-eslint/visitor-keys": "npm:6.17.0"
+    "@typescript-eslint/scope-manager": "npm:6.21.0"
+    "@typescript-eslint/type-utils": "npm:6.21.0"
+    "@typescript-eslint/utils": "npm:6.21.0"
+    "@typescript-eslint/visitor-keys": "npm:6.21.0"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.2.4"
@@ -16366,43 +17296,54 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 44a3c914b72607b12925d07c04be97d325f8795f5d7de8501054a4405accc35b35eaa2aa93983c602d13e842503d49bdbf1f5af5c0a69d700351c005681dcd52
+  checksum: f911a79ee64d642f814a3b6cdb0d324b5f45d9ef955c5033e78903f626b7239b4aa773e464a38c3e667519066169d983538f2bf8e5d00228af587c9d438fb344
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^5.4.2 || ^6.0.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/parser@npm:6.17.0"
+"@typescript-eslint/experimental-utils@npm:^5.62.0":
+  version: 5.62.0
+  resolution: "@typescript-eslint/experimental-utils@npm:5.62.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:6.17.0"
-    "@typescript-eslint/types": "npm:6.17.0"
-    "@typescript-eslint/typescript-estree": "npm:6.17.0"
-    "@typescript-eslint/visitor-keys": "npm:6.17.0"
+    "@typescript-eslint/utils": "npm:5.62.0"
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: f7037977e00849cd8c03677a88b0659a4f0e0b1e0151aebb47c49c92b8e57408578142df598eac08b364623d926343c724f42494f87662e437b1c89f0b2e815b
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/parser@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/parser@npm:6.21.0"
+  dependencies:
+    "@typescript-eslint/scope-manager": "npm:6.21.0"
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/typescript-estree": "npm:6.21.0"
+    "@typescript-eslint/visitor-keys": "npm:6.21.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 66b53159688083eb48259de5b4daf076f3de284ac3b4d2618bda3f7ab2d8ee27b01ae851b08e8487047e33ff3668424f17d677d66413164cb231f1519dcff82f
+  checksum: a8f99820679decd0d115c0af61903fb1de3b1b5bec412dc72b67670bf636de77ab07f2a68ee65d6da7976039bbf636907f9d5ca546db3f0b98a31ffbc225bc7d
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^6.10.0":
-  version: 6.13.2
-  resolution: "@typescript-eslint/parser@npm:6.13.2"
+"@typescript-eslint/parser@npm:^5.4.2 || ^6.0.0":
+  version: 6.17.0
+  resolution: "@typescript-eslint/parser@npm:6.17.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:6.13.2"
-    "@typescript-eslint/types": "npm:6.13.2"
-    "@typescript-eslint/typescript-estree": "npm:6.13.2"
-    "@typescript-eslint/visitor-keys": "npm:6.13.2"
+    "@typescript-eslint/scope-manager": "npm:6.17.0"
+    "@typescript-eslint/types": "npm:6.17.0"
+    "@typescript-eslint/typescript-estree": "npm:6.17.0"
+    "@typescript-eslint/visitor-keys": "npm:6.17.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 2c62b8cd8a37eb2ea59cd00e559f51a9f57af746e2040e872af3c58ddd3f4071ad7b7009789bdeb0e0d4ee0343bfe96ee77288020f3ae22d08e1674203f5e156
+  checksum: 66b53159688083eb48259de5b4daf076f3de284ac3b4d2618bda3f7ab2d8ee27b01ae851b08e8487047e33ff3668424f17d677d66413164cb231f1519dcff82f
   languageName: node
   linkType: hard
 
@@ -16416,26 +17357,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.13.2":
-  version: 6.13.2
-  resolution: "@typescript-eslint/scope-manager@npm:6.13.2"
-  dependencies:
-    "@typescript-eslint/types": "npm:6.13.2"
-    "@typescript-eslint/visitor-keys": "npm:6.13.2"
-  checksum: 9b159e5bb10dfb5953e71488200b4126378fc7e987ce7d90946aea9ec40cd66c7ada92399657c5d9794189b764ca6f4eb38a8dcb9e4c5aa50ab6000a39636b9c
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/scope-manager@npm:6.15.0":
-  version: 6.15.0
-  resolution: "@typescript-eslint/scope-manager@npm:6.15.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:6.15.0"
-    "@typescript-eslint/visitor-keys": "npm:6.15.0"
-  checksum: 3428d99de440f227cbc2afb44cdcb25e44c4b49c5f490392f83e21d2048210a6ec2f2f68133376c842034f5b5ba4ec9721da7caa18e631e23b57e20927b5b6f0
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/scope-manager@npm:6.17.0":
   version: 6.17.0
   resolution: "@typescript-eslint/scope-manager@npm:6.17.0"
@@ -16446,29 +17367,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/type-utils@npm:6.17.0"
+"@typescript-eslint/scope-manager@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/scope-manager@npm:6.21.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:6.17.0"
-    "@typescript-eslint/utils": "npm:6.17.0"
-    debug: "npm:^4.3.4"
-    ts-api-utils: "npm:^1.0.1"
-  peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 15bc9ba2d7f12c3825eced4e5c2283616496e4bca57914c98e895af23d920f94e47e2081fb4fd59da13d274809e08667ae43a76a2f1494a7043c75f980f21114
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/visitor-keys": "npm:6.21.0"
+  checksum: eaf868938d811cbbea33e97e44ba7050d2b6892202cea6a9622c486b85ab1cf801979edf78036179a8ba4ac26f1dfdf7fcc83a68c1ff66be0b3a8e9a9989b526
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:^6.9.1":
-  version: 6.15.0
-  resolution: "@typescript-eslint/type-utils@npm:6.15.0"
+"@typescript-eslint/type-utils@npm:6.21.0, @typescript-eslint/type-utils@npm:^6.13.2":
+  version: 6.21.0
+  resolution: "@typescript-eslint/type-utils@npm:6.21.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:6.15.0"
-    "@typescript-eslint/utils": "npm:6.15.0"
+    "@typescript-eslint/typescript-estree": "npm:6.21.0"
+    "@typescript-eslint/utils": "npm:6.21.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependencies:
@@ -16476,7 +17390,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 32cb531a4b5e0ccd431cba553ec73b87d4453b48af288a33e359ba4f5278126390d82799b61d3f0fbf135cfde1ac6c2275c2cf37a676e8a2a2811e774e660f16
+  checksum: 7409c97d1c4a4386b488962739c4f1b5b04dc60cf51f8cd88e6b12541f84d84c6b8b67e491a147a2c95f9ec486539bf4519fb9d418411aef6537b9c156468117
   languageName: node
   linkType: hard
 
@@ -16487,20 +17401,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.13.2":
-  version: 6.13.2
-  resolution: "@typescript-eslint/types@npm:6.13.2"
-  checksum: 029918ca5b1442bb4bc435773504ce32191e2c3e2fde8d4176bb6513f03e3dfa2aa9724b2d22b1640656d666b97f7a7ebfeaf67b881d5e07250828fa83e3ebe8
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/types@npm:6.15.0":
-  version: 6.15.0
-  resolution: "@typescript-eslint/types@npm:6.15.0"
-  checksum: 6e33529ea301c8c4b8c1f589dadd5d2a66c1b24ec87a577524fbc996d4c7b65d4f4fdfa4a3937b691efee6a10a6b16f7bfcabe98a15e0fc0c0c57aa0d80dcc25
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/types@npm:6.17.0":
   version: 6.17.0
   resolution: "@typescript-eslint/types@npm:6.17.0"
@@ -16508,6 +17408,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/types@npm:6.21.0"
+  checksum: 020631d3223bbcff8a0da3efbdf058220a8f48a3de221563996ad1dcc30d6c08dadc3f7608cc08830d21c0d565efd2db19b557b9528921c78aabb605eef2d74d
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:5.62.0":
   version: 5.62.0
   resolution: "@typescript-eslint/typescript-estree@npm:5.62.0"
@@ -16526,79 +17433,80 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.13.2":
-  version: 6.13.2
-  resolution: "@typescript-eslint/typescript-estree@npm:6.13.2"
+"@typescript-eslint/typescript-estree@npm:6.17.0":
+  version: 6.17.0
+  resolution: "@typescript-eslint/typescript-estree@npm:6.17.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.13.2"
-    "@typescript-eslint/visitor-keys": "npm:6.13.2"
+    "@typescript-eslint/types": "npm:6.17.0"
+    "@typescript-eslint/visitor-keys": "npm:6.17.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
+    minimatch: "npm:9.0.3"
     semver: "npm:^7.5.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 1c4c59dce0c51fdfee34d9f418e64fe28e3ec1a97661efc8a3d2780bdff36aff38de9090d356a968f394fa6d4e9c058936ce9cd260d4c44a52761ecd74915bce
+  checksum: 5a858288bb05f45a2a45b04394115826ff19f85555144bfb67dc281d4e75fc3a1e1aceb3dee68022e86b91f199d1310c15bda3100a4890004b8e474d86afad51
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.15.0":
-  version: 6.15.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.15.0"
+"@typescript-eslint/typescript-estree@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/typescript-estree@npm:6.21.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.15.0"
-    "@typescript-eslint/visitor-keys": "npm:6.15.0"
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/visitor-keys": "npm:6.21.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
+    minimatch: "npm:9.0.3"
     semver: "npm:^7.5.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 08955f6e84b8edb855a6769671e85889e52b15b82e00a64f595da867b21ad060e5342787c436d77702b2a1f39d411ac79b81a8d2e2006e9b1886eadb08b626df
+  checksum: af1438c60f080045ebb330155a8c9bb90db345d5069cdd5d01b67de502abb7449d6c75500519df829f913a6b3f490ade3e8215279b6bdc63d0fb0ae61034df5f
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.17.0"
+"@typescript-eslint/utils@npm:5.62.0, @typescript-eslint/utils@npm:^5.45.0":
+  version: 5.62.0
+  resolution: "@typescript-eslint/utils@npm:5.62.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.17.0"
-    "@typescript-eslint/visitor-keys": "npm:6.17.0"
-    debug: "npm:^4.3.4"
-    globby: "npm:^11.1.0"
-    is-glob: "npm:^4.0.3"
-    minimatch: "npm:9.0.3"
-    semver: "npm:^7.5.4"
-    ts-api-utils: "npm:^1.0.1"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 5a858288bb05f45a2a45b04394115826ff19f85555144bfb67dc281d4e75fc3a1e1aceb3dee68022e86b91f199d1310c15bda3100a4890004b8e474d86afad51
+    "@eslint-community/eslint-utils": "npm:^4.2.0"
+    "@types/json-schema": "npm:^7.0.9"
+    "@types/semver": "npm:^7.3.12"
+    "@typescript-eslint/scope-manager": "npm:5.62.0"
+    "@typescript-eslint/types": "npm:5.62.0"
+    "@typescript-eslint/typescript-estree": "npm:5.62.0"
+    eslint-scope: "npm:^5.1.1"
+    semver: "npm:^7.3.7"
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: f09b7d9952e4a205eb1ced31d7684dd55cee40bf8c2d78e923aa8a255318d97279825733902742c09d8690f37a50243f4c4d383ab16bd7aefaf9c4b438f785e1
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.15.0":
-  version: 6.15.0
-  resolution: "@typescript-eslint/utils@npm:6.15.0"
+"@typescript-eslint/utils@npm:6.21.0, @typescript-eslint/utils@npm:^6.13.2":
+  version: 6.21.0
+  resolution: "@typescript-eslint/utils@npm:6.21.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.12"
     "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:6.15.0"
-    "@typescript-eslint/types": "npm:6.15.0"
-    "@typescript-eslint/typescript-estree": "npm:6.15.0"
+    "@typescript-eslint/scope-manager": "npm:6.21.0"
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/typescript-estree": "npm:6.21.0"
     semver: "npm:^7.5.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: 53519a2027681bdc8f028f9421c65f193f91b5bb1659465fedb8043376c693c2391211f1c01d8ba25bfaa7f7b3a102263d7123f9dfade12032159f4b4490f0fb
+  checksum: ab2df3833b2582d4e5467a484d08942b4f2f7208f8e09d67de510008eb8001a9b7460f2f9ba11c12086fd3cdcac0c626761c7995c2c6b5657d5fa6b82030a32d
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.17.0, @typescript-eslint/utils@npm:^6.17.0, @typescript-eslint/utils@npm:^6.9.1":
+"@typescript-eslint/utils@npm:^6.17.0":
   version: 6.17.0
   resolution: "@typescript-eslint/utils@npm:6.17.0"
   dependencies:
@@ -16615,24 +17523,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:^5.45.0":
-  version: 5.62.0
-  resolution: "@typescript-eslint/utils@npm:5.62.0"
-  dependencies:
-    "@eslint-community/eslint-utils": "npm:^4.2.0"
-    "@types/json-schema": "npm:^7.0.9"
-    "@types/semver": "npm:^7.3.12"
-    "@typescript-eslint/scope-manager": "npm:5.62.0"
-    "@typescript-eslint/types": "npm:5.62.0"
-    "@typescript-eslint/typescript-estree": "npm:5.62.0"
-    eslint-scope: "npm:^5.1.1"
-    semver: "npm:^7.3.7"
-  peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: f09b7d9952e4a205eb1ced31d7684dd55cee40bf8c2d78e923aa8a255318d97279825733902742c09d8690f37a50243f4c4d383ab16bd7aefaf9c4b438f785e1
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/visitor-keys@npm:5.62.0":
   version: 5.62.0
   resolution: "@typescript-eslint/visitor-keys@npm:5.62.0"
@@ -16643,26 +17533,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.13.2":
-  version: 6.13.2
-  resolution: "@typescript-eslint/visitor-keys@npm:6.13.2"
-  dependencies:
-    "@typescript-eslint/types": "npm:6.13.2"
-    eslint-visitor-keys: "npm:^3.4.1"
-  checksum: c173bc1fcc42c3075a5ee094e7f3bf0279d98315c25ff49e20d02d79022b1d0402accfa113b070afb4d52a6f6d180594b67baa8b6a784eabdf82b54dd1ff454c
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/visitor-keys@npm:6.15.0":
-  version: 6.15.0
-  resolution: "@typescript-eslint/visitor-keys@npm:6.15.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:6.15.0"
-    eslint-visitor-keys: "npm:^3.4.1"
-  checksum: bf9f71af60bd63d1073900e75c5a0aa6eddd672f6c3ac6092c765d67deb7a0c32d2a5f6f3aee9e95f93a93d58563a76da209bd8487aadafd4d013100ffe38520
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/visitor-keys@npm:6.17.0":
   version: 6.17.0
   resolution: "@typescript-eslint/visitor-keys@npm:6.17.0"
@@ -16673,6 +17543,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/visitor-keys@npm:6.21.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:6.21.0"
+    eslint-visitor-keys: "npm:^3.4.1"
+  checksum: 7395f69739cfa1cb83c1fb2fad30afa2a814756367302fb4facd5893eff66abc807e8d8f63eba94ed3b0fe0c1c996ac9a1680bcbf0f83717acedc3f2bb724fbf
+  languageName: node
+  linkType: hard
+
 "@ungap/structured-clone@npm:^1.0.0, @ungap/structured-clone@npm:^1.2.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"
@@ -16721,6 +17601,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vitest/expect@npm:1.4.0":
+  version: 1.4.0
+  resolution: "@vitest/expect@npm:1.4.0"
+  dependencies:
+    "@vitest/spy": "npm:1.4.0"
+    "@vitest/utils": "npm:1.4.0"
+    chai: "npm:^4.3.10"
+  checksum: 2d6a657afc674adb78ad6609ecf61a94355b080cf90f922e05193b5b33b37d486c9b66a52270f1f367c16d626bcb8323368519dae096a992190898e03280b5e0
+  languageName: node
+  linkType: hard
+
 "@vitest/expect@npm:^0.34.2":
   version: 0.34.7
   resolution: "@vitest/expect@npm:0.34.7"
@@ -16732,6 +17623,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vitest/runner@npm:1.4.0":
+  version: 1.4.0
+  resolution: "@vitest/runner@npm:1.4.0"
+  dependencies:
+    "@vitest/utils": "npm:1.4.0"
+    p-limit: "npm:^5.0.0"
+    pathe: "npm:^1.1.1"
+  checksum: 87a5bdde5c48e3258ecd2716994da20c8eec63acaf63a0db724513a42701bc644728009a7301d78b8775d8004c7ce1ddb8bde6495066d864c532bc117783aa91
+  languageName: node
+  linkType: hard
+
+"@vitest/snapshot@npm:1.4.0":
+  version: 1.4.0
+  resolution: "@vitest/snapshot@npm:1.4.0"
+  dependencies:
+    magic-string: "npm:^0.30.5"
+    pathe: "npm:^1.1.1"
+    pretty-format: "npm:^29.7.0"
+  checksum: 6f089d1dbe43556779479bc309b0a8fc7e0229843c40efb4dabcf99ccf9a6fa859dd38c13674616a955801442730aca55151cbd52bb22d41d9a335060e03759b
+  languageName: node
+  linkType: hard
+
 "@vitest/spy@npm:0.34.7, @vitest/spy@npm:^0.34.1":
   version: 0.34.7
   resolution: "@vitest/spy@npm:0.34.7"
@@ -16741,6 +17654,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vitest/spy@npm:1.4.0":
+  version: 1.4.0
+  resolution: "@vitest/spy@npm:1.4.0"
+  dependencies:
+    tinyspy: "npm:^2.2.0"
+  checksum: 847bc3085d0aa2e039aa42d803cf2dc94596aab3a63de7d364933d24ed9e0781b7d3d4bd222df202f92bae83e9c37b2893b9f24a2de7d83b6930b7b1acf43516
+  languageName: node
+  linkType: hard
+
+"@vitest/ui@npm:1.4.0":
+  version: 1.4.0
+  resolution: "@vitest/ui@npm:1.4.0"
+  dependencies:
+    "@vitest/utils": "npm:1.4.0"
+    fast-glob: "npm:^3.3.2"
+    fflate: "npm:^0.8.1"
+    flatted: "npm:^3.2.9"
+    pathe: "npm:^1.1.1"
+    picocolors: "npm:^1.0.0"
+    sirv: "npm:^2.0.4"
+  peerDependencies:
+    vitest: 1.4.0
+  checksum: 38f8e69b8735a6f63c6503e1f9bbca3e0ab59b6f5e19258e8e0756f3f85941b58dcf6c5e58895a853b930aeed419d54ae2b8e80f2a235ad3bb5c9ab0da0ab232
+  languageName: node
+  linkType: hard
+
 "@vitest/utils@npm:0.34.7, @vitest/utils@npm:^0.34.6":
   version: 0.34.7
   resolution: "@vitest/utils@npm:0.34.7"
@@ -16752,6 +17691,98 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vitest/utils@npm:1.4.0":
+  version: 1.4.0
+  resolution: "@vitest/utils@npm:1.4.0"
+  dependencies:
+    diff-sequences: "npm:^29.6.3"
+    estree-walker: "npm:^3.0.3"
+    loupe: "npm:^2.3.7"
+    pretty-format: "npm:^29.7.0"
+  checksum: cfa352484f0ea2614444a94fc35979bea94fac64e9756238c685ae74bcd027893a1798b9d6d92c1cdd454b1f7f08f453d0cca108274f0449b6f5efd345822a4c
+  languageName: node
+  linkType: hard
+
+"@volar/language-core@npm:1.11.1, @volar/language-core@npm:~1.11.1":
+  version: 1.11.1
+  resolution: "@volar/language-core@npm:1.11.1"
+  dependencies:
+    "@volar/source-map": "npm:1.11.1"
+  checksum: 92c4439e3a9ccc534c970031388c318740f6fa032283d03e136c6c8c0228f549c68a7c363af1a28252617a0dca6069e14028329ac906d5acf1912931d0cdcb69
+  languageName: node
+  linkType: hard
+
+"@volar/source-map@npm:1.11.1, @volar/source-map@npm:~1.11.1":
+  version: 1.11.1
+  resolution: "@volar/source-map@npm:1.11.1"
+  dependencies:
+    muggle-string: "npm:^0.3.1"
+  checksum: 0bfc639889802705f8036ea8b2052a95a4d691a68bc2b6744ba8b9d312d887393dd3278101180a5ee5304972899d493972a483afafd41e097968746c77d724cb
+  languageName: node
+  linkType: hard
+
+"@volar/typescript@npm:~1.11.1":
+  version: 1.11.1
+  resolution: "@volar/typescript@npm:1.11.1"
+  dependencies:
+    "@volar/language-core": "npm:1.11.1"
+    path-browserify: "npm:^1.0.1"
+  checksum: 86fe153db3a14d8eb3632784a1d7fcbfbfb51fa5517c3878bfdd49ee8d15a83b1a09f9c589454b7396454c104d3a8e2db3a987dc99b37c33816772fc3e292bf2
+  languageName: node
+  linkType: hard
+
+"@vue/compiler-core@npm:3.4.21":
+  version: 3.4.21
+  resolution: "@vue/compiler-core@npm:3.4.21"
+  dependencies:
+    "@babel/parser": "npm:^7.23.9"
+    "@vue/shared": "npm:3.4.21"
+    entities: "npm:^4.5.0"
+    estree-walker: "npm:^2.0.2"
+    source-map-js: "npm:^1.0.2"
+  checksum: 3ee871b95e17948d10375093c8dd3265923f844528a24ac67512c201ddb9b628021c010565f3e50f2e551b217c502e80a7901384f616a977a04f81e68c64a37c
+  languageName: node
+  linkType: hard
+
+"@vue/compiler-dom@npm:^3.3.0":
+  version: 3.4.21
+  resolution: "@vue/compiler-dom@npm:3.4.21"
+  dependencies:
+    "@vue/compiler-core": "npm:3.4.21"
+    "@vue/shared": "npm:3.4.21"
+  checksum: b4a1099eddacded2663d12388b48088ca0be0d8969a070476f49e4e65da9b22851fc897cc693662b178e7e7fdee98fcf9ea3617a1f626c3a1b2089815cb1264e
+  languageName: node
+  linkType: hard
+
+"@vue/language-core@npm:1.8.27, @vue/language-core@npm:^1.8.27":
+  version: 1.8.27
+  resolution: "@vue/language-core@npm:1.8.27"
+  dependencies:
+    "@volar/language-core": "npm:~1.11.1"
+    "@volar/source-map": "npm:~1.11.1"
+    "@vue/compiler-dom": "npm:^3.3.0"
+    "@vue/shared": "npm:^3.3.0"
+    computeds: "npm:^0.0.1"
+    minimatch: "npm:^9.0.3"
+    muggle-string: "npm:^0.3.1"
+    path-browserify: "npm:^1.0.1"
+    vue-template-compiler: "npm:^2.7.14"
+  peerDependencies:
+    typescript: "*"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 2018214d8ce2643d19e8e84eddaeacddca28b2980984d7916d97f97556c3716be184cf9f8c4f506d072a11f265401e3bc0391117cf7cfcc1e4a25048f4432dc7
+  languageName: node
+  linkType: hard
+
+"@vue/shared@npm:3.4.21, @vue/shared@npm:^3.3.0":
+  version: 3.4.21
+  resolution: "@vue/shared@npm:3.4.21"
+  checksum: 79cba4228c3c1769ba8024302d7dbebf6ed1b77fb2e7a69e635cdebaa1c18b409e9c27ce27ccbe3a98e702a7e2dae1b87754d87f0b29adfe2a8f9e1e7c7899d5
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/ast@npm:1.11.6, @webassemblyjs/ast@npm:^1.11.5":
   version: 1.11.6
   resolution: "@webassemblyjs/ast@npm:1.11.6"
@@ -17213,6 +18244,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"acorn-walk@npm:^8.3.2":
+  version: 8.3.2
+  resolution: "acorn-walk@npm:8.3.2"
+  checksum: 7e2a8dad5480df7f872569b9dccff2f3da7e65f5353686b1d6032ab9f4ddf6e3a2cb83a9b52cf50b1497fd522154dda92f0abf7153290cc79cd14721ff121e52
+  languageName: node
+  linkType: hard
+
 "acorn@npm:^7.0.0, acorn@npm:^7.4.1":
   version: 7.4.1
   resolution: "acorn@npm:7.4.1"
@@ -18275,7 +19313,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^1.5.1, axios@npm:^1.6.1, axios@npm:^1.6.2":
+"axios@npm:^1.6.0":
+  version: 1.6.7
+  resolution: "axios@npm:1.6.7"
+  dependencies:
+    follow-redirects: "npm:^1.15.4"
+    form-data: "npm:^4.0.0"
+    proxy-from-env: "npm:^1.1.0"
+  checksum: 131bf8e62eee48ca4bd84e6101f211961bf6a21a33b95e5dfb3983d5a2fe50d9fffde0b57668d7ce6f65063d3dc10f2212cbcb554f75cfca99da1c73b210358d
+  languageName: node
+  linkType: hard
+
+"axios@npm:^1.6.1, axios@npm:^1.6.2":
   version: 1.6.4
   resolution: "axios@npm:1.6.4"
   dependencies:
@@ -18655,6 +19704,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-plugin-polyfill-corejs2@npm:^0.4.8":
+  version: 0.4.9
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.9"
+  dependencies:
+    "@babel/compat-data": "npm:^7.22.6"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.0"
+    semver: "npm:^6.3.1"
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 2cd47af763eb40aa41f1d6d9cbf1bdd217ff6c28f614b057c0328ee42a4d82cbcdcbc7d081d93e2a2d80446c899f25c3ebec048a63d260ef65a0a364134f71cd
+  languageName: node
+  linkType: hard
+
 "babel-plugin-polyfill-corejs3@npm:^0.8.7":
   version: 0.8.7
   resolution: "babel-plugin-polyfill-corejs3@npm:0.8.7"
@@ -18667,6 +19729,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-plugin-polyfill-corejs3@npm:^0.9.0":
+  version: 0.9.0
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.9.0"
+  dependencies:
+    "@babel/helper-define-polyfill-provider": "npm:^0.5.0"
+    core-js-compat: "npm:^3.34.0"
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: b857010736c5e42e20b683973dae862448a42082fcc95b3ef188305a6864a4f94b5cbd568e49e4cd7172c6b2eace7bc403c3ba0984fbe5479474ade01126d559
+  languageName: node
+  linkType: hard
+
 "babel-plugin-polyfill-regenerator@npm:^0.5.4":
   version: 0.5.4
   resolution: "babel-plugin-polyfill-regenerator@npm:0.5.4"
@@ -18678,6 +19752,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-plugin-polyfill-regenerator@npm:^0.5.5":
+  version: 0.5.5
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.5"
+  dependencies:
+    "@babel/helper-define-polyfill-provider": "npm:^0.5.0"
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 2aab692582082d54e0df9f9373dca1b223e65b4e7e96440160f27ed8803d417a1fa08da550f08aa3820d2010329ca91b68e2b6e9bd7aed51c93d46dfe79629bb
+  languageName: node
+  linkType: hard
+
 "babel-plugin-syntax-async-functions@npm:^6.8.0":
   version: 6.13.0
   resolution: "babel-plugin-syntax-async-functions@npm:6.13.0"
@@ -20105,7 +21190,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cac@npm:^6.7.12":
+"cac@npm:^6.7.12, cac@npm:^6.7.14":
   version: 6.7.14
   resolution: "cac@npm:6.7.14"
   checksum: 4ee06aaa7bab8981f0d54e5f5f9d4adcd64058e9697563ce336d8a3878ed018ee18ebe5359b2430eceae87e0758e62ea2019c3f52ae6e211b1bd2e133856cd10
@@ -20204,6 +21289,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cache-manager-redis-yet@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "cache-manager-redis-yet@npm:4.1.2"
+  dependencies:
+    "@redis/bloom": "npm:^1.2.0"
+    "@redis/client": "npm:^1.5.8"
+    "@redis/graph": "npm:^1.1.0"
+    "@redis/json": "npm:^1.0.4"
+    "@redis/search": "npm:^1.1.3"
+    "@redis/time-series": "npm:^1.0.4"
+    cache-manager: "npm:^5.2.2"
+    redis: "npm:^4.6.7"
+  checksum: dfa74d7de775cf89b570f19e97e3c8498f9c9441a0a049567fcec7ff2782967c6e61bb43dd038c0bcf940468e6f64eaa98d5b180a3589a7ebe0759595902876a
+  languageName: node
+  linkType: hard
+
+"cache-manager@npm:^5.2.2, cache-manager@npm:^5.4.0":
+  version: 5.4.0
+  resolution: "cache-manager@npm:5.4.0"
+  dependencies:
+    lodash.clonedeep: "npm:^4.5.0"
+    lru-cache: "npm:^10.1.0"
+    promise-coalesce: "npm:^1.1.2"
+  checksum: b89178fdb422625a40576a5db1bd11328381505cec84a10794b73239b36636ce36020a1b28bea2c96b5e96d30577d0ce1e28b63cd96258a6cae9c0df6f03f433
+  languageName: node
+  linkType: hard
+
 "cacheable-lookup@npm:^5.0.3":
   version: 5.0.4
   resolution: "cacheable-lookup@npm:5.0.4"
@@ -20694,6 +21806,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chokidar@npm:3.6.0":
+  version: 3.6.0
+  resolution: "chokidar@npm:3.6.0"
+  dependencies:
+    anymatch: "npm:~3.1.2"
+    braces: "npm:~3.0.2"
+    fsevents: "npm:~2.3.2"
+    glob-parent: "npm:~5.1.2"
+    is-binary-path: "npm:~2.1.0"
+    is-glob: "npm:~4.0.1"
+    normalize-path: "npm:~3.0.0"
+    readdirp: "npm:~3.6.0"
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  checksum: 8361dcd013f2ddbe260eacb1f3cb2f2c6f2b0ad118708a343a5ed8158941a39cb8fb1d272e0f389712e74ee90ce8ba864eece9e0e62b9705cb468a2f6d917462
+  languageName: node
+  linkType: hard
+
 "chownr@npm:^1.1.1":
   version: 1.1.4
   resolution: "chownr@npm:1.1.4"
@@ -21154,7 +22285,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cluster-key-slot@npm:^1.1.0":
+"cluster-key-slot@npm:1.1.2, cluster-key-slot@npm:^1.1.0":
   version: 1.1.2
   resolution: "cluster-key-slot@npm:1.1.2"
   checksum: d7d39ca28a8786e9e801eeb8c770e3c3236a566625d7299a47bb71113fb2298ce1039596acb82590e598c52dbc9b1f088c8f587803e697cb58e1867a95ff94d3
@@ -21177,13 +22308,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"code-block-writer@npm:^12.0.0":
-  version: 12.0.0
-  resolution: "code-block-writer@npm:12.0.0"
-  checksum: ced73cdc466bff968bba9e8e32340d88420d25a229b9269f7425a10a7c2c9a12ca702dcb601b2462b96472d354f021cf66e552179fcbe30c8f7ecd0173c5fa07
-  languageName: node
-  linkType: hard
-
 "code-point-at@npm:^1.0.0":
   version: 1.1.0
   resolution: "code-point-at@npm:1.1.0"
@@ -21212,13 +22336,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"codesandbox-import-util-types@npm:^2.2.3":
-  version: 2.3.0
-  resolution: "codesandbox-import-util-types@npm:2.3.0"
-  checksum: c906359c7dba8bfe6d4d88a7c38c89852c4df0e21a3ebd2290b44db3b91bb21377ffa7ea7c8ed3235e2198456aa64edcb80725ab92dec6233ff7060ca116515f
-  languageName: node
-  linkType: hard
-
 "collapse-white-space@npm:^2.0.0":
   version: 2.1.0
   resolution: "collapse-white-space@npm:2.1.0"
@@ -21308,7 +22425,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colorette@npm:^2.0.10, colorette@npm:^2.0.16, colorette@npm:^2.0.19":
+"colorette@npm:^2.0.10, colorette@npm:^2.0.16, colorette@npm:^2.0.20":
   version: 2.0.20
   resolution: "colorette@npm:2.0.20"
   checksum: e94116ff33b0ff56f3b83b9ace895e5bf87c2a7a47b3401b8c3f3226e050d5ef76cf4072fb3325f9dc24d1698f9b730baf4e05eeaf861d74a1883073f4c98a40
@@ -21329,13 +22446,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colors@npm:~1.2.1":
-  version: 1.2.5
-  resolution: "colors@npm:1.2.5"
-  checksum: f4acebf2d2da9b4f8afb770361d14c01034bcb43add4cae493e7d186dcd7e0c5e2b440520fbfdf636e872606a0eb86b1f69fcf2f087df2876a4e222612539ee0
-  languageName: node
-  linkType: hard
-
 "columnify@npm:^1.6.0":
   version: 1.6.0
   resolution: "columnify@npm:1.6.0"
@@ -21565,6 +22675,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"computeds@npm:^0.0.1":
+  version: 0.0.1
+  resolution: "computeds@npm:0.0.1"
+  checksum: 8a8736f1f43e4a99286519785d71a10ece8f444a2fa1fc2fe1f03dedf63f3477b45094002c85a2826f7631759c9f5a00b4ace47456997f253073fc525e8983de
+  languageName: node
+  linkType: hard
+
 "concat-map@npm:0.0.1":
   version: 0.0.1
   resolution: "concat-map@npm:0.0.1"
@@ -22794,6 +23911,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"de-indent@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "de-indent@npm:1.0.2"
+  checksum: 7058ce58abd6dfc123dd204e36be3797abd419b59482a634605420f47ae97639d0c183ec5d1b904f308a01033f473673897afc2bd59bc620ebf1658763ef4291
+  languageName: node
+  linkType: hard
+
 "debounce@npm:^1.2.0, debounce@npm:^1.2.1":
   version: 1.2.1
   resolution: "debounce@npm:1.2.1"
@@ -23301,6 +24425,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"diff-sequences@npm:^28.1.1":
+  version: 28.1.1
+  resolution: "diff-sequences@npm:28.1.1"
+  checksum: 26f29fa3f6b8c9040c3c6f6dab85413d90a09c8e6cb17b318bbcf64f225d7dcb1fb64392f3a9919a90888b434c4f6c8a4cc4f807aad02bbabae912c5d13c31f7
+  languageName: node
+  linkType: hard
+
 "diff-sequences@npm:^29.4.3, diff-sequences@npm:^29.6.3":
   version: 29.6.3
   resolution: "diff-sequences@npm:29.6.3"
@@ -23535,6 +24666,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dompurify@npm:^3.0.11":
+  version: 3.0.11
+  resolution: "dompurify@npm:3.0.11"
+  checksum: 38740deed057da8076e85026853635312a6720a21430218a85875e5f43e453c78637d93aa08c744460b0e91c652b06c736efb481c408a8f9c81894d8f76e0de1
+  languageName: node
+  linkType: hard
+
 "domutils@npm:^1.5.1":
   version: 1.7.0
   resolution: "domutils@npm:1.7.0"
@@ -23981,7 +25119,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"entities@npm:^4.2.0, entities@npm:^4.4.0":
+"entities@npm:^4.2.0, entities@npm:^4.4.0, entities@npm:^4.5.0":
   version: 4.5.0
   resolution: "entities@npm:4.5.0"
   checksum: 5b039739f7621f5d1ad996715e53d964035f75ad3b9a4d38c6b3804bb226e282ffeae2443624d8fdd9c47d8e926ae9ac009c54671243f0c3294c26af7cc85250
@@ -24662,7 +25800,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-import@npm:^2.27.5, eslint-plugin-import@npm:^2.28.1":
+"eslint-plugin-import@npm:2.29.1, eslint-plugin-import@npm:^2.28.1":
   version: 2.29.1
   resolution: "eslint-plugin-import@npm:2.29.1"
   dependencies:
@@ -24895,6 +26033,54 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint@npm:^8.0.0":
+  version: 8.57.0
+  resolution: "eslint@npm:8.57.0"
+  dependencies:
+    "@eslint-community/eslint-utils": "npm:^4.2.0"
+    "@eslint-community/regexpp": "npm:^4.6.1"
+    "@eslint/eslintrc": "npm:^2.1.4"
+    "@eslint/js": "npm:8.57.0"
+    "@humanwhocodes/config-array": "npm:^0.11.14"
+    "@humanwhocodes/module-importer": "npm:^1.0.1"
+    "@nodelib/fs.walk": "npm:^1.2.8"
+    "@ungap/structured-clone": "npm:^1.2.0"
+    ajv: "npm:^6.12.4"
+    chalk: "npm:^4.0.0"
+    cross-spawn: "npm:^7.0.2"
+    debug: "npm:^4.3.2"
+    doctrine: "npm:^3.0.0"
+    escape-string-regexp: "npm:^4.0.0"
+    eslint-scope: "npm:^7.2.2"
+    eslint-visitor-keys: "npm:^3.4.3"
+    espree: "npm:^9.6.1"
+    esquery: "npm:^1.4.2"
+    esutils: "npm:^2.0.2"
+    fast-deep-equal: "npm:^3.1.3"
+    file-entry-cache: "npm:^6.0.1"
+    find-up: "npm:^5.0.0"
+    glob-parent: "npm:^6.0.2"
+    globals: "npm:^13.19.0"
+    graphemer: "npm:^1.4.0"
+    ignore: "npm:^5.2.0"
+    imurmurhash: "npm:^0.1.4"
+    is-glob: "npm:^4.0.0"
+    is-path-inside: "npm:^3.0.3"
+    js-yaml: "npm:^4.1.0"
+    json-stable-stringify-without-jsonify: "npm:^1.0.1"
+    levn: "npm:^0.4.1"
+    lodash.merge: "npm:^4.6.2"
+    minimatch: "npm:^3.1.2"
+    natural-compare: "npm:^1.4.0"
+    optionator: "npm:^0.9.3"
+    strip-ansi: "npm:^6.0.1"
+    text-table: "npm:^0.2.0"
+  bin:
+    eslint: bin/eslint.js
+  checksum: 00bb96fd2471039a312435a6776fe1fd557c056755eaa2b96093ef3a8508c92c8775d5f754768be6b1dddd09fdd3379ddb231eeb9b6c579ee17ea7d68000a529
+  languageName: node
+  linkType: hard
+
 "eslint@npm:^8.53.0":
   version: 8.56.0
   resolution: "eslint@npm:8.56.0"
@@ -25110,7 +26296,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"estree-walker@npm:^3.0.0":
+"estree-walker@npm:^3.0.0, estree-walker@npm:^3.0.3":
   version: 3.0.3
   resolution: "estree-walker@npm:3.0.3"
   dependencies:
@@ -25478,19 +26664,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:3.2.12":
-  version: 3.2.12
-  resolution: "fast-glob@npm:3.2.12"
-  dependencies:
-    "@nodelib/fs.stat": "npm:^2.0.2"
-    "@nodelib/fs.walk": "npm:^1.2.3"
-    glob-parent: "npm:^5.1.2"
-    merge2: "npm:^1.3.0"
-    micromatch: "npm:^4.0.4"
-  checksum: 08604fb8ef6442ce74068bef3c3104382bb1f5ab28cf75e4ee904662778b60ad620e1405e692b7edea598ef445f5d387827a965ba034e1892bf54b1dfde97f26
-  languageName: node
-  linkType: hard
-
 "fast-glob@npm:3.2.7":
   version: 3.2.7
   resolution: "fast-glob@npm:3.2.7"
@@ -25504,7 +26677,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.7, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.1":
+"fast-glob@npm:3.3.2, fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.7, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.1, fast-glob@npm:^3.3.2":
   version: 3.3.2
   resolution: "fast-glob@npm:3.3.2"
   dependencies:
@@ -25711,6 +26884,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fflate@npm:^0.8.1":
+  version: 0.8.2
+  resolution: "fflate@npm:0.8.2"
+  checksum: 03448d630c0a583abea594835a9fdb2aaf7d67787055a761515bf4ed862913cfd693b4c4ffd5c3f3b355a70cf1e19033e9ae5aedcca103188aaff91b8bd6e293
+  languageName: node
+  linkType: hard
+
 "figures@npm:3.2.0, figures@npm:^3.0.0":
   version: 3.2.0
   resolution: "figures@npm:3.2.0"
@@ -26382,7 +27562,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-extra@npm:^10.0.0, fs-extra@npm:^10.0.1, fs-extra@npm:^10.1.0":
+"fs-extra@npm:^10.0.0, fs-extra@npm:^10.0.1":
   version: 10.1.0
   resolution: "fs-extra@npm:10.1.0"
   dependencies:
@@ -26605,6 +27785,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"generic-pool@npm:3.9.0":
+  version: 3.9.0
+  resolution: "generic-pool@npm:3.9.0"
+  checksum: 6b314d0d71170d5cbaf7162c423f53f8d6556b2135626a65bcdc03c089840b0a2f59eeb2d907939b8200e945eaf71ceb6630426f22d2128a1d242aec4b232aa7
+  languageName: node
+  linkType: hard
+
 "gensync@npm:^1.0.0-beta.2":
   version: 1.0.0-beta.2
   resolution: "gensync@npm:1.0.0-beta.2"
@@ -26857,20 +28044,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:7.1.4":
-  version: 7.1.4
-  resolution: "glob@npm:7.1.4"
-  dependencies:
-    fs.realpath: "npm:^1.0.0"
-    inflight: "npm:^1.0.4"
-    inherits: "npm:2"
-    minimatch: "npm:^3.0.4"
-    once: "npm:^1.3.0"
-    path-is-absolute: "npm:^1.0.0"
-  checksum: 7f6fcbf600eb2298cce34c65f6d8bbe6933ddd4f88aa5b38a9c6feec82b615bb33b63b120725303e89c4b50284413c21d2ff883414717a5c7d0c9f7cd7a0e5fe
-  languageName: node
-  linkType: hard
-
 "glob@npm:7.1.7":
   version: 7.1.7
   resolution: "glob@npm:7.1.7"
@@ -27191,11 +28364,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"graphiql@npm:^3.0.10":
-  version: 3.0.10
-  resolution: "graphiql@npm:3.0.10"
+"graphiql@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "graphiql@npm:3.1.1"
   dependencies:
-    "@graphiql/react": "npm:^0.20.2"
+    "@graphiql/react": "npm:^0.20.3"
     "@graphiql/toolkit": "npm:^0.9.1"
     graphql-language-service: "npm:^5.2.0"
     markdown-it: "npm:^12.2.0"
@@ -27203,7 +28376,7 @@ __metadata:
     graphql: ^15.5.0 || ^16.0.0
     react: ^16.8.0 || ^17 || ^18
     react-dom: ^16.8.0 || ^17 || ^18
-  checksum: 36750b94b8a1abaa2448f6eb6e29c8e38680d06e950bcaab67d26f3ab4509b2bdfcb74162e7e79846665c360943204c0d4d571176187e17a3e7073595763e42e
+  checksum: d9d8e8fab7290d17c32f5aeb48194c1476c04aed0213b3895fe966e14699620f45f3afd90aa689fc2f8fa97b26ae79ebf24008bcff262d7eb14035e57a7c730e
   languageName: node
   linkType: hard
 
@@ -27360,12 +28533,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"graphql-ws@npm:5.14.0":
-  version: 5.14.0
-  resolution: "graphql-ws@npm:5.14.0"
+"graphql-ws@npm:5.14.3":
+  version: 5.14.3
+  resolution: "graphql-ws@npm:5.14.3"
   peerDependencies:
     graphql: ">=0.11 <=16"
-  checksum: 505c1b1332b1a45a4a410ada0f335cc21b1a9511deb034bf0631d786d5fe328af2b4887dadc99a9eb3b7f9be0e1d0643e5cada6e3485d05b20851eabb5e7b92d
+  checksum: 0715feb7b6bf760e2460c31848983bd3bd5958c95d8120c2acc7416f24137585dab2eb731d6bb6f8de992afbc2ad0cf258a00c6a08aa21479fb3e9bd1d3e120a
   languageName: node
   linkType: hard
 
@@ -29225,6 +30398,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ip@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "ip@npm:2.0.1"
+  checksum: cab8eb3e88d0abe23e4724829621ec4c4c5cb41a7f936a2e626c947128c1be16ed543448d42af7cca95379f9892bfcacc1ccd8d09bc7e8bea0e86d492ce33616
+  languageName: node
+  linkType: hard
+
 "ipaddr.js@npm:1.9.1":
   version: 1.9.1
   resolution: "ipaddr.js@npm:1.9.1"
@@ -30343,6 +31523,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-diff@npm:^28.1.3":
+  version: 28.1.3
+  resolution: "jest-diff@npm:28.1.3"
+  dependencies:
+    chalk: "npm:^4.0.0"
+    diff-sequences: "npm:^28.1.1"
+    jest-get-type: "npm:^28.0.2"
+    pretty-format: "npm:^28.1.3"
+  checksum: 17a101ceb7e8f25c3ef64edda15cb1a259c2835395637099f3cc44f578fbd94ced7a13d11c0cbe8c5c1c3959a08544f0a913bec25a305b6dfc9847ce488e7198
+  languageName: node
+  linkType: hard
+
 "jest-diff@npm:^29.4.1, jest-diff@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-diff@npm:29.7.0"
@@ -30398,7 +31590,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-environment-node@npm:^29.6.4, jest-environment-node@npm:^29.7.0":
+"jest-environment-node@npm:^29.4.1, jest-environment-node@npm:^29.6.4, jest-environment-node@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-environment-node@npm:29.7.0"
   dependencies:
@@ -30422,6 +31614,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-get-type@npm:^28.0.2":
+  version: 28.0.2
+  resolution: "jest-get-type@npm:28.0.2"
+  checksum: f64a40cfa10d79a56b383919033d35c8c4daee6145a1df31ec5ef2283fa7e8adbd443c6fcb4cfd0f60bbbd89f046c2323952f086b06e875cbbbc1a7d543a6e5e
+  languageName: node
+  linkType: hard
+
 "jest-get-type@npm:^29.6.3":
   version: 29.6.3
   resolution: "jest-get-type@npm:29.6.3"
@@ -30474,6 +31673,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-matcher-utils@npm:^28.0.0":
+  version: 28.1.3
+  resolution: "jest-matcher-utils@npm:28.1.3"
+  dependencies:
+    chalk: "npm:^4.0.0"
+    jest-diff: "npm:^28.1.3"
+    jest-get-type: "npm:^28.0.2"
+    pretty-format: "npm:^28.1.3"
+  checksum: 026fbe664cfdaed5a5c9facfc86ccc9bed3718a7d1fe061e355eb6158019a77f74e9b843bc99f9a467966cbebe60bde8b43439174cbf64997d4ad404f8f809d0
+  languageName: node
+  linkType: hard
+
 "jest-matcher-utils@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-matcher-utils@npm:29.7.0"
@@ -30515,7 +31726,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-mock@npm:^27.0.6":
+"jest-mock@npm:^27.0.6, jest-mock@npm:^27.3.0":
   version: 27.5.1
   resolution: "jest-mock@npm:27.5.1"
   dependencies:
@@ -31015,6 +32226,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"js-tokens@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "js-tokens@npm:9.0.0"
+  checksum: 4ad1c12f47b8c8b2a3a99e29ef338c1385c7b7442198a425f3463f3537384dab6032012791bfc2f056ea5ecdb06b1ed4f70e11a3ab3f388d3dcebfe16a52b27d
+  languageName: node
+  linkType: hard
+
 "js-yaml@npm:4.1.0, js-yaml@npm:^4.0.0, js-yaml@npm:^4.1.0":
   version: 4.1.0
   resolution: "js-yaml@npm:4.1.0"
@@ -31582,6 +32800,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jwt-decode@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "jwt-decode@npm:4.0.0"
+  checksum: de75bbf89220746c388cf6a7b71e56080437b77d2edb29bae1c2155048b02c6b8c59a3e5e8d6ccdfd54f0b8bda25226e491a4f1b55ac5f8da04cfbadec4e546c
+  languageName: node
+  linkType: hard
+
 "keyv@npm:^3.0.0":
   version: 3.1.0
   resolution: "keyv@npm:3.1.0"
@@ -31646,7 +32871,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"kolorist@npm:^1.7.0":
+"kolorist@npm:^1.8.0":
   version: 1.8.0
   resolution: "kolorist@npm:1.8.0"
   checksum: 73075db44a692bf6c34a649f3b4b3aea4993b84f6b754cbf7a8577e7c7db44c0bad87752bd23b0ce533f49de2244ce2ce03b7b1b667a85ae170a94782cc50f9b
@@ -31972,6 +33197,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"local-pkg@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "local-pkg@npm:0.5.0"
+  dependencies:
+    mlly: "npm:^1.4.2"
+    pkg-types: "npm:^1.0.3"
+  checksum: f61cbd00d7689f275558b1a45c7ff2a3ddf8472654123ed880215677b9adfa729f1081e50c27ffb415cdb9fa706fb755fec5e23cdd965be375c8059e87ff1cc9
+  languageName: node
+  linkType: hard
+
 "locate-path@npm:^3.0.0":
   version: 3.0.0
   resolution: "locate-path@npm:3.0.0"
@@ -32030,6 +33265,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lodash.clonedeep@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "lodash.clonedeep@npm:4.5.0"
+  checksum: 2caf0e4808f319d761d2939ee0642fa6867a4bbf2cfce43276698828380756b99d4c4fa226d881655e6ac298dd453fe12a5ec8ba49861777759494c534936985
+  languageName: node
+  linkType: hard
+
 "lodash.debounce@npm:^4.0.8":
   version: 4.0.8
   resolution: "lodash.debounce@npm:4.0.8"
@@ -32051,6 +33293,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lodash.differencewith@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "lodash.differencewith@npm:4.5.0"
+  checksum: 685a51f5e78aa4bb8ff1a22f144b9729e9189ee44d498bd94ab6061885a33efb906436f7e828b50ec91f3b86bd9f35e240da526ec062eac8f7edb42b989c15ed
+  languageName: node
+  linkType: hard
+
 "lodash.filter@npm:^4.6.0":
   version: 4.6.0
   resolution: "lodash.filter@npm:4.6.0"
@@ -32079,13 +33328,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.foreach@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "lodash.foreach@npm:4.5.0"
-  checksum: bd9cc83e87e805b21058ce6cf718dd22db137c7ca08eddbd608549db59989911c571b7195707f615cb37f27bb4f9a9fa9980778940d768c24095f5a04b244c84
-  languageName: node
-  linkType: hard
-
 "lodash.get@npm:^4.4.2":
   version: 4.4.2
   resolution: "lodash.get@npm:4.4.2"
@@ -32301,6 +33543,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lodash.uniqby@npm:^4.7.0":
+  version: 4.7.0
+  resolution: "lodash.uniqby@npm:4.7.0"
+  checksum: c505c0de20ca759599a2ba38710e8fb95ff2d2028e24d86c901ef2c74be8056518571b9b754bfb75053b2818d30dd02243e4a4621a6940c206bbb3f7626db656
+  languageName: node
+  linkType: hard
+
 "lodash.upperfirst@npm:^4.3.1":
   version: 4.3.1
   resolution: "lodash.upperfirst@npm:4.3.1"
@@ -32376,7 +33625,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loupe@npm:^2.3.6":
+"loupe@npm:^2.3.6, loupe@npm:^2.3.7":
   version: 2.3.7
   resolution: "loupe@npm:2.3.7"
   dependencies:
@@ -32438,6 +33687,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lru-cache@npm:^10.1.0":
+  version: 10.2.0
+  resolution: "lru-cache@npm:10.2.0"
+  checksum: c9847612aa2daaef102d30542a8d6d9b2c2bb36581c1bf0dc3ebf5e5f3352c772a749e604afae2e46873b930a9e9523743faac4e5b937c576ab29196774712ee
+  languageName: node
+  linkType: hard
+
 "lru-cache@npm:^4.0.1":
   version: 4.1.5
   resolution: "lru-cache@npm:4.1.5"
@@ -32548,12 +33804,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"magic-string@npm:^0.29.0":
-  version: 0.29.0
-  resolution: "magic-string@npm:0.29.0"
+"magic-string@npm:^0.30.5, magic-string@npm:^0.30.8":
+  version: 0.30.8
+  resolution: "magic-string@npm:0.30.8"
   dependencies:
-    "@jridgewell/sourcemap-codec": "npm:^1.4.13"
-  checksum: 6c8b6246bca11e439d35f18b3a27cbdf55226acc7f4489900f027e253b7af6c5cd32ebb275389ef32c05d11f699d7dac8a06b833f51a51faf3d1978b9dabd861
+    "@jridgewell/sourcemap-codec": "npm:^1.4.15"
+  checksum: 51a1f06f678c082aceddfb5943de9b6bdb88f2ea1385a1c2adf116deb73dfcfa50df6c222901d691b529455222d4d68d0b28be5689ac6f69b3baa3462861f922
   languageName: node
   linkType: hard
 
@@ -34796,15 +36052,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:3.0.5":
-  version: 3.0.5
-  resolution: "minimatch@npm:3.0.5"
-  dependencies:
-    brace-expansion: "npm:^1.1.7"
-  checksum: f398652d0d260137c289c270a4ac98ebe0a27cd316fa0fac72b096e96cbdc89f71d80d47ac7065c716ba3b0b730783b19180bd85a35f9247535d2adfe96bba76
-  languageName: node
-  linkType: hard
-
 "minimatch@npm:3.1.2, minimatch@npm:^3.0.2, minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
   version: 3.1.2
   resolution: "minimatch@npm:3.1.2"
@@ -34868,6 +36115,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimatch@npm:^9.0.3":
+  version: 9.0.4
+  resolution: "minimatch@npm:9.0.4"
+  dependencies:
+    brace-expansion: "npm:^2.0.1"
+  checksum: 2c16f21f50e64922864e560ff97c587d15fd491f65d92a677a344e970fe62aafdbeafe648965fa96d33c061b4d0eabfe0213466203dd793367e7f28658cf6414
+  languageName: node
+  linkType: hard
+
+"minimatch@npm:~3.0.3":
+  version: 3.0.8
+  resolution: "minimatch@npm:3.0.8"
+  dependencies:
+    brace-expansion: "npm:^1.1.7"
+  checksum: 72b226f452dcfb5075255f53534cb83fc25565b909e79b9be4fad463d735cb1084827f7013ff41d050e77ee6e474408c6073473edd2fb72c2fd630cfb0acc6ad
+  languageName: node
+  linkType: hard
+
 "minimist@npm:1.2.6":
   version: 1.2.6
   resolution: "minimist@npm:1.2.6"
@@ -35060,7 +36325,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp@npm:^2.1.3, mkdirp@npm:^2.1.6":
+"mkdirp@npm:^2.1.3":
   version: 2.1.6
   resolution: "mkdirp@npm:2.1.6"
   bin:
@@ -35069,6 +36334,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mlly@npm:^1.2.0, mlly@npm:^1.4.2":
+  version: 1.6.1
+  resolution: "mlly@npm:1.6.1"
+  dependencies:
+    acorn: "npm:^8.11.3"
+    pathe: "npm:^1.1.2"
+    pkg-types: "npm:^1.0.3"
+    ufo: "npm:^1.3.2"
+  checksum: a7bf26b3d4f83b0f5a5232caa3af44be08b464f562f31c11d885d1bc2d43b7d717137d47b0c06fdc69e1b33ffc09f902b6d2b18de02c577849d40914e8785092
+  languageName: node
+  linkType: hard
+
 "module-deps@npm:^6.2.3":
   version: 6.2.3
   resolution: "module-deps@npm:6.2.3"
@@ -35226,6 +36503,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"muggle-string@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "muggle-string@npm:0.3.1"
+  checksum: 489b0575fa76e30914393915a36638590052409fca2206a6bef0fb0ad7b181c1cbf99761191bfd16fe402c6f5a3164897965422fa32ef20ada1b44024ba46ab6
+  languageName: node
+  linkType: hard
+
 "multer@npm:1.4.4-lts.1":
   version: 1.4.4-lts.1
   resolution: "multer@npm:1.4.4-lts.1"
@@ -36118,25 +37402,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nx@npm:17.2.8":
-  version: 17.2.8
-  resolution: "nx@npm:17.2.8"
-  dependencies:
-    "@nrwl/tao": "npm:17.2.8"
-    "@nx/nx-darwin-arm64": "npm:17.2.8"
-    "@nx/nx-darwin-x64": "npm:17.2.8"
-    "@nx/nx-freebsd-x64": "npm:17.2.8"
-    "@nx/nx-linux-arm-gnueabihf": "npm:17.2.8"
-    "@nx/nx-linux-arm64-gnu": "npm:17.2.8"
-    "@nx/nx-linux-arm64-musl": "npm:17.2.8"
-    "@nx/nx-linux-x64-gnu": "npm:17.2.8"
-    "@nx/nx-linux-x64-musl": "npm:17.2.8"
-    "@nx/nx-win32-arm64-msvc": "npm:17.2.8"
-    "@nx/nx-win32-x64-msvc": "npm:17.2.8"
+"nx@npm:18.1.3":
+  version: 18.1.3
+  resolution: "nx@npm:18.1.3"
+  dependencies:
+    "@nrwl/tao": "npm:18.1.3"
+    "@nx/nx-darwin-arm64": "npm:18.1.3"
+    "@nx/nx-darwin-x64": "npm:18.1.3"
+    "@nx/nx-freebsd-x64": "npm:18.1.3"
+    "@nx/nx-linux-arm-gnueabihf": "npm:18.1.3"
+    "@nx/nx-linux-arm64-gnu": "npm:18.1.3"
+    "@nx/nx-linux-arm64-musl": "npm:18.1.3"
+    "@nx/nx-linux-x64-gnu": "npm:18.1.3"
+    "@nx/nx-linux-x64-musl": "npm:18.1.3"
+    "@nx/nx-win32-arm64-msvc": "npm:18.1.3"
+    "@nx/nx-win32-x64-msvc": "npm:18.1.3"
     "@yarnpkg/lockfile": "npm:^1.1.0"
     "@yarnpkg/parsers": "npm:3.0.0-rc.46"
     "@zkochan/js-yaml": "npm:0.0.6"
-    axios: "npm:^1.5.1"
+    axios: "npm:^1.6.0"
     chalk: "npm:^4.1.0"
     cli-cursor: "npm:3.1.0"
     cli-spinners: "npm:2.6.1"
@@ -36147,17 +37431,17 @@ __metadata:
     figures: "npm:3.2.0"
     flat: "npm:^5.0.2"
     fs-extra: "npm:^11.1.0"
-    glob: "npm:7.1.4"
     ignore: "npm:^5.0.4"
     jest-diff: "npm:^29.4.1"
     js-yaml: "npm:4.1.0"
     jsonc-parser: "npm:3.2.0"
     lines-and-columns: "npm:~2.0.3"
-    minimatch: "npm:3.0.5"
+    minimatch: "npm:9.0.3"
     node-machine-id: "npm:1.1.12"
     npm-run-path: "npm:^4.0.1"
     open: "npm:^8.4.0"
-    semver: "npm:7.5.3"
+    ora: "npm:5.3.0"
+    semver: "npm:^7.5.3"
     string-width: "npm:^4.2.3"
     strong-log-transformer: "npm:^2.1.0"
     tar-stream: "npm:~2.2.0"
@@ -36167,7 +37451,7 @@ __metadata:
     yargs: "npm:^17.6.2"
     yargs-parser: "npm:21.1.1"
   peerDependencies:
-    "@swc-node/register": ^1.6.7
+    "@swc-node/register": ^1.8.0
     "@swc/core": ^1.3.85
   dependenciesMeta:
     "@nx/nx-darwin-arm64":
@@ -36198,7 +37482,7 @@ __metadata:
   bin:
     nx: bin/nx.js
     nx-cloud: bin/nx-cloud.js
-  checksum: c8049bf1b3136545a3fe9e5c1206d23e7161d044f550837208bacd2a1dcf51842377959ab94ea89ce8741d553e7bd15cda2335d03e91e0f5485ead53ee4c09ad
+  checksum: ee16b3e346a6f270895c372a568375eba0499df491bbd098c578c6ef61b561fa479425aebe414c7569c1e0c3a9d6f4a3f281069a6990f9b1a6c6ed47baa833ed
   languageName: node
   linkType: hard
 
@@ -36642,6 +37926,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"overlayscrollbars-react@npm:^0.5.4":
+  version: 0.5.4
+  resolution: "overlayscrollbars-react@npm:0.5.4"
+  peerDependencies:
+    overlayscrollbars: ^2.0.0
+    react: ">=16.8.0"
+  checksum: 71efe2a3775b26d1bc7c7e4cd8cf7ea7a977864fb1286cecc3ea6e83bf56fb2c104c9860de5ad6e472598be4f010d3e125b282a2a61190f3a8eb449f85e46a5e
+  languageName: node
+  linkType: hard
+
+"overlayscrollbars@npm:^2.6.1":
+  version: 2.6.1
+  resolution: "overlayscrollbars@npm:2.6.1"
+  checksum: fc20c787bc842a522f2498ef4a23cbd1e3849c98961bf87b6482366b0cbc325848c0e6f99deec7d035114f4f55f4efcc67939752f55742389c3ec16f2502fd1e
+  languageName: node
+  linkType: hard
+
 "override-require@npm:^1.1.1":
   version: 1.1.1
   resolution: "override-require@npm:1.1.1"
@@ -36704,6 +38005,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-limit@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "p-limit@npm:5.0.0"
+  dependencies:
+    yocto-queue: "npm:^1.0.0"
+  checksum: 574e93b8895a26e8485eb1df7c4b58a1a6e8d8ae41b1750cc2cc440922b3d306044fc6e9a7f74578a883d46802d9db72b30f2e612690fcef838c173261b1ed83
+  languageName: node
+  linkType: hard
+
 "p-locate@npm:^3.0.0":
   version: 3.0.0
   resolution: "p-locate@npm:3.0.0"
@@ -37393,6 +38703,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pathe@npm:^1.1.0, pathe@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "pathe@npm:1.1.2"
+  checksum: 64ee0a4e587fb0f208d9777a6c56e4f9050039268faaaaecd50e959ef01bf847b7872785c36483fa5cdcdbdfdb31fef2ff222684d4fc21c330ab60395c681897
+  languageName: node
+  linkType: hard
+
 "pathe@npm:^1.1.1":
   version: 1.1.1
   resolution: "pathe@npm:1.1.1"
@@ -37617,7 +38934,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pirates@npm:^4.0.1, pirates@npm:^4.0.4, pirates@npm:^4.0.5, pirates@npm:^4.0.6":
+"pirates@npm:^4.0.1, pirates@npm:^4.0.4, pirates@npm:^4.0.6":
   version: 4.0.6
   resolution: "pirates@npm:4.0.6"
   checksum: 00d5fa51f8dded94d7429700fb91a0c1ead00ae2c7fd27089f0c5b63e6eca36197fe46384631872690a66f390c5e27198e99006ab77ae472692ab9c2ca903f36
@@ -37660,6 +38977,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pkg-types@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "pkg-types@npm:1.0.3"
+  dependencies:
+    jsonc-parser: "npm:^3.2.0"
+    mlly: "npm:^1.2.0"
+    pathe: "npm:^1.1.0"
+  checksum: 7f692ff2005f51b8721381caf9bdbc7f5461506ba19c34f8631660a215c8de5e6dca268f23a319dd180b8f7c47a0dc6efea14b376c485ff99e98d810b8f786c4
+  languageName: node
+  linkType: hard
+
 "pkg-up@npm:^3.1.0":
   version: 3.1.0
   resolution: "pkg-up@npm:3.1.0"
@@ -38400,6 +39728,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pretty-format@npm:^28.0.0, pretty-format@npm:^28.1.3":
+  version: 28.1.3
+  resolution: "pretty-format@npm:28.1.3"
+  dependencies:
+    "@jest/schemas": "npm:^28.1.3"
+    ansi-regex: "npm:^5.0.1"
+    ansi-styles: "npm:^5.0.0"
+    react-is: "npm:^18.0.0"
+  checksum: 596d8b459b6fdac7dcbd70d40169191e889939c17ffbcc73eebe2a9a6f82cdbb57faffe190274e0a507d9ecdf3affadf8a9b43442a625eecfbd2813b9319660f
+  languageName: node
+  linkType: hard
+
 "pretty-format@npm:^29.0.0, pretty-format@npm:^29.5.0, pretty-format@npm:^29.7.0":
   version: 29.7.0
   resolution: "pretty-format@npm:29.7.0"
@@ -38541,6 +39881,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"promise-coalesce@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "promise-coalesce@npm:1.1.2"
+  checksum: 9bcdc954a645b30ccb094ae76e36212af2ee7ecc6b9fc67634d7d4f490d082c1efc39590737d957a32f6df93e7c5f51ca232549095e9e2d7291c0482d1bb1557
+  languageName: node
+  linkType: hard
+
 "promise-inflight@npm:^1.0.1":
   version: 1.0.1
   resolution: "promise-inflight@npm:1.0.1"
@@ -38834,7 +40181,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"psl@npm:^1.1.28, psl@npm:^1.1.33":
+"psl@npm:^1.1.28, psl@npm:^1.1.33, psl@npm:^1.9.0":
   version: 1.9.0
   resolution: "psl@npm:1.9.0"
   checksum: 6a3f805fdab9442f44de4ba23880c4eba26b20c8e8e0830eff1cb31007f6825dace61d17203c58bfe36946842140c97a1ba7f67bc63ca2d88a7ee052b65d97ab
@@ -40079,6 +41426,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"redis@npm:^4.6.7":
+  version: 4.6.13
+  resolution: "redis@npm:4.6.13"
+  dependencies:
+    "@redis/bloom": "npm:1.2.0"
+    "@redis/client": "npm:1.5.14"
+    "@redis/graph": "npm:1.1.1"
+    "@redis/json": "npm:1.0.6"
+    "@redis/search": "npm:1.1.6"
+    "@redis/time-series": "npm:1.0.5"
+  checksum: 5fbbf61fc244ca0d0eeca648e470de92d30a494f724f17fac434a7b2713425fc67be31736e17dc53798eba7d236cdfb66e330034ccced51f0faa1a3df1711d5d
+  languageName: node
+  linkType: hard
+
 "redux@npm:^4.2.1":
   version: 4.2.1
   resolution: "redux@npm:4.2.1"
@@ -41518,17 +42879,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:7.5.3":
-  version: 7.5.3
-  resolution: "semver@npm:7.5.3"
-  dependencies:
-    lru-cache: "npm:^6.0.0"
-  bin:
-    semver: bin/semver.js
-  checksum: 4cf3bab7e8cf8c2ae521fc4bcc50a4d6912a836360796b23b9f1c26f45d27a73f870e47664df4770bde0dd60dc4d4781a05fd49fe91d72376ea5519b9e791459
-  languageName: node
-  linkType: hard
-
 "semver@npm:7.5.4, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.3, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.0, semver@npm:^7.5.1, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:~7.5.4":
   version: 7.5.4
   resolution: "semver@npm:7.5.4"
@@ -41841,6 +43191,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"siginfo@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "siginfo@npm:2.0.0"
+  checksum: 3def8f8e516fbb34cb6ae415b07ccc5d9c018d85b4b8611e3dc6f8be6d1899f693a4382913c9ed51a06babb5201639d76453ab297d1c54a456544acf5c892e34
+  languageName: node
+  linkType: hard
+
 "signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
   version: 3.0.7
   resolution: "signal-exit@npm:3.0.7"
@@ -41904,16 +43261,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"simple-update-notifier@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "simple-update-notifier@npm:2.0.0"
-  dependencies:
-    semver: "npm:^7.5.3"
-  checksum: 2a00bd03bfbcbf8a737c47ab230d7920f8bfb92d1159d421bdd194479f6d01ebc995d13fbe13d45dace23066a78a3dc6642999b4e3b38b847e6664191575b20c
-  languageName: node
-  linkType: hard
-
-"sirv@npm:^2.0.3":
+"sirv@npm:^2.0.3, sirv@npm:^2.0.4":
   version: 2.0.4
   resolution: "sirv@npm:2.0.4"
   dependencies:
@@ -42406,6 +43754,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stackback@npm:0.0.2":
+  version: 0.0.2
+  resolution: "stackback@npm:0.0.2"
+  checksum: 89a1416668f950236dd5ac9f9a6b2588e1b9b62b1b6ad8dff1bfc5d1a15dbf0aafc9b52d2226d00c28dffff212da464eaeebfc6b7578b9d180cef3e3782c5983
+  languageName: node
+  linkType: hard
+
 "stackframe@npm:^1.3.4":
   version: 1.3.4
   resolution: "stackframe@npm:1.3.4"
@@ -42467,7 +43822,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"std-env@npm:^3.0.1":
+"std-env@npm:^3.0.1, std-env@npm:^3.5.0":
   version: 3.7.0
   resolution: "std-env@npm:3.7.0"
   checksum: 60edf2d130a4feb7002974af3d5a5f3343558d1ccf8d9b9934d225c638606884db4a20d2fe6440a09605bca282af6b042ae8070a10490c0800d69e82e478f41e
@@ -42530,15 +43885,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"storybook-dark-mode@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "storybook-dark-mode@npm:4.0.1"
+  dependencies:
+    "@storybook/components": "npm:^8.0.0"
+    "@storybook/core-events": "npm:^8.0.0"
+    "@storybook/global": "npm:^5.0.0"
+    "@storybook/icons": "npm:^1.2.5"
+    "@storybook/manager-api": "npm:^8.0.0"
+    "@storybook/theming": "npm:^8.0.0"
+    fast-deep-equal: "npm:^3.1.3"
+    memoizerific: "npm:^1.11.3"
+  checksum: 201e13e7bbed85ad7a52d65984da9347b0ecaf1458ec569a6645a5e6dc04638b8aa61ed52a56a775321f801f1a035444b6d0d715624aa217f7d6ea7671060d3e
+  languageName: node
+  linkType: hard
+
 "storybook@npm:^7.6.3":
-  version: 7.6.7
-  resolution: "storybook@npm:7.6.7"
+  version: 7.6.17
+  resolution: "storybook@npm:7.6.17"
   dependencies:
-    "@storybook/cli": "npm:7.6.7"
+    "@storybook/cli": "npm:7.6.17"
   bin:
     sb: ./index.js
     storybook: ./index.js
-  checksum: 0f27d7fe47da8d9a87caef62e490cdad173d5d8405d0d096d62f9abc6265d8bf53a45d92b1d9a824e9708c21430bdf3a841107de7b64dc36d5eb40d8d8d7bb9b
+  checksum: 256b8ff26b69f622889488605e786c0742350a901037139dd469ec20f2e7031c326d65f2a202a5ee7baa407ff407a6746af2f01d91c0c617eda2013679a65271
   languageName: node
   linkType: hard
 
@@ -42958,6 +44329,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"strip-literal@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "strip-literal@npm:2.1.0"
+  dependencies:
+    js-tokens: "npm:^9.0.0"
+  checksum: bc8b8c8346125ae3c20fcdaf12e10a498ff85baf6f69597b4ab2b5fbf2e58cfd2827f1a44f83606b852da99a5f6c8279770046ddea974c510c17c98934c9cc24
+  languageName: node
+  linkType: hard
+
 "stripe@npm:^14.17.0":
   version: 14.17.0
   resolution: "stripe@npm:14.17.0"
@@ -43179,7 +44559,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-color@npm:^8.0.0, supports-color@npm:^8.1.0, supports-color@npm:^8.1.1":
+"supports-color@npm:^8.0.0, supports-color@npm:^8.1.0, supports-color@npm:^8.1.1, supports-color@npm:~8.1.1":
   version: 8.1.1
   resolution: "supports-color@npm:8.1.1"
   dependencies:
@@ -43593,6 +44973,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tinybench@npm:^2.5.1":
+  version: 2.6.0
+  resolution: "tinybench@npm:2.6.0"
+  checksum: 60ea35699bf8bac9bc8cf279fa5877ab5b335b4673dcd07bf0fbbab9d7953a02c0ccded374677213eaa13aa147f54eb75d3230139ddbeec3875829ebe73db310
+  languageName: node
+  linkType: hard
+
+"tinypool@npm:^0.8.2":
+  version: 0.8.3
+  resolution: "tinypool@npm:0.8.3"
+  checksum: c219d0cfb69de8e3cf17403034a508d773f2fccaad79a13cdbad68600c4fb10186ad814d2320bcaa8f6e774fff5666d2a3d3b241dc8a7ad9d970ee63fe620a32
+  languageName: node
+  linkType: hard
+
 "tinyspy@npm:^2.1.1":
   version: 2.2.0
   resolution: "tinyspy@npm:2.2.0"
@@ -43600,6 +44994,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tinyspy@npm:^2.2.0":
+  version: 2.2.1
+  resolution: "tinyspy@npm:2.2.1"
+  checksum: 0b4cfd07c09871e12c592dfa7b91528124dc49a4766a0b23350638c62e6a483d5a2a667de7e6282246c0d4f09996482ddaacbd01f0c05b7ed7e0f79d32409bdc
+  languageName: node
+  linkType: hard
+
 "tippy.js@npm:^6.3.7":
   version: 6.3.7
   resolution: "tippy.js@npm:6.3.7"
@@ -43976,16 +45377,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-morph@npm:18.0.0":
-  version: 18.0.0
-  resolution: "ts-morph@npm:18.0.0"
-  dependencies:
-    "@ts-morph/common": "npm:~0.19.0"
-    code-block-writer: "npm:^12.0.0"
-  checksum: 6ea3259bf46a786eb446f75586aaa3a23715529889069e28e7bbd57e85e21585097559ec5b94e1b99cd6e6e9097d644d71e4a1e3274499f46b1cafd6a009b534
-  languageName: node
-  linkType: hard
-
 "ts-node@npm:10.9.1":
   version: 10.9.1
   resolution: "ts-node@npm:10.9.1"
@@ -44104,10 +45495,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:2.6.0":
-  version: 2.6.0
-  resolution: "tslib@npm:2.6.0"
-  checksum: 8d18020a8b9e70ecc529a744c883c095f177805efdbc9786bd50bd82a46c17547923133c5444fbcaf1f7f1c44e0e29c89f73ecf6d8fd1039668024a073a81dc6
+"tslib@npm:2.6.2, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.5.2, tslib@npm:^2.6.0, tslib@npm:^2.6.1, tslib@npm:^2.6.2":
+  version: 2.6.2
+  resolution: "tslib@npm:2.6.2"
+  checksum: e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb
   languageName: node
   linkType: hard
 
@@ -44118,13 +45509,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.5.2, tslib@npm:^2.6.0, tslib@npm:^2.6.1, tslib@npm:^2.6.2":
-  version: 2.6.2
-  resolution: "tslib@npm:2.6.2"
-  checksum: e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb
-  languageName: node
-  linkType: hard
-
 "tslib@npm:~2.0.1":
   version: 2.0.3
   resolution: "tslib@npm:2.0.3"
@@ -44255,12 +45639,6 @@ __metadata:
 "twenty-emails@workspace:packages/twenty-emails":
   version: 0.0.0-use.local
   resolution: "twenty-emails@workspace:packages/twenty-emails"
-  dependencies:
-    "@nx/vite": "npm:17.2.8"
-    "@vitejs/plugin-react-swc": "npm:^3.5.0"
-    vite: "npm:^5.0.0"
-    vite-plugin-dts: "npm:~2.3.0"
-    vite-tsconfig-paths: "npm:^4.2.1"
   languageName: unknown
   linkType: soft
 
@@ -44275,22 +45653,42 @@ __metadata:
   resolution: "twenty-server@workspace:packages/twenty-server"
   dependencies:
     "@graphql-yoga/nestjs": "patch:@graphql-yoga/nestjs@2.1.0#./patches/@graphql-yoga+nestjs+2.1.0.patch"
+    "@nestjs/cache-manager": "npm:^2.2.1"
     "@nestjs/cli": "npm:10.3.0"
-    "@nestjs/graphql": "patch:@nestjs/graphql@12.0.8#./patches/@nestjs+graphql+12.0.8.patch"
-    "@nx/js": "npm:17.2.8"
+    "@nestjs/devtools-integration": "npm:^0.1.6"
+    "@nestjs/graphql": "patch:@nestjs/graphql@12.1.1#./patches/@nestjs+graphql+12.1.1.patch"
+    "@nx/js": "npm:18.1.3"
     "@ptc-org/nestjs-query-graphql": "patch:@ptc-org/nestjs-query-graphql@4.2.0#./patches/@ptc-org+nestjs-query-graphql+4.2.0.patch"
+    "@types/lodash.differencewith": "npm:^4.5.9"
     "@types/lodash.isempty": "npm:^4.4.7"
     "@types/lodash.isequal": "npm:^4.5.8"
     "@types/lodash.isobject": "npm:^3.0.7"
     "@types/lodash.omit": "npm:^4.5.9"
     "@types/lodash.snakecase": "npm:^4.1.7"
+    "@types/lodash.uniq": "npm:^4.5.9"
+    "@types/lodash.uniqby": "npm:^4.7.9"
     "@types/lodash.upperfirst": "npm:^4.3.7"
     "@types/react": "npm:^18.2.39"
+    cache-manager: "npm:^5.4.0"
+    cache-manager-redis-yet: "npm:^4.1.2"
     class-validator: "patch:class-validator@0.14.0#./patches/class-validator+0.14.0.patch"
     graphql-middleware: "npm:^6.1.35"
+    jsdom: "npm:~22.1.0"
+    jwt-decode: "npm:^4.0.0"
+    lodash.differencewith: "npm:^4.5.0"
+    lodash.uniq: "npm:^4.5.0"
+    lodash.uniqby: "npm:^4.7.0"
     passport: "npm:^0.7.0"
+    psl: "npm:^1.9.0"
     rimraf: "npm:^5.0.5"
-    typescript: "npm:^5.3.3"
+    tsconfig-paths: "npm:^4.2.0"
+    typescript: "npm:5.3.3"
+  languageName: unknown
+  linkType: soft
+
+"twenty-ui@workspace:packages/twenty-ui":
+  version: 0.0.0-use.local
+  resolution: "twenty-ui@workspace:packages/twenty-ui"
   languageName: unknown
   linkType: soft
 
@@ -44330,11 +45728,11 @@ __metadata:
     "@aws-sdk/credential-providers": "npm:^3.363.0"
     "@babel/core": "npm:^7.14.5"
     "@babel/preset-react": "npm:^7.14.5"
-    "@blocknote/core": "npm:^0.11.2"
-    "@blocknote/react": "npm:^0.11.2"
+    "@blocknote/core": "npm:^0.12.1"
+    "@blocknote/react": "npm:^0.12.2"
     "@chakra-ui/accordion": "npm:^2.3.0"
     "@chakra-ui/system": "npm:^2.6.0"
-    "@codesandbox/sandpack-react": "npm:^2.11.3"
+    "@codesandbox/sandpack-react": "npm:^2.13.5"
     "@docusaurus/core": "npm:^3.1.0"
     "@docusaurus/module-type-aliases": "npm:^3.1.0"
     "@docusaurus/preset-classic": "npm:^3.1.0"
@@ -44367,18 +45765,21 @@ __metadata:
     "@nestjs/passport": "npm:^9.0.3"
     "@nestjs/platform-express": "npm:^9.0.0"
     "@nestjs/schematics": "npm:^9.0.0"
-    "@nestjs/serve-static": "npm:^3.0.0"
+    "@nestjs/serve-static": "npm:^4.0.1"
     "@nestjs/terminus": "npm:^9.2.2"
     "@nestjs/testing": "npm:^9.0.0"
     "@nestjs/typeorm": "npm:^10.0.0"
+    "@next/eslint-plugin-next": "npm:^14.1.4"
     "@nivo/calendar": "npm:^0.84.0"
     "@nivo/core": "npm:^0.84.0"
-    "@nx/eslint": "npm:17.2.8"
-    "@nx/eslint-plugin": "npm:17.2.8"
-    "@nx/jest": "npm:17.2.8"
-    "@nx/js": "npm:17.2.8"
-    "@nx/react": "npm:17.2.8"
-    "@nx/vite": "npm:17.2.8"
+    "@nx/eslint": "npm:18.1.3"
+    "@nx/eslint-plugin": "npm:18.1.3"
+    "@nx/jest": "npm:18.1.3"
+    "@nx/js": "npm:18.1.3"
+    "@nx/react": "npm:18.1.3"
+    "@nx/storybook": "npm:18.1.3"
+    "@nx/vite": "npm:18.1.3"
+    "@nx/web": "npm:18.1.3"
     "@octokit/graphql": "npm:^7.0.2"
     "@ptc-org/nestjs-query-core": "npm:^4.2.0"
     "@ptc-org/nestjs-query-typeorm": "npm:4.2.1-alpha.2"
@@ -44388,6 +45789,7 @@ __metadata:
     "@sentry/profiling-node": "npm:^1.3.4"
     "@sentry/react": "npm:^7.88.0"
     "@sentry/tracing": "npm:^7.99.0"
+    "@sentry/types": "npm:^7.109.0"
     "@sniptt/guards": "npm:^0.2.0"
     "@stoplight/elements": "npm:^8.0.5"
     "@storybook/addon-actions": "npm:^7.6.3"
@@ -44396,15 +45798,19 @@ __metadata:
     "@storybook/addon-interactions": "npm:^7.6.7"
     "@storybook/addon-links": "npm:^7.6.7"
     "@storybook/addon-onboarding": "npm:^1.0.10"
-    "@storybook/addon-themes": "npm:^7.6.7"
     "@storybook/blocks": "npm:^7.6.3"
+    "@storybook/core-server": "npm:7.6.3"
+    "@storybook/icons": "npm:^1.2.9"
+    "@storybook/jest": "npm:^0.2.3"
     "@storybook/react": "npm:^7.6.3"
     "@storybook/react-vite": "npm:^7.6.3"
     "@storybook/test": "npm:^7.6.3"
     "@storybook/test-runner": "npm:^0.16.0"
+    "@storybook/testing-library": "npm:^0.2.2"
     "@stylistic/eslint-plugin": "npm:^1.5.0"
-    "@swc-node/register": "npm:~1.6.7"
+    "@swc-node/register": "npm:1.8.0"
     "@swc/core": "npm:~1.3.100"
+    "@swc/helpers": "npm:~0.5.2"
     "@swc/jest": "npm:^0.2.29"
     "@tabler/icons-react": "npm:^2.44.0"
     "@testing-library/jest-dom": "npm:^6.1.5"
@@ -44414,6 +45820,7 @@ __metadata:
     "@types/better-sqlite3": "npm:^7.6.8"
     "@types/bytes": "npm:^3.1.1"
     "@types/deep-equal": "npm:^1.0.1"
+    "@types/dompurify": "npm:^3.0.5"
     "@types/express": "npm:^4.17.13"
     "@types/facepaint": "npm:^1.2.5"
     "@types/graphql-fields": "npm:^1.3.6"
@@ -44422,17 +45829,21 @@ __metadata:
     "@types/js-cookie": "npm:^3.0.3"
     "@types/lodash.camelcase": "npm:^4.3.7"
     "@types/lodash.debounce": "npm:^4.0.7"
+    "@types/lodash.groupby": "npm:^4.6.9"
     "@types/lodash.isempty": "npm:^4.4.7"
     "@types/lodash.isequal": "npm:^4.5.7"
     "@types/lodash.isobject": "npm:^3.0.7"
     "@types/lodash.kebabcase": "npm:^4.1.7"
+    "@types/lodash.mapvalues": "npm:^4.6.9"
     "@types/lodash.merge": "npm:^4.6.7"
+    "@types/lodash.omit": "npm:^4.5.9"
+    "@types/lodash.pick": "npm:^4.3.7"
     "@types/lodash.snakecase": "npm:^4.1.7"
     "@types/lodash.upperfirst": "npm:^4.3.7"
     "@types/luxon": "npm:^3.3.0"
     "@types/mailparser": "npm:^3.4.4"
     "@types/ms": "npm:^0.7.31"
-    "@types/node": "npm:^20.10.6"
+    "@types/node": "npm:18.19.26"
     "@types/nodemailer": "npm:^6.4.14"
     "@types/passport-google-oauth20": "npm:^2.0.11"
     "@types/passport-jwt": "npm:^3.0.8"
@@ -44442,10 +45853,12 @@ __metadata:
     "@types/scroll-into-view": "npm:^1.16.0"
     "@types/supertest": "npm:^2.0.11"
     "@types/uuid": "npm:^9.0.2"
-    "@typescript-eslint/eslint-plugin": "npm:^6.10.0"
-    "@typescript-eslint/parser": "npm:^6.10.0"
-    "@typescript-eslint/utils": "npm:^6.9.1"
+    "@typescript-eslint/eslint-plugin": "npm:6.21.0"
+    "@typescript-eslint/experimental-utils": "npm:^5.62.0"
+    "@typescript-eslint/parser": "npm:6.21.0"
+    "@typescript-eslint/utils": "npm:6.21.0"
     "@vitejs/plugin-react-swc": "npm:^3.5.0"
+    "@vitest/ui": "npm:1.4.0"
     add: "npm:^2.0.6"
     afterframe: "npm:^1.0.2"
     apollo-server-express: "npm:^3.12.0"
@@ -44470,6 +45883,7 @@ __metadata:
     debounce: "npm:^2.0.0"
     deep-equal: "npm:^2.2.2"
     docusaurus-node-polyfills: "npm:^1.0.0"
+    dompurify: "npm:^3.0.11"
     dotenv-cli: "npm:^7.2.1"
     drizzle-kit: "npm:^0.20.14"
     drizzle-orm: "npm:^0.29.3"
@@ -44477,7 +45891,7 @@ __metadata:
     eslint: "npm:^8.53.0"
     eslint-config-next: "npm:14.0.4"
     eslint-config-prettier: "npm:^9.1.0"
-    eslint-plugin-import: "npm:^2.27.5"
+    eslint-plugin-import: "npm:2.29.1"
     eslint-plugin-jsx-a11y: "npm:^6.8.0"
     eslint-plugin-prefer-arrow: "npm:^1.2.3"
     eslint-plugin-prettier: "npm:^5.1.2"
@@ -44492,7 +45906,7 @@ __metadata:
     file-type: "npm:16.5.4"
     framer-motion: "npm:^10.12.17"
     googleapis: "npm:105"
-    graphiql: "npm:^3.0.10"
+    graphiql: "npm:^3.1.1"
     graphql: "npm:16.8.0"
     graphql-fields: "npm:^2.0.3"
     graphql-middleware: "npm:^6.1.35"
@@ -44508,6 +45922,7 @@ __metadata:
     immer: "npm:^10.0.2"
     jest: "npm:29.7.0"
     jest-environment-jsdom: "npm:29.7.0"
+    jest-environment-node: "npm:^29.4.1"
     jest-fetch-mock: "npm:^3.0.3"
     jest-mock-extended: "npm:^3.0.4"
     js-cookie: "npm:^3.0.5"
@@ -44518,12 +45933,15 @@ __metadata:
     libphonenumber-js: "npm:^1.10.26"
     lodash.camelcase: "npm:^4.3.0"
     lodash.debounce: "npm:^4.0.8"
+    lodash.groupby: "npm:^4.6.0"
     lodash.isempty: "npm:^4.4.0"
     lodash.isequal: "npm:^4.5.0"
     lodash.isobject: "npm:^3.0.2"
     lodash.kebabcase: "npm:^4.1.1"
+    lodash.mapvalues: "npm:^4.6.0"
     lodash.merge: "npm:^4.6.2"
     lodash.omit: "npm:^4.5.0"
+    lodash.pick: "npm:^4.4.0"
     lodash.snakecase: "npm:^4.1.1"
     lodash.upperfirst: "npm:^4.3.1"
     luxon: "npm:^3.3.0"
@@ -44535,8 +45953,10 @@ __metadata:
     next: "npm:14.0.4"
     next-mdx-remote: "npm:^4.4.1"
     nodemailer: "npm:^6.9.8"
-    nx: "npm:17.2.8"
+    nx: "npm:18.1.3"
     openapi-types: "npm:^12.1.3"
+    overlayscrollbars: "npm:^2.6.1"
+    overlayscrollbars-react: "npm:^0.5.4"
     passport: "npm:^0.7.0"
     passport-google-oauth20: "npm:^2.0.0"
     passport-jwt: "npm:^4.0.1"
@@ -44580,6 +46000,7 @@ __metadata:
     storybook: "npm:^7.6.3"
     storybook-addon-cookie: "npm:^3.2.0"
     storybook-addon-pseudo-states: "npm:^2.1.2"
+    storybook-dark-mode: "npm:^4.0.1"
     stripe: "npm:^14.17.0"
     supertest: "npm:^6.1.3"
     ts-jest: "npm:^29.1.1"
@@ -44591,14 +46012,15 @@ __metadata:
     tsup: "npm:^8.0.1"
     type-fest: "npm:4.10.1"
     typeorm: "npm:^0.3.17"
-    typescript: "npm:^5.3.3"
+    typescript: "npm:5.3.3"
     use-debounce: "npm:^10.0.0"
     uuid: "npm:^9.0.0"
     vite: "npm:^5.0.0"
     vite-plugin-checker: "npm:^0.6.2"
-    vite-plugin-dts: "npm:~2.3.0"
+    vite-plugin-dts: "npm:3.8.1"
     vite-plugin-svgr: "npm:^4.2.0"
     vite-tsconfig-paths: "npm:^4.2.1"
+    vitest: "npm:1.4.0"
     xlsx-ugnis: "npm:^0.19.3"
     zod: "npm:^3.22.2"
   languageName: unknown
@@ -44794,17 +46216,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:4.9.5":
-  version: 4.9.5
-  resolution: "typescript@npm:4.9.5"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 5f6cad2e728a8a063521328e612d7876e12f0d8a8390d3b3aaa452a6a65e24e9ac8ea22beb72a924fd96ea0a49ea63bb4e251fb922b12eedfb7f7a26475e5c56
-  languageName: node
-  linkType: hard
-
-"typescript@npm:5.3.3, typescript@npm:^5.3.3":
+"typescript@npm:5.3.3":
   version: 5.3.3
   resolution: "typescript@npm:5.3.3"
   bin:
@@ -44814,27 +46226,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:~5.2.2":
-  version: 5.2.2
-  resolution: "typescript@npm:5.2.2"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 91ae3e6193d0ddb8656d4c418a033f0f75dec5e077ebbc2bd6d76439b93f35683936ee1bdc0e9cf94ec76863aa49f27159b5788219b50e1cd0cd6d110aa34b07
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@npm%3A4.9.5#optional!builtin<compat/typescript>":
-  version: 4.9.5
-  resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin<compat/typescript>::version=4.9.5&hash=289587"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: e3333f887c6829dfe0ab6c1dbe0dd1e3e2aeb56c66460cb85c5440c566f900c833d370ca34eb47558c0c69e78ced4bfe09b8f4f98b6de7afed9b84b8d1dd06a1
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.3.3#optional!builtin<compat/typescript>":
+"typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>":
   version: 5.3.3
   resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>::version=5.3.3&hash=e012d7"
   bin:
@@ -44844,16 +46236,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A~5.2.2#optional!builtin<compat/typescript>":
-  version: 5.2.2
-  resolution: "typescript@patch:typescript@npm%3A5.2.2#optional!builtin<compat/typescript>::version=5.2.2&hash=f3b441"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 062c1cee1990e6b9419ce8a55162b8dc917eb87f807e4de0327dbc1c2fa4e5f61bc0dd4e034d38ff541d1ed0479b53bcee8e4de3a4075c51a1724eb6216cb6f5
-  languageName: node
-  linkType: hard
-
 "ua-parser-js@npm:^1.0.35":
   version: 1.0.37
   resolution: "ua-parser-js@npm:1.0.37"
@@ -46105,6 +47487,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vite-node@npm:1.4.0":
+  version: 1.4.0
+  resolution: "vite-node@npm:1.4.0"
+  dependencies:
+    cac: "npm:^6.7.14"
+    debug: "npm:^4.3.4"
+    pathe: "npm:^1.1.1"
+    picocolors: "npm:^1.0.0"
+    vite: "npm:^5.0.0"
+  bin:
+    vite-node: vite-node.mjs
+  checksum: bc8eb01dd03c2cc306be2bf35efe789d6a3e8ca1d89d635d3154a9af0213f7609c94ef849f30a01f04535b31e729aee49468275e267693a42c32845fbd2a6721
+  languageName: node
+  linkType: hard
+
 "vite-plugin-checker@npm:^0.6.2":
   version: 0.6.2
   resolution: "vite-plugin-checker@npm:0.6.2"
@@ -46157,23 +47554,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite-plugin-dts@npm:~2.3.0":
-  version: 2.3.0
-  resolution: "vite-plugin-dts@npm:2.3.0"
+"vite-plugin-dts@npm:3.8.1":
+  version: 3.8.1
+  resolution: "vite-plugin-dts@npm:3.8.1"
   dependencies:
-    "@babel/parser": "npm:^7.21.4"
-    "@microsoft/api-extractor": "npm:^7.34.4"
-    "@rollup/pluginutils": "npm:^5.0.2"
-    "@rushstack/node-core-library": "npm:^3.55.2"
+    "@microsoft/api-extractor": "npm:7.43.0"
+    "@rollup/pluginutils": "npm:^5.1.0"
+    "@vue/language-core": "npm:^1.8.27"
     debug: "npm:^4.3.4"
-    fast-glob: "npm:^3.2.12"
-    fs-extra: "npm:^10.1.0"
-    kolorist: "npm:^1.7.0"
-    magic-string: "npm:^0.29.0"
-    ts-morph: "npm:18.0.0"
+    kolorist: "npm:^1.8.0"
+    magic-string: "npm:^0.30.8"
+    vue-tsc: "npm:^1.8.27"
   peerDependencies:
-    vite: ">=2.9.0"
-  checksum: e33c4bba5b0c936a159287c250dc935644008a05d6c1e46f01e7b0c4bcea47f061844782563302d9ca787c78d47f48c4405240faca0881dcd037563f031704b6
+    typescript: "*"
+    vite: "*"
+  peerDependenciesMeta:
+    vite:
+      optional: true
+  checksum: 0d61a6eae3c97d78efd74bc647fc94b446a8461ad97530e69b18173084e728411a1005d8ad97142508d1a8252b00cf9b849dd94e9fcc72560a69c92f48e9185c
   languageName: node
   linkType: hard
 
@@ -46258,6 +47656,56 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vitest@npm:1.4.0":
+  version: 1.4.0
+  resolution: "vitest@npm:1.4.0"
+  dependencies:
+    "@vitest/expect": "npm:1.4.0"
+    "@vitest/runner": "npm:1.4.0"
+    "@vitest/snapshot": "npm:1.4.0"
+    "@vitest/spy": "npm:1.4.0"
+    "@vitest/utils": "npm:1.4.0"
+    acorn-walk: "npm:^8.3.2"
+    chai: "npm:^4.3.10"
+    debug: "npm:^4.3.4"
+    execa: "npm:^8.0.1"
+    local-pkg: "npm:^0.5.0"
+    magic-string: "npm:^0.30.5"
+    pathe: "npm:^1.1.1"
+    picocolors: "npm:^1.0.0"
+    std-env: "npm:^3.5.0"
+    strip-literal: "npm:^2.0.0"
+    tinybench: "npm:^2.5.1"
+    tinypool: "npm:^0.8.2"
+    vite: "npm:^5.0.0"
+    vite-node: "npm:1.4.0"
+    why-is-node-running: "npm:^2.2.2"
+  peerDependencies:
+    "@edge-runtime/vm": "*"
+    "@types/node": ^18.0.0 || >=20.0.0
+    "@vitest/browser": 1.4.0
+    "@vitest/ui": 1.4.0
+    happy-dom: "*"
+    jsdom: "*"
+  peerDependenciesMeta:
+    "@edge-runtime/vm":
+      optional: true
+    "@types/node":
+      optional: true
+    "@vitest/browser":
+      optional: true
+    "@vitest/ui":
+      optional: true
+    happy-dom:
+      optional: true
+    jsdom:
+      optional: true
+  bin:
+    vitest: vitest.mjs
+  checksum: 732ce229341f6777350d36020dc00ccf5dd2ac0da39424cf5c9f6f4116ed1b6f7bb56de5a11270c693214d817b6d121d3d326e8f5a73437ec3f4c65aa07e1f52
+  languageName: node
+  linkType: hard
+
 "vm-browserify@npm:^1.0.0, vm-browserify@npm:^1.1.2":
   version: 1.1.2
   resolution: "vm-browserify@npm:1.1.2"
@@ -46332,6 +47780,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vue-template-compiler@npm:^2.7.14":
+  version: 2.7.16
+  resolution: "vue-template-compiler@npm:2.7.16"
+  dependencies:
+    de-indent: "npm:^1.0.2"
+    he: "npm:^1.2.0"
+  checksum: 66667ffd5095b707f169c902c4f1a011e9d5ab99fc228e4dac14eb5ca7f107ed99bff261b21578a4b391d2f3d320a8050e754404443472acad13ddaa4bd7bae2
+  languageName: node
+  linkType: hard
+
+"vue-tsc@npm:^1.8.27":
+  version: 1.8.27
+  resolution: "vue-tsc@npm:1.8.27"
+  dependencies:
+    "@volar/typescript": "npm:~1.11.1"
+    "@vue/language-core": "npm:1.8.27"
+    semver: "npm:^7.5.4"
+  peerDependencies:
+    typescript: "*"
+  bin:
+    vue-tsc: bin/vue-tsc.js
+  checksum: 6e6ba37eb7a0c8b9cc613225729c74edf8bd0632d265e62aca28b1969b5615b9dbe2de03aefb8aed2e26fdbd4b93f134785c8ab0095f92c2469192e2db5d09fd
+  languageName: node
+  linkType: hard
+
 "w3c-keyname@npm:^2.2.0, w3c-keyname@npm:^2.2.4":
   version: 2.2.8
   resolution: "w3c-keyname@npm:2.2.8"
@@ -46897,6 +48370,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"why-is-node-running@npm:^2.2.2":
+  version: 2.2.2
+  resolution: "why-is-node-running@npm:2.2.2"
+  dependencies:
+    siginfo: "npm:^2.0.0"
+    stackback: "npm:0.0.2"
+  bin:
+    why-is-node-running: cli.js
+  checksum: 805d57eb5d33f0fb4e36bae5dceda7fd8c6932c2aeb705e30003970488f1a2bc70029ee64be1a0e1531e2268b11e65606e88e5b71d667ea745e6dc48fc9014bd
+  languageName: node
+  linkType: hard
+
 "wide-align@npm:^1.1.0, wide-align@npm:^1.1.2, wide-align@npm:^1.1.5":
   version: 1.1.5
   resolution: "wide-align@npm:1.1.5"
@@ -47053,6 +48538,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ws@npm:8.16.0, ws@npm:^8.11.0, ws@npm:^8.12.0, ws@npm:^8.2.3":
+  version: 8.16.0
+  resolution: "ws@npm:8.16.0"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ">=5.0.2"
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: a7783bb421c648b1e622b423409cb2a58ac5839521d2f689e84bc9dc41d59379c692dd405b15a997ea1d4c0c2e5314ad707332d0c558f15232d2bc07c0b4618a
+  languageName: node
+  linkType: hard
+
 "ws@npm:^5.2.0 || ^6.0.0 || ^7.0.0, ws@npm:^7.3.1":
   version: 7.5.9
   resolution: "ws@npm:7.5.9"
@@ -47077,21 +48577,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.11.0, ws@npm:^8.12.0, ws@npm:^8.2.3":
-  version: 8.16.0
-  resolution: "ws@npm:8.16.0"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: a7783bb421c648b1e622b423409cb2a58ac5839521d2f689e84bc9dc41d59379c692dd405b15a997ea1d4c0c2e5314ad707332d0c558f15232d2bc07c0b4618a
-  languageName: node
-  linkType: hard
-
 "ws@npm:^8.13.0":
   version: 8.15.0
   resolution: "ws@npm:8.15.0"
@@ -47244,6 +48729,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yallist@npm:4.0.0, yallist@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "yallist@npm:4.0.0"
+  checksum: 2286b5e8dbfe22204ab66e2ef5cc9bbb1e55dfc873bbe0d568aa943eb255d131890dfd5bf243637273d31119b870f49c18fcde2c6ffbb7a7a092b870dc90625a
+  languageName: node
+  linkType: hard
+
 "yallist@npm:^2.1.2":
   version: 2.1.2
   resolution: "yallist@npm:2.1.2"
@@ -47258,13 +48750,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yallist@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "yallist@npm:4.0.0"
-  checksum: 2286b5e8dbfe22204ab66e2ef5cc9bbb1e55dfc873bbe0d568aa943eb255d131890dfd5bf243637273d31119b870f49c18fcde2c6ffbb7a7a092b870dc90625a
-  languageName: node
-  linkType: hard
-
 "yaml-ast-parser@npm:^0.0.43":
   version: 0.0.43
   resolution: "yaml-ast-parser@npm:0.0.43"